Shanghai/Capella upgrade