Several updates to reduce Cloud upgrade time.