fix for GCP-8293