Merge branch 'release-1.4.0' into stable