GCP-6975 removed integration conflicts