2.3.4 upgrade