Merge branch 'bugfix/muted-user-notif-streaming' into 'develop'