GCP-8180 (improvement)