Merge "Correctly check expired jobs against active ones"