Convert #517246 to NCS