[NUI] Merge master#1206 to API7 (#1209)