Forward-port 3.5.0 upgrade script