Refactoring config helper
Merge branch 'master' into develop