BRD-7907: Xanti's Links