GCP-7265 style