changes for GCP-7195