Merge origin/main into jif/move-session-ownership

Co-authored-by: Codex <noreply@openai.com>