Convert #624871 to NCS