Updating patch for 8.2.x branch.
Re-rolled fresh patch as #48 wasn't being ap...