GCP-6967 initial changes