Merge pull request #31486 from saschagrunert/fix-additional-storage-shard