Fixes #8333 - correct matcher values with multi-key matchers
(cherry picked from commit a3d8204a4d7d2eb7355c149d602aa43e8de8aff4)
Fixes #8333 - correct matcher values with multi-key matchers
(cherry picked from commit a3d8204a4d7d2eb7355c149d602aa43e8de8aff4)