Merge branch 'master' into t3_enhancements
ticket:3 rework of tests
Merge branch 't3_enhancements'