[DF-2707][DF-2706] fixes for review
Merge branch 'origin/framework_0_5_5'
[DF-2707][DF-2706] fixes for review
Merge branch 'origin/framework_0_5_5'