GCP-5707 + WorkbenchService