Convert #516231 to NCS