Merge branch 'eval-code'