Merge pull request #8976 from JosJuice/port-some-settings Port some settings to the new config system
