Convert #749338 to NCS