Merge branch 'main' into 1178-add-ltv-to-sba-test-long-self-test-and-sanitizer-tests