Port the changes done on 5.34 patches branch. Fix stressProof test.