Rebased better-config-defaults.patch