Merge pull request #6581 from nupplaphil/config_refact