diff --git a/deps/+Blosc/Blosc.cmake b/deps/+Blosc/Blosc.cmake
index aeecd672a6..5b1e429e72 100644
--- a/deps/+Blosc/Blosc.cmake
+++ b/deps/+Blosc/Blosc.cmake
@@ -7,10 +7,8 @@ else()
 endif()
 
 add_cmake_project(Blosc
-    URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm_universal.zip #https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip
-    #URL_HASH SHA256=dcb48bf43a672fa3de6a4b1de2c4c238709dad5893d1e097b8374ad84b1fc3b3
-    # Patching upstream does not work this way with git version 2.28 installed on mac worker
-    # PATCH_COMMAND  ${GIT_EXECUTABLE} apply --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/blosc-mods.patch
+    URL https://github.com/Blosc/c-blosc/archive/8724c06e3da90f10986a253814af18ca081d8de0.zip
+    URL_HASH SHA256=53986fd04210b3d94124b7967c857f9766353e576a69595a9393999e0712c035
     CMAKE_ARGS
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
         -DBUILD_SHARED=${_build_shared} 
diff --git a/deps/+Blosc/blosc-mods.patch b/deps/+Blosc/blosc-mods.patch
deleted file mode 100644
index 9b1b9cb27d..0000000000
--- a/deps/+Blosc/blosc-mods.patch
+++ /dev/null
@@ -1,469 +0,0 @@
-From 7cf6c014a36f1712efbdbe9bc52d2d4922b54673 Mon Sep 17 00:00:00 2001
-From: tamasmeszaros <meszaros.q@gmail.com>
-Date: Wed, 30 Oct 2019 12:54:52 +0100
-Subject: [PATCH] Blosc 1.17 fixes and cmake config script
-
-Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
----
- CMakeLists.txt                   | 105 +++++++++++++++++-----------------
- blosc/CMakeLists.txt             | 118 +++++++++------------------------------
- cmake/FindLZ4.cmake              |   6 +-
- cmake/FindSnappy.cmake           |   8 ++-
- cmake/FindZstd.cmake             |   8 ++-
- cmake_config.cmake.in            |  24 ++++++++
- internal-complibs/CMakeLists.txt |  35 ++++++++++++
- 7 files changed, 157 insertions(+), 147 deletions(-)
- create mode 100644 cmake_config.cmake.in
- create mode 100644 internal-complibs/CMakeLists.txt
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 59d9fab..e9134c2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,7 +71,7 @@
- #    DEV: static includes blosc.a and blosc.h
- 
- 
--cmake_minimum_required(VERSION 2.8.12)
-+cmake_minimum_required(VERSION 3.1) # Threads::Threads target available from 3.1
- if (NOT CMAKE_VERSION VERSION_LESS 3.3)
-     cmake_policy(SET CMP0063 NEW)
- endif()
-@@ -124,55 +124,30 @@ option(PREFER_EXTERNAL_ZSTD
- 
- set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
- 
--
--if(NOT DEACTIVATE_LZ4)
--    if(PREFER_EXTERNAL_LZ4)
--        find_package(LZ4)
--    else()
--        message(STATUS "Using LZ4 internal sources.")
--    endif(PREFER_EXTERNAL_LZ4)
--    # HAVE_LZ4 will be set to true because even if the library is
--    # not found, we will use the included sources for it
--    set(HAVE_LZ4 TRUE)
--endif(NOT DEACTIVATE_LZ4)
--
--if(NOT DEACTIVATE_SNAPPY)
--    if(PREFER_EXTERNAL_SNAPPY)
--        find_package(Snappy)
--    else()
--        message(STATUS "Using Snappy internal sources.")
--    endif(PREFER_EXTERNAL_SNAPPY)
--    # HAVE_SNAPPY will be set to true because even if the library is not found,
--    # we will use the included sources for it
--    set(HAVE_SNAPPY TRUE)
--endif(NOT DEACTIVATE_SNAPPY)
--
--if(NOT DEACTIVATE_ZLIB)
--    # import the ZLIB_ROOT environment variable to help finding the zlib library
--    if(PREFER_EXTERNAL_ZLIB)
--        set(ZLIB_ROOT $ENV{ZLIB_ROOT})
--        find_package(ZLIB)
--        if (NOT ZLIB_FOUND )
--            message(STATUS "No zlib found.  Using internal sources.")
--        endif (NOT ZLIB_FOUND )
--    else()
--        message(STATUS "Using zlib internal sources.")
--    endif(PREFER_EXTERNAL_ZLIB)
--    # HAVE_ZLIB will be set to true because even if the library is not found,
--    # we will use the included sources for it
--    set(HAVE_ZLIB TRUE)
--endif(NOT DEACTIVATE_ZLIB)
--
--if (NOT DEACTIVATE_ZSTD)
--    if (PREFER_EXTERNAL_ZSTD)
--        find_package(Zstd)
--    else ()
--        message(STATUS "Using ZSTD internal sources.")
--    endif (PREFER_EXTERNAL_ZSTD)
--    # HAVE_ZSTD will be set to true because even if the library is
--    # not found, we will use the included sources for it
--    set(HAVE_ZSTD TRUE)
--endif (NOT DEACTIVATE_ZSTD)
-+set(LIBS "")
-+macro(use_package _pkg _tgt)
-+    string(TOUPPER ${_pkg} _PKG)
-+    if(NOT DEACTIVATE_${_PKG})
-+        if(PREFER_EXTERNAL_${_PKG})
-+            find_package(${_pkg})
-+            if (NOT ${_pkg}_FOUND )
-+                message(STATUS "No ${_pkg} found.  Using internal sources.")
-+            endif()
-+        else()
-+            message(STATUS "Using ${_pkg} internal sources.")
-+        endif(PREFER_EXTERNAL_${_PKG})
-+        # HAVE_${_pkg} will be set to true because even if the library is
-+        # not found, we will use the included sources for it
-+        set(HAVE_${_PKG} TRUE)
-+        list(APPEND LIBS ${_pkg}::${_tgt})
-+    endif(NOT DEACTIVATE_${_PKG})
-+endmacro()
-+
-+set(ZLIB_ROOT $ENV{ZLIB_ROOT})
-+use_package(ZLIB ZLIB)
-+use_package(LZ4 LZ4)
-+use_package(Snappy snappy)
-+use_package(Zstd Zstd)
- 
- # create the config.h file
- configure_file ("blosc/config.h.in"  "blosc/config.h" )
-@@ -316,6 +291,7 @@ endif()
- 
- 
- # subdirectories
-+add_subdirectory(internal-complibs)
- add_subdirectory(blosc)
- 
- if(BUILD_TESTS)
-@@ -328,7 +304,6 @@ if(BUILD_BENCHMARKS)
-     add_subdirectory(bench)
- endif(BUILD_BENCHMARKS)
- 
--
- # uninstall target
- if (BLOSC_INSTALL)
-     configure_file(
-@@ -338,10 +313,38 @@ if (BLOSC_INSTALL)
-     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/blosc.pc"
-             DESTINATION lib/pkgconfig COMPONENT DEV)
- 
-+    configure_file(
-+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake_config.cmake.in"
-+        "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/BloscConfig.cmake"
-+        @ONLY)
-+
-     configure_file(
-         "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-         "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-         IMMEDIATE @ONLY)
-+
-+    include(CMakePackageConfigHelpers)
-+    write_basic_package_version_file(
-+        "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/BloscConfigVersion.cmake"
-+        VERSION ${BLOSC_VERSION_MAJOR}.${BLOSC_VERSION_MINOR}.${BLOSC_VERSION_PATCH}
-+        COMPATIBILITY AnyNewerVersion
-+    )
-+
-+    export(EXPORT BloscTargets
-+       FILE "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/BloscTargets.cmake"
-+       NAMESPACE Blosc::)
-+
-+    install(EXPORT BloscTargets
-+            FILE BloscTargets.cmake
-+            NAMESPACE Blosc::
-+            DESTINATION lib/cmake/Blosc
-+            EXPORT_LINK_INTERFACE_LIBRARIES)
-+
-+    install(FILES
-+                "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/BloscConfig.cmake"
-+                "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/BloscConfigVersion.cmake"
-+            DESTINATION lib/cmake/Blosc COMPONENT DEV)
-+
-     add_custom_target(uninstall
-         COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
- endif()
-diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt
-index 1d1bebe..f554abe 100644
---- a/blosc/CMakeLists.txt
-+++ b/blosc/CMakeLists.txt
-@@ -1,52 +1,11 @@
- # a simple way to detect that we are using CMAKE
- add_definitions(-DUSING_CMAKE)
- 
--set(INTERNAL_LIBS ${PROJECT_SOURCE_DIR}/internal-complibs)
--
- # Hide symbols by default unless they're specifically exported.
- # This makes it easier to keep the set of exported symbols the
- # same across all compilers/platforms.
- set(CMAKE_C_VISIBILITY_PRESET hidden)
- 
--# includes
--set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})
--if(NOT DEACTIVATE_LZ4)
--    if (LZ4_FOUND)
--        set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${LZ4_INCLUDE_DIR})
--    else(LZ4_FOUND)
--        set(LZ4_LOCAL_DIR ${INTERNAL_LIBS}/lz4-1.9.1)
--        set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${LZ4_LOCAL_DIR})
--    endif(LZ4_FOUND)
--endif(NOT DEACTIVATE_LZ4)
--
--if(NOT DEACTIVATE_SNAPPY)
--    if (SNAPPY_FOUND)
--        set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${SNAPPY_INCLUDE_DIR})
--    else(SNAPPY_FOUND)
--        set(SNAPPY_LOCAL_DIR ${INTERNAL_LIBS}/snappy-1.1.1)
--        set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${SNAPPY_LOCAL_DIR})
--    endif(SNAPPY_FOUND)
--endif(NOT DEACTIVATE_SNAPPY)
--
--if(NOT DEACTIVATE_ZLIB)
--    if (ZLIB_FOUND)
--        set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
--    else(ZLIB_FOUND)
--        set(ZLIB_LOCAL_DIR ${INTERNAL_LIBS}/zlib-1.2.8)
--        set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZLIB_LOCAL_DIR})
--    endif(ZLIB_FOUND)
--endif(NOT DEACTIVATE_ZLIB)
--
--if (NOT DEACTIVATE_ZSTD)
--    if (ZSTD_FOUND)
--        set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZSTD_INCLUDE_DIR})
--    else (ZSTD_FOUND)
--        set(ZSTD_LOCAL_DIR ${INTERNAL_LIBS}/zstd-1.4.1)
--        set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZSTD_LOCAL_DIR} ${ZSTD_LOCAL_DIR}/common)
--    endif (ZSTD_FOUND)
--endif (NOT DEACTIVATE_ZSTD)
--
--include_directories(${BLOSC_INCLUDE_DIRS})
- 
- # library sources
- set(SOURCES blosc.c blosclz.c fastcopy.c shuffle-generic.c bitshuffle-generic.c
-@@ -73,53 +32,13 @@ if(WIN32)
-         message(STATUS "using the internal pthread library for win32 systems.")
-         set(SOURCES ${SOURCES} win32/pthread.c)
-     else(NOT Threads_FOUND)
--        set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
-+        list(APPEND LIBS Threads::Threads)
-     endif(NOT Threads_FOUND)
- else(WIN32)
-     find_package(Threads REQUIRED)
--    set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
-+    list(APPEND LIBS Threads::Threads)
- endif(WIN32)
- 
--if(NOT DEACTIVATE_LZ4)
--    if(LZ4_FOUND)
--        set(LIBS ${LIBS} ${LZ4_LIBRARY})
--    else(LZ4_FOUND)
--        file(GLOB LZ4_FILES ${LZ4_LOCAL_DIR}/*.c)
--        set(SOURCES ${SOURCES} ${LZ4_FILES})
--    endif(LZ4_FOUND)
--endif(NOT DEACTIVATE_LZ4)
--
--if(NOT DEACTIVATE_SNAPPY)
--    if(SNAPPY_FOUND)
--        set(LIBS ${LIBS} ${SNAPPY_LIBRARY})
--    else(SNAPPY_FOUND)
--        file(GLOB SNAPPY_FILES ${SNAPPY_LOCAL_DIR}/*.cc)
--        set(SOURCES ${SOURCES} ${SNAPPY_FILES})
--    endif(SNAPPY_FOUND)
--endif(NOT DEACTIVATE_SNAPPY)
--
--if(NOT DEACTIVATE_ZLIB)
--    if(ZLIB_FOUND)
--        set(LIBS ${LIBS} ${ZLIB_LIBRARY})
--    else(ZLIB_FOUND)
--        file(GLOB ZLIB_FILES ${ZLIB_LOCAL_DIR}/*.c)
--        set(SOURCES ${SOURCES} ${ZLIB_FILES})
--    endif(ZLIB_FOUND)
--endif(NOT DEACTIVATE_ZLIB)
--
--if (NOT DEACTIVATE_ZSTD)
--    if (ZSTD_FOUND)
--        set(LIBS ${LIBS} ${ZSTD_LIBRARY})
--    else (ZSTD_FOUND)
--      file(GLOB ZSTD_FILES
--        ${ZSTD_LOCAL_DIR}/common/*.c
--        ${ZSTD_LOCAL_DIR}/compress/*.c
--        ${ZSTD_LOCAL_DIR}/decompress/*.c)
--        set(SOURCES ${SOURCES} ${ZSTD_FILES})
--    endif (ZSTD_FOUND)
--endif (NOT DEACTIVATE_ZSTD)
--
--
- # targets
- if (BUILD_SHARED)
-     add_library(blosc_shared SHARED ${SOURCES})
-@@ -191,14 +110,17 @@ if (BUILD_TESTS)
-     endif()
- endif()
- 
-+add_library(blosc INTERFACE)
-+
- if (BUILD_SHARED)
--    target_link_libraries(blosc_shared ${LIBS})
--    target_include_directories(blosc_shared PUBLIC ${BLOSC_INCLUDE_DIRS})
-+    target_link_libraries(blosc_shared PRIVATE ${LIBS})
-+    target_include_directories(blosc_shared PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
-+    target_link_libraries(blosc INTERFACE blosc_shared)
- endif()
- 
- if (BUILD_TESTS)
--    target_link_libraries(blosc_shared_testing ${LIBS})
--    target_include_directories(blosc_shared_testing PUBLIC ${BLOSC_INCLUDE_DIRS})
-+    target_link_libraries(blosc_shared_testing PRIVATE ${LIBS})
-+    target_include_directories(blosc_shared_testing PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- endif()
- 
- if(BUILD_STATIC)
-@@ -207,17 +129,31 @@ if(BUILD_STATIC)
-     if (MSVC)
-         set_target_properties(blosc_static PROPERTIES PREFIX lib)
-     endif()
--    target_link_libraries(blosc_static ${LIBS})
--    target_include_directories(blosc_static PUBLIC ${BLOSC_INCLUDE_DIRS})
-+    # With the static library, cmake has to deal with transitive dependencies
-+    target_link_libraries(blosc_static PRIVATE ${LIBS})
-+    target_include_directories(blosc_static PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
-+    if (NOT BUILD_SHARED)
-+        target_link_libraries(blosc INTERFACE blosc_static)
-+    endif()
- endif(BUILD_STATIC)
- 
-+
- # install
- if(BLOSC_INSTALL)
-     install(FILES blosc.h blosc-export.h DESTINATION include COMPONENT DEV)
-+    set(_inst_libs "blosc")
-     if(BUILD_SHARED)
--        install(TARGETS blosc_shared DESTINATION ${lib_dir} COMPONENT LIB)
-+        list(APPEND _inst_libs blosc_shared)
-     endif(BUILD_SHARED)
-     if(BUILD_STATIC)
--        install(TARGETS blosc_static DESTINATION ${lib_dir} COMPONENT DEV)
-+        list(APPEND _inst_libs blosc_static)
-     endif(BUILD_STATIC)
-+
-+    install(TARGETS ${_inst_libs}
-+            EXPORT BloscTargets
-+            LIBRARY DESTINATION ${lib_dir}
-+            ARCHIVE DESTINATION ${lib_dir}
-+            RUNTIME DESTINATION bin
-+            COMPONENT DEV
-+            INCLUDES DESTINATION include)
- endif(BLOSC_INSTALL)
-diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake
-index e581a80..05de6ef 100644
---- a/cmake/FindLZ4.cmake
-+++ b/cmake/FindLZ4.cmake
-@@ -5,6 +5,10 @@ find_library(LZ4_LIBRARY NAMES lz4)
- if (LZ4_INCLUDE_DIR AND LZ4_LIBRARY)
-     set(LZ4_FOUND TRUE)
-     message(STATUS "Found LZ4 library: ${LZ4_LIBRARY}")
-+    add_library(LZ4::LZ4 UNKNOWN IMPORTED)
-+    set_target_properties(LZ4::LZ4 PROPERTIES
-+        IMPORTED_LOCATION ${LZ4_LIBRARY}
-+        INTERFACE_INCLUDE_DIRECTORIES ${LZ4_INCLUDE_DIR})
- else ()
-     message(STATUS "No LZ4 library found.  Using internal sources.")
--endif ()
-+endif ()
-\ No newline at end of file
-diff --git a/cmake/FindSnappy.cmake b/cmake/FindSnappy.cmake
-index 688d4d5..21dbee1 100644
---- a/cmake/FindSnappy.cmake
-+++ b/cmake/FindSnappy.cmake
-@@ -3,8 +3,12 @@ find_path(SNAPPY_INCLUDE_DIR snappy-c.h)
- find_library(SNAPPY_LIBRARY NAMES snappy)
- 
- if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARY)
--    set(SNAPPY_FOUND TRUE)
-+    set(Snappy_FOUND TRUE)
-+    add_library(Snappy::snappy UNKNOWN IMPORTED)
-+    set_target_properties(Snappy::snappy PROPERTIES
-+        IMPORTED_LOCATION ${SNAPPY_LIBRARY}
-+        INTERFACE_INCLUDE_DIRECTORIES ${SNAPPY_INCLUDE_DIR})
-     message(STATUS "Found SNAPPY library: ${SNAPPY_LIBRARY}")
- else ()
-     message(STATUS "No snappy found.  Using internal sources.")
--endif ()
-+endif ()
-\ No newline at end of file
-diff --git a/cmake/FindZstd.cmake b/cmake/FindZstd.cmake
-index 7db4bb9..cabc2f8 100644
---- a/cmake/FindZstd.cmake
-+++ b/cmake/FindZstd.cmake
-@@ -3,8 +3,12 @@ find_path(ZSTD_INCLUDE_DIR zstd.h)
- find_library(ZSTD_LIBRARY NAMES zstd)
- 
- if (ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY)
--    set(ZSTD_FOUND TRUE)
-+    set(Zstd_FOUND TRUE)
-+    add_library(Zstd::Zstd UNKNOWN IMPORTED)
-+    set_target_properties(Zstd::Zstd PROPERTIES
-+        IMPORTED_LOCATION ${ZSTD_LIBRARY}
-+        INTERFACE_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR})
-     message(STATUS "Found Zstd library: ${ZSTD_LIBRARY}")
- else ()
-     message(STATUS "No Zstd library found.  Using internal sources.")
--endif ()
-+endif ()
-\ No newline at end of file
-diff --git a/cmake_config.cmake.in b/cmake_config.cmake.in
-new file mode 100644
-index 0000000..0f6af24
---- /dev/null
-+++ b/cmake_config.cmake.in
-@@ -0,0 +1,24 @@
-+include(CMakeFindDependencyMacro)
-+
-+include("${CMAKE_CURRENT_LIST_DIR}/BloscTargets.cmake")
-+
-+function(_blosc_remap_configs from_Cfg to_Cfg)
-+    string(TOUPPER ${from_Cfg} from_CFG)
-+    string(TOLOWER ${from_Cfg} from_cfg)
-+
-+    if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/BloscTargets-${from_cfg}.cmake)
-+        foreach(tgt IN ITEMS blosc_static blosc_shared blosc)
-+            if(TARGET Blosc::${tgt})
-+                set_target_properties(Blosc::${tgt} PROPERTIES
-+                    MAP_IMPORTED_CONFIG_${from_CFG} ${to_Cfg})
-+            endif()
-+        endforeach()
-+    endif()
-+endfunction()
-+
-+# MSVC will try to link RelWithDebInfo or MinSizeRel target with debug config
-+# if no matching installation is present which would result in link errors.
-+if(MSVC)
-+    _blosc_remap_configs(RelWithDebInfo Release)
-+    _blosc_remap_configs(MinSizeRel Release)
-+endif()
-diff --git a/internal-complibs/CMakeLists.txt b/internal-complibs/CMakeLists.txt
-new file mode 100644
-index 0000000..4586efa
---- /dev/null
-+++ b/internal-complibs/CMakeLists.txt
-@@ -0,0 +1,35 @@
-+macro(add_lib_target pkg tgt incdir files)
-+    string(TOUPPER ${pkg} TGT)
-+    if(NOT DEACTIVATE_${TGT} AND NOT ${pkg}_FOUND)
-+        add_library(${tgt}_objs OBJECT ${files})
-+        add_library(${tgt} INTERFACE)
-+        target_include_directories(${tgt}_objs PRIVATE $<BUILD_INTERFACE:${incdir}>)
-+        target_include_directories(${tgt} INTERFACE $<BUILD_INTERFACE:${incdir}>)
-+        #set_target_properties(${tgt} PROPERTIES INTERFACE_SOURCES "$<TARGET_OBJECTS:${tgt}_objs>")
-+        set_target_properties(${tgt}_objs PROPERTIES POSITION_INDEPENDENT_CODE ON)
-+        target_sources(${tgt} INTERFACE "$<BUILD_INTERFACE:$<TARGET_OBJECTS:${tgt}_objs>>")
-+        add_library(${pkg}::${tgt} ALIAS ${tgt})
-+
-+        # This creates dummy (empty) interface targets in the exported config.
-+        install(TARGETS ${tgt} EXPORT BloscTargets INCLUDES DESTINATION include)
-+    endif()
-+    unset(TGT)
-+endmacro()
-+
-+set(ZLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zlib-1.2.8)
-+file(GLOB ZLIB_FILES ${ZLIB_DIR}/*.c)
-+add_lib_target(ZLIB ZLIB ${ZLIB_DIR} "${ZLIB_FILES}")
-+
-+set(SNAPPY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/snappy-1.1.1)
-+file(GLOB SNAPPY_FILES ${SNAPPY_DIR}/*.cc)
-+add_lib_target(Snappy snappy ${SNAPPY_DIR} "${SNAPPY_FILES}")
-+
-+set(LZ4_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lz4-1.9.1)
-+file(GLOB LZ4_FILES ${LZ4_DIR}/*.c)
-+add_lib_target(LZ4 LZ4 ${LZ4_DIR} "${LZ4_FILES}")
-+
-+set(ZSTD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zstd-1.4.1)
-+file(GLOB ZSTD_FILES ${ZSTD_DIR}/common/*.c ${ZSTD_DIR}/compress/*.c ${ZSTD_DIR}/decompress/*.c)
-+add_lib_target(Zstd Zstd ${ZSTD_DIR} "${ZSTD_FILES}")
-+target_include_directories(Zstd INTERFACE $<BUILD_INTERFACE:${ZSTD_DIR}/common>)
-+target_include_directories(Zstd_objs PRIVATE $<BUILD_INTERFACE:${ZSTD_DIR}/common>)
-\ No newline at end of file
--- 
-2.16.2.windows.1
-
diff --git a/deps/+CGAL/cgal/CGALConfigVersion.cmake b/deps/+CGAL/cgal/CGALConfigVersion.cmake
index 9bef13fcba..8a15bb8acf 100644
--- a/deps/+CGAL/cgal/CGALConfigVersion.cmake
+++ b/deps/+CGAL/cgal/CGALConfigVersion.cmake
@@ -1,7 +1,3 @@
-#/|/ Copyright (c) Prusa Research 2020 Tomáš Mészáros @tamasmeszaros
-#/|/
-#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
-#/|/
 # This is a basic version file for the Config-mode of find_package().
 # It is used by write_basic_package_version_file() as input file for configure_file()
 # to create a version-file which can be installed along a config.cmake file.
diff --git a/deps/+LibBGCode/LibBGCode.cmake b/deps/+LibBGCode/LibBGCode.cmake
index 144d7e7394..4ad2f4aa03 100644
--- a/deps/+LibBGCode/LibBGCode.cmake
+++ b/deps/+LibBGCode/LibBGCode.cmake
@@ -1,8 +1,8 @@
 set(LibBGCode_SOURCE_DIR "" CACHE PATH "Optionally specify local LibBGCode source directory")
 
 set(_source_dir_line
-    URL https://github.com/prusa3d/libbgcode/archive/6aae90bdd2b5d65a3cd053906a2ae1e6b16cc045.zip
-	URL_HASH SHA256=d693887a77c986a96fee43924ee65de05565eb7e8c98fa02d6a156148d6d6597
+    URL https://github.com/prusa3d/libbgcode/archive/ebbe90b65a5ab6b878e2913cb22f1732838ed4b7.zip
+    URL_HASH SHA256=72bd2031b822a08c202e8aa78c90048ede5072be34f6c52754077cef16be7295
 )
 
 if (LibBGCode_SOURCE_DIR)
@@ -12,13 +12,12 @@ endif ()
 add_cmake_project(LibBGCode_deps
     ${_source_dir_line}
     SOURCE_SUBDIR deps
-    DEPENDS dep_Boost ${ZLIB_PKG}
     CMAKE_ARGS
-        -DDEP_DOWNLOAD_DIR:PATH=${DEP_DOWNLOAD_DIR}
+        -DLibBGCode_Deps_DEP_DOWNLOAD_DIR:PATH=${${PROJECT_NAME}_DEP_DOWNLOAD_DIR}
         -DDEP_CMAKE_OPTS:STRING=-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
         -DLibBGCode_Deps_SELECT_ALL:BOOL=OFF
         -DLibBGCode_Deps_SELECT_heatshrink:BOOL=ON
-        -DDESTDIR=${DESTDIR}
+        -DLibBGCode_Deps_DEP_INSTALL_PREFIX=${${PROJECT_NAME}_DEP_INSTALL_PREFIX}
 )
 
 add_cmake_project(LibBGCode
@@ -28,5 +27,5 @@ add_cmake_project(LibBGCode
         -DLibBGCode_BUILD_CMD_TOOL:BOOL=OFF
 )
 
-set(DEP_LibBGCode_Deps_DEPENDS ZLIB Boost)
+set(DEP_LibBGCode_deps_DEPENDS ZLIB Boost)
 set(DEP_LibBGCode_DEPENDS LibBGCode_deps)
\ No newline at end of file
diff --git a/deps/+MPFR/MPFR.cmake b/deps/+MPFR/MPFR.cmake
index 4717b9c6e6..e04ce286a1 100644
--- a/deps/+MPFR/MPFR.cmake
+++ b/deps/+MPFR/MPFR.cmake
@@ -19,19 +19,23 @@ if (MSVC)
 
 else ()
 
-    set(_cross_compile_arg "")
-    if (CMAKE_CROSSCOMPILING)
-        # TOOLCHAIN_PREFIX should be defined in the toolchain file
-        set(_cross_compile_arg --host=${TOOLCHAIN_PREFIX})
-    endif ()
+    # set(_cross_compile_arg "")
+    # if (CMAKE_CROSSCOMPILING)
+    #     # TOOLCHAIN_PREFIX should be defined in the toolchain file
+    #     set(_cross_compile_arg --host=${TOOLCHAIN_PREFIX})
+    # endif ()
+
+    message(STATUS "${PROJECT_NAME}_DEP_INSTALL_PREFIX=${${PROJECT_NAME}_DEP_INSTALL_PREFIX}")
 
     ExternalProject_Add(dep_MPFR
         EXCLUDE_FROM_ALL ON
-        URL http://ftp.vim.org/ftp/gnu/mpfr/mpfr-3.1.6.tar.bz2 https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2  # mirrors are allowed
-        URL_HASH SHA256=cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068
+        #URL http://ftp.vim.org/ftp/gnu/mpfr/mpfr-3.1.6.tar.bz2 https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2  # mirrors are allowed
+        #URL_HASH SHA256=cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068
+        URL https://www.mpfr.org/mpfr-current/mpfr-4.2.1.tar.bz2
+        URL_HASH SHA256=b9df93635b20e4089c29623b19420c4ac848a1b29df1cfd59f26cab0d2666aa0
         DOWNLOAD_DIR ${${PROJECT_NAME}_DEP_DOWNLOAD_DIR}/MPFR
         BUILD_IN_SOURCE ON
-        CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${${PROJECT_NAME}_DEP_INSTALL_PREFIX} --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt}
+        CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${${PROJECT_NAME}_DEP_INSTALL_PREFIX} --enable-shared=no --enable-static=yes --with-gmp=${${PROJECT_NAME}_DEP_INSTALL_PREFIX} ${_gmp_build_tgt}
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install
     )
diff --git a/deps/+MPFR/mpfr/include/mpf2mpfr.h b/deps/+MPFR/mpfr/include/mpf2mpfr.h
index 6688e860c7..0d1a4ee1ed 100644
--- a/deps/+MPFR/mpfr/include/mpf2mpfr.h
+++ b/deps/+MPFR/mpfr/include/mpf2mpfr.h
@@ -1,7 +1,3 @@
-///|/ Copyright (c) Prusa Research 2019 Tomáš Mészáros @tamasmeszaros
-///|/
-///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
-///|/
 /* mpf2mpfr.h -- Compatibility include file with mpf.
 
 Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
diff --git a/deps/+MPFR/mpfr/include/mpfr.h b/deps/+MPFR/mpfr/include/mpfr.h
index 02056b58ff..d330e33f7d 100644
--- a/deps/+MPFR/mpfr/include/mpfr.h
+++ b/deps/+MPFR/mpfr/include/mpfr.h
@@ -1,7 +1,3 @@
-///|/ Copyright (c) Prusa Research 2019 Tomáš Mészáros @tamasmeszaros
-///|/
-///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
-///|/
 /* mpfr.h -- Include file for mpfr.
 
 Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
diff --git a/deps/+OCCT/occt_toolkit.cmake b/deps/+OCCT/occt_toolkit.cmake
index b8320a9ad0..1b77eb1b29 100644
--- a/deps/+OCCT/occt_toolkit.cmake
+++ b/deps/+OCCT/occt_toolkit.cmake
@@ -1,7 +1,3 @@
-#/|/ Copyright (c) Prusa Research 2022 Tomáš Mészáros @tamasmeszaros
-#/|/
-#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
-#/|/
 # script for each OCCT toolkit
 
 # filling some variables by default values(src) or using custom(tools, samples)