fix config.set
Merge branch 'hotfix.configSet'
Merge branch 'master' into develop