Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'