Forward-port 3.3.4 upgrade script