Forward port 3.0.9 upgrade script