fix for GCP-5510