NEB-3847: Valerie's Links