diff --git a/xml/development/info.json b/xml/development/info.json
index 6e93871a5928..e1a166a3c9a5 100644
--- a/xml/development/info.json
+++ b/xml/development/info.json
@@ -1,4 +1,4 @@
   {
-    "commit": "5e58a479c1c925bd616890e574bc65bc8b76f773",
+    "commit": "f283debce777204df52daa4cb887892033c27959",
     "branch": "development"
   }
diff --git a/xml/development/js.xml b/xml/development/js.xml
index f725e14fcda5..779afd4cd27a 100644
--- a/xml/development/js.xml
+++ b/xml/development/js.xml
@@ -17865,7 +17865,7 @@
 			<c path="haxe.ds.IntMap.T"/>
 		</implements>
 		<h><d/></h>
-		<set public="1" get="inline" set="null" line="32">
+		<set public="1" get="inline" set="null" line="94">
 			<f a="key:value">
 				<x path="Int"/>
 				<c path="haxe.ds.IntMap.T"/>
@@ -17873,35 +17873,35 @@
 			</f>
 			<haxe_doc>See `Map.set`</haxe_doc>
 		</set>
-		<get public="1" get="inline" set="null" line="36">
+		<get public="1" get="inline" set="null" line="98">
 			<f a="key">
 				<x path="Int"/>
 				<x path="Null"><c path="haxe.ds.IntMap.T"/></x>
 			</f>
 			<haxe_doc>See `Map.get`</haxe_doc>
 		</get>
-		<exists public="1" get="inline" set="null" line="40">
+		<exists public="1" get="inline" set="null" line="102">
 			<f a="key">
 				<x path="Int"/>
 				<x path="Bool"/>
 			</f>
 			<haxe_doc>See `Map.exists`</haxe_doc>
 		</exists>
-		<remove public="1" set="method" line="44">
+		<remove public="1" set="method" line="106">
 			<f a="key">
 				<x path="Int"/>
 				<x path="Bool"/>
 			</f>
 			<haxe_doc>See `Map.remove`</haxe_doc>
 		</remove>
-		<keys public="1" set="method" line="51">
+		<keys public="1" set="method" line="113">
 			<f a=""><t path="Iterator"><x path="Int"/></t></f>
 			<haxe_doc>See `Map.keys`
 
 		(java) Implementation detail: Do not `set()` any new value while
 		iterating, as it may cause a resize, which will break iteration.</haxe_doc>
 		</keys>
-		<iterator public="1" set="method" line="57">
+		<iterator public="1" set="method" line="119">
 			<f a=""><t path="Iterator"><c path="haxe.ds.IntMap.T"/></t></f>
 			<meta><m n=":has_untyped"/></meta>
 			<haxe_doc>See `Map.iterator`
@@ -17909,7 +17909,7 @@
 		(java) Implementation detail: Do not `set()` any new value while
 		iterating, as it may cause a resize, which will break iteration.</haxe_doc>
 		</iterator>
-		<keyValueIterator public="1" get="inline" set="null" line="71">
+		<keyValueIterator public="1" get="inline" set="null" line="133">
 			<f a=""><t path="KeyValueIterator">
 	<x path="Int"/>
 	<c path="haxe.ds.IntMap.T"/>
@@ -17917,19 +17917,19 @@
 			<meta><m n=":runtime"/></meta>
 			<haxe_doc>See `Map.keyValueIterator`</haxe_doc>
 		</keyValueIterator>
-		<copy public="1" set="method" line="75">
+		<copy public="1" set="method" line="137">
 			<f a=""><c path="haxe.ds.IntMap"><c path="haxe.ds.IntMap.T"/></c></f>
 			<haxe_doc>See `Map.copy`</haxe_doc>
 		</copy>
-		<toString public="1" set="method" line="82">
+		<toString public="1" set="method" line="144">
 			<f a=""><c path="String"/></f>
 			<haxe_doc>See `Map.toString`</haxe_doc>
 		</toString>
-		<clear public="1" get="inline" set="null" line="97">
+		<clear public="1" get="inline" set="null" line="159">
 			<f a=""><x path="Void"/></f>
 			<haxe_doc>See `Map.clear`</haxe_doc>
 		</clear>
-		<new public="1" get="inline" set="null" line="28">
+		<new public="1" get="inline" set="null" line="90">
 			<f a=""><x path="Void"/></f>
 			<haxe_doc>Creates a new IntMap.</haxe_doc>
 		</new>
@@ -18722,11 +18722,11 @@
 			<c path="haxe.ds.ObjectMap.K"/>
 			<c path="haxe.ds.ObjectMap.V"/>
 		</implements>
-		<assignId get="inline" set="null" line="31" static="1"><f a="obj">
+		<assignId get="inline" set="null" line="93" static="1"><f a="obj">
 	<a/>
 	<x path="Int"/>
 </f></assignId>
-		<getId get="inline" set="null" line="35" static="1">
+		<getId get="inline" set="null" line="97" static="1">
 			<f a="obj">
 				<a/>
 				<x path="Int"/>
@@ -18734,7 +18734,7 @@
 			<meta><m n=":has_untyped"/></meta>
 		</getId>
 		<h><a><__keys__><a/></__keys__></a></h>
-		<set public="1" set="method" line="45">
+		<set public="1" set="method" line="107">
 			<f a="key:value">
 				<c path="haxe.ds.ObjectMap.K"/>
 				<c path="haxe.ds.ObjectMap.V"/>
@@ -18742,7 +18742,7 @@
 			</f>
 			<haxe_doc>See `Map.set`</haxe_doc>
 		</set>
-		<get public="1" get="inline" set="null" line="54">
+		<get public="1" get="inline" set="null" line="116">
 			<f a="key">
 				<c path="haxe.ds.ObjectMap.K"/>
 				<x path="Null"><c path="haxe.ds.ObjectMap.V"/></x>
@@ -18750,7 +18750,7 @@
 			<meta><m n=":has_untyped"/></meta>
 			<haxe_doc>See `Map.get`</haxe_doc>
 		</get>
-		<exists public="1" get="inline" set="null" line="58">
+		<exists public="1" get="inline" set="null" line="120">
 			<f a="key">
 				<c path="haxe.ds.ObjectMap.K"/>
 				<x path="Bool"/>
@@ -18758,7 +18758,7 @@
 			<meta><m n=":has_untyped"/></meta>
 			<haxe_doc>See `Map.exists`</haxe_doc>
 		</exists>
-		<remove public="1" set="method" line="62">
+		<remove public="1" set="method" line="124">
 			<f a="key">
 				<c path="haxe.ds.ObjectMap.K"/>
 				<x path="Bool"/>
@@ -18766,7 +18766,7 @@
 			<meta><m n=":has_untyped"/></meta>
 			<haxe_doc>See `Map.remove`</haxe_doc>
 		</remove>
-		<keys public="1" set="method" line="71">
+		<keys public="1" set="method" line="133">
 			<f a=""><t path="Iterator"><c path="haxe.ds.ObjectMap.K"/></t></f>
 			<meta><m n=":has_untyped"/></meta>
 			<haxe_doc>See `Map.keys`
@@ -18774,7 +18774,7 @@
 		(java) Implementation detail: Do not `set()` any new value while
 		iterating, as it may cause a resize, which will break iteration.</haxe_doc>
 		</keys>
-		<iterator public="1" set="method" line="82">
+		<iterator public="1" set="method" line="144">
 			<f a=""><t path="Iterator"><c path="haxe.ds.ObjectMap.V"/></t></f>
 			<meta><m n=":has_untyped"/></meta>
 			<haxe_doc>See `Map.iterator`
@@ -18782,7 +18782,7 @@
 		(java) Implementation detail: Do not `set()` any new value while
 		iterating, as it may cause a resize, which will break iteration.</haxe_doc>
 		</iterator>
-		<keyValueIterator public="1" get="inline" set="null" line="96">
+		<keyValueIterator public="1" get="inline" set="null" line="158">
 			<f a=""><t path="KeyValueIterator">
 	<c path="haxe.ds.ObjectMap.K"/>
 	<c path="haxe.ds.ObjectMap.V"/>
@@ -18790,22 +18790,22 @@
 			<meta><m n=":runtime"/></meta>
 			<haxe_doc>See `Map.keyValueIterator`</haxe_doc>
 		</keyValueIterator>
-		<copy public="1" set="method" line="100">
+		<copy public="1" set="method" line="162">
 			<f a=""><c path="haxe.ds.ObjectMap">
 	<c path="haxe.ds.ObjectMap.K"/>
 	<c path="haxe.ds.ObjectMap.V"/>
 </c></f>
 			<haxe_doc>See `Map.copy`</haxe_doc>
 		</copy>
-		<toString public="1" set="method" line="107">
+		<toString public="1" set="method" line="169">
 			<f a=""><c path="String"/></f>
 			<haxe_doc>See `Map.toString`</haxe_doc>
 		</toString>
-		<clear public="1" get="inline" set="null" line="122">
+		<clear public="1" get="inline" set="null" line="184">
 			<f a=""><x path="Void"/></f>
 			<haxe_doc>See `Map.clear`</haxe_doc>
 		</clear>
-		<new public="1" set="method" line="41">
+		<new public="1" set="method" line="103">
 			<f a=""><x path="Void"/></f>
 			<haxe_doc>Creates a new ObjectMap.</haxe_doc>
 		</new>
@@ -18928,11 +18928,11 @@
 			<c path="String"/>
 			<c path="haxe.ds.StringMap.T"/>
 		</implements>
-		<createCopy params="T" set="method" line="82" static="1"><f a="h">
+		<createCopy params="T" set="method" line="143" static="1"><f a="h">
 	<d/>
 	<c path="haxe.ds.StringMap"><c path="createCopy.T"/></c>
 </f></createCopy>
-		<stringify set="method" line="89" static="1">
+		<stringify set="method" line="150" static="1">
 			<f a="h">
 				<d/>
 				<c path="String"/>
@@ -18940,21 +18940,21 @@
 			<meta><m n=":analyzer"><e>no_optimize</e></m></meta>
 		</stringify>
 		<h><d/></h>
-		<exists public="1" get="inline" set="null" line="37">
+		<exists public="1" get="inline" set="null" line="98">
 			<f a="key">
 				<c path="String"/>
 				<x path="Bool"/>
 			</f>
 			<haxe_doc>See `Map.exists`</haxe_doc>
 		</exists>
-		<get public="1" get="inline" set="null" line="41">
+		<get public="1" get="inline" set="null" line="102">
 			<f a="key">
 				<c path="String"/>
 				<x path="Null"><c path="haxe.ds.StringMap.T"/></x>
 			</f>
 			<haxe_doc>See `Map.get`</haxe_doc>
 		</get>
-		<set public="1" get="inline" set="null" line="45">
+		<set public="1" get="inline" set="null" line="106">
 			<f a="key:value">
 				<c path="String"/>
 				<c path="haxe.ds.StringMap.T"/>
@@ -18962,47 +18962,47 @@
 			</f>
 			<haxe_doc>See `Map.set`</haxe_doc>
 		</set>
-		<remove public="1" get="inline" set="null" line="49">
+		<remove public="1" get="inline" set="null" line="110">
 			<f a="key">
 				<c path="String"/>
 				<x path="Bool"/>
 			</f>
 			<haxe_doc>See `Map.remove`</haxe_doc>
 		</remove>
-		<keys public="1" get="inline" set="null" line="57">
+		<keys public="1" get="inline" set="null" line="118">
 			<f a=""><t path="Iterator"><c path="String"/></t></f>
 			<haxe_doc>See `Map.keys`
 
 		(java) Implementation detail: Do not `set()` any new value while
 		iterating, as it may cause a resize, which will break iteration.</haxe_doc>
 		</keys>
-		<iterator public="1" get="inline" set="null" line="61">
+		<iterator public="1" get="inline" set="null" line="122">
 			<f a=""><t path="Iterator"><c path="haxe.ds.StringMap.T"/></t></f>
 			<haxe_doc>See `Map.iterator`
 
 		(java) Implementation detail: Do not `set()` any new value while
 		iterating, as it may cause a resize, which will break iteration.</haxe_doc>
 		</iterator>
-		<keyValueIterator public="1" get="inline" set="null" line="65">
+		<keyValueIterator public="1" get="inline" set="null" line="126">
 			<f a=""><t path="KeyValueIterator">
 	<c path="String"/>
 	<c path="haxe.ds.StringMap.T"/>
 </t></f>
 			<haxe_doc>See `Map.keyValueIterator`</haxe_doc>
 		</keyValueIterator>
-		<copy public="1" get="inline" set="null" line="69">
+		<copy public="1" get="inline" set="null" line="130">
 			<f a=""><c path="haxe.ds.StringMap"><c path="haxe.ds.StringMap.T"/></c></f>
 			<haxe_doc>See `Map.copy`</haxe_doc>
 		</copy>
-		<clear public="1" get="inline" set="null" line="73">
+		<clear public="1" get="inline" set="null" line="134">
 			<f a=""><x path="Void"/></f>
 			<haxe_doc>See `Map.clear`</haxe_doc>
 		</clear>
-		<toString public="1" get="inline" set="null" line="77">
+		<toString public="1" get="inline" set="null" line="138">
 			<f a=""><c path="String"/></f>
 			<haxe_doc>See `Map.toString`</haxe_doc>
 		</toString>
-		<new public="1" get="inline" set="null" line="33">
+		<new public="1" get="inline" set="null" line="94">
 			<f a=""><x path="Void"/></f>
 			<haxe_doc>Creates a new StringMap.</haxe_doc>
 		</new>
@@ -19021,9 +19021,9 @@
 		<keys final="1"><c path="Array"><c path="String"/></c></keys>
 		<length final="1"><x path="Int"/></length>
 		<current><x path="Int"/></current>
-		<hasNext public="1" get="inline" set="null" line="112"><f a=""><x path="Bool"/></f></hasNext>
-		<next public="1" get="inline" set="null" line="116"><f a=""><c path="String"/></f></next>
-		<new public="1" get="inline" set="null" line="105"><f a="h">
+		<hasNext public="1" get="inline" set="null" line="173"><f a=""><x path="Bool"/></f></hasNext>
+		<next public="1" get="inline" set="null" line="177"><f a=""><c path="String"/></f></next>
+		<new public="1" get="inline" set="null" line="166"><f a="h">
 	<d/>
 	<x path="Void"/>
 </f></new>
@@ -19033,9 +19033,9 @@
 		<keys final="1"><c path="Array"><c path="String"/></c></keys>
 		<length final="1"><x path="Int"/></length>
 		<current><x path="Int"/></current>
-		<hasNext public="1" get="inline" set="null" line="134"><f a=""><x path="Bool"/></f></hasNext>
-		<next public="1" get="inline" set="null" line="138"><f a=""><c path="haxe.ds._StringMap.StringMapValueIterator.T"/></f></next>
-		<new public="1" get="inline" set="null" line="127"><f a="h">
+		<hasNext public="1" get="inline" set="null" line="195"><f a=""><x path="Bool"/></f></hasNext>
+		<next public="1" get="inline" set="null" line="199"><f a=""><c path="haxe.ds._StringMap.StringMapValueIterator.T"/></f></next>
+		<new public="1" get="inline" set="null" line="188"><f a="h">
 	<d/>
 	<x path="Void"/>
 </f></new>
@@ -19045,12 +19045,12 @@
 		<keys final="1"><c path="Array"><c path="String"/></c></keys>
 		<length final="1"><x path="Int"/></length>
 		<current><x path="Int"/></current>
-		<hasNext public="1" get="inline" set="null" line="156"><f a=""><x path="Bool"/></f></hasNext>
-		<next public="1" get="inline" set="null" line="160"><f a=""><a>
+		<hasNext public="1" get="inline" set="null" line="217"><f a=""><x path="Bool"/></f></hasNext>
+		<next public="1" get="inline" set="null" line="221"><f a=""><a>
 	<value><c path="haxe.ds._StringMap.StringMapKeyValueIterator.T"/></value>
 	<key><c path="String"/></key>
 </a></f></next>
-		<new public="1" get="inline" set="null" line="149"><f a="h">
+		<new public="1" get="inline" set="null" line="210"><f a="h">
 	<d/>
 	<x path="Void"/>
 </f></new>
@@ -85481,6 +85481,38 @@
 </f></new>
 		<haxe_doc>`HaxeIterator` wraps a JavaScript native iterator object to enable for-in iteration in haxe.
 	It can be used directly: `new HaxeIterator(jsIterator)` or via using: `using HaxeIterator`.</haxe_doc>
+	</class>
+	<class path="js.lib.HaxeKeyValueIterator" params="K:V" file="/home/runner/work/haxe/haxe/std/js/lib/HaxeKeyValueIterator.hx">
+		<keyValueIterator public="1" params="K:V" get="inline" set="null" line="44" static="1"><f a="jsIterator">
+	<t path="js.lib.Iterator"><x path="js.lib.KeyValue">
+	<c path="keyValueIterator.K"/>
+	<c path="keyValueIterator.V"/>
+</x></t>
+	<c path="js.lib.HaxeKeyValueIterator">
+		<c path="keyValueIterator.K"/>
+		<c path="keyValueIterator.V"/>
+	</c>
+</f></keyValueIterator>
+		<jsIterator final="1"><t path="js.lib.Iterator"><x path="js.lib.KeyValue">
+	<c path="js.lib.HaxeKeyValueIterator.K"/>
+	<c path="js.lib.HaxeKeyValueIterator.V"/>
+</x></t></jsIterator>
+		<lastStep><t path="js.lib.IteratorStep"><x path="js.lib.KeyValue">
+	<c path="js.lib.HaxeKeyValueIterator.K"/>
+	<c path="js.lib.HaxeKeyValueIterator.V"/>
+</x></t></lastStep>
+		<hasNext public="1" get="inline" set="null" line="34"><f a=""><x path="Bool"/></f></hasNext>
+		<next public="1" get="inline" set="null" line="38"><f a=""><a>
+	<value><c path="js.lib.HaxeKeyValueIterator.V"/></value>
+	<key><c path="js.lib.HaxeKeyValueIterator.K"/></key>
+</a></f></next>
+		<new public="1" get="inline" set="null" line="29"><f a="jsIterator">
+	<t path="js.lib.Iterator"><x path="js.lib.KeyValue">
+	<c path="js.lib.HaxeKeyValueIterator.K"/>
+	<c path="js.lib.HaxeKeyValueIterator.V"/>
+</x></t>
+	<x path="Void"/>
+</f></new>
 	</class>
 	<class path="js.lib.Int16Array" params="" file="/home/runner/work/haxe/haxe/std/js/lib/Int16Array.hx" extern="1">
 		<implements path="js.lib.ArrayBufferView"/>
@@ -87879,10 +87911,10 @@
 		for each element in the `js.Map` object in insertion order.</haxe_doc>
 		</entries>
 		<iterator public="1" get="inline" set="null" line="103"><f a=""><c path="js.lib.HaxeIterator"><c path="js.lib.Map.V"/></c></f></iterator>
-		<keyValueIterator public="1" get="inline" set="null" line="107"><f a=""><c path="js.lib.HaxeIterator"><x path="js.lib.KeyValue">
+		<keyValueIterator public="1" get="inline" set="null" line="107"><f a=""><c path="js.lib.HaxeKeyValueIterator">
 	<c path="js.lib.Map.K"/>
 	<c path="js.lib.Map.V"/>
-</x></c></f></keyValueIterator>
+</c></f></keyValueIterator>
 		<new public="1" set="method">
 			<f a="?iterable">
 				<x path="Any"/>