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