GCP-6550 for traits table