changes for GCP-7503