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