Merge branch 'main' into ci/fix-test-26444