[#64704392] modify for sharding support