Merge pull request #21374 from ufundo/event-custom-tokens