[JBJCA-1153] Implicit enable validate-on-match if possible