Merge branch 'main' into ci/restrict-osba-complexity-runs-to-hoa3