Merge branch 'develop' into feature/thread-muting