Merge branch 'hotfix/v1.3.1'
Merge branch 'master' into develop