SC-2343: Leon's Links