Prepare release

author: Erlang/OTP <otp@erlang.org> 2021-03-25 16:27:17 +0100
committer: Erlang/OTP <otp@erlang.org> 2021-03-25 16:27:17 +0100
commit: 1cc1d15c4e54c1d9d8c34a4c66193a95b10c479a (patch)
tree: 0272fb5bf328310831d06510a03864de5942ee8d
parent: 444144870c528d80a3fcf34b3a2d1707115987f2 (diff)
download: erlang-1cc1d15c4e54c1d9d8c34a4c66193a95b10c479a.tar.gz
86 files changed, 2719 insertions, 185 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 2bba258c07..b1a322e10b 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -316,8 +316,8 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="alias" arity="0" since="OTP @OTP-16718@"/>
-      <name name="alias" arity="1" since="OTP @OTP-16718@"/>
+      <name name="alias" arity="0" since="OTP 24.0"/>
+      <name name="alias" arity="1" since="OTP 24.0"/>
       <fsummary>Create an alias.</fsummary>
       <desc>
 	<p>
@@ -4143,9 +4143,9 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="monitor" arity="3" clause_i="1" since="OTP @OTP-16718@"/>
-      <name name="monitor" arity="3" clause_i="2" since="OTP @OTP-16718@"/>
-      <name name="monitor" arity="3" clause_i="3" since="OTP @OTP-16718@"/>
+      <name name="monitor" arity="3" clause_i="1" since="OTP 24.0"/>
+      <name name="monitor" arity="3" clause_i="2" since="OTP 24.0"/>
+      <name name="monitor" arity="3" clause_i="3" since="OTP 24.0"/>
       <fsummary>Start monitoring with options.</fsummary>
       <type name="registered_name"/>
       <type name="registered_process_identifier"/>
@@ -12436,7 +12436,7 @@ improper_end</pre>
     </func>
 
     <func>
-      <name name="unalias" arity="1" since="OTP @OTP-16718@"/>
+      <name name="unalias" arity="1" since="OTP 24.0"/>
       <fsummary>Create an alias.</fsummary>
       <desc>
 	<p>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 14a3c2b58d..bd3df55d59 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,434 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 12.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    <c>file:open/2</c> now throws an badarg error when opened
+	    with both the <c>ram</c> and <c>raw</c> options.</p>
+          <p>
+	    Own Id: OTP-16822 Aux Id: PR-2723 </p>
+        </item>
+        <item>
+          <p>
+	    The estone benchmark has been updated to better reflect
+	    changes in the compiler and run-time system.</p>
+          <p>
+	    Own Id: OTP-16879</p>
+        </item>
+        <item>
+          <p>
+	    Fix profile guided optimization of run-time system when
+	    using GCC 7 or later.</p>
+          <p>
+	    Own Id: OTP-16880</p>
+        </item>
+        <item>
+          <p>
+	    Fix double close of fd when creating crash dump.</p>
+          <p>
+	    Own Id: OTP-16884</p>
+        </item>
+        <item>
+          <p>
+	    Improve <c>erl</c> error message when unable to open
+	    included <c>args_file</c>.</p>
+          <p>
+	    Own Id: OTP-17014</p>
+        </item>
+        <item>
+          <p>
+	    Remove warning text about the <c>--</c> operation from
+	    documentation</p>
+          <p>
+	    The <c>--</c> operation was optimized in Erlang/OTP 22 so
+	    that its worst case complexity is O(N*log(N)), where N is
+	    the total size of the input lists. Therefore, the warning
+	    in the documentation saying that the time complexity is
+	    proportional to length(A)*length(B) is incorrect and is
+	    no longer needed. Notice that Erlang/OTP 21 will no
+	    longer be supported when Erlang/OTP 24 gets released.</p>
+          <p>
+	    Own Id: OTP-17020</p>
+        </item>
+        <item>
+          <p>
+	    A floating point zero (0.0) can be both positive (+0.0)
+	    and negative (-0.0). Multiple bugs in the compiler,
+	    runtime system, and STDLIB have been fixed to ensure that
+	    the minus sign on 0.0 is not lost.</p>
+          <p>
+	    Own Id: OTP-17077 Aux Id: ERL-1431, PR-2903, PR-2905,
+	    PR-2906 </p>
+        </item>
+        <item>
+          <p>
+	    Fix compiler warnings produced by the clang compiler.</p>
+          <p>
+	    Own Id: OTP-17105 Aux Id: PR-2872 </p>
+        </item>
+        <item>
+          <p>
+	    Windows process <c>erl.exe</c> killed if its service
+	    process <c>erlsrv.exe</c> terminates.</p>
+          <p>
+	    Own Id: OTP-17131 Aux Id: PR-3031, GH-4360 </p>
+        </item>
+        <item>
+          <p>
+	    The <c>erl</c> command line arguments <c>+Bi</c>,
+	    <c>+Bd</c>, and <c>+B</c> erroneously caused reception of
+	    the <c>USR1</c> signal to terminate the runtime system
+	    without creating a crash dump. Reception of the
+	    <c>USR1</c> signal now always cause termination
+	    <em>with</em> creation of a crash dump, regardless of
+	    command line arguments passed. This bug has existed at
+	    least since OTP R5B.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-17275 Aux Id: PR-4553 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The experimental <c>socket</c> module can now use any
+	    protocol (by name) the OS supports. Suggested in PR-2641,
+	    implemented in PR-2670.</p>
+          <p>
+	    Own Id: OTP-14601 Aux Id: PR-2641, PR-2670, OTP-16749 </p>
+        </item>
+        <item>
+	    <p>The deprecated function <c>erlang:get_stacktrace/0</c>
+	    has been removed. Use the new syntax in try/catch to
+	    retrieve the stack backtrace.</p>
+          <p>
+	    Own Id: OTP-16653</p>
+        </item>
+        <item>
+          <p>
+	    Support for handling abstract code created before OTP R15
+	    has been dropped.</p>
+          <p>
+	    Own Id: OTP-16678 Aux Id: PR-2627 </p>
+        </item>
+        <item>
+          <p>
+	    Extended error information for failing BIF calls as
+	    proposed in <url
+	    href="https://github.com/erlang/eep/blob/master/eeps/eep-0054.md">EEP
+	    54</url> has been implemented.</p>
+          <p>
+	    When a BIF call from the Erlang shell fails, more
+	    information about which argument or arguments that were
+	    in error will be printed. The same extended error
+	    information will by <c>proc_lib</c>, <c>common_test</c>,
+	    and <c>qlc</c> when BIF calls fail.</p>
+          <p>
+	    For applications that wish to provide the same extended
+	    error information, there are new functions
+	    <c>erl_error:format_exception/3</c> and
+	    <c>erl_error:format_exception/4</c>.</p>
+          <p>
+	    There is a new <c>error/3</c> BIF that allows
+	    applications or libraries to provide extended error
+	    information in the same way for their own exceptions.</p>
+          <p>
+	    Own Id: OTP-16686</p>
+        </item>
+        <item>
+          <p>
+	    The <seeerl marker="erlang"><c>erlang</c></seeerl> module
+	    documentation has been updated to improve clarity and
+	    description of edge cases.</p>
+          <p>
+	    Own Id: OTP-16687 Aux Id: PR-2996 PR-2762 </p>
+        </item>
+        <item>
+          <p>
+	    An example implementation of Erlang distribution over UDS
+	    using distribution processes has been introduced.</p>
+          <p>
+	    Thanks to Jérôme de Bretagne</p>
+          <p>
+	    Own Id: OTP-16703 Aux Id: PR-2620 </p>
+        </item>
+        <item>
+          <p>
+	    Improve code generation when creating funs by adding a
+	    new beam instruction make_fun3 that does not do GC and
+	    allows for better register allocation.</p>
+          <p>
+	    Own Id: OTP-16712</p>
+        </item>
+        <item>
+          <p>
+	    Process aliases as outlined by <url
+	    href="https://github.com/erlang/eep/blob/master/eeps/eep-0053.md">EEP
+	    53</url> has been introduced. Process aliases is
+	    introduced in order to provide a lightweight mechanism
+	    that can prevent late replies after timeout or connection
+	    loss. For more information, see EEP 53 and the
+	    documentation of the new <seemfa
+	    marker="erts:erlang#alias/1"><c>alias/1</c></seemfa> BIF
+	    and the new options to the <seemfa
+	    marker="erts:erlang#monitor/3"><c>monitor/3</c></seemfa>
+	    BIF.</p>
+          <p>
+	    The <c>call</c> operation in the framework used by
+	    <c>gen_server</c>, <c>gen_statem</c>, and
+	    <c>gen_event</c> has been updated to utilize alias in
+	    order to prevent late responses. The <c>gen_statem</c>
+	    behavior still use a proxy process in the distributed
+	    case, since it has always prevented late replies and
+	    aliases wont work against pre OTP 24 nodes. The proxy
+	    process can be removed in OTP 26.</p>
+          <p>
+	    The alias feature also made it possible to introduce new
+	    functions similar to the <seemfa
+	    marker="kernel:erpc#receive_response/2"><c>erpc:receive_response()</c></seemfa>
+	    function in the gen behaviors, so the new functions
+	    <seemfa
+	    marker="stdlib:gen_server#receive_response/2"><c>gen_server:receive_response()</c></seemfa>,
+	    <seemfa
+	    marker="stdlib:gen_statem#receive_response/2"><c>gen_statem:receive_response()</c></seemfa>,
+	    <seemfa
+	    marker="stdlib:gen_event#receive_response/2"><c>gen_event:receive_response()</c></seemfa>
+	    have also been introduced.</p>
+          <p>
+	    Own Id: OTP-16718 Aux Id: PR-2735 </p>
+        </item>
+        <item>
+          <p>
+	    Accept 64-bit process identifiers from external nodes.
+	    This is the first step in an upgrade path toward using
+	    64-bit pids in a future OTP release.</p>
+          <p>
+	    Own Id: OTP-16720 Aux Id: PR-2680 </p>
+        </item>
+        <item>
+	    <p> The experimental new socket API has been further
+	    developed. Some backwards incompatible changes with
+	    respect to OTP 23 have been made. </p><p> The control
+	    message format has been changed so a decoded value is now
+	    in the 'value' field instead of in the 'data' field. The
+	    'data' field now always contains binary data. </p><p>
+	    Some type names have been changed regarding message
+	    headers and control message headers. </p><p>
+	    <c>socket:bind/2</c> now returns plain <c>ok</c> instead
+	    of <c>{ok, Port}</c> which was only relevant for the
+	    <c>inet</c> and <c>inet6</c> address families and often
+	    not interesting. To find out which port was chosen use
+	    <c>socket:sockname/1</c>. </p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16749 Aux Id: OTP-14601 </p>
+        </item>
+        <item>
+          <p>
+	    Remove old unused <c>+MYm</c> and <c>ERL_MALLOC_LIB</c>
+	    options.</p>
+          <p>
+	    Own Id: OTP-16788</p>
+        </item>
+        <item>
+          <p>
+	    Increase timer resolution on windows.</p>
+          <p>
+	    Own Id: OTP-16814 Aux Id: PR-2704 </p>
+        </item>
+        <item>
+          <p>
+	    The code loader has been rewritten in order to be able to
+	    load JIT:ed code. As a consequence of this, it is no
+	    longer possible to load HiPE code.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16878</p>
+        </item>
+        <item>
+          <p>
+	    Add support in the Erlang/OTP build system to generate a
+	    compilation database that can be used by third-party
+	    tools (such as irony in Emacs) to compile the erts C and
+	    C++ source code. Create the database using <c>make
+	    compdb</c>.</p>
+          <p>
+	    Own Id: OTP-16881</p>
+        </item>
+        <item>
+          <p>
+	    The BeamAsm JIT-compiler has been added to Erlang/OTP.
+	    The JIT-compiler is enabled by default on most x86 64-bit
+	    platforms that have a C++ compiler that can compile
+	    C++17. To verify that a JIT enabled emulator is running
+	    you can use <seeerl
+	    marker="erlang#system_info_emu_flavor"><c>erlang:system_info(emu_flavor)</c></seeerl>.</p>
+          <p>
+	    For more information see the <seeguide
+	    marker="BeamAsm">internal documentation of BeamAsm in
+	    erts</seeguide>.</p>
+          <p>
+	    Own Id: OTP-16885 Aux Id: PR-2745 </p>
+        </item>
+        <item>
+          <p>
+	    By default all ERTS internal memory allocators based on
+	    <c>alloc_util</c> will now use their own separate carrier
+	    pool for migration of carriers instead of using a node
+	    global carrier pool. This was the default behavior
+	    between OTP 17 and OTP 21, but changed to use a node
+	    global carrier pool as of OTP 22.0. Usage of the node
+	    global carrier pool proved troublesome since it had a
+	    tendency to spread long lived blocks into allocators with
+	    normally short lived blocks causing increased memory
+	    fragmentation. The node global carrier pool behavior as
+	    well as other behaviors can be configured using the
+	    <seecref
+	    marker="erts_alloc#M_cp"><c>+M&lt;S&gt;cp</c></seecref>
+	    command line argument.</p>
+          <p>
+	    Own Id: OTP-16898 Aux Id: OTP-16856 </p>
+        </item>
+        <item>
+          <p>
+	    New functions have been added to the <c>maps</c> module:
+	    <c>merge_with/3</c>, <c>intersect/2</c>,
+	    <c>intersect_with/3</c>, <c>filtermap/2</c>,
+	    <c>from_keys/2</c>, and <c>maps:foreach/2</c>.</p>
+          <p>
+	    <c>maps:merge_with/3</c> is the same as <c>merge/2</c>
+	    but takes an extra fun that is used to combine items with
+	    the same key.</p>
+          <p>
+	    <c>maps:intersect/2</c> computes the intersection of two
+	    maps.</p>
+          <p>
+	    <c>maps:intersect_with/3</c> is the same as
+	    <c>intersect/2</c> but takes an extra fun that is used to
+	    combine intersecting items.</p>
+          <p>
+	    <c>maps:filtermap/2</c> allows filtering and mapping of a
+	    map in a single pass.</p>
+          <p>
+	    <c>maps:from_keys/2</c> constructs a map from a list of
+	    keys and a single value and can be used to to optimize
+	    sets operations such as from_list/1, filter/2,
+	    intersection/2, and subtract/2.</p>
+          <p>
+	    <c>maps:foreach/2</c> allows iteration over a map without
+	    returning any value.</p>
+          <p>
+	    Own Id: OTP-16936 Aux Id: ERL-1367 </p>
+        </item>
+        <item>
+          <p>
+	    Change <c>escript</c>s to output any errors or warnings
+	    to standard error instead of standard out.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16945</p>
+        </item>
+        <item>
+          <p>
+	    A new erl parameter for specifying a file descriptor with
+	    configuration data has been added. This makes it possible
+	    to pass the parameter "-configfd FD" when executing the
+	    erl command. When this option is given, the system will
+	    try to read and parse configuration parameters from the
+	    file descriptor.</p>
+          <p>
+	    Own Id: OTP-16952</p>
+        </item>
+        <item>
+	    <p>The experimental HiPE application has been removed,
+	    together with all related functionality in other
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16963</p>
+        </item>
+        <item>
+          <p>
+	    The pretty printer for floating point number have been
+	    changed to make it easier to see if the integer part of
+	    the number has been rounded. After the change the digit
+	    that may have been rounded always appears last or just
+	    before the exponent character (e or E). This is
+	    accomplished by always printing the number using
+	    scientific notation if it is so large that the integer
+	    part could be rounded.</p>
+          <p>
+	    Own Id: OTP-16980 Aux Id: ERL-1308 </p>
+        </item>
+        <item>
+	    <p>The <c>erlang:monitor_node/2</c> BIF will now fail
+	    with a <c>notalive</c> exception if distribution has not
+	    been started on the current node; it used to fail with a
+	    <c>badarg</c> exception.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16987</p>
+        </item>
+        <item>
+          <p>
+	    Accept references up to a size of 160-bits from remote
+	    nodes. This is the first step in an upgrade path toward
+	    using references up to 160-bits in a future OTP release.</p>
+          <p>
+	    Own Id: OTP-17005 Aux Id: OTP-16718 </p>
+        </item>
+        <item>
+          <p>
+	    Accept 64-bit port identifiers from external nodes. This
+	    is the first step in an upgrade path toward using 64-bit
+	    port identifiers in a future OTP release.</p>
+          <p>
+	    Own Id: OTP-17007</p>
+        </item>
+        <item>
+          <p>
+	    One can now pass the ERL_ROOTDIR environment variable to
+	    the erl and start scrips. This makes it easier to use
+	    Erlang for Android apps. On Android, apps don't control
+	    where they will be installed.</p>
+          <p>
+	    Own Id: OTP-17028</p>
+        </item>
+        <item>
+          <p>
+	    All long running functions in the maps API are now
+	    yielding. In previous releases the functions
+	    <c>maps:from_list/1</c>, <c>maps:keys/1</c> and
+	    <c>maps:values/1</c> did not yield. This could cause
+	    unfair scheduling of processes.</p>
+          <p>
+	    Own Id: OTP-17057</p>
+        </item>
+        <item>
+	    <p>The bit matching and construction syntax now supports
+	    16-bit floats (IEEE 754-2008).</p>
+          <p>
+	    Own Id: OTP-17207</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 11.2</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 7e69e28e62..21968153c3 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.13", "kernel-@OTP-16718@", "sasl-3.3"]}
+	{runtime_dependencies, ["stdlib-3.13", "kernel-8.0", "sasl-3.3"]}
     ]}.
 
 %% vim: ft=erlang
diff --git a/erts/vsn.mk b/erts/vsn.mk
index ef6d146974..5aed65cbb9 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 11.2
+VSN = 12.0
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 3f4bfddd06..a1e82bc849 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 5.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The compiler will now emit warnings when (previously
+	    bound) underscore-prefixed variables are matched.</p>
+          <p>
+	    Own Id: OTP-17123</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 5.0.14</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index b5dfc871bd..a63de49f97 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.0.14
+ASN1_VSN = 5.1
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 1ba1765347..f1df3a6273 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,6 +33,37 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.20.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The option <c>release_shell</c> could crash when used
+	    together with the <c>spec</c> option.</p>
+          <p>
+	    Own Id: OTP-16940 Aux Id: ERL-1335 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The experimental HiPE application has been removed,
+	    together with all related functionality in other
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16963</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.20</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index d1e8e2e8ba..a4e91a0fbe 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.20
+COMMON_TEST_VSN = 1.20.1
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 0d8fafb523..28e822ef18 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,199 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 8.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A floating point zero (0.0) can be both positive (+0.0)
+	    and negative (-0.0). Multiple bugs in the compiler,
+	    runtime system, and STDLIB have been fixed to ensure that
+	    the minus sign on 0.0 is not lost.</p>
+          <p>
+	    Own Id: OTP-17077 Aux Id: ERL-1431, PR-2903, PR-2905,
+	    PR-2906 </p>
+        </item>
+        <item>
+	    <p>A repeated stack trace variable in a try/catch was not
+	    rejected. The following example will now cause a
+	    compilation error:</p> <pre>try E catch _:A:A -&gt; A
+	    end.</pre>
+          <p>
+	    Own Id: OTP-17104 Aux Id: ERL-1380 </p>
+        </item>
+        <item>
+	    <p>Eliminated a Dialyzer crashed when the <c>-MMD</c>
+	    option is used to generate a dependency file and a BEAM
+	    file a the same time.</p>
+          <p>
+	    Own Id: OTP-17118 Aux Id: PR-2825 </p>
+        </item>
+        <item>
+	    <p>When the <c>makedep</c> option was given, the compiler
+	    would crash if the dependency output contained non-latin1
+	    characters. The compiler will now output the dependency
+	    information encoded in UTF-8 to avoid crashing.</p>
+          <p>
+	    Own Id: OTP-17206</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Selective receive optimization will now be applied
+	    much more often.</p>
+	    <p>The new <seeguide
+	    marker="system/efficiency_guide:processes#recv_opt_info"><c>recv_opt_info</c></seeguide>
+	    compile flag can be used to print diagnostics relating to
+	    this optimization.</p>
+          <p>
+	    You can read more about the <seeguide
+	    marker="system/efficiency_guide:processes#receiving-messages">selective
+	    receive optimization</seeguide> in the Efficiency Guide.</p>
+          <p>
+	    Own Id: OTP-10391 Aux Id: OTP-16226 </p>
+        </item>
+        <item>
+	    <p><c>erlang:throw/1</c> will no longer build stack
+	    traces when we can prove that they will never be
+	    inspected.</p>
+          <p>
+	    Own Id: OTP-16334</p>
+        </item>
+        <item>
+	    <p>Variables bound between the keywords 'try' and 'of'
+	    can now be used in the clauses following the 'of' keyword
+	    (that is, in the success case when no exception was
+	    raised).</p>
+          <p>
+	    Own Id: OTP-16706 Aux Id: ERL-1281 </p>
+        </item>
+        <item>
+          <p>
+	    Compiler warnings and errors now include column numbers
+	    in addition to line numbers.</p>
+          <p>
+	    When a compiler message is emitted, the source line is
+	    printed along with a marker (a <c>^</c> character) that
+	    indicates the column position of the issue. The option
+	    '<c>brief</c>' removes the printout of the source line.</p>
+          <p>
+	    The compiler option <c>{error_location, line |
+	    column}</c> has been added. The default value is
+	    <c>column</c>. Besides adding column numbers to
+	    compilation warnings and errors, the option also
+	    determines whether column numbers are included in
+	    abstract code. If tools stop working, setting the
+	    environment variable <c>ERL_COMPILER_OPTIONS</c> can help
+	    (include <c>{error_location, line}</c>).</p>
+          <p>
+	    The compiler will now call the function
+	    <c>PT</c>:<c>parse_transform_info/0</c> in parse
+	    transforms (if it exists). It can be used by parse
+	    transforms to signal that they can only handle line
+	    numbers in abstract code.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16824 Aux Id: PR-2664, PR-3006 </p>
+        </item>
+        <item>
+	    <p>Fixed a performance bug that made functions with lots
+	    of <c>try/after</c> blocks slow to compile.</p>
+          <p>
+	    Own Id: OTP-16867 Aux Id: ERL-1354 </p>
+        </item>
+        <item>
+	    <p>The experimental HiPE application has been removed,
+	    together with all related functionality in other
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16963</p>
+        </item>
+        <item>
+	    <p>Generators in list and binary comprehensions will now
+	    raise a <c>{bad_generator,Generator}</c> exception if the
+	    generator has an incorrect type (instead of raising an
+	    ad-hoc <c>badarg</c> or <c>badarih</c> exception).
+	    Similarly, when a filter does not evaluate to a boolean,
+	    a <c>{bad_filter,Filter}</c> exception will be raised.
+	    Some minor bugs in the compilation of binary
+	    comprehensions have also been fixed.</p>
+          <p>
+	    Own Id: OTP-16964</p>
+        </item>
+        <item>
+	    <p>Some compiler warnings, such as the warning for an
+	    expression whose result is ignored, could not be
+	    suppressed by assigning to a variable beginning with
+	    '<c>_</c>', but only by assigning to the anonymous
+	    variable ('<c>_</c>'). This has now been changed so that
+	    any warning that can be suppressed by assigning to the
+	    anonymous variable can also be suppressed by assigning to
+	    a variable beginning with '<c>_</c>'.</p>
+          <p>
+	    Own Id: OTP-16981 Aux Id: ERL-1113 </p>
+        </item>
+        <item>
+          <p>
+	    The previously undocumented compiler options
+	    <c>warn_missing_spec</c> and <c>warn_missing_spec_all</c>
+	    are now documented.</p>
+          <p>
+	    Own Id: OTP-17078 Aux Id: ERL-1430, PR-2918 </p>
+        </item>
+        <item>
+	    <p>The compiler will now emit warnings when (previously
+	    bound) underscore-prefixed variables are matched.</p>
+          <p>
+	    Own Id: OTP-17123</p>
+        </item>
+        <item>
+	    <p>Erlang source files not encoded in utf-8 will no
+	    longer be accepted by the compiler unless it contains a
+	    "coding: latin-1" comment.</p>
+          <p>
+	    Own Id: OTP-17168</p>
+        </item>
+        <item>
+	    <p>New compiler options <c>from_abstr</c> and
+	    <c>no_lint</c> have been added. They are useful when
+	    implementing other languages running on the BEAM.</p>
+          <p>
+	    Own Id: OTP-17172</p>
+        </item>
+        <item>
+	    <p>The bit matching and construction syntax now supports
+	    16-bit floats (IEEE 754-2008).</p>
+          <p>
+	    Own Id: OTP-17207</p>
+        </item>
+        <item>
+	    <p>The compiler will now inline funs that are used only
+	    once immediately after their definition.</p>
+          <p>
+	    Own Id: OTP-17226 Aux Id: GH-4019, PR-4545 </p>
+        </item>
+        <item>
+	    <p>It is now possible to disable warnings emitted from
+	    the compiler's optimization passes with the new options
+	    <c>nowarn_opportunistic</c>, <c>nowarn_nomatch</c>,
+	    <c>nowarn_ignored</c>, and <c>nowarn_failed</c>.</p>
+          <p>
+	    Own Id: OTP-17260</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 7.6.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index c628ece88c..8920d8881d 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.6.7
+COMPILER_VSN = 8.0
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 304e263f88..52c5453899 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,51 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 5.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add <c>/usr/local/opt/openssl</c> to the openssl
+	    configure search path. This path is where some tools on
+	    OS X place openssl.</p>
+          <p>
+	    Own Id: OTP-16882</p>
+        </item>
+        <item>
+          <p>
+	    Fix compiler warnings produced by the clang compiler.</p>
+          <p>
+	    Own Id: OTP-17105 Aux Id: PR-2872 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The functions and cipher names that were deprecated in
+	    OTP-23.0 are now removed.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16656</p>
+        </item>
+        <item>
+          <p>
+	    Removed installed directory priv/obj/ containing
+	    superfluous object files.</p>
+          <p>
+	    Own Id: OTP-17001 Aux Id: PR-2852 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 4.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 1aaf84ba37..df8d618e72 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 4.9
+CRYPTO_VSN = 5.0
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 5e3f2ce878..c9b644105d 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -33,6 +33,39 @@
   <p>This document describes the changes made to the Debugger
     application.</p>
 
+<section><title>Debugger 5.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Extended error information for failing BIF calls as
+	    proposed in <url
+	    href="https://github.com/erlang/eep/blob/master/eeps/eep-0054.md">EEP
+	    54</url> has been implemented.</p>
+          <p>
+	    When a BIF call from the Erlang shell fails, more
+	    information about which argument or arguments that were
+	    in error will be printed. The same extended error
+	    information will by <c>proc_lib</c>, <c>common_test</c>,
+	    and <c>qlc</c> when BIF calls fail.</p>
+          <p>
+	    For applications that wish to provide the same extended
+	    error information, there are new functions
+	    <c>erl_error:format_exception/3</c> and
+	    <c>erl_error:format_exception/4</c>.</p>
+          <p>
+	    There is a new <c>error/3</c> BIF that allows
+	    applications or libraries to provide extended error
+	    information in the same way for their own exceptions.</p>
+          <p>
+	    Own Id: OTP-16686</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Debugger 5.0</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index 8e334a00f5..a4fdf366f3 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 5.0
+DEBUGGER_VSN = 5.1
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index eac56be316..2ae3fa934d 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,6 +32,66 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 4.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Some internal HiPE modules have been moved into the
+	    dialyzer application so that dialyzer works when HiPE is
+	    disabled.</p>
+          <p>
+	    Own Id: OTP-16883</p>
+        </item>
+        <item>
+	    <p>The experimental HiPE application has been removed,
+	    together with all related functionality in other
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16963</p>
+        </item>
+        <item>
+          <p>
+	    Add warning option <c>no_underspecs</c>.</p>
+          <p>
+	    Own Id: OTP-16986 Aux Id: ERL-1379, ERL-1480, GH-4033 </p>
+        </item>
+        <item>
+          <p>
+	    Report filename and location for warnings returned due to
+	    the <c>-Wunknown</c> option. When used from the
+	    command-line, one location per file is printed.</p>
+          <p>
+	    Own Id: OTP-16995 Aux Id: ERL-1348 </p>
+        </item>
+        <item>
+          <p>
+	    Add types and specifications for documentation.</p>
+          <p>
+	    Own Id: OTP-17084</p>
+        </item>
+        <item>
+          <p>
+	    Add option <c>error_location</c>. The option is
+	    recognized if included in the environment variable
+	    ERL_COMPILER_OPTIONS.</p>
+          <p>
+	    Own Id: OTP-17177 Aux Id: OTP-16824 </p>
+        </item>
+        <item>
+          <p>
+	    Clarify how to declare records used in match patterns.</p>
+          <p>
+	    Own Id: OTP-17183 Aux Id: ERL-892, GH-4493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 4.3.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index 803d121b53..bf764c3c7e 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 4.3.1
+DIALYZER_VSN = 4.4
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index 2871a09476..96055d1cf8 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -32,6 +32,73 @@
   <p>This document describes the changes made to the EDoc
     application.</p>
 
+<section><title>Edoc 1.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix so that the edoc_doclet option <c>file_suffix</c>
+	    also effects the links emitted into the module index.</p>
+          <p>
+	    Own Id: OTP-17092</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    EDoc, the Erlang documentation engine, hits version 1.0
+	    with this release, which means a few changes.</p>
+          <p>
+	    EDoc is now capable of emitting EEP-48 doc chunks. This
+	    means that, with some configuration, community projects
+	    can now provide documentation for <seeerl
+	    marker="stdlib:shell_docs"><c>shell_docs</c></seeerl> the
+	    same way that OTP libraries did since OTP 23.0.</p>
+          <p>
+	    The <c>@spec</c> and <c>@type</c> EDoc tags have been
+	    deprecated. These are not supported with the new
+	    chunk-generating doclet and layout. Moreover, previously
+	    when there was a redundant <c>@spec</c> tag and
+	    <c>-spec</c> attribute defined for the same function, the
+	    <c>@spec</c> tag would take precedence. Now, the
+	    <c>-spec</c> attribute takes precedence and is more
+	    important. The same is true for redundant <c>@type</c>
+	    tags and <c>-type</c> attributes. Warnings are now
+	    emitted when such redundant entries are found.</p>
+          <p>
+	    See the <seeguide marker="chapter">Doc chunks chapter in
+	    the Edoc User's Guide</seeguide> for more details.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16949 Aux Id: PR-2803 OTP-17192 </p>
+        </item>
+        <item>
+          <p>
+	    Edoc has been updated to use <c>-spec</c> to document its
+	    own interface instead of <c>@doc@</c> tags.</p>
+          <p>
+	    Together with this change the inter-application linking
+	    for <c>-spec</c> style documentation has been improved.</p>
+          <p>
+	    Own Id: OTP-17095 Aux Id: PR-2914 </p>
+        </item>
+        <item>
+          <p>
+	    Allow user defined edoc macros to be functions.</p>
+          <p>
+	    Own Id: OTP-17153 Aux Id: PR-2674 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Edoc 0.12</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/edoc/src/edoc.app.src b/lib/edoc/src/edoc.app.src
index 6b6b6712f7..0edee67fce 100644
--- a/lib/edoc/src/edoc.app.src
+++ b/lib/edoc/src/edoc.app.src
@@ -26,6 +26,6 @@
   {registered,[]},
   {applications, [compiler, kernel, stdlib, syntax_tools]},
   {env, []},
-  {runtime_dependencies, ["xmerl-1.3.7", "syntax_tools-1.6.14", "stdlib-@OTP-17120@",
+  {runtime_dependencies, ["xmerl-1.3.7", "syntax_tools-1.6.14", "stdlib-3.15",
 			  "kernel-3.0", "inets-5.10", "erts-6.0"]}
  ]}.
diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk
index 5d2bbe769d..251dc5be0f 100644
--- a/lib/edoc/vsn.mk
+++ b/lib/edoc/vsn.mk
@@ -1 +1 @@
-EDOC_VSN = 0.12
+EDOC_VSN = 1.0
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index 603fcdf1be..982d99f095 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -31,7 +31,58 @@
   </header>
   <p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
 
-  <section><title>Erl_Docgen 1.0.2</title>
+  <section><title>Erl_Docgen 1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed bug in <seeerl
+	    marker="stdlib:shell_docs"><c>shell_docs</c></seeerl> and
+	    <c>erl_docgen</c> that interpreted <c>em</c> tags as
+	    <c>strong</c>.</p>
+          <p>
+	    Own Id: OTP-17122</p>
+        </item>
+        <item>
+	    <p>Missing runtime dependencies has been added to this
+	    application.</p>
+          <p>
+	    Own Id: OTP-17243 Aux Id: PR-4557 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bug where <c>see*</c> elements within
+	    <c>type</c>/<c>name</c> were removed when generating
+	    html. Bug has been present since OTP-21.</p>
+          <p>
+	    Own Id: OTP-17257</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add support for displaying <c>.svg</c> images.</p>
+          <p>
+	    Own Id: OTP-16877</p>
+        </item>
+        <item>
+          <p>
+	    Updated the way specs are generated after changes in
+	    edoc.</p>
+          <p>
+	    Own Id: OTP-17192 Aux Id: PR-2803 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 1.0.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/erl_docgen/src/erl_docgen.app.src b/lib/erl_docgen/src/erl_docgen.app.src
index 27a684637e..c7b7967a3d 100644
--- a/lib/erl_docgen/src/erl_docgen.app.src
+++ b/lib/erl_docgen/src/erl_docgen.app.src
@@ -10,6 +10,6 @@
   {registered,[]},
   {applications, [kernel,stdlib]},
   {env, []},
-  {runtime_dependencies, ["xmerl-1.3.7","kernel-8.0","stdlib-@OTP-17120@","edoc-@OTP-16949@","erts-9.0"]}
+  {runtime_dependencies, ["xmerl-1.3.7","kernel-8.0","stdlib-3.15","edoc-1.0","erts-9.0"]}
  ]
 }.
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 4b05826b61..c822a93b41 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 1.0.2
+ERL_DOCGEN_VSN = 1.1
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 3a7c64b98b..2e8fbf98c0 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,6 +31,86 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 5.0</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Accept 64-bit process identifiers from external nodes.
+	    This is the first step in an upgrade path toward using
+	    64-bit pids in a future OTP release.</p>
+          <p>
+	    Own Id: OTP-16720 Aux Id: PR-2680 </p>
+        </item>
+        <item>
+	    <p>The experimental HiPE application has been removed,
+	    together with all related functionality in other
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16963</p>
+        </item>
+        <item>
+          <p>
+	    The <c>registry</c> functionality part of
+	    <c>erl_interface</c> has been removed. It was as of OTP
+	    23 deprecated and scheduled for removal in OTP 24.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16970</p>
+        </item>
+        <item>
+          <p>
+	    Accept references up to a size of 160-bits from remote
+	    nodes. This is the first step in an upgrade path toward
+	    using references up to 160-bits in a future OTP release.</p>
+          <p>
+	    Own Id: OTP-17005 Aux Id: OTP-16718 </p>
+        </item>
+        <item>
+          <p>
+	    Accept 64-bit port identifiers from external nodes. This
+	    is the first step in an upgrade path toward using 64-bit
+	    port identifiers in a future OTP release.</p>
+          <p>
+	    Own Id: OTP-17007</p>
+        </item>
+        <item>
+          <p>
+	    Support the new link protocol in order to be able to
+	    phase out the old link protocol in the future.
+	    <c>erl_interface</c> does not support setting up or
+	    removing links from the <c>erl_interface</c> side, so the
+	    bug present with the old protocol did not effect
+	    <c>erl_interface</c>. This since both participants of a
+	    link simultaneously needed to operate on the link in
+	    order to trigger the bug.</p>
+          <p>
+	    Own Id: OTP-17270 Aux Id: OTP-17127 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    The <c>ei</c> API for decoding/encoding terms is not
+	    fully 64-bit compatible since terms that have a
+	    representation on the external term format larger than 2
+	    GB cannot be handled.</p>
+          <p>
+	    Own Id: OTP-16607 Aux Id: OTP-16608 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 4.0.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index d928057ca4..1d1414d0af 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 4.0.2
+EI_VSN = 5.0
 ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/et/doc/src/notes.xml b/lib/et/doc/src/notes.xml
index e144defb69..fbf71680ca 100644
--- a/lib/et/doc/src/notes.xml
+++ b/lib/et/doc/src/notes.xml
@@ -37,6 +37,21 @@
   one section in this document. The title of each section is the
   version number of <c>Event Tracer (ET)</c>.</p>
 
+<section><title>ET 1.7</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The compiler will now emit warnings when (previously
+	    bound) underscore-prefixed variables are matched.</p>
+          <p>
+	    Own Id: OTP-17123</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>ET 1.6.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/et/vsn.mk b/lib/et/vsn.mk
index d5416f1ea9..0cf3d091ea 100644
--- a/lib/et/vsn.mk
+++ b/lib/et/vsn.mk
@@ -1 +1 @@
-ET_VSN  = 1.6.4
+ET_VSN  = 1.7
diff --git a/lib/ftp/doc/src/notes.xml b/lib/ftp/doc/src/notes.xml
index e6ce2e3d81..c4f763a6f7 100644
--- a/lib/ftp/doc/src/notes.xml
+++ b/lib/ftp/doc/src/notes.xml
@@ -33,7 +33,43 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Ftp 1.0.5</title>
+  <section><title>Ftp 1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Use OTP supervisor as intended, avoiding surprising
+	    behavior as the killing of the user's process. Also, FTP
+	    state handling logic is improved to avoid race conditions
+	    that could result in unexpected errors.</p>
+          <p>
+	    Own Id: OTP-16926 Aux Id: ERL-1450, GH-4473 </p>
+        </item>
+        <item>
+	    <p>Missing runtime dependencies has been added to this
+	    application.</p>
+          <p>
+	    Own Id: OTP-17243 Aux Id: PR-4557 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add support for FTPES (explicit FTP over TLS).</p>
+          <p>
+	    Own Id: OTP-15523 Aux Id: OTP-15352, PR-1968 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ftp 1.0.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ftp/vsn.mk b/lib/ftp/vsn.mk
index 733b082b21..6c67fa5eaa 100644
--- a/lib/ftp/vsn.mk
+++ b/lib/ftp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = ftp
-FTP_VSN   = 1.0.5
+FTP_VSN   = 1.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(FTP_VSN)$(PRE_VSN)"
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index a8499b8d43..c3df0a2337 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,44 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 7.3.2</title>
+  <section><title>Inets 7.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Drop all support for ftp and tftp in inets code.</p>
+          <p>
+	    Own Id: OTP-16722</p>
+        </item>
+        <item>
+          <p>
+	    Deprecate following functions in <c>httpd_util</c>
+	    module: <c>flatlength/1</c>,
+	    <c>lhexlist_to_integer/1</c>,
+	    <c>integer_to_hexlist/1</c>, <c>strip/1</c>, and
+	    <c>suffix/1</c>.</p>
+          <p>
+	    Own Id: OTP-16723</p>
+        </item>
+        <item>
+          <p>
+	    Remove support of HTTP 0.9 in httpd.</p>
+          <p>
+	    Own Id: OTP-16724</p>
+        </item>
+        <item>
+          <p>
+	    Remove support of HTTP 0.9 in httpc.</p>
+          <p>
+	    Own Id: OTP-16725</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 7.3.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 211c662218..eb97a20548 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 7.3.2
+INETS_VSN   = 7.4
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index 8603433fbd..6186ea74e8 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -31,6 +31,46 @@
   </header>
   <p>This document describes the changes made to the Jinterface application.</p>
 
+<section><title>Jinterface 1.12</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Accept 64-bit process identifiers from external nodes.
+	    This is the first step in an upgrade path toward using
+	    64-bit pids in a future OTP release.</p>
+          <p>
+	    Own Id: OTP-16720 Aux Id: PR-2680 </p>
+        </item>
+        <item>
+          <p>
+	    Accept references up to a size of 160-bits from remote
+	    nodes. This is the first step in an upgrade path toward
+	    using references up to 160-bits in a future OTP release.</p>
+          <p>
+	    Own Id: OTP-17005 Aux Id: OTP-16718 </p>
+        </item>
+        <item>
+          <p>
+	    Accept 64-bit port identifiers from external nodes. This
+	    is the first step in an upgrade path toward using 64-bit
+	    port identifiers in a future OTP release.</p>
+          <p>
+	    Own Id: OTP-17007</p>
+        </item>
+        <item>
+          <p>
+	    Make <c>OtpErlangExternalFun</c>'s fields <c>module</c>,
+	    <c>function</c> and <c>arity</c> public.</p>
+          <p>
+	    Own Id: OTP-17170 Aux Id: PR-3005 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Jinterface 1.11.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index 5209c63af3..f1b77e6857 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1 +1 @@
-JINTERFACE_VSN = 1.11.1
+JINTERFACE_VSN = 1.12
diff --git a/lib/kernel/doc/src/logger.xml b/lib/kernel/doc/src/logger.xml
index aea1bc98a4..1c17004aa0 100644
--- a/lib/kernel/doc/src/logger.xml
+++ b/lib/kernel/doc/src/logger.xml
@@ -865,7 +865,7 @@ start(_, []) ->
       <name name="set_primary_config" arity="2" clause_i="1" since="OTP 21.0"/>
       <name name="set_primary_config" arity="2" clause_i="2" since="OTP 21.0"/>
       <name name="set_primary_config" arity="2" clause_i="3" since="OTP 21.0"/>
-      <name name="set_primary_config" arity="2" clause_i="4" since="OTP @OTP-17181@"/>
+      <name name="set_primary_config" arity="2" clause_i="4" since="OTP 24.0"/>
       <fsummary>Add or update primary configuration data for Logger.</fsummary>
       <type variable="Level" name_i="1"/>
       <type variable="FilterDefault" name_i="2"/>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 562384f7be..4af283d1ee 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,405 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 8.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A bug has been fixed for the internal <c>inet_res</c>
+	    resolver cache that handled a resolver configuration file
+	    status timer incorrectly and caused performance problems
+	    due to many unnecessary file system accesses.</p>
+          <p>
+	    Own Id: OTP-14700 Aux Id: PR-2848 </p>
+        </item>
+        <item>
+          <p>
+	    Change the value of the tag <c>head</c> returned by
+	    <c>disk_log:info/1</c> from <c>{ok, Head}</c> to just
+	    <c>Head</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16809 Aux Id: ERL-1313 </p>
+        </item>
+        <item>
+	    <p>Missing runtime dependencies has been added to this
+	    application.</p>
+          <p>
+	    Own Id: OTP-17243 Aux Id: PR-4557 </p>
+        </item>
+        <item>
+          <p>
+	    <c>inet:get_rc/0</c> has been corrected to return host
+	    entries as separate entries instead of (incorrectly) in a
+	    list within the list. This bug was introduced by
+	    OTP-16487 in OTP-23.0-rc1.</p>
+          <p>
+	    Own Id: OTP-17262 Aux Id: GH-4588, PR-4604, OTP-16487 </p>
+        </item>
+        <item>
+          <p>
+	    The type gen_tcp:option_name() had a duplicate pktoptions
+	    value.</p>
+          <p>
+	    Own Id: OTP-17277</p>
+        </item>
+        <item>
+          <p>
+	    Fixed removal of empty groups from internal state in
+	    <c>pg</c>.</p>
+          <p>
+	    Own Id: OTP-17286 Aux Id: PR-4619 </p>
+        </item>
+        <item>
+          <p>
+	    <c>erl -remsh</c> now prints an error message when it
+	    fails to connect to the remote node.</p>
+          <p>
+	    Own Id: OTP-17287 Aux Id: PR-4581 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bugs related to corrupt shell history files.</p>
+          <p>
+	    Error messages printed by shell history are now logged as
+	    logger error reports instead of written to standard
+	    error.</p>
+          <p>
+	    Own Id: OTP-17288 Aux Id: PR-4581 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The cache used by the DNS resolver <c>inet_res</c> has
+	    been improved to use ETS lookups instead of server calls.
+	    This is a considerable speed improvement for cache hits.</p>
+          <p>
+	    Own Id: OTP-13126 Aux Id: PR-3041 </p>
+        </item>
+        <item>
+          <p>
+	    The cache ETS table type for the internal DNS resolver
+	    <c>inet_res</c> has changed type (internally) to get
+	    better speed and atomicity.</p>
+          <p>
+	    Own Id: OTP-14485 Aux Id: PR-2891 </p>
+        </item>
+        <item>
+          <p>
+	    The experimental <c>socket</c> module can now use any
+	    protocol (by name) the OS supports. Suggested in PR-2641,
+	    implemented in PR-2670.</p>
+          <p>
+	    Own Id: OTP-14601 Aux Id: PR-2641, PR-2670, OTP-16749 </p>
+        </item>
+        <item>
+          <p>
+	    The DNS resolver <c>inet_res</c> has been updated to
+	    support CAA (RFC 6844) and URI (RFC 7553) records.</p>
+          <p>
+	    Own Id: OTP-16517 Aux Id: PR-2827 </p>
+        </item>
+        <item>
+          <p>
+	    A compatibility adaptor for <c>gen_tcp</c> to use the new
+	    <c>socket</c> API has been implemented
+	    (<c>gen_tcp_socket</c>). Used when setting the kernel
+	    application variable <c>inet_backend = socket</c>.</p>
+          <p>
+	    Own Id: OTP-16611 Aux Id: OTP-16749 </p>
+        </item>
+        <item>
+          <p>
+	    Extended error information for failing BIF calls as
+	    proposed in <url
+	    href="https://github.com/erlang/eep/blob/master/eeps/eep-0054.md">EEP
+	    54</url> has been implemented.</p>
+          <p>
+	    When a BIF call from the Erlang shell fails, more
+	    information about which argument or arguments that were
+	    in error will be printed. The same extended error
+	    information will by <c>proc_lib</c>, <c>common_test</c>,
+	    and <c>qlc</c> when BIF calls fail.</p>
+          <p>
+	    For applications that wish to provide the same extended
+	    error information, there are new functions
+	    <c>erl_error:format_exception/3</c> and
+	    <c>erl_error:format_exception/4</c>.</p>
+          <p>
+	    There is a new <c>error/3</c> BIF that allows
+	    applications or libraries to provide extended error
+	    information in the same way for their own exceptions.</p>
+          <p>
+	    Own Id: OTP-16686</p>
+        </item>
+        <item>
+	    <p>The file server can now be bypassed in
+	    <c>file:delete/1,2</c> with the <c>raw</c> option.</p>
+          <p>
+	    Own Id: OTP-16698 Aux Id: PR-2634 </p>
+        </item>
+        <item>
+          <p>
+	    An example implementation of Erlang distribution over UDS
+	    using distribution processes has been introduced.</p>
+          <p>
+	    Thanks to Jérôme de Bretagne</p>
+          <p>
+	    Own Id: OTP-16703 Aux Id: PR-2620 </p>
+        </item>
+        <item>
+          <p>
+	    Process aliases as outlined by <url
+	    href="https://github.com/erlang/eep/blob/master/eeps/eep-0053.md">EEP
+	    53</url> has been introduced. Process aliases is
+	    introduced in order to provide a lightweight mechanism
+	    that can prevent late replies after timeout or connection
+	    loss. For more information, see EEP 53 and the
+	    documentation of the new <seemfa
+	    marker="erts:erlang#alias/1"><c>alias/1</c></seemfa> BIF
+	    and the new options to the <seemfa
+	    marker="erts:erlang#monitor/3"><c>monitor/3</c></seemfa>
+	    BIF.</p>
+          <p>
+	    The <c>call</c> operation in the framework used by
+	    <c>gen_server</c>, <c>gen_statem</c>, and
+	    <c>gen_event</c> has been updated to utilize alias in
+	    order to prevent late responses. The <c>gen_statem</c>
+	    behavior still use a proxy process in the distributed
+	    case, since it has always prevented late replies and
+	    aliases wont work against pre OTP 24 nodes. The proxy
+	    process can be removed in OTP 26.</p>
+          <p>
+	    The alias feature also made it possible to introduce new
+	    functions similar to the <seemfa
+	    marker="kernel:erpc#receive_response/2"><c>erpc:receive_response()</c></seemfa>
+	    function in the gen behaviors, so the new functions
+	    <seemfa
+	    marker="stdlib:gen_server#receive_response/2"><c>gen_server:receive_response()</c></seemfa>,
+	    <seemfa
+	    marker="stdlib:gen_statem#receive_response/2"><c>gen_statem:receive_response()</c></seemfa>,
+	    <seemfa
+	    marker="stdlib:gen_event#receive_response/2"><c>gen_event:receive_response()</c></seemfa>
+	    have also been introduced.</p>
+          <p>
+	    Own Id: OTP-16718 Aux Id: PR-2735 </p>
+        </item>
+        <item>
+	    <p> The experimental new socket API has been further
+	    developed. Some backwards incompatible changes with
+	    respect to OTP 23 have been made. </p><p> The control
+	    message format has been changed so a decoded value is now
+	    in the 'value' field instead of in the 'data' field. The
+	    'data' field now always contains binary data. </p><p>
+	    Some type names have been changed regarding message
+	    headers and control message headers. </p><p>
+	    <c>socket:bind/2</c> now returns plain <c>ok</c> instead
+	    of <c>{ok, Port}</c> which was only relevant for the
+	    <c>inet</c> and <c>inet6</c> address families and often
+	    not interesting. To find out which port was chosen use
+	    <c>socket:sockname/1</c>. </p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16749 Aux Id: OTP-14601 </p>
+        </item>
+        <item>
+          <p>
+	    New function <c>os:env/0</c> returns all OS environment
+	    variables as a list of 2-tuples.</p>
+          <p>
+	    Own Id: OTP-16793 Aux Id: ERL-1332, PR-2740 </p>
+        </item>
+        <item>
+          <p>
+	    Remove the support for distributed disk logs. The new
+	    function <c>disk_log:all/0</c> is to be used instead of
+	    <c>disk_log:accessible_logs/0</c>. The function
+	    <c>disk_log:close/1</c> is to be used instead of
+	    <c>disk_log:lclose/1,2</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16811</p>
+        </item>
+        <item>
+          <p>
+	    Expand the spec for <c>erl_epmd:listen_port_please/2</c>
+	    to mirror <c>erl_epmd:port_please/2</c>.</p>
+          <p>
+	    Own Id: OTP-16947 Aux Id: PR-2781 </p>
+        </item>
+        <item>
+          <p>
+	    A new erl parameter for specifying a file descriptor with
+	    configuration data has been added. This makes it possible
+	    to pass the parameter "-configfd FD" when executing the
+	    erl command. When this option is given, the system will
+	    try to read and parse configuration parameters from the
+	    file descriptor.</p>
+          <p>
+	    Own Id: OTP-16952</p>
+        </item>
+        <item>
+	    <p>The experimental HiPE application has been removed,
+	    together with all related functionality in other
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16963</p>
+        </item>
+        <item>
+	    <p>The <c>pg2</c> module has been removed.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16968</p>
+        </item>
+        <item>
+          <p>
+	    Accept references up to a size of 160-bits from remote
+	    nodes. This is the first step in an upgrade path toward
+	    using references up to 160-bits in a future OTP release.</p>
+          <p>
+	    Own Id: OTP-17005 Aux Id: OTP-16718 </p>
+        </item>
+        <item>
+          <p>
+	    Allow utf-8 binaries as parts of logger_formatter
+	    template.</p>
+          <p>
+	    Own Id: OTP-17015</p>
+        </item>
+        <item>
+          <p>
+	    Let <c>disk_log:open/1</c> change the size if a wrap log
+	    is opened for the first time, that is, the disk log
+	    process does not exist, and the value of option
+	    <c>size</c> does not match the current size of the disk
+	    log.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-17062 Aux Id: ERL-1418, GH-4469, ERIERL-537 </p>
+        </item>
+        <item>
+          <p>
+	    Allow the shell history of an erlang node to be fetched
+	    and stores using a custom callback module. See
+	    <c>shell_history</c> configuration parameter in the
+	    <seeapp marker="kernel:kernel_app">kernel
+	    documentation</seeapp> for more details.</p>
+          <p>
+	    Own Id: OTP-17103 Aux Id: PR-2949 </p>
+        </item>
+        <item>
+          <p>
+	    The simple logger (used to log events that happen before
+	    kernel has been started) has been improved to print
+	    prettier error messages.</p>
+          <p>
+	    Own Id: OTP-17106 Aux Id: PR-2885 </p>
+        </item>
+        <item>
+          <p>
+	    Fix various issues with the gen_tcp_socket. Including
+	    documenting some incompatibilities.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-17156</p>
+        </item>
+        <item>
+          <p>
+	    Added support in logger for setting primary metadata. The
+	    primary metadata is passed as a base metadata to all log
+	    events in the system. See <seeguide
+	    marker="logger_chapter#metadata">Metadata</seeguide> in
+	    the Logger chapter of the Kernel User's Guide for more
+	    details.</p>
+          <p>
+	    Own Id: OTP-17181 Aux Id: PR-2457 </p>
+        </item>
+        <item>
+          <p>
+	    Recognize new key 'optional_applications' in application
+	    resource files.</p>
+          <p>
+	    Own Id: OTP-17189 Aux Id: PR-2675 </p>
+        </item>
+        <item>
+          <p>
+	    The <c>Fun</c>'s passed to logger:log/2,3,4 can now
+	    return metadata that will only be fetched when needed.
+	    See <seemfa
+	    marker="logger#log/2"><c>logger:log/2,3,4</c></seemfa>
+	    for more details.</p>
+          <p>
+	    Own Id: OTP-17198 Aux Id: PR-2721 </p>
+        </item>
+        <item>
+          <p>
+	    <c>erpc:multicall()</c> has been rewritten to be able to
+	    utilize the newly introduced and improved
+	    reference/receive optimization.</p>
+          <p>
+	    Own Id: OTP-17201 Aux Id: PR-4534 </p>
+        </item>
+        <item>
+          <p>
+	    Add utility fiunction inet:info/1 to provide
+	    miscellaneous info about a socket.</p>
+          <p>
+	    Own Id: OTP-17203 Aux Id: OTP-17156 </p>
+        </item>
+        <item>
+	    <p> The behaviour for <c>gen_tcp:connect/3,4</c> has been
+	    changed to not per default bind to an address, which
+	    allows the network stack to delay the address and port
+	    selection to when the remote address is known. This
+	    allows better port re-use, and thus enables far more
+	    outgoing connections, since the ephemeral port range no
+	    longer has to be a hard limit. </p><p> There is a
+	    theoretical possibility that this behaviour change can
+	    affect the set of possible error values, or have other
+	    small implications on some platforms. </p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-17216 Aux Id: PR-2989 </p>
+        </item>
+        <item>
+          <p>
+	    An option <c>{nxdomain_reply, boolean()}</c> has been
+	    implemented in the DNS resolver <c>inet_res</c>. It is
+	    useful since an <c>nxdomain</c> error from a name server
+	    does contain the SOA record if the domain exists at all.
+	    This record is useful to determine a TTL for negative
+	    caching of the failed entry.</p>
+          <p>
+	    Own Id: OTP-17266 Aux Id: PR-4564 </p>
+        </item>
+        <item>
+          <p>
+	    Optimized lookup of local processes part of groups in
+	    <c>pg</c>.</p>
+          <p>
+	    Own Id: OTP-17284 Aux Id: PR-4615 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 7.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 9b832068e3..c3ec358ef3 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -144,7 +144,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
-      <name name="env" arity="0" since="OTP @OTP-16793@"/>
+      <name name="env" arity="0" since="OTP 24.0"/>
       <fsummary>List all environment variables.</fsummary>
       <desc>
         <p>Returns a list of all environment variables.
diff --git a/lib/kernel/doc/src/socket.xml b/lib/kernel/doc/src/socket.xml
index b1cdcafaed..4828d9553c 100644
--- a/lib/kernel/doc/src/socket.xml
+++ b/lib/kernel/doc/src/socket.xml
@@ -1327,7 +1327,7 @@
     <func>
       <name name="accept" arity="2" clause_i="1" since="OTP 22.1"
             anchor="accept-nowait"/>
-      <name name="accept" arity="2" clause_i="2" since="OTP @OTP-16749@"/>
+      <name name="accept" arity="2" clause_i="2" since="OTP 24.0"/>
       <fsummary>Accept a connection on a socket.</fsummary>
       <desc>
 	<p>
@@ -1488,7 +1488,7 @@
     <func>
       <name name="connect" arity="3" clause_i="1" since="OTP 22.1"
             anchor="connect-nowait"/>
-      <name name="connect" arity="3" clause_i="2" since="OTP @OTP-16749@"/>
+      <name name="connect" arity="3" clause_i="2" since="OTP 24.0"/>
       <fsummary>Initiate a connection on a socket.</fsummary>
       <desc>
         <p>
@@ -1531,7 +1531,7 @@
     </func>
 
     <func>
-      <name name="connect" arity="1" since="OTP @OTP-16749@"/>
+      <name name="connect" arity="1" since="OTP 24.0"/>
       <fsummary>Finalize a connection initiation on a socket.</fsummary>
       <desc>
         <p>
@@ -1708,7 +1708,7 @@
     </func>
 
     <func>
-      <name name="info" arity="0" since="OTP @OTP-16749@"/>
+      <name name="info" arity="0" since="OTP 24.0"/>
       <fsummary>Get miscellaneous socket library info.</fsummary>
       <desc>
         <p>Get miscellaneous info about the socket library.</p>
@@ -1932,9 +1932,9 @@
     <func>
       <name name="recv" arity="1" since="OTP 22.0"
 	    anchor="recv-infinity"/>
-      <name name="recv" arity="2" clause_i="1" since="OTP @OTP-16749@"/>
+      <name name="recv" arity="2" clause_i="1" since="OTP 24.0"/>
       <name name="recv" arity="2" clause_i="2" since="OTP 22.0"/>
-      <name name="recv" arity="3" clause_i="3" since="OTP @OTP-16749@"/>
+      <name name="recv" arity="3" clause_i="3" since="OTP 24.0"/>
       <name name="recv" arity="3" clause_i="5" since="OTP 22.0"/>
       <name name="recv" arity="3" clause_i="8" since="OTP 22.0"/>
       <name name="recv" arity="4" clause_i="3" since="OTP 22.0"/>
@@ -1973,7 +1973,7 @@
     </func>
 
     <func>
-      <name name="recv" arity="3" clause_i="4" since="OTP @OTP-16749@"
+      <name name="recv" arity="3" clause_i="4" since="OTP 24.0"
 	    anchor="recv-timeout"/>
       <name name="recv" arity="3" clause_i="9" since="OTP 22.0"/>
       <name name="recv" arity="4" clause_i="4" since="OTP 22.0"/>
@@ -1997,13 +1997,13 @@
     </func>
 
     <func>
-      <name name="recv" arity="3" clause_i="1" since="OTP @OTP-16749@"
+      <name name="recv" arity="3" clause_i="1" since="OTP 24.0"
 	    anchor="recv-nowait"/>
-      <name name="recv" arity="3" clause_i="2" since="OTP @OTP-16749@"/>
+      <name name="recv" arity="3" clause_i="2" since="OTP 24.0"/>
       <name name="recv" arity="3" clause_i="6" since="OTP 22.1"/>
-      <name name="recv" arity="3" clause_i="7" since="OTP @OTP-16749@"/>
+      <name name="recv" arity="3" clause_i="7" since="OTP 24.0"/>
       <name name="recv" arity="4" clause_i="1" since="OTP 22.1"/>
-      <name name="recv" arity="4" clause_i="2" since="OTP @OTP-16749@"/>
+      <name name="recv" arity="4" clause_i="2" since="OTP 24.0"/>
       <fsummary>Receive data from a socket, but do not wait.</fsummary>
       <desc>
         <p>
@@ -2066,7 +2066,7 @@
     <func>
       <name name="recvfrom" arity="1" since="OTP 22.0"
 	    anchor="recvfrom-infinity"/>
-      <name name="recvfrom" arity="2" clause_i="1" since="OTP @OTP-16749@"/>
+      <name name="recvfrom" arity="2" clause_i="1" since="OTP 24.0"/>
       <name name="recvfrom" arity="2" clause_i="2" since="OTP 22.0"/>
       <name name="recvfrom" arity="3" clause_i="3" since="OTP 22.0"/>
       <name name="recvfrom" arity="3" clause_i="5" since="OTP 22.0"/>
@@ -2138,11 +2138,11 @@
     <func>
       <name name="recvfrom" arity="3" clause_i="1" since="OTP 22.1"
 	    anchor="recvfrom-nowait"/>
-      <name name="recvfrom" arity="3" clause_i="2" since="OTP @OTP-16749@"/>
+      <name name="recvfrom" arity="3" clause_i="2" since="OTP 24.0"/>
       <name name="recvfrom" arity="3" clause_i="6" since="OTP 22.1"/>
-      <name name="recvfrom" arity="3" clause_i="7" since="OTP @OTP-16749@"/>
+      <name name="recvfrom" arity="3" clause_i="7" since="OTP 24.0"/>
       <name name="recvfrom" arity="4" clause_i="1" since="OTP 22.1"/>
-      <name name="recvfrom" arity="4" clause_i="2" since="OTP @OTP-16749@"/>
+      <name name="recvfrom" arity="4" clause_i="2" since="OTP 24.0"/>
       <fsummary>Receive a message from a socket, but do not wait.</fsummary>
       <desc>
         <p>
@@ -2196,7 +2196,7 @@
       <name name="recvmsg" arity="2" clause_i="4" since="OTP 22.0"/>
       <name name="recvmsg" arity="3" clause_i="3" since="OTP 22.0"/>
       <name name="recvmsg" arity="3" clause_i="5" since="OTP 22.0"/>
-      <name name="recvmsg" arity="4" clause_i="3" since="OTP @OTP-16749@"/>
+      <name name="recvmsg" arity="4" clause_i="3" since="OTP 24.0"/>
       <name name="recvmsg" arity="5" clause_i="3" since="OTP 22.0"/>
       <fsummary>
         Receive a message from a socket, with "infinite" time-out.
@@ -2249,7 +2249,7 @@
       <name name="recvmsg" arity="2" clause_i="5" since="OTP 22.0"
             anchor="recvmsg-timeout"/>
       <name name="recvmsg" arity="3" clause_i="4" since="OTP 22.0"/>
-      <name name="recvmsg" arity="4" clause_i="4" since="OTP @OTP-16749@"/>
+      <name name="recvmsg" arity="4" clause_i="4" since="OTP 24.0"/>
       <name name="recvmsg" arity="5" clause_i="4" since="OTP 22.0"/>
       <fsummary>Receive a message from a socket, with time-out.</fsummary>
       <desc>
@@ -2270,13 +2270,13 @@
     <func>
       <name name="recvmsg" arity="2" clause_i="2" since="OTP 22.1"
             anchor="recvmsg-nowait"/>
-      <name name="recvmsg" arity="2" clause_i="3" since="OTP @OTP-16749@"/>
+      <name name="recvmsg" arity="2" clause_i="3" since="OTP 24.0"/>
       <name name="recvmsg" arity="3" clause_i="1" since="OTP 22.1"/>
-      <name name="recvmsg" arity="3" clause_i="2" since="OTP @OTP-16749@"/>
-      <name name="recvmsg" arity="4" clause_i="1" since="OTP @OTP-16749@"/>
-      <name name="recvmsg" arity="4" clause_i="2" since="OTP @OTP-16749@"/>
+      <name name="recvmsg" arity="3" clause_i="2" since="OTP 24.0"/>
+      <name name="recvmsg" arity="4" clause_i="1" since="OTP 24.0"/>
+      <name name="recvmsg" arity="4" clause_i="2" since="OTP 24.0"/>
       <name name="recvmsg" arity="5" clause_i="1" since="OTP 22.1"/>
-      <name name="recvmsg" arity="5" clause_i="2" since="OTP @OTP-16749@"/>
+      <name name="recvmsg" arity="5" clause_i="2" since="OTP 24.0"/>
       <fsummary>Receive a message from a socket, but do not wait.</fsummary>
       <desc>
         <p>
@@ -2455,9 +2455,9 @@
     <func>
       <name name="send" arity="3" clause_i="3" since="OTP 22.1"
 	    anchor="send-nowait"/>
-      <name name="send" arity="3" clause_i="4" since="OTP @OTP-16749@"/>
+      <name name="send" arity="3" clause_i="4" since="OTP 24.0"/>
       <name name="send" arity="4" clause_i="1" since="OTP 22.1"/>
-      <name name="send" arity="4" clause_i="2" since="OTP @OTP-16749@"/>
+      <name name="send" arity="4" clause_i="2" since="OTP 24.0"/>
       <fsummary>Send data on a connected socket, but do not wait.</fsummary>
       <desc>
         <p>
@@ -2518,12 +2518,12 @@
     </func>
 
     <func>
-      <name name="send" arity="3" clause_i="2" since="OTP @OTP-16749@"
+      <name name="send" arity="3" clause_i="2" since="OTP 24.0"
 	    anchor="send-cont"/>
-      <name name="send" arity="4" clause_i="7" since="OTP @OTP-16749@"/>
-      <name name="send" arity="4" clause_i="8" since="OTP @OTP-16749@"/>
-      <name name="send" arity="4" clause_i="5" since="OTP @OTP-16749@"/>
-      <name name="send" arity="4" clause_i="6" since="OTP @OTP-16749@"/>
+      <name name="send" arity="4" clause_i="7" since="OTP 24.0"/>
+      <name name="send" arity="4" clause_i="8" since="OTP 24.0"/>
+      <name name="send" arity="4" clause_i="5" since="OTP 24.0"/>
+      <name name="send" arity="4" clause_i="6" since="OTP 24.0"/>
       <fsummary>Send data on a connected socket, continuation.</fsummary>
       <desc>
         <p>
@@ -2652,9 +2652,9 @@
     <func>
       <name name="sendmsg" arity="3" clause_i="3" since="OTP 22.1"
 	    anchor="sendmsg-nowait"/>
-      <name name="sendmsg" arity="3" clause_i="4" since="OTP @OTP-16749@"/>
+      <name name="sendmsg" arity="3" clause_i="4" since="OTP 24.0"/>
       <name name="sendmsg" arity="4" clause_i="1" since="OTP 22.1"/>
-      <name name="sendmsg" arity="4" clause_i="2" since="OTP @OTP-16749@"/>
+      <name name="sendmsg" arity="4" clause_i="2" since="OTP 24.0"/>
       <fsummary>Send a message on a socket, but do not wait.</fsummary>
       <desc>
         <p>
@@ -2715,12 +2715,12 @@
     </func>
 
     <func>
-      <name name="sendmsg" arity="3" clause_i="2" since="OTP @OTP-16749@"
+      <name name="sendmsg" arity="3" clause_i="2" since="OTP 24.0"
 	    anchor="sendmsg-cont"/>
-      <name name="sendmsg" arity="4" clause_i="7" since="OTP @OTP-16749@"/>
-      <name name="sendmsg" arity="4" clause_i="8" since="OTP @OTP-16749@"/>
-      <name name="sendmsg" arity="4" clause_i="5" since="OTP @OTP-16749@"/>
-      <name name="sendmsg" arity="4" clause_i="6" since="OTP @OTP-16749@"/>
+      <name name="sendmsg" arity="4" clause_i="7" since="OTP 24.0"/>
+      <name name="sendmsg" arity="4" clause_i="8" since="OTP 24.0"/>
+      <name name="sendmsg" arity="4" clause_i="5" since="OTP 24.0"/>
+      <name name="sendmsg" arity="4" clause_i="6" since="OTP 24.0"/>
       <fsummary>Send a message on a socket, continuation.</fsummary>
       <desc>
         <p>
@@ -2819,9 +2819,9 @@
     <func>
       <name name="sendto" arity="4" clause_i="2" since="OTP 22.1"
 	    anchor="sendto-nowait"/>
-      <name name="sendto" arity="4" clause_i="3" since="OTP @OTP-16749@"/>
+      <name name="sendto" arity="4" clause_i="3" since="OTP 24.0"/>
       <name name="sendto" arity="5" clause_i="1" since="OTP 22.1"/>
-      <name name="sendto" arity="5" clause_i="2" since="OTP @OTP-16749@"/>
+      <name name="sendto" arity="5" clause_i="2" since="OTP 24.0"/>
       <fsummary>Send data on a socket, but do not wait.</fsummary>
       <desc>
         <p>
@@ -2883,12 +2883,12 @@
     </func>
 
     <func>
-      <name name="sendto" arity="3" clause_i="2" since="OTP @OTP-16749@"
+      <name name="sendto" arity="3" clause_i="2" since="OTP 24.0"
 	    anchor="sendto-cont"/>
-      <name name="sendto" arity="4" clause_i="8" since="OTP @OTP-16749@"/>
-      <name name="sendto" arity="4" clause_i="9" since="OTP @OTP-16749@"/>
-      <name name="sendto" arity="4" clause_i="6" since="OTP @OTP-16749@"/>
-      <name name="sendto" arity="4" clause_i="7" since="OTP @OTP-16749@"/>
+      <name name="sendto" arity="4" clause_i="8" since="OTP 24.0"/>
+      <name name="sendto" arity="4" clause_i="9" since="OTP 24.0"/>
+      <name name="sendto" arity="4" clause_i="6" since="OTP 24.0"/>
+      <name name="sendto" arity="4" clause_i="7" since="OTP 24.0"/>
       <fsummary>Send data on a socket, continuation.</fsummary>
       <desc>
         <p>
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 1d6208d68d..73765455dd 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -154,6 +154,6 @@
          {shell_docs_ansi,auto}
         ]},
   {mod, {kernel, []}},
-  {runtime_dependencies, ["erts-@OTP-16718@", "stdlib-3.13", "sasl-3.0", "crypto-5.0"]}
+  {runtime_dependencies, ["erts-12.0", "stdlib-3.13", "sasl-3.0", "crypto-5.0"]}
  ]
 }.
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 796bec68b3..9508a46f14 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -19,28 +19,16 @@
 %%
 %% We allow upgrade from, and downgrade to all previous
 %% versions from the following OTP releases:
-%% - OTP 21
 %% - OTP 22
 %% - OTP 23
+%% - OTP 24
 %%
 %% We also allow upgrade from, and downgrade to all
 %% versions that have branched off from the above
 %% stated previous versions.
 %%
 {"%VSN%",
- [{<<"^6\\.0$">>,[restart_new_emulator]},
-  {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.1$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.2$">>,[restart_new_emulator]},
-  {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.3$">>,[restart_new_emulator]},
-  {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.4$">>,[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\\.5$">>,[restart_new_emulator]},
@@ -53,20 +41,10 @@
   {<<"^7\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^7\\.2$">>,[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]},
-  {<<"^6\\.1$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.2$">>,[restart_new_emulator]},
-  {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.3$">>,[restart_new_emulator]},
-  {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.4$">>,[restart_new_emulator]},
+  {<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^7\\.3$">>,[restart_new_emulator]},
+  {<<"^7\\.3\\.0(?:\\.[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\\.5$">>,[restart_new_emulator]},
@@ -79,4 +57,6 @@
   {<<"^7\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^7\\.2$">>,[restart_new_emulator]},
   {<<"^7\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+  {<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^7\\.3$">>,[restart_new_emulator]},
+  {<<"^7\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index c04299ae88..0a81e9f79d 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 7.3
+KERNEL_VSN = 8.0
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 7ea065ff72..2fca226214 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -37,7 +37,31 @@
   section is the version number of Megaco.</p>
 
 
-  <section><title>Megaco 3.19.5</title>
+  <section><title>Megaco 4.0</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    All the pre-v3 codec(s) (prev3a, prev3b and prev3c) was
+	    deprecated in OTP-23.0. They have now been removed.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16560</p>
+        </item>
+        <item>
+          <p>
+	    Removed deprecated functions marked for removal.</p>
+          <p>
+	    Own Id: OTP-17049</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Megaco 3.19.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index f416a0324a..691dcb971b 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.19.5
+MEGACO_VSN  = 4.0
 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 ba61efa7e9..7dfbc2dde8 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,22 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.19</title>
+  <section><title>Mnesia 4.19.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Suppression of deprecation warnings has been added to
+	    the source files of the Mnesia application.</p>
+          <p>
+	    Own Id: OTP-17217</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.19</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index a5832068a1..2683c3f8af 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.19
+MNESIA_VSN = 4.19.1
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 5e752dda1f..29227f7965 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 2.9.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Updated gui parts to work with the new wx version.</p>
+          <p>
+	    Own Id: OTP-17214</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 2.9.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index b69de6c454..4c6e483411 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.9.5
+OBSERVER_VSN = 2.9.6
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index b219f79b87..2b76cdd66a 100644
--- a/lib/odbc/doc/src/notes.xml
+++ b/lib/odbc/doc/src/notes.xml
@@ -32,7 +32,22 @@
   <p>This document describes the changes made to the odbc application.
   </p>
 
-  <section><title>ODBC 2.13.3</title>
+  <section><title>ODBC 2.13.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix compiler warnings produced by the clang compiler.</p>
+          <p>
+	    Own Id: OTP-17105 Aux Id: PR-2872 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ODBC 2.13.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index 717da2b77c..84af3fade0 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.13.3
+ODBC_VSN = 2.13.4
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index e4d544cca4..d98768c18a 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -31,6 +31,32 @@
   </header>
   <p>This document describes the changes made to the OS_Mon application.</p>
 
+<section><title>Os_Mon 2.7</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The temporarily introduced configuration parameter
+	    <c>memsup_improved_system_memory_data</c> has been
+	    removed.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16943 Aux Id: OTP-16906 </p>
+        </item>
+        <item>
+          <p>
+	    Fix <c>disk_sup</c> to also search the system PATH on
+	    linux when looking for the <c>df</c> program.</p>
+          <p>
+	    Own Id: OTP-16944 Aux Id: PR-2787 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Os_Mon 2.6.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index b71478e75b..fbd682afc5 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.6.1
+OS_MON_VSN = 2.7
diff --git a/lib/parsetools/doc/src/notes.xml b/lib/parsetools/doc/src/notes.xml
index 3975c55c6c..ee02e4b0e6 100644
--- a/lib/parsetools/doc/src/notes.xml
+++ b/lib/parsetools/doc/src/notes.xml
@@ -31,6 +31,29 @@
   </header>
   <p>This document describes the changes made to the Parsetools application.</p>
 
+<section><title>Parsetools 2.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add types and specifications for documentation.</p>
+          <p>
+	    Own Id: OTP-16957</p>
+        </item>
+        <item>
+          <p>
+	    Let Leex and Yecc recognize the environment variable
+	    ERL_COMPILER_OPTIONS. Add Yecc option <c>{error_location,
+	    column | line}</c>.</p>
+          <p>
+	    Own Id: OTP-17023</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Parsetools 2.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/parsetools/vsn.mk b/lib/parsetools/vsn.mk
index c18fcbe762..5853e6bf4f 100644
--- a/lib/parsetools/vsn.mk
+++ b/lib/parsetools/vsn.mk
@@ -1 +1 @@
-PARSETOOLS_VSN = 2.2
+PARSETOOLS_VSN = 2.3
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index ee00b6086d..defbe730c3 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -38,7 +38,23 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Reltool.</p>
 
-  <section><title>Reltool 0.8</title>
+  <section><title>Reltool 0.9</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Recognize new key 'optional_applications' in application
+	    resource files.</p>
+          <p>
+	    Own Id: OTP-17189 Aux Id: PR-2675 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Reltool 0.8</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/reltool/vsn.mk b/lib/reltool/vsn.mk
index c5aacfba38..1bee6b4581 100644
--- a/lib/reltool/vsn.mk
+++ b/lib/reltool/vsn.mk
@@ -1 +1 @@
-RELTOOL_VSN = 0.8
+RELTOOL_VSN = 0.9
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index 6303397f57..2f78ffdedf 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -32,6 +32,24 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
+<section><title>Runtime_Tools 1.16.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The experimental HiPE application has been removed,
+	    together with all related functionality in other
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16963</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Runtime_Tools 1.16</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index e62d59acf6..f51f6b523b 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.16
+RUNTIME_TOOLS_VSN = 1.16.1
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index 46e6762b90..4dcb95dfb8 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.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The experimental HiPE application has been removed,
+	    together with all related functionality in other
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16963</p>
+        </item>
+        <item>
+          <p>
+	    Recognize new key 'optional_applications' in application
+	    resource files.</p>
+          <p>
+	    Own Id: OTP-17189 Aux Id: PR-2675 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SASL 4.0.2</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 4fff8f79ab..863ed16dc5 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -19,36 +19,28 @@
 %%
 %% We allow upgrade from, and downgrade to all previous
 %% versions from the following OTP releases:
-%% - OTP 21
 %% - OTP 22
 %% - OTP 23
+%% - OTP 24
 %%
 %% We also allow upgrade from, and downgrade to all
 %% versions that have branched off from the above
 %% stated previous versions.
 %%
 {"%VSN%",
- [{<<"^3\\.2$">>,[restart_new_emulator]},
-  {<<"^3\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.3$">>,[restart_new_emulator]},
-  {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.4$">>,[restart_new_emulator]},
+ [{<<"^3\\.4$">>,[restart_new_emulator]},
   {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^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\\.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]},
-  {<<"^3\\.3$">>,[restart_new_emulator]},
-  {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.4$">>,[restart_new_emulator]},
+  {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+ [{<<"^3\\.4$">>,[restart_new_emulator]},
   {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^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\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+  {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index a61b72d6f6..4b224b7215 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 4.0.2
+SASL_VSN = 4.1
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index f8caf6228b..1104beecee 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,22 @@
   </header>
 
 
-  <section><title>SNMP 5.8</title>
+  <section><title>SNMP 5.8.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Removed deprecated functions marked for removal.</p>
+          <p>
+	    Own Id: OTP-17049</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.8</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 102de54127..a56e1b9574 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.8
+SNMP_VSN    = 5.8.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 4a9fc3b19d..76d628bdaa 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,68 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.12</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Missing runtime dependencies has been added to this
+	    application.</p>
+          <p>
+	    Own Id: OTP-17243 Aux Id: PR-4557 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Removed usage of <c>erlang:is_port/1</c> from the SSH
+	    implementation.</p>
+          <p>
+	    Own Id: OTP-16750</p>
+        </item>
+        <item>
+          <p>
+	    Internal connection setup refactoring.</p>
+          <p>
+	    Own Id: OTP-17051</p>
+        </item>
+        <item>
+          <p>
+	    Refactor SSH fsm into a (hopefully) more comprehensible
+	    set of gen_statem callback-files.</p>
+          <p>
+	    Own Id: OTP-17140</p>
+        </item>
+        <item>
+          <p>
+	    The RSA SHA1 sign/verify variants are disabled by
+	    default. That is, ssh-rsa is disabled by default as well
+	    as the SHA1 sign/verify with RSA keys from id_rsa and
+	    ssh_host_rsa_key. All SHA2 sign/verify are enabled by
+	    default.</p>
+          <p>
+	    The reason is that SHA1 is now considered easy to break.</p>
+          <p>
+	    To enable RSA with SHA1, for example for a very old and
+	    unsafe peer, see <seeguide
+	    marker="configure_algos#example-9">Example 9</seeguide>
+	    in the User's Guide chapter <seeguide
+	    marker="configure_algos">Configuring algorithms in
+	    SSH</seeguide>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-17259 Aux Id: OTP-16511, ERIERL-619 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.11</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index dff8da55c7..e8edad182e 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.11
+SSH_VSN = 4.12
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 19ad5bdbac..a9ba8dd9c4 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,51 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 10.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Missing runtime dependencies has been added to this
+	    application.</p>
+          <p>
+	    Own Id: OTP-17243 Aux Id: PR-4557 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Removed ssl:ssl_accept/1,2,3 and ssl:cipher:suites/0,1
+	    use ssl:handshake/1,2,3 and ssl:cipher_suites/2,3
+	    instead.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16974</p>
+        </item>
+        <item>
+          <p>
+	    Make TLS handshakes in Erlang distribution concurrent.</p>
+          <p>
+	    Own Id: OTP-17044 Aux Id: PR-2654 </p>
+        </item>
+        <item>
+          <p>
+	    Randomize internal <c>{active,n}</c> optimization when
+	    running Erlang distribution over TLS to spread RAM/CPU
+	    spike that may occur when starting up a big cluster.</p>
+          <p>
+	    Own Id: OTP-17117 Aux Id: PR-2933 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 10.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index ecb5111403..4f8f8bf248 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.3
+SSL_VSN = 10.4
diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml
index d6118b937a..bdd1000dde 100644
--- a/lib/stdlib/doc/src/binary.xml
+++ b/lib/stdlib/doc/src/binary.xml
@@ -243,7 +243,7 @@
     </func>
 
     <func>
-      <name name="encode_hex" arity="1" since="OTP @OTP-17236@"/>
+      <name name="encode_hex" arity="1" since="OTP 24.0"/>
       <fsummary>Encodes a binary into a hex encoded binary.</fsummary>
       <desc>
       <p>Encodes a binary into a hex encoded binary.</p>
@@ -257,7 +257,7 @@
     </func>
 
     <func>
-      <name name="decode_hex" arity="1" since="OTP @OTP-17236@"/>
+      <name name="decode_hex" arity="1" since="OTP 24.0"/>
       <fsummary>Decodes a hex encoded binary into a binary.</fsummary>
       <desc>
       <p>Decodes a hex encoded binary into a binary.</p>
diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml
index 74ae2674ee..aaff07f0b1 100644
--- a/lib/stdlib/doc/src/gen_event.xml
+++ b/lib/stdlib/doc/src/gen_event.xml
@@ -394,7 +394,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name since="OTP @OTP-16718@">receive_response(RequestId, Timeout) -> Result</name>
+      <name since="OTP 24.0">receive_response(RequestId, Timeout) -> Result</name>
       <fsummary>Receive for a reply from a server.</fsummary>
       <type>
 	<v>RequestId = request_id()</v>
diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml
index 226fcdaf60..645d612fce 100644
--- a/lib/stdlib/doc/src/gen_server.xml
+++ b/lib/stdlib/doc/src/gen_server.xml
@@ -354,7 +354,7 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name since="OTP @OTP-16718@">receive_response(RequestId, Timeout) -> Result</name>
+      <name since="OTP 24.0">receive_response(RequestId, Timeout) -> Result</name>
       <fsummary>Receive for a reply from a server.</fsummary>
       <type>
 	<v>RequestId = term()</v>
diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index 167d7052f2..1fcc104013 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -1844,8 +1844,8 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name name="receive_response" arity="1" since="OTP @OTP-16718@"/>
-      <name name="receive_response" arity="2" since="OTP @OTP-16718@"/>
+      <name name="receive_response" arity="1" since="OTP 24.0"/>
+      <name name="receive_response" arity="2" since="OTP 24.0"/>
       <fsummary>Receive for a reply from a server.</fsummary>
       <desc>
 	<p>
diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml
index d90d566c14..a6df0fcce9 100644
--- a/lib/stdlib/doc/src/maps.xml
+++ b/lib/stdlib/doc/src/maps.xml
@@ -143,7 +143,7 @@
     </func>
 
     <func>
-      <name name="foreach" arity="2" since="OTP @OTP-17179@"/>
+      <name name="foreach" arity="2" since="OTP 24.0"/>
       <fsummary>Apply a function to each element of a map.</fsummary>
       <desc>
         <p>Calls <c>fun F(Key, Value)</c> for every <c><anno>Key</anno></c>
@@ -228,7 +228,7 @@ val1
     </func>
 
     <func>
-      <name name="intersect" arity="2" since="OTP @OTP-16936@"/>
+      <name name="intersect" arity="2" since="OTP 24.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Intersects two maps into a single map
@@ -248,7 +248,7 @@ val1
     </func>
 
     <func>
-      <name name="intersect_with" arity="3" since="OTP @OTP-16936@"/>
+      <name name="intersect_with" arity="3" since="OTP 24.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Intersects two maps into a single map
@@ -379,7 +379,7 @@ none</code>
     </func>
 
     <func>
-      <name name="merge_with" arity="3" since="OTP @OTP-16936@"/>
+      <name name="merge_with" arity="3" since="OTP 24.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Merges two maps into a single map
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 9c60fb860f..9a2d6ce0c0 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,404 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 3.15</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Time-outs in <c>gen_statem</c> with relative time
+	    <c>0</c> did not behave quite according to the intended
+	    model. This has now been corrected.</p> <p>The correction
+	    introduces a small potential incompatibility e.g when
+	    combining a state time-out with inserted events, and the
+	    inserted event does a state change in the state with the
+	    time-out. Before this correction the state time-out could
+	    be delivered even after the second state change, but now
+	    it is guaranteed that a state time-out is only delivered
+	    in the state it was started for, even in this corner
+	    case.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15107 Aux Id: ERL-1381, PR-2813 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bugs in <c>erl_eval</c> concerning bitstring
+	    comprehensions.</p>
+          <p>
+	    Own Id: OTP-16865</p>
+        </item>
+        <item>
+	    <p>File names that start with a dot (such as
+	    "<c>.gitignore</c>" are now treated as file names and not
+	    extensions by <c>filename:extension/1</c> and
+	    <c>filename:rootname/1</c>.</p>
+          <p>
+	    Own Id: OTP-16905</p>
+        </item>
+        <item>
+	    <p>Fixed a bug where <c>beam_lib:chunks/3</c> with the
+	    <c>allow_missing_chunks</c> option would crash if a named
+	    chunk was missing.</p>
+          <p>
+	    Own Id: OTP-16950 Aux Id: ERL-1378 </p>
+        </item>
+        <item>
+          <p>
+	    A floating point zero (0.0) can be both positive (+0.0)
+	    and negative (-0.0). Multiple bugs in the compiler,
+	    runtime system, and STDLIB have been fixed to ensure that
+	    the minus sign on 0.0 is not lost.</p>
+          <p>
+	    Own Id: OTP-17077 Aux Id: ERL-1431, PR-2903, PR-2905,
+	    PR-2906 </p>
+        </item>
+        <item>
+	    <p>Eliminated a Dialyzer crashed when the <c>-MMD</c>
+	    option is used to generate a dependency file and a BEAM
+	    file a the same time.</p>
+          <p>
+	    Own Id: OTP-17118 Aux Id: PR-2825 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in <seeerl
+	    marker="stdlib:shell_docs"><c>shell_docs</c></seeerl> and
+	    <c>erl_docgen</c> that interpreted <c>em</c> tags as
+	    <c>strong</c>.</p>
+          <p>
+	    Own Id: OTP-17122</p>
+        </item>
+        <item>
+	    <p>On Solaris, the <c>math:acos/1</c> and
+	    <c>math:asin/1</c> functions would not fail for arguments
+	    outside the valid domain.</p>
+          <p>
+	    Own Id: OTP-17133</p>
+        </item>
+        <item>
+	    <p>Documented a deficiency in the <c>re</c> module
+	    regarding the <c>[:ascii:]</c> character class matching
+	    Latin-1 characters.</p>
+          <p>
+	    Own Id: OTP-17222 Aux Id: GH-4544 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>In the <c>rand</c> module it is now possible to seed
+	    the default algorithm using an algorithm alias:
+	    <c>default</c>. </p> <p> Generating pseudo random
+	    binaries has been implemented with <c>rand:bytes/1</c>
+	    and <c>rand:bytes_s/2</c>. </p>
+          <p>
+	    Own Id: OTP-14646 Aux Id: PR-2920 </p>
+        </item>
+        <item>
+          <p>
+	    New functions have been added to the <c>proplists</c>
+	    module: <c>to_map/1,2</c> and <c>from_map/1</c>.</p>
+          <p>
+	    Own Id: OTP-14647 Aux Id: PR-2910 </p>
+        </item>
+        <item>
+          <p>
+	    New functions have been added to the <c>queue</c> module:
+	    <c>all/2</c>, <c>any/2</c>, <c>delete/2</c>,
+	    <c>delete_r/2</c>, <c>delete_with/2</c>, and
+	    <c>delete_with_r/2</c>.</p>
+          <p>
+	    Own Id: OTP-14650 Aux Id: PR-2850 </p>
+        </item>
+        <item>
+          <p>
+	    New function have been added to the <c>queue</c> module:
+	    <c>fold/2</c> and <c>filtermap/2</c>.</p>
+          <p>
+	    Own Id: OTP-14793 Aux Id: PR-2791 </p>
+        </item>
+        <item>
+          <p>
+	    Support for handling abstract code created before OTP R15
+	    has been dropped.</p>
+          <p>
+	    Own Id: OTP-16678 Aux Id: PR-2627 </p>
+        </item>
+        <item>
+          <p>
+	    Extended error information for failing BIF calls as
+	    proposed in <url
+	    href="https://github.com/erlang/eep/blob/master/eeps/eep-0054.md">EEP
+	    54</url> has been implemented.</p>
+          <p>
+	    When a BIF call from the Erlang shell fails, more
+	    information about which argument or arguments that were
+	    in error will be printed. The same extended error
+	    information will by <c>proc_lib</c>, <c>common_test</c>,
+	    and <c>qlc</c> when BIF calls fail.</p>
+          <p>
+	    For applications that wish to provide the same extended
+	    error information, there are new functions
+	    <c>erl_error:format_exception/3</c> and
+	    <c>erl_error:format_exception/4</c>.</p>
+          <p>
+	    There is a new <c>error/3</c> BIF that allows
+	    applications or libraries to provide extended error
+	    information in the same way for their own exceptions.</p>
+          <p>
+	    Own Id: OTP-16686</p>
+        </item>
+        <item>
+          <p>
+	    Process aliases as outlined by <url
+	    href="https://github.com/erlang/eep/blob/master/eeps/eep-0053.md">EEP
+	    53</url> has been introduced. Process aliases is
+	    introduced in order to provide a lightweight mechanism
+	    that can prevent late replies after timeout or connection
+	    loss. For more information, see EEP 53 and the
+	    documentation of the new <seemfa
+	    marker="erts:erlang#alias/1"><c>alias/1</c></seemfa> BIF
+	    and the new options to the <seemfa
+	    marker="erts:erlang#monitor/3"><c>monitor/3</c></seemfa>
+	    BIF.</p>
+          <p>
+	    The <c>call</c> operation in the framework used by
+	    <c>gen_server</c>, <c>gen_statem</c>, and
+	    <c>gen_event</c> has been updated to utilize alias in
+	    order to prevent late responses. The <c>gen_statem</c>
+	    behavior still use a proxy process in the distributed
+	    case, since it has always prevented late replies and
+	    aliases wont work against pre OTP 24 nodes. The proxy
+	    process can be removed in OTP 26.</p>
+          <p>
+	    The alias feature also made it possible to introduce new
+	    functions similar to the <seemfa
+	    marker="kernel:erpc#receive_response/2"><c>erpc:receive_response()</c></seemfa>
+	    function in the gen behaviors, so the new functions
+	    <seemfa
+	    marker="stdlib:gen_server#receive_response/2"><c>gen_server:receive_response()</c></seemfa>,
+	    <seemfa
+	    marker="stdlib:gen_statem#receive_response/2"><c>gen_statem:receive_response()</c></seemfa>,
+	    <seemfa
+	    marker="stdlib:gen_event#receive_response/2"><c>gen_event:receive_response()</c></seemfa>
+	    have also been introduced.</p>
+          <p>
+	    Own Id: OTP-16718 Aux Id: PR-2735 </p>
+        </item>
+        <item>
+          <p>
+	    Improved documentation about exit signals emitted when a
+	    <c>gen_server</c> terminates.</p>
+          <p>
+	    Own Id: OTP-16910 Aux Id: PR-2771 </p>
+        </item>
+        <item>
+          <p>
+	    New functions have been added to the <c>maps</c> module:
+	    <c>merge_with/3</c>, <c>intersect/2</c>,
+	    <c>intersect_with/3</c>, <c>filtermap/2</c>,
+	    <c>from_keys/2</c>, and <c>maps:foreach/2</c>.</p>
+          <p>
+	    <c>maps:merge_with/3</c> is the same as <c>merge/2</c>
+	    but takes an extra fun that is used to combine items with
+	    the same key.</p>
+          <p>
+	    <c>maps:intersect/2</c> computes the intersection of two
+	    maps.</p>
+          <p>
+	    <c>maps:intersect_with/3</c> is the same as
+	    <c>intersect/2</c> but takes an extra fun that is used to
+	    combine intersecting items.</p>
+          <p>
+	    <c>maps:filtermap/2</c> allows filtering and mapping of a
+	    map in a single pass.</p>
+          <p>
+	    <c>maps:from_keys/2</c> constructs a map from a list of
+	    keys and a single value and can be used to to optimize
+	    sets operations such as from_list/1, filter/2,
+	    intersection/2, and subtract/2.</p>
+          <p>
+	    <c>maps:foreach/2</c> allows iteration over a map without
+	    returning any value.</p>
+          <p>
+	    Own Id: OTP-16936 Aux Id: ERL-1367 </p>
+        </item>
+        <item>
+	    <p>The experimental HiPE application has been removed,
+	    together with all related functionality in other
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16963</p>
+        </item>
+        <item>
+          <p>
+	    The <c>filename:src/1</c> function which was deprecated
+	    in OTP 20 has been removed. Use
+	    <c>filelib:find_source/1,3</c> instead.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16971</p>
+        </item>
+        <item>
+          <p>
+	    The pretty printer for floating point number have been
+	    changed to make it easier to see if the integer part of
+	    the number has been rounded. After the change the digit
+	    that may have been rounded always appears last or just
+	    before the exponent character (e or E). This is
+	    accomplished by always printing the number using
+	    scientific notation if it is so large that the integer
+	    part could be rounded.</p>
+          <p>
+	    Own Id: OTP-16980 Aux Id: ERL-1308 </p>
+        </item>
+        <item>
+          <p>
+	    Accept references up to a size of 160-bits from remote
+	    nodes. This is the first step in an upgrade path toward
+	    using references up to 160-bits in a future OTP release.</p>
+          <p>
+	    Own Id: OTP-17005 Aux Id: OTP-16718 </p>
+        </item>
+        <item>
+          <p>
+	    Add option <c>location</c> to
+	    <c>erl_parse:abstract/2</c>.</p>
+          <p>
+	    Own Id: OTP-17024</p>
+        </item>
+        <item>
+          <p>
+	    All long running functions in the maps API are now
+	    yielding. In previous releases the functions
+	    <c>maps:from_list/1</c>, <c>maps:keys/1</c> and
+	    <c>maps:values/1</c> did not yield. This could cause
+	    unfair scheduling of processes.</p>
+          <p>
+	    Own Id: OTP-17057</p>
+        </item>
+        <item>
+	    <p>The <c>sets</c> module now has an optional map-based
+	    implementation, as described in <c>EEP 50</c>.</p>
+	    <p>To use this implementation, pass the
+	    <c>{version,2}</c> option to <c>sets:new/1</c> or
+	    <c>sets:from_list/2</c>.</p>
+          <p>
+	    Own Id: OTP-17059 Aux Id: PR-2864 </p>
+        </item>
+        <item>
+          <p>
+	    Added <seemfa
+	    marker="shell_docs#supported_tags/0"><c>shell_docs:supported_tags/0</c></seemfa>.
+	    This function can be used to retrieve the tags currently
+	    supported by <c>shell_docs</c>.</p>
+          <p>
+	    Own Id: OTP-17120</p>
+        </item>
+        <item>
+          <p>
+	    The <c>application/erlang+html</c> documentation storage
+	    format used by <seeerl
+	    marker="shell_docs"><c>shell_docs</c></seeerl> has been
+	    updated to include the tags <c>b</c>, <c>strong</c>,
+	    <c>h4</c>, <c>h5</c> and <c>h6</c>.</p>
+          <p>
+	    Own Id: OTP-17121</p>
+        </item>
+        <item>
+          <p>
+	    Improved explanation of <c>{continue,Continue}</c> in
+	    <c>Module:init/1</c> of the <c>gen_server</c>
+	    documentation.</p>
+          <p>
+	    Own Id: OTP-17171 Aux Id: PR-3011 </p>
+        </item>
+        <item>
+	    <p>The <c>erl_eval</c> module now accepts a map for
+	    keeping track of bindings. Using an <c>orddict</c> for
+	    bindings will still work.</p>
+          <p>
+	    Own Id: OTP-17175</p>
+        </item>
+        <item>
+	    <p>Documented <c>epp:scan_erl_form/1</c> and added
+	    <c>epp:scan_file/2</c>.</p>
+          <p>
+	    Own Id: OTP-17199 Aux Id: PR-2658 </p>
+        </item>
+        <item>
+          <p>
+	    The standard floating point printing algorithm used by
+	    the <c>io</c> and <c>io_lib</c> modules has been changed
+	    from the algorithm described in [1] to the Ryu algorithm
+	    [2]. This gives a significant speed improvement for the
+	    printing of most floating point numbers and a small
+	    memory consumption improvement.</p>
+          <p>
+	    [1]: Robert G. Burger and R. Kent Dybvig. 1996. Printing
+	    floating-point numbers quickly and accurately. In
+	    Proceedings of the ACM SIGPLAN 1996 conference on
+	    Programming language design and implementation (PLDI
+	    '96). Association for Computing Machinery, New York, NY,
+	    USA, 108–116. DOI:https://doi.org/10.1145/231379.231397</p>
+          <p>
+	    [2]: Ulf Adams. 2018. Ryū: fast float-to-string
+	    conversion. In Proceedings of the 39th ACM SIGPLAN
+	    Conference on Programming Language Design and
+	    Implementation (PLDI 2018). Association for Computing
+	    Machinery, New York, NY, USA, 270–282.
+	    DOI:https://doi.org/10.1145/3192366.3192369</p>
+          <p>
+	    Thanks to Thomas Depierre</p>
+          <p>
+	    Own Id: OTP-17210</p>
+        </item>
+        <item>
+          <p>
+	    Add hex encoding and decoding functions in the binary
+	    module.</p>
+          <p>
+	    Own Id: OTP-17236 Aux Id: PR-3014 </p>
+        </item>
+        <item>
+	    <p>The undocumented and partially broken
+	    <c>ets:filter/3</c> function has been removed.</p>
+          <p>
+	    Own Id: OTP-17263</p>
+        </item>
+        <item>
+          <p>
+	    Add support in <seeerl
+	    marker="shell_docs"><c>shell_docs</c></seeerl> to display
+	    any <c>"text"</c> documentation format. This means that
+	    <c>h(Module)</c> in the shell now can display the
+	    <c>"text/markdown"</c> of Elixir documentation.</p>
+          <p>
+	    Own Id: OTP-17267</p>
+        </item>
+        <item>
+          <p>
+	    The internal hashing of keys within ETS tables of types
+	    <c>set</c>, <c>bag</c>, <c>duplicate_bag</c> has been
+	    salted to diverge from <c>erlang:phash2</c>. This to
+	    avoid bad hashing if <c>phash2</c> is used to distribute
+	    the keys over separate tables/nodes.</p>
+          <p>
+	    Own Id: OTP-17276 Aux Id: PR-2979 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.14.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/doc/src/rand.xml b/lib/stdlib/doc/src/rand.xml
index bae50d2582..3e811d2d4e 100644
--- a/lib/stdlib/doc/src/rand.xml
+++ b/lib/stdlib/doc/src/rand.xml
@@ -380,7 +380,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
 
   <funcs>
     <func>
-      <name name="bytes" arity="1" since="OTP @OTP-14646@"/>
+      <name name="bytes" arity="1" since="OTP 24.0"/>
       <fsummary>Return a random binary.</fsummary>
       <desc><marker id="bytes-1"/>
       <p>
@@ -394,7 +394,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="bytes_s" arity="2" since="OTP @OTP-14646@"/>
+      <name name="bytes_s" arity="2" since="OTP 24.0"/>
       <fsummary>Return a random binary.</fsummary>
       <desc><marker id="bytes-1"/>
       <p>
@@ -493,7 +493,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
 
     <func>
       <name name="seed" arity="1" clause_i="1" since="OTP 18.0"/>
-      <name name="seed" arity="1" clause_i="2" since="OTP @OTP-14646@"/>
+      <name name="seed" arity="1" clause_i="2" since="OTP 24.0"/>
       <fsummary>Seed random number generator.</fsummary>
       <desc>
         <marker id="seed-1"/>
@@ -515,7 +515,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
 
     <func>
       <name name="seed" arity="2" clause_i="1" since="OTP 18.0"/>
-      <name name="seed" arity="2" clause_i="2" since="OTP @OTP-14646@"/>
+      <name name="seed" arity="2" clause_i="2" since="OTP 24.0"/>
       <fsummary>Seed the random number generation.</fsummary>
       <desc>
         <p>
@@ -532,7 +532,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
 
     <func>
       <name name="seed_s" arity="1" clause_i="1" since="OTP 18.0"/>
-      <name name="seed_s" arity="1" clause_i="2" since="OTP @OTP-14646@"/>
+      <name name="seed_s" arity="1" clause_i="2" since="OTP 24.0"/>
       <fsummary>Seed random number generator.</fsummary>
       <desc>
         <p>
@@ -553,7 +553,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
 
     <func>
       <name name="seed_s" arity="2" clause_i="1" since="OTP 18.0"/>
-      <name name="seed_s" arity="2" clause_i="2" since="OTP @OTP-14646@"/>
+      <name name="seed_s" arity="2" clause_i="2" since="OTP 24.0"/>
       <fsummary>Seed the random number generation.</fsummary>
       <desc>
         <p>
diff --git a/lib/stdlib/doc/src/shell_docs.xml b/lib/stdlib/doc/src/shell_docs.xml
index ed250f7b03..0b64c01d72 100644
--- a/lib/stdlib/doc/src/shell_docs.xml
+++ b/lib/stdlib/doc/src/shell_docs.xml
@@ -182,7 +182,7 @@ Since:
     </func>
 
     <func>
-      <name name="supported_tags" arity="0" since="OTP @OTP-17120@"/>
+      <name name="supported_tags" arity="0" since="OTP 24.0"/>
       <fsummary>Which tags are supported</fsummary>
       <desc>
         <p>This function can be used to find out which tags are
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index a906349463..f03aab50b6 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -111,6 +111,6 @@
                dets]},
   {applications, [kernel]},
   {env, []},
-  {runtime_dependencies, ["sasl-3.0","kernel-7.0","erts-@OTP-16718@","crypto-3.3",
+  {runtime_dependencies, ["sasl-3.0","kernel-7.0","erts-12.0","crypto-3.3",
 			  "compiler-5.0"]}
 ]}.
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index bba0d1ceee..64bce598d1 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -19,9 +19,9 @@
 %%
 %% We allow upgrade from, and downgrade to all previous
 %% versions from the following OTP releases:
-%% - OTP 21
 %% - OTP 22
 %% - OTP 23
+%% - OTP 24
 %%
 %% We also allow upgrade from, and downgrade to all
 %% versions that have branched off from the above
@@ -43,18 +43,7 @@
   {<<"^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]},
-  {<<"^3\\.6$">>,[restart_new_emulator]},
-  {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.7$">>,[restart_new_emulator]},
-  {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.8$">>,[restart_new_emulator]},
-  {<<"^3\\.8\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.8\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.8\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.14\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.9$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -74,18 +63,7 @@
   {<<"^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]},
-  {<<"^3\\.6$">>,[restart_new_emulator]},
-  {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.7$">>,[restart_new_emulator]},
-  {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.8$">>,[restart_new_emulator]},
-  {<<"^3\\.8\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.8\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.8\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.14\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.9$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index e234b0cd58..67431a45ed 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.14.1
+STDLIB_VSN = 3.15
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index a1f280e594..60129bf02f 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,6 +32,33 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 2.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Support for handling abstract code created before OTP R15
+	    has been dropped.</p>
+          <p>
+	    Own Id: OTP-16678 Aux Id: PR-2627 </p>
+        </item>
+        <item>
+	    <p>The <c>igor</c> and <c>erl_tidy</c> modules have been
+	    the removed and are now maintained by their original
+	    author Richard Carlsson. They can be found at <url
+	    href="https://github.com/richcarl/igor">github.com/richcarl/igor</url>
+	    and <url
+	    href="https://github.com/richcarl/erl_tidy">github.com/richcarl/erl_tidy</url>,
+	    respectively.</p>
+          <p>
+	    Own Id: OTP-17180</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Syntax_Tools 2.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/syntax_tools/vsn.mk b/lib/syntax_tools/vsn.mk
index 7a93e81b94..87a6cb0158 100644
--- a/lib/syntax_tools/vsn.mk
+++ b/lib/syntax_tools/vsn.mk
@@ -1 +1 @@
-SYNTAX_TOOLS_VSN = 2.5
+SYNTAX_TOOLS_VSN = 2.6
diff --git a/lib/tftp/doc/src/notes.xml b/lib/tftp/doc/src/notes.xml
index 0b7aee87e9..7dcc98b150 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.2</title>
+  <section><title>Tftp 1.0.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Missing runtime dependencies has been added to this
+	    application.</p>
+          <p>
+	    Own Id: OTP-17243 Aux Id: PR-4557 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tftp 1.0.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/tftp/vsn.mk b/lib/tftp/vsn.mk
index 689a2fa57c..566108ba59 100644
--- a/lib/tftp/vsn.mk
+++ b/lib/tftp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = tftp
-TFTP_VSN   = 1.0.2
+TFTP_VSN   = 1.0.3
 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 47373ca1fe..20f0f4b913 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -31,6 +31,55 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 3.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>For cover-compiled code, the error behaviour of list
+	    and binary comprehensions that used
+	    <c>andalso</c>/<c>orelse</c> in guards could be changed
+	    so that a filter that was supposed be evaluated in guard
+	    context was evaluated in body context. That is, there was
+	    a possibility that comprehensions that did not raise
+	    exceptions could raise exceptions when being run using
+	    <c>cover</c>.</p>
+          <p>
+	    Own Id: OTP-17221 Aux Id: PR-4547 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Support for handling abstract code created before OTP R15
+	    has been dropped.</p>
+          <p>
+	    Own Id: OTP-16678 Aux Id: PR-2627 </p>
+        </item>
+        <item>
+          <p>
+	    Add types and specifications for documentation.</p>
+          <p>
+	    Own Id: OTP-16957</p>
+        </item>
+        <item>
+	    <p>The experimental HiPE application has been removed,
+	    together with all related functionality in other
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16963</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 3.4.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index 33ff4b4a7c..c6c97df8ef 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 3.4.4
+TOOLS_VSN = 3.5
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 62f333f0c1..25d3f4b39d 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,6 +32,88 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 2.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix compiler warnings produced by the clang compiler.</p>
+          <p>
+	    Own Id: OTP-17105 Aux Id: PR-2872 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The application has been completely rewritten in order
+	    to use wxWidgets version 3 as its base.</p> <p>Add basic
+	    documentation generated from the wxWidgets project.</p>
+          <p>
+	    Own Id: OTP-16800</p>
+        </item>
+        <item>
+	    <p>The experimental HiPE application has been removed,
+	    together with all related functionality in other
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16963</p>
+        </item>
+        <item>
+          <p>
+	    Added support for wxWebView.</p>
+          <p>
+	    Own Id: OTP-17213 Aux Id: PR-3027 </p>
+        </item>
+        <item>
+	    <p>Due to the support of the new backend versions some
+	    API incompatibilities have been introduced. Examples of
+	    changes are:<br/> <br/> wxWindowDC default creators have
+	    been removed <br/> wxClientDC default creators have been
+	    removed <br/> wxPaintDC default creators have been
+	    removed <br/> wxWindow:setVirtualSizeHints() has been
+	    deprecated in wxWidgets and removed <br/>
+	    wxWindow:makeModal() has been deprecated in wxWidgets and
+	    removed <br/> wxToolBar:add/insertTool without label have
+	    been deprecated in wxWidgets and removed <br/>
+	    wxStyledTextCtrl some functions have changed arguments
+	    from boolean to int <br/> wxSizerItem:new() Some
+	    arguments have become options <br/> Removed deprecated
+	    wxSizerItem:setWindow() use assignWindow() <br/> Removed
+	    deprecated wxSizerItem:setSpacer() use assignSpacer()
+	    <br/> Removed deprecated wxSizerItem:setSpacer() use
+	    assignSpacer() <br/> Removed deprecated
+	    wxSizerItem:setSizer() use assignSizer() <br/> wxMenu
+	    append/insert/prepend have changed return value and lost
+	    IsCheckable argument <br/> wxListCtrl:setItem/4 changed
+	    return value <br/> wxImage:convertToGreyscale() options
+	    have changed <br/> wxGridSizer:wxGridSizer() options have
+	    changed <br/> wxGrid API have many changes <br/>
+	    wxGraphicsRenderer:create*GradientBrush() uses
+	    GradientStops now <br/> wxGraphicsRenderer:createPen()
+	    have been removed <br/>
+	    wxGraphicsRenderer:create*GradientBrush() uses
+	    GradientStops now <br/> wxGLCanvas API is incompatible
+	    <br/> wxFlexGridSizer:wxFlexGridSizer() options have
+	    changed <br/> wxDisplay:new() options have changed <br/>
+	    wxCalendarDateAttr:new(ColText [,OptList]) have been
+	    removed <br/> wxBitmapButton:set/getBitmapSelected() have
+	    been removed </p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-17219 Aux Id: OTP-16800 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 1.9.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index 42776cc17a..708e471420 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.9.3
+WX_VSN = 2.0
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 143111e3d1..04a4f4560d 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The compiler will now emit warnings when (previously
+	    bound) underscore-prefixed variables are matched.</p>
+          <p>
+	    Own Id: OTP-17123</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.26</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 5715f32e4f..9bf3fe20cc 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.26
+XMERL_VSN = 1.4
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index b8220e1a87..5976486e6a 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1 +1,170 @@
-DEVELOPMENT
+OTP-10391
+OTP-13126
+OTP-14485
+OTP-14601
+OTP-14646
+OTP-14647
+OTP-14650
+OTP-14700
+OTP-14793
+OTP-15107
+OTP-15523
+OTP-16226
+OTP-16334
+OTP-16517
+OTP-16560
+OTP-16607
+OTP-16611
+OTP-16653
+OTP-16656
+OTP-16678
+OTP-16686
+OTP-16687
+OTP-16698
+OTP-16703
+OTP-16706
+OTP-16712
+OTP-16718
+OTP-16720
+OTP-16722
+OTP-16723
+OTP-16724
+OTP-16725
+OTP-16749
+OTP-16750
+OTP-16756
+OTP-16788
+OTP-16793
+OTP-16800
+OTP-16809
+OTP-16811
+OTP-16814
+OTP-16822
+OTP-16824
+OTP-16831
+OTP-16865
+OTP-16867
+OTP-16877
+OTP-16878
+OTP-16879
+OTP-16880
+OTP-16881
+OTP-16882
+OTP-16883
+OTP-16884
+OTP-16885
+OTP-16887
+OTP-16898
+OTP-16905
+OTP-16909
+OTP-16910
+OTP-16926
+OTP-16936
+OTP-16940
+OTP-16943
+OTP-16944
+OTP-16945
+OTP-16946
+OTP-16947
+OTP-16949
+OTP-16950
+OTP-16952
+OTP-16957
+OTP-16963
+OTP-16964
+OTP-16968
+OTP-16970
+OTP-16971
+OTP-16974
+OTP-16980
+OTP-16981
+OTP-16986
+OTP-16987
+OTP-16995
+OTP-17001
+OTP-17005
+OTP-17007
+OTP-17014
+OTP-17015
+OTP-17020
+OTP-17023
+OTP-17024
+OTP-17028
+OTP-17044
+OTP-17048
+OTP-17049
+OTP-17051
+OTP-17057
+OTP-17059
+OTP-17062
+OTP-17063
+OTP-17077
+OTP-17078
+OTP-17079
+OTP-17084
+OTP-17087
+OTP-17092
+OTP-17095
+OTP-17103
+OTP-17104
+OTP-17105
+OTP-17106
+OTP-17114
+OTP-17117
+OTP-17118
+OTP-17120
+OTP-17121
+OTP-17122
+OTP-17123
+OTP-17131
+OTP-17133
+OTP-17140
+OTP-17148
+OTP-17153
+OTP-17156
+OTP-17168
+OTP-17170
+OTP-17171
+OTP-17172
+OTP-17175
+OTP-17177
+OTP-17179
+OTP-17180
+OTP-17181
+OTP-17183
+OTP-17189
+OTP-17192
+OTP-17198
+OTP-17199
+OTP-17201
+OTP-17203
+OTP-17206
+OTP-17207
+OTP-17210
+OTP-17213
+OTP-17214
+OTP-17216
+OTP-17217
+OTP-17219
+OTP-17221
+OTP-17222
+OTP-17226
+OTP-17236
+OTP-17243
+OTP-17257
+OTP-17259
+OTP-17260
+OTP-17262
+OTP-17263
+OTP-17266
+OTP-17267
+OTP-17270
+OTP-17272
+OTP-17275
+OTP-17276
+OTP-17277
+OTP-17278
+OTP-17284
+OTP-17286
+OTP-17287
+OTP-17288
author	Erlang/OTP <otp@erlang.org>	2021-03-25 16:27:17 +0100
committer	Erlang/OTP <otp@erlang.org>	2021-03-25 16:27:17 +0100
commit	1cc1d15c4e54c1d9d8c34a4c66193a95b10c479a (patch)
tree	0272fb5bf328310831d06510a03864de5942ee8d
parent	444144870c528d80a3fcf34b3a2d1707115987f2 (diff)
download	erlang-1cc1d15c4e54c1d9d8c34a4c66193a95b10c479a.tar.gz