Fix issue with regular changes not triggering resort
Merge remote-tracking branch 'origin/filter-event-order-fix' into updated