Merge branch 'develop' into 'hide-muted-reactions'