Merge tag '0.8.4' into development

0.8.4
fix bug
fix bug
Merge branch 'release/0.8.5'