Merge remote-tracking branch 'origin/main' into sync/upstream-2026-06…

Merge remote-tracking branch 'origin/main' into sync/upstream-2026-06… #29