Merge "Filter Event classes"