SC-2398: Soleil's Links