SC-1917: Thomas's Links