Merge branch 'hotfix/1.3' into develop
hotfix informal
Merge branch 'release/1.3.1'