Merge branch 'ab/aix-needs-compat-regex' into maint