Merge branch 'master' of https://github.com/flarss/repo4
fixes for task 16761
Merge remote-tracking branch 'origin/master'