[NUI] Merge mater#1206 to API6 (#1208)