GCP-8440
GCP-7532
merged