GDMS: GCP-8338 to GCP-8342, GCP-8348 to GCP-8353, GCP-8377