Convert #264628 to NCS