Bugfix 6901 to dev by sys

assigned to @roman.khlopkov

added 3 commits

• 72973237...98572a94 - 2 commits from branch develop
• a1246fdf - Merge branch 'develop' into bugfix-6901-to-dev-bySYS

Compare with previous version

mentioned in commit 7e37414d

merged