[DF-784] issue is fixed - another approach.
Merge remote-tracking branch 'origin/UIEditor' into UIEditor