changes for GCP-7017