PRZ-3531: Mara's Links