Merge "[OOM] Clean up old jobs"