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

Merge remote-tracking branch 'origin/main' into sync/upstream-2026-06-21 #26