Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint