rc2 evaluator fixes - 2

9 jobs for master