Pull in more consistent hash changes code