Add a stats-based pre-filter to the generic filtering
Merge branch 'master' into filtershortcut
Match removed ght test