Merge branch 'hotfix/3.3.1.1' into 3.3/develop