Merge "Deploment configuration for CLI"