Convert #363829 to NCS