GCP-5956 initial changes