Merge branch 'main' into enable_osba_tests