Merge "Attempt to fix the verify job problem"