GCP-GCP-8461, GCP-8462 fix header