Merge branch 'poll-notification' into 'develop'