[cfg_match] Generalize inputs
#130313
+25
−5
Merged