partial implementation for GCP-6109