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