PRZ-1631: Amatista's Links