some ocaf stuff#202

Open

ericsink wants to merge 2 commits intobschwind:mainfrom

Commits on Mar 25, 2025

some ocaf stuff
ericsink
committed

Commits on Apr 27, 2025

checkpoint. added some OCAF stuff, then commented out all the OCAF stuff. net actual change from upstream should now be minimal.
ericsink
committed