GCP-5518 Partial Implementation