GCP-5957 initial changes