Merge branch '2239-mute-fixes' into 'develop'