Convert #652369 to NCS