Code cleaning for config management
Merge branch 'develop' into user