Merge pull request #4689 from solgenomics/topic/genotyping_project