Add config version control
Add config version control
Solve merge conflicts
Create stable version
Merge branch 'master' into develop