Convert #641386 to NCS