Convert #725638 to NCS