fix for GCP-8228