Merge pull request #10817 from TRox1972/clubic_match_id