Merge pull request #16957 from MHBauer/eventsservice-refactor

refactor access to daemon member EventsService