3.3.0 upgrade