am 4af8dbed: Merge "Improve evaluate-ahead heuristic" into mnc-dev

* commit '4af8dbed0dd2d1df47da6fc98a43ca34d6f7b351':
  Improve evaluate-ahead heuristic