Convert #624638 to NCS