merge release upgrade changes from 3.3