Merge release 1.4.0 into master
Backported release 1.4.0 into develop