Mainline 2.0 beta upgrade path