diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
index 834fa2bac988d6..75f8dfbdca23d8 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
@@ -219,6 +219,7 @@
     <PlatformManifestFileEntry Include="pinvoke.h" IsNative="true" />
     <PlatformManifestFileEntry Include="emcc-default.rsp" IsNative="true" />
     <PlatformManifestFileEntry Include="Emcc.props" IsNative="true" />
+    <PlatformManifestFileEntry Include="js_support.js" IsNative="false" />
     <!-- ICU-specific files -->
     <PlatformManifestFileEntry Include="libicudata.a" IsNative="true" />
     <PlatformManifestFileEntry Include="libicui18n.a" IsNative="true" />
diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 3001a00bc110ec..8d9023eb98072f 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -103,6 +103,15 @@
     <HelixPreCommand Include="set XHARNESS_DISABLE_COLORED_OUTPUT=true" />
     <HelixPreCommand Include="set XHARNESS_LOG_WITH_TIMESTAMPS=true" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetOS)' == 'Browser'">
+    <!-- 
+      We are hosting the payloads for the WASM/browser on kestrel in the xharness process.
+      We also run some network tests to this server and so, we are running it on both HTTP and HTTPS.
+      For the HTTPS endpoint we need development SSL certificate.
+      Below is alternative to `dotnet dev-certs https` but we don't have full SDK installed on helix, so the tool is not available.
+    -->
+    <HelixPreCommand Include="powershell -command &quot;New-SelfSignedCertificate -FriendlyName &#39;ASP.NET Core HTTPS development certificate&#39; -DnsName @(&#39;localhost&#39;) -Subject &#39;CN = localhost&#39; -KeyAlgorithm RSA -KeyLength 2048 -HashAlgorithm sha256 -CertStoreLocation &#39;Cert:\CurrentUser\My&#39; -TextExtension @(&#39;2.5.29.37={text}1.3.6.1.5.5.7.3.1&#39;,&#39;1.3.6.1.4.1.311.84.1.1={hex}02&#39;,&#39;2.5.29.19={text}&#39;) -KeyUsage DigitalSignature,KeyEncipherment&quot;" />
+  </ItemGroup>
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
     <!-- 
diff --git a/src/mono/sample/mbr/browser/index.html b/src/mono/sample/mbr/browser/index.html
index 472cf5f29ea053..eb19b7bb2f5954 100644
--- a/src/mono/sample/mbr/browser/index.html
+++ b/src/mono/sample/mbr/browser/index.html
@@ -29,7 +29,6 @@ <h3 id="header">Wasm Browser Sample</h3>
         },
       };
     </script>
-    <script type="text/javascript" src="mono-config.js"></script>
     <script type="text/javascript" src="runtime.js"></script>
 
     <script defer src="dotnet.js"></script>
diff --git a/src/mono/sample/mbr/browser/runtime.js b/src/mono/sample/mbr/browser/runtime.js
index 0856b8d0e03033..3a63c214f2ff65 100644
--- a/src/mono/sample/mbr/browser/runtime.js
+++ b/src/mono/sample/mbr/browser/runtime.js
@@ -2,17 +2,36 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 var Module = { 
+    config: null,
+
+    // Called once the config file is loaded. The contents of the config file
+    // are passed as a JS object within the config parameter
+    onConfigLoaded: function (config) {
+        if (!config || config.error){
+            console.log("An error occured while loading the config file");
+            return;
+        }
+
+        Module.config = config;
+    },
+
+    // Called when the runtime is initialized and wasm is ready
     onRuntimeInitialized: function () {
-        config.loaded_cb = function () {
+        if (!Module.config || Module.config.error){
+            alert("An error occured while loading the config file");
+            return;
+        }
+
+        Module.config.loaded_cb = function () {
             App.init ();
         };
-        config.environment_variables = {
+        Module.config.environment_variables = {
             "DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
         };
-        config.fetch_file_cb = function (asset) {
+        Module.config.fetch_file_cb = function (asset) {
             return fetch (asset, { credentials: 'same-origin' });
         }
 
-        MONO.mono_load_runtime_and_bcl_args (config);
+        MONO.mono_load_runtime_and_bcl_args (Module.config);
     },
 };
diff --git a/src/mono/sample/wasm/browser-bench/index.html b/src/mono/sample/wasm/browser-bench/index.html
index eebbae65eb1052..658bfb573ddbfc 100644
--- a/src/mono/sample/wasm/browser-bench/index.html
+++ b/src/mono/sample/wasm/browser-bench/index.html
@@ -51,7 +51,6 @@ <h3 id="header">Wasm Browser Sample - Simple Benchmark</h3>
         }
       };
     </script>
-    <script type="text/javascript" src="mono-config.js"></script>
     <script type="text/javascript" src="runtime.js"></script>
 
     <script defer src="dotnet.js"></script>
diff --git a/src/mono/sample/wasm/browser-bench/runtime.js b/src/mono/sample/wasm/browser-bench/runtime.js
index a39b0b97b14901..cbebc617ba82d7 100644
--- a/src/mono/sample/wasm/browser-bench/runtime.js
+++ b/src/mono/sample/wasm/browser-bench/runtime.js
@@ -1,9 +1,27 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-
 var Module = { 
+    config: null,
+
+    // Called once the config file is loaded. The contents of the config file
+    // are passed as a JS object within the config parameter
+    onConfigLoaded: function (config) {
+        if (!config || config.error){
+            console.log("An error occured while loading the config file");
+            return;
+        }
+
+        Module.config = config;
+    },
+
+    // Called when the runtime is initialized and wasm is ready
     onRuntimeInitialized: function () {
-        config.loaded_cb = function () {
+        if (!Module.config || Module.config.error){
+            alert("An error occured while loading the config file");
+            return;
+        }
+
+        Module.config.loaded_cb = function () {
             try {
                 App.init ();
             } catch (error) {
@@ -11,13 +29,21 @@ var Module = {
                 throw (error);
             }
         };
-        config.fetch_file_cb = function (asset) {
+        Module.config.fetch_file_cb = function (asset) {
             return fetch (asset, { credentials: 'same-origin' });
         }
 
+        if (Module.config.enable_profiler)
+        {
+            Module.config.aot_profiler_options = {
+                write_at:"Sample.Test::StopProfile",
+                send_to: "System.Runtime.InteropServices.JavaScript.Runtime::DumpAotProfileData"
+            }
+        }
+
         try
         {
-            MONO.mono_load_runtime_and_bcl_args (config);
+            MONO.mono_load_runtime_and_bcl_args (Module.config);
         } catch (error) {
             test_exit(1);
             throw(error);
diff --git a/src/mono/sample/wasm/browser-profile/index.html b/src/mono/sample/wasm/browser-profile/index.html
index 50eb0ff28c2efe..de4a5599e94ad0 100644
--- a/src/mono/sample/wasm/browser-profile/index.html
+++ b/src/mono/sample/wasm/browser-profile/index.html
@@ -10,67 +10,8 @@
   <body>
     <h3 id="header">Wasm Browser Sample</h3>
     Result from Sample.Test.TestMeaning: <span id="out"></span>
-    <script type='text/javascript'>
-      var is_testing = false;
-      var onLoad = function() {
-        var url = new URL(decodeURI(window.location));
-        let args = url.searchParams.getAll('arg');
-        is_testing = args !== undefined && (args.find(arg => arg == '--testing') !== undefined);
-      };
 
-      var test_exit = function(exit_code)
-      {
-        if (!is_testing) {
-          console.log(`test_exit: ${exit_code}`);
-          return;
-        }
-
-        /* Set result in a tests_done element, to be read by xharness */
-        var tests_done_elem = document.createElement("label");
-        tests_done_elem.id = "tests_done";
-        tests_done_elem.innerHTML = exit_code.toString();
-        document.body.appendChild(tests_done_elem);
-
-        console.log(`WASM EXIT ${exit_code}`);
-      };
-
-      var App = {
-        init: function () {
-          var ret = BINDING.call_static_method("[Wasm.BrowserProfile.Sample] Sample.Test:TestMeaning", []);
-          document.getElementById("out").innerHTML = ret;
-          console.log ("ready");
-
-          if (is_testing)
-          {
-            console.debug(`ret: ${ret}`);
-            let exit_code = ret == 42 ? 0 : 1;
-            test_exit(exit_code);
-          }
-
-          if (config.enable_profiler) {
-            BINDING.call_static_method("[Wasm.BrowserProfile.Sample] Sample.Test:StopProfile", []);
-            saveProfile();
-          }
-        },
-      };
-
-      function saveProfile() {
-        var a = document.createElement('a');
-        var blob = new Blob([Module.aot_profile_data]);
-        a.href = URL.createObjectURL(blob);
-        a.download = "data.aotprofile";
-        // Append anchor to body.
-        document.body.appendChild(a);
-        a.click();
-
-        // Remove anchor from body
-        document.body.removeChild(a);
-      }
-
-    </script>
-    <script type="text/javascript" src="mono-config.js"></script>
     <script type="text/javascript" src="runtime.js"></script>
-
     <script defer src="dotnet.js"></script>
 
   </body>
diff --git a/src/mono/sample/wasm/browser-profile/runtime.js b/src/mono/sample/wasm/browser-profile/runtime.js
index 1ce1c0b736034c..e385167eaec223 100644
--- a/src/mono/sample/wasm/browser-profile/runtime.js
+++ b/src/mono/sample/wasm/browser-profile/runtime.js
@@ -1,22 +1,42 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-var Module = {
+var Module = { 
+    is_testing: false,
+    config: null,
+
+    // Called once the config file is loaded. The contents of the config file
+    // are passed as a JS object within the config parameter
+    onConfigLoaded: function (config) {
+        if (!config || config.error){
+            console.log("An error occured while loading the config file");
+            return;
+        }
+
+        Module.config = config;
+    },
+
+    // Called when the runtime is initialized and wasm is ready
     onRuntimeInitialized: function () {
-        config.loaded_cb = function () {
+        if (!Module.config || Module.config.error){
+            alert("An error occured while loading the config file");
+            return;
+        }
+
+        Module.config.loaded_cb = function () {
             try {
-                App.init ();
+                Module.init();
             } catch (error) {
-                test_exit(1);
+                Module.test_exit(1);
                 throw (error);
             }
         };
-        config.fetch_file_cb = function (asset) {
+        Module.config.fetch_file_cb = function (asset) {
             return fetch (asset, { credentials: 'same-origin' });
         }
 
-        if (config.enable_profiler)
+        if (Module.config.enable_profiler)
         {
-            config.aot_profiler_options = {
+            Module.config.aot_profiler_options = {
                 write_at:"Sample.Test::StopProfile",
                 send_to: "System.Runtime.InteropServices.JavaScript.Runtime::DumpAotProfileData"
             }
@@ -24,10 +44,63 @@ var Module = {
 
         try
         {
-            MONO.mono_load_runtime_and_bcl_args (config);
+            MONO.mono_load_runtime_and_bcl_args (Module.config);
         } catch (error) {
-            test_exit(1);
+            Module.test_exit(1);
             throw(error);
         }
+    },
+
+    init: function () {
+        console.log("not ready yet")
+        var ret = BINDING.call_static_method("[Wasm.BrowserProfile.Sample] Sample.Test:TestMeaning", []);
+        document.getElementById("out").innerHTML = ret;
+        console.log ("ready");
+
+        if (Module.is_testing)
+        {
+          console.debug(`ret: ${ret}`);
+          let exit_code = ret == 42 ? 0 : 1;
+          Module.test_exit(exit_code);
+        }
+
+        if (Module.config.enable_profiler) {
+          BINDING.call_static_method("[Wasm.BrowserProfile.Sample] Sample.Test:StopProfile", []);
+          Module.saveProfile();
+        }
+    },
+
+    onLoad: function() {
+        var url = new URL(decodeURI(window.location));
+        let args = url.searchParams.getAll('arg');
+        Module.is_testing = args !== undefined && (args.find(arg => arg == '--testing') !== undefined);
+    },
+  
+    test_exit: function(exit_code) {
+        if (!Module.is_testing) {
+            console.log(`test_exit: ${exit_code}`);
+            return;
+        }
+
+        /* Set result in a tests_done element, to be read by xharness */
+        var tests_done_elem = document.createElement("label");
+        tests_done_elem.id = "tests_done";
+        tests_done_elem.innerHTML = exit_code.toString();
+        document.body.appendChild(tests_done_elem);
+
+        console.log(`WASM EXIT ${exit_code}`);
+    },
+  
+    saveProfile: function () {
+        var a = document.createElement('a');
+        var blob = new Blob([Module.aot_profile_data]);
+        a.href = URL.createObjectURL(blob);
+        a.download = "data.aotprofile";
+        // Append anchor to body.
+        document.body.appendChild(a);
+        a.click();
+
+        // Remove anchor from body
+        document.body.removeChild(a);
     }
-};
\ No newline at end of file
+};
diff --git a/src/mono/sample/wasm/browser/index.html b/src/mono/sample/wasm/browser/index.html
index bd8e5015a0ee5f..5f170bb38e7bcb 100644
--- a/src/mono/sample/wasm/browser/index.html
+++ b/src/mono/sample/wasm/browser/index.html
@@ -48,7 +48,6 @@ <h3 id="header">Wasm Browser Sample</h3>
         },
       };
     </script>
-    <script type="text/javascript" src="mono-config.js"></script>
     <script type="text/javascript" src="runtime.js"></script>
 
     <script defer src="dotnet.js"></script>
diff --git a/src/mono/sample/wasm/browser/runtime.js b/src/mono/sample/wasm/browser/runtime.js
index a39b0b97b14901..0a99c174a01f62 100644
--- a/src/mono/sample/wasm/browser/runtime.js
+++ b/src/mono/sample/wasm/browser/runtime.js
@@ -2,8 +2,28 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 var Module = { 
+
+    config: null,
+
+    // Called once the config file is loaded. The contents of the config file
+    // are passed as a JS object within the config parameter
+    onConfigLoaded: function (config) {
+        if (!config || config.error){
+            console.log("An error occured while loading the config file");
+            return;
+        }
+
+        Module.config = config;
+    },
+
+    // Called when the runtime is initialized and wasm is ready
     onRuntimeInitialized: function () {
-        config.loaded_cb = function () {
+        if (!Module.config || Module.config.error){
+            alert("No config found");
+            return;
+        }
+
+        Module.config.loaded_cb = function () {
             try {
                 App.init ();
             } catch (error) {
@@ -11,13 +31,13 @@ var Module = {
                 throw (error);
             }
         };
-        config.fetch_file_cb = function (asset) {
+        Module.config.fetch_file_cb = function (asset) {
             return fetch (asset, { credentials: 'same-origin' });
         }
 
         try
         {
-            MONO.mono_load_runtime_and_bcl_args (config);
+            MONO.mono_load_runtime_and_bcl_args (Module.config);
         } catch (error) {
             test_exit(1);
             throw(error);
diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile
index 8a69822976bfe4..83108f8f84c01a 100644
--- a/src/mono/wasm/Makefile
+++ b/src/mono/wasm/Makefile
@@ -92,8 +92,8 @@ $(NATIVE_BIN_DIR)/include/wasm:
 $(BUILDS_OBJ_DIR):
 	mkdir -p $$@
 
-$(NATIVE_BIN_DIR)/dotnet.js: $(BUILDS_OBJ_DIR)/driver.o $(BUILDS_OBJ_DIR)/pinvoke.o $(BUILDS_OBJ_DIR)/corebindings.o runtime/library_mono.js runtime/binding_support.js runtime/dotnet_support.js $(SYSTEM_NATIVE_LIBDIR)/pal_random.js $(2) $(EMCC_DEFAULT_RSP) | $(NATIVE_BIN_DIR)
-	$(EMCC) @$(EMCC_DEFAULT_RSP) $(1) --js-library runtime/library_mono.js --js-library runtime/binding_support.js --js-library runtime/dotnet_support.js --js-library $(SYSTEM_NATIVE_LIBDIR)/pal_random.js $(BUILDS_OBJ_DIR)/driver.o $(BUILDS_OBJ_DIR)/pinvoke.o $(BUILDS_OBJ_DIR)/corebindings.o $(2) -o $(NATIVE_BIN_DIR)/dotnet.js $(3)
+$(NATIVE_BIN_DIR)/dotnet.js: $(BUILDS_OBJ_DIR)/driver.o $(BUILDS_OBJ_DIR)/pinvoke.o $(BUILDS_OBJ_DIR)/corebindings.o runtime/library_mono.js runtime/binding_support.js runtime/dotnet_support.js runtime/js_support.js $(SYSTEM_NATIVE_LIBDIR)/pal_random.js $(2) $(EMCC_DEFAULT_RSP) | $(NATIVE_BIN_DIR)
+	$(EMCC) @$(EMCC_DEFAULT_RSP) $(1) --js-library runtime/library_mono.js --js-library runtime/binding_support.js --js-library runtime/dotnet_support.js --js-library $(SYSTEM_NATIVE_LIBDIR)/pal_random.js --pre-js runtime/js_support.js $(BUILDS_OBJ_DIR)/driver.o $(BUILDS_OBJ_DIR)/pinvoke.o $(BUILDS_OBJ_DIR)/corebindings.o $(2) -o $(NATIVE_BIN_DIR)/dotnet.js $(3)
 
 $(BUILDS_OBJ_DIR)/pinvoke-table.h: $(PINVOKE_TABLE) | $(BUILDS_OBJ_DIR)
 	if cmp -s $(PINVOKE_TABLE) $$@ ; then : ; else cp $(PINVOKE_TABLE) $$@ ; fi
@@ -132,7 +132,7 @@ clean:
 icu-files: $(wildcard $(ICU_LIBDIR)/*.dat) $(ICU_LIBDIR)/libicuuc.a $(ICU_LIBDIR)/libicui18n.a | $(NATIVE_BIN_DIR)
 	cp $^ $(NATIVE_BIN_DIR)
 
-source-files: runtime/driver.c runtime/pinvoke.c runtime/corebindings.c runtime/binding_support.js runtime/dotnet_support.js runtime/library_mono.js $(SYSTEM_NATIVE_LIBDIR)/pal_random.js | $(NATIVE_BIN_DIR)/src
+source-files: runtime/driver.c runtime/pinvoke.c runtime/corebindings.c runtime/binding_support.js runtime/dotnet_support.js runtime/library_mono.js runtime/js_support.js $(SYSTEM_NATIVE_LIBDIR)/pal_random.js | $(NATIVE_BIN_DIR)/src
 	cp $^ $(NATIVE_BIN_DIR)/src
 
 header-files: runtime/pinvoke.h | $(NATIVE_BIN_DIR)/include/wasm
diff --git a/src/mono/wasm/build/WasmApp.targets b/src/mono/wasm/build/WasmApp.targets
index 2141cce41b69b2..b886f327d71626 100644
--- a/src/mono/wasm/build/WasmApp.targets
+++ b/src/mono/wasm/build/WasmApp.targets
@@ -65,7 +65,7 @@
       - @(WasmFilesToIncludeInFileSystem) - Files to include in the vfs
       - @(WasmNativeAsset)        - Native files to be added to `NativeAssets` in the bundle.
 
-      - @(WasmExtraConfig)        - json elements to add to `mono-config.js`
+      - @(WasmExtraConfig)        - json elements to add to `mono-config.json`
                                     Eg. <WasmExtraConfig Include="enable_profiler" Value="true" />
 
                                     - Value attribute can have a number, bool, quoted string, or json string
diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
index 87ba804792ef39..b1bfcd859d0644 100644
--- a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
+++ b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
@@ -83,7 +83,6 @@
 			return App.int_add (a, b);
 		}
       </script>
-      <script type="text/javascript" src="mono-config.js"></script>
       <script type="text/javascript" src="runtime-debugger.js"></script>
       <script type="text/javascript" src="other.js"></script>
       <script async type="text/javascript" src="dotnet.js"></script>
diff --git a/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js b/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js
index 4c641eb2c6a0d7..da8da61bd92fd3 100644
--- a/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js
+++ b/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js
@@ -2,8 +2,27 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 var Module = { 
-	onRuntimeInitialized: function () {
-		config.loaded_cb = function () {
+    config: null,
+
+    // Called once the config file is loaded. The contents of the config file
+    // are passed as a JS object within the config parameter
+    onConfigLoaded: function (config) {
+        if (!config || config.error){
+            console.log("An error occured while loading the config file");
+            return;
+        }
+
+        Module.config = config;
+    },
+
+    // Called when the runtime is initialized and wasm is ready
+    onRuntimeInitialized: function () {
+		if (!Module.config || Module.config.error){
+            console.log("An error occured while loading the config file");
+            return;
+        }
+
+		Module.config.loaded_cb = function () {
 			App.init ();
 		};
 		// For custom logging patch the functions below
@@ -15,6 +34,6 @@ var Module = {
 		MONO.mono_wasm_setenv ("MONO_LOG_LEVEL", "debug");
 		MONO.mono_wasm_setenv ("MONO_LOG_MASK", "all");
 		*/
-		MONO.mono_load_runtime_and_bcl_args (config)
+		MONO.mono_load_runtime_and_bcl_args (Module.config)
 	},
 };
diff --git a/src/mono/wasm/runtime-test.js b/src/mono/wasm/runtime-test.js
index 74aa1083c033d1..f1cda9437ef224 100644
--- a/src/mono/wasm/runtime-test.js
+++ b/src/mono/wasm/runtime-test.js
@@ -4,29 +4,31 @@
 //
 
 //glue code to deal with the differences between chrome, ch, d8, jsc and sm.
-var is_browser = typeof window != "undefined";
+const is_browser = typeof window != "undefined";
+const is_node = !is_browser && typeof process != 'undefined';
 
 // if the engine doesn't provide a console
 if (typeof (console) === "undefined") {
-	var console = {
+	console = {
 		log: globalThis.print,
 		clear: function () { }
 	};
 }
 
+
 globalThis.testConsole = console;
 
-function proxyMethod (prefix, func, asJson) {
+function proxyMethod (prefix, proxyFunc, asJson) {
 	return function() {
 		var args = [...arguments];
 		if (asJson) {
-			func (JSON.stringify({
+			proxyFunc (JSON.stringify({
 				method: prefix,
 				payload: args[0],
 				arguments: args
 			}));
 		} else {
-			func([prefix + args[0], ...args.slice(1)]);
+			proxyFunc([prefix + args[0], ...args.slice(1)]);
 		}
 	};
 };
@@ -38,9 +40,9 @@ for (var m of methods) {
 	}
 }
 
-function proxyJson (func) {
+function proxyJson (consoleFunc) {
 	for (var m of ["log", ...methods])
-		console[m] = proxyMethod(`console.${m}`,func, true);
+		console[m] = proxyMethod(`console.${m}`, consolefunc, true);
 }
 
 if (is_browser) {
@@ -49,7 +51,7 @@ if (is_browser) {
 	let consoleWebSocket = new WebSocket(consoleUrl);
 	consoleWebSocket.onopen = function(event) {
 		proxyJson(function (msg) { consoleWebSocket.send (msg); });
-		globalThis.testConsole.log("browser: Console websocket connected.");
+		testConsole.log("browser: Console websocket connected.");
 	};
 	consoleWebSocket.onerror = function(event) {
 		console.log(`websocket error: ${event}`);
@@ -64,6 +66,18 @@ if (is_browser) {
 		}
 	}
 }
+
+if (is_node) {
+	arguments = process.argv.slice (2);
+	var fs = require ('fs');
+	function load (file) {
+		eval (fs.readFileSync(file).toString());
+	};
+	function read (path) {
+		return fs.readFileSync(path);
+	};
+	const { performance, PerformanceObserver } = require("perf_hooks")
+}
 //proxyJson(console.log);
 
 
@@ -91,22 +105,20 @@ if (typeof performance == 'undefined') {
 	}
 }
 
-try {
-	if (typeof arguments == "undefined")
-		arguments = WScript.Arguments;
-	load = WScript.LoadScriptFile;
-	read = WScript.LoadBinaryFile;
-} catch (e) {
-}
-
 try {
 	if (typeof arguments == "undefined") {
-		if (typeof scriptArgs !== "undefined")
+		if (typeof (WScript) != "undefined") {
+			arguments = WScript.Arguments;
+			load = WScript.LoadScriptFile;
+			read = WScript.LoadBinaryFile;
+		} else if (typeof (scriptArgs) != "undefined") {
 			arguments = scriptArgs;
+		}
 	}
 } catch (e) {
 }
 
+
 if (arguments === undefined)
 	arguments = [];
 
@@ -119,7 +131,7 @@ function test_exit (exit_code) {
 	if (is_browser) {
 		// Notify the selenium script
 		Module.exit_code = exit_code;
-		Module.print ("WASM EXIT " + exit_code);
+		console.log ("WASM EXIT " + exit_code);
 		var tests_done_elem = document.createElement ("label");
 		tests_done_elem.id = "tests_done";
 		tests_done_elem.innerHTML = exit_code.toString ();
@@ -130,7 +142,7 @@ function test_exit (exit_code) {
 }
 
 function fail_exec (reason) {
-	Module.print (reason);
+	console.log (reason);
 	test_exit (1);
 }
 
@@ -144,8 +156,8 @@ function inspect_object (o) {
 }
 
 // Preprocess arguments
-var args = testArguments;
-console.info("Arguments: " + testArguments);
+var args = [...testArguments];
+//console.info("Arguments: " + testArguments);
 profilers = [];
 setenv = {};
 runtime_args = [];
@@ -153,28 +165,29 @@ enable_gc = true;
 enable_zoneinfo = false;
 working_dir='/';
 while (args !== undefined && args.length > 0) {
-	if (args [0].startsWith ("--profile=")) {
-		var arg = args [0].substring ("--profile=".length);
+	let currentArg = args [0].toString();
+	if (currentArg.startsWith ("--profile=")) {
+		var arg = currentArg.substring ("--profile=".length);
 
 		profilers.push (arg);
 
 		args = args.slice (1);
-	} else if (args [0].startsWith ("--setenv=")) {
-		var arg = args [0].substring ("--setenv=".length);
+	} else if (currentArg.startsWith ("--setenv=")) {
+		var arg = currentArg.substring ("--setenv=".length);
 		var parts = arg.split ('=');
 		if (parts.length != 2)
-			fail_exec ("Error: malformed argument: '" + args [0]);
+			fail_exec ("Error: malformed argument: '" + currentArg);
 		setenv [parts [0]] = parts [1];
 		args = args.slice (1);
-	} else if (args [0].startsWith ("--runtime-arg=")) {
-		var arg = args [0].substring ("--runtime-arg=".length);
+	} else if (currentArg.startsWith ("--runtime-arg=")) {
+		var arg = currentArg.substring ("--runtime-arg=".length);
 		runtime_args.push (arg);
 		args = args.slice (1);
-	} else if (args [0] == "--disable-on-demand-gc") {
+	} else if (currentArg == "--disable-on-demand-gc") {
 		enable_gc = false;
 		args = args.slice (1);
-	} else if (args [0].startsWith ("--working-dir=")) {
-		var arg = args [0].substring ("--working-dir=".length);
+	} else if (currentArg.startsWith ("--working-dir=")) {
+		var arg = currentArg.substring ("--working-dir=".length);
 		working_dir = arg;
 		args = args.slice (1);
 	} else {
@@ -186,15 +199,13 @@ testArguments = args;
 // cheap way to let the testing infrastructure know we're running in a browser context (or not)
 setenv["IsBrowserDomSupported"] = is_browser.toString().toLowerCase();
 
-function writeContentToFile(content, path)
-{
+function writeContentToFile(content, path) {
 	var stream = FS.open(path, 'w+');
 	FS.write(stream, content, 0, content.length, 0);
 	FS.close(stream);
 }
 
-function loadScript (url)
-{
+function loadScript (url){
 	if (is_browser) {
 		var script = document.createElement ("script");
 		script.src = url;
@@ -204,33 +215,50 @@ function loadScript (url)
 	}
 }
 
-loadScript ("mono-config.js");
+//var module = require ('./dotnet.js')(Module).then ((va) => console.log (va));
+//globalThis.Module = Module;
 
 var Module = {
 	mainScriptUrlOrBlob: "dotnet.js",
-
 	print,
 	printErr,
-
+	config: null,
 	onAbort: function(x) {
-		print ("ABORT: " + x);
+		console.log ("ABORT: " + x);
 		var err = new Error();
-		print ("Stacktrace: \n");
-		print (err.stack);
+		console.log ("Stacktrace: \n");
+		console.log (err.stack);
 		test_exit (1);
 	},
 
+	onConfigLoaded: function (config) {
+        if (!config || config.error){
+            console.log("An error occured while loading the config file");
+            return;
+        }
+
+        Module.config = config;
+
+		if (is_node) {
+			eval (read ("dotnet.js").toString());
+		} else {
+			loadScript ("dotnet.js");
+		}
+    },
+
 	onRuntimeInitialized: function () {
+		try {
+
 		// Have to set env vars here to enable setting MONO_LOG_LEVEL etc.
 		for (var variable in setenv) {
-			MONO.mono_wasm_setenv (variable, setenv [variable]);
+			Module._mono_wasm_setenv (variable, setenv [variable]);
 		}
 
 		if (!enable_gc) {
 			Module.ccall ('mono_wasm_enable_on_demand_gc', 'void', ['number'], [0]);
 		}
 
-		config.loaded_cb = function () {
+		Module.config.loaded_cb = function () {
 			let wds = FS.stat (working_dir);
 			if (wds === undefined || !FS.isDir (wds.mode)) {
 				fail_exec (`Could not find working directory ${working_dir}`);
@@ -240,13 +268,13 @@ var Module = {
 			FS.chdir (working_dir);
 			App.init ();
 		};
-		config.fetch_file_cb = function (asset) {
-			// console.log("fetch_file_cb('" + asset + "')");
+		Module.config.fetch_file_cb = function (asset) {
+			//console.log("fetch_file_cb('" + asset + "')");
 			// for testing purposes add BCL assets to VFS until we special case File.Open
 			// to identify when an assembly from the BCL is being open and resolve it correctly.
 			/*
 			var content = new Uint8Array (read (asset, 'binary'));
-			var path = asset.substr(config.deploy_prefix.length);
+			var path = asset.substr(Module.config.deploy_prefix.length);
 			writeContentToFile(content, path);
 			*/
 
@@ -261,33 +289,25 @@ var Module = {
 				return new Promise ((resolve, reject) => {
 					var bytes = null, error = null;
 					try {
-						bytes = read (asset, 'binary');
+						bytes = Module.read (asset, 'binary');
 					} catch (exc) {
-						error = exc;
-					}
-					var response = { ok: (bytes && !error), url: asset,
-						arrayBuffer: function () {
-							return new Promise ((resolve2, reject2) => {
-								if (error)
-									reject2 (error);
-								else
-									resolve2 (new Uint8Array (bytes));
-						}
-					)}
+						reject (exc);
 					}
-					resolve (response);
-				})
+					resolve ({
+						ok: (bytes && !error),
+						url: asset,
+						arrayBuffer: () => Promise.resolve (new Uint8Array (bytes))
+					});
+				});
 			}
 		};
-
-		MONO.mono_load_runtime_and_bcl_args (config);
+		Module.mono_load_runtime_and_bcl_args (Module.config);
+	} catch (e) {
+		console.log (e);
+	}
 	},
 };
 
-loadScript ("dotnet.js");
-
-const IGNORE_PARAM_COUNT = -1;
-
 var App = {
 	init: function () {
 		var wasm_set_main_args = Module.cwrap ('mono_wasm_set_main_args', 'void', ['number', 'number']);
@@ -314,10 +334,10 @@ var App = {
 			var res = 0;
 				try {
 					res = exec_regression (10, args[1]);
-					Module.print ("REGRESSION RESULT: " + res);
+					console.log ("REGRESSION RESULT: " + res);
 				} catch (e) {
-					Module.print ("ABORT: " + e);
-					print (e.stack);
+					console.log ("ABORT: " + e);
+					console.log (e.stack);
 					res = 1;
 				}
 
@@ -352,9 +372,7 @@ var App = {
 			wasm_set_main_args (main_argc, main_argv);
 
 			// Automatic signature isn't working correctly
-			let result = Module.mono_call_assembly_entry_point (main_assembly_name, [app_args], "m");
-			let onError = function (error)
-			{
+			let onError = function (error) {
 				console.error (error);
 				if (error.stack)
 					console.error (error.stack);
@@ -362,13 +380,15 @@ var App = {
 				test_exit (1);
 			}
 			try {
-				result.then (test_exit).catch (onError);
+				Module.mono_call_assembly_entry_point (main_assembly_name, [app_args], "m")
+					.then (test_exit)
+					.catch (onError);
 			} catch (error) {
 				onError(error);
 			}
 
 		} else {
-			fail_exec ("Unhandled argument: " + args [0]);
+			fail_exec ("Unhandled argument: " + args[0]);
 		}
 	},
 	call_test_method: function (method_name, args, signature) {
diff --git a/src/mono/wasm/runtime/binding_support.js b/src/mono/wasm/runtime/binding_support.js
index 3951da52101b43..1e3c5cddb54c28 100644
--- a/src/mono/wasm/runtime/binding_support.js
+++ b/src/mono/wasm/runtime/binding_support.js
@@ -1020,7 +1020,7 @@ var BindingSupportLib = {
 			// ensure the indirect values are 8-byte aligned so that aligned loads and stores will work
 			var indirectBaseOffset = ((((args_marshal.length * 4) + 7) / 8) | 0) * 8;
 
-			var closure = {};
+			var closure = { Module };
 			var indirectLocalOffset = 0;
 
 			body.push (
@@ -1353,6 +1353,7 @@ var BindingSupportLib = {
 				library_mono: MONO,
 				binding_support: this,
 				method: method,
+				Module: Module,
 				this_arg: this_arg
 			};
 
diff --git a/src/mono/wasm/runtime/js_support.js b/src/mono/wasm/runtime/js_support.js
new file mode 100644
index 00000000000000..80353e35fa0b25
--- /dev/null
+++ b/src/mono/wasm/runtime/js_support.js
@@ -0,0 +1,60 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+// THIS FILE IS COPIED DIRECTLY INTO THE DOTNET.JS FILE WITHOUT BEING RUN OR COMPILED/OPTIMIZED
+// IT I MEANT AS A SET OF JS TOOLS TO SUPPORT THE SDK
+
+// Loads the config file located in the root of the project
+// Not meant to be used outside of this class (TODO make private to this file when project converted to TS)
+function load_config() {
+    // since this file loads before emsdk we don't have environment vars yet, so we define them locally
+    var ENVIRONMENT_IS_NODE = typeof process === 'object';
+    var ENVIRONMENT_IS_WEB = typeof window === 'object';
+    // var ENVIRONMENT_IS_WORKER = typeof importScripts === 'function';
+    // var ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER;
+
+    callback = Module['onConfigLoaded'];
+
+    if (ENVIRONMENT_IS_NODE){
+        try {
+            var config = JSON.parse(require('./mono-config.json'));
+            callback(config);
+        } catch(e) {
+            callback({error: "Error loading mono-config.json file from current directory"});
+        }
+    } else if (ENVIRONMENT_IS_WEB){
+        var xobj = new XMLHttpRequest();
+        xobj.overrideMimeType("application/json");
+        xobj.open('GET', './mono-config.json', true);
+        xobj.onreadystatechange = function() {
+            if (xobj.readyState == XMLHttpRequest.DONE) {
+                if (xobj.status === 0 || (xobj.status >= 200 && xobj.status < 400)) {
+                    var config = JSON.parse(xobj.responseText);
+                    callback(config);
+                } else {
+                    // error if the request to load the file was successful but loading failed
+                    callback({error: "Error loading mono-config.json file from current directory"});
+                }
+            }
+        };
+        xobj.onerror = function() {
+            // error if the request failed
+            callback({error: "Error loading mono-config.json file from current directory"});
+        }
+
+        try {
+            xobj.send();
+        } catch(e) {
+            // other kinds of errors
+            callback({error: "Error loading mono-config.json file from current directory"});
+        }
+    } else {
+        try {
+            var config = JSON.parse(load("./mono-config.json"));
+            callback(config);
+        } catch(e) {
+            callback({error: "Error loading mono-config.json file from current directory"});
+        }
+    }
+}
+load_config();
diff --git a/src/mono/wasm/runtime/library_mono.js b/src/mono/wasm/runtime/library_mono.js
index 685aaaf375d85e..60de7ff8aa54f9 100644
--- a/src/mono/wasm/runtime/library_mono.js
+++ b/src/mono/wasm/runtime/library_mono.js
@@ -64,7 +64,7 @@ var MonoSupportLib = {
 				this.mono_background_exec = Module.cwrap ("mono_background_exec", null);
 			while (MONO.timeout_queue.length > 0) {
 				--MONO.pump_count;
-				MONO.timeout_queue.shift()();
+				Promise.resolve().then(MONO.timeout_queue.shift()());
 			}
 			while (MONO.pump_count > 0) {
 				--MONO.pump_count;
@@ -1759,9 +1759,9 @@ var MonoSupportLib = {
 				try {
 					load_runtime ("unused", args.debug_level);
 				} catch (ex) {
-					print ("MONO_WASM: load_runtime () failed: " + ex);
-					print ("MONO_WASM: Stacktrace: \n");
-					print (ex.stack);
+					Module.print ("MONO_WASM: load_runtime () failed: " + ex);
+					Module.print ("MONO_WASM: Stacktrace: \n");
+					Module.print (ex.stack);
 
 					var wasm_exit = Module.cwrap ('mono_wasm_exit', null, ['number']);
 					wasm_exit (1);
@@ -2452,24 +2452,19 @@ var MonoSupportLib = {
 
 	schedule_background_exec: function () {
 		++MONO.pump_count;
-		if (typeof globalThis.setTimeout === 'function') {
-			globalThis.setTimeout (MONO.pump_message, 0);
-		}
+		Promise.resolve().then (MONO.pump_message);
 	},
 
 	mono_set_timeout: function (timeout, id) {
 		if (!this.mono_set_timeout_exec)
 			this.mono_set_timeout_exec = Module.cwrap ("mono_set_timeout_exec", null, [ 'number' ]);
 
+		var timer = function () { this.mono_set_timeout_exec (id) }.bind (this);
 		if (typeof globalThis.setTimeout === 'function') {
-			globalThis.setTimeout (function () {
-				this.mono_set_timeout_exec (id);
-			}, timeout);
+			globalThis.setTimeout (timer, timeout);
 		} else {
 			++MONO.pump_count;
-			MONO.timeout_queue.push(function() {
-				this.mono_set_timeout_exec (id);
-			})
+			MONO.timeout_queue.push(timer);
 		}
 	},
 
diff --git a/src/mono/wasm/wasm.proj b/src/mono/wasm/wasm.proj
index 064cb445bfac8a..eb6d65060aa512 100644
--- a/src/mono/wasm/wasm.proj
+++ b/src/mono/wasm/wasm.proj
@@ -231,7 +231,7 @@
           EmSdkPath="$(EMSDK_PATH)"
           IgnoreStandardErrorWarningFormat="true" />
 
-    <RunWithEmSdkEnv Command="$(EmccCmd) @$(_EmccDefaultsRspPath) $(EmccConfigurationFlags) --js-library runtime/library_mono.js --js-library runtime/binding_support.js --js-library runtime/dotnet_support.js --js-library &quot;$(SystemNativeDir)\pal_random.js&quot; &quot;$(MonoObjDir)driver.o&quot; &quot;$(MonoObjDir)pinvoke.o&quot; &quot;$(MonoObjDir)corebindings.o&quot; &quot;@(MonoLibFiles->'%(FullPath)', '&quot; &quot;')&quot; -o &quot;$(NativeBinDir)dotnet.js&quot; &amp;&amp; $(StripCmd)"
+    <RunWithEmSdkEnv Command="$(EmccCmd) @$(_EmccDefaultsRspPath) $(EmccConfigurationFlags) --js-library runtime/library_mono.js --js-library runtime/binding_support.js --js-library runtime/dotnet_support.js --pre-js runtime/js_support.js --js-library &quot;$(SystemNativeDir)\pal_random.js&quot; &quot;$(MonoObjDir)driver.o&quot; &quot;$(MonoObjDir)pinvoke.o&quot; &quot;$(MonoObjDir)corebindings.o&quot; &quot;@(MonoLibFiles->'%(FullPath)', '&quot; &quot;')&quot; -o &quot;$(NativeBinDir)dotnet.js&quot; &amp;&amp; $(StripCmd)"
           EmSdkPath="$(EMSDK_PATH)"
           IgnoreStandardErrorWarningFormat="true" />
 
diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.cs b/src/tasks/WasmAppBuilder/WasmAppBuilder.cs
index 9ef7679c292b66..aedcb5dd36bb5d 100644
--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.cs
+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.cs
@@ -51,7 +51,7 @@ public class WasmAppBuilder : Task
     public ITaskItem[]? ExtraFilesToDeploy { get; set; }
 
     // <summary>
-    // Extra json elements to add to mono-config.js
+    // Extra json elements to add to mono-config.json
     //
     // Metadata:
     // - Value: can be a number, bool, quoted string, or json string
@@ -246,11 +246,11 @@ public override bool Execute ()
             config.Extra[name] = valueObject;
         }
 
-        string monoConfigPath = Path.Combine(AppDir, "mono-config.js");
+        string monoConfigPath = Path.Combine(AppDir, "mono-config.json");
         using (var sw = File.CreateText(monoConfigPath))
         {
             var json = JsonSerializer.Serialize (config, new JsonSerializerOptions { WriteIndented = true });
-            sw.Write($"config = {json};");
+            sw.Write($"{json}");
         }
         _fileWrites.Add(monoConfigPath);
 
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs
index b5f1f7e0b95f73..99e721dfa65f78 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs
@@ -347,7 +347,7 @@ protected static void AssertBasicAppBundle(string bundleDir, string projectName,
                 "runtime.js",
                 "dotnet.timezones.blat",
                 "dotnet.wasm",
-                "mono-config.js",
+                "mono-config.json",
                 "dotnet.js",
                 "run-v8.sh"
             });
diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/AOT/index.html b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/index.html
index efab9ac4324a21..642987d23c5e2b 100644
--- a/src/tests/FunctionalTests/WebAssembly/Browser/AOT/index.html
+++ b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/index.html
@@ -47,7 +47,6 @@ <h3 id="header">Wasm Browser Sample</h3>
         },
       };
     </script>
-    <script type="text/javascript" src="mono-config.js"></script>
     <script type="text/javascript" src="runtime.js"></script>
 
     <script defer src="dotnet.js"></script>
diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/AOT/runtime.js b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/runtime.js
index a39b0b97b14901..d60354b01d042a 100644
--- a/src/tests/FunctionalTests/WebAssembly/Browser/AOT/runtime.js
+++ b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/runtime.js
@@ -3,6 +3,15 @@
 
 var Module = { 
     onRuntimeInitialized: function () {
+        JSSupportLib.load_config(this.onConfigLoaded);
+    },
+
+    onConfigLoaded: function (config) {
+        if (!config || config.error){
+            console.log("An error occured while loading the config file");
+            return;
+        }
+
         config.loaded_cb = function () {
             try {
                 App.init ();
diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/index.html b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/index.html
index 03f68679a5b85c..9de05f5031b325 100644
--- a/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/index.html
+++ b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/index.html
@@ -47,7 +47,6 @@ <h3 id="header">Wasm Browser Sample</h3>
         },
       };
     </script>
-    <script type="text/javascript" src="mono-config.js"></script>
     <script type="text/javascript" src="runtime.js"></script>
 
     <script defer src="dotnet.js"></script>
diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/runtime.js b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/runtime.js
index a39b0b97b14901..d60354b01d042a 100644
--- a/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/runtime.js
+++ b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/runtime.js
@@ -3,6 +3,15 @@
 
 var Module = { 
     onRuntimeInitialized: function () {
+        JSSupportLib.load_config(this.onConfigLoaded);
+    },
+
+    onConfigLoaded: function (config) {
+        if (!config || config.error){
+            console.log("An error occured while loading the config file");
+            return;
+        }
+
         config.loaded_cb = function () {
             try {
                 App.init ();