Improve custom config support (closes #10648)