Last patch failed to apply re-rolling for 9.1.x , kindly review.