Merge "Try to avoid overlapping job execution." into tm-dev