Convert #187858 to NCS