initial work for GCP-7832