partial implementation for GCP-4745