Merge branch 'hotfix/v3.1.3'
Merge branch 'master' into develop