Merge Eval::Info fix from master

bench: 4591193