diff --git a/.github/workflows/build-cmake.yaml b/.github/workflows/build-cmake.yaml
index 3fc15c22b6e..e3ce377818f 100644
--- a/.github/workflows/build-cmake.yaml
+++ b/.github/workflows/build-cmake.yaml
@@ -59,6 +59,11 @@ jobs:
             cc: clang
             cxx: clang++
             developer-dir: /Applications/Xcode_26.2.app/Contents/Developer
+
+          - os: windows-2025-vs2026
+            cc: cl.exe
+            cxx: cl.exe
+
         exclude:
           - environment: { unity: OFF }
             cmake-build-type: Release
@@ -118,15 +123,37 @@ jobs:
           brew install ninja qt@6
           pip3 install tornado --break-system-packages
 
+      - name: Install Qt
+        if: ${{ runner.os == 'Windows' }}
+        uses: jurplel/install-qt-action@v4
+
       - name: Configure repository
+        if: ${{ runner.os != 'Windows' }}
+        shell: bash
         run: ./configure.sh
 
+      - uses: ilammy/msvc-dev-cmd@v1
+        if: ${{ runner.os == 'Windows' }}
+
+      - name: Bootstrap boost (Windows)
+        if: ${{ runner.os == 'Windows' }}
+        shell: cmd
+        run: .\bootstrap.bat msvc
+        working-directory: ./3party/boost
+
+      - name: Install boost (Windows)
+        if: ${{ runner.os == 'Windows' }}
+        shell: cmd
+        run: .\b2.exe headers
+        working-directory: ./3party/boost
+
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           key: ${{ github.workflow }}-${{ matrix.environment.os }}-${{ matrix.environment.cc }}-${{ matrix.environment.unity }}-${{ matrix.cmake-build-type }}
 
       - name: Configure cmake
+        shell: bash
         env:
           CC: ${{ matrix.environment.cc }}
           CXX: ${{ matrix.environment.cxx }}
@@ -136,13 +163,12 @@ jobs:
         run: |
           cmake . -B ${{ env.BUILD_DIR }} -G Ninja \
             -DCMAKE_BUILD_TYPE=${{ matrix.cmake-build-type }} \
-            -DCMAKE_C_FLAGS=-g1 \
-            -DCMAKE_CXX_FLAGS=-g1 \
             -DCMAKE_UNITY_BUILD=${UNITY_BUILD}
 
       - name: Compile
+        shell: bash
         working-directory: ${{ env.BUILD_DIR }}
-        run: ninja
+        run: cmake --build .
 
       - name: Prepare testing environment (Linux)
         if: ${{ runner.os == 'Linux' }}
diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
index e90e6251b2e..9f7aa6fd4a5 100644
--- a/3party/CMakeLists.txt
+++ b/3party/CMakeLists.txt
@@ -35,6 +35,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
   set(JANSSON_WITHOUT_TESTS ON)
   add_subdirectory(jansson/jansson/)
   target_include_directories(jansson INTERFACE "${PROJECT_BINARY_DIR}/3party/jansson/jansson/include")
+  if (PLATFORM_WIN)
+    set_target_properties(jansson PROPERTIES UNITY_BUILD OFF)
+  endif()
 
   # Add gflags library.
   set(GFLAGS_BUILD_TESTING OFF)
@@ -57,6 +60,20 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
   add_library(utf8cpp INTERFACE)
   add_library(utf8cpp::utf8cpp ALIAS utf8cpp)
   target_include_directories(utf8cpp INTERFACE "${OMIM_ROOT}/3party/utfcpp/source")
+
+  set(ZLIB_COMPAT ON)
+  set(ZLIB_ENABLE_TESTS OFF)
+  set(ZLIB_ALIASES OFF)
+  set(SKIP_INSTALL_ALL ON)
+  include(FetchContent)
+  FetchContent_Declare(
+    zlib-ng
+    GIT_REPOSITORY https://github.com/zlib-ng/zlib-ng.git
+    GIT_TAG 2.3.2
+  )
+  FetchContent_MakeAvailable(zlib-ng)
+  add_library(ZLIB::ZLIB ALIAS zlib-ng)
+  set_target_properties(zlib-ng PROPERTIES UNITY_BUILD OFF)
 endif()
 
 add_subdirectory(agg)
diff --git a/3party/protobuf/CMakeLists.txt b/3party/protobuf/CMakeLists.txt
index 8507767315a..7f491bd1435 100644
--- a/3party/protobuf/CMakeLists.txt
+++ b/3party/protobuf/CMakeLists.txt
@@ -37,6 +37,10 @@ if(NOT PLATFORM_WIN)
   target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_PTHREAD)
 endif ()
 
+if(PLATFORM_WIN)
+  set_target_properties(${PROJECT_NAME} PROPERTIES UNITY_BUILD OFF)
+endif()
+
 target_compile_options(${PROJECT_NAME} PRIVATE
   $<$<CXX_COMPILER_ID:AppleClang,Clang>:-Wno-shorten-64-to-32>
   $<$<CXX_COMPILER_ID:AppleClang,Clang,GNU>:-Wno-deprecated-declarations>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d9128ce6c9..2f58597335a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,8 @@ endif()
 
 # Global compile options for all configurations.
 if (MSVC)
-  add_compile_options(/utf-8)
+  add_compile_options(/utf-8 /bigobj)
+  add_compile_options(/fp:fast)
   add_link_options(/INCREMENTAL:NO)
 else()
   add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
@@ -187,10 +188,9 @@ if (WITH_SYSTEM_PROVIDED_3PARTY)
   find_package(jansson CONFIG REQUIRED)
   find_package(pugixml REQUIRED)
   find_package(utf8cpp REQUIRED)
+  find_package(ZLIB REQUIRED)
 endif()
 
-find_package(ZLIB REQUIRED)
-
 # Include 3party dependencies.
 add_subdirectory(3party)
 
diff --git a/dev_sandbox/main.cpp b/dev_sandbox/main.cpp
index 7d876e2d12c..e9d7644dd41 100644
--- a/dev_sandbox/main.cpp
+++ b/dev_sandbox/main.cpp
@@ -260,8 +260,10 @@ int main(int argc, char * argv[])
   if (!settings::Get(settings::kDeveloperMode, outvalue))
     settings::Set(settings::kDeveloperMode, true);
 
+#if !defined(OMIM_OS_WINDOWS)
   if (!FLAGS_lang.empty())
     (void)::setenv("LANGUAGE", FLAGS_lang.c_str(), 1);
+#endif
 
   FrameworkParams frameworkParams;
   Framework framework(frameworkParams);
diff --git a/generator/generator_tests/descriptions_section_builder_tests.cpp b/generator/generator_tests/descriptions_section_builder_tests.cpp
index b726854b19a..7c2499247af 100644
--- a/generator/generator_tests/descriptions_section_builder_tests.cpp
+++ b/generator/generator_tests/descriptions_section_builder_tests.cpp
@@ -231,7 +231,7 @@ class TestDescriptionSectionBuilder
   static int SumPageSizes(std::vector<PageT> const & p)
   {
     return std::accumulate(std::begin(p), std::end(p), 0,
-                           [](int acc, PageT const & p) { return acc + p.second.size(); });
+                           [](int acc, PageT const & p) { return acc + static_cast<int>(p.second.size()); });
   }
 
   static bool CheckLangs(DescriptionsCollectionBuilderStat::LangStatistics const & stat)
diff --git a/libs/base/CMakeLists.txt b/libs/base/CMakeLists.txt
index e9bc68411f9..d6042848ddd 100644
--- a/libs/base/CMakeLists.txt
+++ b/libs/base/CMakeLists.txt
@@ -9,7 +9,6 @@ set(SRC
   ../std/windows.hpp
   array_adapters.hpp
   assert.hpp
-  atomic_shared_ptr.hpp
   base.cpp
   base.hpp
   beam.hpp
diff --git a/libs/base/atomic_shared_ptr.hpp b/libs/base/atomic_shared_ptr.hpp
deleted file mode 100644
index 3059f0dc09d..00000000000
--- a/libs/base/atomic_shared_ptr.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "base/macros.hpp"
-
-#include <memory>
-
-namespace base
-{
-// Template which provides methods for concurrently using shared pointers.
-template <typename T>
-class AtomicSharedPtr final
-{
-public:
-  using ContentType = T const;
-  using ValueType = std::shared_ptr<ContentType>;
-
-  AtomicSharedPtr() = default;
-
-  void Set(ValueType value) noexcept { atomic_store(&m_wrapped, value); }
-  ValueType Get() const noexcept { return atomic_load(&m_wrapped); }
-
-private:
-  ValueType m_wrapped = std::make_shared<ContentType>();
-
-  DISALLOW_COPY_AND_MOVE(AtomicSharedPtr);
-};
-}  // namespace base
diff --git a/libs/base/base_tests/beam_tests.cpp b/libs/base/base_tests/beam_tests.cpp
index cd67823f318..0b8e26085b2 100644
--- a/libs/base/base_tests/beam_tests.cpp
+++ b/libs/base/base_tests/beam_tests.cpp
@@ -20,19 +20,19 @@ using namespace std;
 template <template <typename, typename> class Beam>
 void Smoke()
 {
-  size_t const kCapacity = 10;
-  size_t const kTotal = 100;
+  constexpr size_t kCapacity = 10;
+  constexpr size_t kTotal = 100;
 
-  CHECK_LESS_OR_EQUAL(kCapacity, kTotal, ());
+  static_assert(kCapacity <= kTotal);
 
   Beam<uint32_t, double> beam(kCapacity);
 
-  for (uint32_t i = 0; i < kTotal; ++i)
+  for (size_t i = 0; i < kTotal; ++i)
     beam.Add(i, static_cast<double>(i));
 
   vector<double> expected;
   for (size_t i = 0; i < kCapacity; ++i)
-    expected.emplace_back(kTotal - 1 - i);
+    expected.emplace_back(static_cast<double>(kTotal - 1 - i));
 
   vector<double> actual;
   actual.reserve(kCapacity);
diff --git a/libs/coding/coding_tests/fixed_bits_ddvector_test.cpp b/libs/coding/coding_tests/fixed_bits_ddvector_test.cpp
index 72c7b1c96a4..46a69daab4d 100644
--- a/libs/coding/coding_tests/fixed_bits_ddvector_test.cpp
+++ b/libs/coding/coding_tests/fixed_bits_ddvector_test.cpp
@@ -35,7 +35,7 @@ void TestWithData(vector<uint32_t> const & lst)
       builder.PushBack(v);
     }
 
-    pair<uint32_t, uint32_t> expected(optCount, lst.size());
+    pair<uint32_t, uint32_t> expected(optCount, static_cast<uint32_t>(lst.size()));
     TEST_EQUAL(builder.GetCount(), expected, ());
   }
 
diff --git a/libs/coding/string_utf8_multilang.cpp b/libs/coding/string_utf8_multilang.cpp
index a72276a2456..7e5eda90d85 100644
--- a/libs/coding/string_utf8_multilang.cpp
+++ b/libs/coding/string_utf8_multilang.cpp
@@ -99,7 +99,7 @@ constexpr bool IsServiceLang(std::string_view const lang)
          lang == kLanguages[StringUtf8Multilang::kOldNameCode].m_code;
 }
 
-StringUtf8Multilang::Languages constexpr allLanguages = [] consteval
+StringUtf8Multilang::Languages const allLanguages = []
 {
   StringUtf8Multilang::Languages langs;
   std::ranges::copy_if(kLanguages, std::back_inserter(langs), [](StringUtf8Multilang::Lang const & lang)
@@ -107,7 +107,7 @@ StringUtf8Multilang::Languages constexpr allLanguages = [] consteval
   return langs;
 }();
 
-StringUtf8Multilang::Languages constexpr languagesWithoutService = [] consteval
+StringUtf8Multilang::Languages const languagesWithoutService = []
 {
   StringUtf8Multilang::Languages langs;
   std::ranges::copy_if(allLanguages, std::back_inserter(langs),
diff --git a/libs/coding/zlib.hpp b/libs/coding/zlib.hpp
index fec1ed814dc..c00498e498b 100644
--- a/libs/coding/zlib.hpp
+++ b/libs/coding/zlib.hpp
@@ -7,7 +7,7 @@
 #include <cstddef>
 #include <string>
 
-#include "zlib.h"
+#include <zlib.h>
 
 namespace coding
 {
diff --git a/libs/descriptions/descriptions_tests/descriptions_tests.cpp b/libs/descriptions/descriptions_tests/descriptions_tests.cpp
index d13e18d3131..c0e312bb880 100644
--- a/libs/descriptions/descriptions_tests/descriptions_tests.cpp
+++ b/libs/descriptions/descriptions_tests/descriptions_tests.cpp
@@ -35,7 +35,7 @@ DescriptionsCollection Convert(std::vector<RawDescription> const & rawDescriptio
 
     for (auto const & translation : desc.m_strings)
     {
-      ftDesc.m_strIndices.emplace_back(translation.first, descriptions.m_strings.size());
+      ftDesc.m_strIndices.emplace_back(translation.first, static_cast<uint32_t>(descriptions.m_strings.size()));
       descriptions.m_strings.push_back(translation.second);
     }
   }
diff --git a/libs/drape/batcher_helpers.cpp b/libs/drape/batcher_helpers.cpp
index e7ba18c76d0..af4e3de23e4 100644
--- a/libs/drape/batcher_helpers.cpp
+++ b/libs/drape/batcher_helpers.cpp
@@ -553,7 +553,7 @@ void TriangleFanBatch::BatchData(ref_ptr<GraphicsContext> context, ref_ptr<Attri
           // "(vertexCount + 1) - batchVertexCount" we allocate CPUBuffer on all remaining data
           // + first vertex of fan, that must be duplicate in the next buffer
           // + last vertex of currently uploaded data.
-          cpuBuffers.emplace_back(binding.GetElementSize(), (vertexCount + 2) - batchVertexCount);
+          cpuBuffers.emplace_back(static_cast<uint8_t>(binding.GetElementSize()), (vertexCount + 2) - batchVertexCount);
           CPUBuffer & cpuBuffer = cpuBuffers.back();
           cpuBuffer.UploadData(rawDataPointer, 1);
 
diff --git a/libs/drape/gl_functions.cpp b/libs/drape/gl_functions.cpp
index 9535bd8b741..b3b789e1703 100644
--- a/libs/drape/gl_functions.cpp
+++ b/libs/drape/gl_functions.cpp
@@ -843,7 +843,7 @@ void GLFunctions::glVertexAttributePointer(int attrLocation, uint32_t count, glC
   ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glVertexAttributePointerFn != nullptr, ());
   GLCHECK(glVertexAttributePointerFn(attrLocation, count, type, convert(needNormalize), stride,
-                                     reinterpret_cast<void *>(offset)));
+                                     reinterpret_cast<GLvoid const *>(static_cast<GLintptr>(offset))));
 }
 
 void GLFunctions::glGetActiveUniform(uint32_t programID, uint32_t uniformIndex, int32_t * uniformSize, glConst * type,
@@ -1048,7 +1048,7 @@ void GLFunctions::glDrawElements(glConst primitive, uint32_t sizeOfIndex, uint32
 {
   ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glDrawElements(primitive, indexCount, sizeOfIndex == sizeof(uint32_t) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT,
-                           reinterpret_cast<GLvoid *>(startIndex * sizeOfIndex)));
+                           reinterpret_cast<GLvoid const *>(static_cast<GLintptr>(startIndex * sizeOfIndex))));
 }
 
 void GLFunctions::glDrawArrays(glConst mode, int32_t first, uint32_t count)
diff --git a/libs/drape/harfbuzz_shaping.cpp b/libs/drape/harfbuzz_shaping.cpp
index fff802b001f..d90d0cf59c1 100644
--- a/libs/drape/harfbuzz_shaping.cpp
+++ b/libs/drape/harfbuzz_shaping.cpp
@@ -21,11 +21,11 @@ using TScriptsArray = std::array<UScriptCode, 32>;
 
 // Writes the script and the script extensions of the Unicode codepoint.
 // Returns the number of written scripts.
-size_t GetScriptExtensions(char32_t codepoint, TScriptsArray & scripts)
+int32_t GetScriptExtensions(char32_t codepoint, TScriptsArray & scripts)
 {
   // Fill scripts with the script extensions.
   UErrorCode icu_error = U_ZERO_ERROR;
-  size_t const count = uscript_getScriptExtensions(static_cast<UChar32>(codepoint), scripts.data(),
+  int32_t const count = uscript_getScriptExtensions(static_cast<UChar32>(codepoint), scripts.data(),
                                                    static_cast<int32_t>(scripts.max_size()), &icu_error);
   if (U_FAILURE(icu_error))
   {
@@ -38,7 +38,7 @@ size_t GetScriptExtensions(char32_t codepoint, TScriptsArray & scripts)
 
 // Intersects the script extensions set of codepoint with scripts and returns the updated size of the scripts.
 // The output result will be a subset of the input result (thus resultSize can only be smaller).
-size_t ScriptSetIntersect(char32_t codepoint, TScriptsArray & inOutScripts, size_t inOutScriptsCount)
+int32_t ScriptSetIntersect(char32_t codepoint, TScriptsArray & inOutScripts, int32_t inOutScriptsCount)
 {
   // Each codepoint has a Script property and a Script Extensions (Scx) property.
   //
@@ -65,7 +65,7 @@ size_t ScriptSetIntersect(char32_t codepoint, TScriptsArray & inOutScripts, size
   // For most of the codepoints, the script extensions set contains only one element. For CJK codepoints, it's common
   // to see 3-4 scripts. For really rare cases, the set can go above 20 scripts.
   TScriptsArray codepointScripts;
-  size_t const codepointScriptsCount = GetScriptExtensions(codepoint, codepointScripts);
+  size_t const codepointScriptsCount = static_cast<size_t>(GetScriptExtensions(codepoint, codepointScripts));
 
   // Implicit script 'inherited' is inheriting scripts from preceding codepoint.
   if (codepointScriptsCount == 1 && codepointScripts[0] == USCRIPT_INHERITED)
@@ -99,27 +99,27 @@ size_t ScriptSetIntersect(char32_t codepoint, TScriptsArray & inOutScripts, size
 //
 // Consider 3 characters with the script values {Kana}, {Hira, Kana}, {Kana}. Without script extensions only the first
 // script in each set would be taken into account, resulting in 3 segments where 1 would be enough.
-size_t ScriptInterval(std::u16string const & text, int32_t start, size_t length, UScriptCode & outScript)
+int32_t ScriptInterval(std::u16string const & text, int32_t start, int32_t length, UScriptCode & outScript)
 {
   ASSERT_GREATER(length, 0U, ());
 
   auto const begin = text.begin() + start;
-  auto const end = text.begin() + start + static_cast<int32_t>(length);
+  auto const end = text.begin() + start + length;
   auto iterator = begin;
 
   auto c32 = utf8::unchecked::next16(iterator);
 
   TScriptsArray scripts;
-  size_t scriptsSize = GetScriptExtensions(c32, scripts);
+  int32_t scriptsSize = GetScriptExtensions(c32, scripts);
 
   while (iterator != end)
   {
     auto prev = iterator;
     c32 = utf8::unchecked::next16(iterator);
     scriptsSize = ScriptSetIntersect(c32, scripts, scriptsSize);
-    if (scriptsSize == 0U)
+    if (scriptsSize == 0)
     {
-      length = prev - begin;
+      length = static_cast<int32_t>(prev - begin);
       break;
     }
   }
@@ -168,7 +168,7 @@ void GetSingleTextLineRuns(TextSegments & segments)
     {
       // Find the longest sequence of characters that have at least one common UScriptCode value.
       UScriptCode script = USCRIPT_INVALID_CODE;
-      size_t const scriptRunEnd =
+      int32_t const scriptRunEnd =
           ScriptInterval(segments.m_text, scriptRunStart, bidiRunEnd - scriptRunStart, script) + scriptRunStart;
       ASSERT_LESS(scriptRunStart, base::asserted_cast<int32_t>(scriptRunEnd), ());
 
@@ -179,7 +179,7 @@ void GetSingleTextLineRuns(TextSegments & segments)
                                        bidiLevel & 0x01 ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
 
       // Move to the next script sequence.
-      scriptRunStart = static_cast<int32_t>(scriptRunEnd);
+      scriptRunStart = scriptRunEnd;
     }
     // Move to the next direction sequence.
     bidiRunStart = bidiRunEnd;
diff --git a/libs/drape_frontend/drape_measurer.hpp b/libs/drape_frontend/drape_measurer.hpp
index 02b6a9db97d..ce6d182e584 100644
--- a/libs/drape_frontend/drape_measurer.hpp
+++ b/libs/drape_frontend/drape_measurer.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "drape/drape_diagnostics.hpp"
+#include "drape/drape_global.hpp"
 #include "drape/utils/glyph_usage_tracker.hpp"
 #include "drape/utils/gpu_mem_tracker.hpp"
 
@@ -10,7 +11,6 @@
 #include "base/timer.hpp"
 
 #include <chrono>
-#include <drape/drape_global.hpp>
 #include <map>
 #include <memory>
 #include <mutex>
diff --git a/libs/editor/config_loader.cpp b/libs/editor/config_loader.cpp
index 7648b38c379..743fd9da010 100644
--- a/libs/editor/config_loader.cpp
+++ b/libs/editor/config_loader.cpp
@@ -31,7 +31,7 @@ void Waiter::Interrupt()
   m_event.notify_all();
 }
 
-ConfigLoader::ConfigLoader(base::AtomicSharedPtr<EditorConfig> & config) : m_config(config)
+ConfigLoader::ConfigLoader(std::atomic<std::shared_ptr<EditorConfig>> & config) : m_config(config)
 {
   pugi::xml_document doc;
   LoadFromLocal(doc);
@@ -47,7 +47,7 @@ void ConfigLoader::ResetConfig(pugi::xml_document const & doc)
 {
   auto config = std::make_shared<EditorConfig>();
   config->SetConfig(doc);
-  m_config.Set(config);
+  m_config.store(config);
 }
 
 // static
diff --git a/libs/editor/config_loader.hpp b/libs/editor/config_loader.hpp
index e3fb2047a95..b46521d74f0 100644
--- a/libs/editor/config_loader.hpp
+++ b/libs/editor/config_loader.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "base/atomic_shared_ptr.hpp"
 #include "base/exception.hpp"
 #include "base/logging.hpp"
 
@@ -48,7 +47,7 @@ class Waiter
 class ConfigLoader
 {
 public:
-  explicit ConfigLoader(base::AtomicSharedPtr<EditorConfig> & config);
+  explicit ConfigLoader(std::atomic<std::shared_ptr<EditorConfig>> & config);
   ~ConfigLoader();
 
   // Static methods for production and testing.
@@ -57,7 +56,7 @@ class ConfigLoader
 private:
   void ResetConfig(pugi::xml_document const & doc);
 
-  base::AtomicSharedPtr<EditorConfig> & m_config;
+  std::atomic<std::shared_ptr<EditorConfig>> & m_config;
 
   Waiter m_waiter;
 };
diff --git a/libs/editor/editor_tests/config_loader_test.cpp b/libs/editor/editor_tests/config_loader_test.cpp
index fef1c1323a2..b53a5be7ae4 100644
--- a/libs/editor/editor_tests/config_loader_test.cpp
+++ b/libs/editor/editor_tests/config_loader_test.cpp
@@ -5,8 +5,6 @@
 
 #include "platform/platform_tests_support/scoped_file.hpp"
 
-#include "base/atomic_shared_ptr.hpp"
-
 #include <pugixml.hpp>
 
 namespace
@@ -24,10 +22,10 @@ void CheckGeneralTags(pugi::xml_document const & doc)
 
 UNIT_TEST(ConfigLoader_Base)
 {
-  base::AtomicSharedPtr<EditorConfig> config;
+  std::atomic<std::shared_ptr<EditorConfig>> config;
   ConfigLoader loader(config);
 
-  TEST(!config.Get()->GetTypesThatCanBeAdded().empty(), ());
+  TEST(!config.load()->GetTypesThatCanBeAdded().empty(), ());
 }
 
 // This functionality is not used and corresponding server is not working.
diff --git a/libs/editor/editor_tests/osm_editor_test.cpp b/libs/editor/editor_tests/osm_editor_test.cpp
index 89f40eb14f1..35936d0e7d5 100644
--- a/libs/editor/editor_tests/osm_editor_test.cpp
+++ b/libs/editor/editor_tests/osm_editor_test.cpp
@@ -214,7 +214,7 @@ void EditorTest::GetFeatureTypeInfoTest()
   {
     MwmSet::MwmId mwmId;
 
-    TEST(!editor.GetFeatureTypeInfo((*editor.m_features.Get()), mwmId, 0), ());
+    TEST(!editor.GetFeatureTypeInfo((*editor.m_features.load()), mwmId, 0), ());
   }
 
   auto const mwmId = ConstructTestMwm([](TestMwmBuilder & builder)
@@ -225,12 +225,12 @@ void EditorTest::GetFeatureTypeInfoTest()
 
   ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
   {
-    auto const featuresBefore = editor.m_features.Get();
+    auto const featuresBefore = editor.m_features.load();
     TEST(!editor.GetFeatureTypeInfo(*featuresBefore, ft.GetID().m_mwmId, ft.GetID().m_index), ());
 
     SetBuildingLevelsToOne(ft);
 
-    auto const featuresAfter = editor.m_features.Get();
+    auto const featuresAfter = editor.m_features.load();
     auto const fti = editor.GetFeatureTypeInfo(*featuresAfter, ft.GetID().m_mwmId, ft.GetID().m_index);
     TEST_NOT_EQUAL(fti, nullptr, ());
     TEST_EQUAL(fti->m_object.GetID(), ft.GetID(), ());
@@ -474,9 +474,9 @@ void EditorTest::ClearAllLocalEditsTest()
   osm::EditableMapObject emo;
   CreateCafeAtPoint({3.0, 3.0}, mwmId, emo);
 
-  TEST(!editor.m_features.Get()->empty(), ());
+  TEST(!editor.m_features.load()->empty(), ());
   editor.ClearAllLocalEdits();
-  TEST(editor.m_features.Get()->empty(), ());
+  TEST(editor.m_features.load()->empty(), ());
 }
 
 void EditorTest::GetFeaturesByStatusTest()
@@ -571,7 +571,7 @@ void EditorTest::OnMapDeregisteredTest()
 
   ForEachCafeAtPoint(m_dataSource, m2::PointD(2.0, 2.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
-  TEST_EQUAL(editor.m_features.Get()->size(), 2, (editor.m_features.Get()->size()));
+  TEST_EQUAL(editor.m_features.load()->size(), 2, (editor.m_features.load()->size()));
 
   {
     platform::tests_support::AsyncGuiThread guiThread;
@@ -580,7 +580,7 @@ void EditorTest::OnMapDeregisteredTest()
   // The map is deregistered but the edits are not deleted until
   // LoadEdits() is called again, either on the next startup or
   // on registering a new map.
-  TEST_EQUAL(editor.m_features.Get()->size(), 2, ());
+  TEST_EQUAL(editor.m_features.load()->size(), 2, ());
 
   {
     platform::tests_support::AsyncGuiThread guiThread;
@@ -590,13 +590,13 @@ void EditorTest::OnMapDeregisteredTest()
     TEST(gbMwmId.IsAlive(), ());
   }
   // The same map was registered: the edits are still here.
-  TEST_EQUAL(editor.m_features.Get()->size(), 2, ());
+  TEST_EQUAL(editor.m_features.load()->size(), 2, ());
 
   {
     platform::tests_support::AsyncGuiThread guiThread;
     m_dataSource.DeregisterMap(gbMwmId.GetInfo()->GetLocalFile().GetCountryFile());
   }
-  TEST_EQUAL(editor.m_features.Get()->size(), 2, ());
+  TEST_EQUAL(editor.m_features.load()->size(), 2, ());
 
   {
     platform::tests_support::AsyncGuiThread guiThread;
@@ -607,9 +607,9 @@ void EditorTest::OnMapDeregisteredTest()
   }
   // Another map was registered: all edits are reloaded and
   // the edits for the deleted map are removed.
-  TEST_EQUAL(editor.m_features.Get()->size(), 1, ());
-  auto const editedMwmId = editor.m_features.Get()->find(rfMwmId);
-  bool const result = (editedMwmId != editor.m_features.Get()->end());
+  TEST_EQUAL(editor.m_features.load()->size(), 1, ());
+  auto const editedMwmId = editor.m_features.load()->find(rfMwmId);
+  bool const result = (editedMwmId != editor.m_features.load()->end());
   TEST(result, ());
 }
 
@@ -956,13 +956,13 @@ void EditorTest::LoadMapEditsTest()
   CreateCafeAtPoint({5.0, 5.0}, rfMwmId, emo);
   features.emplace_back(emo.GetID());
 
-  editor.Save((*editor.m_features.Get()));
+  editor.Save((*editor.m_features.load()));
   editor.LoadEdits();
 
   auto const fillLoaded = [&editor](std::vector<FeatureID> & loadedFeatures)
   {
     loadedFeatures.clear();
-    for (auto const & mwm : *(editor.m_features.Get()))
+    for (auto const & mwm : *(editor.m_features.load()))
       for (auto const & index : mwm.second)
         loadedFeatures.emplace_back(index.second.m_object.GetID());
   };
@@ -993,12 +993,12 @@ void EditorTest::LoadMapEditsTest()
   m_dataSource.DeregisterMap(m_mwmFiles.back().GetCountryFile());
   TEST(RemoveMwm(newRfMwmId), ());
 
-  TEST_EQUAL(editor.m_features.Get()->size(), 2, ());
+  TEST_EQUAL(editor.m_features.load()->size(), 2, ());
 
   editor.LoadEdits();
   fillLoaded(loadedFeatures);
 
-  TEST_EQUAL(editor.m_features.Get()->size(), 1, ());
+  TEST_EQUAL(editor.m_features.load()->size(), 1, ());
   TEST_EQUAL(loadedFeatures.size(), 2, ());
 
   osm::EditableMapObject gbEmo;
@@ -1010,7 +1010,7 @@ void EditorTest::LoadMapEditsTest()
   editor.LoadEdits();
   fillLoaded(loadedFeatures);
 
-  TEST_EQUAL(editor.m_features.Get()->size(), 1, ());
+  TEST_EQUAL(editor.m_features.load()->size(), 1, ());
   TEST_EQUAL(loadedFeatures.size(), 1, ());
 
   m_dataSource.DeregisterMap(m_mwmFiles.back().GetCountryFile());
@@ -1025,7 +1025,7 @@ void EditorTest::LoadMapEditsTest()
   newGbMwmId.GetInfo()->m_version.SetSecondsSinceEpoch(time(nullptr) + 1);
 
   editor.LoadEdits();
-  TEST(editor.m_features.Get()->empty(), ());
+  TEST(editor.m_features.load()->empty(), ());
 }
 
 void EditorTest::SaveEditedFeatureTest()
@@ -1086,7 +1086,7 @@ void EditorTest::SaveTransactionTest()
 
   ForEachCafeAtPoint(m_dataSource, m2::PointD(10.0, 10.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
-  auto const features = editor.m_features.Get();
+  auto const features = editor.m_features.load();
 
   TEST_EQUAL(features->size(), 2, ());
   TEST_EQUAL(features->begin()->second.size(), 1, ());
@@ -1110,7 +1110,7 @@ void EditorTest::SaveTransactionTest()
 
     TEST_EQUAL(saveResult, osm::Editor::SaveResult::NoFreeSpaceError, ());
 
-    auto const features = editor.m_features.Get();
+    auto const features = editor.m_features.load();
     auto const mwmIt = features->find(mwmId);
 
     TEST(mwmIt != features->end(), ());
@@ -1133,7 +1133,7 @@ void EditorTest::SaveTransactionTest()
 
     TEST_EQUAL(saveResult, osm::Editor::SaveResult::SavingError, ());
 
-    auto const features = editor.m_features.Get();
+    auto const features = editor.m_features.load();
     auto const mwmIt = features->find(mwmId);
 
     TEST(mwmIt != features->end(), ());
@@ -1147,7 +1147,7 @@ void EditorTest::SaveTransactionTest()
     ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0),
                        [&editor](FeatureType & ft) { editor.DeleteFeature(ft.GetID()); });
 
-    auto const features = editor.m_features.Get();
+    auto const features = editor.m_features.load();
     auto const mwmIt = features->find(mwmId);
 
     TEST(mwmIt != features->end(), ());
@@ -1161,7 +1161,7 @@ void EditorTest::SaveTransactionTest()
     ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0),
                        [&editor](FeatureType & ft) { editor.MarkFeatureAsObsolete(ft.GetID()); });
 
-    auto const features = editor.m_features.Get();
+    auto const features = editor.m_features.load();
     auto const mwmIt = features->find(mwmId);
 
     TEST(mwmIt != features->end(), ());
@@ -1182,7 +1182,7 @@ void EditorTest::SaveTransactionTest()
 
     TEST_EQUAL(editor.m_notes->NotUploadedNotesCount(), 0, ());
 
-    auto const features = editor.m_features.Get();
+    auto const features = editor.m_features.load();
     auto const mwmIt = features->find(mwmId);
 
     TEST(mwmIt != features->end(), ());
@@ -1196,7 +1196,7 @@ void EditorTest::SaveTransactionTest()
     ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0),
                        [&editor](FeatureType & ft) { editor.RollBackChanges(ft.GetID()); });
 
-    auto const features = editor.m_features.Get();
+    auto const features = editor.m_features.load();
     auto const mwmIt = features->find(mwmId);
 
     TEST(mwmIt != features->end(), ());
@@ -1208,7 +1208,7 @@ void EditorTest::SaveTransactionTest()
 
   {
     editor.ClearAllLocalEdits();
-    TEST_EQUAL(editor.m_features.Get()->size(), 2, ());
+    TEST_EQUAL(editor.m_features.load()->size(), 2, ());
   }
 
   {
@@ -1217,7 +1217,7 @@ void EditorTest::SaveTransactionTest()
       editor.OnMapDeregistered(mwmId.GetInfo()->GetLocalFile());
     }
 
-    auto const features = editor.m_features.Get();
+    auto const features = editor.m_features.load();
     auto const mwmIt = features->find(mwmId);
 
     TEST(mwmIt != features->end(), ());
@@ -1230,7 +1230,7 @@ void EditorTest::SaveTransactionTest()
   optionalSaveStorage.AllowSave(true);
 
   editor.ClearAllLocalEdits();
-  TEST(editor.m_features.Get()->empty(), ());
+  TEST(editor.m_features.load()->empty(), ());
 }
 
 void EditorTest::Cleanup(platform::LocalCountryFile const & map)
@@ -1283,7 +1283,7 @@ void EditorTest::LoadExistingEditsXml()
   editor.SetStorageForTesting(std::move(memStorage));
 
   editor.LoadEdits();
-  TEST_EQUAL(editor.m_features.Get()->size(), 1, ());
+  TEST_EQUAL(editor.m_features.load()->size(), 1, ());
 }
 
 }  // namespace testing
diff --git a/libs/editor/osm_editor.cpp b/libs/editor/osm_editor.cpp
index 8d3dde9f572..cc64235937f 100644
--- a/libs/editor/osm_editor.cpp
+++ b/libs/editor/osm_editor.cpp
@@ -166,7 +166,7 @@ void Editor::LoadEdits()
   if (!m_storage->Load(doc))
     return;
 
-  m_features.Set(make_shared<FeaturesContainer>());
+  m_features.store(make_shared<FeaturesContainer>());
   auto loadedFeatures = make_shared<FeaturesContainer>();
 
   auto rootNode = doc.child(kXmlRootNode);
@@ -201,7 +201,7 @@ void Editor::LoadEdits()
   if (needRewriteEdits)
     SaveTransaction(loadedFeatures);
   else
-    m_features.Set(loadedFeatures);
+    m_features.store(loadedFeatures);
 }
 
 bool Editor::Save(FeaturesContainer const & features) const
@@ -264,7 +264,7 @@ bool Editor::SaveTransaction(std::shared_ptr<FeaturesContainer> const & features
   if (!Save(*features))
     return false;
 
-  m_features.Set(features);
+  m_features.store(features);
   return true;
 }
 
@@ -284,24 +284,24 @@ void Editor::OnMapRegistered(platform::LocalCountryFile const &)
 
 FeatureStatus Editor::GetFeatureStatus(MwmId const & mwmId, uint32_t index) const
 {
-  return GetFeatureStatusImpl(*m_features.Get(), mwmId, index);
+  return GetFeatureStatusImpl(*m_features.load(), mwmId, index);
 }
 
 FeatureStatus Editor::GetFeatureStatus(FeatureID const & fid) const
 {
-  return GetFeatureStatusImpl(*m_features.Get(), fid.m_mwmId, fid.m_index);
+  return GetFeatureStatusImpl(*m_features.load(), fid.m_mwmId, fid.m_index);
 }
 
 bool Editor::IsFeatureUploaded(MwmId const & mwmId, uint32_t index) const
 {
-  return IsFeatureUploadedImpl(*m_features.Get(), mwmId, index);
+  return IsFeatureUploadedImpl(*m_features.load(), mwmId, index);
 }
 
 void Editor::DeleteFeature(FeatureID const & fid)
 {
   CHECK_THREAD_CHECKER(MainThreadChecker, ());
 
-  auto editableFeatures = make_shared<FeaturesContainer>(*m_features.Get());
+  auto editableFeatures = make_shared<FeaturesContainer>(*m_features.load());
 
   auto const mwm = editableFeatures->find(fid.m_mwmId);
 
@@ -347,7 +347,7 @@ Editor::SaveResult Editor::SaveEditedFeature(EditableMapObject const & emo)
   FeatureID const & fid = emo.GetID();
   FeatureTypeInfo fti;
 
-  auto const features = m_features.Get();
+  auto const features = m_features.load();
 
   auto const featureStatus = GetFeatureStatusImpl(*features, fid.m_mwmId, fid.m_index);
   ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Obsolete, ("Obsolete feature cannot be modified."));
@@ -445,7 +445,7 @@ bool Editor::RollBackChanges(FeatureID const & fid)
 void Editor::ForEachCreatedFeature(MwmId const & id, FeatureIndexFunctor const & f, m2::RectD const & rect,
                                    int /*scale*/) const
 {
-  auto const features = m_features.Get();
+  auto const features = m_features.load();
 
   auto const mwmFound = features->find(id);
   if (mwmFound == features->cend())
@@ -465,7 +465,7 @@ void Editor::ForEachCreatedFeature(MwmId const & id, FeatureIndexFunctor const &
 
 std::optional<osm::EditableMapObject> Editor::GetEditedFeature(FeatureID const & fid) const
 {
-  auto const features = m_features.Get();
+  auto const features = m_features.load();
   auto const * featureInfo = GetFeatureTypeInfo(*features, fid.m_mwmId, fid.m_index);
   if (featureInfo == nullptr)
     return {};
@@ -475,7 +475,7 @@ std::optional<osm::EditableMapObject> Editor::GetEditedFeature(FeatureID const &
 
 std::optional<osm::EditJournal> Editor::GetEditedFeatureJournal(FeatureID const & fid) const
 {
-  auto const features = m_features.Get();
+  auto const features = m_features.load();
   auto const * featureInfo = GetFeatureTypeInfo(*features, fid.m_mwmId, fid.m_index);
   if (featureInfo == nullptr)
     return {};
@@ -485,7 +485,7 @@ std::optional<osm::EditJournal> Editor::GetEditedFeatureJournal(FeatureID const
 
 bool Editor::GetEditedFeatureStreet(FeatureID const & fid, string & outFeatureStreet) const
 {
-  auto const features = m_features.Get();
+  auto const features = m_features.load();
   auto const * featureInfo = GetFeatureTypeInfo(*features, fid.m_mwmId, fid.m_index);
   if (featureInfo == nullptr)
     return false;
@@ -496,7 +496,7 @@ bool Editor::GetEditedFeatureStreet(FeatureID const & fid, string & outFeatureSt
 
 std::vector<uint32_t> Editor::GetFeaturesByStatus(MwmId const & mwmId, FeatureStatus status) const
 {
-  auto const features = m_features.Get();
+  auto const features = m_features.load();
 
   std::vector<uint32_t> result;
   auto const matchedMwm = features->find(mwmId);
@@ -512,7 +512,7 @@ std::vector<uint32_t> Editor::GetFeaturesByStatus(MwmId const & mwmId, FeatureSt
 
 EditableProperties Editor::GetEditableProperties(FeatureType & feature) const
 {
-  auto const features = m_features.Get();
+  auto const features = m_features.load();
 
   auto const & fid = feature.GetID();
   auto const featureStatus = GetFeatureStatusImpl(*features, fid.m_mwmId, fid.m_index);
@@ -548,7 +548,7 @@ EditableProperties Editor::GetEditableProperties(FeatureType & feature) const
 EditableProperties Editor::GetEditablePropertiesForTypes(feature::TypesHolder const & types) const
 {
   editor::TypeAggregatedDescription desc;
-  if (m_config.Get()->GetTypeDescription(types.ToObjectNames(), desc))
+  if (m_config.load()->GetTypeDescription(types.ToObjectNames(), desc))
   {
     return {std::move(desc.m_editableFields), desc.IsNameEditable(), desc.IsAddressEditable(),
             desc.IsCuisineEditable()};
@@ -561,7 +561,7 @@ bool Editor::HaveMapEditsOrNotesToUpload() const
   if (m_notes->NotUploadedNotesCount() != 0)
     return true;
 
-  auto const features = m_features.Get();
+  auto const features = m_features.load();
   return HaveMapEditsToUpload(*features);
 }
 
@@ -570,7 +570,7 @@ bool Editor::HaveMapEditsToUpload(MwmId const & mwmId) const
   if (!mwmId.IsAlive())
     return false;
 
-  auto const features = m_features.Get();
+  auto const features = m_features.load();
 
   auto const found = features->find(mwmId);
   if (found != features->cend())
@@ -589,7 +589,7 @@ void Editor::UploadChanges(string const & oauthToken, ChangesetTags tags, Finish
   if (m_isUploadingNow)
     return;
 
-  if (!HaveMapEditsToUpload(*m_features.Get()))
+  if (!HaveMapEditsToUpload(*m_features.load()))
     return;
 
   m_isUploadingNow = true;
@@ -602,7 +602,7 @@ void Editor::UploadChanges(string const & oauthToken, ChangesetTags tags, Finish
     int uploadedFeaturesCount = 0, errorsCount = 0;
     ChangesetWrapper changeset(oauthToken, std::move(tags));
 
-    auto const features = m_features.Get();
+    auto const features = m_features.load();
     LOG(LINFO, ("Features =", features->size()));
 
     for (auto const & id : *features)
@@ -894,7 +894,7 @@ void Editor::SaveUploadedInformation(FeatureID const & fid, UploadInfo const & u
 {
   CHECK_THREAD_CHECKER(MainThreadChecker, ());
 
-  auto editableFeatures = make_shared<FeaturesContainer>(*m_features.Get());
+  auto editableFeatures = make_shared<FeaturesContainer>(*m_features.load());
 
   auto id = editableFeatures->find(fid.m_mwmId);
   // Rare case: feature was deleted at the time of changes uploading.
@@ -986,7 +986,7 @@ bool Editor::RemoveFeatureIfExists(FeatureID const & fid)
 {
   CHECK_THREAD_CHECKER(MainThreadChecker, ());
 
-  auto editableFeatures = make_shared<FeaturesContainer>(*m_features.Get());
+  auto editableFeatures = make_shared<FeaturesContainer>(*m_features.load());
 
   auto matchedMwm = editableFeatures->find(fid.m_mwmId);
   if (matchedMwm == editableFeatures->end())
@@ -1012,7 +1012,7 @@ bool Editor::MarkFeatureAsObsolete(FeatureID const & fid)
 {
   CHECK_THREAD_CHECKER(MainThreadChecker, ());
 
-  auto editableFeatures = make_shared<FeaturesContainer>(*m_features.Get());
+  auto editableFeatures = make_shared<FeaturesContainer>(*m_features.load());
 
   auto const featureStatus = GetFeatureStatusImpl(*editableFeatures, fid.m_mwmId, fid.m_index);
   if (featureStatus != FeatureStatus::Untouched && featureStatus != FeatureStatus::Modified)
@@ -1045,7 +1045,7 @@ Editor::Stats Editor::GetStats() const
   Stats stats;
   LOG(LDEBUG, ("Edited features status:"));
 
-  auto const features = m_features.Get();
+  auto const features = m_features.load();
   for (auto const & id : *features)
   {
     for (auto & index : id.second)
@@ -1069,7 +1069,7 @@ Editor::Stats Editor::GetStats() const
 
 NewFeatureCategories Editor::GetNewFeatureCategories() const
 {
-  return NewFeatureCategories(*(m_config.Get()));
+  return NewFeatureCategories(*(m_config.load()));
 }
 
 FeatureID Editor::GenerateNewFeatureId(FeaturesContainer const & features, MwmId const & id) const
@@ -1101,7 +1101,7 @@ bool Editor::CreatePoint(uint32_t type, m2::PointD const & mercator, MwmId const
   }
 
   outFeature.SetMercator(mercator);
-  outFeature.SetID(GenerateNewFeatureId(*(m_features.Get()), id));
+  outFeature.SetID(GenerateNewFeatureId(*(m_features.load()), id));
   outFeature.SetType(type);
   outFeature.SetEditableProperties(GetEditablePropertiesForTypes(outFeature.GetTypes()));
   // Only point type features can be created at the moment.
@@ -1128,7 +1128,7 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid, featur
     sstr << "The place has gone or never existed. A user of Organic Maps application has reported "
             "that the POI was visible on the map (see snapshot date below), but was not found "
             "on the ground.\n";
-    auto const features = m_features.Get();
+    auto const features = m_features.load();
     auto const isCreated = GetFeatureStatusImpl(*features, fid.m_mwmId, fid.m_index) == FeatureStatus::Created;
     auto const createdAndUploaded = (isCreated && IsFeatureUploadedImpl(*features, fid.m_mwmId, fid.m_index));
     CHECK(!isCreated || createdAndUploaded, ());
diff --git a/libs/editor/osm_editor.hpp b/libs/editor/osm_editor.hpp
index a7eee5f3d4c..90378ca8e27 100644
--- a/libs/editor/osm_editor.hpp
+++ b/libs/editor/osm_editor.hpp
@@ -15,7 +15,6 @@
 
 #include "geometry/rect2d.hpp"
 
-#include "base/atomic_shared_ptr.hpp"
 #include "base/thread_checker.hpp"
 #include "base/timer.hpp"
 
@@ -244,7 +243,7 @@ class Editor final : public MwmSet::Observer
   void UpdateXMLFeatureTags(editor::XMLFeature & feature, std::list<JournalEntry> const & journal);
 
   /// Deleted, edited and created features.
-  base::AtomicSharedPtr<FeaturesContainer> m_features;
+  std::atomic<std::shared_ptr<FeaturesContainer>> m_features;
 
   std::unique_ptr<Delegate> m_delegate;
 
@@ -252,7 +251,7 @@ class Editor final : public MwmSet::Observer
   InvalidateFn m_invalidateFn;
 
   /// Contains information about what and how can be edited.
-  base::AtomicSharedPtr<editor::EditorConfig> m_config;
+  std::atomic<std::shared_ptr<editor::EditorConfig>> m_config;
   editor::ConfigLoader m_configLoader;
 
   /// Notes to be sent to osm.
diff --git a/libs/indexer/categories_holder.hpp b/libs/indexer/categories_holder.hpp
index 41bf3e941dc..ece01500a7d 100644
--- a/libs/indexer/categories_holder.hpp
+++ b/libs/indexer/categories_holder.hpp
@@ -25,8 +25,8 @@ class CategoriesHolder
       /// This language/locale code is completely different from our built-in langs in
       /// string_utf8_multilang.cpp and is only used for mapping user's input language to our values
       /// in categories.txt file
-      int8_t m_locale;
-      uint8_t m_prefixLengthToSuggest;
+      int8_t m_locale = 0;
+      uint8_t m_prefixLengthToSuggest = kEmptyPrefixLength;
     };
 
     std::vector<Name> m_synonyms;
diff --git a/libs/indexer/drules_include.hpp b/libs/indexer/drules_include.hpp
index 7c1ac11e13d..f6afb9e2403 100644
--- a/libs/indexer/drules_include.hpp
+++ b/libs/indexer/drules_include.hpp
@@ -3,13 +3,13 @@
 #include "std/target_os.hpp"
 
 // Both clang and gcc implements `#pragma GCC`
-#if !defined(__INTEL_COMPILER)
+#if !defined(__INTEL_COMPILER) && !defined(_MSC_VER)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif  // !defined(__INTEL_COMPILER)
+#endif  // !defined(__INTEL_COMPILER) && !defined(_MSC_VER)
 
 #include "indexer/drules_struct.pb.h"
 
-#if !defined(__INTEL_COMPILER)
+#if !defined(__INTEL_COMPILER) && !defined(_MSC_VER)
 #pragma GCC diagnostic pop
-#endif  // !defined(__INTEL_COMPILER)
+#endif  // !defined(__INTEL_COMPILER) && !defined(_MSC_VER)
diff --git a/libs/indexer/edit_journal.cpp b/libs/indexer/edit_journal.cpp
index 8174531474c..feb2a85740e 100644
--- a/libs/indexer/edit_journal.cpp
+++ b/libs/indexer/edit_journal.cpp
@@ -95,6 +95,7 @@ std::string EditJournal::ToString(osm::JournalEntry const & journalEntry)
     LegacyObjData const & legacyObjData = std::get<LegacyObjData>(journalEntry.data);
     return ToString(journalEntry.journalEntryType).append(": version=\"").append(legacyObjData.version).append("\"");
   }
+  default: return {};
   }
 }
 
@@ -105,6 +106,7 @@ std::string EditJournal::ToString(osm::JournalEntryType journalEntryType)
   case osm::JournalEntryType::TagModification: return "TagModification";
   case osm::JournalEntryType::ObjectCreated: return "ObjectCreated";
   case osm::JournalEntryType::LegacyObject: return "LegacyObject";
+  default: return {};
   }
 }
 
diff --git a/libs/map/framework.cpp b/libs/map/framework.cpp
index 1e0095cbfea..b5065beffa2 100644
--- a/libs/map/framework.cpp
+++ b/libs/map/framework.cpp
@@ -1814,7 +1814,7 @@ void Framework::OnUpdateGpsTrackPointsCallback(vector<pair<size_t, location::Gps
     ASSERT_LESS_OR_EQUAL(toRemove.first, toRemove.second, ());
     indicesRemove.reserve(toRemove.second - toRemove.first + 1);
     for (size_t i = toRemove.first; i <= toRemove.second; ++i)
-      indicesRemove.emplace_back(i);
+      indicesRemove.emplace_back(static_cast<uint32_t>(i));
   }
 
   m_drapeEngine->UpdateGpsTrackPoints(std::move(pointsAdd), std::move(indicesRemove));
diff --git a/libs/platform/platform_win.cpp b/libs/platform/platform_win.cpp
index 1f152d9bf79..444b200c496 100644
--- a/libs/platform/platform_win.cpp
+++ b/libs/platform/platform_win.cpp
@@ -1,3 +1,4 @@
+#include "platform/gui_thread.hpp"
 #include "platform/platform.hpp"
 #include "platform/socket.hpp"
 
diff --git a/libs/platform/preferred_languages.cpp b/libs/platform/preferred_languages.cpp
index aa21ceab175..30f9d37a6ad 100644
--- a/libs/platform/preferred_languages.cpp
+++ b/libs/platform/preferred_languages.cpp
@@ -18,8 +18,6 @@
 #include <CoreFoundation/CFString.h>
 #elif defined(OMIM_OS_WINDOWS)
 #include "std/windows.hpp"
-// for XP it's not defined
-#define MUI_LANGUAGE_NAME 0x8
 #elif defined(OMIM_OS_LINUX)
 #include <cstdlib>
 #elif defined(OMIM_OS_ANDROID)
@@ -29,409 +27,6 @@ std::string GetAndroidSystemLanguage();
 #error "Define language preferences for your platform"
 #endif
 
-#ifdef OMIM_OS_WINDOWS
-struct MSLocale
-{
-  uint16_t m_code;
-  char const * m_name;
-};
-/// Used on Windows XP which lacks LCIDToLocaleName function
-/// Taken from MSDN: http://msdn.microsoft.com/en-us/library/cc233968(v=PROT.10).aspx
-static MSLocale const gLocales[] = {
-    {0x1, "ar"},
-    {0x2, "bg"},
-    {0x3, "ca"},
-    {0x4, "zh-Hans"},
-    {0x5, "cs"},
-    {0x6, "da"},
-    {0x7, "de"},
-    {0x8, "el"},
-    {0x9, "en"},
-    {0xa, "es"},
-    {0xb, "fi"},
-    {0xc, "fr"},
-    {0xd, "he"},
-    {0xe, "hu"},
-    {0xf, "is"},
-    {0x10, "it"},
-    {0x11, "ja"},
-    {0x12, "ko"},
-    {0x13, "nl"},
-    {0x14, "no"},
-    {0x15, "pl"},
-    {0x16, "pt"},
-    {0x17, "rm"},
-    {0x18, "ro"},
-    {0x19, "ru"},
-    {0x1a, "hr"},
-    {0x1b, "sk"},
-    {0x1c, "sq"},
-    {0x1d, "sv"},
-    {0x1e, "th"},
-    {0x1f, "tr"},
-    {0x20, "ur"},
-    {0x21, "id"},
-    {0x22, "uk"},
-    {0x23, "be"},
-    {0x24, "sl"},
-    {0x25, "et"},
-    {0x26, "lv"},
-    {0x27, "lt"},
-    {0x28, "tg"},
-    {0x29, "fa"},
-    {0x2a, "vi"},
-    {0x2b, "hy"},
-    {0x2c, "az"},
-    {0x2d, "eu"},
-    {0x2e, "hsb"},
-    {0x2f, "mk"},
-    {0x32, "tn"},
-    {0x34, "xh"},
-    {0x35, "zu"},
-    {0x36, "af"},
-    {0x37, "ka"},
-    {0x38, "fo"},
-    {0x39, "hi"},
-    {0x3a, "mt"},
-    {0x3b, "se"},
-    {0x3c, "ga"},
-    {0x3e, "ms"},
-    {0x3f, "kk"},
-    {0x40, "ky"},
-    {0x41, "sw"},
-    {0x42, "tk"},
-    {0x43, "uz"},
-    {0x44, "tt"},
-    {0x45, "bn"},
-    {0x46, "pa"},
-    {0x47, "gu"},
-    {0x48, "or"},
-    {0x49, "ta"},
-    {0x4a, "te"},
-    {0x4b, "kn"},
-    {0x4c, "ml"},
-    {0x4d, "as"},
-    {0x4e, "mr"},
-    {0x4f, "sa"},
-    {0x50, "mn"},
-    {0x51, "bo"},
-    {0x52, "cy"},
-    {0x53, "km"},
-    {0x54, "lo"},
-    {0x56, "gl"},
-    {0x57, "kok"},
-    {0x5a, "syr"},
-    {0x5b, "si"},
-    {0x5d, "iu"},
-    {0x5e, "am"},
-    {0x5f, "tzm"},
-    {0x61, "ne"},
-    {0x62, "fy"},
-    {0x63, "ps"},
-    {0x64, "fil"},
-    {0x65, "dv"},
-    {0x68, "ha"},
-    {0x6a, "yo"},
-    {0x6b, "quz"},
-    {0x6c, "nso"},
-    {0x6d, "ba"},
-    {0x6e, "lb"},
-    {0x6f, "kl"},
-    {0x70, "ig"},
-    {0x78, "ii"},
-    {0x7a, "arn"},
-    {0x7c, "moh"},
-    {0x7e, "br"},
-    {0x80, "ug"},
-    {0x81, "mi"},
-    {0x82, "oc"},
-    {0x83, "co"},
-    {0x84, "gsw"},
-    {0x85, "sah"},
-    {0x86, "qut"},
-    {0x87, "rw"},
-    {0x88, "wo"},
-    {0x8c, "prs"},
-    {0x91, "gd"},
-    {0x401, "ar-SA"},
-    {0x402, "bg-BG"},
-    {0x403, "ca-ES"},
-    {0x404, "zh-TW"},
-    {0x405, "cs-CZ"},
-    {0x406, "da-DK"},
-    {0x407, "de-DE"},
-    {0x408, "el-GR"},
-    {0x409, "en-US"},
-    {0x40a, "es-ES_tradnl"},
-    {0x40b, "fi-FI"},
-    {0x40c, "fr-FR"},
-    {0x40d, "he-IL"},
-    {0x40e, "hu-HU"},
-    {0x40f, "is-IS"},
-    {0x410, "it-IT"},
-    {0x411, "ja-JP"},
-    {0x412, "ko-KR"},
-    {0x413, "nl-NL"},
-    {0x414, "nb-NO"},
-    {0x415, "pl-PL"},
-    {0x416, "pt-BR"},
-    {0x417, "rm-CH"},
-    {0x418, "ro-RO"},
-    {0x419, "ru-RU"},
-    {0x41a, "hr-HR"},
-    {0x41b, "sk-SK"},
-    {0x41c, "sq-AL"},
-    {0x41d, "sv-SE"},
-    {0x41e, "th-TH"},
-    {0x41f, "tr-TR"},
-    {0x420, "ur-PK"},
-    {0x421, "id-ID"},
-    {0x422, "uk-UA"},
-    {0x423, "be-BY"},
-    {0x424, "sl-SI"},
-    {0x425, "et-EE"},
-    {0x426, "lv-LV"},
-    {0x427, "lt-LT"},
-    {0x428, "tg-Cyrl-TJ"},
-    {0x429, "fa-IR"},
-    {0x42a, "vi-VN"},
-    {0x42b, "hy-AM"},
-    {0x42c, "az-Latn-AZ"},
-    {0x42d, "eu-ES"},
-    {0x42e, "wen-DE"},
-    {0x42f, "mk-MK"},
-    {0x430, "st-ZA"},
-    {0x431, "ts-ZA"},
-    {0x432, "tn-ZA"},
-    {0x433, "ven-ZA"},
-    {0x434, "xh-ZA"},
-    {0x435, "zu-ZA"},
-    {0x436, "af-ZA"},
-    {0x437, "ka-GE"},
-    {0x438, "fo-FO"},
-    {0x439, "hi-IN"},
-    {0x43a, "mt-MT"},
-    {0x43b, "se-NO"},
-    {0x43e, "ms-MY"},
-    {0x43f, "kk-KZ"},
-    {0x440, "ky-KG"},
-    {0x441, "sw-KE"},
-    {0x442, "tk-TM"},
-    {0x443, "uz-Latn-UZ"},
-    {0x444, "tt-RU"},
-    {0x445, "bn-IN"},
-    {0x446, "pa-IN"},
-    {0x447, "gu-IN"},
-    {0x448, "or-IN"},
-    {0x449, "ta-IN"},
-    {0x44a, "te-IN"},
-    {0x44b, "kn-IN"},
-    {0x44c, "ml-IN"},
-    {0x44d, "as-IN"},
-    {0x44e, "mr-IN"},
-    {0x44f, "sa-IN"},
-    {0x450, "mn-MN"},
-    {0x451, "bo-CN"},
-    {0x452, "cy-GB"},
-    {0x453, "km-KH"},
-    {0x454, "lo-LA"},
-    {0x455, "my-MM"},
-    {0x456, "gl-ES"},
-    {0x457, "kok-IN"},
-    {0x458, "mni"},
-    {0x459, "sd-IN"},
-    {0x45a, "syr-SY"},
-    {0x45b, "si-LK"},
-    {0x45c, "chr-US"},
-    {0x45d, "iu-Cans-CA"},
-    {0x45e, "am-ET"},
-    {0x45f, "tmz"},
-    {0x461, "ne-NP"},
-    {0x462, "fy-NL"},
-    {0x463, "ps-AF"},
-    {0x464, "fil-PH"},
-    {0x465, "dv-MV"},
-    {0x466, "bin-NG"},
-    {0x467, "fuv-NG"},
-    {0x468, "ha-Latn-NG"},
-    {0x469, "ibb-NG"},
-    {0x46a, "yo-NG"},
-    {0x46b, "quz-BO"},
-    {0x46c, "nso-ZA"},
-    {0x46d, "ba-RU"},
-    {0x46e, "lb-LU"},
-    {0x46f, "kl-GL"},
-    {0x470, "ig-NG"},
-    {0x471, "kr-NG"},
-    {0x472, "gaz-ET"},
-    {0x473, "ti-ER"},
-    {0x474, "gn-PY"},
-    {0x475, "haw-US"},
-    {0x477, "so-SO"},
-    {0x478, "ii-CN"},
-    {0x479, "pap-AN"},
-    {0x47a, "arn-CL"},
-    {0x47c, "moh-CA"},
-    {0x47e, "br-FR"},
-    {0x480, "ug-CN"},
-    {0x481, "mi-NZ"},
-    {0x482, "oc-FR"},
-    {0x483, "co-FR"},
-    {0x484, "gsw-FR"},
-    {0x485, "sah-RU"},
-    {0x486, "qut-GT"},
-    {0x487, "rw-RW"},
-    {0x488, "wo-SN"},
-    {0x48c, "prs-AF"},
-    {0x48d, "plt-MG"},
-    {0x491, "gd-GB"},
-    {0x801, "ar-IQ"},
-    {0x804, "zh-CN"},
-    {0x807, "de-CH"},
-    {0x809, "en-GB"},
-    {0x80a, "es-MX"},
-    {0x80c, "fr-BE"},
-    {0x810, "it-CH"},
-    {0x813, "nl-BE"},
-    {0x814, "nn-NO"},
-    {0x816, "pt-PT"},
-    {0x818, "ro-MO"},
-    {0x819, "ru-MO"},
-    {0x81a, "sr-Latn-CS"},
-    {0x81d, "sv-FI"},
-    {0x820, "ur-IN"},
-    {0x82c, "az-Cyrl-AZ"},
-    {0x82e, "dsb-DE"},
-    {0x83b, "se-SE"},
-    {0x83c, "ga-IE"},
-    {0x83e, "ms-BN"},
-    {0x843, "uz-Cyrl-UZ"},
-    {0x845, "bn-BD"},
-    {0x846, "pa-PK"},
-    {0x850, "mn-Mong-CN"},
-    {0x851, "bo-BT"},
-    {0x859, "sd-PK"},
-    {0x85d, "iu-Latn-CA"},
-    {0x85f, "tzm-Latn-DZ"},
-    {0x861, "ne-IN"},
-    {0x86b, "quz-EC"},
-    {0x873, "ti-ET"},
-    {0xc01, "ar-EG"},
-    {0xc04, "zh-HK"},
-    {0xc07, "de-AT"},
-    {0xc09, "en-AU"},
-    {0xc0a, "es-ES"},
-    {0xc0c, "fr-CA"},
-    {0xc1a, "sr-Cyrl-CS"},
-    {0xc3b, "se-FI"},
-    {0xc5f, "tmz-MA"},
-    {0xc6b, "quz-PE"},
-    {0x1001, "ar-LY"},
-    {0x1004, "zh-SG"},
-    {0x1007, "de-LU"},
-    {0x1009, "en-CA"},
-    {0x100a, "es-GT"},
-    {0x100c, "fr-CH"},
-    {0x101a, "hr-BA"},
-    {0x103b, "smj-NO"},
-    {0x1401, "ar-DZ"},
-    {0x1404, "zh-MO"},
-    {0x1407, "de-LI"},
-    {0x1409, "en-NZ"},
-    {0x140a, "es-CR"},
-    {0x140c, "fr-LU"},
-    {0x141a, "bs-Latn-BA"},
-    {0x143b, "smj-SE"},
-    {0x1801, "ar-MA"},
-    {0x1809, "en-IE"},
-    {0x180a, "es-PA"},
-    {0x180c, "fr-MC"},
-    {0x181a, "sr-Latn-BA"},
-    {0x183b, "sma-NO"},
-    {0x1c01, "ar-TN"},
-    {0x1c09, "en-ZA"},
-    {0x1c0a, "es-DO"},
-    {0x1c0c, "fr-WestIndies"},
-    {0x1c1a, "sr-Cyrl-BA"},
-    {0x1c3b, "sma-SE"},
-    {0x2001, "ar-OM"},
-    {0x2009, "en-JM"},
-    {0x200a, "es-VE"},
-    {0x200c, "fr-RE"},
-    {0x201a, "bs-Cyrl-BA"},
-    {0x203b, "sms-FI"},
-    {0x2401, "ar-YE"},
-    {0x2409, "en-CB"},
-    {0x240a, "es-CO"},
-    {0x240c, "fr-CG"},
-    {0x241a, "sr-Latn-RS"},
-    {0x243b, "smn-FI"},
-    {0x2801, "ar-SY"},
-    {0x2809, "en-BZ"},
-    {0x280a, "es-PE"},
-    {0x280c, "fr-SN"},
-    {0x281a, "sr-Cyrl-RS"},
-    {0x2c01, "ar-JO"},
-    {0x2c09, "en-TT"},
-    {0x2c0a, "es-AR"},
-    {0x2c0c, "fr-CM"},
-    {0x2c1a, "sr-Latn-ME"},
-    {0x3001, "ar-LB"},
-    {0x3009, "en-ZW"},
-    {0x300a, "es-EC"},
-    {0x300c, "fr-CI"},
-    {0x301a, "sr-Cyrl-ME"},
-    {0x3401, "ar-KW"},
-    {0x3409, "en-PH"},
-    {0x340a, "es-CL"},
-    {0x340c, "fr-ML"},
-    {0x3801, "ar-AE"},
-    {0x3809, "en-ID"},
-    {0x380a, "es-UY"},
-    {0x380c, "fr-MA"},
-    {0x3c01, "ar-BH"},
-    {0x3c09, "en-HK"},
-    {0x3c0a, "es-PY"},
-    {0x3c0c, "fr-HT"},
-    {0x4001, "ar-QA"},
-    {0x4009, "en-IN"},
-    {0x400a, "es-BO"},
-    {0x4409, "en-MY"},
-    {0x440a, "es-SV"},
-    {0x4809, "en-SG"},
-    {0x480a, "es-HN"},
-    {0x4c0a, "es-NI"},
-    {0x500a, "es-PR"},
-    {0x540a, "es-US"},
-    {0x641a, "bs-Cyrl"},
-    {0x681a, "bs-Latn"},
-    {0x6c1a, "sr-Cyrl"},
-    {0x701a, "sr-Latn"},
-    {0x703b, "smn"},
-    {0x742c, "az-Cyrl"},
-    {0x743b, "sms"},
-    {0x7804, "zh"},
-    {0x7814, "nn"},
-    {0x781a, "bs"},
-    {0x782c, "az-Latn"},
-    {0x783b, "sma"},
-    {0x7843, "uz-Cyrl"},
-    {0x7850, "mn-Cyrl"},
-    {0x785d, "iu-Cans"},
-    {0x7c04, "zh-Hant"},
-    {0x7c14, "nb"},
-    {0x7c1a, "sr"},
-    {0x7c28, "tg-Cyrl"},
-    {0x7c2e, "dsb"},
-    {0x7c3b, "smj"},
-    {0x7c43, "uz-Latn"},
-    {0x7c50, "mn-Mong"},
-    {0x7c5d, "iu-Latn"},
-    {0x7c5f, "tzm-Latn"},
-    {0x7c68, "ha-Latn"},
-};
-#endif
-
 namespace languages
 {
 struct SystemLanguages
@@ -474,43 +69,27 @@ struct SystemLanguages
 #endif
 
 #elif defined(OMIM_OS_WINDOWS)
-    // if we're on Vista or above, take list of preferred languages
-    typedef BOOL(WINAPI * PGETUSERPREFERREDUILANGUAGES)(DWORD, PULONG, PWCHAR, PULONG);
-    PGETUSERPREFERREDUILANGUAGES p = reinterpret_cast<PGETUSERPREFERREDUILANGUAGES>(
-        GetProcAddress(GetModuleHandleA("Kernel32.dll"), "GetUserPreferredUILanguages"));
-    if (p)
+    // Take list of preferred languages
     {
-      // Vista or above, get buffer size first
       ULONG numLangs;
-      WCHAR * buf = NULL;
       ULONG bufSize = 0;
-      CHECK_EQUAL(TRUE, p(MUI_LANGUAGE_NAME, &numLangs, buf, &bufSize), ());
+      CHECK_EQUAL(TRUE, GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &numLangs, nullptr, &bufSize), ());
       CHECK_GREATER(bufSize, 0U, ("GetUserPreferredUILanguages failed"));
-      buf = new WCHAR[++bufSize];
-      p(MUI_LANGUAGE_NAME, &numLangs, buf, &bufSize);
-      size_t len;
-      WCHAR * pCurr = buf;
-      while ((len = wcslen(pCurr)))
+      std::wstring buf(bufSize, L'?');
+      GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &numLangs, buf.data(), &bufSize);
+      int32_t len;
+      wchar_t const * curr = buf.data();
+      while ((len = static_cast<int32_t>(wcslen(curr))))
       {
-        char * utf8Buf = new char[len * 2];
-        CHECK_NOT_EQUAL(WideCharToMultiByte(CP_UTF8, 0, pCurr, -1, utf8Buf, len * 2, NULL, NULL), 0, ());
-        m_langs.push_back(utf8Buf);
-        delete[] utf8Buf;
-        pCurr += len + 1;
-      }
-      delete[] buf;
-    }
-
-    if (m_langs.empty())
-    {
-      // used mostly on WinXP
-      LANGID langId = GetUserDefaultLangID();
-      for (size_t i = 0; i < ARRAY_SIZE(gLocales); ++i)
-        if (gLocales[i].m_code == langId)
+        int const u8Len = WideCharToMultiByte(CP_UTF8, 0, curr, len, nullptr, 0, nullptr, nullptr);
+        if (u8Len != 0)
         {
-          m_langs.push_back(gLocales[i].m_name);
-          break;
+          std::string u8Buf(u8Len, '?');
+          if (u8Len == WideCharToMultiByte(CP_UTF8, 0, curr, len, u8Buf.data(), u8Len, nullptr, nullptr))
+            m_langs.push_back(std::move(u8Buf));
         }
+        curr += len + 1;
+      }
     }
 
 #elif defined(OMIM_OS_ANDROID)
diff --git a/libs/routing/turns_tts_text_i18n.cpp b/libs/routing/turns_tts_text_i18n.cpp
index e5ec839f280..131729f452e 100644
--- a/libs/routing/turns_tts_text_i18n.cpp
+++ b/libs/routing/turns_tts_text_i18n.cpp
@@ -1,6 +1,7 @@
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
-#include "unicode/uchar.h"
+
+#include <unicode/uchar.h>
 
 #include <regex>
 #include <string>
diff --git a/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
index 6493dcf1e43..7bda7ec77b4 100644
--- a/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
+++ b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
@@ -167,6 +167,7 @@ void CompileShaders(CompilerData const & compiler, std::string const & additiona
   TEST_EQUAL(errorLog.isEmpty(), true, ("Defines:", additionalDefines, "\n", errorLog));
 }
 
+#if !defined(OMIM_OS_WINDOWS)
 UNIT_TEST(MobileCompileShaders_Test)
 {
   base::DelayedThreadPool workerThread(6 /* threadsCount */);
@@ -178,6 +179,7 @@ UNIT_TEST(MobileCompileShaders_Test)
 
   workerThread.Shutdown(base::DelayedThreadPool::Exit::ExecPending);
 }
+#endif
 
 struct MaliReleaseVersion
 {
@@ -230,6 +232,7 @@ void MaliCompileShaders(MaliCompilerData const & compiler, MaliDriverSet const &
   // MALI GPUs do not support ENABLE_VTF. Do not test it here.
 }
 
+#if !defined(OMIM_OS_WINDOWS)
 UNIT_TEST(MALI_MobileCompileShaders_Test)
 {
 #if defined(OMIM_OS_MAC)
@@ -472,3 +475,4 @@ UNIT_TEST(MALI_MobileCompileShaders_Test)
 
   workerThread.Shutdown(base::DelayedThreadPool::Exit::ExecPending);
 }
+#endif
diff --git a/libs/storage/storage_defines.hpp b/libs/storage/storage_defines.hpp
index 85d24fcb576..1f456b07dde 100644
--- a/libs/storage/storage_defines.hpp
+++ b/libs/storage/storage_defines.hpp
@@ -28,7 +28,7 @@ using MwmTopCityGeoIds = std::unordered_map<CountryId, base::GeoObjectId>;
 using MwmTopCountryGeoIds = std::unordered_map<CountryId, std::vector<base::GeoObjectId>>;
 
 /// @note Android code relies that kInvalidCountryId is an empty string!
-storage::CountryId constexpr kInvalidCountryId;
+inline constexpr char kInvalidCountryId[] = "";
 
 inline bool IsCountryIdValid(CountryId const & countryId)
 {
diff --git a/libs/timezone/timezone_tests/conversion_tests.cpp b/libs/timezone/timezone_tests/conversion_tests.cpp
index 375420b660e..b928ccb3601 100644
--- a/libs/timezone/timezone_tests/conversion_tests.cpp
+++ b/libs/timezone/timezone_tests/conversion_tests.cpp
@@ -6,7 +6,7 @@ using namespace om::tz;
 
 namespace
 {
-constexpr TimeZone kZeroTz{.generation_year_offset = 0, .base_offset = 64, .dst_delta = 0, .transitions = {}};
+TimeZone const kZeroTz{.generation_year_offset = 0, .base_offset = 64, .dst_delta = 0, .transitions = {}};
 
 time_t CreateTime(int const year, int const month, int const day, int const hour, int const minute, int const second)
 {
@@ -19,7 +19,11 @@ time_t CreateTime(int const year, int const month, int const day, int const hour
   tm_time.tm_sec = second;
   tm_time.tm_isdst = -1;
 
+#ifdef OMIM_OS_WINDOWS
   return timegm(&tm_time);
+#else
+  return _mkgmtime(&tm_time);
+#endif
 }
 
 std::string TimeToString(time_t const t)
diff --git a/libs/transit/world_feed/feed_helpers.cpp b/libs/transit/world_feed/feed_helpers.cpp
index 1150c101b35..92d4e6cde48 100644
--- a/libs/transit/world_feed/feed_helpers.cpp
+++ b/libs/transit/world_feed/feed_helpers.cpp
@@ -357,8 +357,8 @@ std::pair<LineSegments, LineSegments> FindIntersections(std::vector<m2::PointD>
 
       if (intersection >= minIntersection)
       {
-        intersections.first.emplace_back(i, i + intersection - 1);
-        intersections.second.emplace_back(j, j + intersection - 1);
+        intersections.first.emplace_back(static_cast<uint32_t>(i), static_cast<uint32_t>(i + intersection - 1));
+        intersections.second.emplace_back(static_cast<uint32_t>(j), static_cast<uint32_t>(j + intersection - 1));
         delta = intersection;
         break;
       }
@@ -438,11 +438,11 @@ std::pair<size_t, size_t> GetStopsRange(IdList const & lineStopIds, IdSet const
 }
 
 // Returns indexes of nearest to the |point| elements in |shape|.
-std::vector<size_t> GetMinDistIndexes(std::vector<m2::PointD> const & shape, m2::PointD const & point)
+std::vector<uint32_t> GetMinDistIndexes(std::vector<m2::PointD> const & shape, m2::PointD const & point)
 {
   double minDist = std::numeric_limits<double>::max();
 
-  std::vector<size_t> indexes;
+  std::vector<uint32_t> indexes;
 
   for (size_t i = 0; i < shape.size(); ++i)
   {
@@ -450,7 +450,7 @@ std::vector<size_t> GetMinDistIndexes(std::vector<m2::PointD> const & shape, m2:
 
     if (AlmostEqualAbs(dist, minDist, kEps))
     {
-      indexes.push_back(i);
+      indexes.push_back(static_cast<uint32_t>(i));
       continue;
     }
 
@@ -458,7 +458,7 @@ std::vector<size_t> GetMinDistIndexes(std::vector<m2::PointD> const & shape, m2:
     {
       minDist = dist;
       indexes.clear();
-      indexes.push_back(i);
+      indexes.push_back(static_cast<uint32_t>(i));
     }
   }
 
@@ -467,17 +467,17 @@ std::vector<size_t> GetMinDistIndexes(std::vector<m2::PointD> const & shape, m2:
 }
 
 // Returns minimal distance between |val| and element in |vals| and the nearest element value.
-std::pair<size_t, size_t> FindMinDist(size_t val, std::vector<size_t> const & vals)
+std::pair<uint32_t, uint32_t> FindMinDist(uint32_t val, std::vector<uint32_t> const & vals)
 {
-  size_t minDist = std::numeric_limits<size_t>::max();
-  size_t minVal;
+  uint32_t minDist = std::numeric_limits<uint32_t>::max();
+  uint32_t minVal;
 
   CHECK(!vals.empty(), ());
 
-  for (size_t curVal : vals)
+  for (uint32_t curVal : vals)
   {
     auto const & [min, max] = std::minmax(val, curVal);
-    size_t const dist = max - min;
+    uint32_t const dist = max - min;
 
     if (dist < minDist)
     {
@@ -489,7 +489,7 @@ std::pair<size_t, size_t> FindMinDist(size_t val, std::vector<size_t> const & va
   return {minDist, minVal};
 }
 
-std::pair<size_t, size_t> FindSegmentOnShape(std::vector<m2::PointD> const & shape,
+std::pair<uint32_t, uint32_t> FindSegmentOnShape(std::vector<m2::PointD> const & shape,
                                              std::vector<m2::PointD> const & segment)
 {
   auto const & intersectionsShape = FindIntersections(shape, segment).first;
@@ -501,17 +501,17 @@ std::pair<size_t, size_t> FindSegmentOnShape(std::vector<m2::PointD> const & sha
   return {firstIntersection.m_startIdx, firstIntersection.m_endIdx};
 }
 
-std::pair<size_t, size_t> FindPointsOnShape(std::vector<m2::PointD> const & shape, m2::PointD const & p1,
+std::pair<uint32_t, uint32_t> FindPointsOnShape(std::vector<m2::PointD> const & shape, m2::PointD const & p1,
                                             m2::PointD const & p2)
 {
   // We find indexes of nearest points in |shape| to |p1| and |p2| correspondingly.
-  std::vector<size_t> const & indexes1 = GetMinDistIndexes(shape, p1);
-  std::vector<size_t> const & indexes2 = GetMinDistIndexes(shape, p2);
+  std::vector<uint32_t> const & indexes1 = GetMinDistIndexes(shape, p1);
+  std::vector<uint32_t> const & indexes2 = GetMinDistIndexes(shape, p2);
 
   // We fill mapping of distance (between p1 and p2 on the shape) to pairs of indexes of p1 and p2.
-  std::map<size_t, std::pair<size_t, size_t>> distToIndexes;
+  std::map<uint32_t, std::pair<uint32_t, uint32_t>> distToIndexes;
 
-  for (size_t i1 : indexes1)
+  for (uint32_t i1 : indexes1)
   {
     auto [minDist, i2] = FindMinDist(i1, indexes2);
     distToIndexes.emplace(minDist, std::make_pair(i1, i2));
diff --git a/libs/transit/world_feed/feed_helpers.hpp b/libs/transit/world_feed/feed_helpers.hpp
index d73ceccff0b..6f1c99ea526 100644
--- a/libs/transit/world_feed/feed_helpers.hpp
+++ b/libs/transit/world_feed/feed_helpers.hpp
@@ -132,12 +132,12 @@ std::pair<size_t, size_t> GetStopsRange(IdList const & lineStopIds, IdSet const
 
 // Returns indexes of points |p1| and |p2| on the |shape| polyline. If there are more then 1
 // occurrences of |p1| or |p2| in |shape|, indexes with minimum distance are returned.
-std::pair<size_t, size_t> FindPointsOnShape(std::vector<m2::PointD> const & shape, m2::PointD const & p1,
+std::pair<uint32_t, uint32_t> FindPointsOnShape(std::vector<m2::PointD> const & shape, m2::PointD const & p1,
                                             m2::PointD const & p2);
 
 // Returns indexes of first and last points of |segment| in the |shape| polyline. If |edgeShape|
 // is not found returns pair of zeroes.
-std::pair<size_t, size_t> FindSegmentOnShape(std::vector<m2::PointD> const & shape,
+std::pair<uint32_t, uint32_t> FindSegmentOnShape(std::vector<m2::PointD> const & shape,
                                              std::vector<m2::PointD> const & segment);
 
 // Returns reversed vector.
diff --git a/libs/transit/world_feed/subway_converter.cpp b/libs/transit/world_feed/subway_converter.cpp
index d19eceae124..e0a5dac2f86 100644
--- a/libs/transit/world_feed/subway_converter.cpp
+++ b/libs/transit/world_feed/subway_converter.cpp
@@ -132,9 +132,9 @@ bool SubwayConverter::SplitEdges()
     auto const & edgeSubway = edgesSubway[i];
 
     if (edgeSubway.GetTransfer())
-      m_edgesTransferSubway.emplace(edgeSubway, i);
+      m_edgesTransferSubway.emplace(edgeSubway, static_cast<uint32_t>(i));
     else
-      m_edgesSubway.emplace(edgeSubway, i);
+      m_edgesSubway.emplace(edgeSubway, static_cast<uint32_t>(i));
   }
 
   return !m_edgesSubway.empty() && !m_edgesTransferSubway.empty();
diff --git a/libs/transit/world_feed/world_feed_integration_tests/CMakeLists.txt b/libs/transit/world_feed/world_feed_integration_tests/CMakeLists.txt
index 88984c624f0..562ff4bbb6a 100644
--- a/libs/transit/world_feed/world_feed_integration_tests/CMakeLists.txt
+++ b/libs/transit/world_feed/world_feed_integration_tests/CMakeLists.txt
@@ -16,9 +16,14 @@ if(NOT TEST_DATA_REPO_URL)
 endif()
 set(DESTINATION_FOLDER "${OMIM_DATA_DIR}/test_data/world_feed_integration_tests_data/")
 
-add_custom_command(
-  TARGET ${PROJECT_NAME}
-  POST_BUILD
-  COMMAND test -d ${DESTINATION_FOLDER} || (git clone ${TEST_DATA_REPO_URL} ${DESTINATION_FOLDER})
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+include(ExternalProject)
+ExternalProject_Add(world_feed_integration_tests_data 
+    GIT_REPOSITORY "${TEST_DATA_REPO_URL}"
+    GIT_TAG 30ecb0b3fe694a582edfacc2a7425b6f01f9fec6
+    SOURCE_DIR "${DESTINATION_FOLDER}"
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    UPDATE_DISCONNECTED ON
 )
+add_dependencies(${PROJECT_NAME} world_feed_integration_tests_data)
diff --git a/qt/main.cpp b/qt/main.cpp
index d0b7eb2a962..7b117e2a376 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -84,7 +84,7 @@ class FinalizeBase
   }
 };
 
-#if defined(OMIM_OS_WINDOWS)  //&& defined(PROFILER_COMMON)
+#if 0 && defined(OMIM_OS_WINDOWS)  //&& defined(PROFILER_COMMON)
 class InitializeFinalize : public FinalizeBase
 {
   FILE * m_errFile;
@@ -177,8 +177,10 @@ int main(int argc, char * argv[])
   {
     std::unique_ptr<qt::ScreenshotParams> screenshotParams;
 
+#if !defined(OMIM_OS_WINDOWS)
     if (!FLAGS_lang.empty())
       (void)::setenv("LANGUAGE", FLAGS_lang.c_str(), 1);
+#endif
 
     if (!FLAGS_kml_path.empty() || !FLAGS_points.empty() || !FLAGS_rects.empty())
     {
diff --git a/qt/qt_common/map_widget.cpp b/qt/qt_common/map_widget.cpp
index 27827bc4131..1ff6f6b7be9 100644
--- a/qt/qt_common/map_widget.cpp
+++ b/qt/qt_common/map_widget.cpp
@@ -32,7 +32,7 @@ static constexpr float kViewportFractionSmoothMove = 0.1;
 
 namespace qt::common
 {
-// #define ENABLE_AA_SWITCH
+#define ENABLE_AA_SWITCH
 
 MapWidget::MapWidget(Framework & framework, bool isScreenshotMode, QWidget * parent)
   : QOpenGLWidget(parent)
diff --git a/tools/mwm_viewer/mwm_viewer.cpp b/tools/mwm_viewer/mwm_viewer.cpp
index 42f79083d28..dc9eec6acbb 100644
--- a/tools/mwm_viewer/mwm_viewer.cpp
+++ b/tools/mwm_viewer/mwm_viewer.cpp
@@ -324,7 +324,8 @@ int main(int const argc, char const ** const argv)
   classificator::Load();
 
   FrozenDataSource dataSource;
-  dataSource.RegisterMap(platform::LocalCountryFile{mwmPath.parent_path(), platform::CountryFile(mwmPath.stem()), 0});
+  dataSource.RegisterMap(
+      platform::LocalCountryFile{mwmPath.parent_path().string(), platform::CountryFile(mwmPath.stem().string()), 0});
   std::vector<std::shared_ptr<MwmInfo>> mwmInfos;
   dataSource.GetMwmsInfo(mwmInfos);
   Processor doProcess(dataSource);
diff --git a/tools/openlr/CMakeLists.txt b/tools/openlr/CMakeLists.txt
index 34ff58562ce..2167d425861 100644
--- a/tools/openlr/CMakeLists.txt
+++ b/tools/openlr/CMakeLists.txt
@@ -45,6 +45,10 @@ target_link_libraries(${PROJECT_NAME}
     pugixml
 )
 
+if (PLATFORM_WIN)
+  set_target_properties(${PROJECT_NAME} PROPERTIES UNITY_BUILD OFF)
+endif()
+
 omim_add_tool_subdirectory(openlr_match_quality)
 omim_add_tool_subdirectory(openlr_stat)
 
diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj
index 09393c118dc..8e103efef4c 100644
--- a/xcode/base/base.xcodeproj/project.pbxproj
+++ b/xcode/base/base.xcodeproj/project.pbxproj
@@ -71,7 +71,6 @@
 		39FD27391CC65AD000AFF551 /* timer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26E31CC65A0E00AFF551 /* timer_test.cpp */; };
 		39FD273B1CC65B1000AFF551 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675341771A3F57BF00A0A8C3 /* libbase.a */; };
 		3D08987924810A0B00837783 /* linked_map.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D08987824810A0B00837783 /* linked_map.hpp */; };
-		3D1BE646212D775500ACD94A /* atomic_shared_ptr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D1BE645212D775500ACD94A /* atomic_shared_ptr.hpp */; };
 		3D74EF111F8B902C0081202C /* suffix_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D74EF0B1F8B902B0081202C /* suffix_array.cpp */; };
 		3D74EF121F8B902C0081202C /* visitor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D74EF0C1F8B902B0081202C /* visitor.hpp */; };
 		3D7815731F3A145F0068B6AC /* task_loop.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D7815711F3A145F0068B6AC /* task_loop.hpp */; };
@@ -217,7 +216,6 @@
 		39FD27071CC65A7100AFF551 /* base_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = base_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D08987824810A0B00837783 /* linked_map.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = linked_map.hpp; sourceTree = "<group>"; };
 		3D08987A24810A1300837783 /* linked_map_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = linked_map_tests.cpp; sourceTree = "<group>"; };
-		3D1BE645212D775500ACD94A /* atomic_shared_ptr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = atomic_shared_ptr.hpp; sourceTree = "<group>"; };
 		3D74EF0B1F8B902B0081202C /* suffix_array.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = suffix_array.cpp; sourceTree = "<group>"; };
 		3D74EF0C1F8B902B0081202C /* visitor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = visitor.hpp; sourceTree = "<group>"; };
 		3D7815711F3A145F0068B6AC /* task_loop.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = task_loop.hpp; sourceTree = "<group>"; };
@@ -403,7 +401,6 @@
 			children = (
 				675341851A3F57E400A0A8C3 /* array_adapters.hpp */,
 				675341861A3F57E400A0A8C3 /* assert.hpp */,
-				3D1BE645212D775500ACD94A /* atomic_shared_ptr.hpp */,
 				675341881A3F57E400A0A8C3 /* base.hpp */,
 				675341871A3F57E400A0A8C3 /* base.cpp */,
 				39F1E52E21C961A800D961DC /* beam.hpp */,
@@ -536,7 +533,6 @@
 				3D7815731F3A145F0068B6AC /* task_loop.hpp in Headers */,
 				675341F51A3F57E400A0A8C3 /* set_operations.hpp in Headers */,
 				675342041A3F57E400A0A8C3 /* strings_bundle.hpp in Headers */,
-				3D1BE646212D775500ACD94A /* atomic_shared_ptr.hpp in Headers */,
 				672DD4C81E0425600078E13C /* stl_helpers.hpp in Headers */,
 				675341CE1A3F57E400A0A8C3 /* base.hpp in Headers */,
 				675341F41A3F57E400A0A8C3 /* scope_guard.hpp in Headers */,