Forward Port 3.6.3 Upgrade Script