diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
index 0160603c82..0c1a7cea7c 100644
--- a/3party/CMakeLists.txt
+++ b/3party/CMakeLists.txt
@@ -43,10 +43,18 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
   target_include_directories(utf8cpp SYSTEM INTERFACE "${OMIM_ROOT}/3party/utfcpp/source")
 endif()
 
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(BLAKE3 REQUIRED IMPORTED_TARGET GLOBAL libblake3)
+add_library(BLAKE3::blake3 ALIAS PkgConfig::BLAKE3)
+
+find_package(glaze CONFIG REQUIRED)
+set_target_properties(glaze::glaze PROPERTIES IMPORTED_GLOBAL TRUE)
+if (NOT TARGET glaze::glaze)
+  add_library(glaze::glaze ALIAS glaze)
+endif()
+
 add_subdirectory(agg)
-add_subdirectory(BLAKE3/c)
 add_subdirectory(bsdiff-courgette)
-add_subdirectory(glaze)
 add_subdirectory(minizip)
 add_subdirectory(open-location-code)
 add_subdirectory(opening_hours)
@@ -57,19 +65,4 @@ add_subdirectory(vulkan_wrapper)
 
 if (PLATFORM_DESKTOP)
   add_subdirectory(libtess2)
-
-  set(GLFW_BUILD_DOCS OFF CACHE BOOL "")
-  set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "")
-  set(GLFW_BUILD_TESTS OFF CACHE BOOL "")
-  set(GLFW_INSTALL OFF CACHE BOOL "")
-  set(GLFW_VULKAN_STATIC OFF CACHE BOOL "")
-  set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "")
-  # Disable ARC for glfw and re-enable after it because it's globally set in the root CMakeLists.txt
-  set(CMAKE_OBJC_FLAGS "")
-  add_subdirectory(glfw)
-  set_target_properties(glfw PROPERTIES UNITY_BUILD OFF)
-  set_target_properties(glfw PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO)
-  set(CMAKE_OBJC_FLAGS -fobjc-arc)
-
-  add_subdirectory(imgui)
 endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d32429e298..7e82299617 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,7 +226,7 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter)
 add_subdirectory(libs)
 
 if (PLATFORM_DESKTOP)
-  add_subdirectory(dev_sandbox)
+  #add_subdirectory(dev_sandbox)
   add_subdirectory(generator)
   add_subdirectory(tools)
   if (NOT SKIP_QT_GUI)
diff --git a/libs/coding/blake3.hpp b/libs/coding/blake3.hpp
index d56caa1871..cb81705bd1 100644
--- a/libs/coding/blake3.hpp
+++ b/libs/coding/blake3.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "3party/BLAKE3/c/blake3.h"
+#include <blake3.h>
 
 #include <array>
 #include <cstddef>
diff --git a/libs/search/search_quality/CMakeLists.txt b/libs/search/search_quality/CMakeLists.txt
index 376310e14e..a7b80dec23 100644
--- a/libs/search/search_quality/CMakeLists.txt
+++ b/libs/search/search_quality/CMakeLists.txt
@@ -19,12 +19,12 @@ target_link_libraries(${PROJECT_NAME}
     indexer
 )
 
-if (NOT SKIP_QT_GUI)
-  omim_add_tool_subdirectory(assessment_tool)
+if (BUILD_TESTING)
+  if (NOT SKIP_QT_GUI)
+   omim_add_tool_subdirectory(assessment_tool)
+  endif()
+  omim_add_tool_subdirectory(features_collector_tool)
+  omim_add_tool_subdirectory(samples_generation_tool)
+  omim_add_tool_subdirectory(search_quality_tool)
+  omim_add_test_subdirectory(search_quality_tests)
 endif()
-
-omim_add_tool_subdirectory(features_collector_tool)
-omim_add_tool_subdirectory(samples_generation_tool)
-omim_add_tool_subdirectory(search_quality_tool)
-
-omim_add_test_subdirectory(search_quality_tests)