Using ConfigHelper from dev
Merge branch 'master' into develop