Fix for GCP-5848