Remove duplicate event_reporter directory
Merge branch 'master' into clean_up