EGG-1589: Bastienne's Links