Merge pull request #4073 from solgenomics/topic/fix_another_type_id_issue