Enable if
and match
in constants behind a feature flag
#66507
+1,376
−408
Merged