NEB-3876: Aiesha's Links