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