Convert #623946 to NCS