Convert #624831 to NCS