DF-798 fix.
Merge remote-tracking branch 'origin/UIEditor' into UIEditor