Convert #623077 to NCS