Convert #624490 to NCS