Merge branch 'release/1.4.0'
Merge tag '1.4.0' into develop

Tagging version 1.4.0 1.4.0