Forward-port 2.12.3 upgrade script