GCP-6162 labeling updates