Merge branch 'hotfix/3.1.3.1' into 3.1/master