Merge OBA 2.3 into master after release

Catch-all PR for OBA 2.3 release.