Merge pull request #3008 from solgenomics/topic/design_type