Forward-port 3.2.1 upgrade script