Convert #930628 to NCS