Merge remote-tracking branch 'origin/pr/798' into codex/weekly-triage-20260829