Patch was not being applied to 8.6.x branch. Re-rolling for 8.6.x