Merge branch 'bugfix/poll_replies_count' into 'develop'