NEB-3562: Thomas's Links