WHY
We need to merge the feature branch into the master branch to ship OBO support.

WHAT
Rebase the feature branch off of master, resolving any conflicts along the way. Make sure to test the rebased feature branch before force pushing. After force pushing, open a PR to merge into master.

HOW
<Suggestions for how this may be solved. [Optional]

TESTS
<List of related tests>

DONE

• Rebased feature branch off of master branch
• Tested rebased feature branch to confirm everything still works
• Force pushed changes and created a PR to merge into master