NEB-3814: Puppet's Links