Merge branch '426_conf_to_deploy' into 'develop'

426 conf to deploy

See merge request !13
2 jobs for develop in 0 seconds