changes for GCP-6768