Forward-port 2.11.2 Upgrade Script