release-19.4:Backport!3139

Merged MaksimSmile13 requested to merge cherry-pick-c1994b49 into release-19.4

Some fixes

See merge request !3139 (merged)

(cherry picked from commit c1994b49)

047b0730 Some fixes

Edited by MaksimSmile13

Merge request reports