changed for GCP-6709