Merge "Introducing ShardManager"