PRZ-3536: Peaches's Links