fix for GCP-8386