Re-rolled patch for 10.1.x. Please review