Merge branch 'rs/compat-strdup' into maint