Merge pull request #2624 from solgenomics/topic/genotype_storage_nd_protocolprop