Merge pull request #2287 from TheBlueMatt/2023-05-no-background-event-dup-persist