GCP-8338 to GCP-8342