Merge pull request #19209 from mattwire/daoeventid