Merge branch 'maint'

* maint:
  Updated OTP version
  Prepare release

# Conflicts:
#	OTP_VERSION

45 files changed, 799 insertions, 27 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 04edba9bef..14a3c2b58d 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,159 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 11.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix memory leak of about 6 words when
+	    <c>erlang:process_flag/3</c> is called with a pid of an
+	    already dead process. Bug exists since OTP-21.0.</p>
+          <p>
+	    Own Id: OTP-17081 Aux Id: PR-2930 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed small memory leak in <c>erl_drv_send_term</c> and
+	    <c>erl_drv_output_term</c> when failing due to the term
+	    being invalid.</p>
+          <p>
+	    Own Id: OTP-17089 Aux Id: PR-2934 </p>
+        </item>
+        <item>
+          <p>
+	    The DTrace/SystemTap <c>process_heap_grow</c> probe is
+	    now called with valid the heap and stack pointers for the
+	    process in question.</p>
+          <p>
+	    Own Id: OTP-17096 Aux Id: PR-2932 </p>
+        </item>
+        <item>
+	    <p>Fixed a performance issue in memory allocation for
+	    Linux kernels that didn't support <c>MADV_FREE</c>.</p>
+          <p>
+	    Own Id: OTP-17124</p>
+        </item>
+        <item>
+          <p>
+	    A <seeguide
+	    marker="erts:erl_dist_protocol#new_link_protocol">new
+	    link protocol</seeguide> has been introduced which
+	    prevents links from ending up in an inconsistent state
+	    where one participant considers itself linked while the
+	    other doesn't. This bug has always existed in the
+	    distributed case, but has since OTP 21 also existed in
+	    the node local case since the distributed link protocol
+	    then was adopted also for node local links. The bug
+	    could, however, only trigger if both participants
+	    operated on the link simultaneously.</p>
+          <p>
+	    Own Id: OTP-17127</p>
+        </item>
+        <item>
+          <p>
+	    Fix memory leak when receiving sigchld from port program
+	    to already dead port.</p>
+          <p>
+	    Own Id: OTP-17163</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug where complex seq_trace tokens (that is lists,
+	    tuples, maps etc) could becomes corrupted by the GC. The
+	    bug was introduced in OTP-21.</p>
+          <p>
+	    Own Id: OTP-17209 Aux Id: PR-3039 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed WSLPATH environment variable addition to PATH on
+	    windows, the last character was lost.</p>
+          <p>
+	    Own Id: OTP-17229</p>
+        </item>
+        <item>
+          <p>
+	    Fixed a bug in the timer implementation which could cause
+	    timers that were set to more than 37.25 hours in the
+	    future to be delayed. This could occur if there were
+	    multiple timers scheduled to be triggered very close in
+	    time, but still at different times, and the scheduler
+	    thread handling the timers was not able to handle them
+	    quickly enough. Delayed timers were in this case
+	    triggered when another unrelated timer was triggered.</p>
+          <p>
+	    Own Id: OTP-17253</p>
+        </item>
+        <item>
+          <p>
+	    Fixed small memory leak in <c>erlang:trace/3</c> if
+	    option <c>{tracer,_}</c> is included and the option list
+	    is invalid or the call races with a concurrent trace or
+	    code change operation.</p>
+          <p>
+	    Own Id: OTP-17265 Aux Id: PR-4596 </p>
+        </item>
+        <item>
+          <p>
+	    Fix configure check for <c>inet_pton</c> on 32-bit
+	    windows. The failure of this check would cause epmd to be
+	    built without ipv6 support.</p>
+          <p>
+	    Own Id: OTP-17283</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Various address sanitizer support.</p>
+          <p>
+	    Own Id: OTP-16959 Aux Id: PR-2965 </p>
+        </item>
+        <item>
+	    <p>The emulator will now honor <c>cgroup2</c> CPU
+	    quotas.</p>
+          <p>
+	    Own Id: OTP-17002</p>
+        </item>
+        <item>
+          <p>
+	    Improved memory barrier usage on ARMv8 hardware, and
+	    specifically on Apple silicon.</p>
+          <p>
+	    Own Id: OTP-17195 Aux Id: PR-4505, PR-4538 </p>
+        </item>
+        <item>
+          <p>
+	    Improved memory barrier usage on 64-bit POWER hardware.</p>
+          <p>
+	    Own Id: OTP-17200 Aux Id: PR-4510 </p>
+        </item>
+        <item>
+          <p>
+	    Fix a file descriptor leak when using sendfile and the
+	    remote side closes the connection. This bug has been
+	    present since OTP-21.0.</p>
+          <p>
+	    Own Id: OTP-17244</p>
+        </item>
+        <item>
+          <p>
+	    Refinement of the documentation of the
+	    <c>message_queue_data</c> process flag.</p>
+          <p>
+	    Own Id: OTP-17252 Aux Id: PR-4568 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 11.1.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index cc7958578f..ef6d146974 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 11.1.8
+VSN = 11.2
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index c4f5c7bb11..1ba1765347 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,6 +33,21 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.20</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Various address sanitizer support.</p>
+          <p>
+	    Own Id: OTP-16959 Aux Id: PR-2965 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.19.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index 1994d75518..d1e8e2e8ba 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.19.1
+COMMON_TEST_VSN = 1.20
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 4938c6920a..0d8fafb523 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,28 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 7.6.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a bug in the type optimization pass that could
+	    yield incorrect values or cause the wrong clauses to be
+	    executed.</p>
+          <p>
+	    Own Id: OTP-17073</p>
+        </item>
+        <item>
+	    <p>Fixed a bug in the validator that could cause it to
+	    reject valid code.</p>
+          <p>
+	    Own Id: OTP-17126 Aux Id: ERL-1471 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 7.6.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index 421b5ac2a1..c628ece88c 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.6.6
+COMPILER_VSN = 7.6.7
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index aea2139351..304e263f88 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,54 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 4.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix minor memory leaks in crypto ENGINE and robustify the
+	    code.</p>
+          <p>
+	    Own Id: OTP-17212</p>
+        </item>
+        <item>
+          <p>
+	    The otp_test_engine no longer fails if NO_EC* is set in
+	    the OpenSSL configuration.</p>
+          <p>
+	    Own Id: OTP-17256 Aux Id: PR-4580, GH-4573 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Various address sanitizer support.</p>
+          <p>
+	    Own Id: OTP-16959 Aux Id: PR-2965 </p>
+        </item>
+        <item>
+          <p>
+	    EVP is now disabled for OpenSSL cryptolib versions up to
+	    and including 1.0.2</p>
+          <p>
+	    Own Id: OTP-17116 Aux Id: PR-2972 </p>
+        </item>
+        <item>
+          <p>
+	    Warning for unused C function removed</p>
+          <p>
+	    Own Id: OTP-17145 Aux Id: OTP-17105, PR-2872 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 4.8.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 0fb42b3993..1aaf84ba37 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 4.8.3
+CRYPTO_VSN = 4.9
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 7667ab9459..eac56be316 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 4.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Correct handling of PLTs in the GUI.</p>
+          <p>
+	    Own Id: OTP-17091</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 4.3</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index 3e7cebb1c9..803d121b53 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 4.3
+DIALYZER_VSN = 4.3.1
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index 946db5b93d..667c0075cd 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the Eldap application.</p>
 
+<section><title>Eldap 1.2.9</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add ability to specify size limit on ldap requests</p>
+          <p>
+	    Own Id: OTP-17166 Aux Id: PR-2904 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eldap 1.2.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index 8f969e6945..f0b9745f08 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.2.8
+ELDAP_VSN = 1.2.9
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index fca0b46878..8603433fbd 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -31,6 +31,31 @@
   </header>
   <p>This document describes the changes made to the Jinterface application.</p>
 
+<section><title>Jinterface 1.11.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A <seeguide
+	    marker="erts:erl_dist_protocol#new_link_protocol">new
+	    link protocol</seeguide> has been introduced which
+	    prevents links from ending up in an inconsistent state
+	    where one participant considers itself linked while the
+	    other doesn't. This bug has always existed in the
+	    distributed case, but has since OTP 21 also existed in
+	    the node local case since the distributed link protocol
+	    then was adopted also for node local links. The bug
+	    could, however, only trigger if both participants
+	    operated on the link simultaneously.</p>
+          <p>
+	    Own Id: OTP-17127</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Jinterface 1.11</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index f253cf7431..5209c63af3 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1 +1 @@
-JINTERFACE_VSN = 1.11
+JINTERFACE_VSN = 1.11.1
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 9bfb2df9f7..562384f7be 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,60 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 7.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The range check for compression pointers in DNS encoding
+	    was faulty, which caused incorrect label compression
+	    encoding for very large DNS messages; larger than about
+	    16 kBytes, such as AXFR responses. This more than 11 year
+	    old bug has now been corrected.</p>
+          <p>
+	    Own Id: OTP-13641 Aux Id: PR-2959 </p>
+        </item>
+        <item>
+          <p>
+	    Fix of internal links in the <c>erpc</c> documentation.</p>
+          <p>
+	    Own Id: OTP-17202 Aux Id: PR-4516 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bug where complex seq_trace tokens (that is lists,
+	    tuples, maps etc) could becomes corrupted by the GC. The
+	    bug was introduced in OTP-21.</p>
+          <p>
+	    Own Id: OTP-17209 Aux Id: PR-3039 </p>
+        </item>
+        <item>
+	    <p>When running Xref in the <c>modules</c> mode, the
+	    Debugger application would show up as a depency for the
+	    Kernel applications.</p>
+          <p>
+	    Own Id: OTP-17223 Aux Id: GH-4546, PR-4554 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    <seeerl marker="erl_epmd"><c>erl_epmd</c></seeerl> (the
+	    epmd client) will now try to reconnect to the local EPMD
+	    if the connection is broken.</p>
+          <p>
+	    Own Id: OTP-17178 Aux Id: PR-3003 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 7.2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index a8490ecefa..796bec68b3 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -52,7 +52,8 @@
   {<<"^7\\.1$">>,[restart_new_emulator]},
   {<<"^7\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^7\\.2$">>,[restart_new_emulator]},
-  {<<"^7\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+  {<<"^7\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
  [{<<"^6\\.0$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -77,4 +78,5 @@
   {<<"^7\\.1$">>,[restart_new_emulator]},
   {<<"^7\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^7\\.2$">>,[restart_new_emulator]},
-  {<<"^7\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+  {<<"^7\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 4a226539a3..c04299ae88 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 7.2.1
+KERNEL_VSN = 7.3
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index c8c7c0c0a5..ba61efa7e9 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,42 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.18.1</title>
+  <section><title>Mnesia 4.19</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed the type spec for <c>disc_only_copies</c>.</p>
+          <p>
+	    Own Id: OTP-17249 Aux Id: PR-4578 </p>
+        </item>
+        <item>
+          <p>
+	    Do not crash in <c>mnesia:change_config/2</c> if mnesia
+	    is stopping or starting.</p>
+          <p>
+	    Own Id: OTP-17274 Aux Id: GH-4616 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Optimized table loading time for tables that are updated
+	    during the loading.</p>
+          <p>
+	    Own Id: OTP-17271 Aux Id: PR-4575 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.18.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 19a69fb714..a5832068a1 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.18.1
+MNESIA_VSN = 4.19
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index 3533310e51..b219f79b87 100644
--- a/lib/odbc/doc/src/notes.xml
+++ b/lib/odbc/doc/src/notes.xml
@@ -32,7 +32,23 @@
   <p>This document describes the changes made to the odbc application.
   </p>
 
-  <section><title>ODBC 2.13.2</title>
+  <section><title>ODBC 2.13.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Make sure odbc c-process exits when erlang process orders
+	    it to shutdown.</p>
+          <p>
+	    Own Id: OTP-17188 Aux Id: ERL-1448 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ODBC 2.13.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index c08f40d233..717da2b77c 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.13.2
+ODBC_VSN = 2.13.3
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 7cabfed09a..e831773871 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,46 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 1.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed case insensitive hostname check.</p>
+          <p>
+	    Own Id: OTP-17242 Aux Id: GH-4500 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add sanity check of trusted anchor certificate expiration
+	    to pkix_path_validation/3. Although the anchor is
+	    considered a trusted input this sanity check does provide
+	    extra security for the users of the public_key
+	    application as this property needs to be checked at time
+	    of usage and fits very well with the other checks
+	    performed here.</p>
+          <p>
+	    Own Id: OTP-16907</p>
+        </item>
+        <item>
+          <p>
+	    Adjust generation of test certificates to conform to RFC
+	    5280 rules for formatting of the certificates validity</p>
+          <p>
+	    Own Id: OTP-17111</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 1.9.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 0de40d1d3f..442b3cc18e 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.9.2
+PUBLIC_KEY_VSN = 1.10
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index efd5939fe0..6303397f57 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
+<section><title>Runtime_Tools 1.16</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Clarify documentation of module 'scheduler'.</p>
+          <p>
+	    Own Id: OTP-17208 Aux Id: GH-4502, PR-4532 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Runtime_Tools 1.15.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index b4e5e953e4..e62d59acf6 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.15.1
+RUNTIME_TOOLS_VSN = 1.16
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index a15351cd23..46e6762b90 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -31,6 +31,31 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
+<section><title>SASL 4.0.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix dependent application to be stopped after the primary
+	    application when upgrading a release and the primary and
+	    dependent application is removed.</p>
+          <p>
+	    Example: In a release where app1 depends on app2 and we
+	    should remove app1 and app2 using a release upgrade. When
+	    the release upgrade is done app1 should be stopped and
+	    purged before app2 as otherwise app1 could start crashing
+	    when its dependency is removed.</p>
+          <p>
+	    This bugfix changes the order of removal to be correct.</p>
+          <p>
+	    Own Id: OTP-17113 Aux Id: ERL-1410 PR-2882 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SASL 4.0.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index a8e1b85ff9..4fff8f79ab 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -38,7 +38,8 @@
   {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.4\\.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\\.2$">>,[restart_new_emulator]},
   {<<"^3\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -49,4 +50,5 @@
   {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.4\\.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/sasl/vsn.mk b/lib/sasl/vsn.mk
index f2b315c59e..a61b72d6f6 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 4.0.1
+SASL_VSN = 4.0.2
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 792090f3bf..f8caf6228b 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,24 @@
   </header>
 
 
-  <section><title>SNMP 5.7.3</title>
+  <section><title>SNMP 5.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add function to get a list of configured agent
+	    transports. Also improved agent info with regards to
+	    transports.</p>
+          <p>
+	    Own Id: OTP-17109 Aux Id: ERIERL-583 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.7.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index e1e018878a..102de54127 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.7.3
+SNMP_VSN    = 5.8
 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 60c3a9b9a5..4a9fc3b19d 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,24 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.11</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The long name field in SSH_FXP_NAME responses to display
+	    file information in sftp version 3 now contains the
+	    expanded format defined in the sftp draft. It is similar
+	    to what is returned by "ls -l" on Unix systems.</p>
+          <p>
+	    Own Id: OTP-17197 Aux Id: PR- 3049 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.10.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 4e74eeddde..dff8da55c7 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.10.8
+SSH_VSN = 4.11
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 368f215f16..19ad5bdbac 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,73 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 10.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix CRL handling that previously could fail to find the
+	    issuer cert under some circumstances.</p>
+          <p>
+	    Own Id: OTP-17261 Aux Id: GH-4589 </p>
+        </item>
+        <item>
+          <p>
+	    TLS-1.3 client could, under some circumstances, select an
+	    incorrect algorithm to sign the certificate verification
+	    message causing a TLS Decrypt Alert being issued by the
+	    server.</p>
+          <p>
+	    Own Id: OTP-17281 Aux Id: GH-4620 </p>
+        </item>
+        <item>
+          <p>
+	    Correct handling of default values for emulated socket
+	    options and retain the order of the ssl options list to
+	    ensure backwards compatible behavior if options should be
+	    set more than once.</p>
+          <p>
+	    Own Id: OTP-17282</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Enhance pre TLS-1.3 session handling so the client and
+	    server side handling is completely separated and client
+	    disregards oldest session when reaching max limit of the
+	    session table.</p>
+          <p>
+	    Own Id: OTP-16876</p>
+        </item>
+        <item>
+          <p>
+	    This change implements the early data feature for TLS 1.3
+	    clients.</p>
+          <p>
+	    TLS 1.3 allows clients to send data in the first flight
+	    using a Pre-Shared Key to authenticate the server and to
+	    encrypt the early data.</p>
+          <p>
+	    Own Id: OTP-16985</p>
+        </item>
+        <item>
+          <p>
+	    This change implements the early data feature for TLS 1.3
+	    servers.</p>
+          <p>
+	    Own Id: OTP-17042</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 10.2.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 451777e4b7..ecb5111403 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.2.4
+SSL_VSN = 10.3
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index ad41d33d1d..9c60fb860f 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,47 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 3.14.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Handle maps in <c>erl_parse:tokens()</c>.</p>
+          <p>
+	    Own Id: OTP-16978</p>
+        </item>
+        <item>
+          <p>
+	    The erlang shell function <c>rr</c> has been fixed to be
+	    able to read records from files within a code archive.</p>
+          <p>
+	    Own Id: OTP-17182 Aux Id: PR-3002 </p>
+        </item>
+        <item>
+	    <p>If <c>beam_lib</c> is asked to return abstract code
+	    for a BEAM file produced by Elixir and Elixir is not
+	    installed on the computer, <c>beam_lib</c> will no longer
+	    crash, but will return an error tuple. The
+	    <c>cover:compile_beam()</c> and
+	    <c>cover:compile_beam_directory()</c> functions have been
+	    updated to also return an error tuple in that
+	    situation.</p>
+          <p>
+	    Own Id: OTP-17194 Aux Id: GH-4353 </p>
+        </item>
+        <item>
+          <p>
+	    Correct example module <c>erl_id_trans</c> regarding the
+	    <c>{char, C}</c> type.</p>
+          <p>
+	    Own Id: OTP-17273</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.14</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 2f44c251e0..bba0d1ceee 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -41,6 +41,8 @@
   {<<"^3\\.13\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.13\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.13\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.14$">>,[restart_new_emulator]},
+  {<<"^3\\.14\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -70,6 +72,8 @@
   {<<"^3\\.13\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.13\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.13\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.14$">>,[restart_new_emulator]},
+  {<<"^3\\.14\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 5f8e568387..e234b0cd58 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.14
+STDLIB_VSN = 3.14.1
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index b7d304aabe..a1f280e594 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,6 +32,35 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 2.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p><c>epp_dodger</c> was unable to handle a parameterized
+	    macro in a function head.</p>
+          <p>
+	    Own Id: OTP-17064 Aux Id: GH-4445, PR-2964 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>All functions in <c>erl_tidy</c> in syntax_tools have
+	    now been deprecated and are scheduled for removal in OTP
+	    24. Users who still need it can find it at <url
+	    href="https://github.com/richcarl/erl_tidy">https://github.com/richcarl/erl_tidy</url>.</p>
+          <p>
+	    Own Id: OTP-17167 Aux Id: OTP-17046 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Syntax_Tools 2.4</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/syntax_tools/vsn.mk b/lib/syntax_tools/vsn.mk
index 7f0b8f40dd..7a93e81b94 100644
--- a/lib/syntax_tools/vsn.mk
+++ b/lib/syntax_tools/vsn.mk
@@ -1 +1 @@
-SYNTAX_TOOLS_VSN = 2.4
+SYNTAX_TOOLS_VSN = 2.5
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 5b98d338b0..47373ca1fe 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -31,6 +31,40 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 3.4.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p><c>cover</c> would crash when compiling a module
+	    having an exported function named <c>clauses</c>.</p>
+          <p>
+	    Own Id: OTP-17162 Aux Id: GH-4549, PR-2997, PR-4555,
+	    elixir-lang/elixir#10666 </p>
+        </item>
+        <item>
+	    <p>If <c>beam_lib</c> is asked to return abstract code
+	    for a BEAM file produced by Elixir and Elixir is not
+	    installed on the computer, <c>beam_lib</c> will no longer
+	    crash, but will return an error tuple. The
+	    <c>cover:compile_beam()</c> and
+	    <c>cover:compile_beam_directory()</c> functions have been
+	    updated to also return an error tuple in that
+	    situation.</p>
+          <p>
+	    Own Id: OTP-17194 Aux Id: GH-4353 </p>
+        </item>
+        <item>
+          <p>
+	    Make emacs mode work on emacs-27.</p>
+          <p>
+	    Own Id: OTP-17225 Aux Id: PR-4542, GH-4451 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 3.4.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index 6e4ee2fd14..33ff4b4a7c 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 3.4.3
+TOOLS_VSN = 3.4.4
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index fe5a9966f8..62f333f0c1 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,6 +32,24 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 1.9.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed wx initialization on mac, top level menus did not
+	    always work on newer MacOS versions. The menues will not
+	    work until wxWidgets-3.1.5 is released and used on these
+	    MacOS versions.</p>
+          <p>
+	    Own Id: OTP-17187</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 1.9.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index e2ff4812e9..42776cc17a 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.9.2
+WX_VSN = 1.9.3
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index e69de29bb2..b17befa8a5 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1,61 @@
+OTP-13641
+OTP-16607
+OTP-16876
+OTP-16907
+OTP-16959
+OTP-16978
+OTP-16985
+OTP-17002
+OTP-17032
+OTP-17042
+OTP-17043
+OTP-17064
+OTP-17073
+OTP-17081
+OTP-17086
+OTP-17089
+OTP-17091
+OTP-17096
+OTP-17109
+OTP-17111
+OTP-17113
+OTP-17116
+OTP-17124
+OTP-17126
+OTP-17127
+OTP-17138
+OTP-17145
+OTP-17162
+OTP-17163
+OTP-17164
+OTP-17166
+OTP-17167
+OTP-17178
+OTP-17182
+OTP-17187
+OTP-17188
+OTP-17194
+OTP-17195
+OTP-17197
+OTP-17200
+OTP-17202
+OTP-17208
+OTP-17209
+OTP-17212
+OTP-17223
+OTP-17225
+OTP-17229
+OTP-17242
+OTP-17244
+OTP-17249
+OTP-17252
+OTP-17253
+OTP-17256
+OTP-17261
+OTP-17265
+OTP-17271
+OTP-17273
+OTP-17274
+OTP-17281
+OTP-17282
+OTP-17283
diff --git a/otp_versions.table b/otp_versions.table
index fd46539fba..4dc9fea108 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-23.3 : common_test-1.20 compiler-7.6.7 crypto-4.9 dialyzer-4.3.1 eldap-1.2.9 erts-11.2 jinterface-1.11.1 kernel-7.3 mnesia-4.19 odbc-2.13.3 public_key-1.10 runtime_tools-1.16 sasl-4.0.2 snmp-5.8 ssh-4.11 ssl-10.3 stdlib-3.14.1 syntax_tools-2.5 tools-3.4.4 wx-1.9.3 # asn1-5.0.14 debugger-5.0 diameter-2.2.3 edoc-0.12 erl_docgen-1.0.2 erl_interface-4.0.2 et-1.6.4 eunit-2.6 ftp-1.0.5 hipe-4.0.1 inets-7.3.2 megaco-3.19.5 observer-2.9.5 os_mon-2.6.1 parsetools-2.2 reltool-0.8 tftp-1.0.2 xmerl-1.3.26 :
 OTP-23.2.7 : kernel-7.2.1 ssl-10.2.4 # asn1-5.0.14 common_test-1.19.1 compiler-7.6.6 crypto-4.8.3 debugger-5.0 dialyzer-4.3 diameter-2.2.3 edoc-0.12 eldap-1.2.8 erl_docgen-1.0.2 erl_interface-4.0.2 erts-11.1.8 et-1.6.4 eunit-2.6 ftp-1.0.5 hipe-4.0.1 inets-7.3.2 jinterface-1.11 megaco-3.19.5 mnesia-4.18.1 observer-2.9.5 odbc-2.13.2 os_mon-2.6.1 parsetools-2.2 public_key-1.9.2 reltool-0.8 runtime_tools-1.15.1 sasl-4.0.1 snmp-5.7.3 ssh-4.10.8 stdlib-3.14 syntax_tools-2.4 tftp-1.0.2 tools-3.4.3 wx-1.9.2 xmerl-1.3.26 :
 OTP-23.2.6 : inets-7.3.2 ssh-4.10.8 # asn1-5.0.14 common_test-1.19.1 compiler-7.6.6 crypto-4.8.3 debugger-5.0 dialyzer-4.3 diameter-2.2.3 edoc-0.12 eldap-1.2.8 erl_docgen-1.0.2 erl_interface-4.0.2 erts-11.1.8 et-1.6.4 eunit-2.6 ftp-1.0.5 hipe-4.0.1 jinterface-1.11 kernel-7.2 megaco-3.19.5 mnesia-4.18.1 observer-2.9.5 odbc-2.13.2 os_mon-2.6.1 parsetools-2.2 public_key-1.9.2 reltool-0.8 runtime_tools-1.15.1 sasl-4.0.1 snmp-5.7.3 ssl-10.2.3 stdlib-3.14 syntax_tools-2.4 tftp-1.0.2 tools-3.4.3 wx-1.9.2 xmerl-1.3.26 :
 OTP-23.2.5 : erts-11.1.8 ssl-10.2.3 tools-3.4.3 # asn1-5.0.14 common_test-1.19.1 compiler-7.6.6 crypto-4.8.3 debugger-5.0 dialyzer-4.3 diameter-2.2.3 edoc-0.12 eldap-1.2.8 erl_docgen-1.0.2 erl_interface-4.0.2 et-1.6.4 eunit-2.6 ftp-1.0.5 hipe-4.0.1 inets-7.3.1 jinterface-1.11 kernel-7.2 megaco-3.19.5 mnesia-4.18.1 observer-2.9.5 odbc-2.13.2 os_mon-2.6.1 parsetools-2.2 public_key-1.9.2 reltool-0.8 runtime_tools-1.15.1 sasl-4.0.1 snmp-5.7.3 ssh-4.10.7 stdlib-3.14 syntax_tools-2.4 tftp-1.0.2 wx-1.9.2 xmerl-1.3.26 :