Merge pull request #2619 from solgenomics/topic/new_cross_type