Merge "Fix pending queue job presence check." into tm-dev