GCP-6035 Stub