diff --git a/.gitmodules b/.gitmodules
index 64ad14e6ac..ef9dc3da16 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -77,4 +77,4 @@
 [submodule "cmake/external/emsdk"]
 	path = cmake/external/emsdk
 	url = https://github.com/emscripten-core/emsdk.git
-	branch = 2.0.13
+	branch = 2.0.23
diff --git a/cgmanifests/submodules/cgmanifest.json b/cgmanifests/submodules/cgmanifest.json
index f4ac602b82..5937070ad6 100644
--- a/cgmanifests/submodules/cgmanifest.json
+++ b/cgmanifests/submodules/cgmanifest.json
@@ -182,7 +182,7 @@
       "component": {
         "type": "git",
         "git": {
-          "commitHash": "8b32b7def837a15e766039501630549149d3db41",
+          "commitHash": "f44b84154703d29a946d51ddee08f4e5725a61db",
           "repositoryUrl": "https://github.com/emscripten-core/emsdk.git"
         },
         "comments": "git submodule at cmake/external/emsdk"
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 49a83933b8..aa04eceb16 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -629,6 +629,8 @@ if (onnxruntime_BUILD_UNIT_TESTS)
     add_subdirectory(${PROJECT_SOURCE_DIR}/external/googletest EXCLUDE_FROM_ALL)
     set_msvc_c_cpp_compiler_warning_level(3)
     set_target_properties(gmock PROPERTIES FOLDER "External/GTest")
+    # disable treating all warnings as errors for gmock
+    target_compile_options(gmock PRIVATE "-w")
     set_target_properties(gmock_main PROPERTIES FOLDER "External/GTest")
     set_target_properties(gtest PROPERTIES FOLDER "External/GTest")
     set_target_properties(gtest_main PROPERTIES FOLDER "External/GTest")
diff --git a/cmake/external/emsdk b/cmake/external/emsdk
index 8b32b7def8..f44b841547 160000
--- a/cmake/external/emsdk
+++ b/cmake/external/emsdk
@@ -1 +1 @@
-Subproject commit 8b32b7def837a15e766039501630549149d3db41
+Subproject commit f44b84154703d29a946d51ddee08f4e5725a61db
diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
index 329ae821d2..6254f23f3c 100644
--- a/tools/ci_build/build.py
+++ b/tools/ci_build/build.py
@@ -2003,7 +2003,7 @@ def main():
             # since emscripten doesn't support file packaging required for unit tests,
             # need to apply patch with the specific version of emscripten.
             # once patch is committed to emsdk repository, this must be replaced with 'latest'.
-            emsdk_version = "2.0.13"
+            emsdk_version = "2.0.23"
 
             emsdk_dir = os.path.join(source_dir, "cmake", "external", "emsdk")
             emsdk_file = os.path.join(emsdk_dir, "emsdk.bat") if is_windows() else os.path.join(emsdk_dir, "emsdk")
diff --git a/tools/ci_build/wasm/file_packager.py.patch b/tools/ci_build/wasm/file_packager.py.patch
index 16722c395f..94843df533 100644
--- a/tools/ci_build/wasm/file_packager.py.patch
+++ b/tools/ci_build/wasm/file_packager.py.patch
@@ -64,10 +64,6 @@ import ctypes
 
 sys.path.insert(1, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from tools.toolchain_profiler import ToolchainProfiler
-if __name__ == '__main__':
-  ToolchainProfiler.record_process_start()
-
 import posixpath
 from tools import shared
 from subprocess import PIPE
@@ -153,7 +149,7 @@ def add(mode, rootpathsrc, rootpathdst):
       elif DEBUG:
         print('Skipping file "%s" from inclusion in the emscripten '
               'virtual file system.' % fullname, file=sys.stderr)
-    del dirnames[:]
+    dirnames.clear()
     dirnames.extend(new_dirnames)
 
 
@@ -515,10 +511,10 @@ def main():
       use_data = '''
             var compressedData = %s;
             compressedData['data'] = byteArray;
-            assert(typeof Module.LZ4 === 'object', 'LZ4 not present - was your app build with  -s LZ4=1  ?');
-            Module.LZ4.loadPackage({ 'metadata': metadata, 'compressedData': compressedData });
+            assert(typeof Module['LZ4'] === 'object', 'LZ4 not present - was your app build with  -s LZ4=1  ?');
+            Module['LZ4'].loadPackage({ 'metadata': metadata, 'compressedData': compressedData }, %s);
             Module['removeRunDependency']('datafile_%s');
-      ''' % (meta, shared.JS.escape_for_js_string(data_target))
+      ''' % (meta, "true" if use_preload_plugins else "false", shared.JS.escape_for_js_string(data_target))
 
     package_uuid = uuid.uuid4()
     package_name = data_target