Merge pull request #11692 from neheb/evt2