1.0.4 release readiness
Merge branch 'releases/1.0.4'

1.0.4 release