Merge pull request #10865 from mattwire/CRM-21069_check_eventid