Merge "Bug 2055: Handle shard not initialized resiliently"