Small fix
Merge branch 'hotfix/v0.0.8.3a'
Release v0.8.4
Merge branch 'release/v0.8.4'
Merge tag 'v0.8.4' into develop

v0.8.4