deployment configuration
Merge branch 'deploy_configuration'