Merge deployConfig with a deployConfig from db in ctl
Merge branch 'deploy-config-db' into devel