[NUI] Merge master#1199 to API7 (#1205)