Merge branch 'op_eval'