Merge pull request #1749 from entireio/fix/review-interactive-codex-regressions