NEB-3762: Poppy's Links