Convert #674471 to NCS