made tests sharding ready
Merge remote-tracking branch 'origin/devel' into 2.0