Merge branch 'develop' into release-1.3
Merge branch 'release-1.3' for 1.3.1