Patched ported from 1.5 to 1.4 for hashing enhancements.
Update the patch so that it applies correctly on latest.