change blp to retry indefinitely on EOF
Merge branch 'resharding'