Version 1.4.0
Merge branch 'release_1.4.0' into release
Merge branch 'release' into dev