Forward-port 3.0.2 upgrade script