GCP-6550 additional fixes