[DF-1992] is fixed - hierarchy for "embedded" controls is now saved.
Merge remote-tracking branch 'origin/development' into DAVA_development