Merge "Stop the actual job in question." into tm-dev