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

v0.8.5