Updating patch as it was not getting applied to recent 8.3.x branch.
Fixing s...