Convert #721681 to NCS