GCP-6266 and GCP-6292