Merge branch 'rj/compat-regex-size-max-fix' into maint