Merge tag '0.8.5' into development

0.8.5
fix bug
Merge branch 'release/0.8.6'