CAP-1029: Velen's Links