Merge branch 'jk/rebase-interative-eval-fix' into maint