fix for GCP-6291