Merge "Fix MixMatchCriterion conversion from native side" into main