Fix for special case when event ordering is messed up
Merge branch 'refs/heads/filter-event-order-fix' into updated