Merge remote-tracking branch 'remotes/origin/main' into ci/self-test-testv-and-bs-proc-updates