Port 9376

[*] Changes from the support-9376 branch have been ported starting from commit a40d78f605377b27f260ea14ca4a50db8c4b0f4b.

assigned to @roman.khlopkov

mentioned in merge request !1464 (merged)

added 1 commit

• 109c4057 - [*] Fixed.

Compare with previous version

marked this merge request as ready

mentioned in commit 47ae39b7

merged

picked the changes into the branch cherry-pick-47ae39b7 with commit 6902f698

mentioned in commit 6902f698

mentioned in merge request !1497 (merged)