Convert #721674 to NCS