NEB-3856: Valentino's Links