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