Forward Port 3.4.1 to 3.4.2 upgrade script