diff --git a/cloud/blockstore/libs/storage/partition/model/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/storage/partition/model/CMakeLists.darwin-x86_64.txt
index 4c0eb869f97..17ebf18a57a 100644
--- a/cloud/blockstore/libs/storage/partition/model/CMakeLists.darwin-x86_64.txt
+++ b/cloud/blockstore/libs/storage/partition/model/CMakeLists.darwin-x86_64.txt
@@ -45,7 +45,7 @@ target_sources(storage-partition-model PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/garbage_queue.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/mixed_index_cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/operation_status.cpp
-  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/unconfirmed_blob.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/blob_unique_id_with_range.cpp
 )
 generate_enum_serilization(storage-partition-model
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/mixed_index_cache.h
diff --git a/cloud/blockstore/libs/storage/partition/model/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/storage/partition/model/CMakeLists.linux-aarch64.txt
index 2e4474ff3b5..6bcd692ff57 100644
--- a/cloud/blockstore/libs/storage/partition/model/CMakeLists.linux-aarch64.txt
+++ b/cloud/blockstore/libs/storage/partition/model/CMakeLists.linux-aarch64.txt
@@ -46,7 +46,7 @@ target_sources(storage-partition-model PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/garbage_queue.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/mixed_index_cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/operation_status.cpp
-  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/unconfirmed_blob.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/blob_unique_id_with_range.cpp
 )
 generate_enum_serilization(storage-partition-model
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/mixed_index_cache.h
diff --git a/cloud/blockstore/libs/storage/partition/model/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/storage/partition/model/CMakeLists.linux-x86_64.txt
index 2e4474ff3b5..6bcd692ff57 100644
--- a/cloud/blockstore/libs/storage/partition/model/CMakeLists.linux-x86_64.txt
+++ b/cloud/blockstore/libs/storage/partition/model/CMakeLists.linux-x86_64.txt
@@ -46,7 +46,7 @@ target_sources(storage-partition-model PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/garbage_queue.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/mixed_index_cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/operation_status.cpp
-  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/unconfirmed_blob.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/blob_unique_id_with_range.cpp
 )
 generate_enum_serilization(storage-partition-model
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/mixed_index_cache.h
diff --git a/cloud/blockstore/libs/storage/partition/model/CMakeLists.windows-x86_64.txt b/cloud/blockstore/libs/storage/partition/model/CMakeLists.windows-x86_64.txt
index 4c0eb869f97..17ebf18a57a 100644
--- a/cloud/blockstore/libs/storage/partition/model/CMakeLists.windows-x86_64.txt
+++ b/cloud/blockstore/libs/storage/partition/model/CMakeLists.windows-x86_64.txt
@@ -45,7 +45,7 @@ target_sources(storage-partition-model PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/garbage_queue.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/mixed_index_cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/operation_status.cpp
-  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/unconfirmed_blob.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/blob_unique_id_with_range.cpp
 )
 generate_enum_serilization(storage-partition-model
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition/model/mixed_index_cache.h
diff --git a/cloud/blockstore/libs/storage/partition/part_actor_writemergedblocks.cpp b/cloud/blockstore/libs/storage/partition/part_actor_writemergedblocks.cpp
index 253587325d7..340c319795e 100644
--- a/cloud/blockstore/libs/storage/partition/part_actor_writemergedblocks.cpp
+++ b/cloud/blockstore/libs/storage/partition/part_actor_writemergedblocks.cpp
@@ -503,8 +503,7 @@ void TPartitionActor::WriteMergedBlocks(
 
     const bool addingUnconfirmedBlobsEnabledForCloud = Config->IsAddingUnconfirmedBlobsFeatureEnabled(
         PartitionConfig.GetCloudId(),
-        PartitionConfig.GetFolderId(),
-        PartitionConfig.GetDiskId());
+        PartitionConfig.GetFolderId());
     bool shouldAddUnconfirmedBlobs = Config->GetAddingUnconfirmedBlobsEnabled()
         || addingUnconfirmedBlobsEnabledForCloud;
     if (shouldAddUnconfirmedBlobs) {
diff --git a/cloud/blockstore/libs/storage/partition/part_ut.cpp b/cloud/blockstore/libs/storage/partition/part_ut.cpp
index fd29c1d2409..c10246b30ad 100644
--- a/cloud/blockstore/libs/storage/partition/part_ut.cpp
+++ b/cloud/blockstore/libs/storage/partition/part_ut.cpp
@@ -9738,7 +9738,7 @@ Y_UNIT_TEST_SUITE(TPartitionTest)
         config.SetUnconfirmedBlobCountHardLimit(1);
         auto runtime = PrepareTestActorRuntime(config);
 
-        runtime->SetObserverFunc([&] (auto& event) {
+        runtime->SetObserverFunc([&] (TTestActorRuntimeBase& runtime, TAutoPtr<IEventHandle>& event) {
             switch (event->GetTypeRewrite()) {
                 case TEvPartitionPrivate::EvAddConfirmedBlobsRequest: {
                     return TTestActorRuntime::EEventAction::DROP;