inject octopus_shard in non-sharding cases as well