BRD-4176: Octavius's Links