NEB-3718: Aden's Links