GCP-7986 and GCP-7989