[DF-1992] is fixed - hierarchy for "embedded" controls is now saved.