GCP-6979
GCP-6227