Convert #624843 to NCS