GCP-6246 initial changes