Merge branch 'feature/poll-refresh' into 'develop'