diff --git a/src/main/java/redis/clients/jedis/ClusterCommandObjects.java b/src/main/java/redis/clients/jedis/ClusterCommandObjects.java
index 7e2e026c79..c218f76877 100644
--- a/src/main/java/redis/clients/jedis/ClusterCommandObjects.java
+++ b/src/main/java/redis/clients/jedis/ClusterCommandObjects.java
@@ -4,19 +4,11 @@
 import static redis.clients.jedis.Protocol.Command.SCAN;
 import static redis.clients.jedis.Protocol.Keyword.TYPE;
 
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import redis.clients.jedis.commands.ProtocolCommand;
 import redis.clients.jedis.params.ScanParams;
 import redis.clients.jedis.resps.ScanResult;
-import redis.clients.jedis.search.IndexOptions;
-import redis.clients.jedis.search.Query;
-import redis.clients.jedis.search.Schema;
-import redis.clients.jedis.search.SearchResult;
-import redis.clients.jedis.search.aggr.AggregationBuilder;
-import redis.clients.jedis.search.aggr.AggregationResult;
 import redis.clients.jedis.util.JedisClusterHashTag;
 
 public class ClusterCommandObjects extends CommandObjects {
@@ -105,127 +97,4 @@ public final CommandObject<ScanResult<byte[]>> scan(byte[] cursor, ScanParams pa
   public final CommandObject<Long> waitReplicas(int replicas, long timeout) {
     throw new UnsupportedOperationException(CLUSTER_UNSUPPORTED_MESSAGE);
   }
-
-  // RediSearch commands
-  // TODO: Send RediSearch command to random 'master' node or random hashslot.
-//  boolean searchLite = false;
-
-  private <T> CommandObject<T> processSearchCommand(String indexName, CommandObject<T> command) {
-//    if (searchLite) command.getArguments().processKey(indexName);
-    command.getArguments().processKey(indexName);
-    return command;
-  }
-
-  @Override
-  public final CommandObject<String> ftCreate(String indexName, IndexOptions indexOptions, Schema schema) {
-    return processSearchCommand(indexName, super.ftCreate(indexName, indexOptions, schema));
-  }
-
-  @Override
-  public final CommandObject<String> ftAlter(String indexName, Schema schema) {
-    return processSearchCommand(indexName, super.ftAlter(indexName, schema));
-  }
-
-  @Override
-  public final CommandObject<SearchResult> ftSearch(String indexName, Query query) {
-    return processSearchCommand(indexName, super.ftSearch(indexName, query));
-  }
-
-  @Override
-  public final CommandObject<SearchResult> ftSearch(byte[] indexName, Query query) {
-    CommandObject<SearchResult> command = super.ftSearch(indexName, query);
-//    if (searchLite) command.getArguments().processKey(indexName);
-    command.getArguments().processKey(indexName);
-    return command;
-  }
-
-  @Override
-  public CommandObject<String> ftExplain(String indexName, Query query) {
-    return processSearchCommand(indexName, super.ftExplain(indexName, query));
-  }
-
-  @Override
-  public CommandObject<List<String>> ftExplainCLI(String indexName, Query query) {
-    return processSearchCommand(indexName, super.ftExplainCLI(indexName, query));
-  }
-
-  @Override
-  public CommandObject<AggregationResult> ftAggregate(String indexName, AggregationBuilder aggr) {
-    return processSearchCommand(indexName, super.ftAggregate(indexName, aggr));
-  }
-
-  @Override
-  public CommandObject<AggregationResult> ftCursorRead(String indexName, long cursorId, int count) {
-    return processSearchCommand(indexName, super.ftCursorRead(indexName, cursorId, count));
-  }
-
-  @Override
-  public CommandObject<String> ftCursorDel(String indexName, long cursorId) {
-    return processSearchCommand(indexName, super.ftCursorDel(indexName, cursorId));
-  }
-
-  @Override
-  public CommandObject<String> ftDropIndex(String indexName) {
-    return processSearchCommand(indexName, super.ftDropIndex(indexName));
-  }
-
-  @Override
-  public CommandObject<String> ftDropIndexDD(String indexName) {
-    return processSearchCommand(indexName, super.ftDropIndexDD(indexName));
-  }
-
-  @Override
-  public CommandObject<String> ftSynUpdate(String indexName, String synonymGroupId, String... terms) {
-    return processSearchCommand(indexName, super.ftSynUpdate(indexName, synonymGroupId, terms));
-  }
-
-  @Override
-  public CommandObject<Map<String, List<String>>> ftSynDump(String indexName) {
-    return processSearchCommand(indexName, super.ftSynDump(indexName));
-  }
-
-  @Override
-  public CommandObject<Map<String, Object>> ftInfo(String indexName) {
-    return processSearchCommand(indexName, super.ftInfo(indexName));
-  }
-
-  @Override
-  public CommandObject<Set<String>> ftTagVals(String indexName, String fieldName) {
-    return processSearchCommand(indexName, super.ftTagVals(indexName, fieldName));
-  }
-
-  @Override
-  public CommandObject<String> ftAliasAdd(String aliasName, String indexName) {
-//    CommandObject<String> command = super.ftAliasAdd(aliasName, indexName);
-//    if (searchLite) command.getArguments().processKey(aliasName).processKey(indexName);
-//    return command;
-    return processSearchCommand(indexName, super.ftAliasAdd(aliasName, indexName));
-  }
-
-  @Override
-  public CommandObject<String> ftAliasUpdate(String aliasName, String indexName) {
-//    CommandObject<String> command = super.ftAliasUpdate(aliasName, indexName);
-//    if (searchLite) command.getArguments().processKey(aliasName).processKey(indexName);
-//    return command;
-    return processSearchCommand(indexName, super.ftAliasUpdate(aliasName, indexName));
-  }
-
-  @Override
-  public CommandObject<String> ftAliasDel(String aliasName) {
-//    CommandObject<String> command = super.ftAliasDel(aliasName);
-//    if (searchLite) command.getArguments().processKey(aliasName);
-//    return command;
-    return processSearchCommand(aliasName, super.ftAliasDel(aliasName));
-  }
-
-  @Override
-  public CommandObject<Map<String, String>> ftConfigGet(String indexName, String option) {
-    return processSearchCommand(indexName, super.ftConfigGet(indexName, option));
-  }
-
-  @Override
-  public CommandObject<String> ftConfigSet(String indexName, String option, String value) {
-    return processSearchCommand(indexName, super.ftConfigSet(indexName, option, value));
-  }
-  // RediSearch commands
 }
diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java
index 0f52726184..7091316af8 100644
--- a/src/main/java/redis/clients/jedis/CommandObjects.java
+++ b/src/main/java/redis/clients/jedis/CommandObjects.java
@@ -35,6 +35,12 @@ public class CommandObjects {
 
   private volatile JsonObjectMapper jsonObjectMapper;
 
+  private JedisBroadcastAndRoundRobinConfig broadcastAndRoundRobinConfig = null;
+
+  void setBroadcastAndRoundRobinConfig(JedisBroadcastAndRoundRobinConfig config) {
+    this.broadcastAndRoundRobinConfig = config;
+  }
+
   protected CommandArguments commandArguments(ProtocolCommand command) {
     return new CommandArguments(command);
   }
@@ -3120,14 +3126,36 @@ public final CommandObject<Long> publish(byte[] channel, byte[] message) {
   // Miscellaneous commands
 
   // RediSearch commands
-  public CommandObject<String> ftCreate(String indexName, IndexOptions indexOptions, Schema schema) {
+  private boolean isRoundRobinSearchCommand() {
+    if (broadcastAndRoundRobinConfig == null) {
+      return true;
+    } else if (broadcastAndRoundRobinConfig.getRediSearchModeInCluster() == JedisBroadcastAndRoundRobinConfig.RediSearchMode.LIGHT) {
+      return false;
+    }
+    return true;
+  }
+
+  private CommandArguments checkAndRoundRobinSearchCommand(CommandArguments commandArguments, String indexName) {
+    return isRoundRobinSearchCommand() ? commandArguments.add(indexName) : commandArguments.key(indexName);
+  }
+
+  private CommandArguments checkAndRoundRobinSearchCommand(CommandArguments commandArguments, byte[] indexName) {
+    return isRoundRobinSearchCommand() ? commandArguments.add(indexName) : commandArguments.key(indexName);
+  }
+
+  private <T> CommandObject<T> directSearchCommand(CommandObject<T> object, String indexName) {
+    object.getArguments().processKey(indexName);
+    return object;
+  }
+
+  public final CommandObject<String> ftCreate(String indexName, IndexOptions indexOptions, Schema schema) {
     CommandArguments args = commandArguments(SearchCommand.CREATE).add(indexName)
         .addParams(indexOptions).add(SearchKeyword.SCHEMA);
     schema.fields.forEach(field -> args.addParams(field));
     return new CommandObject<>(args, BuilderFactory.STRING);
   }
 
-  public CommandObject<String> ftCreate(String indexName, FTCreateParams createParams,
+  public final CommandObject<String> ftCreate(String indexName, FTCreateParams createParams,
       Iterable<SchemaField> schemaFields) {
     CommandArguments args = commandArguments(SearchCommand.CREATE).add(indexName)
         .addParams(createParams).add(SearchKeyword.SCHEMA);
@@ -3135,111 +3163,119 @@ public CommandObject<String> ftCreate(String indexName, FTCreateParams createPar
     return new CommandObject<>(args, BuilderFactory.STRING);
   }
 
-  public CommandObject<String> ftAlter(String indexName, Schema schema) {
+  public final CommandObject<String> ftAlter(String indexName, Schema schema) {
     CommandArguments args = commandArguments(SearchCommand.ALTER).add(indexName)
         .add(SearchKeyword.SCHEMA).add(SearchKeyword.ADD);
     schema.fields.forEach(field -> args.addParams(field));
     return new CommandObject<>(args, BuilderFactory.STRING);
   }
 
-  public CommandObject<String> ftAlter(String indexName, Iterable<SchemaField> schemaFields) {
+  public final CommandObject<String> ftAlter(String indexName, Iterable<SchemaField> schemaFields) {
     CommandArguments args = commandArguments(SearchCommand.ALTER).add(indexName)
         .add(SearchKeyword.SCHEMA).add(SearchKeyword.ADD);
     schemaFields.forEach(field -> args.addParams(field));
     return new CommandObject<>(args, BuilderFactory.STRING);
   }
 
-  public CommandObject<SearchResult> ftSearch(String indexName, String query) {
-    return new CommandObject<>(commandArguments(SearchCommand.SEARCH).add(indexName).add(query),
+  public final CommandObject<SearchResult> ftSearch(String indexName, String query) {
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SEARCH), indexName).add(query),
         new SearchResultBuilder(true, false, false, true));
   }
 
-  public CommandObject<SearchResult> ftSearch(String indexName, String query, FTSearchParams params) {
-    return new CommandObject<>(commandArguments(SearchCommand.SEARCH).add(indexName).add(query).addParams(params),
-        new SearchResultBuilder(!params.getNoContent(), params.getWithScores(), false, true));
+  public final CommandObject<SearchResult> ftSearch(String indexName, String query, FTSearchParams params) {
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SEARCH), indexName)
+        .add(query).addParams(params), new SearchResultBuilder(!params.getNoContent(), params.getWithScores(), false, true));
   }
 
-  public CommandObject<SearchResult> ftSearch(String indexName, Query query) {
-    return new CommandObject<>(commandArguments(SearchCommand.SEARCH).add(indexName).addParams(query),
+  public final CommandObject<SearchResult> ftSearch(String indexName, Query query) {
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SEARCH), indexName).addParams(query),
         new SearchResultBuilder(!query.getNoContent(), query.getWithScores(), query.getWithPayloads(), true));
   }
 
-  public CommandObject<SearchResult> ftSearch(byte[] indexName, Query query) {
-    return new CommandObject<>(commandArguments(SearchCommand.SEARCH).add(indexName).addParams(query),
+  public final CommandObject<SearchResult> ftSearch(byte[] indexName, Query query) {
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SEARCH), indexName).addParams(query),
         new SearchResultBuilder(!query.getNoContent(), query.getWithScores(), query.getWithPayloads(), false));
   }
 
-  public CommandObject<String> ftExplain(String indexName, Query query) {
-    return new CommandObject<>(commandArguments(SearchCommand.EXPLAIN).add(indexName).addParams(query), BuilderFactory.STRING);
+  public final CommandObject<String> ftExplain(String indexName, Query query) {
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.EXPLAIN), indexName)
+        .addParams(query), BuilderFactory.STRING);
   }
 
-  public CommandObject<List<String>> ftExplainCLI(String indexName, Query query) {
-    return new CommandObject<>(commandArguments(SearchCommand.EXPLAINCLI).add(indexName).addParams(query), BuilderFactory.STRING_LIST);
+  public final CommandObject<List<String>> ftExplainCLI(String indexName, Query query) {
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.EXPLAINCLI), indexName)
+        .addParams(query), BuilderFactory.STRING_LIST);
   }
 
-  public CommandObject<AggregationResult> ftAggregate(String indexName, AggregationBuilder aggr) {
-    return new CommandObject<>(commandArguments(SearchCommand.AGGREGATE).add(indexName).addObjects(aggr.getArgs()),
-        !aggr.isWithCursor() ? SearchBuilderFactory.SEARCH_AGGREGATION_RESULT : SearchBuilderFactory.SEARCH_AGGREGATION_RESULT_WITH_CURSOR);
+  public final CommandObject<AggregationResult> ftAggregate(String indexName, AggregationBuilder aggr) {
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.AGGREGATE), indexName)
+        .addObjects(aggr.getArgs()), !aggr.isWithCursor() ? SearchBuilderFactory.SEARCH_AGGREGATION_RESULT
+        : SearchBuilderFactory.SEARCH_AGGREGATION_RESULT_WITH_CURSOR);
   }
 
-  public CommandObject<AggregationResult> ftCursorRead(String indexName, long cursorId, int count) {
+  public final CommandObject<AggregationResult> ftCursorRead(String indexName, long cursorId, int count) {
     return new CommandObject<>(commandArguments(SearchCommand.CURSOR).add(SearchKeyword.READ)
-        .add(indexName).add(cursorId).add(SearchKeyword.COUNT).add(count), SearchBuilderFactory.SEARCH_AGGREGATION_RESULT_WITH_CURSOR);
+        .add(indexName).add(cursorId).add(SearchKeyword.COUNT).add(count),
+        SearchBuilderFactory.SEARCH_AGGREGATION_RESULT_WITH_CURSOR);
   }
 
-  public CommandObject<String> ftCursorDel(String indexName, long cursorId) {
+  public final CommandObject<String> ftCursorDel(String indexName, long cursorId) {
     return new CommandObject<>(commandArguments(SearchCommand.CURSOR).add(SearchKeyword.DEL)
         .add(indexName).add(cursorId), BuilderFactory.STRING);
   }
 
-  public CommandObject<Map.Entry<AggregationResult, Map<String, Object>>> ftProfileAggregate(
+  public final CommandObject<Map.Entry<AggregationResult, Map<String, Object>>> ftProfileAggregate(
       String indexName, FTProfileParams profileParams, AggregationBuilder aggr) {
-    return new CommandObject<>(commandArguments(SearchCommand.PROFILE).add(indexName)
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.PROFILE), indexName)
         .add(SearchKeyword.AGGREGATE).addParams(profileParams).add(SearchKeyword.QUERY)
         .addObjects(aggr.getArgs()), new SearchProfileResponseBuilder<>(!aggr.isWithCursor()
             ? SearchBuilderFactory.SEARCH_AGGREGATION_RESULT
             : SearchBuilderFactory.SEARCH_AGGREGATION_RESULT_WITH_CURSOR));
   }
 
-  public CommandObject<Map.Entry<SearchResult, Map<String, Object>>> ftProfileSearch(
+  public final CommandObject<Map.Entry<SearchResult, Map<String, Object>>> ftProfileSearch(
       String indexName, FTProfileParams profileParams, Query query) {
-    return new CommandObject<>(commandArguments(SearchCommand.PROFILE).add(indexName)
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.PROFILE), indexName)
         .add(SearchKeyword.SEARCH).addParams(profileParams).add(SearchKeyword.QUERY)
         .addParams(query), new SearchProfileResponseBuilder<>(new SearchResultBuilder(
             !query.getNoContent(), query.getWithScores(), query.getWithPayloads(), true)));
   }
 
-  public CommandObject<Map.Entry<SearchResult, Map<String, Object>>> ftProfileSearch(
+  public final CommandObject<Map.Entry<SearchResult, Map<String, Object>>> ftProfileSearch(
       String indexName, FTProfileParams profileParams, String query, FTSearchParams searchParams) {
-    return new CommandObject<>(commandArguments(SearchCommand.PROFILE).add(indexName)
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.PROFILE), indexName)
         .add(SearchKeyword.SEARCH).addParams(profileParams).add(SearchKeyword.QUERY).add(query)
         .addParams(searchParams), new SearchProfileResponseBuilder<>(new SearchResultBuilder(
             !searchParams.getNoContent(), searchParams.getWithScores(), false, true)));
   }
 
-  public CommandObject<String> ftDropIndex(String indexName) {
+  public final CommandObject<String> ftDropIndex(String indexName) {
     return new CommandObject<>(commandArguments(SearchCommand.DROPINDEX).add(indexName), BuilderFactory.STRING);
   }
 
-  public CommandObject<String> ftDropIndexDD(String indexName) {
-    return new CommandObject<>(commandArguments(SearchCommand.DROPINDEX).add(indexName).add(SearchKeyword.DD), BuilderFactory.STRING);
+  public final CommandObject<String> ftDropIndexDD(String indexName) {
+    return new CommandObject<>(commandArguments(SearchCommand.DROPINDEX).add(indexName).add(SearchKeyword.DD),
+        BuilderFactory.STRING);
   }
 
-  public CommandObject<String> ftSynUpdate(String indexName, String synonymGroupId, String... terms) {
-    return new CommandObject<>(commandArguments(SearchCommand.SYNUPDATE).add(indexName)
+  public final CommandObject<String> ftSynUpdate(String indexName, String synonymGroupId, String... terms) {
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SYNUPDATE), indexName)
         .add(synonymGroupId).addObjects((Object[]) terms), BuilderFactory.STRING);
   }
 
-  public CommandObject<Map<String, List<String>>> ftSynDump(String indexName) {
-    return new CommandObject<>(commandArguments(SearchCommand.SYNDUMP).add(indexName), SearchBuilderFactory.SEARCH_SYNONYM_GROUPS);
+  public final CommandObject<Map<String, List<String>>> ftSynDump(String indexName) {
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SYNDUMP), indexName),
+        SearchBuilderFactory.SEARCH_SYNONYM_GROUPS);
   }
 
   public final CommandObject<Long> ftDictAdd(String dictionary, String... terms) {
-    return new CommandObject<>(commandArguments(SearchCommand.DICTADD).add(dictionary).addObjects((Object[]) terms), BuilderFactory.LONG);
+    return new CommandObject<>(commandArguments(SearchCommand.DICTADD).add(dictionary).addObjects((Object[]) terms),
+        BuilderFactory.LONG);
   }
 
   public final CommandObject<Long> ftDictDel(String dictionary, String... terms) {
-    return new CommandObject<>(commandArguments(SearchCommand.DICTDEL).add(dictionary).addObjects((Object[]) terms), BuilderFactory.LONG);
+    return new CommandObject<>(commandArguments(SearchCommand.DICTDEL).add(dictionary).addObjects((Object[]) terms),
+        BuilderFactory.LONG);
   }
 
   public final CommandObject<Set<String>> ftDictDump(String dictionary) {
@@ -3247,45 +3283,47 @@ public final CommandObject<Set<String>> ftDictDump(String dictionary) {
   }
 
   public final CommandObject<Long> ftDictAddBySampleKey(String indexName, String dictionary, String... terms) {
-    return addProcessKey(ftDictAdd(dictionary, terms), indexName);
+    return directSearchCommand(ftDictAdd(dictionary, terms), indexName);
   }
 
   public final CommandObject<Long> ftDictDelBySampleKey(String indexName, String dictionary, String... terms) {
-    return addProcessKey(ftDictDel(dictionary, terms), indexName);
+    return directSearchCommand(ftDictDel(dictionary, terms), indexName);
   }
 
   public final CommandObject<Set<String>> ftDictDumpBySampleKey(String indexName, String dictionary) {
-    return addProcessKey(ftDictDump(dictionary), indexName);
+    return directSearchCommand(ftDictDump(dictionary), indexName);
   }
 
   public final CommandObject<Map<String, Map<String, Double>>> ftSpellCheck(String index, String query) {
-    return new CommandObject<>(commandArguments(SearchCommand.SPELLCHECK).key(index).add(query),
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SPELLCHECK), index).add(query),
         SearchBuilderFactory.SEARCH_SPELLCHECK_RESPONSE);
   }
 
   public final CommandObject<Map<String, Map<String, Double>>> ftSpellCheck(String index, String query,
       FTSpellCheckParams spellCheckParams) {
-    return new CommandObject<>(commandArguments(SearchCommand.SPELLCHECK).key(index).add(query)
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SPELLCHECK), index).add(query)
         .addParams(spellCheckParams), SearchBuilderFactory.SEARCH_SPELLCHECK_RESPONSE);
   }
 
-  public CommandObject<Map<String, Object>> ftInfo(String indexName) {
-    return new CommandObject<>(commandArguments(SearchCommand.INFO).add(indexName), BuilderFactory.ENCODED_OBJECT_MAP);
+  public final CommandObject<Map<String, Object>> ftInfo(String indexName) {
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.INFO), indexName),
+        BuilderFactory.ENCODED_OBJECT_MAP);
   }
 
-  public CommandObject<Set<String>> ftTagVals(String indexName, String fieldName) {
-    return new CommandObject<>(commandArguments(SearchCommand.TAGVALS).add(indexName).add(fieldName), BuilderFactory.STRING_SET);
+  public final CommandObject<Set<String>> ftTagVals(String indexName, String fieldName) {
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.TAGVALS), indexName)
+        .add(fieldName), BuilderFactory.STRING_SET);
   }
 
-  public CommandObject<String> ftAliasAdd(String aliasName, String indexName) {
+  public final CommandObject<String> ftAliasAdd(String aliasName, String indexName) {
     return new CommandObject<>(commandArguments(SearchCommand.ALIASADD).add(aliasName).add(indexName), BuilderFactory.STRING);
   }
 
-  public CommandObject<String> ftAliasUpdate(String aliasName, String indexName) {
+  public final CommandObject<String> ftAliasUpdate(String aliasName, String indexName) {
     return new CommandObject<>(commandArguments(SearchCommand.ALIASUPDATE).add(aliasName).add(indexName), BuilderFactory.STRING);
   }
 
-  public CommandObject<String> ftAliasDel(String aliasName) {
+   public final CommandObject<String> ftAliasDel(String aliasName) {
     return new CommandObject<>(commandArguments(SearchCommand.ALIASDEL).add(aliasName), BuilderFactory.STRING);
   }
 
@@ -3293,16 +3331,16 @@ public final CommandObject<Map<String, String>> ftConfigGet(String option) {
     return new CommandObject<>(commandArguments(SearchCommand.CONFIG).add(SearchKeyword.GET).add(option), BuilderFactory.STRING_MAP_FROM_PAIRS);
   }
 
-  public CommandObject<Map<String, String>> ftConfigGet(String indexName, String option) {
-    return ftConfigGet(option);
+  public final CommandObject<Map<String, String>> ftConfigGet(String indexName, String option) {
+    return directSearchCommand(ftConfigGet(option), indexName);
   }
 
   public final CommandObject<String> ftConfigSet(String option, String value) {
     return new CommandObject<>(commandArguments(SearchCommand.CONFIG).add(SearchKeyword.SET).add(option).add(value), BuilderFactory.STRING);
   }
 
-  public CommandObject<String> ftConfigSet(String indexName, String option, String value) {
-    return ftConfigSet(option, value);
+  public final CommandObject<String> ftConfigSet(String indexName, String option, String value) {
+    return directSearchCommand(ftConfigSet(option, value), indexName);
   }
 
   public final CommandObject<Long> ftSugAdd(String key, String string, double score) {
@@ -4229,9 +4267,4 @@ private CommandArguments addGeoCoordinateFlatMapArgs(CommandArguments args, Map<
     }
     return args;
   }
-
-  private <T> CommandObject<T> addProcessKey(CommandObject<T> object, String sampleKey) {
-    object.getArguments().processKey(sampleKey);
-    return object;
-  }
 }
diff --git a/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java b/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
index 6cd2c26ce8..d30370887b 100644
--- a/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
+++ b/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
@@ -3422,21 +3422,25 @@ public Response<AggregationResult> ftAggregate(String indexName, AggregationBuil
   }
 
   @Override
+  @Deprecated
   public Response<AggregationResult> ftCursorRead(String indexName, long cursorId, int count) {
     return appendCommand(commandObjects.ftCursorRead(indexName, cursorId, count));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftCursorDel(String indexName, long cursorId) {
     return appendCommand(commandObjects.ftCursorDel(indexName, cursorId));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftDropIndex(String indexName) {
     return appendCommand(commandObjects.ftDropIndex(indexName));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftDropIndexDD(String indexName) {
     return appendCommand(commandObjects.ftDropIndexDD(indexName));
   }
@@ -3502,16 +3506,19 @@ public Response<Set<String>> ftTagVals(String indexName, String fieldName) {
   }
 
   @Override
+  @Deprecated
   public Response<String> ftAliasAdd(String aliasName, String indexName) {
     return appendCommand(commandObjects.ftAliasAdd(aliasName, indexName));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftAliasUpdate(String aliasName, String indexName) {
     return appendCommand(commandObjects.ftAliasUpdate(aliasName, indexName));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftAliasDel(String aliasName) {
     return appendCommand(commandObjects.ftAliasDel(aliasName));
   }
diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java
index 9ebdf38909..00cc6b14fd 100644
--- a/src/main/java/redis/clients/jedis/Pipeline.java
+++ b/src/main/java/redis/clients/jedis/Pipeline.java
@@ -3373,21 +3373,25 @@ public Response<AggregationResult> ftAggregate(String indexName, AggregationBuil
   }
 
   @Override
+  @Deprecated
   public Response<AggregationResult> ftCursorRead(String indexName, long cursorId, int count) {
     return appendCommand(commandObjects.ftCursorRead(indexName, cursorId, count));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftCursorDel(String indexName, long cursorId) {
     return appendCommand(commandObjects.ftCursorDel(indexName, cursorId));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftDropIndex(String indexName) {
     return appendCommand(commandObjects.ftDropIndex(indexName));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftDropIndexDD(String indexName) {
     return appendCommand(commandObjects.ftDropIndexDD(indexName));
   }
@@ -3453,16 +3457,19 @@ public Response<Set<String>> ftTagVals(String indexName, String fieldName) {
   }
 
   @Override
+  @Deprecated
   public Response<String> ftAliasAdd(String aliasName, String indexName) {
     return appendCommand(commandObjects.ftAliasAdd(aliasName, indexName));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftAliasUpdate(String aliasName, String indexName) {
     return appendCommand(commandObjects.ftAliasUpdate(aliasName, indexName));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftAliasDel(String aliasName) {
     return appendCommand(commandObjects.ftAliasDel(aliasName));
   }
diff --git a/src/main/java/redis/clients/jedis/TransactionBase.java b/src/main/java/redis/clients/jedis/TransactionBase.java
index e255df31d4..227180486c 100644
--- a/src/main/java/redis/clients/jedis/TransactionBase.java
+++ b/src/main/java/redis/clients/jedis/TransactionBase.java
@@ -3472,21 +3472,25 @@ public Response<AggregationResult> ftAggregate(String indexName, AggregationBuil
   }
 
   @Override
+  @Deprecated
   public Response<AggregationResult> ftCursorRead(String indexName, long cursorId, int count) {
     return appendCommand(commandObjects.ftCursorRead(indexName, cursorId, count));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftCursorDel(String indexName, long cursorId) {
     return appendCommand(commandObjects.ftCursorDel(indexName, cursorId));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftDropIndex(String indexName) {
     return appendCommand(commandObjects.ftDropIndex(indexName));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftDropIndexDD(String indexName) {
     return appendCommand(commandObjects.ftDropIndexDD(indexName));
   }
@@ -3552,16 +3556,19 @@ public Response<Set<String>> ftTagVals(String indexName, String fieldName) {
   }
 
   @Override
+  @Deprecated
   public Response<String> ftAliasAdd(String aliasName, String indexName) {
     return appendCommand(commandObjects.ftAliasAdd(aliasName, indexName));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftAliasUpdate(String aliasName, String indexName) {
     return appendCommand(commandObjects.ftAliasUpdate(aliasName, indexName));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftAliasDel(String aliasName) {
     return appendCommand(commandObjects.ftAliasDel(aliasName));
   }
diff --git a/src/main/java/redis/clients/jedis/UnifiedJedis.java b/src/main/java/redis/clients/jedis/UnifiedJedis.java
index 7a46e0ae2c..60f8f7ba58 100644
--- a/src/main/java/redis/clients/jedis/UnifiedJedis.java
+++ b/src/main/java/redis/clients/jedis/UnifiedJedis.java
@@ -201,6 +201,7 @@ private <T> T checkAndBroadcastCommand(CommandObject<T> commandObject) {
 
   public void setBroadcastAndRoundRobinConfig(JedisBroadcastAndRoundRobinConfig config) {
     this.broadcastAndRoundRobinConfig = config;
+    this.commandObjects.setBroadcastAndRoundRobinConfig(this.broadcastAndRoundRobinConfig);
   }
 
   public String ping() {
diff --git a/src/main/java/redis/clients/jedis/search/RediSearchPipelineCommands.java b/src/main/java/redis/clients/jedis/search/RediSearchPipelineCommands.java
index 5598a10dc1..e78155f697 100644
--- a/src/main/java/redis/clients/jedis/search/RediSearchPipelineCommands.java
+++ b/src/main/java/redis/clients/jedis/search/RediSearchPipelineCommands.java
@@ -59,12 +59,16 @@ default Response<SearchResult> ftSearch(String indexName) {
 
   Response<AggregationResult> ftAggregate(String indexName, AggregationBuilder aggr);
 
+  @Deprecated
   Response<AggregationResult> ftCursorRead(String indexName, long cursorId, int count);
 
+  @Deprecated
   Response<String> ftCursorDel(String indexName, long cursorId);
 
+  @Deprecated
   Response<String> ftDropIndex(String indexName);
 
+  @Deprecated
   Response<String> ftDropIndexDD(String indexName);
 
   Response<String> ftSynUpdate(String indexName, String synonymGroupId, String... terms);
@@ -92,10 +96,13 @@ Response<Map<String, Map<String, Double>>> ftSpellCheck(String index, String que
 
   Response<Set<String>> ftTagVals(String indexName, String fieldName);
 
+  @Deprecated
   Response<String> ftAliasAdd(String aliasName, String indexName);
 
+  @Deprecated
   Response<String> ftAliasUpdate(String aliasName, String indexName);
 
+  @Deprecated
   Response<String> ftAliasDel(String aliasName);
 
   Response<Map<String, String>> ftConfigGet(String option);