Merge "Fix starting job logging." into tm-dev