Convert #624653 to NCS