NEB-2535: Mottle's Links