Merge tag '1.0.4' into develop

Release v1.0.4
Current work checkpoint. See diff for details.
Current work checkpoint. See diff for details.
Composer dependencies updated.
Merge branch 'release/1.0.5'