SC-2089: Ellie's Links