Convert #236597 to NCS