[DF-4558] Main changes.
[DF-4558] Fixed after review.
Merge remote-tracking branch 'origin/development' into DF-4558_Control_child_controls_contents_missing_after_redo
Merge remote-tracking branch 'origin/DF-4558_Control_child_controls_contents_missing_after_redo' into development