Merge branch 'feature/voters-count' into 'develop'