Merge branch 'main' into 948-extend-coverage-by-appending-short-test-vectors-stereo