PRZ-2982: Ygor's Links