changes for GCP-7576 and GCP-7604