Merge branch 'hotfix/3.1.1'