Forward port 2.12.9 upgrade script