Also copying Shard object content, not just create
Merge branch 'master' into resharding
Merge branch 'resharding'