GCP-8318 partial implementation