Merge remote-tracking branch 'origin/main' into 711-codec-smoke-test-passes-when-test-did-not-run-properly
