Merge pull request #2557 from solgenomics/topic/solgs/refactor-030719