Fixed logic error
Added test with alternative shard chooser
Merge branch 'DDC-613' into 2.4