GCP-7937, GCP-7938 initial changes