Merge branch 'rb/compat-poll-fix' into maint