Andrey's fixes through part of API

Andrey Gorlinrequested to merge
andrey_fix_7_26 into main

Had to reconcile some changes with the recent commit, went through file-by-file to retain fixes in cases of conflicts.

Merge request reports