Merge "CLI Configuration Standardization"