Add generalized modifier support to matchUtilities
#9541
+426
−81
Merged