Release 2.2.40 upgrade