Merged current master version of EvaluatorManager