2.5 Upgrade and Migration