Convert #617448 to NCS