Merge pull request #2937 from solgenomics/topic/fix-bugs-brapi