Add client timeout to stream calls.

31 files changed, 147 insertions, 269 deletions

diff --git a/ydb/core/yq/libs/private_client/private_client.cpp b/ydb/core/yq/libs/private_client/private_client.cpp
index 48cc6da88a..b6664e41fb 100644
--- a/ydb/core/yq/libs/private_client/private_client.cpp
+++ b/ydb/core/yq/libs/private_client/private_client.cpp
@@ -62,8 +62,7 @@ public:
                 &Fq::Private::V1::FqPrivateTaskService::Stub::AsyncPingTask,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -87,8 +86,7 @@ public:
                 &Fq::Private::V1::FqPrivateTaskService::Stub::AsyncGetTask,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -112,8 +110,7 @@ public:
                 &Fq::Private::V1::FqPrivateTaskService::Stub::AsyncWriteTaskResult,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -137,8 +134,7 @@ public:
                 &Fq::Private::V1::FqPrivateTaskService::Stub::AsyncNodesHealthCheck,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -163,8 +159,7 @@ public:
                 &Fq::Private::V1::FqPrivateTaskService::Stub::AsyncCreateRateLimiterResource,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -189,8 +184,7 @@ public:
                 &Fq::Private::V1::FqPrivateTaskService::Stub::AsyncDeleteRateLimiterResource,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
diff --git a/ydb/public/lib/experimental/ydb_clickhouse_internal.cpp b/ydb/public/lib/experimental/ydb_clickhouse_internal.cpp
index 5e137a1c87..e830941e29 100644
--- a/ydb/public/lib/experimental/ydb_clickhouse_internal.cpp
+++ b/ydb/public/lib/experimental/ydb_clickhouse_internal.cpp
@@ -109,7 +109,6 @@ public:
                     DbDriverState_,
                     INITIAL_DEFERRED_CALL_DELAY,
                     TRpcRequestSettings::Make(settings),
-                    settings.ClientTimeout_,
                     TEndpointKey(settings.Endpoint_, 0));
 
         return promise.GetFuture();
@@ -375,8 +374,7 @@ public:
                     &Ydb::ClickhouseInternal::V1::ClickhouseInternalService::Stub::AsyncGetShardLocations,
                     DbDriverState_,
                     INITIAL_DEFERRED_CALL_DELAY,
-                    TRpcRequestSettings::Make(settings),
-                    settings.ClientTimeout_);
+                    TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -411,8 +409,7 @@ public:
                     &Ydb::ClickhouseInternal::V1::ClickhouseInternalService::Stub::AsyncDescribeTable,
                     DbDriverState_,
                     INITIAL_DEFERRED_CALL_DELAY,
-                    TRpcRequestSettings::Make(settings),
-                    settings.ClientTimeout_);
+                    TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -462,8 +459,7 @@ public:
                 &Ydb::ClickhouseInternal::V1::ClickhouseInternalService::Stub::AsyncCreateSnapshot,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -498,8 +494,7 @@ public:
                 &Ydb::ClickhouseInternal::V1::ClickhouseInternalService::Stub::AsyncRefreshSnapshot,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -534,8 +529,7 @@ public:
                 &Ydb::ClickhouseInternal::V1::ClickhouseInternalService::Stub::AsyncDiscardSnapshot,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
diff --git a/ydb/public/lib/experimental/ydb_logstore.cpp b/ydb/public/lib/experimental/ydb_logstore.cpp
index c9b3c4a898..0b96617433 100644
--- a/ydb/public/lib/experimental/ydb_logstore.cpp
+++ b/ydb/public/lib/experimental/ydb_logstore.cpp
@@ -228,8 +228,7 @@ public:
             Ydb::LogStore::CreateLogStoreResponse>(
             std::move(request),
             &Ydb::LogStore::V1::LogStoreService::Stub::AsyncCreateLogStore,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncDescribeLogStoreResult DescribeLogStore(const TString& path, const TDescribeLogStoreSettings& settings) {
@@ -258,8 +257,7 @@ public:
             &Ydb::LogStore::V1::LogStoreService::Stub::AsyncDescribeLogStore,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -273,8 +271,7 @@ public:
             Ydb::LogStore::DropLogStoreResponse>(
             std::move(request),
             &Ydb::LogStore::V1::LogStoreService::Stub::AsyncDropLogStore,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncStatus AlterLogStore(const TString& path, const TAlterLogStoreSettings& settings) {
@@ -289,8 +286,7 @@ public:
             Ydb::LogStore::AlterLogStoreResponse>(
             std::move(request),
             &Ydb::LogStore::V1::LogStoreService::Stub::AsyncAlterLogStore,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncStatus CreateLogTable(const TString& path, TLogTableDescription&& tableDesc,
@@ -305,8 +301,7 @@ public:
             Ydb::LogStore::CreateLogTableResponse>(
             std::move(request),
             &Ydb::LogStore::V1::LogStoreService::Stub::AsyncCreateLogTable,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncDescribeLogTableResult DescribeLogTable(const TString& path, const TDescribeLogTableSettings& settings) {
@@ -335,8 +330,7 @@ public:
             &Ydb::LogStore::V1::LogStoreService::Stub::AsyncDescribeLogTable,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -350,8 +344,7 @@ public:
             Ydb::LogStore::DropLogTableResponse>(
             std::move(request),
             &Ydb::LogStore::V1::LogStoreService::Stub::AsyncDropLogTable,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncStatus AlterLogTable(const TString& path, const TAlterLogTableSettings& settings) {
@@ -373,8 +366,7 @@ public:
             Ydb::LogStore::AlterLogTableResponse>(
             std::move(request),
             &Ydb::LogStore::V1::LogStoreService::Stub::AsyncAlterLogTable,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 };
 
diff --git a/ydb/public/lib/experimental/ydb_s3_internal.cpp b/ydb/public/lib/experimental/ydb_s3_internal.cpp
index ac1c5025ed..9e6e4d0f7d 100644
--- a/ydb/public/lib/experimental/ydb_s3_internal.cpp
+++ b/ydb/public/lib/experimental/ydb_s3_internal.cpp
@@ -87,8 +87,7 @@ public:
             &Ydb::S3Internal::V1::S3InternalService::Stub::AsyncS3Listing,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
diff --git a/ydb/public/lib/fq/fq.cpp b/ydb/public/lib/fq/fq.cpp
index 59c4d5cb22..f942f2af76 100644
--- a/ydb/public/lib/fq/fq.cpp
+++ b/ydb/public/lib/fq/fq.cpp
@@ -54,8 +54,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncCreateQuery,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -82,8 +81,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncListQueries,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -110,8 +108,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncDescribeQuery,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -138,8 +135,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncGetQueryStatus,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -166,8 +162,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncModifyQuery,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -194,8 +189,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncDeleteQuery,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -222,8 +216,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncControlQuery,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -250,8 +243,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncGetResultData,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -278,8 +270,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncListJobs,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -306,8 +297,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncDescribeJob,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -334,8 +324,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncCreateConnection,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -362,8 +351,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncListConnections,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -390,8 +378,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncDescribeConnection,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -418,8 +405,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncModifyConnection,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -446,8 +432,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncDeleteConnection,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -474,8 +459,7 @@ public:
                     &FederatedQuery::V1::FederatedQueryService::Stub::AsyncTestConnection,
                     DbDriverState_,
                     INITIAL_DEFERRED_CALL_DELAY,
-                    TRpcRequestSettings::Make(settings),
-                    settings.ClientTimeout_);
+                    TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -502,8 +486,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncCreateBinding,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -530,8 +513,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncListBindings,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -558,8 +540,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncDescribeBinding,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -586,8 +567,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncModifyBinding,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -614,8 +594,7 @@ public:
                 &FederatedQuery::V1::FederatedQueryService::Stub::AsyncDeleteBinding,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
diff --git a/ydb/public/lib/yq/yq.cpp b/ydb/public/lib/yq/yq.cpp
index e9aa329323..12a13ae187 100644
--- a/ydb/public/lib/yq/yq.cpp
+++ b/ydb/public/lib/yq/yq.cpp
@@ -54,8 +54,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncCreateQuery,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -82,8 +81,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncListQueries,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -110,8 +108,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncDescribeQuery,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -138,8 +135,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncGetQueryStatus,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -166,8 +162,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncModifyQuery,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -194,8 +189,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncDeleteQuery,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -222,8 +216,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncControlQuery,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -250,8 +243,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncGetResultData,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -278,8 +270,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncListJobs,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -306,8 +297,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncDescribeJob,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -334,8 +324,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncCreateConnection,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -362,8 +351,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncListConnections,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -390,8 +378,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncDescribeConnection,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -418,8 +405,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncModifyConnection,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -446,8 +432,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncDeleteConnection,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -474,8 +459,7 @@ public:
                     &YandexQuery::V1::YandexQueryService::Stub::AsyncTestConnection,
                     DbDriverState_,
                     INITIAL_DEFERRED_CALL_DELAY,
-                    TRpcRequestSettings::Make(settings),
-                    settings.ClientTimeout_);
+                    TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -502,8 +486,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncCreateBinding,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -530,8 +513,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncListBindings,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -558,8 +540,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncDescribeBinding,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -586,8 +567,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncModifyBinding,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
@@ -614,8 +594,7 @@ public:
                 &YandexQuery::V1::YandexQueryService::Stub::AsyncDeleteBinding,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return future;
     }
diff --git a/ydb/public/sdk/cpp/client/draft/ydb_long_tx.cpp b/ydb/public/sdk/cpp/client/draft/ydb_long_tx.cpp
index b3534751c7..8368fb8497 100644
--- a/ydb/public/sdk/cpp/client/draft/ydb_long_tx.cpp
+++ b/ydb/public/sdk/cpp/client/draft/ydb_long_tx.cpp
@@ -31,8 +31,7 @@ public:
                             Ydb::LongTx::BeginTransactionRequest, Ydb::LongTx::BeginTransactionResponse, TLongTxBeginResult>(
             std::move(request),
             &Ydb::LongTx::V1::LongTxService::Stub::AsyncBeginTx,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncCommitTxResult CommitTx(const TString& txId,
@@ -44,8 +43,7 @@ public:
                             Ydb::LongTx::CommitTransactionRequest, Ydb::LongTx::CommitTransactionResponse, TLongTxCommitResult>(
             std::move(request),
             &Ydb::LongTx::V1::LongTxService::Stub::AsyncCommitTx,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncRollbackTxResult RollbackTx(const TString& txId,
@@ -57,8 +55,7 @@ public:
                             Ydb::LongTx::RollbackTransactionRequest, Ydb::LongTx::RollbackTransactionResponse, TLongTxRollbackResult>(
             std::move(request),
             &Ydb::LongTx::V1::LongTxService::Stub::AsyncRollbackTx,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncWriteResult Write(const TString& txId, const TString& table, const TString& dedupId,
@@ -77,8 +74,7 @@ public:
                             Ydb::LongTx::WriteRequest, Ydb::LongTx::WriteResponse, TLongTxWriteResult>(
             std::move(request),
             &Ydb::LongTx::V1::LongTxService::Stub::AsyncWrite,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncReadResult Read(const TString& txId, const TString& table,
@@ -92,8 +88,7 @@ public:
                             Ydb::LongTx::ReadRequest, Ydb::LongTx::ReadResponse, TLongTxReadResult>(
             std::move(request),
             &Ydb::LongTx::V1::LongTxService::Stub::AsyncRead,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 };
 
diff --git a/ydb/public/sdk/cpp/client/draft/ydb_scripting.cpp b/ydb/public/sdk/cpp/client/draft/ydb_scripting.cpp
index 38b8c8123d..313219f5c4 100644
--- a/ydb/public/sdk/cpp/client/draft/ydb_scripting.cpp
+++ b/ydb/public/sdk/cpp/client/draft/ydb_scripting.cpp
@@ -189,8 +189,7 @@ public:
                 &Ydb::Scripting::V1::ScriptingService::Stub::AsyncExecuteYql,
                 DbDriverState_,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -290,8 +289,7 @@ public:
                     &Ydb::Scripting::V1::ScriptingService::Stub::AsyncExplainYql,
                     DbDriverState_,
                     INITIAL_DEFERRED_CALL_DELAY,
-                    TRpcRequestSettings::Make(settings),
-                    settings.ClientTimeout_);
+                    TRpcRequestSettings::Make(settings));
 
             return promise.GetFuture();
     }
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/actions.cpp b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/actions.cpp
index 4dc61d5305..d44f288da2 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/actions.cpp
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/actions.cpp
@@ -51,7 +51,6 @@ void TDeferredAction::OnAlarm() {
         DbDriverState_,
         NextDelay_,
         {},
-        TDuration::Zero(),
         true,
         TEndpointKey(Endpoint_, 0),
         std::move(Context_));
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/grpc_connections.cpp b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/grpc_connections.cpp
index f6e90a622f..a22aba01b4 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/grpc_connections.cpp
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/grpc_connections.cpp
@@ -327,14 +327,16 @@ TAsyncListEndpointsResult TGRpcConnectionsImpl::GetEndpoints(TDbDriverStatePtr d
             promise.SetValue(std::move(val));
         };
 
+    TRpcRequestSettings rpcSettings;
+    rpcSettings.ClientTimeout = GET_ENDPOINTS_TIMEOUT;
+
     RunDeferred<Ydb::Discovery::V1::DiscoveryService, Ydb::Discovery::ListEndpointsRequest, Ydb::Discovery::ListEndpointsResponse>(
         std::move(request),
         extractor,
         &Ydb::Discovery::V1::DiscoveryService::Stub::AsyncListEndpoints,
         dbState->shared_from_this(),
         INITIAL_DEFERRED_CALL_DELAY,
-        TRpcRequestSettings(),
-        GET_ENDPOINTS_TIMEOUT);
+        rpcSettings);
 
     std::weak_ptr<TDbDriverState> weakState = dbState;
 
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/grpc_connections.h b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/grpc_connections.h
index 4f27a5a25a..3f3b85ede0 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/grpc_connections.h
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/grpc_connections.h
@@ -139,7 +139,6 @@ public:
         TSimpleRpc<TService, TRequest, TResponse> rpc,
         TDbDriverStatePtr dbState,
         const TRpcRequestSettings& requestSettings,
-        TDuration clientTimeout,
         const TEndpointKey& preferredEndpoint,
         std::shared_ptr<IQueueClientContext> context = nullptr)
     {
@@ -170,7 +169,7 @@ public:
         auto endpointPolicy = requestSettings.EndpointPolicy;
 
         WithServiceConnection<TService>(
-            [this, request = std::move(request), userResponseCb = std::move(userResponseCb), rpc, requestSettings, context = std::move(context), clientTimeout, dbState]
+            [this, request = std::move(request), userResponseCb = std::move(userResponseCb), rpc, requestSettings, context = std::move(context), dbState]
             (TPlainStatus status, TConnection serviceConnection, TEndpointKey endpoint) mutable -> void {
                 if (!status.Ok()) {
                     userResponseCb(
@@ -180,7 +179,7 @@ public:
                 }
 
                 TCallMeta meta;
-                meta.Timeout = clientTimeout;
+                meta.Timeout = requestSettings.ClientTimeout;
         #ifndef YDB_GRPC_UNSECURE_AUTH
                 meta.CallCredentials = dbState->CallCredentials;
         #else
@@ -280,7 +279,6 @@ public:
         TDbDriverStatePtr dbState,
         TDuration deferredTimeout,
         const TRpcRequestSettings& requestSettings,
-        TDuration clientTimeout,
         bool poll = false,
         const TEndpointKey& preferredEndpoint = TEndpointKey(),
         std::shared_ptr<IQueueClientContext> context = nullptr)
@@ -324,7 +322,6 @@ public:
             rpc,
             dbState,
             requestSettings,
-            clientTimeout,
             preferredEndpoint,
             std::move(context));
     }
@@ -337,8 +334,7 @@ public:
         TRequest&& request,
         TResponseCb<TResponse>&& responseCb,
         TSimpleRpc<TService, TRequest, TResponse> rpc,
-        TRpcRequestSettings requestSettings,
-        TDuration clientTimeout)
+        TRpcRequestSettings requestSettings)
     {
         requestSettings.EndpointPolicy = TRpcRequestSettings::TEndpointPolicy::UseDiscoveryEndpoint;
         requestSettings.UseAuth = false;
@@ -353,7 +349,6 @@ public:
             rpc,
             dbState,
             requestSettings,
-            clientTimeout,
             TEndpointKey(),
             nullptr);
     }
@@ -366,7 +361,6 @@ public:
         TDbDriverStatePtr dbState,
         TDuration deferredTimeout,
         const TRpcRequestSettings& requestSettings,
-        TDuration clientTimeout,
         const TEndpointKey& preferredEndpoint = TEndpointKey(),
         std::shared_ptr<IQueueClientContext> context = nullptr)
     {
@@ -386,7 +380,6 @@ public:
             dbState,
             deferredTimeout,
             requestSettings,
-            clientTimeout,
             true, // poll
             preferredEndpoint,
             context);
@@ -428,6 +421,7 @@ public:
                 }
 
                 TCallMeta meta;
+                meta.Timeout = requestSettings.ClientTimeout;
 #ifndef YDB_GRPC_UNSECURE_AUTH
                 meta.CallCredentials = dbState->CallCredentials;
 #else
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/rpc_request_settings/settings.h b/ydb/public/sdk/cpp/client/impl/ydb_internal/rpc_request_settings/settings.h
index 2a2611794d..5be2ac64de 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/rpc_request_settings/settings.h
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/rpc_request_settings/settings.h
@@ -14,6 +14,7 @@ struct TRpcRequestSettings {
         UseDiscoveryEndpoint // Use single discovery endpoint for request
     } EndpointPolicy = TEndpointPolicy::UsePreferedEndpoint;
     bool UseAuth = true;
+    TDuration ClientTimeout;
 
     template<typename TRequestSettings>
     static TRpcRequestSettings Make(const TRequestSettings& settings) {
@@ -23,6 +24,7 @@ struct TRpcRequestSettings {
         rpcSettings.Header = settings.Header_;
         rpcSettings.EndpointPolicy = TEndpointPolicy::UsePreferedEndpoint;
         rpcSettings.UseAuth = true;
+        rpcSettings.ClientTimeout = settings.ClientTimeout_;
         return rpcSettings;
     }
 };
diff --git a/ydb/public/sdk/cpp/client/resources/ydb_sdk_version.txt b/ydb/public/sdk/cpp/client/resources/ydb_sdk_version.txt
index e3a4f19336..cc6612c36e 100644
--- a/ydb/public/sdk/cpp/client/resources/ydb_sdk_version.txt
+++ b/ydb/public/sdk/cpp/client/resources/ydb_sdk_version.txt
@@ -1 +1 @@
-2.2.0
\ No newline at end of file
+2.3.0
\ No newline at end of file
diff --git a/ydb/public/sdk/cpp/client/ydb_common_client/impl/client.h b/ydb/public/sdk/cpp/client/ydb_common_client/impl/client.h
index 6b26c7b049..71fbb7c25c 100644
--- a/ydb/public/sdk/cpp/client/ydb_common_client/impl/client.h
+++ b/ydb/public/sdk/cpp/client/ydb_common_client/impl/client.h
@@ -60,7 +60,6 @@ protected:
         TRequest&& request,
         TAsyncRequest<TService, TRequest, TResponse> rpc,
         const TRpcRequestSettings& requestSettings = {},
-        TDuration timeout = TDuration::Zero(),
         const TEndpointKey& preferredEndpoint = TEndpointKey())
     {
         auto promise = NThreading::NewPromise<TStatus>();
@@ -78,7 +77,6 @@ protected:
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
             requestSettings,
-            timeout,
             preferredEndpoint);
 
         return promise.GetFuture();
@@ -88,8 +86,7 @@ protected:
     NThreading::TFuture<TOp> RunOperation(
         TRequest&& request,
         TAsyncRequest<TService, TRequest, TResponse> rpc,
-        const TRpcRequestSettings& requestSettings = {},
-        TDuration timeout = TDuration::Zero())
+        const TRpcRequestSettings& requestSettings = {})
     {
         auto promise = NThreading::NewPromise<TOp>();
 
@@ -109,8 +106,7 @@ protected:
             rpc,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            requestSettings,
-            timeout);
+            requestSettings);
 
         return promise.GetFuture();
     }
diff --git a/ydb/public/sdk/cpp/client/ydb_coordination/coordination.cpp b/ydb/public/sdk/cpp/client/ydb_coordination/coordination.cpp
index 7a99c95214..f06f521808 100644
--- a/ydb/public/sdk/cpp/client/ydb_coordination/coordination.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_coordination/coordination.cpp
@@ -1819,8 +1819,7 @@ public:
                         Ydb::Coordination::CreateNodeResponse>(
             std::move(request),
             &Ydb::Coordination::V1::CoordinationService::Stub::AsyncCreateNode,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncStatus AlterNode(
@@ -1832,8 +1831,7 @@ public:
                         Ydb::Coordination::AlterNodeResponse>(
             std::move(request),
             &Ydb::Coordination::V1::CoordinationService::Stub::AsyncAlterNode,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncStatus DropNode(
@@ -1845,8 +1843,7 @@ public:
                         Ydb::Coordination::DropNodeResponse>(
             std::move(request),
             &Ydb::Coordination::V1::CoordinationService::Stub::AsyncDropNode,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncDescribeNodeResult DescribeNode(
@@ -1875,8 +1872,7 @@ public:
             &Ydb::Coordination::V1::CoordinationService::Stub::AsyncDescribeNode,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
diff --git a/ydb/public/sdk/cpp/client/ydb_datastreams/datastreams.cpp b/ydb/public/sdk/cpp/client/ydb_datastreams/datastreams.cpp
index 6604fbe83c..dd152b871f 100644
--- a/ydb/public/sdk/cpp/client/ydb_datastreams/datastreams.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_datastreams/datastreams.cpp
@@ -50,8 +50,7 @@ namespace NYdb::NDataStreams::V1 {
                     grpcCall,
                     DbDriverState_,
                     INITIAL_DEFERRED_CALL_DELAY,
-                    TRpcRequestSettings::Make(settings),
-                    settings.ClientTimeout_);
+                    TRpcRequestSettings::Make(settings));
 
             return future;
 
diff --git a/ydb/public/sdk/cpp/client/ydb_discovery/discovery.cpp b/ydb/public/sdk/cpp/client/ydb_discovery/discovery.cpp
index b2a1696160..b502222fc2 100644
--- a/ydb/public/sdk/cpp/client/ydb_discovery/discovery.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_discovery/discovery.cpp
@@ -85,8 +85,7 @@ public:
             &Ydb::Discovery::V1::DiscoveryService::Stub::AsyncListEndpoints,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -115,8 +114,7 @@ public:
             &Ydb::Discovery::V1::DiscoveryService::Stub::AsyncWhoAmI,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
diff --git a/ydb/public/sdk/cpp/client/ydb_export/export.cpp b/ydb/public/sdk/cpp/client/ydb_export/export.cpp
index f91398bdbd..25c7e10d39 100644
--- a/ydb/public/sdk/cpp/client/ydb_export/export.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_export/export.cpp
@@ -125,8 +125,7 @@ public:
         return RunOperation<V1::ExportService, ExportToYtRequest, ExportToYtResponse, TExportToYtResponse>(
             std::move(request),
             &V1::ExportService::Stub::AsyncExportToYt,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TFuture<TExportToS3Response> ExportToS3(ExportToS3Request&& request,
@@ -135,8 +134,7 @@ public:
         return RunOperation<V1::ExportService, ExportToS3Request, ExportToS3Response, TExportToS3Response>(
             std::move(request),
             &V1::ExportService::Stub::AsyncExportToS3,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
 };
diff --git a/ydb/public/sdk/cpp/client/ydb_import/import.cpp b/ydb/public/sdk/cpp/client/ydb_import/import.cpp
index f0a55678ef..b7d2496743 100644
--- a/ydb/public/sdk/cpp/client/ydb_import/import.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_import/import.cpp
@@ -89,8 +89,7 @@ public:
         return RunOperation<V1::ImportService, ImportFromS3Request, ImportFromS3Response, TImportFromS3Response>(
             std::move(request),
             &V1::ImportService::Stub::AsyncImportFromS3,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     template <typename TSettings>
@@ -109,8 +108,7 @@ public:
             &V1::ImportService::Stub::AsyncImportData,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
diff --git a/ydb/public/sdk/cpp/client/ydb_monitoring/monitoring.cpp b/ydb/public/sdk/cpp/client/ydb_monitoring/monitoring.cpp
index 0a4d8bffbb..701eb24534 100644
--- a/ydb/public/sdk/cpp/client/ydb_monitoring/monitoring.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_monitoring/monitoring.cpp
@@ -75,8 +75,7 @@ public:
             &Ydb::Monitoring::V1::MonitoringService::Stub::AsyncSelfCheck,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            requestSettings,
-            settings.ClientTimeout_);
+            requestSettings);
 
         return promise.GetFuture();
     }
diff --git a/ydb/public/sdk/cpp/client/ydb_operation/operation.cpp b/ydb/public/sdk/cpp/client/ydb_operation/operation.cpp
index 86da132e3e..eea3b7ae19 100644
--- a/ydb/public/sdk/cpp/client/ydb_operation/operation.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_operation/operation.cpp
@@ -43,13 +43,15 @@ class TOperationClient::TImpl : public TClientImplCommon<TOperationClient::TImpl
                 }
             };
 
+        TRpcRequestSettings rpcSettings;
+        rpcSettings.ClientTimeout = OPERATION_CLIENT_TIMEOUT;
+
         Connections_->Run<V1::OperationService, TRequest, TResponse>(
             std::move(request),
             extractor,
             rpc,
             DbDriverState_,
-            TRpcRequestSettings(),
-            OPERATION_CLIENT_TIMEOUT,
+            rpcSettings,
             TEndpointKey());
 
         return promise.GetFuture();
@@ -105,13 +107,15 @@ public:
                 }
             };
 
+        TRpcRequestSettings rpcSettings;
+        rpcSettings.ClientTimeout = OPERATION_CLIENT_TIMEOUT;
+
         Connections_->Run<V1::OperationService, ListOperationsRequest, ListOperationsResponse>(
             std::move(request),
             extractor,
             &V1::OperationService::Stub::AsyncListOperations,
             DbDriverState_,
-            TRpcRequestSettings(),
-            OPERATION_CLIENT_TIMEOUT,
+            rpcSettings,
             TEndpointKey());
 
         return promise.GetFuture();
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/persqueue_impl.h b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/persqueue_impl.h
index cb74163ffc..45ba161d4e 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/persqueue_impl.h
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/persqueue_impl.h
@@ -113,8 +113,7 @@ public:
         return RunSimple<Ydb::PersQueue::V1::PersQueueService, Ydb::PersQueue::V1::CreateTopicRequest, Ydb::PersQueue::V1::CreateTopicResponse>(
             std::move(request),
             &Ydb::PersQueue::V1::PersQueueService::Stub::AsyncCreateTopic,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncStatus AlterTopic(const TString& path, const TAlterTopicSettings& settings) {
@@ -123,8 +122,7 @@ public:
         return RunSimple<Ydb::PersQueue::V1::PersQueueService, Ydb::PersQueue::V1::AlterTopicRequest, Ydb::PersQueue::V1::AlterTopicResponse>(
             std::move(request),
             &Ydb::PersQueue::V1::PersQueueService::Stub::AsyncAlterTopic,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
 
@@ -135,8 +133,7 @@ public:
         return RunSimple<Ydb::PersQueue::V1::PersQueueService, Ydb::PersQueue::V1::DropTopicRequest, Ydb::PersQueue::V1::DropTopicResponse>(
             std::move(request),
             &Ydb::PersQueue::V1::PersQueueService::Stub::AsyncDropTopic,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncStatus AddReadRule(const TString& path, const TAddReadRuleSettings& settings) {
@@ -146,8 +143,7 @@ public:
         return RunSimple<Ydb::PersQueue::V1::PersQueueService, Ydb::PersQueue::V1::AddReadRuleRequest, Ydb::PersQueue::V1::AddReadRuleResponse>(
                 std::move(request),
                 &Ydb::PersQueue::V1::PersQueueService::Stub::AsyncAddReadRule,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
     }
 
     TAsyncStatus RemoveReadRule(const TString& path, const TRemoveReadRuleSettings& settings) {
@@ -158,8 +154,7 @@ public:
         return RunSimple<Ydb::PersQueue::V1::PersQueueService, Ydb::PersQueue::V1::RemoveReadRuleRequest, Ydb::PersQueue::V1::RemoveReadRuleResponse>(
                 std::move(request),
                 &Ydb::PersQueue::V1::PersQueueService::Stub::AsyncRemoveReadRule,
-                TRpcRequestSettings::Make(settings),
-                settings.ClientTimeout_);
+                TRpcRequestSettings::Make(settings));
     }
 
 
@@ -186,8 +181,7 @@ public:
             &Ydb::PersQueue::V1::PersQueueService::Stub::AsyncDescribeTopic,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/read_session.cpp b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/read_session.cpp
index 1cfc846630..c388d1a6be 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/read_session.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/read_session.cpp
@@ -132,6 +132,8 @@ void TReadSession::StartClusterDiscovery() {
         selfShared->OnClusterDiscovery(st, result);
     };
 
+    auto rpcSettings = TRpcRequestSettings::Make(Settings);
+    rpcSettings.ClientTimeout = TDuration::Seconds(5); // TODO: make client timeout setting
     Connections->RunDeferred<Ydb::PersQueue::V1::ClusterDiscoveryService,
                              Ydb::PersQueue::ClusterDiscovery::DiscoverClustersRequest,
                              Ydb::PersQueue::ClusterDiscovery::DiscoverClustersResponse>(
@@ -140,8 +142,7 @@ void TReadSession::StartClusterDiscovery() {
         &Ydb::PersQueue::V1::ClusterDiscoveryService::Stub::AsyncDiscoverClusters,
         DbDriverState,
         INITIAL_DEFERRED_CALL_DELAY,
-        TRpcRequestSettings::Make(Settings),
-        /*ClientTimeout_*/TDuration::Seconds(5)); // TODO: make client timeout setting
+        rpcSettings); // TODO: make client timeout setting
 }
 
 
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/write_session.cpp b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/write_session.cpp
index f069852bf8..a7572339ae 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/write_session.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/write_session.cpp
@@ -168,8 +168,7 @@ void TWriteSession::DoCdsRequest(TDuration delay) {
                 &Ydb::PersQueue::V1::ClusterDiscoveryService::Stub::AsyncDiscoverClusters,
                 dbState,
                 INITIAL_DEFERRED_CALL_DELAY,
-                TRpcRequestSettings::Make(settings),
-                settings.ConnectTimeout_); // TODO: make client timeout setting
+                TRpcRequestSettings::Make(settings)); // TODO: make client timeout setting
         }
     };
     Connections->ScheduleOneTimeTask(std::move(cdsRequestCall), delay);
diff --git a/ydb/public/sdk/cpp/client/ydb_rate_limiter/rate_limiter.cpp b/ydb/public/sdk/cpp/client/ydb_rate_limiter/rate_limiter.cpp
index bea557812c..aa5efd3d82 100644
--- a/ydb/public/sdk/cpp/client/ydb_rate_limiter/rate_limiter.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_rate_limiter/rate_limiter.cpp
@@ -78,8 +78,7 @@ public:
         return RunSimple<Ydb::RateLimiter::V1::RateLimiterService, Ydb::RateLimiter::CreateResourceRequest, Ydb::RateLimiter::CreateResourceResponse>(
             std::move(request),
             &Ydb::RateLimiter::V1::RateLimiterService::Stub::AsyncCreateResource,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncStatus AlterResource(const TString& coordinationNodePath, const TString& resourcePath, const TAlterResourceSettings& settings) {
@@ -88,8 +87,7 @@ public:
         return RunSimple<Ydb::RateLimiter::V1::RateLimiterService, Ydb::RateLimiter::AlterResourceRequest, Ydb::RateLimiter::AlterResourceResponse>(
             std::move(request),
             &Ydb::RateLimiter::V1::RateLimiterService::Stub::AsyncAlterResource,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncStatus DropResource(const TString& coordinationNodePath, const TString& resourcePath, const TDropResourceSettings& settings) {
@@ -100,8 +98,7 @@ public:
         return RunSimple<Ydb::RateLimiter::V1::RateLimiterService, Ydb::RateLimiter::DropResourceRequest, Ydb::RateLimiter::DropResourceResponse>(
             std::move(request),
             &Ydb::RateLimiter::V1::RateLimiterService::Stub::AsyncDropResource,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncListResourcesResult ListResources(const TString& coordinationNodePath, const TString& resourcePath, const TListResourcesSettings& settings) {
@@ -134,8 +131,7 @@ public:
             &Ydb::RateLimiter::V1::RateLimiterService::Stub::AsyncListResources,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -164,8 +160,7 @@ public:
             &Ydb::RateLimiter::V1::RateLimiterService::Stub::AsyncDescribeResource,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -184,8 +179,7 @@ public:
         return RunSimple<Ydb::RateLimiter::V1::RateLimiterService, Ydb::RateLimiter::AcquireResourceRequest, Ydb::RateLimiter::AcquireResourceResponse>(
             std::move(request),
             &Ydb::RateLimiter::V1::RateLimiterService::Stub::AsyncAcquireResource,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 };
 
diff --git a/ydb/public/sdk/cpp/client/ydb_scheme/scheme.cpp b/ydb/public/sdk/cpp/client/ydb_scheme/scheme.cpp
index 181d6a4fa7..807f70aff1 100644
--- a/ydb/public/sdk/cpp/client/ydb_scheme/scheme.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_scheme/scheme.cpp
@@ -113,8 +113,7 @@ public:
         return RunSimple<Ydb::Scheme::V1::SchemeService, MakeDirectoryRequest, MakeDirectoryResponse>(
             std::move(request),
             &Ydb::Scheme::V1::SchemeService::Stub::AsyncMakeDirectory,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncStatus RemoveDirectory(const TString& path, const TRemoveDirectorySettings& settings) {
@@ -124,8 +123,7 @@ public:
         return RunSimple<Ydb::Scheme::V1::SchemeService, RemoveDirectoryRequest, RemoveDirectoryResponse>(
             std::move(request),
             &Ydb::Scheme::V1::SchemeService::Stub::AsyncRemoveDirectory,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncDescribePathResult DescribePath(const TString& path, const TDescribePathSettings& settings) {
@@ -150,8 +148,7 @@ public:
             &Ydb::Scheme::V1::SchemeService::Stub::AsyncDescribePath,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -183,8 +180,7 @@ public:
             &Ydb::Scheme::V1::SchemeService::Stub::AsyncListDirectory,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
 
@@ -229,8 +225,7 @@ public:
         return RunSimple<Ydb::Scheme::V1::SchemeService, ModifyPermissionsRequest, ModifyPermissionsResponse>(
             std::move(request),
             &Ydb::Scheme::V1::SchemeService::Stub::AsyncModifyPermissions,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
 };
diff --git a/ydb/public/sdk/cpp/client/ydb_table/table.cpp b/ydb/public/sdk/cpp/client/ydb_table/table.cpp
index 2265a5b396..d161f64854 100644
--- a/ydb/public/sdk/cpp/client/ydb_table/table.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_table/table.cpp
@@ -1932,7 +1932,6 @@ public:
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
             rpcSettings,
-            settings.ClientTimeout_,
             TEndpointKey(preferedLocation, 0));
 
         std::weak_ptr<TDbDriverState> state = DbDriverState_;
@@ -1976,7 +1975,6 @@ public:
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
             TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_,
             session->GetEndpointKey());
 
         return keepAliveResultPromise.GetFuture();
@@ -1987,8 +1985,7 @@ public:
         return RunSimple<Ydb::Table::V1::TableService, Ydb::Table::CreateTableRequest,Ydb::Table::CreateTableResponse>(
             std::move(request),
             &Ydb::Table::V1::TableService::Stub::AsyncCreateTable,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TFuture<TStatus> AlterTable(Ydb::Table::AlterTableRequest&& request, const TAlterTableSettings& settings)
@@ -1996,8 +1993,7 @@ public:
         return RunSimple<Ydb::Table::V1::TableService, Ydb::Table::AlterTableRequest, Ydb::Table::AlterTableResponse>(
             std::move(request),
             &Ydb::Table::V1::TableService::Stub::AsyncAlterTable,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncOperation AlterTableLong(Ydb::Table::AlterTableRequest&& request, const TAlterTableSettings& settings)
@@ -2008,8 +2004,7 @@ public:
         return RunOperation<TableService, AlterTableRequest, AlterTableResponse, TOperation>(
             std::move(request),
             &Ydb::Table::V1::TableService::Stub::AsyncAlterTable,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TFuture<TStatus> CopyTable(const TString& sessionId, const TString& src, const TString& dst,
@@ -2023,8 +2018,7 @@ public:
         return RunSimple<Ydb::Table::V1::TableService, Ydb::Table::CopyTableRequest, Ydb::Table::CopyTableResponse>(
             std::move(request),
             &Ydb::Table::V1::TableService::Stub::AsyncCopyTable,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TFuture<TStatus> CopyTables(Ydb::Table::CopyTablesRequest&& request, const TCopyTablesSettings& settings)
@@ -2032,8 +2026,7 @@ public:
         return RunSimple<Ydb::Table::V1::TableService, Ydb::Table::CopyTablesRequest, Ydb::Table::CopyTablesResponse>(
             std::move(request),
             &Ydb::Table::V1::TableService::Stub::AsyncCopyTables,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TFuture<TStatus> RenameTables(Ydb::Table::RenameTablesRequest&& request, const TRenameTablesSettings& settings)
@@ -2041,8 +2034,7 @@ public:
         return RunSimple<Ydb::Table::V1::TableService, Ydb::Table::RenameTablesRequest, Ydb::Table::RenameTablesResponse>(
             std::move(request),
             &Ydb::Table::V1::TableService::Stub::AsyncRenameTables,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TFuture<TStatus> DropTable(const TString& sessionId, const TString& path, const TDropTableSettings& settings) {
@@ -2053,8 +2045,7 @@ public:
         return RunSimple<Ydb::Table::V1::TableService, Ydb::Table::DropTableRequest, Ydb::Table::DropTableResponse>(
             std::move(request),
             &Ydb::Table::V1::TableService::Stub::AsyncDropTable,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncDescribeTableResult DescribeTable(const TString& sessionId, const TString& path, const TDescribeTableSettings& settings) {
@@ -2092,8 +2083,7 @@ public:
             &Ydb::Table::V1::TableService::Stub::AsyncDescribeTable,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -2175,7 +2165,6 @@ public:
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
             TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_,
             session.SessionImpl_->GetEndpointKey());
 
         return promise.GetFuture();
@@ -2191,8 +2180,7 @@ public:
         return RunSimple<Ydb::Table::V1::TableService, Ydb::Table::ExecuteSchemeQueryRequest, Ydb::Table::ExecuteSchemeQueryResponse>(
             std::move(request),
             &Ydb::Table::V1::TableService::Stub::AsyncExecuteSchemeQuery,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncBeginTransactionResult BeginTransaction(const TSession& session, const TTxSettings& txSettings,
@@ -2225,7 +2213,6 @@ public:
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
             TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_,
             session.SessionImpl_->GetEndpointKey());
 
         return promise.GetFuture();
@@ -2264,7 +2251,6 @@ public:
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
             TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_,
             session.SessionImpl_->GetEndpointKey());
 
         return promise.GetFuture();
@@ -2281,7 +2267,6 @@ public:
             std::move(request),
             &Ydb::Table::V1::TableService::Stub::AsyncRollbackTransaction,
             TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_,
             session.SessionImpl_->GetEndpointKey());
     }
 
@@ -2316,7 +2301,6 @@ public:
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
             TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_,
             session.SessionImpl_->GetEndpointKey());
 
         return promise.GetFuture();
@@ -2389,7 +2373,6 @@ public:
             std::move(request),
             &Ydb::Table::V1::TableService::Stub::AsyncDeleteSession,
             TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_,
             sessionImpl->GetEndpointKey());
     }
 
@@ -2504,8 +2487,7 @@ public:
             &Ydb::Table::V1::TableService::Stub::AsyncBulkUpsert,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -2544,8 +2526,7 @@ public:
             &Ydb::Table::V1::TableService::Stub::AsyncBulkUpsert,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
@@ -2759,7 +2740,6 @@ private:
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
             TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_,
             session.SessionImpl_->GetEndpointKey());
 
         return promise.GetFuture();
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/impl/topic_impl.h b/ydb/public/sdk/cpp/client/ydb_topic/impl/topic_impl.h
index f24800c933..de512c6ebb 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/impl/topic_impl.h
+++ b/ydb/public/sdk/cpp/client/ydb_topic/impl/topic_impl.h
@@ -92,8 +92,7 @@ public:
         return RunSimple<Ydb::Topic::V1::TopicService, Ydb::Topic::CreateTopicRequest, Ydb::Topic::CreateTopicResponse>(
             std::move(request),
             &Ydb::Topic::V1::TopicService::Stub::AsyncCreateTopic,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
 
@@ -154,8 +153,7 @@ public:
         return RunSimple<Ydb::Topic::V1::TopicService, Ydb::Topic::AlterTopicRequest, Ydb::Topic::AlterTopicResponse>(
             std::move(request),
             &Ydb::Topic::V1::TopicService::Stub::AsyncAlterTopic,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
 
@@ -166,8 +164,7 @@ public:
         return RunSimple<Ydb::Topic::V1::TopicService, Ydb::Topic::DropTopicRequest, Ydb::Topic::DropTopicResponse>(
             std::move(request),
             &Ydb::Topic::V1::TopicService::Stub::AsyncDropTopic,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
     }
 
     TAsyncDescribeTopicResult DescribeTopic(const TString& path, const TDescribeTopicSettings& settings) {
@@ -193,8 +190,7 @@ public:
             &Ydb::Topic::V1::TopicService::Stub::AsyncDescribeTopic,
             DbDriverState_,
             INITIAL_DEFERRED_CALL_DELAY,
-            TRpcRequestSettings::Make(settings),
-            settings.ClientTimeout_);
+            TRpcRequestSettings::Make(settings));
 
         return promise.GetFuture();
     }
diff --git a/ydb/public/sdk/cpp/client/ydb_types/credentials/login/login.cpp b/ydb/public/sdk/cpp/client/ydb_types/credentials/login/login.cpp
index 23c865525d..6b08cfcc4b 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/credentials/login/login.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_types/credentials/login/login.cpp
@@ -111,10 +111,12 @@ void TLoginCredentialsProvider::RequestToken() {
         Ydb::Auth::LoginRequest request;
         request.set_user(Params_.User);
         request.set_password(Params_.Password);
+        TRpcRequestSettings rpcSettings;
+        rpcSettings.ClientTimeout = TDuration::Seconds(60);
 
         TGRpcConnectionsImpl::RunOnDiscoveryEndpoint<Ydb::Auth::V1::AuthService, Ydb::Auth::LoginRequest, Ydb::Auth::LoginResponse>(
             strongFacility, std::move(request), std::move(responseCb), &Ydb::Auth::V1::AuthService::Stub::AsyncLogin,
-            TRpcRequestSettings(), /*TODO*/TDuration::Seconds(60));
+            rpcSettings);
     }
 }
 
diff --git a/ydb/public/sdk/cpp/client/ydb_types/request_settings.h b/ydb/public/sdk/cpp/client/ydb_types/request_settings.h
index fb8aa8ac68..14bef80925 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/request_settings.h
+++ b/ydb/public/sdk/cpp/client/ydb_types/request_settings.h
@@ -17,6 +17,7 @@ struct TRequestSettings {
     FLUENT_SETTING(TString, TraceId);
     FLUENT_SETTING(TString, RequestType);
     FLUENT_SETTING(THeader, Header);
+    FLUENT_SETTING(TDuration, ClientTimeout);
 
     TRequestSettings() = default;
 
@@ -25,6 +26,7 @@ struct TRequestSettings {
         : TraceId_(other.TraceId_)
         , RequestType_(other.RequestType_)
         , Header_(other.Header_)
+        , ClientTimeout_(other.ClientTimeout_)
     {}
 };
 
@@ -32,14 +34,11 @@ template<typename TDerived>
 struct TSimpleRequestSettings : public TRequestSettings<TDerived> {
     using TSelf = TDerived;
 
-    FLUENT_SETTING(TDuration, ClientTimeout);
-
     TSimpleRequestSettings() = default;
 
     template <typename T>
     explicit TSimpleRequestSettings(const TSimpleRequestSettings<T>& other)
         : TRequestSettings<TDerived>(other)
-        , ClientTimeout_(other.ClientTimeout_)
     {}
 };
 
diff --git a/ydb/services/ydb/sdk_credprovider_ut/dummy_provider_ut.cpp b/ydb/services/ydb/sdk_credprovider_ut/dummy_provider_ut.cpp
index af34937c50..cd29e21c11 100644
--- a/ydb/services/ydb/sdk_credprovider_ut/dummy_provider_ut.cpp
+++ b/ydb/services/ydb/sdk_credprovider_ut/dummy_provider_ut.cpp
@@ -37,9 +37,12 @@ class TExampleDummyProviderFactory : public ICredentialsProviderFactory {
                 request.set_copy(true);
                 request.set_payload("abc");
 
+                TRpcRequestSettings rpcSettings;
+                rpcSettings.ClientTimeout = TDuration::Seconds(1);
+
                 TGRpcConnectionsImpl::RunOnDiscoveryEndpoint<Draft::Dummy::DummyService, Draft::Dummy::PingRequest, Draft::Dummy::PingResponse>(
                     strong, std::move(request), std::move(responseCb), &Draft::Dummy::DummyService::Stub::AsyncPing,
-                    TRpcRequestSettings(), TDuration::Seconds(1));
+                    rpcSettings);
                 return true;
             };
             return periodicCb;