Fix GCP-6003