config module
changes to aid config module
Merge remote-tracking branch 'upstream2/master'