Merge branch 'hotfix/v1.3.1' into develop