Release v0.8.4
Merge branch 'release/v0.8.4'
Merge tag 'v0.8.4' into develop

v0.8.4