Handle rolling data upgrades with grace