Merge branch 't/generic_match_count'