Merge OBA 2.2 into master after release

Catch-all PR for OBA 2.2 release.