landed the patches that try to fix intermittent failures