BugId:18355 - Cleanup of polls handling in parser
Merge branch 'bugid-18355-polls-cleanup' into dev