Merge branch 'feature/1072-muting-notifications' into 'develop'