changes for GCP-7633