Additional Fix, GCP-6621