GCP-6628, GCP-6629, GCP-6330