BRD-8316: Nai's Links