Convert #871736 to NCS