Convert #351384 to NCS