Merge upstream main at 496524ced5 without rewriting published history. Preserve current upstream fixes and retain only the independent feature change in the resulting PR diff. Co-authored-by: Codex <noreply@openai.com>
496524ced5