change for GCP-8611