GCP-6918 bugfixes