[DF-348] UI Editor. Fixed DF-655.
Merge remote-tracking branch 'refs/remotes/origin/UIEditor' into UIEditor