Merge pull request #15010 from eileenmcnaughton/event_inv