GCP-5536 - return