Convert #721336 to NCS