fix for GCP-8189