Merge branch 'hotfix/0.8.6'