Integrate and fix contributor PRs #865, #868, #869, #870#875

SawyerHood merged 13 commits into

mainymichael/bb:mainfrom

integration/contributor-pr-fixesymichael/bb:integration/contributor-pr-fixesCopy head branch name to clipboard