Merge branch 'muting' into 'develop'