Merge pull request #1004 from TheBlueMatt/2021-07-forward-event