Convert #725129 to NCS