Merge branch 'master' into eval-code