Merge "EventsService authorization refactor"