Merge pull request #15515 from eileenmcnaughton/event_flow