GCP-8559 (initial)