Convert #624658 to NCS