Convert #369179 to NCS