Merge pull request #3204 from solgenomics/topic/solgs/fix-01220