Convert #624535 to NCS