Merge pull request #2199 from tnull/2023-04-fix-async-event-processing