Merge pull request #1889 from solgenomics/topic/trait_search