Merge "Fix: Update diff base to match old version history"