Merge branch 'bugfix/exclude-replies' into 'develop'