Config refactor fixes
Merge pull request #280 from qiangdavidliu/2.x

Config refactor fixes