Merge tag '0.8.6' into development

0.8.6
fix bug
Merge branch 'release/0.8.7'