Convert #188315 to NCS