Merge pull request #1087 from TheBlueMatt/2021-09-event-backwards-compat-fix