Merge pull request #2280 from TheBlueMatt/2023-05-event-deadlock