Merge "Fix BP1to2UpgradeTests"