I have re-rolled the patch for 10.1.x, Please review.