Initial attempt to re-roll patch for 8.2.x branch.