VOID-6490: Cyril's Links