Merge pull request #2369 from TheBlueMatt/2023-06-mon-event-less-race