BRD-1932: Giselle's Links