Merge branch 'hotfix/3.2.2.1' into 3.2/master