[DF-2706] refactoring
[DF-2707] refactoring
[DF-2706] doc added
Merge branch 'origin/framework_0_5_5_2706_2707_3069_refactor'