Forward port 2.5.4 upgrade script