Merge branch 'hotfix/1.3.1' into develop