Convert #118367 to NCS