Release 0.8.7
Merge branch 'release/0.8.7' into develop