Merge branch 'maint'

* maint:
  Updated OTP version
  Prepare release

# Conflicts:
#	OTP_VERSION

57 files changed, 1216 insertions, 39 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index aad1f0e575..491cba8bff 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,309 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 10.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The functions <seealso
+	    marker="stdlib:unicode#characters_to_list/2"><c>unicode:characters_to_list()</c></seealso>
+	    and <seealso
+	    marker="stdlib:unicode#characters_to_binary/3"><c>unicode:characters_to_binary()</c></seealso>
+	    raised a <c>badarg</c> exception instead of returning an
+	    error tuple when passed very large invalid code points as
+	    input.</p>
+          <p>
+	    Own Id: OTP-16052</p>
+        </item>
+        <item>
+	    <p><c>file:allocate/3</c> will now work properly on Mac
+	    OS.</p>
+          <p>
+	    Own Id: OTP-16074 Aux Id: ERL-1042, PR-2386 </p>
+        </item>
+        <item>
+          <p>
+	    For <seealso marker="socket#">socket</seealso>, invalid
+	    encoding of send and receive flags caused badarg and send
+	    failure.</p>
+          <p>
+	    Own Id: OTP-16149</p>
+        </item>
+        <item>
+          <p>
+	    Fix a bug in <c>re</c> on platforms where the native
+	    stack grows upwards, for instance on HP PA-RISC.</p>
+          <p>
+	    Own Id: OTP-16150 Aux Id: ERL-1043 </p>
+        </item>
+        <item>
+          <p>
+	    For <seealso marker="socket#">socket</seealso>, unable to
+	    properly decode the timestamp control message header on
+	    FreeBSD. We incorrectly used the SO_TIMESTAMP flag for
+	    the timestamp control message header type. It should have
+	    been SCM_TIMESTAMP. This caused the timestamp control
+	    message header to not be fully decoded.</p>
+          <p>
+	    Own Id: OTP-16151 Aux Id: #2400 </p>
+        </item>
+        <item>
+          <p>
+	    For <seealso marker="socket#">socket</seealso>, when
+	    setting the ip option 'recvtos' to true, thereby
+	    indicating that we want to receive the TOS control
+	    message header, we don't actually get TOS but RECVTOS on
+	    FreeBSD (and maybe others)! This was previously not
+	    handled.</p>
+          <p>
+	    Own Id: OTP-16152 Aux Id: OTP-16114 </p>
+        </item>
+        <item>
+	    <p>Fixed a bug where the emulator would print out error
+	    messages forever if it crashed during startup.</p>
+          <p>
+	    Own Id: OTP-16159 Aux Id: ERL-1060 </p>
+        </item>
+        <item>
+          <p>
+	    For <seealso marker="socket#">socket</seealso>, wrong
+	    type for protocol caused segmentation fault if protocol
+	    was provided as {raw, integer()}.</p>
+          <p>
+	    Own Id: OTP-16163 Aux Id: ERL-1061 </p>
+        </item>
+        <item>
+          <p>
+	    For <seealso marker="socket#">socket</seealso>, when
+	    setting the ip option 'recvttl' to true, thereby
+	    indicating that we want to receive the TTL control
+	    message header, we don't actually get TTL but RECVTTL on
+	    Solaris (and maybe others)! This was previously not
+	    handled.</p>
+          <p>
+	    Own Id: OTP-16172 Aux Id: OTP-16114 </p>
+        </item>
+        <item>
+          <p>
+	    For <seealso marker="socket#">socket</seealso>, IPv6
+	    control message headers was incorrectly decoded with
+	    level ip instead of ipv6.</p>
+          <p>
+	    Own Id: OTP-16173</p>
+        </item>
+        <item>
+          <p>
+	    Fix configure bug where <c>clock_getres</c> would not
+	    correctly be detected causing
+	    <c>erlang:system_info(os_system_time_source)</c> to
+	    return an incorrect resolution.</p>
+          <p>
+	    This bug effects all OSs that use <c>clock_gettime</c> to
+	    get time (basically all OSs except windows) and has been
+	    present since OTP-19.2.</p>
+          <p>
+	    Own Id: OTP-16191 Aux Id: ERL-1067 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bugs when using <c>ERLC_USE_SERVER=true</c> on
+	    Windows when building Erlang/OTP.</p>
+          <p>
+	    Change the cookie used by the compile server to be hard
+	    coded instead of using the users cookie.</p>
+          <p>
+	    Own Id: OTP-16192</p>
+        </item>
+        <item>
+          <p>
+	    Fix so that <c>persistent_term</c> is listed in the erts
+	    application file.</p>
+          <p>
+	    Own Id: OTP-16194</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug in call_time tracing which could sometimes cause
+	    call time measurements being attributed to the wrong
+	    function.</p>
+          <p>
+	    Own Id: OTP-16195 Aux Id: ERL-1027 </p>
+        </item>
+        <item>
+          <p>
+	    The <seealso marker="socket#">socket</seealso> socket
+	    option 'peek_off' has been disabled. If peek_off was set
+	    and then socket:recv/3 was called with the peek flag, the
+	    call could hang.</p>
+          <p>
+	    Own Id: OTP-16196</p>
+        </item>
+        <item>
+          <p>
+	    Handle possibly uninitiated (control message header)
+	    data.</p>
+          <p>
+	    Own Id: OTP-16197</p>
+        </item>
+        <item>
+          <p>
+	    For <seealso marker="kernel:net#">net</seealso>, a couple
+	    of NI macros was deprecated in new versions of glibc, so
+	    these are no longer used (IDN_ALLOW_UNASSIGNED and
+	    IDN_USE_STD3_ASCII_RULES).</p>
+          <p>
+	    Own Id: OTP-16203</p>
+        </item>
+        <item>
+          <p>
+	    The string value from a get operation needed to be
+	    truncated.</p>
+          <p>
+	    Own Id: OTP-16204</p>
+        </item>
+        <item>
+          <p>
+	    Fix misleading seq_trace message for remote send
+	    operation toward named process. Changed receiver to be
+	    <c>{Name,Node}</c> instead of just <c>Name</c>.</p>
+          <p>
+	    Own Id: OTP-16206 Aux Id: PR-2423 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed a bug causing actual nodedown reason reported by
+	    <seealso
+	    marker="kernel:net_kernel#monitor_nodes/2"><c>net_kernel:monitor_nodes(true,
+	    [nodedown_reason])</c></seealso> to be lost and replaced
+	    by the reason <c>killed</c>.</p>
+          <p>
+	    Own Id: OTP-16216</p>
+        </item>
+        <item>
+          <p>
+	    For <seealso marker="socket#">socket</seealso>, the
+	    timestamp creation used when printing warning messages
+	    and debug printouts did not work. The used buffer was too
+	    small.</p>
+          <p>
+	    Own Id: OTP-16223</p>
+        </item>
+        <item>
+          <p>
+	    Fix compiler warnings generated by GCC 8</p>
+          <p>
+	    Own Id: OTP-16235</p>
+        </item>
+        <item>
+          <p>
+	    Fix <c>erl -emu_type</c> to accept the option <c>opt</c>
+	    which means the normal optimized emulator. This can be
+	    used to override the <c>-emu_type</c> option from
+	    environment variables.</p>
+          <p>
+	    Own Id: OTP-16297</p>
+        </item>
+        <item>
+          <p>
+	    Corrected the function spec to reflect the actual code of
+	    the function socket:bind.</p>
+          <p>
+	    Own Id: OTP-16310 Aux Id: ERL-1082 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed a performance issue in ETS lookup when using the
+	    <c>compressed</c> option and the term contained atoms.
+	    Before this fix the decompress algorithm for atoms would
+	    unnecessarily take a global lock to validate the atom.</p>
+          <p>
+	    Own Id: OTP-16316</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    For <seealso marker="socket#">socket</seealso>, not all
+	    send and receive flags are supported on all platforms. In
+	    order to (at least) simplify testing, the
+	    socket:supports/0,1,2,3 functions has been extended with
+	    send_flags and recv_flags items, which indicates what the
+	    current platform can manage.</p>
+          <p>
+	    Own Id: OTP-16153</p>
+        </item>
+        <item>
+          <p>
+	    For <seealso marker="socket#">socket</seealso>, add
+	    support for IPv6 socket options tclass and recvtclass.
+	    Both has been added, but the use of them are platform
+	    dependent. Call socket:supports(options, ipv6, Opt) to be
+	    sure what option to use in order to request a TCLASS
+	    control message header.</p>
+          <p>
+	    Own Id: OTP-16180</p>
+        </item>
+        <item>
+          <p>
+	    For <seealso marker="socket#">socket</seealso>, the TCP
+	    socket option cork was not supported even though the
+	    supports function reported it as such.</p>
+          <p>
+	    Own Id: OTP-16205</p>
+        </item>
+        <item>
+          <p>
+	    The Kernel application's User's Guide now contain a
+	    Logger Cookbook with with common usage patterns.</p>
+          <p>
+	    Own Id: OTP-16208</p>
+        </item>
+        <item>
+          <p>
+	    Add a "full featured" version of getifaddrs in the net
+	    module.</p>
+          <p>
+	    Own Id: OTP-16212 Aux Id: ERL-1070 </p>
+        </item>
+        <item>
+          <p>
+	    Fix an inefficiency introduced by the bug fix in
+	    OTP-16241 which fixed a problem with the receive
+	    optimization. That bug fix introduced an inefficiency
+	    when using the receive optimization and a burst of
+	    messages arrive at once when the receiving process'
+	    mailbox was empty.</p>
+          <p>
+	    Own Id: OTP-16269 Aux Id: OTP-16241 </p>
+        </item>
+        <item>
+          <p>
+	    For <seealso marker="socket#">socket</seealso>, added
+	    support for the socket option extended_err. Andreas
+	    Schultz.</p>
+          <p>
+	    Own Id: OTP-16302 Aux Id: #2449 </p>
+        </item>
+        <item>
+          <p>
+	    ETS tables have been optimized to not use any locks when
+	    running in a system with only one scheduler enabled. This
+	    can provide significant performance gains for
+	    applications that use ETS tables heavily.</p>
+          <p>
+	    Own Id: OTP-16315</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 10.5.6</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 639744bfb7..d3dbe0f2d1 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-3.5", "kernel-@OTP-16216@", "sasl-3.3"]}
+	{runtime_dependencies, ["stdlib-3.5", "kernel-6.5.1", "sasl-3.3"]}
     ]}.
 
 %% vim: ft=erlang
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 179b89bf24..82b3d9a394 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 10.5.6
+VSN = 10.6
 
 # 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 068db6a8bf..17f9b4c7ff 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.18.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The ct_property_test logging is improved.</p>
+          <p>
+	    Own Id: OTP-16287</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.18</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index ddc518f474..f6fee19324 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.18
+COMMON_TEST_VSN = 1.18.1
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index cb4f77e0b5..6919d2310f 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,45 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 7.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a bug in the linter where list and binary
+	    comprehensions could suppress unsafe variable errors.</p>
+          <p>
+	    Own Id: OTP-16053 Aux Id: ERL-1039 </p>
+        </item>
+        <item>
+	    <p>When a compilation starts from Core Erlang code, the
+	    <c>core_lint</c> pass will always be run and the
+	    compilation will be aborted if any errors are found.</p>
+          <p>
+	    Own Id: OTP-16181 Aux Id: ERL-1065 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The warning message that appears when the compiler
+	    detects a non-utf-8 encoded source file without an
+	    encoding string in the beginning of the file has been
+	    changed to contain information about that support for
+	    latin1 encoded source files without an encoding string
+	    will be removed in Erlang/OTP 24.</p>
+          <p>
+	    Own Id: OTP-16054 Aux Id: OTP-11791 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 7.4.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index a19cee1ae2..f0bcff01da 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.4.9
+COMPILER_VSN = 7.5
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index e45a948a0c..2d238582b2 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,30 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 4.6.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The chipers aes_cfb8 and aes_cfb128 are now using the EVP
+	    interface. The supported key lengths are 128, 192 and 256
+	    bits.</p>
+          <p>
+	    Own Id: OTP-16133 Aux Id: PR-2407 </p>
+        </item>
+        <item>
+          <p>
+	    The chipers aes_cfb8 and aes_cfb128 are now available in
+	    FIPS enabled mode.</p>
+          <p>
+	    Own Id: OTP-16134 Aux Id: PR-2407 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 4.6.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 1ecffa37c2..c773529c84 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 4.6.2
+CRYPTO_VSN = 4.6.3
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 795b46d467..64af47a4fb 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -33,6 +33,22 @@
   <p>This document describes the changes made to the Debugger
     application.</p>
 
+<section><title>Debugger 4.2.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug where Unicode atoms are printed differently
+	    depending on if integer lists are printed as strings or
+	    not. </p>
+          <p>
+	    Own Id: OTP-16186</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Debugger 4.2.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index daecc7594c..06fc743270 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 4.2.7
+DEBUGGER_VSN = 4.2.8
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index f6cd2ec585..c2e8875635 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,6 +32,33 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 4.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug where warnings about overspecified
+	    functions were erroneously emitted. Only overloaded
+	    functions were affected by the bug. </p>
+          <p>
+	    Own Id: OTP-16292</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Remove test data with GNU license. </p>
+          <p>
+	    Own Id: OTP-16146</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 4.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index 03155e2d24..ee680f3bcf 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 4.1
+DIALYZER_VSN = 4.1.1
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index f51cd26a7f..e5076a4790 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -31,7 +31,37 @@
   </header>
   <p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
 
-  <section><title>Erl_Docgen 0.10</title>
+  <section><title>Erl_Docgen 0.11</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a cosmetic formatting bug in the data types
+	    section of generated HTML documentation.</p>
+          <p>
+	    Own Id: OTP-15940</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Added support for specifying what language a code snippet
+	    should be highlighted as.</p>
+          <p>
+	    Updated the code examples syntax highlighting library.</p>
+          <p>
+	    Own Id: OTP-16209</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.10</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 2ac4acaf09..ebc9516da3 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 0.10
+ERL_DOCGEN_VSN = 0.11
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 08f5a40687..869b615d51 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,6 +31,22 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.13.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix user supplied socket implementation for Windows and
+	    other platforms without gcc atomics.</p>
+          <p>
+	    Own Id: OTP-16308</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.13</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 2bf84bf18f..0856895ef5 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 3.13
+EI_VSN = 3.13.1
 ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml
index 397a4657d3..e373f6378c 100644
--- a/lib/eunit/doc/src/notes.xml
+++ b/lib/eunit/doc/src/notes.xml
@@ -33,6 +33,21 @@
   </header>
   <p>This document describes the changes made to the EUnit application.</p>
 
+<section><title>Eunit 2.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Remove compiler warnings from eunit.</p>
+          <p>
+	    Own Id: OTP-16313</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eunit 2.3.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk
index 52d23698fa..a56d7b4058 100644
--- a/lib/eunit/vsn.mk
+++ b/lib/eunit/vsn.mk
@@ -1 +1 @@
-EUNIT_VSN = 2.3.8
+EUNIT_VSN = 2.4
diff --git a/lib/ftp/doc/src/notes.xml b/lib/ftp/doc/src/notes.xml
index 8c1b73e87d..44348691a2 100644
--- a/lib/ftp/doc/src/notes.xml
+++ b/lib/ftp/doc/src/notes.xml
@@ -33,7 +33,34 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Ftp 1.0.3</title>
+  <section><title>Ftp 1.0.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A possibly infinite loop is removed.</p>
+          <p>
+	    Own Id: OTP-16243 Aux Id: PR-2436, OTP-16056 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Removed compiler warnings.</p>
+          <p>
+	    Own Id: OTP-16318 Aux Id: OTP-16183 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ftp 1.0.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ftp/vsn.mk b/lib/ftp/vsn.mk
index 397328ce27..20a5eea26a 100644
--- a/lib/ftp/vsn.mk
+++ b/lib/ftp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = ftp
-FTP_VSN   = 1.0.3
+FTP_VSN   = 1.0.4
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(FTP_VSN)$(PRE_VSN)"
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index 3fad2ac53a..6233bc158c 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
+<section><title>Hipe 3.19.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Correct the range type of <c>erlang:is_record/3</c>.
+	    </p>
+          <p>
+	    Own Id: OTP-16323</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Hipe 3.19.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index 3a22e07f57..91b4699c93 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.19.1
+HIPE_VSN = 3.19.2
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 7e69b4fac4..d755fbd8d1 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,37 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 7.1.1</title>
+  <section><title>Inets 7.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Inets will honor that valid HTTP headers can not have
+	    white space between field-name and the colon.</p>
+          <p>
+	    Own Id: OTP-16169 Aux Id: ERL-1053 </p>
+        </item>
+        <item>
+          <p>
+	    Changed error propagation in httpc:request/1 to return
+	    expected error tuple instead of crashing.</p>
+          <p>
+	    Own Id: OTP-16290 Aux Id: PR-2437, ERL-1083 </p>
+        </item>
+        <item>
+          <p>
+	    Fix handling of HEAD request with chunked
+	    transfer-encoding (httpc).</p>
+          <p>
+	    Own Id: OTP-16300 Aux Id: ERL-1090 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 7.1.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index acc4375b6e..a30b437a37 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 7.1.1
+INETS_VSN   = 7.1.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index aea3787115..39da9ef3d6 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,47 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 6.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The 'socket state' info provided by the inet info
+	    function has been improved</p>
+          <p>
+	    Own Id: OTP-16043 Aux Id: ERL-1036 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bug where <c>logger</c> would crash when starting
+	    when a very large log file needed to be rotated and
+	    compressed.</p>
+          <p>
+	    Own Id: OTP-16145 Aux Id: ERL-1034 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed a bug causing actual nodedown reason reported by
+	    <seealso
+	    marker="kernel:net_kernel#monitor_nodes/2"><c>net_kernel:monitor_nodes(true,
+	    [nodedown_reason])</c></seealso> to be lost and replaced
+	    by the reason <c>killed</c>.</p>
+          <p>
+	    Own Id: OTP-16216</p>
+        </item>
+        <item>
+	    <p>The documentation for <c>rpc:call/4,5/</c> has been
+	    updated to describe what happens when the called function
+	    throws or return an <c>'EXIT'</c> tuple. </p>
+          <p>
+	    Own Id: OTP-16279 Aux Id: ERL-1066 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 6.5</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 1fdb390a32..35c0c3f88e 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -149,6 +149,6 @@
          {logger_sasl_compatible, false}
         ]},
   {mod, {kernel, []}},
-  {runtime_dependencies, ["erts-@OTP-16216@", "stdlib-3.5", "sasl-3.0"]}
+  {runtime_dependencies, ["erts-10.6", "stdlib-3.5", "sasl-3.0"]}
  ]
 }.
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index d862b5491f..d599235a0f 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -41,7 +41,9 @@
   {<<"^6\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.4$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+  {<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.5$">>,[restart_new_emulator]},
+  {<<"^6\\.5\\.0(?:\\.[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]},
@@ -56,4 +58,6 @@
   {<<"^6\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.4$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+  {<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.5$">>,[restart_new_emulator]},
+  {<<"^6\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 508e54237b..8e97f5a4ac 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 6.5
+KERNEL_VSN = 6.5.1
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 62d0aad77d..3d2273ea95 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -37,7 +37,24 @@
   section is the version number of Megaco.</p>
 
 
-  <section><title>Megaco 3.18.6</title>
+  <section><title>Megaco 3.18.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The meas example had not been updated for a long time,
+	    which caused it to not work. Also, it made use of
+	    deprecated functions (now()). This has now been fixed.</p>
+          <p>
+	    Own Id: OTP-16061</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Megaco 3.18.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 381def97d7..98f062fd41 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.18.6
+MEGACO_VSN  = 3.18.7
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index e918338c8a..be6215b787 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,31 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.16.1</title>
+  <section><title>Mnesia 4.16.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed mnesia crash which could happen when trying to
+	    recover from failures in transactions containing
+	    <c>sticky_locks</c>.</p>
+          <p>
+	    Own Id: OTP-16286 Aux Id: ERL-1077 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed mnesia index issue. Could happen when updating
+	    records with a index plugin backend.</p>
+          <p>
+	    Own Id: OTP-16291 Aux Id: ERL-1091 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.16.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index f1a6333c18..760ca2e92c 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.16.1
+MNESIA_VSN = 4.16.2
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index f66ab95893..b27de66984 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,6 +32,22 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 2.9.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Crashdump Viewer how handles crash dumps where the Old
+	    Binary VHeap has overflowed.</p>
+          <p>
+	    Own Id: OTP-16296</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 2.9.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index 3bb316a5e2..6b733687b8 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.9.2
+OBSERVER_VSN = 2.9.3
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index f47988d6d8..b990b1867d 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,24 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 1.7.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Corrected CRL handling which could cause CRL verification
+	    to fail. This could happen when the CRL distribution
+	    point explicitly specifies the CRL issuer, that is not
+	    using the fallback.</p>
+          <p>
+	    Own Id: OTP-16156 Aux Id: ERL-1030 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 1.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 1982218574..89b1719276 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.7
+PUBLIC_KEY_VSN = 1.7.1
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 5037801d2c..680dffcf4b 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,27 @@
   </header>
 
 
-  <section><title>SNMP 5.4.3</title>
+  <section><title>SNMP 5.4.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    [manager] The callbacks where executed in a (new)
+	    'temporary' process, that executed the callback call and
+	    then exited. This has now been made configurable so that
+	    is also possible to specify a 'permanent' callback proxy
+	    process. All callback calls will then be executed in this
+	    (permanent) process (in sequence).</p>
+          <p>
+	    Own Id: OTP-15947 Aux Id: ERIERL-378 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.4.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 1ff1a074e3..d53554269e 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.4.3
+SNMP_VSN    = 5.4.4
 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 da986707a9..b5a718c0b9 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,116 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.8.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The ssh cli (e.g shell) server behaved strangely when
+	    characters were inserted in a string such that the last
+	    characters tried to wrap the line.</p>
+          <p>
+	    Own Id: OTP-14849 Aux Id: ERL-545 </p>
+        </item>
+        <item>
+          <p>
+	    If an OTP SSH server was serving an "exec" request and
+	    the executed code used Erlang <c>standard_io</c> for
+	    input/output, the I/O was erroneously handled by the
+	    *server's* group leader, so the I/O turned up in the the
+	    server's Erlang shell (if any). The user at the client
+	    side did therefor not see that I/O.</p>
+          <p>
+	    This is corrected now, so the client - for example the
+	    ssh OS shell command - handles the I/O. The user could
+	    send input to the server side exec handling code by
+	    writing on the terminal, and server side output from for
+	    example io:format is presented on the terminal - not only
+	    the functional result.</p>
+          <p>
+	    NOTE 1: Servers executing exec requests with the old,
+	    undocumented ways of specifying the custom exec handler
+	    is not changed. Changed are only the two cases where the
+	    server's 'exec' option either:<br/> 1) is not specified
+	    (i.e. using the default shell) or, <br/> 2) it has the
+	    <c>{direct, fun(...) -&gt; ... end}</c> value format.</p>
+          <p>
+	    NOTE 2: Previously an end-of-line marker was appended on
+	    the result and error reports at the client side. They are
+	    removed now and the error reports are slightly enhanced.</p>
+          <p>
+	    TECHNICAL DETAILS: The server's device
+	    <c>standard_input</c> receives data events from the exec
+	    request's channel, and the device <c>standard_output</c>
+	    is sending its data by data events to the client on that
+	    channel. The result is that <c>standard_io</c> is now
+	    performed by the client's group leader.</p>
+          <p>
+	    Own Id: OTP-15417 Aux Id: OTP-16108 </p>
+        </item>
+        <item>
+          <p>
+	    The functions ssh:shell/1,2,3 left the connection open
+	    when they returned. That leakage is fixed now.</p>
+          <p>
+	    Own Id: OTP-16047</p>
+        </item>
+        <item>
+          <p>
+	    Corrected that an Erlang SSH server could return the
+	    status code 4294967295 instead of 255 on some errors of
+	    an exec request.</p>
+          <p>
+	    Own Id: OTP-16123</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Internal simplification of ssh_sftp/ssh_xfer</p>
+          <p>
+	    Own Id: OTP-15972</p>
+        </item>
+        <item>
+          <p>
+	    The documentation of <seealso
+	    marker="ssh:using_ssh#one-time-execution">One-Time
+	    Execution</seealso> in the User's Guide is updated with
+	    more examples.</p>
+          <p>
+	    Own Id: OTP-16108 Aux Id: OTP-15417 </p>
+        </item>
+        <item>
+          <p>
+	    The new value <c>'disabled'</c> is introduced in the SSH
+	    daemon options 'exec' and 'shell'. Previously they lacked
+	    a clear way of disabling them.</p>
+          <p>
+	    Own Id: OTP-16113</p>
+        </item>
+        <item>
+          <p>
+	    The old algorithms 'aes192_cbc', 'aes256_cbc' and
+	    'hmac-sha1-96' are added for compatibility with older
+	    peers.</p>
+          <p>
+	    The mac 'hmac-sha1-96' is nowadays not recommended and
+	    must therefore be explicitly enabled. Use for example the
+	    Option value <c>{modify_algorithms, [{append,
+	    [{mac,['hmac-sha1-96']}]}]}</c></p>
+          <p>
+	    Own Id: OTP-16170</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index fcf97177d8..a205da67fc 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.8
+SSH_VSN = 4.8.1
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 2f675560d6..b2540ced91 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,77 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 9.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Corrected CRL handling which could cause CRL verification
+	    to fail. This could happen when the CRL distribution
+	    point explicitly specifies the CRL issuer, that is not
+	    using the fallback.</p>
+          <p>
+	    Own Id: OTP-16156 Aux Id: ERL-1030 </p>
+        </item>
+        <item>
+          <p>
+	    Correct handling of unordered chains so that it works as
+	    expected</p>
+          <p>
+	    Own Id: OTP-16293</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug causing ssl application to crash when handshake
+	    is paused and ClientHello contains extensions for session
+	    resumption (psk_key_exchange_modes, pre_shared_key).</p>
+          <p>
+	    Own Id: OTP-16295 Aux Id: ERL-1095 </p>
+        </item>
+        <item>
+          <p>
+	    Fix connectivity problems with legacy servers when client
+	    is configured to support a range of protocol versions
+	    including TLS 1.3.</p>
+          <p>
+	    Own Id: OTP-16303</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improve session handling for TLS-1.3 compatibility mode
+	    and cleaner internal handling so that removal of old
+	    session data can be more efficient, hopefully mitigating
+	    problems with big session tables during heavy load.</p>
+          <p>
+	    Own Id: OTP-15524 Aux Id: OTP-15352 </p>
+        </item>
+        <item>
+          <p>
+	    Correct handling of DTLS listen socket emulation. Could
+	    cause failure to create new listen socket after process
+	    that owned previous listen socket died.</p>
+          <p>
+	    Own Id: OTP-15809 Aux Id: ERL-917 </p>
+        </item>
+        <item>
+          <p>
+	    Add detailed info in ALERT description when client does
+	    not send a requested cert.</p>
+          <p>
+	    Own Id: OTP-16266</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 9.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index c7404c0169..e0dc6be614 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 9.4
+SSL_VSN = 9.5
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index e2badecffa..fb24bb63b5 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,87 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 3.11</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The functions <seealso
+	    marker="stdlib:unicode#characters_to_list/2"><c>unicode:characters_to_list()</c></seealso>
+	    and <seealso
+	    marker="stdlib:unicode#characters_to_binary/3"><c>unicode:characters_to_binary()</c></seealso>
+	    raised a <c>badarg</c> exception instead of returning an
+	    error tuple when passed very large invalid code points as
+	    input.</p>
+          <p>
+	    Own Id: OTP-16052</p>
+        </item>
+        <item>
+	    <p>Fixed a bug in the linter where list and binary
+	    comprehensions could suppress unsafe variable errors.</p>
+          <p>
+	    Own Id: OTP-16053 Aux Id: ERL-1039 </p>
+        </item>
+        <item>
+	    <p>Fixed incorrect type specifications for
+	    <c>erl_tar:open/2</c>, <c>create/2,3</c>, and
+	    <c>add/4</c>.</p>
+          <p>
+	    Own Id: OTP-16085 Aux Id: PR-2379 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed erroneous type spec for <seealso
+	    marker="stdlib:binary#list_to_bin/1"><c>binary:list_to_bin/1</c></seealso>.
+	    Argument type was changed from <c>iodata()</c> to
+	    <c>iolist()</c>.</p>
+          <p>
+	    Own Id: OTP-16132 Aux Id: ERL-1041 </p>
+        </item>
+        <item>
+          <p>
+	    Fix a race in <c>pool:pspawn_link</c> that caused a
+	    <c>noproc</c> error to be thrown when using it to spawn a
+	    very short lived process.</p>
+          <p>
+	    Own Id: OTP-16211</p>
+        </item>
+        <item>
+          <p>
+	    Fixed a performance issue in ETS lookup when using the
+	    <c>compressed</c> option and the term contained atoms.
+	    Before this fix the decompress algorithm for atoms would
+	    unnecessarily take a global lock to validate the atom.</p>
+          <p>
+	    Own Id: OTP-16316</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Added a new compiler/linter option to disable warnings
+	    for unused types (<c>nowarn_unused_type</c>).</p>
+          <p>
+	    Own Id: OTP-16262 Aux Id: ERIERL-435 </p>
+        </item>
+        <item>
+          <p>
+	    ETS tables have been optimized to not use any locks when
+	    running in a system with only one scheduler enabled. This
+	    can provide significant performance gains for
+	    applications that use ETS tables heavily.</p>
+          <p>
+	    Own Id: OTP-16315</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.10</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 76986bf5f1..6eeee41ad5 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -108,6 +108,6 @@
                dets]},
   {applications, [kernel]},
   {env, []},
-  {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-@OTP-16052@","crypto-3.3",
+  {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-10.6","crypto-3.3",
 			  "compiler-5.0"]}
 ]}.
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 0f87d1e52a..20d93f1fee 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -27,7 +27,9 @@
 %% stated previous versions.
 %%
 {"%VSN%",
- [{<<"^3\\.5$">>,[restart_new_emulator]},
+ [{<<"^3\\.10$">>,[restart_new_emulator]},
+  {<<"^3\\.10\\.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]},
   {<<"^3\\.6$">>,[restart_new_emulator]},
@@ -43,7 +45,9 @@
   {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
- [{<<"^3\\.5$">>,[restart_new_emulator]},
+ [{<<"^3\\.10$">>,[restart_new_emulator]},
+  {<<"^3\\.10\\.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]},
   {<<"^3\\.6$">>,[restart_new_emulator]},
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index e2ed11a3d2..6f74c2cd06 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.10
+STDLIB_VSN = 3.11
diff --git a/lib/tftp/doc/src/notes.xml b/lib/tftp/doc/src/notes.xml
index ff6113a89d..0b7aee87e9 100644
--- a/lib/tftp/doc/src/notes.xml
+++ b/lib/tftp/doc/src/notes.xml
@@ -33,7 +33,22 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Tftp 1.0.1</title>
+  <section><title>Tftp 1.0.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Removed compiler warnings.</p>
+          <p>
+	    Own Id: OTP-16317 Aux Id: OTP-16183 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tftp 1.0.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/tftp/vsn.mk b/lib/tftp/vsn.mk
index 1a547fbe9b..689a2fa57c 100644
--- a/lib/tftp/vsn.mk
+++ b/lib/tftp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = tftp
-TFTP_VSN   = 1.0.1
+TFTP_VSN   = 1.0.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(TFTP_VSN)$(PRE_VSN)"
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index c1e664b10f..7aef9b852f 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -31,6 +31,43 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 3.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Improve <c>-spec</c> indentation in emacs mode.</p>
+          <p>
+	    Own Id: OTP-16164</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The Emacs erlang-mode function that lets the user open
+	    the documentation for an Erlang/OTP function in an Emacs
+	    buffer has been improved. Bugs in this function has been
+	    fixed and and the user will now be asked if the man pages
+	    should be downloaded automatically by Emacs when they
+	    can't be found on the system. To test this functionality,
+	    put the cursor over the function name in a call to an
+	    Erlang/OTP function (e.g., "io:format("arg")") and type
+	    C-c C-d (i.e., Ctrl-key and c-key and then Ctrl-key and
+	    d-key). There is also a new menu item under the Erlang
+	    menu (labeled "Man - Function Under Cursor").</p>
+          <p>
+	    Own Id: OTP-16174</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 3.2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index 022332e840..44912d1810 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 3.2.1
+TOOLS_VSN = 3.3
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 4de771d209..7dcfbb1588 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,6 +32,25 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 1.9</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Added <c>wxWindow:isShownOnScreen/1</c>,
+	    <c>wxMouseEvent:getWheelAxis</c> and mac specific menubar
+	    functions. Fixed defines that have changed in newer
+	    wxWidgets versions, that caused some literals to become
+	    run-time dependent on wxWidgets version.</p>
+          <p>
+	    Own Id: OTP-16285</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 1.8.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index ec07f7b691..b498d21f3f 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.8.9
+WX_VSN = 1.9
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 4355b7114a..99846397c6 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,54 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.23</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Replace a local floor/1 function with erlang:floor/1.
+	    </p>
+          <p>
+	    Own Id: OTP-16324</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Implement handling of parsed entity content and some
+	    other improvements. </p> <list> <item>Updated the SAX
+	    test-suite (xmerl_sax_std_SUITE) to more recent
+	    version</item> <item>Test now uses its own data directory
+	    since the non-SAX xmerl test suite (xmerl_std_SUITE) uses
+	    a different version of the other suite</item>
+	    <item>Canonical XML checks have been added to all tests
+	    that apply. Canonical, as it applies here, is regular
+	    canonical XML with the addition of notation declarations
+	    if any. Output must match byte-for-byte.</item>
+	    <item>External entities implemented, both as markup and
+	    replacement text</item> <item>Cyclic references are
+	    checked at the end of the DTD parse; also when a
+	    reference is found</item> <item>Default attributes are
+	    reported in events</item> <item>Attributes are whitespace
+	    normalized if their type demands it</item> <item>External
+	    entities can have a different encoding than the base
+	    document and will be transcoded to the document
+	    encoding</item> <item>Conditional sections
+	    (IGNORE/INCLUDE) handling has been added to DTD
+	    parsing</item> <item>Element content-model is now checked
+	    for well-formed-ness</item> <item>A few missing function
+	    clauses have been added</item> </list>
+          <p>
+	    Own Id: OTP-16339</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.22</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index fc73964773..6f814736ac 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.22
+XMERL_VSN = 1.3.23
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index e69de29bb2..2f517e9302 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1,94 @@
+OTP-14627
+OTP-14849
+OTP-15417
+OTP-15524
+OTP-15809
+OTP-15940
+OTP-15947
+OTP-15972
+OTP-16043
+OTP-16047
+OTP-16052
+OTP-16053
+OTP-16054
+OTP-16061
+OTP-16074
+OTP-16085
+OTP-16108
+OTP-16113
+OTP-16114
+OTP-16117
+OTP-16123
+OTP-16132
+OTP-16133
+OTP-16134
+OTP-16145
+OTP-16146
+OTP-16149
+OTP-16150
+OTP-16151
+OTP-16152
+OTP-16153
+OTP-16156
+OTP-16157
+OTP-16159
+OTP-16163
+OTP-16164
+OTP-16169
+OTP-16170
+OTP-16172
+OTP-16173
+OTP-16174
+OTP-16180
+OTP-16181
+OTP-16186
+OTP-16191
+OTP-16192
+OTP-16194
+OTP-16195
+OTP-16196
+OTP-16197
+OTP-16203
+OTP-16204
+OTP-16205
+OTP-16206
+OTP-16208
+OTP-16209
+OTP-16211
+OTP-16212
+OTP-16216
+OTP-16223
+OTP-16235
+OTP-16238
+OTP-16243
+OTP-16262
+OTP-16266
+OTP-16269
+OTP-16279
+OTP-16285
+OTP-16286
+OTP-16287
+OTP-16288
+OTP-16290
+OTP-16291
+OTP-16292
+OTP-16293
+OTP-16294
+OTP-16295
+OTP-16296
+OTP-16297
+OTP-16298
+OTP-16300
+OTP-16302
+OTP-16303
+OTP-16308
+OTP-16310
+OTP-16311
+OTP-16313
+OTP-16315
+OTP-16316
+OTP-16317
+OTP-16318
+OTP-16323
+OTP-16324
+OTP-16339
diff --git a/otp_versions.table b/otp_versions.table
index 5b0ea41bcf..49de0d28ad 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-22.2 : common_test-1.18.1 compiler-7.5 crypto-4.6.3 debugger-4.2.8 dialyzer-4.1.1 erl_docgen-0.11 erl_interface-3.13.1 erts-10.6 eunit-2.4 ftp-1.0.4 hipe-3.19.2 inets-7.1.2 kernel-6.5.1 megaco-3.18.7 mnesia-4.16.2 observer-2.9.3 public_key-1.7.1 snmp-5.4.4 ssh-4.8.1 ssl-9.5 stdlib-3.11 tftp-1.0.2 tools-3.3 wx-1.9 xmerl-1.3.23 # asn1-5.0.9 diameter-2.2.1 edoc-0.11 eldap-1.2.8 et-1.6.4 jinterface-1.10.1 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 syntax_tools-2.2.1 :
 OTP-22.1.8 : erts-10.5.6 # asn1-5.0.9 common_test-1.18 compiler-7.4.9 crypto-4.6.2 debugger-4.2.7 dialyzer-4.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.10 erl_interface-3.13 et-1.6.4 eunit-2.3.8 ftp-1.0.3 hipe-3.19.1 inets-7.1.1 jinterface-1.10.1 kernel-6.5 megaco-3.18.6 mnesia-4.16.1 observer-2.9.2 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.3 ssh-4.8 ssl-9.4 stdlib-3.10 syntax_tools-2.2.1 tftp-1.0.1 tools-3.2.1 wx-1.8.9 xmerl-1.3.22 :
 OTP-22.1.7 : compiler-7.4.9 erts-10.5.5 # asn1-5.0.9 common_test-1.18 crypto-4.6.2 debugger-4.2.7 dialyzer-4.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.10 erl_interface-3.13 et-1.6.4 eunit-2.3.8 ftp-1.0.3 hipe-3.19.1 inets-7.1.1 jinterface-1.10.1 kernel-6.5 megaco-3.18.6 mnesia-4.16.1 observer-2.9.2 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.3 ssh-4.8 ssl-9.4 stdlib-3.10 syntax_tools-2.2.1 tftp-1.0.1 tools-3.2.1 wx-1.8.9 xmerl-1.3.22 :
 OTP-22.1.6 : compiler-7.4.8 crypto-4.6.2 erts-10.5.4 snmp-5.4.3 # asn1-5.0.9 common_test-1.18 debugger-4.2.7 dialyzer-4.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.10 erl_interface-3.13 et-1.6.4 eunit-2.3.8 ftp-1.0.3 hipe-3.19.1 inets-7.1.1 jinterface-1.10.1 kernel-6.5 megaco-3.18.6 mnesia-4.16.1 observer-2.9.2 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 ssh-4.8 ssl-9.4 stdlib-3.10 syntax_tools-2.2.1 tftp-1.0.1 tools-3.2.1 wx-1.8.9 xmerl-1.3.22 :