Merge branch 'release/0.8.7'
Merge tag '0.8.7' into development

0.8.7