Merge "Stop tracking ghost jobs." into tm-dev