Resolve #3622557 "Changed token"

Dan Lobellerequested to merge
issue/recurring_events-3622557:3622557-changed-token into 3.0.x

Closes #3622557

Merge request reports