Merge "Remove cancelled job from evaluation list." into tm-dev