9 files changed, 44 insertions, 37 deletions
diff --git a/contrib/libs/dtl/.yandex_meta/devtools.licenses.report b/contrib/libs/dtl/.yandex_meta/devtools.licenses.report
index 23c4410c90..03e5b497fb 100644
--- a/contrib/libs/dtl/.yandex_meta/devtools.licenses.report
+++ b/contrib/libs/dtl/.yandex_meta/devtools.licenses.report
@@ -33,7 +33,7 @@
 # FILE_INCLUDE - include all file data into licenses text file
 # =======================
 
-KEEP     LicenseRef-scancode-unknown-license-reference 27ff83b6d7e95b709c1a8b94532ebef1
+KEEP     BSD-3-Clause         27ff83b6d7e95b709c1a8b94532ebef1
 BELONGS ya.make
     License text:
         Please read the file [COPYING](https://github.com/cubicdaiya/dtl/blob/master/COPYING).
@@ -45,7 +45,7 @@ BELONGS ya.make
     Files with this license:
         README.md [685:685]
 
-KEEP     LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause 3d436eacb955b50a8f94435e0ba12145
+KEEP     BSD-3-Clause         3d436eacb955b50a8f94435e0ba12145
 BELONGS ya.make
     License text:
            In short, Diff Template Library is distributed under so called "BSD license",
@@ -90,7 +90,7 @@ FILE_INCLUDE CONTRIBUTORS found in files: COPYING at line 20, COPYING at line 24
     Files with this license:
         COPYING [6:30]
 
-KEEP     LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause d9ebc19a46340bfaf128a098aade97ed
+KEEP     BSD-3-Clause         d9ebc19a46340bfaf128a098aade97ed
 BELONGS ya.make
     License text:
         In short, Diff Template Library is distributed under so called "BSD license",
diff --git a/contrib/libs/dtl/.yandex_meta/licenses.list.txt b/contrib/libs/dtl/.yandex_meta/licenses.list.txt
index 523a76b40a..bbec30e822 100644
--- a/contrib/libs/dtl/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/dtl/.yandex_meta/licenses.list.txt
@@ -1,4 +1,8 @@
 ====================BSD-3-Clause====================
+   In short, Diff Template Library is distributed under so called "BSD license",
+
+
+====================BSD-3-Clause====================
    Redistribution and use in source and binary forms, with or without modification,
    are permitted provided that the following conditions are met:
    
@@ -27,6 +31,13 @@
 
 
 ====================BSD-3-Clause====================
+In short, Diff Template Library is distributed under so called "BSD license",
+
+
+====================BSD-3-Clause====================
+Please read the file [COPYING](https://github.com/cubicdaiya/dtl/blob/master/COPYING).
+
+====================BSD-3-Clause====================
 Redistribution and use in source and binary forms, with or without modification, 
 are permitted provided that the following conditions are met:
 
@@ -61,14 +72,3 @@ All rights reserved.
 ====================File: CONTRIBUTORS====================
 Tatsuhiko Kubo <cubicdaiya@gmail.com>
 Jan Weiß <jan@geheimwerk.de>
-
-
-====================LicenseRef-scancode-unknown-license-reference====================
-Please read the file [COPYING](https://github.com/cubicdaiya/dtl/blob/master/COPYING).
-
-====================LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause====================
-   In short, Diff Template Library is distributed under so called "BSD license",
-
-
-====================LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause====================
-In short, Diff Template Library is distributed under so called "BSD license",
diff --git a/contrib/libs/dtl/ya.make b/contrib/libs/dtl/ya.make
index 8e61f56df4..417881c9f6 100644
--- a/contrib/libs/dtl/ya.make
+++ b/contrib/libs/dtl/ya.make
@@ -2,10 +2,7 @@
 
 LIBRARY()
 
-LICENSE(
-    BSD-3-Clause AND
-    LicenseRef-scancode-unknown-license-reference
-)
+LICENSE(BSD-3-Clause)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
diff --git a/util/datetime/benchmark/gmtime_r/main.cpp b/util/datetime/benchmark/gmtime_r/main.cpp
index 705f81006d..7402a369c5 100644
--- a/util/datetime/benchmark/gmtime_r/main.cpp
+++ b/util/datetime/benchmark/gmtime_r/main.cpp
@@ -59,5 +59,7 @@ BENCHMARK_CAPTURE(BM_GmTimeRRandom, last_year, TDuration::Days(365));
 BENCHMARK_CAPTURE(BM_gmtime_r_Random, last_year, TDuration::Days(365));
 BENCHMARK_CAPTURE(BM_GmTimeRRandom, last_decade, TDuration::Days(3653));
 BENCHMARK_CAPTURE(BM_gmtime_r_Random, last_decade, TDuration::Days(3653));
-BENCHMARK_CAPTURE(BM_GmTimeRRandom, last_half_centry, TDuration::Days(18262));
+BENCHMARK_CAPTURE(BM_GmTimeRRandom, last_half_century, TDuration::Days(18262));
 BENCHMARK_CAPTURE(BM_gmtime_r_Random, last_half_century, TDuration::Days(18262));
+BENCHMARK_CAPTURE(BM_GmTimeRRandom, last_century, TDuration::Days(36525));
+BENCHMARK_CAPTURE(BM_gmtime_r_Random, last_century, TDuration::Days(36525));
diff --git a/yql/essentials/udfs/common/python/bindings/ya.make b/yql/essentials/udfs/common/python/bindings/ya.make
index efb5b475c4..83380ce4c4 100644
--- a/yql/essentials/udfs/common/python/bindings/ya.make
+++ b/yql/essentials/udfs/common/python/bindings/ya.make
@@ -49,6 +49,8 @@ NO_COMPILER_WARNINGS()
 
 END()
 
-RECURSE_FOR_TESTS(
-    ut3
-)
+IF (NOT EXPORT_CMAKE)
+    RECURSE_FOR_TESTS(
+        ut3
+    )
+ENDIF()
diff --git a/yql/essentials/udfs/common/stat/ya.make b/yql/essentials/udfs/common/stat/ya.make
index aee1fe4362..8a5538b371 100644
--- a/yql/essentials/udfs/common/stat/ya.make
+++ b/yql/essentials/udfs/common/stat/ya.make
@@ -16,7 +16,8 @@ YQL_UDF_CONTRIB(stat_udf)
     
     END()
 
-RECURSE_FOR_TESTS(
-    ut
-)
-
+IF (NOT EXPORT_CMAKE)
+    RECURSE_FOR_TESTS(
+        ut
+    )
+ENDIF()
diff --git a/yql/essentials/udfs/common/topfreq/ya.make b/yql/essentials/udfs/common/topfreq/ya.make
index ded936ca26..2c91204fed 100644
--- a/yql/essentials/udfs/common/topfreq/ya.make
+++ b/yql/essentials/udfs/common/topfreq/ya.make
@@ -16,9 +16,9 @@ YQL_UDF_CONTRIB(topfreq_udf)
     
     END()
 
-RECURSE_FOR_TESTS(
-    test
-    ut
-)
-
-
+IF (NOT EXPORT_CMAKE)
+    RECURSE_FOR_TESTS(
+        test
+        ut
+    )
+ENDIF()
diff --git a/yt/yt/core/rpc/grpc/channel.cpp b/yt/yt/core/rpc/grpc/channel.cpp
index 6431aaff4c..df36c40a9b 100644
--- a/yt/yt/core/rpc/grpc/channel.cpp
+++ b/yt/yt/core/rpc/grpc/channel.cpp
@@ -172,11 +172,13 @@ public:
             responseHandler->HandleError(std::move(error));
             return nullptr;
         }
-        return New<TCallHandler>(
+        auto callHandler = New<TCallHandler>(
             this,
             options,
             std::move(request),
             std::move(responseHandler));
+        callHandler->Initialize();
+        return callHandler;
     }
 
     void Terminate(const TError& error) override
@@ -258,6 +260,9 @@ private:
             , Request_(std::move(request))
             , ResponseHandler_(std::move(responseHandler))
             , GuardedCompletionQueue_(TDispatcher::Get()->PickRandomGuardedCompletionQueue())
+        { }
+
+        void Initialize()
         {
             YT_LOG_DEBUG("Sending request (RequestId: %v, Method: %v.%v, Timeout: %v)",
                 Request_->GetRequestId(),
diff --git a/yt/yt/core/rpc/grpc/dispatcher.cpp b/yt/yt/core/rpc/grpc/dispatcher.cpp
index 3fb5de54d9..ee1adfac32 100644
--- a/yt/yt/core/rpc/grpc/dispatcher.cpp
+++ b/yt/yt/core/rpc/grpc/dispatcher.cpp
@@ -91,9 +91,7 @@ private:
                 {.ShutdownPriority = GrpcDispatcherThreadShutdownPriority})
             , LibraryLock_(std::move(libraryLock))
             , GuardedCompletionQueue_(TGrpcCompletionQueuePtr(grpc_completion_queue_create_for_next(nullptr)))
-        {
-            Start();
-        }
+        { }
 
         TGuardedGrpcCompletionQueue* GetGuardedCompletionQueue()
         {
@@ -178,7 +176,9 @@ private:
         // Initialize grpc only after configuration is done.
         auto grpcLock = New<TGrpcLibraryLock>();
         for (int index = 0; index < Config_->DispatcherThreadCount; ++index) {
-            Threads_.push_back(New<TDispatcherThread>(grpcLock, index));
+            auto dispatcherThread = New<TDispatcherThread>(grpcLock, index);
+            dispatcherThread->Start();
+            Threads_.push_back(std::move(dispatcherThread));
         }
         LibraryLock_ = grpcLock;
         Initialized_.store(true);