[DF-667], [DF-673], [DF-674] are fixed.
Merge remote-tracking branch 'origin/UIEditor' into UIEditor