Merge "Add HistoryEvaluator"