GCP-7109 aka GCP-7224
GCP-7198