Merge branch 'feature/thread-muting' into 'develop'