ADVENT-1860: Shivarra's Links