Convert #188629 to NCS