Re-rolling patch for 7.x-1.x branch.