Merge pull request #13284 from aydun/evaluate_fix