326 - refactoring config files update into a library
Merge remote-tracking branch 'origin/master'