Forward-port 2.12.10 upgrade script