[DF-677] fix - Win32.
Merge remote-tracking branch 'origin/UIEditor' into UIEditor