Merge "Remove running jobs from pending list." into tm-dev