Merge branch 'master' into simplify_eval