GCP-6110 & GCP-6113 Partial Implementation