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