Convert #116244 to NCS