Merge branch 'main' into better-chatgpt-codex-support