Convert #347579 to NCS