Fixes.
Merge remote-tracking branch 'origin/backend-refactor' into sanitize-event-names