Convert #736039 to NCS