Convert #236715 to NCS