Fix issue with muting.
Merge branch 'hotfix/0.8.5'