Convert #264620 to NCS