Convert #736221 to NCS