Merge remote-tracking branch 'upstream/main' into agent/resolve-pr-1774-conflict