GCP-8524 initial work