[DF-740] - more changes.
Merge remote-tracking branch 'origin/UIEditor' into UIEditor