diff --git a/ydb/core/tx/columnshard/blobs_action/abstract/ya.make b/ydb/core/tx/columnshard/blobs_action/abstract/ya.make
index 2f0b074a602a..f27dcb2c9ace 100644
--- a/ydb/core/tx/columnshard/blobs_action/abstract/ya.make
+++ b/ydb/core/tx/columnshard/blobs_action/abstract/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     gc.cpp
     common.cpp
diff --git a/ydb/core/tx/columnshard/blobs_action/bs/ya.make b/ydb/core/tx/columnshard/blobs_action/bs/ya.make
index 5974c3731cee..b6940aeec3f6 100644
--- a/ydb/core/tx/columnshard/blobs_action/bs/ya.make
+++ b/ydb/core/tx/columnshard/blobs_action/bs/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     gc.cpp
     gc_actor.cpp
diff --git a/ydb/core/tx/columnshard/blobs_action/counters/ya.make b/ydb/core/tx/columnshard/blobs_action/counters/ya.make
index 34b9f0747546..b2fabf7598ff 100644
--- a/ydb/core/tx/columnshard/blobs_action/counters/ya.make
+++ b/ydb/core/tx/columnshard/blobs_action/counters/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     read.cpp
     storage.cpp
diff --git a/ydb/core/tx/columnshard/blobs_action/tier/ya.make b/ydb/core/tx/columnshard/blobs_action/tier/ya.make
index 2df622ce24e0..57bcad5afa37 100644
--- a/ydb/core/tx/columnshard/blobs_action/tier/ya.make
+++ b/ydb/core/tx/columnshard/blobs_action/tier/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     adapter.cpp
     gc.cpp
diff --git a/ydb/core/tx/columnshard/blobs_action/transaction/ya.make b/ydb/core/tx/columnshard/blobs_action/transaction/ya.make
index 27268e5fd7f1..bab203fab75c 100644
--- a/ydb/core/tx/columnshard/blobs_action/transaction/ya.make
+++ b/ydb/core/tx/columnshard/blobs_action/transaction/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     tx_draft.cpp
     tx_write.cpp
diff --git a/ydb/core/tx/columnshard/blobs_action/ya.make b/ydb/core/tx/columnshard/blobs_action/ya.make
index 320cb63e4e79..fbb7ffa4b7f0 100644
--- a/ydb/core/tx/columnshard/blobs_action/ya.make
+++ b/ydb/core/tx/columnshard/blobs_action/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     blob_manager_db.cpp
     memory.cpp
diff --git a/ydb/core/tx/columnshard/engines/changes/abstract/ya.make b/ydb/core/tx/columnshard/engines/changes/abstract/ya.make
index 872a05a8540a..c78a00978832 100644
--- a/ydb/core/tx/columnshard/engines/changes/abstract/ya.make
+++ b/ydb/core/tx/columnshard/engines/changes/abstract/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     abstract.cpp
     compaction_info.cpp
diff --git a/ydb/core/tx/columnshard/engines/changes/compaction/ya.make b/ydb/core/tx/columnshard/engines/changes/compaction/ya.make
index aa52c0f9d6a0..71f7f1745e22 100644
--- a/ydb/core/tx/columnshard/engines/changes/compaction/ya.make
+++ b/ydb/core/tx/columnshard/engines/changes/compaction/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     merge_context.cpp
     column_cursor.cpp
diff --git a/ydb/core/tx/columnshard/engines/changes/counters/ya.make b/ydb/core/tx/columnshard/engines/changes/counters/ya.make
index 4434502eefa3..5e97e4266b65 100644
--- a/ydb/core/tx/columnshard/engines/changes/counters/ya.make
+++ b/ydb/core/tx/columnshard/engines/changes/counters/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     general.cpp
 )
diff --git a/ydb/core/tx/columnshard/engines/changes/ya.make b/ydb/core/tx/columnshard/engines/changes/ya.make
index faf74a7c05bb..8a6bc24609d8 100644
--- a/ydb/core/tx/columnshard/engines/changes/ya.make
+++ b/ydb/core/tx/columnshard/engines/changes/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     compaction.cpp
     ttl.cpp
diff --git a/ydb/core/tx/columnshard/engines/insert_table/ya.make b/ydb/core/tx/columnshard/engines/insert_table/ya.make
index 5f1d92bfb0ee..8ed43df7d430 100644
--- a/ydb/core/tx/columnshard/engines/insert_table/ya.make
+++ b/ydb/core/tx/columnshard/engines/insert_table/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     insert_table.cpp
     rt_insertion.cpp
diff --git a/ydb/core/tx/columnshard/engines/portions/ya.make b/ydb/core/tx/columnshard/engines/portions/ya.make
index 7a6c96a9a8a2..58d80bf3f47a 100644
--- a/ydb/core/tx/columnshard/engines/portions/ya.make
+++ b/ydb/core/tx/columnshard/engines/portions/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     portion_info.cpp
     column_record.cpp
diff --git a/ydb/core/tx/columnshard/engines/predicate/ya.make b/ydb/core/tx/columnshard/engines/predicate/ya.make
index 10d5ff3b45b7..8deb9ed79b3d 100644
--- a/ydb/core/tx/columnshard/engines/predicate/ya.make
+++ b/ydb/core/tx/columnshard/engines/predicate/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     container.cpp
     range.cpp
diff --git a/ydb/core/tx/columnshard/engines/reader/plain_reader/ya.make b/ydb/core/tx/columnshard/engines/reader/plain_reader/ya.make
index c9224b8d780c..1be24a42352a 100644
--- a/ydb/core/tx/columnshard/engines/reader/plain_reader/ya.make
+++ b/ydb/core/tx/columnshard/engines/reader/plain_reader/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     scanner.cpp
     source.cpp
diff --git a/ydb/core/tx/columnshard/engines/reader/ya.make b/ydb/core/tx/columnshard/engines/reader/ya.make
index f673de8200e8..45c372805a21 100644
--- a/ydb/core/tx/columnshard/engines/reader/ya.make
+++ b/ydb/core/tx/columnshard/engines/reader/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     conveyor_task.cpp
     description.cpp
diff --git a/ydb/core/tx/columnshard/engines/scheme/ya.make b/ydb/core/tx/columnshard/engines/scheme/ya.make
index bace1130d669..8cbb19be7f98 100644
--- a/ydb/core/tx/columnshard/engines/scheme/ya.make
+++ b/ydb/core/tx/columnshard/engines/scheme/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     abstract_scheme.cpp
     snapshot_scheme.cpp
diff --git a/ydb/core/tx/columnshard/engines/storage/optimizer/abstract/ya.make b/ydb/core/tx/columnshard/engines/storage/optimizer/abstract/ya.make
index 140b1ed351bf..3e623be27d15 100644
--- a/ydb/core/tx/columnshard/engines/storage/optimizer/abstract/ya.make
+++ b/ydb/core/tx/columnshard/engines/storage/optimizer/abstract/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     optimizer.cpp
 )
diff --git a/ydb/core/tx/columnshard/engines/storage/optimizer/intervals/ya.make b/ydb/core/tx/columnshard/engines/storage/optimizer/intervals/ya.make
index f76c42447ab7..04930f12fcff 100644
--- a/ydb/core/tx/columnshard/engines/storage/optimizer/intervals/ya.make
+++ b/ydb/core/tx/columnshard/engines/storage/optimizer/intervals/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     optimizer.cpp
     blob_size.cpp
diff --git a/ydb/core/tx/columnshard/engines/storage/optimizer/lbuckets/ya.make b/ydb/core/tx/columnshard/engines/storage/optimizer/lbuckets/ya.make
index 3f96a5717477..26c76d72d790 100644
--- a/ydb/core/tx/columnshard/engines/storage/optimizer/lbuckets/ya.make
+++ b/ydb/core/tx/columnshard/engines/storage/optimizer/lbuckets/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     optimizer.cpp
     counters.cpp
diff --git a/ydb/core/tx/columnshard/engines/storage/optimizer/levels/ya.make b/ydb/core/tx/columnshard/engines/storage/optimizer/levels/ya.make
index 3f96a5717477..26c76d72d790 100644
--- a/ydb/core/tx/columnshard/engines/storage/optimizer/levels/ya.make
+++ b/ydb/core/tx/columnshard/engines/storage/optimizer/levels/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     optimizer.cpp
     counters.cpp
diff --git a/ydb/core/tx/columnshard/engines/storage/optimizer/ut/ya.make b/ydb/core/tx/columnshard/engines/storage/optimizer/ut/ya.make
index 9b7fcea27fe8..65adb6f4ca07 100644
--- a/ydb/core/tx/columnshard/engines/storage/optimizer/ut/ya.make
+++ b/ydb/core/tx/columnshard/engines/storage/optimizer/ut/ya.make
@@ -1,5 +1,9 @@
 UNITTEST_FOR(ydb/core/tx/columnshard/engines/storage/optimizer)
 
+OWNER(
+    g:kikimr
+)
+
 SIZE(SMALL)
 
 PEERDIR(
diff --git a/ydb/core/tx/columnshard/engines/storage/optimizer/ya.make b/ydb/core/tx/columnshard/engines/storage/optimizer/ya.make
index e1362859aaea..d678a1dcc8f7 100644
--- a/ydb/core/tx/columnshard/engines/storage/optimizer/ya.make
+++ b/ydb/core/tx/columnshard/engines/storage/optimizer/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 PEERDIR(
     ydb/core/tx/columnshard/engines/storage/optimizer/abstract
     ydb/core/tx/columnshard/engines/storage/optimizer/intervals
diff --git a/ydb/core/tx/columnshard/engines/storage/ya.make b/ydb/core/tx/columnshard/engines/storage/ya.make
index 811707b20d2d..3b45c823bc22 100644
--- a/ydb/core/tx/columnshard/engines/storage/ya.make
+++ b/ydb/core/tx/columnshard/engines/storage/ya.make
@@ -1,5 +1,9 @@
 LIBRARY()
 
+OWNER(
+    g:kikimr
+)
+
 SRCS(
     granule.cpp
     storage.cpp
diff --git a/ydb/core/tx/columnshard/engines/ut/ya.make b/ydb/core/tx/columnshard/engines/ut/ya.make
index 13fc351c5a56..ef608ef83827 100644
--- a/ydb/core/tx/columnshard/engines/ut/ya.make
+++ b/ydb/core/tx/columnshard/engines/ut/ya.make
@@ -1,5 +1,10 @@
 UNITTEST_FOR(ydb/core/tx/columnshard/engines)
 
+OWNER(
+    chertus
+    g:kikimr
+)
+
 FORK_SUBTESTS()
 
 SPLIT_FACTOR(60)
diff --git a/ydb/core/tx/columnshard/engines/writer/buffer/actor.cpp b/ydb/core/tx/columnshard/engines/writer/buffer/actor.cpp
index 59ba082d0751..dff04e775668 100644
--- a/ydb/core/tx/columnshard/engines/writer/buffer/actor.cpp
+++ b/ydb/core/tx/columnshard/engines/writer/buffer/actor.cpp
@@ -1,51 +1,51 @@
-#include "actor.h"
-#include <ydb/core/tx/columnshard/columnshard_impl.h>
-
-namespace NKikimr::NColumnShard::NWriting {
-
-TActor::TActor(ui64 tabletId, const TActorId& parent)
-    : TabletId(tabletId)
-    , ParentActorId(parent)
-{
-
-}
-
-void TActor::Flush() {
-    if (Aggregations.size()) {
-        AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("event", "flush_writing")("size", SumSize)("count", Aggregations.size());
-        auto action = Aggregations.front()->GetWriteData()->GetBlobsAction();
-        auto writeController = std::make_shared<NOlap::TIndexedWriteController>(ParentActorId, action, std::move(Aggregations));
-        if (action->NeedDraftTransaction()) {
-            TActorContext::AsActorContext().Send(ParentActorId, std::make_unique<NColumnShard::TEvPrivate::TEvWriteDraft>(writeController));
-        } else {
-            TActorContext::AsActorContext().Register(NColumnShard::CreateWriteActor(TabletId, writeController, TInstant::Max()));
-        }
-        Aggregations.clear();
-        SumSize = 0;
-    } else {
-        AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("event", "skip_flush_writing");
-    }
-}
-
-void TActor::Handle(TEvFlushBuffer::TPtr& /*ev*/) {
-    FlushDuration = TDuration::MilliSeconds(AppDataVerified().ColumnShardConfig.GetWritingBufferDurationMs());
-    Flush();
-    if (!FlushDuration) {
-        Schedule(TDuration::MilliSeconds(500), new TEvFlushBuffer);
-    } else {
-        Schedule(FlushDuration, new TEvFlushBuffer);
-    }
-}
-
-void TActor::Handle(TEvAddInsertedDataToBuffer::TPtr& ev) {
-    auto* evBase = ev->Get();
-    AFL_VERIFY(evBase->GetWriteData()->GetBlobsAction()->GetStorageId() == NOlap::IStoragesManager::DefaultStorageId);
-    SumSize += evBase->GetWriteData()->GetSize();
-    Aggregations.emplace_back(std::make_shared<NOlap::TWriteAggregation>(evBase->GetWriteData(), std::move(evBase->MutableBlobsToWrite())));
-    if (SumSize > 4 * 1024 * 1024 || Aggregations.size() > 750 || !FlushDuration) {
-        Flush();
-    }
-}
-
-
-}
+#include "actor.h"
+#include <ydb/core/tx/columnshard/columnshard_impl.h>
+
+namespace NKikimr::NColumnShard::NWriting {
+
+TActor::TActor(ui64 tabletId, const TActorId& parent)
+    : TabletId(tabletId)
+    , ParentActorId(parent)
+{
+
+}
+
+void TActor::Flush() {
+    if (Aggregations.size()) {
+        AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("event", "flush_writing")("size", SumSize)("count", Aggregations.size());
+        auto action = Aggregations.front()->GetWriteData()->GetBlobsAction();
+        auto writeController = std::make_shared<NOlap::TIndexedWriteController>(ParentActorId, action, std::move(Aggregations));
+        if (action->NeedDraftTransaction()) {
+            TActorContext::AsActorContext().Send(ParentActorId, std::make_unique<NColumnShard::TEvPrivate::TEvWriteDraft>(writeController));
+        } else {
+            TActorContext::AsActorContext().Register(NColumnShard::CreateWriteActor(TabletId, writeController, TInstant::Max()));
+        }
+        Aggregations.clear();
+        SumSize = 0;
+    } else {
+        AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("event", "skip_flush_writing");
+    }
+}
+
+void TActor::Handle(TEvFlushBuffer::TPtr& /*ev*/) {
+    FlushDuration = TDuration::MilliSeconds(AppDataVerified().ColumnShardConfig.GetWritingBufferDurationMs());
+    Flush();
+    if (!FlushDuration) {
+        Schedule(TDuration::MilliSeconds(500), new TEvFlushBuffer);
+    } else {
+        Schedule(FlushDuration, new TEvFlushBuffer);
+    }
+}
+
+void TActor::Handle(TEvAddInsertedDataToBuffer::TPtr& ev) {
+    auto* evBase = ev->Get();
+    AFL_VERIFY(evBase->GetWriteData()->GetBlobsAction()->GetStorageId() == NOlap::IStoragesManager::DefaultStorageId);
+    SumSize += evBase->GetWriteData()->GetSize();
+    Aggregations.emplace_back(std::make_shared<NOlap::TWriteAggregation>(evBase->GetWriteData(), std::move(evBase->MutableBlobsToWrite())));
+    if (SumSize > 4 * 1024 * 1024 || Aggregations.size() > 750 || !FlushDuration) {
+        Flush();
+    }
+}
+
+
+}
diff --git a/ydb/core/tx/columnshard/engines/writer/buffer/actor.h b/ydb/core/tx/columnshard/engines/writer/buffer/actor.h
index ffee1a5f834b..3a6a0afa96ce 100644
--- a/ydb/core/tx/columnshard/engines/writer/buffer/actor.h
+++ b/ydb/core/tx/columnshard/engines/writer/buffer/actor.h
@@ -1,39 +1,39 @@
-#pragma once
-#include "events.h"
-#include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/core/tx/columnshard/engines/writer/indexed_blob_constructor.h>
-
-namespace NKikimr::NColumnShard::NWriting {
-
-class TActor: public TActorBootstrapped<TActor> {
-private:
-    std::vector<std::shared_ptr<NOlap::TWriteAggregation>> Aggregations;
-    const ui64 TabletId;
-    NActors::TActorId ParentActorId;
-    TDuration FlushDuration = TDuration::Zero();
-    ui64 SumSize = 0;
-    void Flush();
-public:
-    TActor(ui64 tabletId, const TActorId& parent);
-    ~TActor() = default;
-
-    void Handle(TEvAddInsertedDataToBuffer::TPtr& ev);
-    void Handle(TEvFlushBuffer::TPtr& ev);
-    void Bootstrap() {
-        Become(&TThis::StateWait);
-        Schedule(FlushDuration, new TEvFlushBuffer);
-    }
-
-    STFUNC(StateWait) {
-        TLogContextGuard gLogging(NActors::TLogContextBuilder::Build(NKikimrServices::TX_COLUMNSHARD)("tablet_id", TabletId)("parent", ParentActorId));
-        switch (ev->GetTypeRewrite()) {
-            cFunc(NActors::TEvents::TEvPoison::EventType, PassAway);
-            hFunc(TEvAddInsertedDataToBuffer, Handle);
-            hFunc(TEvFlushBuffer, Handle);
-            default:
-                AFL_VERIFY(false);
-        }
-    }
-};
-
-}
+#pragma once
+#include "events.h"
+#include <ydb/library/actors/core/actor_bootstrapped.h>
+#include <ydb/core/tx/columnshard/engines/writer/indexed_blob_constructor.h>
+
+namespace NKikimr::NColumnShard::NWriting {
+
+class TActor: public TActorBootstrapped<TActor> {
+private:
+    std::vector<std::shared_ptr<NOlap::TWriteAggregation>> Aggregations;
+    const ui64 TabletId;
+    NActors::TActorId ParentActorId;
+    TDuration FlushDuration = TDuration::Zero();
+    ui64 SumSize = 0;
+    void Flush();
+public:
+    TActor(ui64 tabletId, const TActorId& parent);
+    ~TActor() = default;
+
+    void Handle(TEvAddInsertedDataToBuffer::TPtr& ev);
+    void Handle(TEvFlushBuffer::TPtr& ev);
+    void Bootstrap() {
+        Become(&TThis::StateWait);
+        Schedule(FlushDuration, new TEvFlushBuffer);
+    }
+
+    STFUNC(StateWait) {
+        TLogContextGuard gLogging(NActors::TLogContextBuilder::Build(NKikimrServices::TX_COLUMNSHARD)("tablet_id", TabletId)("parent", ParentActorId));
+        switch (ev->GetTypeRewrite()) {
+            cFunc(NActors::TEvents::TEvPoison::EventType, PassAway);
+            hFunc(TEvAddInsertedDataToBuffer, Handle);
+            hFunc(TEvFlushBuffer, Handle);
+            default:
+                AFL_VERIFY(false);
+        }
+    }
+};
+
+}
diff --git a/ydb/core/tx/columnshard/engines/ya.make b/ydb/core/tx/columnshard/engines/ya.make
index 4b058ca9bbca..5b046868bde2 100644
--- a/ydb/core/tx/columnshard/engines/ya.make
+++ b/ydb/core/tx/columnshard/engines/ya.make
@@ -4,6 +4,11 @@ RECURSE_FOR_TESTS(
 
 LIBRARY()
 
+OWNER(
+    chertus
+    g:kikimr
+)
+
 SRCS(
     column_engine_logs.cpp
     column_engine.cpp