Merge "Improve evaluate-ahead heuristic" into mnc-dev