Convert #517719 to NCS