Merge branch 'bugfix/poll-id-as-string' into 'develop'