BRD-1883: Fitz's Links