Backport 7253

assigned to @roman.khlopkov

added 5 commits

• 511546d4...05198943 - 4 commits from branch develop
• 2cc5ec69 - Merge remote-tracking branch 'origin/develop' into backport-7253

Compare with previous version

mentioned in commit 67e13278

merged