Merge pull request #4158 from solgenomics/topic/sensoryTrialType