Merge branch 'release/v0.8.4' into develop
unpack=true
Bump up the version number to v0.8.5
Merge branch 'release/v0.8.5'