Merge branch 'main' into 732-osba-crashes-for-planar-sba