Merge branch 'ab/perf-wildmatch'