Prepare release

53 files changed, 1248 insertions, 39 deletions

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index ee5b08cacc..8a8a219b97 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -4936,7 +4936,7 @@ receive_replies(ReqId, N, Acc) ->
     </func>
 
     <func>
-      <name name="nodes" arity="2" since="OTP @OTP-17934@"/>
+      <name name="nodes" arity="2" since="OTP 25.1"/>
       <fsummary>All nodes of a certain type in the system.</fsummary>
       <desc>
         <p>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 0131f8b68f..dc13954ced 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,200 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 13.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed inconsistency bugs in <seeerl
+	    marker="kernel:global"><c>global</c></seeerl> due to
+	    <c>nodeup</c>/<c>nodedown</c> messages not being
+	    delivered before/after traffic over connections. Also
+	    fixed various other inconsistency bugs and deadlocks in
+	    both <seeerl
+	    marker="kernel:global_group"><c>global_group</c></seeerl>
+	    and <c>global</c>.</p>
+          <p>
+	    As building blocks for these fixes, a new BIF <seemfa
+	    marker="erts:erlang#nodes/2"><c>erlang:nodes/2</c></seemfa>
+	    has been introduced and <seemfa
+	    marker="kernel:net_kernel#monitor_nodes/2"><c>net_kernel:monitor_nodes/2</c></seemfa>
+	    has been extended.</p>
+          <p>
+	    The <seecom
+	    marker="erts:erl#hidden"><c>-hidden</c></seecom> and
+	    <seecom
+	    marker="erts:erl#connect_all"><c>-connect_all</c></seecom>
+	    command line arguments did not work if multiple instances
+	    were present on the command line which has been fixed.
+	    The new kernel parameter <seeapp
+	    marker="kernel:kernel_app#connect_all"><c>connect_all</c></seeapp>
+	    has also been introduced in order to replace the
+	    <c>-connect_all</c> command line argument.</p>
+          <p>
+	    Own Id: OTP-17934 Aux Id: PR-6007 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed IPv6 multicast_if and membership socket options.</p>
+          <p>
+	    Own Id: OTP-18091 Aux Id: #5789 </p>
+        </item>
+        <item>
+          <p>
+	    Accept funs (NEW_FUN_EXT) with incorrectly encoded size
+	    field. This is a workaround for a bug (OTP-18104)
+	    existing in OTP 23 and 24 that could cause incorrect size
+	    fields in certain cases. The emulator does not use the
+	    decoded size field, but <c>erl_interface</c> still does
+	    and is not helped by this workaround.</p>
+          <p>
+	    Own Id: OTP-18093 Aux Id: OTP-18104, PR-5987 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed issue with inet:getifaddrs hanging on pure IPv6
+	    Windows</p>
+          <p>
+	    Own Id: OTP-18102 Aux Id: #5904 </p>
+        </item>
+        <item>
+	    <p>Fix faulty distribution encoding of terms with
+	    either</p> <list> <item>a fun with bit-string or
+	    export-fun in its environment when encoded toward a not
+	    yet established (pending) connection</item> <item>or a
+	    fun with a binary/bitstring, in its environment,
+	    referring to an off-heap binary (larger than 64
+	    bytes).</item> </list> <p>The symptom could be failed
+	    decoding on the receiving side leading to aborted
+	    connection. Fix OTP-18093 is a workaround for theses bugs
+	    that makes the VM accepts such faulty encoded funs.</p>
+	    <p>The first encoding bug toward pending connection
+	    exists only in OTP 23 and 24, but the second one exists
+	    also on OTP 25.</p>
+          <p>
+	    Own Id: OTP-18104 Aux Id: OTP-18093 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed emulator crash that could happen during crashdump
+	    generation of ETS tables with options <c>ordered_set</c>
+	    and <c>{write_concurrency,true}</c>.</p>
+          <p>
+	    Own Id: OTP-18144 Aux Id: GH-5981 </p>
+        </item>
+        <item>
+          <p>
+	    Retrieval of monotonic and system clock resolution on
+	    MacOS could cause a crash and/or erroneous results.</p>
+          <p>
+	    Own Id: OTP-18160 Aux Id: PR-6103 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bug where the max allowed size of <c>erl +hmax</c>
+	    was lower than what was allowed by <c>process_flag</c>.</p>
+          <p>
+	    Own Id: OTP-18161 Aux Id: PR-6081 </p>
+        </item>
+        <item>
+	    <p>On computers with ARM64 (AArch64) processors, the JIT
+	    could generate incorrect code when more than 4095 bits
+	    were skipped at the tail end of a binary match.</p>
+          <p>
+	    Own Id: OTP-18201</p>
+        </item>
+        <item>
+	    <p>In rare circumstances, an <c>is_binary/1</c> guard
+	    test could succeed when given a large integer.</p>
+          <p>
+	    Own Id: OTP-18216 Aux Id: GH-6239, PR-6240 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bug causing <c>ets:info</c> (and sometimes
+	    <c>ets:whereis</c>) to return 'undefined' for an existing
+	    table if a concurrent process were doing
+	    <c>ets:insert</c> with a long list on the same table.</p>
+          <p>
+	    Own Id: OTP-18218 Aux Id: ERIERL-855 </p>
+        </item>
+        <item>
+          <p>
+	    Fix writing and reading of more than 2 GB in a single
+	    read/write operation on macOS. Before this fix attempting
+	    to read/write more than 2GB would result in
+	    <c>{error,einval}</c>.</p>
+          <p>
+	    Own Id: OTP-18222 Aux Id: PR-6248 GH-6242 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bug sometimes causing emulator crash at node shutdown
+	    when there are pending connections. Only seen when
+	    running duel distribution protocols, inet_drv and
+	    inet_tls_dist.</p>
+          <p>
+	    Own Id: OTP-18243 Aux Id: GH-6247, PR-6258 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Yield when adjusting large process message queues due
+	    to</p> <list> <item><p>copying terms from a literal area
+	    prior to removing the literal area.</p></item>
+	    <item><p>changing the <c>message_queue_data</c> state
+	    from <c>on_heap</c> to <c>off_heap</c>.</p></item>
+	    </list> <p>The message queue adjustment work will now be
+	    interleaved with all other types of work that processes
+	    have to do, even other message queue adjustment work.</p>
+          <p>
+	    Own Id: OTP-17340 Aux Id: PR-6133 </p>
+        </item>
+        <item>
+          <p>
+	    Add rudimentary debug feature (option) for the
+	    inet-driver based sockets, such as gen_tcp and gen_udp.</p>
+          <p>
+	    Own Id: OTP-18032</p>
+        </item>
+        <item>
+          <p>
+	    Introduced the <c>hidden</c> and <c>dist_listen</c>
+	    options to <seemfa
+	    marker="kernel:net_kernel#start/2"><c>net_kernel:start/2</c></seemfa>.</p>
+          <p>
+	    Also documented the <seecom
+	    marker="erts:erl#dist_listen"><c>-dist_listen</c></seecom>
+	    command line argument which was erroneously documented as
+	    a <c>kernel</c> parameter and not as a command line
+	    argument.</p>
+          <p>
+	    Own Id: OTP-18107 Aux Id: PR-6009 </p>
+        </item>
+        <item>
+          <p>
+	    New documentation chapter "Debugging NIFs and Port
+	    Drivers" under Interoperability Tutorial.</p>
+          <p>
+	    Own Id: OTP-18109</p>
+        </item>
+        <item>
+          <p>
+	    Add new API function erl_features:configurable/0</p>
+          <p>
+	    Own Id: OTP-18199 Aux Id: PR-5790 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 13.0.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src
index 8fd4f54ef6..4b0d0ae2d7 100644
--- a/erts/preloaded/src/erts.app.src
+++ b/erts/preloaded/src/erts.app.src
@@ -42,7 +42,7 @@
 	{registered, []},
 	{applications, []},
 	{env, []},
-	{runtime_dependencies, ["stdlib-@OTP-17934@", "kernel-@OTP-17934@", "sasl-3.3"]}
+	{runtime_dependencies, ["stdlib-4.1", "kernel-8.5", "sasl-3.3"]}
     ]}.
 
 %% vim: ft=erlang
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 84b6069331..c8be3a9156 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 13.0.4
+VSN = 13.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 5885148b8a..ac7bceb5ca 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,6 +32,25 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 5.0.20</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>There is a new configure option,
+	    <c>--enable-deterministic-build</c>, which will apply the
+	    <c>deterministic</c> compiler option when building
+	    Erlang/OTP. The <c>deterministic</c> option has been
+	    improved to eliminate more sources of non-determinism in
+	    several applications.</p>
+          <p>
+	    Own Id: OTP-18165 Aux Id: PR-5965 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 5.0.19</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 8093d57b72..2fbe40e589 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.0.19
+ASN1_VSN = 5.0.20
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index d5a47e2110..5dca77f4e9 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,6 +33,35 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.23.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix cth_surefire to handle when a suite is not compiled
+	    with <c>debug_info</c>. This bug has been present since
+	    Erlang/OTP 25.0.</p>
+          <p>
+	    Own Id: OTP-18208 Aux Id: ERIERL-852 PR-6229 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Common Test now preserves stack traces for throws.</p>
+          <p>
+	    Own Id: OTP-18138 Aux Id: GH-5719, PR-6029 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.23</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index 4f8c4b55d2..03521d90f6 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.23
+COMMON_TEST_VSN = 1.23.1
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 9e38e8ed92..443b8cb5e5 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,109 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 8.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The compiler will now forbid using the empty atom
+	    <c>''</c> as module name. Also forbidden are modules
+	    names containing control characters, and module names
+	    containing only spaces and soft hyphens.</p>
+          <p>
+	    Own Id: OTP-18125 Aux Id: GH-6026 </p>
+        </item>
+        <item>
+	    <p>The <c>bin_opt_info</c> and <c>recv_opt_info</c>
+	    options would cause the compiler to crash when attempting
+	    to compile generated code without location
+	    information.</p>
+          <p>
+	    Own Id: OTP-18162 Aux Id: PR-6102 </p>
+        </item>
+        <item>
+	    <p>In rare circumstances involving floating point
+	    operations, the compiler could terminate with an internal
+	    consistency check failure.</p>
+          <p>
+	    Own Id: OTP-18182 Aux Id: GH-6163 </p>
+        </item>
+        <item>
+	    <p>In rare circumstances when doing arithmetic
+	    instructions on non-numbers, the compiler could
+	    crash.</p>
+          <p>
+	    Own Id: OTP-18183 Aux Id: GH-6169 </p>
+        </item>
+        <item>
+	    <p>In rare circumstances, complex boolean expressions in
+	    nested cases could cause the compiler to crash.</p>
+          <p>
+	    Own Id: OTP-18184 Aux Id: GH-6164 </p>
+        </item>
+        <item>
+	    <p>Expression similar to <c>#{assoc:=V} =
+	    #key=&gt;self()}, V</c> would return the empty map
+	    instead of raising an exception.</p>
+          <p>
+	    Own Id: OTP-18186</p>
+        </item>
+        <item>
+	    <p>Eliminated a crash in the <c>beam_ssa_bool</c> pass of
+	    the compiler when compiling a complex guard
+	    expression.</p>
+          <p>
+	    Own Id: OTP-18187 Aux Id: GH-6184 </p>
+        </item>
+        <item>
+	    <p>In rare circumstances, the compiler could crash with
+	    an internal consistency check failure.</p>
+          <p>
+	    Own Id: OTP-18202 Aux Id: GH-6222 </p>
+        </item>
+        <item>
+	    <p>When compiling with the option
+	    <c>inline_list_funcs</c>, the compiler could produce a
+	    nonsensical warning.</p>
+          <p>
+	    Own Id: OTP-18214 Aux Id: GH-6158 </p>
+        </item>
+        <item>
+	    <p>When given the <c>no_ssa_opt</c> option, the compiler
+	    could terminate with an internal consistency failure
+	    diagnostic when compiling map matching.</p>
+          <p>
+	    Own Id: OTP-18234 Aux Id: GH-6277 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Made warnings for existing atoms being keywords in
+	    experimental features more precise, by not warning about
+	    quoted atoms.</p>
+          <p>
+	    Own Id: OTP-18050</p>
+        </item>
+        <item>
+	    <p>There is a new configure option,
+	    <c>--enable-deterministic-build</c>, which will apply the
+	    <c>deterministic</c> compiler option when building
+	    Erlang/OTP. The <c>deterministic</c> option has been
+	    improved to eliminate more sources of non-determinism in
+	    several applications.</p>
+          <p>
+	    Own Id: OTP-18165 Aux Id: PR-5965 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 8.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index a1ed7bf10a..dee0da88fd 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 8.2
+COMPILER_VSN = 8.2.1
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index c2ecad5040..0d0ba07d8f 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -1838,7 +1838,7 @@ FloatValue = rand:uniform().     % again
     </func>
 
     <func>
-      <name name="engine_register" arity="2" since="OTP @OTP-18172@"/>
+      <name name="engine_register" arity="2" since="OTP 25.1"/>
       <fsummary>Register engine for some methods</fsummary>
       <desc>
 	<p>Register engine to handle some type of methods, for example engine_method_digests.</p>
@@ -1851,7 +1851,7 @@ FloatValue = rand:uniform().     % again
     </func>
 
     <func>
-      <name name="engine_unregister" arity="2" since="OTP @OTP-18172@"/>
+      <name name="engine_unregister" arity="2" since="OTP 25.1"/>
       <fsummary>Unregister engine for some methods</fsummary>
       <desc>
 	<p>Unregister engine so it don't handle some type of methods.</p>
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index dcdf78cc6c..cfe135808b 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,103 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 5.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fix configure with <c>--with-ssl</c> and
+	    <c>--disable-dynamic-ssl-lib</c> on Windows.</p>
+          <p>
+	    Own Id: OTP-18147 Aux Id: GH-6024, PR-6056 </p>
+        </item>
+        <item>
+	    <p> Remove all references correctly in the garbage
+	    collection if an engine handle was not explicit unloaded.
+	    </p>
+          <p>
+	    Own Id: OTP-18152</p>
+        </item>
+        <item>
+	    <p>Changed the behaviour of the engine load/unload
+	    functions</p> <p> The engine load/unload functions have
+	    got changed semantics to get a more consistent behaviour
+	    and work correct when variables are garbage collected.
+	    </p> <p> The load functions now don't register the
+	    methods for the engine to replace. That will now be
+	    handled with the new functions
+	    engine_register/engine_unregister if needed. </p> <p>
+	    Some functions are removed from the documentation and
+	    therefor the API, but they are left in the code for
+	    compatibility. </p> <list> <item>engine_load/4: is now
+	    the same as engine_load/3</item> <item>engine_unload/2:
+	    is now the same as engine_unload/1</item>
+	    <item>ensure_engine_loaded/3: is now the same as
+	    ensure_engine_loaded/2</item>
+	    <item>ensure_engine_unloaded/1, ensure_engine_unloaded/2:
+	    is now the same as engine_unload/1</item> </list>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-18172 Aux Id: ERIERL-826 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed a naming bug for AES-CFB and Blowfish-CFB/OFB when
+	    linked with OpenSSL 3.0 cryptolib.</p>
+          <p>
+	    Own Id: OTP-18200</p>
+        </item>
+        <item>
+          <p>
+	    Sign/verify does now behave as in OTP-24 and earlier for
+	    eddsa.</p>
+          <p>
+	    Own Id: OTP-18205 Aux Id: GH-6219 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Pass elliptic curve names from crypto.erl to crypto's
+	    nif.</p>
+          <p>
+	    Own Id: OTP-18037</p>
+        </item>
+        <item>
+          <p>
+	    The configure option <c>--disable-deprecated-warnings</c>
+	    is removed. It was used for some releases when the
+	    support for OpenSSL 3.0 was not completed. It is not
+	    needed in OTP 25.</p>
+          <p>
+	    Own Id: OTP-18133</p>
+        </item>
+        <item>
+          <p>
+	    Crypto is now considered to be usable with the OpenSSL
+	    3.0 cryptolib for production code.</p>
+          <p>
+	    ENGINE and FIPS are not yet fully functional.</p>
+          <p>
+	    Own Id: OTP-18153</p>
+        </item>
+        <item>
+          <p>
+	    Do not exit if the legacy provider is missing in
+	    libcrypto 3.0.</p>
+          <p>
+	    Own Id: OTP-18217</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 5.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index a555676d49..d9fae2abd7 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 5.1.1
+CRYPTO_VSN = 5.1.2
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 9b7c7d91d0..4a9174e685 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,6 +32,39 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 5.0.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Two bugs have been fixed in Dialyzer's checking of
+	    behaviors:</p>
+	    <p>When a <em>mandatory</em> callback function is present
+	    but not exported, Dialyzer would not complain about a
+	    missing callback.</p>
+	    <p>When an <em>optional</em> callback function was not
+	    exported and had incompatible arguments and/or the return
+	    values were incompatible, Dialyzer would complain. This
+	    has been changed to suppress the warning, because the
+	    function might not be intended to be a callback function,
+	    for instance if a release added a new optional callback
+	    function (such as <c>format_status/1</c> for the
+	    gen_server behaviour added in OTP 25).</p>
+          <p>
+	    Own Id: OTP-18127 Aux Id: ERIERL-817 </p>
+        </item>
+        <item>
+	    <p>The <c>no_extra_return</c> and
+	    <c>no_missing_return</c> warnings can now be suppressed
+	    through <c>-dialyzer</c> directives in source code.</p>
+          <p>
+	    Own Id: OTP-18148 Aux Id: PR-6068 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 5.0.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index 3baabf0915..de813958da 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 5.0.1
+DIALYZER_VSN = 5.0.2
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 19a2d278fc..3619a118a1 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -43,6 +43,25 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>diameter 2.2.7</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>There is a new configure option,
+	    <c>--enable-deterministic-build</c>, which will apply the
+	    <c>deterministic</c> compiler option when building
+	    Erlang/OTP. The <c>deterministic</c> option has been
+	    improved to eliminate more sources of non-determinism in
+	    several applications.</p>
+          <p>
+	    Own Id: OTP-18165 Aux Id: PR-5965 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>diameter 2.2.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index e0dbd4c442..5eda96f384 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 2.2.6
+DIAMETER_VSN = 2.2.7
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index 893b60117a..92726daa8a 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -31,7 +31,22 @@
   </header>
   <p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
 
-  <section><title>Erl_Docgen 1.3</title>
+  <section><title>Erl_Docgen 1.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Update DTD to allow XML tag <c>em</c> under <c>pre</c>.</p>
+          <p>
+	    Own Id: OTP-18244</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 1.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 90715c9c82..a887c5c839 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 1.3
+ERL_DOCGEN_VSN = 1.4
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml
index c9bd570770..98c2a00c41 100644
--- a/lib/eunit/doc/src/notes.xml
+++ b/lib/eunit/doc/src/notes.xml
@@ -33,6 +33,24 @@
   </header>
   <p>This document describes the changes made to the EUnit application.</p>
 
+<section><title>Eunit 2.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    With this change, Eunit can optionally not try to execute
+	    related module with "_tests" suffix. This might be used
+	    for avoiding duplicated executions when source and test
+	    modules are located in the same folder.</p>
+          <p>
+	    Own Id: OTP-18181 Aux Id: ERL-97, GH-3064, PR-5461 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eunit 2.7.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk
index 757bc168d7..22c38f4c7a 100644
--- a/lib/eunit/vsn.mk
+++ b/lib/eunit/vsn.mk
@@ -1 +1 @@
-EUNIT_VSN = 2.7.1
+EUNIT_VSN = 2.8
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index ba6a6cc047..2d02ddd2be 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -649,7 +649,7 @@
     </func>
 
     <func>
-      <name since="OTP @OTP-18118@">ssl_verify_host_options(WildcardHostName) -> list() </name>
+      <name since="OTP 25.1">ssl_verify_host_options(WildcardHostName) -> list() </name>
       <fsummary>Returns ssl options for host verification.</fsummary>
       <type>
         <v>WildcardHostName = boolean()</v>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 67ef801173..0f29c8852f 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,38 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 8.0</title>
+  <section><title>Inets 8.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add <c>httpc:ssl_verify_host_options/1</c> to help
+	    setting default ssl options for the https client.</p>
+          <p>
+	    Own Id: OTP-18118</p>
+        </item>
+        <item>
+          <p>
+	    This change fixes dialyzer warnings generated for
+	    inets/httpd examples (includes needed adjustment of spec
+	    for ssh_sftp module).</p>
+          <p>
+	    Own Id: OTP-18178 Aux Id: ERIERL-833, ERIERL-834,
+	    ERIERL-835 </p>
+        </item>
+        <item>
+          <p>
+	    Remove documentation of no longer supported callback.</p>
+          <p>
+	    Own Id: OTP-18193 Aux Id: GH-6122 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 8.0</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 8ba56d96a6..27ac6ca6bb 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 8.0
+INETS_VSN   = 8.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index aa50a19343..544bcb0eb2 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -31,6 +31,22 @@
   </header>
   <p>This document describes the changes made to the Jinterface application.</p>
 
+<section><title>Jinterface 1.13.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix javadoc build error by adding option <c>-encoding
+	    UTF-8</c>.</p>
+          <p>
+	    Own Id: OTP-18215 Aux Id: PR-6154 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Jinterface 1.13</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index 67802bef8c..dc71145e36 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1 +1 @@
-JINTERFACE_VSN = 1.13
+JINTERFACE_VSN = 1.13.1
diff --git a/lib/kernel/doc/src/global.xml b/lib/kernel/doc/src/global.xml
index 32dd40c980..407ca52a8b 100644
--- a/lib/kernel/doc/src/global.xml
+++ b/lib/kernel/doc/src/global.xml
@@ -147,7 +147,7 @@
     </func>
 
     <func>
-      <name name="disconnect" arity="0" since="OTP @OTP-18232@"/>
+      <name name="disconnect" arity="0" since="OTP 25.1"/>
       <fsummary>Disconnect from all other nodes known to global</fsummary>
       <desc>
         <p>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index dfc028a12f..4e7537dfb0 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,139 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 8.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed inconsistency bugs in <seeerl
+	    marker="kernel:global"><c>global</c></seeerl> due to
+	    <c>nodeup</c>/<c>nodedown</c> messages not being
+	    delivered before/after traffic over connections. Also
+	    fixed various other inconsistency bugs and deadlocks in
+	    both <seeerl
+	    marker="kernel:global_group"><c>global_group</c></seeerl>
+	    and <c>global</c>.</p>
+          <p>
+	    As building blocks for these fixes, a new BIF <seemfa
+	    marker="erts:erlang#nodes/2"><c>erlang:nodes/2</c></seemfa>
+	    has been introduced and <seemfa
+	    marker="kernel:net_kernel#monitor_nodes/2"><c>net_kernel:monitor_nodes/2</c></seemfa>
+	    has been extended.</p>
+          <p>
+	    The <seecom
+	    marker="erts:erl#hidden"><c>-hidden</c></seecom> and
+	    <seecom
+	    marker="erts:erl#connect_all"><c>-connect_all</c></seecom>
+	    command line arguments did not work if multiple instances
+	    were present on the command line which has been fixed.
+	    The new kernel parameter <seeapp
+	    marker="kernel:kernel_app#connect_all"><c>connect_all</c></seeapp>
+	    has also been introduced in order to replace the
+	    <c>-connect_all</c> command line argument.</p>
+          <p>
+	    Own Id: OTP-17934 Aux Id: PR-6007 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed IPv6 multicast_if and membership socket options.</p>
+          <p>
+	    Own Id: OTP-18091 Aux Id: #5789 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed issue with inet:getifaddrs hanging on pure IPv6
+	    Windows</p>
+          <p>
+	    Own Id: OTP-18102 Aux Id: #5904 </p>
+        </item>
+        <item>
+          <p>
+	    The type specifications for <c>inet:getopts/2</c> and
+	    <c>inet:setopts/2</c> have been corrected regarding SCTP
+	    options.</p>
+          <p>
+	    Own Id: OTP-18115 Aux Id: PR-5939 </p>
+        </item>
+        <item>
+          <p>
+	    The type specifications for <c>inet:parse_*</c> have been
+	    tightened.</p>
+          <p>
+	    Own Id: OTP-18121 Aux Id: PR-5972 </p>
+        </item>
+        <item>
+          <p>
+	    Fix gen_tcp:connect/3 spec to include the inet_backend
+	    option.</p>
+          <p>
+	    Own Id: OTP-18171 Aux Id: PR-6131 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bug where using a binary as the format when calling
+	    <c>logger:log(Level, Format, Args)</c> (or any other
+	    logging function) would cause a crash or incorrect
+	    logging.</p>
+          <p>
+	    Own Id: OTP-18229 Aux Id: PR-6212 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add rudimentary debug feature (option) for the
+	    inet-driver based sockets, such as gen_tcp and gen_udp.</p>
+          <p>
+	    Own Id: OTP-18032</p>
+        </item>
+        <item>
+          <p>
+	    Introduced the <c>hidden</c> and <c>dist_listen</c>
+	    options to <seemfa
+	    marker="kernel:net_kernel#start/2"><c>net_kernel:start/2</c></seemfa>.</p>
+          <p>
+	    Also documented the <seecom
+	    marker="erts:erl#dist_listen"><c>-dist_listen</c></seecom>
+	    command line argument which was erroneously documented as
+	    a <c>kernel</c> parameter and not as a command line
+	    argument.</p>
+          <p>
+	    Own Id: OTP-18107 Aux Id: PR-6009 </p>
+        </item>
+        <item>
+          <p>
+	    Scope and group monitoring have been introduced in
+	    <seeerl marker="kernel:pg"><c>pg</c></seeerl>. For more
+	    information see the documentation of <seemfa
+	    marker="kernel:pg#monitor_scope/0"><c>pg:monitor_scope()</c></seemfa>,
+	    <seemfa
+	    marker="kernel:pg#monitor/1"><c>pg:monitor()</c></seemfa>,
+	    and <seemfa
+	    marker="kernel:pg#demonitor/1"><c>pg:demonitor()</c></seemfa>.</p>
+          <p>
+	    Own Id: OTP-18163 Aux Id: PR-6058, PR-6275 </p>
+        </item>
+        <item>
+          <p>
+	    A new function <seemfa
+	    marker="kernel:global#disconnect/0"><c>global:disconnect/0</c></seemfa>
+	    has been introduced with which one can cleanly disconnect
+	    a node from all other nodes in a cluster of <c>global</c>
+	    nodes.</p>
+          <p>
+	    Own Id: OTP-18232 Aux Id: OTP-17843, PR-6264 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 8.4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index c9fee98cf3..f95e998f2a 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -158,6 +158,6 @@
          {shell_docs_ansi,auto}
         ]},
   {mod, {kernel, []}},
-  {runtime_dependencies, ["erts-@OTP-17934@", "stdlib-4.0", "sasl-3.0", "crypto-5.0"]}
+  {runtime_dependencies, ["erts-13.1", "stdlib-4.0", "sasl-3.0", "crypto-5.0"]}
   ]
 }.
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 19cb1b8970..7c530c2940 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -55,7 +55,8 @@
   {<<"^8\\.3\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.4$">>,[restart_new_emulator]},
   {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+  {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^8\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
  [{<<"^7\\.0$">>,[restart_new_emulator]},
   {<<"^7\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^7\\.1$">>,[restart_new_emulator]},
@@ -83,4 +84,5 @@
   {<<"^8\\.3\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.4$">>,[restart_new_emulator]},
   {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+  {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^8\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 8a231615b4..4665a09e55 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 8.4.2
+KERNEL_VSN = 8.5
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index e42f484091..1ae6b0c908 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -37,7 +37,39 @@
   section is the version number of Megaco.</p>
 
 
-  <section><title>Megaco 4.4</title>
+  <section><title>Megaco 4.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed various dialyzer related issues in the examples and
+	    the application proper.</p>
+          <p>
+	    Own Id: OTP-18179 Aux Id: ERIERL-836 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>There is a new configure option,
+	    <c>--enable-deterministic-build</c>, which will apply the
+	    <c>deterministic</c> compiler option when building
+	    Erlang/OTP. The <c>deterministic</c> option has been
+	    improved to eliminate more sources of non-determinism in
+	    several applications.</p>
+          <p>
+	    Own Id: OTP-18165 Aux Id: PR-5965 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Megaco 4.4</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index a58cf04e2a..deb85264ae 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 4.4
+MEGACO_VSN  = 4.4.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index f8ffc76158..c90095718f 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 2.13</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fixed units in gui.</p>
+          <p>
+	    Own Id: OTP-18151 Aux Id: PR-6063 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 2.12</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index cc6f77a8a2..d0250a76f6 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.12
+OBSERVER_VSN = 2.13
diff --git a/lib/parsetools/doc/src/notes.xml b/lib/parsetools/doc/src/notes.xml
index eeab5d776d..6d79b4ce49 100644
--- a/lib/parsetools/doc/src/notes.xml
+++ b/lib/parsetools/doc/src/notes.xml
@@ -31,6 +31,25 @@
   </header>
   <p>This document describes the changes made to the Parsetools application.</p>
 
+<section><title>Parsetools 2.4.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>There is a new configure option,
+	    <c>--enable-deterministic-build</c>, which will apply the
+	    <c>deterministic</c> compiler option when building
+	    Erlang/OTP. The <c>deterministic</c> option has been
+	    improved to eliminate more sources of non-determinism in
+	    several applications.</p>
+          <p>
+	    Own Id: OTP-18165 Aux Id: PR-5965 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Parsetools 2.4</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/parsetools/vsn.mk b/lib/parsetools/vsn.mk
index fa41d05179..f903e0274d 100644
--- a/lib/parsetools/vsn.mk
+++ b/lib/parsetools/vsn.mk
@@ -1 +1 @@
-PARSETOOLS_VSN = 2.4
+PARSETOOLS_VSN = 2.4.1
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 22ca079487..846a05025e 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,34 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 1.13.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Support more Linux distributions in cacerts_load/0.</p>
+          <p>
+	    Own Id: OTP-18154 Aux Id: PR-6002 </p>
+        </item>
+        <item>
+          <p>
+	    Correct asn1 typenames available in type pki_asn1_type()</p>
+          <p>
+	    Own Id: OTP-18189 Aux Id: ERIERL-829 </p>
+        </item>
+        <item>
+          <p>
+	    Sign/verify does now behave as in OTP-24 and earlier for
+	    eddsa.</p>
+          <p>
+	    Own Id: OTP-18205 Aux Id: GH-6219 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 1.13</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 6ca08cfddb..fe098dd1a4 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.13
+PUBLIC_KEY_VSN = 1.13.1
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 837022cdd9..a57c21ffe4 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,30 @@
   </header>
 
 
-  <section><title>SNMP 5.13</title>
+  <section><title>SNMP 5.13.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Improved the get-bulk response max size calculation. Its
+	    now possible to configure 'empty pdu size', see appendix
+	    c for more info.</p>
+          <p>
+	    Own Id: OTP-17115 Aux Id: ERIERL-456 </p>
+        </item>
+        <item>
+          <p>
+	    Fix various example dialyzer issues</p>
+          <p>
+	    Own Id: OTP-18180 Aux Id: ERIERL-837 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.13</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index a607273107..b69b3c40b2 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.13
+SNMP_VSN    = 5.13.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 13019140eb..465ac854f0 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,67 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.15</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Handling rare race condition at channel close.</p>
+          <p>
+	    Own Id: OTP-18220 Aux Id: ERIERL-666, ERIERL-661 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    New ssh option <c>no_auth_needed</c> to skip the ssh
+	    authentication. Use with caution!</p>
+          <p>
+	    Own Id: OTP-18134 Aux Id: GH-6021 </p>
+        </item>
+        <item>
+          <p>
+	    This change fixes dialyzer warnings generated for
+	    inets/httpd examples (includes needed adjustment of spec
+	    for ssh_sftp module).</p>
+          <p>
+	    Own Id: OTP-18178 Aux Id: ERIERL-833, ERIERL-834,
+	    ERIERL-835 </p>
+        </item>
+        <item>
+          <p>
+	    The new function <c>ssh:daemon_replace_options/2</c>
+	    makes it possible to change the <c>Options</c> in a
+	    running SSH server.</p>
+          <p>
+	    Established connections are not affected, only those
+	    created after the call to this new function.</p>
+          <p>
+	    Own Id: OTP-18196</p>
+        </item>
+        <item>
+          <p>
+	    Add a timeout as option <c>max_initial_idle_time</c>. It
+	    closes a connection that does not allocate a channel
+	    within the timeout time.</p>
+          <p>
+	    For more information about timeouts, see the <seeguide
+	    marker="hardening#timeouts">Timeouts section </seeguide>
+	    in the User's Guide <seeguide
+	    marker="hardening">Hardening</seeguide> chapter.</p>
+          <p>
+	    Own Id: OTP-18207 Aux Id: PR-6231 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.14.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 48b03adafa..fc5447302c 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.14.1
+SSH_VSN = 4.15
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index a490b41ac7..78b81b5f9c 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,106 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 10.8.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Reject unexpected application data in all relevant places
+	    for all TLS versions. Also, handle TLS-1.3 middlebox
+	    compatibility with more care. This will make malicious
+	    connections fail early and further, mitigate possible DoS
+	    attacks, that would be caught by the handshake timeout.</p>
+          <p>
+	    Thanks to Aina Toky Rasoamanana and Olivier Levillain
+	    from Télécom SudParis for alerting us of the issues in
+	    our implementation.</p>
+          <p>
+	    Own Id: OTP-18044</p>
+        </item>
+        <item>
+          <p>
+	    With this change, value of cacertfile option will be
+	    adjusted before loading certs from the file. Adjustments
+	    include converting relative paths to absolute and
+	    converting symlinks to actual file path.</p>
+          <p>
+	    Thanks to Marcus Johansson</p>
+          <p>
+	    Own Id: OTP-18099 Aux Id: PR-6287 </p>
+        </item>
+        <item>
+          <p>
+	    In TLS-1.3, if chain certs are missing (so server auth
+	    domain adherence can not be determined) send peer cert
+	    and hope the server is able to recreate a chain in its
+	    auth domain.</p>
+          <p>
+	    Own Id: OTP-18191 Aux Id: GH-6105 </p>
+        </item>
+        <item>
+          <p>
+	    Make sure periodical refresh of CA certificate files
+	    repopulates cache properly.</p>
+          <p>
+	    Own Id: OTP-18195</p>
+        </item>
+        <item>
+          <p>
+	    Correct internal CRL cache functions to use internal
+	    format consistently.</p>
+          <p>
+	    Own Id: OTP-18203 Aux Id: PR-5996 </p>
+        </item>
+        <item>
+          <p>
+	    Incorrect handling of client middlebox negotiation for
+	    TLS-1.3 could result in that a TLS-1.3 server would not
+	    use middlebox mode although the client was expecting it
+	    too and failing the negotiation with unexpected message.</p>
+          <p>
+	    Own Id: OTP-18219 Aux Id: GH-6241, PR-6249 </p>
+        </item>
+        <item>
+          <p>
+	    If the "User" process, the process starting the TLS
+	    connection, gets killed in the middle of spawning the
+	    dynamic connection tree make sure we do not leave any
+	    processes behind.</p>
+          <p>
+	    Own Id: OTP-18233 Aux Id: GH-6244, PR-6270 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A vulnerability has been discovered and corrected. It is
+	    registered as CVE-2022-37026 "Client Authentication
+	    Bypass". Corrections have been released on the supported
+	    tracks with patches 23.3.4.15, 24.3.4.2, and 25.0.2. The
+	    vulnerability might also exist in older OTP versions. We
+	    recommend that impacted users upgrade to one of these
+	    versions or later on the respective tracks. OTP 25.1
+	    would be an even better choice. Impacted are those who
+	    are running an ssl/tls/dtls server using the ssl
+	    application either directly or indirectly via other
+	    applications. For example via inets (httpd), cowboy, etc.
+	    Note that the vulnerability only affects servers that
+	    request client certification, that is sets the option
+	    {verify, verify_peer}.</p>
+          <p>
+	    Own Id: OTP-18241</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 10.8.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index d06e4c86a6..dff4b5a4fd 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.8.3
+SSL_VSN = 10.8.4
diff --git a/lib/stdlib/doc/src/erl_features.xml b/lib/stdlib/doc/src/erl_features.xml
index f86f6f1d5b..cf85b4ccd6 100644
--- a/lib/stdlib/doc/src/erl_features.xml
+++ b/lib/stdlib/doc/src/erl_features.xml
@@ -71,7 +71,7 @@
     </func>
 
     <func>
-      <name name="configurable" arity="0" since="OTP @OTP-18199@"/>
+      <name name="configurable" arity="0" since="OTP 25.1"/>
       <fsummary>Return all configurable features.</fsummary>
       <desc>
         <p>Return a list of all configurable features, that is, features
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index f760dffccc..af68daad9e 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,125 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed inconsistency bugs in <seeerl
+	    marker="kernel:global"><c>global</c></seeerl> due to
+	    <c>nodeup</c>/<c>nodedown</c> messages not being
+	    delivered before/after traffic over connections. Also
+	    fixed various other inconsistency bugs and deadlocks in
+	    both <seeerl
+	    marker="kernel:global_group"><c>global_group</c></seeerl>
+	    and <c>global</c>.</p>
+          <p>
+	    As building blocks for these fixes, a new BIF <seemfa
+	    marker="erts:erlang#nodes/2"><c>erlang:nodes/2</c></seemfa>
+	    has been introduced and <seemfa
+	    marker="kernel:net_kernel#monitor_nodes/2"><c>net_kernel:monitor_nodes/2</c></seemfa>
+	    has been extended.</p>
+          <p>
+	    The <seecom
+	    marker="erts:erl#hidden"><c>-hidden</c></seecom> and
+	    <seecom
+	    marker="erts:erl#connect_all"><c>-connect_all</c></seecom>
+	    command line arguments did not work if multiple instances
+	    were present on the command line which has been fixed.
+	    The new kernel parameter <seeapp
+	    marker="kernel:kernel_app#connect_all"><c>connect_all</c></seeapp>
+	    has also been introduced in order to replace the
+	    <c>-connect_all</c> command line argument.</p>
+          <p>
+	    Own Id: OTP-17934 Aux Id: PR-6007 </p>
+        </item>
+        <item>
+          <p>
+	    Fix the <c>public_key:ssh*</c> functions to be listed
+	    under the correct release in the Removed Functionality
+	    User's Guide.</p>
+          <p>
+	    Own Id: OTP-18139 Aux Id: PR-6060 </p>
+        </item>
+        <item>
+          <p>
+	    The type spec for <c>format_status/1</c> in
+	    <c>gen_statem</c>, <c>gen_server</c> and <c>gen_event</c>
+	    has been corrected to state that the return value is of
+	    the same type as the argument (instead of the same value
+	    as the argument).</p>
+          <p>
+	    Own Id: OTP-18142 Aux Id: PR-6078 </p>
+        </item>
+        <item>
+          <p>
+	    If the <c>timer</c> server child spec was already present
+	    in <c>kernel_sup</c> but it was not started, the
+	    <c>timer</c> server would fail to start with an
+	    <c>{error, already_present}</c> error instead of
+	    restarting the server.</p>
+          <p>
+	    Own Id: OTP-18146 Aux Id: PR-5983 </p>
+        </item>
+        <item>
+	    <p>When changing callback module in <c>gen_statem</c> the
+	    state_enter calls flag from the old module was used in
+	    for the first event in the new module, which could
+	    confuse the new module and cause malfunction. This bug
+	    has been corrected. </p><p> With this change some
+	    <c>sys</c> debug message formats have been modified,
+	    which can be a problem for debug code relying on the
+	    format. </p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-18239</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>There is a new configure option,
+	    <c>--enable-deterministic-build</c>, which will apply the
+	    <c>deterministic</c> compiler option when building
+	    Erlang/OTP. The <c>deterministic</c> option has been
+	    improved to eliminate more sources of non-determinism in
+	    several applications.</p>
+          <p>
+	    Own Id: OTP-18165 Aux Id: PR-5965 </p>
+        </item>
+        <item>
+	    <p>The <c>rfc339_to_system_time/1,2</c> functions now
+	    allows the minutes part to be omitted from the time
+	    zone.</p>
+          <p>
+	    Own Id: OTP-18166 Aux Id: PR-6108 </p>
+        </item>
+        <item>
+          <p>
+	    The <c>receive</c> statement in <c>gen_event</c> has been
+	    optimized to not use selective receive (which was never
+	    needed, and could cause severe performance degradation
+	    under heavy load).</p>
+          <p>
+	    Own Id: OTP-18194 Aux Id: PR-6199 </p>
+        </item>
+        <item>
+          <p>
+	    Add new API function erl_features:configurable/0</p>
+          <p>
+	    Own Id: OTP-18199 Aux Id: PR-5790 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 4.0.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index 90c19b2cad..8d935fb9e1 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -112,6 +112,6 @@
                dets]},
   {applications, [kernel]},
   {env, []},
-  {runtime_dependencies, ["sasl-3.0","kernel-8.4","erts-@OTP-17934@","crypto-4.5",
+  {runtime_dependencies, ["sasl-3.0","kernel-8.4","erts-13.1","crypto-4.5",
 			  "compiler-5.0"]}
 ]}.
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 0a031e3579..864429adbd 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -48,7 +48,8 @@
   {<<"^3\\.17\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.17\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^4\\.0$">>,[restart_new_emulator]},
-  {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+  {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
  [{<<"^3\\.13$">>,[restart_new_emulator]},
   {<<"^3\\.13\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.13\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -69,4 +70,5 @@
   {<<"^3\\.17\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.17\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^4\\.0$">>,[restart_new_emulator]},
-  {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+  {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 03051bf49f..7ffabdde04 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 4.0.1
+STDLIB_VSN = 4.1
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 276d3dab57..701c4d372b 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,25 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.30</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>There is a new configure option,
+	    <c>--enable-deterministic-build</c>, which will apply the
+	    <c>deterministic</c> compiler option when building
+	    Erlang/OTP. The <c>deterministic</c> option has been
+	    improved to eliminate more sources of non-determinism in
+	    several applications.</p>
+          <p>
+	    Own Id: OTP-18165 Aux Id: PR-5965 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.29</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 53f4ffa895..038f7ba263 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.29
+XMERL_VSN = 1.3.30
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index b8220e1a87..d8f0d97117 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1 +1,83 @@
-DEVELOPMENT
+OTP-16607
+OTP-17115
+OTP-17340
+OTP-17934
+OTP-18032
+OTP-18037
+OTP-18044
+OTP-18050
+OTP-18091
+OTP-18093
+OTP-18099
+OTP-18102
+OTP-18104
+OTP-18107
+OTP-18109
+OTP-18115
+OTP-18118
+OTP-18121
+OTP-18125
+OTP-18127
+OTP-18133
+OTP-18134
+OTP-18138
+OTP-18139
+OTP-18142
+OTP-18144
+OTP-18146
+OTP-18147
+OTP-18148
+OTP-18151
+OTP-18152
+OTP-18153
+OTP-18154
+OTP-18160
+OTP-18161
+OTP-18162
+OTP-18163
+OTP-18165
+OTP-18166
+OTP-18171
+OTP-18172
+OTP-18178
+OTP-18179
+OTP-18180
+OTP-18181
+OTP-18182
+OTP-18183
+OTP-18184
+OTP-18186
+OTP-18187
+OTP-18189
+OTP-18191
+OTP-18192
+OTP-18193
+OTP-18194
+OTP-18195
+OTP-18196
+OTP-18199
+OTP-18200
+OTP-18201
+OTP-18202
+OTP-18203
+OTP-18205
+OTP-18207
+OTP-18208
+OTP-18214
+OTP-18215
+OTP-18216
+OTP-18217
+OTP-18218
+OTP-18219
+OTP-18220
+OTP-18222
+OTP-18224
+OTP-18229
+OTP-18232
+OTP-18233
+OTP-18234
+OTP-18239
+OTP-18241
+OTP-18242
+OTP-18243
+OTP-18244