Merge tag 'v1.4.0'

1.4.0
Fix failing tests
v1.4.1
Merge branch 'release/1.4.1' into production