Merge pull request #10658 from neheb/evt