2.4.0 upgrade