ExternalCLIManager.cs changes