Removed chash per bucket.
Merge branch 'test' into dev