Improve docs for helper method
Merge branch 'bugid-18355-polls-cleanup' into dev