changed for GCP-7503