GCP-5986 Initial commit