PRZ-1189: Lukas's Links