Forward-port 2.6.0 version upgrade script