Merge pull request #10818 from TRox1972/criterion_match_id