Merge branch 'release/1.0.4' into production
Merge tag 'v1.0.4'

1.0.4