Re-rolling patch for 9.1.x.