merging fix for GCP-8246 from release branch