Regex support

Is the es/upstream change by intent?