GC Storage Sharding support (#10406)