[DF-3368] fixed formatting
Merge branch 'origin/framework_0_5_5'