Merge branch 'openapi/polls' into 'develop'