Merge pull request #206 from youtube/resharding

Resharding