Merge branch 'main' into 930-missing-test-case-for-osba-with-planar-foa-hoa-input