Merge remote-tracking branch 'origin/main' into ci/fix-long-test-end-check