Giant merge-in from previous offline solutions