Code

Merge branch 'ab/compat-regex'