GCP-6991 and GCP-6992