Merge branch 'feature/exclude-replies-filter' into 'develop'