Port 10283

[*] Changes from the feature-10283 working branch have been ported.

assigned to @roman.khlopkov

mentioned in merge request !1462 (merged)

marked this merge request as ready

mentioned in commit a0a1d58a

merged

picked the changes into the branch cherry-pick-a0a1d58a with commit d6e167f9

mentioned in commit d6e167f9

mentioned in merge request !1498 (merged)