CAP-1680: Dahlia's Links