Merge branch 'main' into ci/interop-test-based-on-self-test