Convert #338846 to NCS