NEB-3672: Bassil's Links