Convert #351535 to NCS