Merge branch 'hotfix-0.8.2.1'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Bump version to 0.8.6.1