changes for GCP-5926