[DF-185] Merge cherry-pick
[DF-2684] - copying for subcontrols is disabled.
Merge branch 'DAVA/development'