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

0.8.4