GCP-5524 Initial push