Merge branch 'backport/feature-poll-refresh' into 'maint/1.1'