diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
index 7960ac0..90a39a6 100644
--- a/.github/workflows/MainDistributionPipeline.yml
+++ b/.github/workflows/MainDistributionPipeline.yml
@@ -14,20 +14,21 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.1.2
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
       extension_name: azure
-      duckdb_version: v1.1.2
-      ci_tools_version: v1.1.2
+      duckdb_version: main
+      ci_tools_version: main
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
 
   duckdb-stable-deploy:
     name: Deploy extension binaries
     needs: duckdb-stable-build
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.1.2
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
       extension_name: azure
-      duckdb_version: v1.1.2
+      duckdb_version: main
+      ci_tools_version: main
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
diff --git a/duckdb b/duckdb
index f680b7d..78ebe44 160000
--- a/duckdb
+++ b/duckdb
@@ -1 +1 @@
-Subproject commit f680b7d08f56183391b581077d4baf589e1cc8bd
+Subproject commit 78ebe44ef9f31b43cfc41b3bf739ab9069e16ae8
diff --git a/extension-ci-tools b/extension-ci-tools
index f5594c6..46a8dd6 160000
--- a/extension-ci-tools
+++ b/extension-ci-tools
@@ -1 +1 @@
-Subproject commit f5594c61803daee122a5245afb817966e1a4545c
+Subproject commit 46a8dd6850b218b2c1a0ede5daf5053bdc225102
diff --git a/src/azure_blob_filesystem.cpp b/src/azure_blob_filesystem.cpp
index 9aec06b..ded9d4f 100644
--- a/src/azure_blob_filesystem.cpp
+++ b/src/azure_blob_filesystem.cpp
@@ -10,7 +10,7 @@
 #include "duckdb/common/string_util.hpp"
 #include "duckdb/main/secret/secret.hpp"
 #include "duckdb/main/secret/secret_manager.hpp"
-#include "duckdb/function/scalar/string_functions.hpp"
+#include "duckdb/function/scalar/string_common.hpp"
 #include "duckdb/function/scalar_function.hpp"
 #include "duckdb/main/extension_util.hpp"
 #include "duckdb/main/client_data.hpp"
@@ -47,7 +47,7 @@ static bool Match(vector<string>::const_iterator key, vector<string>::const_iter
 			}
 			return false;
 		}
-		if (!LikeFun::Glob(key->data(), key->length(), pattern->data(), pattern->length())) {
+		if (!Glob(key->data(), key->length(), pattern->data(), pattern->length())) {
 			return false;
 		}
 		key++;
diff --git a/src/azure_dfs_filesystem.cpp b/src/azure_dfs_filesystem.cpp
index 8cde847..cb6df74 100644
--- a/src/azure_dfs_filesystem.cpp
+++ b/src/azure_dfs_filesystem.cpp
@@ -3,7 +3,7 @@
 #include "duckdb/common/exception.hpp"
 #include "duckdb/common/helper.hpp"
 #include "duckdb/common/shared_ptr.hpp"
-#include "duckdb/function/scalar/string_functions.hpp"
+#include "duckdb/function/scalar/string_common.hpp"
 #include <algorithm>
 #include <azure/storage/blobs/blob_options.hpp>
 #include <azure/storage/common/storage_exception.hpp>
@@ -50,7 +50,7 @@ static void Walk(const Azure::Storage::Files::DataLake::DataLakeFileSystemClient
 		for (const auto &elt : res.Paths) {
 			if (elt.IsDirectory) {
 				if (!recursive) { // Only perform recursive call if we are not already processing recursive result
-					if (LikeFun::Glob(elt.Name.data(), elt.Name.length(), path_pattern.data(), end_match)) {
+					if (Glob(elt.Name.data(), elt.Name.length(), path_pattern.data(), end_match)) {
 						if (end_match >= path_pattern.length()) {
 							// Skip, no way there will be matches anymore
 							continue;
@@ -61,7 +61,7 @@ static void Walk(const Azure::Storage::Files::DataLake::DataLakeFileSystemClient
 				}
 			} else {
 				// File
-				if (LikeFun::Glob(elt.Name.data(), elt.Name.length(), path_pattern.data(), path_pattern.length())) {
+				if (Glob(elt.Name.data(), elt.Name.length(), path_pattern.data(), path_pattern.length())) {
 					out_result->push_back(elt.Name);
 				}
 			}
diff --git a/src/azure_filesystem.cpp b/src/azure_filesystem.cpp
index fb4cfd8..65e0856 100644
--- a/src/azure_filesystem.cpp
+++ b/src/azure_filesystem.cpp
@@ -21,7 +21,7 @@ void AzureContextState::QueryEnd() {
 
 AzureFileHandle::AzureFileHandle(AzureStorageFileSystem &fs, string path, FileOpenFlags flags,
                                  const AzureReadOptions &read_options)
-    : FileHandle(fs, std::move(path)), flags(flags),
+    : FileHandle(fs, std::move(path), flags), flags(flags),
       // File info
       length(0), last_modified(0),
       // Read info