Convert #658352 to NCS