Merge branch 'ab/wildmatch-tests'