Merge branch 'features/poll-validation' into 'develop'