GCP-6187 Partial Implementation