Convert #721638 to NCS