Merge work on event filtering from master.