NEB-3687: Ellero's Links