Merge tag 'OTP-21.2' into sverker/map-from-ks-vs-bug

47 files changed, 1787 insertions, 1511 deletions

diff --git a/lib/sasl/doc/src/Makefile b/lib/sasl/doc/src/Makefile
index a66b1f8bcb..8e1e8b502c 100644
--- a/lib/sasl/doc/src/Makefile
+++ b/lib/sasl/doc/src/Makefile
@@ -9,11 +9,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# 
+#
 # The Initial Developer of the Original Code is Ericsson Utvecklings AB.
 # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 # AB. All Rights Reserved.''
-# 
+#
 #     $Id$
 #
 include $(ERL_TOP)/make/target.mk
@@ -44,17 +44,14 @@ XML_REF4_FILES = appup.xml rel.xml relup.xml script.xml
 
 XML_REF6_FILES = sasl_app.xml
 
-XML_PART_FILES = part.xml part_notes.xml part_notes_history.xml
+XML_PART_FILES = part.xml
 XML_CHAPTER_FILES = sasl_intro.xml \
 	error_logging.xml \
-	notes.xml \
-	notes_history.xml
+	notes.xml
 
 BOOK_FILES = book.xml
 
-GIF_FILES = \
-	note.gif \
-	warning.gif
+GIF_FILES =
 
 XML_FILES = \
 	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
@@ -78,14 +75,14 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
 # ----------------------------------------------------
-# FLAGS 
+# FLAGS
 # ----------------------------------------------------
-XML_FLAGS += 
+XML_FLAGS +=
 
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif		
+$(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
 docs: pdf html man
@@ -100,19 +97,20 @@ man: $(MAN3_FILES) $(MAN4_FILES) $(MAN6_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)	# We depend just to copy them to ../html
 
-debug opt: 
+debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN4DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~ 
+	rm -f errs core *~
 
 # ----------------------------------------------------
 # Release Target
-# ---------------------------------------------------- 
+# ----------------------------------------------------
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
@@ -130,4 +128,3 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6"
 
 release_spec:
-
diff --git a/lib/sasl/doc/src/appup.xml b/lib/sasl/doc/src/appup.xml
index a43a966dcb..102ea9e5d7 100644
--- a/lib/sasl/doc/src/appup.xml
+++ b/lib/sasl/doc/src/appup.xml
@@ -4,7 +4,7 @@
 <fileref>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -249,9 +249,17 @@
     <pre>
 {restart_application, Application}
   Application = atom()</pre>
-    <p>Restarting an application means that the application is
-      stopped and then started again, similar to using the instructions
-      <c>remove_application</c> and <c>add_application</c> in sequence.</p>
+    <p>Restarting an application means that the application is stopped
+    and then started again, similar to using the instructions
+    <c>remove_application</c> and <c>add_application</c> in sequence.
+    Note that, even if the application has been started before the
+    release upgrade is performed, <c>restart_application</c> may only
+    <c>load</c> it rather than <c>start</c> it, depending on the
+    application's <c>start type</c>:
+    If <c>Type = load</c>, the application is only loaded.
+    If <c>Type = none</c>, the application is not loaded and not
+    started, although the code for its modules is loaded.
+    </p>
     </section>
 
     <section>
diff --git a/lib/sasl/doc/src/error_logging.xml b/lib/sasl/doc/src/error_logging.xml
index 4b2c960bbb..e6c244c1b9 100644
--- a/lib/sasl/doc/src/error_logging.xml
+++ b/lib/sasl/doc/src/error_logging.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,22 +32,52 @@
     <rev>B</rev>
     <file>error_logging.xml</file>
     </header>
+  <note>
+    <p>The SASL error logging concept described in this section is
+      deprecated since Erlang/OTP 21.0, when the
+      new <seealso marker="kernel:logger_chapter">logging
+      API</seealso> was introduced.</p>
+    <p>The new default behaviour is that the SASL application no
+      longer affects which log events that are logged.
+      <seealso marker="#supervisor_report">Supervisor
+      reports</seealso> and <seealso marker="#crash_report">crash
+      reports</seealso> are logged via the default logger handler
+      which is setup by
+      Kernel. <seealso marker="#progress_report">Progress
+      reports</seealso> are by default not logged, but can be enabled
+      by setting the primary log level to <c>info</c>, for example by
+      using the Kernel configuration
+      parameter <seealso marker="kernel:kernel_app#logger_level">
+	<c>logger_level</c></seealso>.</p>
+    <p>The old SASL error logging behaviour can be re-enabled by setting the
+      Kernel configuration
+      parameter <seealso marker="kernel:kernel_app#logger_sasl_compatible">
+	<c>logger_sasl_compatible</c></seealso> to <c>true</c>.</p>
+    <p>The mechanism
+      for <seealso marker="#multi_file_logging">multi-file error report
+      logging</seealso> as described in this section is also kept for
+      backwards compatibility. However, the new logging API also
+      introduces <seealso marker="kernel:logger_disk_log_h">
+	<c>logger_disk_log_h(3)</c></seealso>, which is a logger
+      handler that can print to multiple files
+      using <seealso marker="kernel:disk_log"><c>disk_log(3)</c></seealso>.</p>
+  </note>
+
+  <section>
+    <title>SASL reports</title>
   <p>The SASL application introduces three types of reports:</p>
   <list type="bulleted">
     <item>Supervisor report</item>
     <item>Progress report</item>
     <item>Crash report</item>
   </list>
-  <p>When the SASL application is started, it adds a handler that
-    formats and writes these reports, as specified in the configuration
-    parameters for SASL, that is, the environment variables
-    in the SASL application specification, which is found in the
-    <c>.app</c> file of SASL. For details, see the
-    <seealso marker="sasl_app"><c>sasl(6)</c></seealso> application in the
-    Reference Manual and the <seealso marker="kernel:app"><c>app(4)</c></seealso>
-    file in the Kernel Reference Manual.</p>
+  <p>When the SASL application is started, it adds a Logger handler
+    that formats and writes these reports, as specified in
+    the <seealso marker="sasl_app#deprecated_error_logger_config">configuration
+    parameters for SASL</seealso>.</p>
 
   <section>
+    <marker id="supervisor_report"/>
     <title>Supervisor Report</title>
     <p>A supervisor report is issued when a supervised child terminates
       unexpectedly. A supervisor report contains the following
@@ -68,6 +98,7 @@
   </section>
 
   <section>
+    <marker id="progress_report"/>
     <title>Progress Report</title>
     <p>A progress report is issued when a supervisor starts or
       restarts a child. A progress report contains the following items:</p>
@@ -82,6 +113,7 @@
   </section>
 
   <section>
+    <marker id="crash_report"/>
     <title>Crash Report</title>
     <p>Processes started with functions 
       <seealso marker="stdlib:proc_lib#spawn/1"><c>proc_lib:spawn</c></seealso> or
@@ -105,6 +137,7 @@
        crash. The information gathered is the same as the information
        for Crasher, described in the previous item.</p></item>
     </taglist>
+    </section>
 
     <section>
       <title>Example</title>
@@ -163,6 +196,7 @@
   </section>
 
   <section>
+    <marker id="multi_file_logging"/>
     <title>Multi-File Error Report Logging</title>
     <p>Multi-file error report logging is used to store error messages
       received by <c>error_logger</c>. The error messages
@@ -171,7 +205,8 @@
       of files exist at the same time. The logging is very fast, as
       each error message is written as a binary term.</p>
     <p>For more details, see the
-      <seealso marker="sasl_app"><c>sasl(6)</c></seealso>
+      <seealso marker="sasl_app#deprecated_error_logger_config">
+	<c>sasl(6)</c></seealso>
       application in the Reference Manual.</p>
   </section>
 
diff --git a/lib/sasl/doc/src/fascicules.xml b/lib/sasl/doc/src/fascicules.xml
deleted file mode 100644
index 37feca543f..0000000000
--- a/lib/sasl/doc/src/fascicules.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE fascicules SYSTEM "fascicules.dtd">
-
-<fascicules>
-  <fascicule file="part" href="part_frame.html" entry="no">
-    User's Guide
-  </fascicule>
-  <fascicule file="ref_man" href="ref_man_frame.html" entry="yes">
-    Reference Manual
-  </fascicule>
-  <fascicule file="part_notes" href="part_notes_frame.html" entry="no">
-    Release Notes
-  </fascicule>
-  <fascicule file="" href="../../../../doc/print.html" entry="no">
-    Off-Print
-  </fascicule>
-</fascicules>
-
diff --git a/lib/sasl/doc/src/note.gif b/lib/sasl/doc/src/note.gif
deleted file mode 100644
index 6fffe30419..0000000000
--- a/lib/sasl/doc/src/note.gif
+++ /dev/null
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index 055d433524..982c874117 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2016</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,264 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
+<section><title>SASL 3.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    New <c>counters</c> and <c>atomics</c> modules supplies
+	    access to highly efficient operations on mutable fixed
+	    word sized variables.</p>
+          <p>
+	    Own Id: OTP-13468</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SASL 3.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Improved documentation.</p>
+          <p>
+	    Own Id: OTP-15190</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SASL 3.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>A new logging API is added to Erlang/OTP, see the
+	    <seealso
+	    marker="kernel:logger"><c>logger(3)</c></seealso> manual
+	    page, and section <seealso
+	    marker="kernel:logger_chapter">Logging</seealso> in the
+	    Kernel User's Guide.</p>
+	    <p>Calls to <c>error_logger</c> are automatically
+	    redirected to the new API, and legacy error logger event
+	    handlers can still be used. It is, however, recommended
+	    to use the Logger API directly when writing new code.</p>
+	    <p>Notice the following potential incompatibilities:</p>
+	    <list> <item><p>Kernel configuration parameters
+	    <c>error_logger</c> still works, but is overruled if the
+	    default handler's output destination is configured with
+	    Kernel configuration parameter <c>logger</c>.</p> <p>In
+	    general, parameters for configuring error logger are
+	    overwritten by new parameters for configuring
+	    Logger.</p></item> <item><p>The concept of SASL error
+	    logging is deprecated, meaning that by default the SASL
+	    application does not affect which log events are
+	    logged.</p> <p>By default, supervisor reports and crash
+	    reports are logged by the default Logger handler started
+	    by Kernel, and end up at the same destination (terminal
+	    or file) as other standard log event from Erlang/OTP.</p>
+	    <p>Progress reports are not logged by default, but can be
+	    enabled by setting the primary log level to info, for
+	    example with the Kernel configuration parameter
+	    <c>logger_level</c>.</p> <p>To obtain backwards
+	    compatibility with the SASL error logging functionality
+	    from earlier releases, set Kernel configuration parameter
+	    <c>logger_sasl_compatible</c> to <c>true</c>. This
+	    prevents the default Logger handler from logging any
+	    supervisor-, crash-, or progress reports. Instead, SASL
+	    adds a separate Logger handler during application start,
+	    which takes care of these log events. The SASL
+	    configuration parameters <c>sasl_error_logger</c> and
+	    <c>sasl_errlog_type</c> specify the destination (terminal
+	    or file) and severity level to log for these
+	    events.</p></item></list>
+          <p>
+	    Since Logger is new in Erlang/OTP 21.0, we do reserve the
+	    right to introduce changes to the Logger API and
+	    functionality in patches following this release. These
+	    changes might or might not be backwards compatible with
+	    the initial version.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-13295</p>
+        </item>
+        <item>
+          <p>
+	    The old and outdated "Status Inspection" tool (modules
+	    <c>si</c> and <c>si_sasl_sup</c>) is removed.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14469</p>
+        </item>
+        <item>
+          <p>
+	    When creating the release tar file, systools now includes
+	    sys.config.src if it exists in the
+	    $ROOT/releases/&lt;vsn&gt;/ directory. This is to allow
+	    adjustments, e.g. resolving environment variables, after
+	    unpacking the release, but before installing it. This
+	    functionality requires a custom tool which uses
+	    sys.config.src as input and creates a correct sys.config
+	    file.</p>
+          <p>
+	    Own Id: OTP-14950 Aux Id: PR-1560 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SASL 3.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    When upgrading with instruction 'restart_new_emulator',
+	    the generated temporary boot file used 'kernelProcess'
+	    statements from the old release instead of the new
+	    release. This is now corrected.</p>
+          <p>
+	    This correction is needed for upgrade to OTP-21.</p>
+          <p>
+	    Own Id: OTP-15017</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SASL 3.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The Report Browser, rb, could earlier not handle reports
+	    that were not lists, for example generated by
+	    <c>error_logger:info_report({some, tuple})</c>. This term
+	    is allowed as input to error_logger, but rb would state
+	    that "A report on bad form was encountered". This is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-13906 Aux Id: ERL-261 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SASL 3.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    General Unicode improvements.</p>
+          <p>
+	    Own Id: OTP-14462</p>
+        </item>
+        <item>
+          <p>
+	    Files generated by <c>release_handler</c> and
+	    <c>reltool</c>, which might contain Unicode characters,
+	    are now encoded as UTF-8 and written with format "~tp" or
+	    "~ts". If the file is to be read by
+	    <c>file:consult/1</c>, an encoding comment is added.</p>
+          <p>
+	    Own Id: OTP-14463</p>
+        </item>
+        <item>
+          <p>
+	    The SASL error logger event handler,
+	    <c>sasl_report_file_h</c>, will now by default open its
+	    log file with encoding UTF-8. This can be overridden when
+	    configuring SASL, see configuration parameter
+	    <c>sasl_error_logger</c> in the SASL reference manual.</p>
+          <p>
+	    Own Id: OTP-14618</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SASL 3.0.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Documented default values for the 'mod' and
+	    'start_phases' fields in .app files were not allowed as
+	    actual values in a .app file. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-14029</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Miscellaneous updates due to atoms containing
+	    arbitrary Unicode characters. </p>
+          <p>
+	    Own Id: OTP-14285</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SASL 3.0.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    When both options 'warnings_as_errors' and 'silent' were
+	    given to systools:make_script or systools:make_relup, no
+	    error reason would be returned if warnings occurred.
+	    Instead only the atom 'error' was returned. This is now
+	    corrected.</p>
+          <p>
+	    Options 'warnings_as_errors' and 'no_warn_sasl' are now
+	    also allowed for systools:make_tar.</p>
+          <p>
+	    Own Id: OTP-14170</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SASL 3.0.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    <c>code:add_pathsa/1</c> and command line option
+	    <c>-pa</c> both revert the given list of directories when
+	    adding it at the beginning of the code path. This is now
+	    documented.</p>
+          <p>
+	    Own Id: OTP-13920 Aux Id: ERL-267 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SASL 3.0.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/sasl/doc/src/part_notes.xml b/lib/sasl/doc/src/part_notes.xml
deleted file mode 100644
index 8a32deefd9..0000000000
--- a/lib/sasl/doc/src/part_notes.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2004</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>SASL Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p>The System Architecture Support Libraries, <em>SASL</em>,
-      provides support for alarm and release handling etc.</p>
-    <p>For information about older versions, see
-      <url href="part_notes_history_frame.html">Release Notes History</url>.</p>
-  </description>
-  <xi:include href="notes.xml"/>
-</part>
-
diff --git a/lib/sasl/doc/src/part_notes_history.xml b/lib/sasl/doc/src/part_notes_history.xml
deleted file mode 100644
index abdf09d845..0000000000
--- a/lib/sasl/doc/src/part_notes_history.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <header>
-    <copyright>
-      <year>2006</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>SASL Release Notes History</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p>The System Architecture Support Libraries, <em>SASL</em>,
-      provides support for alarm and release handling etc.</p>
-  </description>
-  <include file="notes_history"></include>
-</part>
-
diff --git a/lib/sasl/doc/src/release_handler.xml b/lib/sasl/doc/src/release_handler.xml
index 8f073807fb..9ba276aeac 100644
--- a/lib/sasl/doc/src/release_handler.xml
+++ b/lib/sasl/doc/src/release_handler.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -61,6 +61,7 @@
     <list type="bulleted">
       <item>A release upgrade file, <c>relup</c></item>
       <item>A system configuration file, <c>sys.config</c></item>
+      <item>A system configuration source file, <c>sys.config.src</c></item>
     </list>
     <p>The <c>relup</c> file contains instructions for how to upgrade
       to, or downgrade from, this version of the release.</p>
@@ -819,4 +820,3 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
       <seealso marker="systools"><c>systools(3)</c></seealso></p>
   </section>
 </erlref>
-
diff --git a/lib/sasl/doc/src/sasl_app.xml b/lib/sasl/doc/src/sasl_app.xml
index 0576397f9b..fc83f63fe6 100644
--- a/lib/sasl/doc/src/sasl_app.xml
+++ b/lib/sasl/doc/src/sasl_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,12 +34,9 @@
     <p>The SASL application provides the following services:</p>
     <list type="bulleted">
       <item><c>alarm_handler</c></item>
-      <item><c>rb</c></item>
       <item><c>release_handler</c></item>
       <item><c>systools</c></item>
     </list>
-    <p>The SASL application also includes <c>error_logger</c> event
-      handlers for formatting SASL error and crash reports.</p>
     <note>
        <p>The SASL application in OTP has nothing to do with
           "Simple Authentication and Security Layer" (RFC 4422).</p>
@@ -47,51 +44,101 @@
   </description>
 
   <section>
-    <title>Error Logger Event Handlers</title>
-    <p>The following error logger event handlers are used by
-      the SASL application.</p>
+    <title>Configuration</title>
+    <p>The following configuration parameters are defined for the SASL
+      application. For more information about configuration parameters, see
+      <seealso marker="kernel:app"><c>app(4)</c></seealso> in Kernel.</p>
+    <p>All configuration parameters are optional.</p>
+    <taglist>
+      <tag><c><![CDATA[start_prg = string() ]]></c></tag>
+      <item>
+        <p>Specifies the program to be used when restarting the system
+          during release installation. Default is
+          <c>$OTP_ROOT/bin/start</c>.</p>
+      </item>
+      <tag><c><![CDATA[masters = [atom()] ]]></c></tag>
+      <item>
+        <p>Specifies the nodes used by this node to read/write release
+          information. This parameter is ignored if parameter
+          <c>client_directory</c> is not set.</p>
+      </item>
+      <tag><c><![CDATA[client_directory = string() ]]></c></tag>
+      <item>
+        <p>This parameter specifies the client directory at the master
+          nodes. For details, see
+          <seealso marker="doc/design_principles:release_handling">Release Handling</seealso>
+          in <em>OTP Design Principles</em>. This parameter is
+          ignored if parameter <c>masters</c> is not set.</p>
+      </item>
+      <tag><c><![CDATA[static_emulator = true | false ]]></c></tag>
+      <item>
+        <p>Indicates if the Erlang emulator is statically installed. A
+          node with a static emulator cannot switch dynamically to a
+          new emulator, as the executable files are written into memory
+          statically. This parameter is ignored if parameters <c>masters</c>
+          and <c>client_directory</c> are not set.</p>
+      </item>
+      <tag><c><![CDATA[releases_dir = string() ]]></c></tag>
+      <item>
+        <p>Indicates where the <c>releases</c> directory is located.
+          The release handler writes all its files to this directory.
+          If this parameter is not set, the OS environment parameter
+          <c>RELDIR</c> is used. By default, this is
+          <c>$OTP_ROOT/releases</c>.</p>
+      </item>
+    </taglist>
+  </section>
+
+  <section>
+    <marker id="deprecated_error_logger_config"/>
+    <title>Deprecated Error Logger Event Handlers and Configuration</title>
+    <p>In Erlang/OTP 21.0, a new API for logging was added. The
+      old <c>error_logger</c> event manager, and event handlers
+      running on this manager, still work, but they are not used
+      by default.</p>
+    <p>The error logger event handlers <c>sasl_report_tty_h</c>
+      and <c>sasl_report_file_h</c>, were earlier used for printing
+      the so called SASL reports, i.e. <em>supervisor
+      reports</em>, <em>crash reports</em>, and <em>progress
+      reports</em>. These reports are now also printed by the default
+      logger handler started by the Kernel application. Progress
+      reports are by default stopped by the primary log level, but can
+      be enabled by setting this level to <c>info</c>, for example by
+      using the Kernel configuration
+      parameter <seealso marker="kernel:kernel_app#logger_level">
+      <c>logger_level</c></seealso>.</p>
+    <p>If the old error logger event handlers are still desired, they
+      must be added by
+      calling <c>error_logger:add_report_handler/1,2</c>.</p>
     <taglist>
       <tag><c>sasl_report_tty_h</c></tag>
       <item>
         <p>Formats and writes <em>supervisor reports</em>, <em>crash
         reports</em>, and <em>progress reports</em> to <c>stdio</c>.
         This error logger event handler uses
-	<seealso marker="kernel:kernel_app#error_logger_format_depth">error_logger_format_depth</seealso>
-	in the Kernel application to limit how much detail is
-        printed in crash and supervisor reports.</p>
+	<seealso marker="kernel:kernel_app#deprecated-configuration-parameters"><c>error_logger_format_depth</c></seealso>
+	in the Kernel application to limit how much detail is printed
+	in crash and supervisor reports.</p>
       </item>
       <tag><c>sasl_report_file_h</c></tag>
       <item>
         <p>Formats and writes <em>supervisor reports</em>, <em>crash
         report</em>, and <em>progress report</em> to a single file.
         This error logger event handler uses
-	<seealso marker="kernel:kernel_app#error_logger_format_depth">error_logger_format_depth</seealso>
-	in the Kernel application to limit the details
-        printed in crash and supervisor reports.</p>
-      </item>
-      <tag><c>log_mf_h</c></tag>
-      <item>
-        <p>This error logger writes <em>all</em> events sent to the
-          error logger to disk. Multiple files and log rotation are
-          used. For efficiency reasons, each event is written as a
-          binary. For more information about this handler,
-          see <seealso marker="stdlib:log_mf_h">the STDLIB Reference
-          Manual</seealso>.</p>
-        <p>To activate this event handler, three SASL
-          configuration parameters must be set,
-          <c>error_logger_mf_dir</c>, <c>error_logger_mf_maxbytes</c>,
-          and <c>error_logger_mf_maxfiles</c>. The next section provides
-          more information about the configuration parameters.</p>
+	<seealso marker="kernel:kernel_app#deprecated-configuration-parameters"><c>error_logger_format_depth</c></seealso>
+	in the Kernel application to limit the details printed in
+	crash and supervisor reports.</p>
       </item>
     </taglist>
-  </section>
-
-  <section>
-    <title>Configuration</title>
-    <p>The following configuration parameters are defined for the SASL
-      application. For more information about configuration parameters, see
-      <seealso marker="kernel:app"><c>app(4)</c></seealso> in Kernel.</p>
-    <p>All configuration parameters are optional.</p>
+    <p>A similar behaviour, but still using the new logger API, can be
+      obtained by setting the Kernel application environment
+      variable <seealso marker="kernel:kernel_app#logger_sasl_compatible">
+	<c>logger_sasl_compatible</c></seealso> to <c>true</c>. This
+      adds a second instance of the standard Logger handler,
+      named <c>sasl</c>, which only prints the SASL reports. No SASL
+      reports are then printed by the Kernel logger handler.</p>
+    <p>The <c>sasl</c> handler is configured according to the values
+      of the following SASL application environment variables.</p>
     <taglist>
       <tag><c><![CDATA[sasl_error_logger = Value ]]></c></tag>
       <item>
@@ -103,13 +150,16 @@
           <tag><c>{file,FileName}</c></tag>
           <item><p>Installs <c>sasl_report_file_h</c> in the error logger.
             All reports go to file <c>FileName</c>, which is a
-            string.</p></item>
+            string. The file is opened in <c>write</c> mode with encoding
+	    <c>utf8</c>.</p></item>
           <tag><c>{file,FileName,Modes}</c></tag>
           <item><p>Same as <c>{file,FileName}</c>, except that <c>Modes</c>
             allows you to specify the modes used for opening the <c>FileName</c>
             given to the <seealso marker="kernel:file#open/2">file:open/2</seealso>
-            call. When not specified, <c>Modes</c> defaults to <c>[write]</c>.
-            Use <c>[append]</c> to have the <c>FileName</c> open in append mode.
+            call. By default, the file is opened in <c>write</c> mode
+            with encoding <c>utf8</c>. Use <c>[append]</c> to have
+            the <c>FileName</c> open in append mode. A different
+            encoding can also be specified.
             <c>FileName</c> is a string.</p></item>
           <tag><c>false</c></tag>
           <item><p>No SASL error logger handler is installed.</p></item>
@@ -121,6 +171,25 @@
           <c>sasl_error_logger</c> to error reports or progress reports,
           or both. Default is <c>all</c>.</p>
       </item>
+      <tag><marker id="utc_log"/><c><![CDATA[utc_log = true | false ]]></c></tag>
+      <item>
+        <p>If set to <c>true</c>, all dates in textual log outputs are
+          displayed in Universal Coordinated Time with the string
+          <c>UTC</c> appended.</p>
+      </item>
+    </taglist>
+
+    <p>The error logger event handler <c>log_mf_h</c> can also still
+      be used. This event handler writes <em>all</em> events sent to
+      the error logger to disk. Multiple files and log rotation are
+      used. For efficiency reasons, each event is written as a
+      binary. For more information about this handler,
+      see <seealso marker="stdlib:log_mf_h">the STDLIB Reference
+      Manual</seealso>.</p>
+    <p>To activate this event handler, three SASL configuration
+      parameters must be
+      set:</p>
+    <taglist>
       <tag><c><![CDATA[error_logger_mf_dir = string() | false ]]></c></tag>
       <item>
         <p>Specifies in which directory <c>log_mf_h</c> is to store
@@ -139,55 +208,19 @@
           this parameter is undefined, the <c>log_mf_h</c> handler is
           not installed.</p>
       </item>
-      <tag><c><![CDATA[start_prg = string() ]]></c></tag>
-      <item>
-        <p>Specifies the program to be used when restarting the system
-          during release installation. Default is
-          <c>$OTP_ROOT/bin/start</c>.</p>
-      </item>
-      <tag><c><![CDATA[masters = [atom()] ]]></c></tag>
-      <item>
-        <p>Specifies the nodes used by this node to read/write release
-          information. This parameter is ignored if parameter
-          <c>client_directory</c> is not set.</p>
-      </item>
-      <tag><c><![CDATA[client_directory = string() ]]></c></tag>
-      <item>
-        <p>This parameter specifies the client directory at the master
-          nodes. For details, see
-          <seealso marker="doc/design_principles:release_handling">Release Handling</seealso>
-          in <em>OTP Design Principles</em>. This parameter is
-          ignored if parameter <c>masters</c> is not set.</p>
-      </item>
-      <tag><c><![CDATA[static_emulator = true | false ]]></c></tag>
-      <item>
-        <p>Indicates if the Erlang emulator is statically installed. A
-          node with a static emulator cannot switch dynamically to a
-          new emulator, as the executable files are written into memory
-          statically. This parameter is ignored if parameters <c>masters</c>
-          and <c>client_directory</c> are not set.</p>
-      </item>
-      <tag><c><![CDATA[releases_dir = string() ]]></c></tag>
-      <item>
-        <p>Indicates where the <c>releases</c> directory is located.
-          The release handler writes all its files to this directory.
-          If this parameter is not set, the OS environment parameter
-          <c>RELDIR</c> is used. By default, this is
-          <c>$OTP_ROOT/releases</c>.</p>
-      </item>
-      <tag><c><![CDATA[utc_log = true | false ]]></c></tag>
-      <item>
-        <p>If set to <c>true</c>, all dates in textual log outputs are
-          displayed in Universal Coordinated Time with the string
-          <c>UTC</c> appended.</p>
-      </item>
     </taglist>
+    <p>The new <seealso marker="kernel:logger_disk_log_h">
+	<c>logger_disk_log_h</c></seealso> might be an alternative
+      to <c>log_mf_h</c> if log rotation is desired. This does,
+      however, write the log events in clear text and not as binaries.</p>
+
   </section>
 
   <section>
     <title>See Also</title>
     <p><seealso marker="alarm_handler"><c>alarm_handler(3)</c></seealso>,
       <seealso marker="kernel:error_logger"><c>error_logger(3)</c></seealso>,
+      <seealso marker="kernel:logger"><c>logger(3)</c></seealso>,
       <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>,
       <seealso marker="rb"><c>rb(3)</c></seealso>,
       <seealso marker="release_handler"><c>release_handler(3)</c></seealso>,
diff --git a/lib/sasl/doc/src/script.xml b/lib/sasl/doc/src/script.xml
index 8ed132354d..b40ff28179 100644
--- a/lib/sasl/doc/src/script.xml
+++ b/lib/sasl/doc/src/script.xml
@@ -88,7 +88,7 @@
           follows:</p>
         <list type="bulleted">
           <item><c>-pa Dir1 Dir2 ... DirN</c> adds the directories
-          <c>Dir1, Dir2, ..., DirN</c> to the front of the initial
+          <c>DirN, DirN-1, ..., Dir2, Dir1</c> to the front of the initial
            load path.</item>
           <item><c>-pz Dir1 Dir2 ... DirN</c> adds the directories
           <c>Dir1, Dir2, ..., DirN</c> to the end of the initial
diff --git a/lib/sasl/doc/src/systools.xml b/lib/sasl/doc/src/systools.xml
index fa503fa573..4842c732b1 100644
--- a/lib/sasl/doc/src/systools.xml
+++ b/lib/sasl/doc/src/systools.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1996</year>
-      <year>2016</year>
+      <year>2017</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -268,7 +268,7 @@
       <fsummary>Creates a release package.</fsummary>
       <type>
         <v>Name = string()</v>
-        <v>Opt = {dirs,[IncDir]} | {path,[Dir]} | {variables,[Var]} | {var_tar,VarTar} | {erts,Dir} | src_tests | exref | {exref,[App]} | silent | {outdir,Dir}</v>
+        <v>Opt = {dirs,[IncDir]} | {path,[Dir]} | {variables,[Var]} | {var_tar,VarTar} | {erts,Dir} | src_tests | exref | {exref,[App]} | silent | {outdir,Dir} | | no_warn_sasl | warnings_as_errors</v>
         <v>&nbsp;Dir = string()</v>
         <v>&nbsp;IncDir = src | include | atom()</v>
         <v>&nbsp;Var = {VarName,PreFix}</v>
@@ -297,6 +297,10 @@
           directory unless <c>Name</c> contains a path. If option
           <c>{outdir,Dir}</c> is specified, it is located in <c>Dir</c>
           instead.</p>
+        <p>If SASL is not included as an application in
+          the <c>.rel</c> file, a warning is issued because such a
+          release cannot be used in an upgrade. To turn off this
+          warning, add option <c>no_warn_sasl</c>.</p>
         <p>By default, the release package contains the directories
           <c>lib/App-Vsn/ebin</c> and <c>lib/App-Vsn/priv</c> for each
           included application. If more directories are to be included,
@@ -345,10 +349,11 @@ myapp-1/ebin/myapp.app
           the release version as specified in <c>Name.rel</c>.</p>
         <p><c>releases/RelVsn</c> contains the boot script
           <c>Name.boot</c> renamed to <c>start.boot</c> and, if found,
-          the files <c>relup</c> and <c>sys.config</c>. These files
+          the files <c>relup</c> and <c>sys.config</c> or <c>sys.config.src</c>. These files
           are searched for in the same directory as <c>Name.rel</c>,
           in the current working directory, and in any directories
-          specified using option <c>path</c>.</p>
+          specified using option <c>path</c>. In the case of <c>sys.config</c>
+          it is not included if <c>sys.config.src</c> is found.</p>
         <p>If the release package is to contain a new Erlang runtime
           system, the <c>bin</c> directory of the specified runtime
           system <c>{erts,Dir}</c> is copied to <c>erts-ErtsVsn/bin</c>.</p>
@@ -393,4 +398,3 @@ myapp-1/ebin/myapp.app
       <seealso marker="script"><c>script(4)</c></seealso></p>
   </section>
 </erlref>
-
diff --git a/lib/sasl/doc/src/warning.gif b/lib/sasl/doc/src/warning.gif
deleted file mode 100644
index 96af52360e..0000000000
--- a/lib/sasl/doc/src/warning.gif
+++ /dev/null
diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
index ac7ee51100..7338bdf016 100644
--- a/lib/sasl/src/Makefile
+++ b/lib/sasl/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2016. All Rights Reserved.
+# Copyright Ericsson AB 1996-2018. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/sasl-$(VSN)
 MODULES= alarm_handler sasl sasl_report \
 	sasl_report_file_h sasl_report_tty_h format_lib_supp \
 	misc_supp rb rb_format_supp release_handler \
-	release_handler_1 si si_sasl_supp systools \
+	release_handler_1 systools \
 	systools_make systools_rc systools_relup systools_lib \
 	erlsrv
 
diff --git a/lib/sasl/src/erlsrv.erl b/lib/sasl/src/erlsrv.erl
index 29d40d362f..e0bbd37ee3 100644
--- a/lib/sasl/src/erlsrv.erl
+++ b/lib/sasl/src/erlsrv.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ erlsrv(EVer) ->
     filename:join([Root, "erts-" ++ EVer, "bin", "erlsrv.exe"]).
 
 current_version() ->
-    hd(string:tokens(erlang:system_info(version),"_ ")).
+    hd(string:lexemes(erlang:system_info(version),"_ ")).
 
 %%% Returns {ok, Output} | failed | {error, Reason}
 run_erlsrv(Command) ->
@@ -107,7 +107,7 @@ get_all_services() ->
 	    [];
 	{ok, [_H|T]} ->
 	    F = fun(X) ->
-			hd(string:tokens(X,"\t "))
+			hd(string:lexemes(X,"\t "))
 		end,
 	    lists:map(F,T);
 	_ ->
@@ -191,8 +191,8 @@ get_service(EVer, ServiceName) ->
 	    %%% have in the environment list...
 	    EnvParts = lists:map(
 			 fun(S) ->
-				 X = string:strip(S,left,$\t),
-				 case hd(string:tokens(X,"=")) of
+				 X = string:trim(S, leading, "$\t"),
+				 case hd(string:lexemes(X,"=")) of
 				     X ->
 					 %% Can this happen?
 					 {X,""};
@@ -371,7 +371,7 @@ split_arglist([H|T]) ->
 parse_arglist(Str) ->
     lists:reverse(parse_arglist(Str,[])).
 parse_arglist(Str,Accum) ->
-    Stripped = string:strip(Str,left),
+    Stripped = string:trim(Str, leading),
     case length(Stripped) of
 	0 ->
 	    Accum;
@@ -432,14 +432,9 @@ split_by_env(Data) ->
 			
 
 splitline(Line) ->
-    case string:chr(Line,$:) of
-	0 ->
+    case string:split(Line, ":") of
+        [_] ->
 	    {Line, ""};
-	N ->
-	    case length(string:substr(Line,N)) of
-		1 ->
-		    {string:substr(Line,1,N-1),""};
-		_ ->
-		    {string:substr(Line,1,N-1),string:substr(Line,N+2)}
-	    end
+        [N, V] ->
+            {N, string:slice(V, 1)}
     end.
diff --git a/lib/sasl/src/format_lib_supp.erl b/lib/sasl/src/format_lib_supp.erl
index 0b474a0232..2d37dfe117 100644
--- a/lib/sasl/src/format_lib_supp.erl
+++ b/lib/sasl/src/format_lib_supp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -25,15 +25,12 @@
 %%% tools. 
 %%% The main parts are:
 %%% 1) print_info.  Prints information tagged by 'header', 'data',
-%%%    'table', 'items' and 'newline'.
+%%%    'items' and 'newline'.
 %%%---------------------------------------------------------------------
 
 %% intermodule exports
 -export([print_info/2, print_info/3]).
 
-%% exports for use within module
--export([maxcol/2]).
-
 %%---------------------------------------------------------------------
 %% Format is an ordered list of:
 %%   {header, HeaderString}
@@ -42,10 +39,6 @@
 %%        (if possible); 'Key:     Value'.
 %%        Elements in the list may also be single terms, which are
 %%        printed as they are.
-%%   {table, {TableName, ColumnNames, Columns}}
-%%        ColumnNames is a tuple of names for the columns, and
-%%        Columns is a list, where each element is a tuple of
-%%        data for that column.
 %%   {items, {Name, Items}}
 %%        Items is a list of KeyValue_tuples. Will be printed as:
 %%        'Name:
@@ -77,9 +70,6 @@ print_format(Device, _Line, []) ->
 print_format(Device, Line, [{data, Data}|T]) ->
     print_data(Device, Line, Data),
     print_format(Device, Line, T);
-print_format(Device, Line, [{table, Table}|T]) ->
-    _ = print_table(Device, Line, Table),
-    print_format(Device, Line, T);
 print_format(Device, Line, [{items, Items}|T]) ->
     print_items(Device, Line, Items),
     print_format(Device, Line, T);
@@ -94,51 +84,51 @@ print_data(Device, Line, [{Key, Value}|T]) ->
     print_one_line(Device, Line, Key, Value),
     print_data(Device, Line, T);
 print_data(Device, Line, [Value|T]) ->
-    io:format(Device, "~p~n", [Value]),
-    print_data(Device, Line, T).
+    Modifier = misc_supp:modifier(Device),
+    io:format(Device, "~"++Modifier++"p~n", [Value]),
+    print_data(Device, Line, T);
+print_data(Device, _Line, Value) ->
+    Modifier = misc_supp:modifier(Device),
+    io:format(Device, "~"++Modifier++"p~n", [Value]).
 
 print_items(Device, Line, {Name, Items}) ->
     print_items(Device, Line, Name, Items).
 
-print_table(Device, Line, {TableName, ColumnNames, Columns}) ->
-    print_table(Device, Line, TableName, ColumnNames, Columns).
-
 print_newlines(_Device, 0) -> ok;
 print_newlines(Device, N) when N > 0 ->
     io:format(Device, '~n', []),
     print_newlines(Device, N-1).
 
 print_one_line(Device, Line, Key, Value) ->
-    StrKey = term_to_string(Key),
-    KeyLen = lists:min([length(StrKey), Line]),
+    Modifier = misc_supp:modifier(Device),
+    StrKey = term_to_string(Key,Modifier),
+    KeyLen = lists:min([string:length(StrKey), Line]),
     ValueLen = Line - KeyLen,
-    Format1 = lists:concat(["~-", KeyLen, s]),
-    Format2 = lists:concat(["~", ValueLen, "s~n"]),
+    Format1 = lists:concat(["~-", KeyLen, Modifier, "s"]),
+    Format2 = lists:concat(["~", ValueLen, Modifier, "s~n"]),
     io:format(Device, Format1, [StrKey]),
-    Try = term_to_string(Value),
-    Length = length(Try),
+    Try = term_to_string(Value,Modifier),
+    Length = string:length(Try),
     if
 	Length < ValueLen ->
 	    io:format(Device, Format2, [Try]);
 	true ->
 	    io:format(Device, "~n         ", []),
-	    Format3 = lists:concat(["~", Line, ".9p~n"]),
+	    Format3 = lists:concat(["~", Line, ".9", Modifier, "p~n"]),
 	    io:format(Device, Format3, [Value])
     end.
 
-term_to_string(Value) ->
-    lists:flatten(io_lib:format(get_format(Value), [Value])).
+term_to_string(Value,Modifier) ->
+    io_lib:format(get_format(Value,Modifier), [Value]).
 
-get_format(Value) ->
-    case misc_supp:is_string(Value) of
-	true -> "~s";
-	false -> "~p"
+get_format([],_) ->
+    "~p";
+get_format(Value,Modifier) ->
+    case io_lib:printable_list(Value) of
+	true -> "~"++Modifier++"s";
+	false -> "~"++Modifier++"p"
     end.
 
-make_list(0, _Elem) -> [];
-make_list(N, Elem) -> [Elem|make_list(N-1, Elem)].
-
-
 %%-----------------------------------------------------------------
 %% Items
 %%-----------------------------------------------------------------
@@ -150,76 +140,3 @@ print_item_elements(_Device, _Line, []) -> ok;
 print_item_elements(Device, Line, [{Key, Value}|T]) ->
     print_one_line(Device, Line, lists:concat(["   ", Key]), Value),
     print_item_elements(Device, Line, T).
-
-%%-----------------------------------------------------------------
-%% Table handling
-%%-----------------------------------------------------------------
-extra_space_between_columns() -> 3.
-
-find_max_col([Row | T], ColumnSizes) ->
-    find_max_col(T, misc_supp:multi_map({format_lib_supp, maxcol},
-					[Row, ColumnSizes]));
-
-find_max_col([], ColumnSizes) -> ColumnSizes.
-
-maxcol(Term, OldMax) ->
-    lists:max([length(term_to_string(Term)), OldMax]).
-
-make_column_format(With) ->
-    lists:concat(["~", With + extra_space_between_columns(), s]).
-
-is_correct_column_length(_Length, []) -> true;
-is_correct_column_length(Length, [Tuple|T]) ->
-    case size(Tuple) of
-	Length -> is_correct_column_length(Length, T);
-	_ -> false
-    end;
-is_correct_column_length(_, _) -> false.
-
-print_table(Device, Line, TableName, _TupleOfColumnNames, []) ->
-    print_one_line(Device, Line, TableName, "<empty table>"),
-    io:format(Device, "~n", []);
-
-print_table(Device, Line, TableName, TupleOfColumnNames, ListOfTuples) 
-                when is_list(ListOfTuples), is_tuple(TupleOfColumnNames) ->
-    case is_correct_column_length(size(TupleOfColumnNames),
-				  ListOfTuples) of
-	true -> 
-	    print_one_line(Device, Line, TableName, " "),
-	    ListOfColumnNames = tuple_to_list(TupleOfColumnNames),
-	    ListOfLists = lists:map(fun(Tuple) ->
-					    tuple_to_list(Tuple)
-				    end,
-				    ListOfTuples),
-	    ColWidths = find_max_col([ListOfColumnNames |
-				      ListOfLists],
-				     make_list(length(ListOfColumnNames),0)),
-	    Format = lists:flatten([lists:map(fun(CW) ->
-						      make_column_format(CW)
-					      end,
-					      ColWidths), "~n"]),
-	    io:format(Device, Format, ListOfColumnNames),
-	    io:format(Device,
-		      lists:concat(['~', extra_space_between_columns(),
-				    'c', '~', lists:sum(ColWidths)
-				    + (length(ColWidths) - 1)
-				    * extra_space_between_columns(),
-				    'c~n']), [$ , $-]),
-	    lists:foreach(fun(List) ->
-				  print_row(List, Device, Format)
-			  end,
-			  ListOfLists),
-	    io:format(Device, '~n', []),
-	    true;
-	false ->
-	    {error, {'a tuple has wrong size',
-		     {TableName, TupleOfColumnNames, ListOfTuples}}}
-    end.
-
-%%--------------------------------------------------
-%% Device MUST be 2nd arg because of extraarg ni foreach...
-%%--------------------------------------------------
-print_row(Row, Device, Format) ->
-    io:format(Device, Format,
-	      lists:map(fun(Term) -> term_to_string(Term) end,
-			Row)).
diff --git a/lib/sasl/src/misc_supp.erl b/lib/sasl/src/misc_supp.erl
index 093b337a2c..cbbcba0def 100644
--- a/lib/sasl/src/misc_supp.erl
+++ b/lib/sasl/src/misc_supp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 %%%---------------------------------------------------------------------
 
 -export([format_pdict/3, format_tuples/2, assq/2, passq/2, is_string/1, 
-	 multi_map/2]).
+	 multi_map/2, modifier/1]).
 
 %%-----------------------------------------------------------------
 %% Uses format_tuples to format the data in process dictionary.
@@ -105,3 +105,19 @@ multi_map(Func, ListOfLists) ->
     [apply(Func, lists:map(fun(List) -> hd(List) end, ListOfLists)) |
      multi_map(Func,
 	       lists:map(fun(List) -> tl(List) end, ListOfLists))].
+
+%%%-----------------------------------------------------------------
+%%% Check encoding of the given device and return "t" if this format
+%%% modifier should be used.
+modifier(Device) ->
+    Encoding =
+        case io:getopts(Device) of
+            List when is_list(List) ->
+                proplists:get_value(encoding,List,latin1);
+            _ ->
+                latin1
+        end,
+    encoding_to_modifier(Encoding).
+
+encoding_to_modifier(latin1) -> "";
+encoding_to_modifier(_) -> "t".
diff --git a/lib/sasl/src/rb.erl b/lib/sasl/src/rb.erl
index 79df150b41..28829132a1 100644
--- a/lib/sasl/src/rb.erl
+++ b/lib/sasl/src/rb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -273,7 +273,7 @@ code_change(_OldVsn, State, _Extra) ->
 open_log_file(standard_io) -> standard_io;
 open_log_file(Fd) when is_atom(Fd),Fd=/=standard_error -> 
     case whereis(Fd) of
-	undefined -> io:format("rb: Registered name not found '~s'.~n",
+	undefined -> io:format("rb: Registered name not found '~ts'.~n",
 		      [Fd]),
 	             io:format("rb: Using standard_io~n"),
                      open_log_file(standard_io);
@@ -281,10 +281,10 @@ open_log_file(Fd) when is_atom(Fd),Fd=/=standard_error ->
     end;
 open_log_file(Fd) when is_pid(Fd)-> Fd;
 open_log_file(FileName) when is_list(FileName) ->
-    case file:open(FileName, [write,append]) of
+    case file:open(FileName, [write,append,{encoding,utf8}]) of
 	{ok, Fd} -> Fd;
 	Error -> 
-	    io:format("rb: Cannot open file '~s' (~w).~n",
+	    io:format("rb: Cannot open file '~ts' (~w).~n",
 		      [FileName, Error]),
 	    io:format("rb: Using standard_io~n"),
 	    standard_io
@@ -419,8 +419,8 @@ read_reports(No, Fd, Fname, Max, Type) ->
 	    add_report_data(NewRes, No, Fname);
 	{error, [Problem | Res]} ->
 	    _ = file:close(Fd),
-	    io:format("Error: ~p~n",[Problem]),
-	    io:format("Salvaged ~p entries from corrupt report file ~s...~n",
+	    io:format("Error: ~tp~n",[Problem]),
+	    io:format("Salvaged ~p entries from corrupt report file ~ts...~n",
 		      [length(Res),Fname]),
 	    NewRes = 
 		if
@@ -431,7 +431,7 @@ read_reports(No, Fd, Fname, Max, Type) ->
 		end,
 	    add_report_data(NewRes, No, Fname);
 	Else ->
-	    io:format("err ~p~n", [Else]),
+	    io:format("err ~tp~n", [Else]),
 	    [{No, unknown, "Can't read reports from file " ++ Fname,
 		  "???", Fname, 0}]
     end.
@@ -530,21 +530,18 @@ get_short_descr({{Date, Time}, {error_report, Pid, {_, crash_report, Rep}}}) ->
 	    {value, {_Key, N}} -> N;
 	    _ -> Pid
 	end,
-    NameStr = lists:flatten(io_lib:format("~w", [Name])),
-    {NameStr, date_str(Date, Time)};
+    {Name, date_str(Date, Time)};
 get_short_descr({{Date, Time}, {error_report, Pid, {_, supervisor_report,Rep}}}) ->
     Name =
 	case lists:keysearch(supervisor, 1, Rep) of
 	    {value, {_Key, N}} when is_atom(N) -> N;
 	    _ -> Pid
 	end,
-    NameStr = lists:flatten(io_lib:format("~w", [Name])),
-    {NameStr, date_str(Date,Time)};
+    {Name, date_str(Date,Time)};
 get_short_descr({{Date, Time}, {_Type, Pid, _}}) ->
-    NameStr = lists:flatten(io_lib:format("~w", [Pid])),
-    {NameStr, date_str(Date,Time)};
+    {Pid, date_str(Date,Time)};
 get_short_descr(_) ->
-    {"???", "???"}.
+    {'???', "???"}.
     
 date_str({Y,Mo,D}=Date,{H,Mi,S}=Time) ->
     case application:get_env(sasl,utc_log) of 
@@ -571,53 +568,57 @@ local_time_to_universal_time({Date,Time}) ->
     end.
 
 
-print_list(Fd, Data, Type) ->
+print_list(Fd, Data0, Type) ->
+    Modifier = misc_supp:modifier(Fd),
     Header = {"No", "Type", "Process", "Date     Time"},
-    Width = find_width([Header | Data], 0)+1,
-    DateWidth = find_date_width([Header | Data], 0) +1,
-    Format = lists:concat(["~4s~20s ~", Width, "s~20s~n"]),
+    {DescrWidth,DateWidth,Data} = find_widths(Data0, Modifier, 7, 13, []),
+    Format = lists:concat(["~4s~20s ~", DescrWidth, "s~20s~n"]),
     io:format(Fd, Format, tuple_to_list(Header)),
     io:format(Fd, Format, ["==", "====", "=======", "====     ===="]),
-    print_list(Fd, Data, Type, Width, DateWidth).
-print_list(_, [], _, _, _) -> true;
-print_list(Fd, [H|T], Type, Width, DateWidth) ->
-    print_one_report(Fd, H, Type, Width, DateWidth),
-    print_list(Fd, T, Type, Width, DateWidth).
-
-find_width([], Width) -> Width;
-find_width([H|T], Width) ->
-    Try = length(element(3, H)),
-    if
-	Try > Width -> find_width(T, Try);
-	true -> find_width(T, Width)
-    end.
-find_date_width([], Width) -> Width;
-find_date_width([H|T], Width) ->
-    Try = length(element(4, H)),
-    if
-	Try > Width -> find_date_width(T, Try);
-	true -> find_date_width(T, Width)
-    end.
+    print_list(Fd, Data, Type, DescrWidth, DateWidth, Modifier).
+print_list(_, [], _, _, _, _) -> true;
+print_list(Fd, [H|T], Type, Width, DateWidth, Modifier) ->
+    print_one_report(Fd, H, Type, Width, DateWidth, Modifier),
+    print_list(Fd, T, Type, Width, DateWidth, Modifier).
+
+
+find_widths([], _Modifier, DescrWidth, DateWidth, Data) ->
+    {DescrWidth+1, DateWidth+1, lists:reverse(Data)};
+find_widths([H|T], Modifier, DescrWidth, DateWidth, Data) ->
+    DescrTerm = element(3,H),
+    Descr = io_lib:format("~"++Modifier++"w", [DescrTerm]),
+    DescrTry = string:length(Descr),
+    NewDescrWidth =
+        if
+            DescrTry > DescrWidth -> DescrTry;
+            true -> DescrWidth
+        end,
+    DateTry = string:length(element(4, H)),
+    NewDateWitdh =
+        if
+            DateTry > DateWidth -> DateTry;
+            true -> DateWidth
+        end,
+    NewH = setelement(3,H,Descr),
+    find_widths(T, Modifier, NewDescrWidth, NewDateWitdh, [NewH|Data]).
 
 print_one_report(Fd, {No, RealType, ShortDescr, Date, _Fname, _FilePos},
 		 WantedType,
-		 Width, DateWidth) ->
+		 Width, DateWidth, Modifier) ->
     if
 	WantedType == all ->
 	    print_short_descr(Fd, No, RealType, ShortDescr, Date, Width, 
-			      DateWidth);
+			      DateWidth, Modifier);
 	WantedType == RealType ->
 	    print_short_descr(Fd, No, RealType, ShortDescr, Date, Width, 
-			      DateWidth);
+			      DateWidth, Modifier);
 	true -> ok
     end.
 
-print_short_descr(Fd, No, Type, ShortDescr, Date, Width, DateWidth) ->
-    Format = lists:concat(["~4w~20w ~", Width, "s~", DateWidth,"s~n"]),
-    io:format(Fd, Format, [No,
-		       Type, 
-		       io_lib:format("~s", [ShortDescr]),
-		       Date]).
+print_short_descr(Fd, No, Type, ShortDescr, Date, Width, DateWidth, Modifier) ->
+    Format = lists:concat(["~4w~20", Modifier, "w ~", Width, Modifier, "s~",
+                           DateWidth, "s~n"]),
+    io:format(Fd, Format, [No, Type,  ShortDescr, Date]).
 
 print_report_by_num(Dir, Data, Number, Device, Abort, Log) ->
     {_,Device1} = print_report(Dir, Data, Number, Device, Abort, Log),
@@ -658,7 +659,7 @@ print_report(Dir, Data, Number, Device, Abort, Log) ->
 		{ok, Fd} -> 
 		    read_rep(Fd, FilePosition, Device, Abort, Log);
 		_ -> 
-		    io:format("rb: can't open file ~p~n", [Fname]),
+		    io:format("rb: can't open file ~tp~n", [Fname]),
 		    {proceed,Device}
 	    end;
 	no_report ->
@@ -691,14 +692,14 @@ print_grep_report(Dir, Data, Number, Device, RegExp, Abort, Log) ->
 	{ok, Fd} when is_pid(Fd) -> 
 	    check_rep(Fd, FilePosition, Device, RegExp, Number, Abort, Log);
 	_ -> 
-	    io:format("rb: can't open file ~p~n", [Fname]),
+	    io:format("rb: can't open file ~tp~n", [Fname]),
 	    {proceed,Device}
     end.
 
 check_rep(Fd, FilePosition, Device, RegExp, Number, Abort, Log) ->
     case read_rep_msg(Fd, FilePosition) of
 	{Date, Msg} ->
-	    MsgStr = lists:flatten(io_lib:format("~p",[Msg])),
+	    MsgStr = lists:flatten(io_lib:format("~tp",[Msg])),
 	    case run_re(MsgStr, RegExp) of
 		match ->
 		    io:format("Found match in report number ~w~n", [Number]),
@@ -722,7 +723,7 @@ run_re(Subject, Regexp) ->
     run_re(Subject, Regexp, []).
 
 run_re(Subject, Regexp, Options) ->
-    case re:run(Subject, Regexp, Options) of
+    case re:run(Subject, Regexp, [unicode|Options--[unicode]]) of
         nomatch ->
             nomatch;
 	_ ->
@@ -748,7 +749,7 @@ filter_report(Dir, Data, Filters, Number, Device, Abort, Log) ->
 		{ok, Fd} ->
 		    filter_rep(Filters, Fd, FilePosition, Device, Abort, Log);
 		_ ->
-		    io:format("rb: can't open file ~p~n", [Fname]),
+		    io:format("rb: can't open file ~tp~n", [Fname]),
 		    {proceed,Device}
 	    end;
 	no_report ->
@@ -800,7 +801,7 @@ filter_report([{Key, RegExp, re}|T], Msg) ->
 	undefined ->
 	    false;
 	Value ->
-	    Subject = lists:flatten(io_lib:format("~p",[Value])),
+	    Subject = lists:flatten(io_lib:format("~tp",[Value])),
 	    case run_re(Subject, RegExp) of
 		match ->
 		    filter_report(T, Msg);
@@ -812,7 +813,7 @@ filter_report([{Key, RegExp, re, no}|T], Msg) ->
 	undefined ->
 	    true;
 	Value ->
-	    Subject = lists:flatten(io_lib:format("~p",[Value])),
+	    Subject = lists:flatten(io_lib:format("~tp",[Value])),
 	    case run_re(Subject, RegExp) of
 		match -> false;
 		_ -> filter_report(T, Msg)
@@ -890,7 +891,7 @@ read_rep(Fd, FilePosition, Device, Abort, Log) ->
 handle_bad_form(Date, Msg, Device, Abort, Log) ->
     io:format("rb: ERROR! A report on bad form was encountered. " ++
 	      "It can not be printed to the log.~n~n"),
-    io:format("Details:~n~p ~p~n~n", [Date,Msg]),
+    io:format("Details:~n~p ~tp~n~n", [Date,Msg]),
     case {Abort,Device,open_log_file(Log)} of
 	{true,standard_io,standard_io} ->
 	    io:format("rb: Logging aborted.~n"),
@@ -899,7 +900,7 @@ handle_bad_form(Date, Msg, Device, Abort, Log) ->
 	    io:format("rb: Logging resumed...~n~n"),
 	    {proceed,Device};
 	{_,_,standard_io} ->
-	    io:format("rb: Can not reopen ~p. Logging aborted.~n", [Log]),
+	    io:format("rb: Can not reopen ~tp. Logging aborted.~n", [Log]),
 	    {abort,Device};
 	{true,_,NewDevice} ->
 	    io:format(NewDevice,
diff --git a/lib/sasl/src/rb_format_supp.erl b/lib/sasl/src/rb_format_supp.erl
index 0004d85af4..b5b7aba151 100644
--- a/lib/sasl/src/rb_format_supp.erl
+++ b/lib/sasl/src/rb_format_supp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -94,19 +94,21 @@ print(Date, Report, Device) ->
 					       [{header, Header}]),
 		    io:format(Device, Format, Args);
 		{Type, _GL, TypeReport} ->
-		    io:format(Device, "~nInfo type <~w> ~s~n",
+                    Modifier = misc_supp:modifier(Device),
+		    io:format(Device, "~nInfo type <~"++Modifier++"w> ~s~n",
 			      [Type, Date]),
-		    io:format(Device, "~p", [TypeReport]);
+		    io:format(Device, "~"++Modifier++"p", [TypeReport]);
 		_ -> 
+                    Modifier = misc_supp:modifier(Device),
 		    io:format("~nPrinting info of unknown type... ~s~n",
 			      [Date]),
-		    io:format(Device, "~p", [Report])
+		    io:format(Device, "~"++Modifier++"p", [Report])
 %	    end
     end.
 
 format_h(Line, Header, Pid, Date) ->
     NHeader = lists:flatten(io_lib:format("~s  ~w", [Header, Pid])), 
-    DateLen = length(Date),
+    DateLen = string:length(Date),
     HeaderLen = Line - DateLen,
     Format = lists:concat(["~-", HeaderLen, "s~", DateLen, "s"]),
     io_lib:format(Format, [NHeader, Date]).
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index 1fcc9a0288..7570b74c1a 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -420,7 +420,7 @@ upgrade_app(App, NewDir) ->
 %%          located in the ebin dir of the _current_ version
 %%-----------------------------------------------------------------
 downgrade_app(App, OldDir) ->
-    case string:tokens(filename:basename(OldDir), "-") of
+    case string:lexemes(filename:basename(OldDir), "-") of
 	[_AppS, OldVsn] ->
 	    downgrade_app(App, OldVsn, OldDir);
 	_ ->
@@ -640,8 +640,8 @@ handle_call({install_release, Vsn, ErrorAction, Opts}, From, S) ->
 	    {noreply, NS};
 	{'EXIT', Reason} ->
 	    io:format("release_handler:"
-		      "install_release(Vsn=~p Opts=~p) failed, "
-		      "Reason=~p~n", [Vsn, Opts, Reason]),
+		      "install_release(Vsn=~tp Opts=~tp) failed, "
+		      "Reason=~tp~n", [Vsn, Opts, Reason]),
 	    gen_server:reply(From, {error, Reason}),
 	    case ErrorAction of
 		restart ->
@@ -831,7 +831,7 @@ do_unpack_release(Root, RelDir, ReleaseName, Releases) ->
     Tar = filename:join(RelDir, ReleaseName ++ ".tar.gz"),
     do_check_file(Tar, regular),
     Rel = ReleaseName ++ ".rel",
-    extract_rel_file(filename:join("releases", Rel), Tar, Root),
+    _ = extract_rel_file(filename:join("releases", Rel), Tar, Root),
     RelFile = filename:join(RelDir, Rel),
     Release = check_rel(Root, RelFile, false),
     #release{vsn = Vsn} = Release,
@@ -1052,8 +1052,8 @@ new_emulator_make_tmp_release(CurrentRelease,ToRelease,RelDir,Opts,Masters) ->
     ToVsn = ToRelease#release.vsn,
     TmpVsn = ?tmp_vsn(CurrentVsn),
     case get_base_libs(ToRelease#release.libs) of
-	{ok,{Kernel,Stdlib,Sasl}=BaseLibs,_} ->
-	    case get_base_libs(ToRelease#release.libs) of
+	{ok,{Kernel,Stdlib,Sasl},_} ->
+	    case get_base_libs(CurrentRelease#release.libs) of
 		{ok,_,RestLibs} ->
 		    TmpErtsVsn = ToRelease#release.erts_vsn,
 		    TmpLibs = [Kernel,Stdlib,Sasl|RestLibs],
@@ -1062,7 +1062,7 @@ new_emulator_make_tmp_release(CurrentRelease,ToRelease,RelDir,Opts,Masters) ->
 							libs = TmpLibs,
 							status = unpacked},
 		    new_emulator_make_hybrid_boot(CurrentVsn,ToVsn,TmpVsn,
-						  BaseLibs,RelDir,Opts,Masters),
+						  RelDir,Opts,Masters),
 		    new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,
 						    RelDir,Masters),
 		    {TmpVsn,TmpRelease};
@@ -1095,7 +1095,7 @@ get_base_libs([],_Kernel,_Stdlib,undefined,_Rest) ->
 get_base_libs([],Kernel,Stdlib,Sasl,Rest) ->
     {ok,{Kernel,Stdlib,Sasl},lists:reverse(Rest)}.
 
-new_emulator_make_hybrid_boot(CurrentVsn,ToVsn,TmpVsn,BaseLibs,RelDir,Opts,Masters) ->
+new_emulator_make_hybrid_boot(CurrentVsn,ToVsn,TmpVsn,RelDir,Opts,Masters) ->
     FromBootFile = filename:join([RelDir,CurrentVsn,"start.boot"]),
     ToBootFile = filename:join([RelDir,ToVsn,"start.boot"]),
     TmpBootFile = filename:join([RelDir,TmpVsn,"start.boot"]),
@@ -1103,11 +1103,7 @@ new_emulator_make_hybrid_boot(CurrentVsn,ToVsn,TmpVsn,BaseLibs,RelDir,Opts,Maste
     Args = [ToVsn,Opts],
     {ok,FromBoot} = read_file(FromBootFile,Masters),
     {ok,ToBoot} = read_file(ToBootFile,Masters),
-    {{_,_,KernelPath},{_,_,StdlibPath},{_,_,SaslPath}} = BaseLibs,
-    Paths = {filename:join(KernelPath,"ebin"),
-	     filename:join(StdlibPath,"ebin"),
-	     filename:join(SaslPath,"ebin")},
-    case systools_make:make_hybrid_boot(TmpVsn,FromBoot,ToBoot,Paths,Args) of
+    case systools_make:make_hybrid_boot(TmpVsn,FromBoot,ToBoot,Args) of
 	{ok,TmpBoot} ->
 	    write_file(TmpBootFile,TmpBoot,Masters);
 	{error,Reason} ->
@@ -1124,7 +1120,7 @@ new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,RelDir,Masters) ->
 	    {ok,[FC]} ->
 		FC;
 	    {error,Error1} ->
-		io:format("Warning: ~w can not read ~p: ~p~n",
+		io:format("Warning: ~w can not read ~tp: ~tp~n",
 			  [?MODULE,FromFile,Error1]),
 		[]
 	end,
@@ -1134,7 +1130,7 @@ new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,RelDir,Masters) ->
 	    {ok,[ToConfig]} ->
 		[lists:keyfind(App,1,ToConfig) || App <- [kernel,stdlib,sasl]];
 	    {error,Error2} ->
-		io:format("Warning: ~w can not read ~p: ~p~n",
+		io:format("Warning: ~w can not read ~tp: ~tp~n",
 			  [?MODULE,ToFile,Error2]),
 		[false,false,false]
 	end,
@@ -1143,8 +1139,9 @@ new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,RelDir,Masters) ->
     Config2 = replace_config(stdlib,Config1,Stdlib),
     Config3 = replace_config(sasl,Config2,Sasl),
 
-    ConfigStr = io_lib:format("~p.~n",[Config3]),
-    write_file(TmpFile,ConfigStr,Masters).
+    ConfigStr = io_lib:format("%% ~s~n~tp.~n",
+                              [epp:encoding_to_string(utf8),Config3]),
+    write_file(TmpFile,unicode:characters_to_binary(ConfigStr),Masters).
 
 %% Take the configuration for application App from the new config and
 %% insert in the old config.
@@ -1173,8 +1170,8 @@ new_emulator_rm_tmp_release(_,_,_,_,Releases,_) ->
 
 %% Rename the tempoarary service (for erts ugprade) to the real ToVsn
 rename_tmp_service(EVsn,TmpVsn,NewVsn) ->
-    FromName = hd(string:tokens(atom_to_list(node()),"@")) ++ "_" ++ TmpVsn,
-    ToName = hd(string:tokens(atom_to_list(node()),"@")) ++ "_" ++ NewVsn,
+    FromName = hd(string:lexemes(atom_to_list(node()),"@")) ++ "_" ++ TmpVsn,
+    ToName = hd(string:lexemes(atom_to_list(node()),"@")) ++ "_" ++ NewVsn,
     case erlsrv:get_service(EVsn,ToName) of
 	{error, _Error} ->
 	    ok;
@@ -1206,9 +1203,9 @@ rename_service(EVsn,FromName,ToName) ->
 %%% in which case we try to rename the old service to the new name and try
 %%% to update heart's view of what service we are really running.
 do_make_services_permanent(PermanentVsn,Vsn, PermanentEVsn, EVsn) ->
-    PermName = hd(string:tokens(atom_to_list(node()),"@")) 
+    PermName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ PermanentVsn,
-    Name = hd(string:tokens(atom_to_list(node()),"@")) 
+    Name = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ Vsn,
     case erlsrv:get_service(EVsn,Name) of
 	{error, _Error} ->
@@ -1295,7 +1292,7 @@ do_make_permanent(#state{releases = Releases,
 
 
 do_back_service(OldVersion, CurrentVersion,OldEVsn,CurrentEVsn) ->
-    NN = hd(string:tokens(atom_to_list(node()),"@")),
+    NN = hd(string:lexemes(atom_to_list(node()),"@")),
     OldName = NN ++ "_" ++ OldVersion,
     CurrentName = NN ++ "_" ++ CurrentVersion,
     UpdData = case erlsrv:get_service(CurrentEVsn,CurrentName) of
@@ -1384,7 +1381,7 @@ do_remove_service(Vsn) ->
     %% Very unconditionally remove the service.
     %% Note that the service could already have been removed when
     %% making another release permanent.
-    ServiceName = hd(string:tokens(atom_to_list(node()),"@")) 
+    ServiceName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ Vsn,
     case erlsrv:get_service(ServiceName) of
 	{error, _Error} ->
@@ -1669,9 +1666,9 @@ flush() ->
 prepare_restart_nt(#release{erts_vsn = EVsn, vsn = Vsn},
 		   #release{erts_vsn = PermEVsn, vsn = PermVsn},
 		   DataFileName) ->
-    CurrentServiceName = hd(string:tokens(atom_to_list(node()),"@")) 
+    CurrentServiceName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ PermVsn,
-    FutureServiceName = hd(string:tokens(atom_to_list(node()),"@")) 
+    FutureServiceName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ Vsn,
     CurrentService = case erlsrv:get_service(PermEVsn,CurrentServiceName) of
 			 {error, _} = Error1 ->
@@ -1807,7 +1804,7 @@ check_opt_file(FileName, Type, Masters) ->
 	ok ->
 	    true;
 	_Error ->
-	    io:format("Warning: ~p missing (optional)~n", [FileName]),
+	    io:format("Warning: ~tp missing (optional)~n", [FileName]),
 	    false
     end.
 
@@ -1841,14 +1838,12 @@ do_check_file(Master, FileName, Type) ->
 %% by the user in another way, i.e. ignore this here.
 %%-----------------------------------------------------------------
 extract_rel_file(Rel, Tar, Root) ->
-    erl_tar:extract(Tar, [{files, [Rel]}, {cwd, Root}, compressed]).
+    _ = erl_tar:extract(Tar, [{files, [Rel]}, {cwd, Root}, compressed]).
 
 extract_tar(Root, Tar) ->
     case erl_tar:extract(Tar, [keep_old_files, {cwd, Root}, compressed]) of
 	ok ->
 	    ok;
-	{error, Reason, Name} ->		% Old erl_tar.
-	    throw({error, {cannot_extract_file, Name, Reason}});
 	{error, {Name, Reason}} ->		% New erl_tar (R3A).
 	    throw({error, {cannot_extract_file, Name, Reason}})
     end.
@@ -1876,9 +1871,10 @@ write_releases_1(Dir, NewReleases, Masters) ->
     write_releases_m(Dir, NewReleases, Masters).
 
 do_write_release(Dir, RELEASES, NewReleases) ->
-    case file:open(filename:join(Dir, RELEASES), [write]) of
+    case file:open(filename:join(Dir, RELEASES), [write,{encoding,utf8}]) of
 	{ok, Fd} ->
-	    ok = io:format(Fd, "~p.~n", [NewReleases]),
+	    ok = io:format(Fd, "%% ~s~n~tp.~n",
+                           [epp:encoding_to_string(utf8),NewReleases]),
 	    ok = file:close(Fd);
 	{error, Reason} ->
 	    {error, Reason}
diff --git a/lib/sasl/src/sasl.app.src b/lib/sasl/src/sasl.app.src
index 633cdfa070..293af504df 100644
--- a/lib/sasl/src/sasl.app.src
+++ b/lib/sasl/src/sasl.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,8 +32,6 @@
 	       sasl_report, 
 	       sasl_report_tty_h, 
 	       sasl_report_file_h, 
-	       si,
-	       si_sasl_supp,
 	       systools, 
 	       systools_make, 
 	       systools_rc, 
@@ -42,9 +40,8 @@
 	      ]},
     {registered, [sasl_sup, alarm_handler, release_handler]},
     {applications, [kernel, stdlib]},
-    {env, [{sasl_error_logger, tty},
-           {errlog_type, all}]},
+    {env, []},
     {mod, {sasl, []}},
-    {runtime_dependencies, ["tools-2.6.14","stdlib-3.0","kernel-5.0",
-			    "erts-8.1"]}]}.
+    {runtime_dependencies, ["tools-2.6.14","stdlib-3.4","kernel-5.3",
+			    "erts-10.2"]}]}.
 
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index ecd320c1ea..26127eae84 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -1,7 +1,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -16,11 +16,30 @@
 %% limitations under the License.
 %%
 %% %CopyrightEnd%
+%%
+%% We allow upgrade from, and downgrade to all previous
+%% versions from the following OTP releases:
+%% - OTP 20
+%% - OTP 21
+%%
+%% We also allow upgrade from, and downgrade to all
+%% versions that have branched off from the above
+%% stated previous versions.
+%%
 {"%VSN%",
- %% Up from - max one major revision back
- [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},      % OTP-19.*
-  {<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-18.*
- %% Down to - max one major revision back
- [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},     % OTP-19.*
-  {<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-18.*
-}.
+ [{<<"^3\\.0\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.1$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.2(?:\\.[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\\.0\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.1$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.2(?:\\.[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]}]}.
diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index 24afaee183..0c68c93dc6 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -31,45 +31,52 @@
 %%%-----------------------------------------------------------------
 -behaviour(application).
 
--record(state, {sasl_error_logger, error_logger_mf}).
+-record(state, {sasl_logger, error_logger_mf}).
 
 start(_, []) ->
-    Handler = get_sasl_error_logger(),
-    Type = get_sasl_error_logger_type(),
+    {Dest,Level} = get_logger_info(),
     Mf = get_error_logger_mf(),
-    add_sasl_error_logger(Handler, Type),
+    add_sasl_logger(Dest, Level),
     add_error_logger_mf(Mf),
-    State = #state{sasl_error_logger = Handler, error_logger_mf = Mf}, 
+    State = #state{sasl_logger = Dest, error_logger_mf = Mf},
     case supervisor:start_link({local, sasl_sup}, sasl, []) of
 	{ok, Pid} -> {ok, Pid, State};
 	Error -> Error
     end.
 
 stop(State) ->
-    delete_sasl_error_logger(State#state.sasl_error_logger),
+    delete_sasl_logger(State#state.sasl_logger),
     delete_error_logger_mf(State#state.error_logger_mf).
 
 %%-----------------------------------------------------------------
 %% Internal functions
 %%-----------------------------------------------------------------
-get_sasl_error_logger() ->
+get_logger_info() ->
+    case application:get_env(kernel, logger_sasl_compatible) of
+        {ok,true} ->
+            {get_logger_dest(),get_logger_level()};
+        _ ->
+            {std,undefined}
+    end.
+
+get_logger_dest() ->
     case application:get_env(sasl, sasl_error_logger) of
-	{ok, false} -> undefined;
-	{ok, tty} -> tty;
-	{ok, {file, File}} when is_list(File) -> {file, File, [write]};
-	{ok, {file, File, Modes}} when is_list(File), is_list(Modes) ->
-        {file, File, Modes};
-	{ok, Bad} -> exit({bad_config, {sasl, {sasl_error_logger, Bad}}});
-	_ -> undefined
+        {ok, false} -> undefined;
+        {ok, tty} -> standard_io;
+        {ok, {file, File}} when is_list(File) -> {file, File};
+        {ok, {file, File, Modes}} when is_list(File), is_list(Modes) ->
+            {file, File, Modes};
+        {ok, Bad} -> exit({bad_config, {sasl, {sasl_logger_dest, Bad}}});
+        undefined -> standard_io
     end.
 
-get_sasl_error_logger_type() ->
+get_logger_level() ->
     case application:get_env(sasl, errlog_type) of
-	{ok, error} -> error;
-	{ok, progress} -> progress;
-	{ok, all} -> all;
-	{ok, Bad} -> exit({bad_config, {sasl, {errlog_type, Bad}}});
-	_ -> all
+        {ok, error} -> error;
+        {ok, progress} -> info;
+        {ok, all} -> info;
+        {ok, Bad} -> exit({bad_config, {sasl, {errlog_type, Bad}}});
+        _ -> info
     end.
 
 get_error_logger_mf() ->
@@ -119,26 +126,36 @@ get_mf_maxf() ->
 	{ok, Bad} -> exit({bad_config, {sasl, {error_logger_mf_maxfiles, Bad}}})
     end.
 
-add_sasl_error_logger(undefined, _Type) -> ok;
-add_sasl_error_logger(Handler, Type) ->
-    error_logger:add_report_handler(mod(Handler), args(Handler, Type)).
-
-delete_sasl_error_logger(undefined) -> ok;
-delete_sasl_error_logger(Type) ->
-    error_logger:delete_report_handler(mod(Type)).
-
-mod(tty) -> sasl_report_tty_h;
-mod({file, _File, _Modes}) -> sasl_report_file_h.
-
-args({file, File, Modes}, Type) -> {File, Modes, type(Type)};
-args(_, Type) -> type(Type).
-
-type(error) -> error;
-type(progress) -> progress;
-type(_) -> all.
+add_sasl_logger(undefined, _Level) -> ok;
+add_sasl_logger(std, undefined) -> ok;
+add_sasl_logger(Dest, Level) ->
+    FC = #{legacy_header=>true,
+           single_line=>false},
+    case Level of
+        info -> allow_progress();
+        _ -> ok
+    end,
+    ok = logger:add_handler(sasl,logger_std_h,
+                            #{level=>Level,
+                              filter_default=>stop,
+                              filters=>
+                                  [{remote_gl,
+                                    {fun logger_filters:remote_gl/2,stop}},
+                                   {sasl_domain,
+                                    {fun logger_filters:domain/2,
+                                     {log,equal,[otp,sasl]}}}],
+                              config=>#{type=>Dest},
+                              formatter=>{logger_formatter,FC}}).
+
+delete_sasl_logger(undefined) -> ok;
+delete_sasl_logger(std) -> ok;
+delete_sasl_logger(_Type) ->
+    _ = logger:remove_handler(sasl),
+    ok.
 
 add_error_logger_mf(undefined) -> ok;
 add_error_logger_mf({Dir, MaxB, MaxF}) ->
+    allow_progress(),
     error_logger:add_report_handler(
       log_mf_h, log_mf_h:init(Dir, MaxB, MaxF, fun pred/1)).
 
@@ -149,6 +166,13 @@ delete_error_logger_mf(_) ->
 pred({_Type, GL, _Msg}) when node(GL) =/= node() -> false;
 pred(_) -> true.
 
+allow_progress() ->
+    #{level:=PL} = logger:get_primary_config(),
+    case logger:compare_levels(info,PL) of
+        lt -> ok = logger:set_primary_config(level,info);
+        _ -> ok
+    end.
+
 %%%-----------------------------------------------------------------
 %%% supervisor functionality
 %%%-----------------------------------------------------------------
diff --git a/lib/sasl/src/sasl_report.erl b/lib/sasl/src/sasl_report.erl
index 14702b0ad2..e6556ec6ce 100644
--- a/lib/sasl/src/sasl_report.erl
+++ b/lib/sasl/src/sasl_report.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@ io_report(_IO, _Fd, _, _) ->
 is_my_error_report(all, Type)   ->  is_my_error_report(Type);
 is_my_error_report(error, Type) ->  is_my_error_report(Type);
 is_my_error_report(_, _Type)    ->  false.
+
 is_my_error_report(supervisor_report)   -> true;
 is_my_error_report(crash_report)        -> true;
 is_my_error_report(_)                   -> false.
@@ -54,6 +55,7 @@ is_my_error_report(_)                   -> false.
 is_my_info_report(all, Type)      -> is_my_info_report(Type);
 is_my_info_report(progress, Type) -> is_my_info_report(Type);
 is_my_info_report(_, _Type)       -> false.
+
 is_my_info_report(progress)  -> true;
 is_my_info_report(_)                    -> false.
 
@@ -62,54 +64,65 @@ write_report2(IO, Fd, Head, supervisor_report, Report) ->
     Context = sup_get(errorContext, Report),
     Reason = sup_get(reason, Report),
     Offender = sup_get(offender, Report),
-    {FmtString,Args} = supervisor_format([Name,Context,Reason,Offender]),
-    write_report_action(IO, Fd, Head, FmtString, Args);
+    Enc = encoding(Fd),
+    {FmtString,Args} = supervisor_format([Name,Context,Reason,Offender], Enc),
+    String = io_lib:format(FmtString, Args),
+    write_report_action(IO, Fd, Head, String);
 write_report2(IO, Fd, Head, progress, Report) ->
-    Format = format_key_val(Report),
-    write_report_action(IO, Fd, Head, "~s", [Format]);
+    Encoding = encoding(Fd),
+    Depth = error_logger:get_format_depth(),
+    String = format_key_val(Report, Encoding, Depth),
+    write_report_action(IO, Fd, Head, String);
 write_report2(IO, Fd, Head, crash_report, Report) ->
-    Depth = get_depth(),
-    Format = proc_lib:format(Report, latin1, Depth),
-    write_report_action(IO, Fd, Head, "~s", [Format]).
-
-supervisor_format(Args0) ->
-    case get_depth() of
-	unlimited ->
-	    {"     Supervisor: ~p~n"
-	     "     Context:    ~p~n"
-	     "     Reason:     ~80.18p~n"
-	     "     Offender:   ~80.18p~n~n",
-	     Args0};
-	Depth ->
-	    [A,B,C,D] = Args0,
-	    Args = [A,Depth,B,Depth,C,Depth,D,Depth],
-	    {"     Supervisor: ~P~n"
-	     "     Context:    ~P~n"
-	     "     Reason:     ~80.18P~n"
-	     "     Offender:   ~80.18P~n~n",
-	     Args}
-    end.
-
-write_report_action(IO, Fd, Head, Format, Args) ->
-    S = [Head|io_lib:format(Format, Args)],
+    Encoding = encoding(Fd),
+    Depth = error_logger:get_format_depth(),
+    String = proc_lib:format(Report, Encoding, Depth),
+    write_report_action(IO, Fd, Head, String).
+
+supervisor_format(Args0, Encoding) ->
+    {P, Tl} = p(Encoding, error_logger:get_format_depth()),
+    [A,B,C,D] = Args0,
+    Args = [A|Tl] ++ [B|Tl] ++ [C|Tl] ++ [D|Tl],
+    {"     Supervisor: ~" ++ P ++ "\n"
+     "     Context:    ~" ++ P ++ "\n"
+     "     Reason:     ~80.18" ++ P ++ "\n"
+     "     Offender:   ~80.18" ++ P ++ "\n~n",
+     Args}.
+
+write_report_action(IO, Fd, Head, String) ->
+    S = [Head|String],
     case IO of
 	io -> io:put_chars(Fd, S);
 	io_lib -> S
     end.
 
-format_key_val([{Tag,Data}|Rep]) ->
-    io_lib:format("    ~16w: ~p~n",[Tag,Data]) ++ format_key_val(Rep);
-format_key_val(_) ->
+format_key_val(Rep, Encoding, Depth) ->
+    {P, Tl} = p(Encoding, Depth),
+    format_key_val1(Rep, P, Tl).
+
+format_key_val1([{Tag,Data}|Rep], P, Tl) ->
+    (io_lib:format("    ~16w: ~" ++ P ++ "\n", [Tag, Data|Tl]) ++
+     format_key_val1(Rep, P, Tl));
+format_key_val1(_, _, _) ->
     [].
 
-get_depth() ->
-    case application:get_env(kernel, error_logger_format_depth) of
-	{ok, Depth} when is_integer(Depth) ->
-	    max(10, Depth);
-	undefined ->
-	    unlimited
+p(Encoding, Depth) ->
+    {Letter, Tl}  = case Depth of
+                        unlimited -> {"p", []};
+                        _         -> {"P", [Depth]}
+                    end,
+    P = modifier(Encoding) ++ Letter,
+    {P, Tl}.
+
+encoding(IO) ->
+    case lists:keyfind(encoding, 1, io:getopts(IO)) of
+	false -> latin1;
+	{encoding, Enc} -> Enc
     end.
 
+modifier(latin1) -> "";
+modifier(_) -> "t".
+
 sup_get(Tag, Report) ->
     case lists:keysearch(Tag, 1, Report) of
 	{value, {_, Value}} ->
diff --git a/lib/sasl/src/sasl_report_file_h.erl b/lib/sasl/src/sasl_report_file_h.erl
index 21746839fa..05d6acd076 100644
--- a/lib/sasl/src/sasl_report_file_h.erl
+++ b/lib/sasl/src/sasl_report_file_h.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,15 +29,27 @@
 	 handle_event/2, handle_call/2, handle_info/2,
 	 terminate/2]).
 
-init({File, Modes, Type}) when is_list(Modes) ->
+init({File, Modes0, Type}) when is_list(Modes0) ->
     process_flag(trap_exit, true),
+    Modes1 =
+        case lists:keymember(encoding,1,Modes0) of
+            true -> Modes0;
+            false -> [{encoding,utf8}|Modes0]
+        end,
+    Modes =
+        case [M || M <- Modes1, lists:member(M,[write,append,exclusive])] of
+            [] ->
+                [write|Modes1];
+            _ ->
+                Modes1
+        end,
     case file:open(File, Modes) of
 	{ok,Fd} ->
 	    {ok, {Fd, File, Type}};
 	What ->
 	    What
     end.
-    
+
 handle_event({_Type, GL, _Msg}, State) when node(GL) /= node() ->
     {ok, State};
 handle_event(Event, {Fd, File, Type}) ->
diff --git a/lib/sasl/src/si.erl b/lib/sasl/src/si.erl
deleted file mode 100644
index 275c6d508b..0000000000
--- a/lib/sasl/src/si.erl
+++ /dev/null
@@ -1,169 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%-----------------------------------------------------------------
-%% l(format_lib_supp), l(si_sasl_supp), l(si), l(si_ms_aos_supp), l(misc_supp).
-%% c(format_lib_supp), c(si_sasl_supp), c(si), c(si_ms_aos_supp), c(misc_supp).
-%%-----------------------------------------------------------------
-
-
-%%--------------------------------------------------
-%% Description:
-%% Status Inspection, main module.
-%%--------------------------------------------------
-
--module(si).
-
-
-%% External exports
--export([h/0, help/0, start/0, start/1, start_log/1, stop_log/0,
-	 abbrevs/0, pi/1, pi/2, pi/3, pi/4, ppi/1, ppi/3, stop/0]).
-
-%% Internal exports
--export([pi_impl/2, test/0]).
-
-
-%%--------------------------------------------------
-%% Table of contents
-%% 1. Interface
-%% 2. Implementation
-
-
--import(si_sasl_supp, [status_info/1, make_pid/1, p/1]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 1. Interface
-%%--------------------------------------------------
-
-h() -> print_help().
-help() -> print_help().
-
-start() -> si_sasl_supp:start().
-start(Options) -> si_sasl_supp:start(Options).
-
-stop() -> si_sasl_supp:stop().
-
-start_log(FileName) ->
-    si_sasl_supp:start_log(FileName).
-
-stop_log() ->
-    si_sasl_supp:stop_log().
-
-%%%-----------------------------------------------------------------
-%%% All functions can be called with an option 'normal' or 'all';
-%%% default is 'normal'.
-%%%-----------------------------------------------------------------
-
-abbrevs() ->
-    io:format("~p", [lists:append(si_sasl_supp:process_abbrevs(),
-				  process_abbrevs())]).
-
-%%-----------------------------------------------------------------
-%% Process Info that tries to determine processtype (=Module), then
-%% it uses this Module:format_info to format data from status_info/1.
-%%-----------------------------------------------------------------
-pi(XPid) -> 
-    si_sasl_supp:si_exec({si, pi_impl}, [normal, XPid]).
-
-pi(Opt, XPid) ->
-    si_sasl_supp:si_exec({si, pi_impl}, [si_sasl_supp:valid_opt(Opt), XPid]).
-
-pi(A, B, C) when is_integer(A), is_integer(B), is_integer(C) ->
-    si_sasl_supp:si_exec({si, pi_impl}, [normal, {A, B, C}]).
-
-pi(Opt, A, B, C) when is_integer(A), is_integer(B), is_integer(C) ->
-    si_sasl_supp:si_exec({si, pi_impl}, [si_sasl_supp:valid_opt(Opt), {A, B, C}]).
-
-%%-----------------------------------------------------------------
-%% Pretty print Process_Info.
-%%-----------------------------------------------------------------
-ppi(XPid) ->
-    si_sasl_supp:ppi(XPid).
-ppi(A, B, C) ->
-    si_sasl_supp:ppi(A, B, C).
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 2. Implementation
-%%--------------------------------------------------
-
-print_help() ->
-    p("~nStatus Inspection tool - usage"),
-    p("=============================="),
-    p("    For all these functions, Opt is an optional argument"),
-    p("    which can be 'normal' or 'all'; default is 'normal'."),
-    p("    If 'all', all information will be printed."),
-    p("    A Pid can be: \"<A.B.C>\", {A, B, C}, B, a registered_name or an abbrev."),
-    p("ANY PROCESS"),
-    p("si:pi([Opt,] Pid)   - Formatted information about any process that"),
-    p("                      SI recognises."),
-    p("si:pi([Opt,] A,B,C) - Same as si:pi({A, B, C})."), 
-    p("si:ppi(Pid)         - Pretty formating of process_info."),
-    p("                      Works for any process."),
-    p("MISC"),
-    p("si:abbrevs()        - Lists valid abbreviations."),
-    p("si:start_log(Filename) - Logging to file."),
-    p("si:stop_log()"),
-    p("si:start()          - Starts Status Inspection (the si_server)."),
-    p("si:start([{start_log, FileName}])"),
-    p("si:stop()           - Shut down SI.").
-
-
-%%--------------------------------------------------
-%% Copied (and modified) code from si_sasl_supp.  
-%%--------------------------------------------------
-pi_impl(Opt, XPid) ->
-    case make_pid(try_local_expand_abbrev(XPid)) of
-	Pid when is_pid(Pid) ->
-	    case status_info(Pid) of
-		{status_info, Pid, {module, Module}, Data} ->
-		    si_sasl_supp:do_best_printout(Opt, Pid, Module, Data);
-		{error, Reason} ->
-		    _ = si_sasl_supp:ppi_impl(Pid),
-		    {error, {"can not get status info from process:",
-			     XPid,
-			     Reason}};
-		Else ->
-		    {error, {"unknown status info", Else}}
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-%%--------------------------------------------------
-%% Functions for handling of abbreviations
-%%--------------------------------------------------
-try_local_expand_abbrev(Abbrev) ->
-    case si_sasl_supp:expand_abbrev(Abbrev, process_abbrevs()) of
-	{value, {_, RealName}} -> RealName;
-	_ -> Abbrev
-    end.
-
-process_abbrevs() ->
-    [].
-
-%% Test get_status_info/format_status_info for all implemented servers.
-test() ->
-    lists:foreach(fun test_all_registered/1,
-		  lists:append(si_sasl_supp:process_abbrevs(),
-			       process_abbrevs())).
-
-test_all_registered({Al, _Ful}) ->
-    si:pi(all, Al).
diff --git a/lib/sasl/src/si_sasl_supp.erl b/lib/sasl/src/si_sasl_supp.erl
deleted file mode 100644
index cce628f8c4..0000000000
--- a/lib/sasl/src/si_sasl_supp.erl
+++ /dev/null
@@ -1,380 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
--module(si_sasl_supp).
-
--behaviour(gen_server).
-
-%%%---------------------------------------------------------------------------
-%%% Description:
-%%% This module contains the BOS specific parts of the Status Inspection Tool.
-%%%---------------------------------------------------------------------------
-
-
-%% user interface
--export([h/0, help/0, start_log/1, stop_log/0, abbrevs/0, pi/1, pi/2, pi/3,
-	 pi/4, ppi/1, ppi/3, start/0, start/1, stop/0, start_link/1]).
-
-%% intermodule exports
--export([make_pid/1, make_pid/3, process_abbrevs/0, expand_abbrev/2,
-	 status_info/1, valid_opt/1, p/1, do_best_printout/4,
-	 si_exec/2, handle_call/3, terminate/2]).
-
-%% exports for use within module
--export([init/1, start_log_impl/1, pi_impl/2, ppi_impl/1]).
-
-%% other gen_server callbacks (not used)
--export([handle_cast/2, handle_info/2, code_change/3]).
-
-%%--------------------------------------------------
-%% Table of contents
-%% 1. Interface
-%% 2. SI - Server
-%% 3. Code
-%% 4. Selectors
-%%--------------------------------------------------
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 1. Interface
-%% -----------------------------------------------------
-
-h() -> print_help().
-help() -> print_help().
-
-si_exec(Fun, Args) -> call({si_exec, Fun, Args}).
-
-start_log(FileName) ->
-    call({start_log, FileName}).
-
-stop_log() ->
-    call(stop_log).
-
-abbrevs() ->
-    io:format("~p", [process_abbrevs()]).
-
-%%-----------------------------------------------------------------
-%% All functions can be called with an option 'normal' or 'all';
-%% default is 'normal'.
-%%-----------------------------------------------------------------
-%% Process Info that tries to determine processtype (=Module), then
-%% it uses this Module:format_info to format data from status_info/1.
-%%-----------------------------------------------------------------
-pi(XPid) -> 
-    si_exec({si_sasl_supp, pi_impl}, [normal, XPid]).
-
-pi(Opt, XPid) ->
-    si_exec({si_sasl_supp, pi_impl}, [valid_opt(Opt), XPid]).
-
-pi(A, B, C) when is_integer(A), is_integer(B), is_integer(C) ->
-    si_exec({si_sasl_supp, pi_impl}, [normal, {A, B, C}]).
-
-pi(Opt, A, B, C) when is_integer(A), is_integer(B), is_integer(C) ->
-    si_exec({si_sasl_supp, pi_impl}, [valid_opt(Opt), {A, B, C}]).
-
-%%-----------------------------------------------------------------
-%% Pretty print Process_Info.
-%%-----------------------------------------------------------------
-ppi(XPid) ->
-    case whereis(si_server) of
-	undefined ->           % You can always run ppi.
-	    ppi_impl(XPid);    % if si_server is down, use standard_io
-	_ ->
-	    si_exec({si_sasl_supp, ppi_impl}, [XPid])
-    end.
-ppi(A, B, C) ->
-    case whereis(si_server) of
-	undefined ->               % You can always run ppi.
-	    ppi_impl({A, B, C});   % if si_server is down, use standard_io
-	_ ->
-	    si_exec({si_sasl_supp, ppi_impl}, [{A, B, C}])
-    end.
-
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 2. SI - Server
-%%--------------------------------------------------
--record(state, {}).
-
-start() -> start([]).
-start(Options) ->
-    supervisor:start_child(sasl_sup, 
-			   {si_server, {si_sasl_supp, start_link, [Options]},
-			    temporary, brutal_kill, worker, [si_sasl_supp]}).
-
-start_link(_Options) ->
-    gen_server:start_link({local, si_server}, si_sasl_supp, [], []).
-
-stop() ->
-    call(stop),
-    supervisor:delete_child(sasl_sup, si_server).
-
-
-init(Options) ->
-    process_flag(trap_exit, true),
-    start_log_impl(get_option(Options, start_log, standard_io)),
-    {ok, #state{}}.
-
-%%-----------------------------------------------------------------
-%% If an error occurs and we're logging to file: write the error
-%% to the file.
-%% Always return the error.
-%% The only data held by the si_server is the device in its process dictionary.
-%%-----------------------------------------------------------------
-handle_call({si_exec, Fun, Args}, _From, State) ->
-    case catch apply(Fun, Args) of
-	{'EXIT', Reason} ->
-	    print_error(get(device),
-			"SI internal error. Reason: ~w~n",
-			[Reason]),
-	    {stop, shutdown, {internal_error, Reason}, State};
-	{error, Reason} ->
-	    print_error(get(device), "~nSI error: ~w~n", [Reason]),
-	    {reply, {error, Reason}, State};
-	X -> 
-	    {reply, X, State}
-    end;
-handle_call({start_log, FileName}, _From, State) ->
-    start_log_impl(FileName),
-    {reply, ok, State};
-handle_call(stop_log, _From, State) ->
-    start_log_impl(standard_io),
-    {reply, ok, State};
-handle_call(stop, _From, State) ->
-    start_log_impl(standard_io),
-    {stop, normal, stopped, State}.
-
-terminate(_Reason, _State) ->
-    _ = close_device(get(device)),
-    ok.
-
-handle_cast(_Msg, State) ->
-    {noreply, State}.
-handle_info(_Info, State) ->
-    {noreply, State}.
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-close_device(standard_io) -> ok;
-close_device(Fd) -> file:close(Fd).
-
-print_error(standard_io, _, _) -> ok;
-print_error(Device, Format, Args) ->
-    io:format(Device, Format, Args).
-
-get_option(Options, Key, Default) ->
-    case lists:keysearch(Key, 1, Options) of
-	{value, {_Key, Value}} -> Value;
-	_ -> Default
-    end.
-
-open_log_file(undefined, NewFile) ->
-    open_log_file(NewFile);
-open_log_file(standard_io, NewFile) ->
-    open_log_file(NewFile);
-open_log_file(OldFile, NewFile) ->
-    _ = file:close(OldFile),
-    open_log_file(NewFile).
-
-open_log_file(standard_io) -> standard_io;
-open_log_file(FileName) ->
-    case file:open(FileName, [write]) of
-	{ok, Fd} -> Fd;
-	Error -> 
-	    io:format("si_sasl_supp: Cannot open file '~s' (~w).~n",
-		      [FileName, Error]),
-	    io:format("si_sasl_supp: Using standard_io~n"),
-	    standard_io
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 3. Code
-%%--------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% call(Request) -> Term
-%%-----------------------------------------------------------------
-call(Req) ->
-    gen_server:call(si_server, Req, infinity).
-
-%%--------------------------------------------------
-%% Makes a Pid of almost anything.
-%% Returns: Pid|{error, Reason}
-%% Fails: Never.
-%%--------------------------------------------------
-make_pid(A,B,C) when is_integer(A), is_integer(B), is_integer(C) ->
-    list_to_pid(lists:concat(["<",A,".",B,".",C,">"])).
-make_pid(P) when is_pid(P) -> P;
-make_pid(undefined) -> undefined;
-make_pid(P) when is_atom(P) ->
-    case whereis(P) of
-	undefined ->
-	    case expand_abbrev(P, process_abbrevs()) of
-		{error, Reason} -> {error, Reason};
-		{value, {_Abbrev, FullName}} ->
-		    case whereis(FullName) of
-			undefined ->
-			    {error, {'process not registered', P}};
-			Pid -> Pid
-		    end
-	    end;
-	Pid -> Pid
-    end;
-make_pid(P) when is_list(P) -> list_to_pid(P);
-make_pid({A, B, C}) -> make_pid(A, B, C);
-make_pid(X) -> {error, {'can not make a pid of', X}}.
-
-process_abbrevs() ->
-    [{init, init},
-     {fs, file_server}].
-     
-%%--------------------------------------------------
-%% Args: Abbrevs is an assoc-list of {Abbrev, RealName}
-%% Returns: {value, {Abbrev, FullName}}|{error, Reason}
-%%--------------------------------------------------
-expand_abbrev(ProcessName, Abbrevs) ->
-    case lists:keysearch(ProcessName, 1, Abbrevs) of
-	{value, {Abbrev, FullName}} ->
-	    {value, {Abbrev, FullName}};
-	_ ->
-	    case lists:keysearch(ProcessName, 2, Abbrevs) of
-		{value, {Abbrev, FullName}} ->
-		    {value, {Abbrev, FullName}};
-		_ ->
-		    {error, {'invalid process name', ProcessName}}
-	    end
-    end.
-
-%%-----------------------------------------------------------------
-%% This is the function that actually gets the information out
-%% of the agent/server/...
-%% Returns: {status_info, Pid, Type, Data}
-%%        | {error, Reason}
-%%-----------------------------------------------------------------
-status_info(Pid) when is_pid(Pid) ->
-    case catch sys:get_status(Pid, 5000) of
-	{status, Pid, Type, Info} ->
-	    {status_info, Pid, Type, Info};
-	_ ->
-	    {error, {'process does not respond', Pid}}
-    end;
-
-status_info(X) ->
-    {error, {'not a pid', X}}.
-
-%%--------------------------------------------------
-%% Implementation starts here.
-%%--------------------------------------------------
-start_log_impl(FileName) ->
-    put(device, open_log_file(get(device), FileName)).
-
-valid_opt(all) -> all;
-valid_opt(_Opt) -> normal.
-
-
-print_help() ->
-    p("- - - - - - - - PROCESSES - - - - - - - - - "),
-    p("si_sasl_supp:pi([Opt,] Pid)   - Formatted information about any process that"),
-    p("                      SI recognises."),
-    p("si_sasl_supp:pi([Opt,] A,B,C) - Same as si_sasl_supp:pi({A, B, C})."), 
-    p("si_sasl_supp:ppi(Pid)         - Pretty formating of process_info."),
-    p("                      Works for any process."),
-    p("- - - - - - - - MISC  - - - - - - - - - - - "),
-    p("si_sasl_supp:abbrevs()        - Lists valid abbreviations."),
-    p("si_sasl_supp:start_log(FileNname)"),
-    p("si_sasl_supp:stop_log()"),
-    p("si_sasl_supp:start()          - Starts Status Inspection (the si_server)."),
-    p("si_sasl_supp:start([{start_log, FileName}])"),
-    p("si_sasl_supp:stop()           - Shut down SI.").
-
-
-
-%% Convenient shorthand
-p(X) ->
-    io:format(lists:append(X, "~n")).
-
-pi_impl(Opt, XPid) ->
-    case make_pid(XPid) of
-	Pid when is_pid(Pid) ->
-	    case status_info(Pid) of
-		{status_info, Pid, {module, Module}, Data} ->
-		    do_best_printout(Opt, Pid, Module, Data);
-		{error, Reason} ->
-		    _ = ppi_impl(Pid),
-		    {error, {"can not get status info from process:",
-			     XPid,
-			     Reason}}
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-%%--------------------------------------------------
-%% Is there a format_info for this process? In that case, run it!
-%% Return ok|{error, Reason}
-%% Fails: Never.
-%%--------------------------------------------------
-do_best_printout(Opt, Pid, Mod, Data) when is_pid(Pid) ->
-    case print_info(get(device), Pid, {Mod, format_status}, Opt, Data) of
-	ok -> ok;
-	{error, Reason} ->
-	    _ = ppi_impl(Pid),
-	    {error, Reason}
-    end.
-
-ppi_impl(XPid) -> 
-    case make_pid(XPid) of
-	P when is_pid(P) -> 
-	    case process_info(P) of
-		undefined ->
-		    {error, {'dead process', P}};
-		PI ->
-		    Device = case get(device) of
-				 undefined -> standard_io;
-				 X -> X
-			     end,
-		    io:format(Device, "~nPretty Process Info~n", []),
-		    io:format(Device, "-------------------~n", []),
-		    io:format(Device, "~p~n", [PI])
-	    end;
-	_ -> {error, {no_pid, XPid}}
-    end.
-
-print_info(Device, Pid, {Module, Func}, Opt, Data) ->
-    case erlang:function_exported(Module, Func, 2) of
-	true ->
-	    case catch apply(Module, Func, [Opt, Data]) of
-		Format when is_list(Format) ->
-		    format_lib_supp:print_info(Device, 79,
-					       add_pid_to_format(Pid, Format)),
-		    ok;
-		Other -> {error, {'invalid format', Other}}
-	    end;
-	_ ->
-	    {error, {no_such_function, Module, Func}}
-    end.
-
-add_pid_to_format(Pid, [{header, H} | T]) ->
-    [{header, H}, {data, [{"Pid", Pid}]} | T];
-add_pid_to_format(Pid, List) ->
-    [{data, [{"Pid", Pid}]} | List].
-
-
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index efe6cc9eb4..f085246924 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 
 -export([read_application/4]).
 
--export([make_hybrid_boot/5]).
+-export([make_hybrid_boot/4]).
 
 -import(lists, [filter/2, keysort/2, keysearch/3, map/2, reverse/1,
 		append/1, foldl/3,  member/2, foreach/2]).
@@ -94,7 +94,11 @@ make_script(RelName, Output, Flags) when is_list(RelName),
 		    Warnings = wsasl(Flags, Warnings0),
 		    case systools_lib:werror(Flags, Warnings) of
 			true ->
-			    return(ok,Warnings,Flags);
+                            Warnings1 = [W || {warning,W}<-Warnings],
+			    return({error,?MODULE,
+                                    {warnings_treated_as_errors,Warnings1}},
+                                   Warnings,
+                                   Flags);
 			false ->
 			    case generate_script(Output,Release,Appls,Flags) of
 				ok ->
@@ -115,7 +119,6 @@ make_script(RelName, _Output, Flags) when is_list(Flags) ->
 make_script(RelName, _Output, Flags) ->
     badarg(Flags,[RelName, Flags]).
 
-
 wsasl(Options, Warnings) ->
     case lists:member(no_warn_sasl,Options) of
 	true -> lists:delete({warning,missing_sasl},Warnings);
@@ -148,21 +151,10 @@ get_outdir(Flags) ->
 return(ok,Warnings,Flags) ->
     case member(silent,Flags) of
 	true ->
-	    case systools_lib:werror(Flags, Warnings) of
-		true ->
-		    error;
-		false ->
-		    {ok,?MODULE,Warnings}
-	    end;
+            {ok,?MODULE,Warnings};
 	_ ->
-	    case member(warnings_as_errors,Flags) of
-		true ->
-		    io:format("~ts",[format_warning(Warnings, true)]),
-		    error;
-		false ->
-		    io:format("~ts",[format_warning(Warnings)]),
-		    ok
-	    end
+            io:format("~ts",[format_warning(Warnings)]),
+            ok
     end;
 return({error,Mod,Error},_,Flags) ->
     case member(silent,Flags) of
@@ -186,94 +178,153 @@ return({error,Mod,Error},_,Flags) ->
 %% and sasl.
 %%
 %% TmpVsn = string(),
-%% Paths = {KernelPath,StdlibPath,SaslPath}
 %% Returns {ok,Boot} | {error,Reason}
 %% Boot1 = Boot2 = Boot = binary()
 %% Reason = {app_not_found,App} | {app_not_replaced,App}
-%% App = kernel | stdlib | sasl
-make_hybrid_boot(TmpVsn, Boot1, Boot2, Paths, Args) ->
-    catch do_make_hybrid_boot(TmpVsn, Boot1, Boot2, Paths, Args).
-do_make_hybrid_boot(TmpVsn, Boot1, Boot2, Paths, Args) ->
-    {script,{_RelName1,_RelVsn1},Script1} = binary_to_term(Boot1),
-    {script,{RelName2,_RelVsn2},Script2} = binary_to_term(Boot2),
-    MatchPaths = get_regexp_path(Paths),
-    NewScript1 = replace_paths(Script1,MatchPaths),
-    {Kernel,Stdlib,Sasl} = get_apps(Script2,undefined,undefined,undefined),
-    NewScript2 = replace_apps(NewScript1,Kernel,Stdlib,Sasl),
-    NewScript3 = add_apply_upgrade(NewScript2,Args),
-    Boot = term_to_binary({script,{RelName2,TmpVsn},NewScript3}),
+%% App = stdlib | sasl
+make_hybrid_boot(TmpVsn, Boot1, Boot2, Args) ->
+    catch do_make_hybrid_boot(TmpVsn, Boot1, Boot2, Args).
+do_make_hybrid_boot(TmpVsn, OldBoot, NewBoot, Args) ->
+    {script,{_RelName1,_RelVsn1},OldScript} = binary_to_term(OldBoot),
+    {script,{NewRelName,_RelVsn2},NewScript} = binary_to_term(NewBoot),
+
+    %% Everyting upto kernel_load_completed must come from the new script
+    Fun1 = fun({progress,kernel_load_completed}) -> false;
+              (_) -> true
+           end,
+    {_OldKernelLoad,OldRest1} = lists:splitwith(Fun1,OldScript),
+    {NewKernelLoad,NewRest1} = lists:splitwith(Fun1,NewScript),
+
+    Fun2 = fun({progress,modules_loaded}) -> false;
+              (_) -> true
+           end,
+    {OldModLoad,OldRest2} = lists:splitwith(Fun2,OldRest1),
+    {NewModLoad,NewRest2} = lists:splitwith(Fun2,NewRest1),
+
+    Fun3 = fun({kernelProcess,_,_}) -> false;
+              (_) -> true
+           end,
+    {OldPaths,OldRest3} = lists:splitwith(Fun3,OldRest2),
+    {NewPaths,NewRest3} = lists:splitwith(Fun3,NewRest2),
+
+    Fun4 = fun({progress,init_kernel_started}) -> false;
+              (_) -> true
+           end,
+    {_OldKernelProcs,OldApps} = lists:splitwith(Fun4,OldRest3),
+    {NewKernelProcs,NewApps} = lists:splitwith(Fun4,NewRest3),
+
+    %% Then comes all module load, which for each app consist of:
+    %% {path,[AppPath]},
+    %% {primLoad,ModuleList}
+    %% Replace kernel, stdlib and sasl here
+    MatchPaths = get_regexp_path(),
+    ModLoad = replace_module_load(OldModLoad,NewModLoad,MatchPaths),
+    Paths = replace_paths(OldPaths,NewPaths,MatchPaths),
+
+    {Stdlib,Sasl} = get_apps(NewApps,undefined,undefined),
+    Apps0 = replace_apps(OldApps,Stdlib,Sasl),
+    Apps = add_apply_upgrade(Apps0,Args),
+
+    Script = NewKernelLoad++ModLoad++Paths++NewKernelProcs++Apps,
+    Boot = term_to_binary({script,{NewRelName,TmpVsn},Script}),
     {ok,Boot}.
 
 %% For each app, compile a regexp that can be used for finding its path
-get_regexp_path({KernelPath,StdlibPath,SaslPath}) ->
+get_regexp_path() ->
     {ok,KernelMP} = re:compile("kernel-[0-9\.]+",[unicode]),
     {ok,StdlibMP} = re:compile("stdlib-[0-9\.]+",[unicode]),
     {ok,SaslMP} = re:compile("sasl-[0-9\.]+",[unicode]),
-    [{KernelMP,KernelPath},{StdlibMP,StdlibPath},{SaslMP,SaslPath}].
-
-%% For each path in the script, check if it matches any of the MPs
-%% found above, and if so replace it with the correct new path.
-replace_paths([{path,Path}|Script],MatchPaths) ->
-    [{path,replace_path(Path,MatchPaths)}|replace_paths(Script,MatchPaths)];
-replace_paths([Stuff|Script],MatchPaths) ->
-    [Stuff|replace_paths(Script,MatchPaths)];
-replace_paths([],_) ->
+    [KernelMP,StdlibMP,SaslMP].
+
+replace_module_load(Old,New,[MP|MatchPaths]) ->
+    replace_module_load(do_replace_module_load(Old,New,MP),New,MatchPaths);
+replace_module_load(Script,_,[]) ->
+    Script.
+
+do_replace_module_load([{path,[OldAppPath]},{primLoad,OldMods}|OldRest],New,MP) ->
+    case re:run(OldAppPath,MP,[{capture,none}]) of
+        nomatch ->
+            [{path,[OldAppPath]},{primLoad,OldMods}|
+             do_replace_module_load(OldRest,New,MP)];
+        match ->
+            get_module_load(New,MP) ++ OldRest
+    end;
+do_replace_module_load([Other|Rest],New,MP) ->
+    [Other|do_replace_module_load(Rest,New,MP)];
+do_replace_module_load([],_,_) ->
     [].
 
-replace_path([Path|Paths],MatchPaths) ->
-    [do_replace_path(Path,MatchPaths)|replace_path(Paths,MatchPaths)];
-replace_path([],_) ->
+get_module_load([{path,[AppPath]},{primLoad,Mods}|Rest],MP) ->
+    case re:run(AppPath,MP,[{capture,none}]) of
+        nomatch ->
+            get_module_load(Rest,MP);
+        match ->
+            [{path,[AppPath]},{primLoad,Mods}]
+    end;
+get_module_load([_|Rest],MP) ->
+    get_module_load(Rest,MP);
+get_module_load([],_) ->
+    [].
+
+replace_paths([{path,OldPaths}|Old],New,MatchPaths) ->
+    {path,NewPath} = lists:keyfind(path,1,New),
+    [{path,do_replace_paths(OldPaths,NewPath,MatchPaths)}|Old];
+replace_paths([Other|Old],New,MatchPaths) ->
+    [Other|replace_paths(Old,New,MatchPaths)].
+
+do_replace_paths(Old,New,[MP|MatchPaths]) ->
+    do_replace_paths(do_replace_paths1(Old,New,MP),New,MatchPaths);
+do_replace_paths(Paths,_,[]) ->
+    Paths.
+
+do_replace_paths1([P|Ps],New,MP) ->
+    case re:run(P,MP,[{capture,none}]) of
+        nomatch ->
+            [P|do_replace_paths1(Ps,New,MP)];
+        match ->
+            get_path(New,MP) ++ Ps
+    end;
+do_replace_paths1([],_,_) ->
     [].
 
-do_replace_path(Path,[{MP,ReplacePath}|MatchPaths]) ->
-    case re:run(Path,MP,[{capture,none}]) of
-	nomatch -> do_replace_path(Path,MatchPaths);
-	match -> ReplacePath
+get_path([P|Ps],MP) ->
+    case re:run(P,MP,[{capture,none}]) of
+        nomatch ->
+            get_path(Ps,MP);
+        match ->
+            [P]
     end;
-do_replace_path(Path,[]) ->
-    Path.
-
-%% Return the entries for loading the three base applications
-get_apps([{kernelProcess,application_controller,
-	   {application_controller,start,[{application,kernel,_}]}}=Kernel|
-	  Script],_,Stdlib,Sasl) ->
-    get_apps(Script,Kernel,Stdlib,Sasl);
+get_path([],_) ->
+    [].
+
+
+%% Return the entries for loading stdlib and sasl
 get_apps([{apply,{application,load,[{application,stdlib,_}]}}=Stdlib|Script],
-	 Kernel,_,Sasl) ->
-    get_apps(Script,Kernel,Stdlib,Sasl);
+	 _,Sasl) ->
+    get_apps(Script,Stdlib,Sasl);
 get_apps([{apply,{application,load,[{application,sasl,_}]}}=Sasl|_Script],
-	 Kernel,Stdlib,_) ->
-    {Kernel,Stdlib,Sasl};
-get_apps([_|Script],Kernel,Stdlib,Sasl) ->
-    get_apps(Script,Kernel,Stdlib,Sasl);
-get_apps([],undefined,_,_) ->
-    throw({error,{app_not_found,kernel}});
-get_apps([],_,undefined,_) ->
+	 Stdlib,_) ->
+    {Stdlib,Sasl};
+get_apps([_|Script],Stdlib,Sasl) ->
+    get_apps(Script,Stdlib,Sasl);
+get_apps([],undefined,_) ->
     throw({error,{app_not_found,stdlib}});
-get_apps([],_,_,undefined) ->
+get_apps([],_,undefined) ->
     throw({error,{app_not_found,sasl}}).
 
-
-%% Replace the entries for loading the base applications
-replace_apps([{kernelProcess,application_controller,
-	       {application_controller,start,[{application,kernel,_}]}}|
-	      Script],Kernel,Stdlib,Sasl) ->
-    [Kernel|replace_apps(Script,undefined,Stdlib,Sasl)];
+%% Replace the entries for loading the stdlib and sasl
 replace_apps([{apply,{application,load,[{application,stdlib,_}]}}|Script],
-	     Kernel,Stdlib,Sasl) ->
-    [Stdlib|replace_apps(Script,Kernel,undefined,Sasl)];
+	     Stdlib,Sasl) ->
+    [Stdlib|replace_apps(Script,undefined,Sasl)];
 replace_apps([{apply,{application,load,[{application,sasl,_}]}}|Script],
-	     _Kernel,_Stdlib,Sasl) ->
+	     _Stdlib,Sasl) ->
     [Sasl|Script];
-replace_apps([Stuff|Script],Kernel,Stdlib,Sasl) ->
-    [Stuff|replace_apps(Script,Kernel,Stdlib,Sasl)];
-replace_apps([],undefined,undefined,_) ->
+replace_apps([Stuff|Script],Stdlib,Sasl) ->
+    [Stuff|replace_apps(Script,Stdlib,Sasl)];
+replace_apps([],undefined,_) ->
     throw({error,{app_not_replaced,sasl}});
-replace_apps([],undefined,_,_) ->
-    throw({error,{app_not_replaced,stdlib}});
-replace_apps([],_,_,_) ->
-    throw({error,{app_not_replaced,kernel}}).
-
+replace_apps([],_,_) ->
+    throw({error,{app_not_replaced,stdlib}}).
 
 %% Finally add an apply of release_handler:new_emulator_upgrade - which will
 %% complete the execution of the upgrade script (relup).
@@ -283,8 +334,6 @@ add_apply_upgrade(Script,Args) ->
 		   {apply,{release_handler,new_emulator_upgrade,Args}} |
 		   RevScript]).
 
-
-
 %%-----------------------------------------------------------------
 %% Create a release package from a release file.
 %% Options is a list of {path, Path} | silent |
@@ -300,6 +349,8 @@ add_apply_upgrade(Script,Args) ->
 %%              {variables,[{Name,AbsString}]}
 %%              {machine, jam | beam | vee}
 %%              {var_tar, include | ownfile | omit}
+%%              no_warn_sasl
+%%              warnings_as_errors
 %%
 %% The tar file contains:
 %%         lib/App-Vsn/ebin
@@ -316,6 +367,7 @@ add_apply_upgrade(Script,Args) ->
 %%                  RelVsn/start.boot
 %%                         relup
 %%                         sys.config
+%%                         sys.config.src
 %%         erts-EVsn[/bin]
 %%-----------------------------------------------------------------
 
@@ -332,13 +384,23 @@ make_tar(RelName, Flags) when is_list(RelName), is_list(Flags) ->
 	    Path  = make_set(Path1 ++ code:get_path()),
 	    ModTestP = {member(src_tests, Flags),xref_p(Flags)},
 	    case get_release(RelName, Path, ModTestP, machine(Flags)) of
-		{ok, Release, Appls, Warnings} ->
-		    case catch mk_tar(RelName, Release, Appls, Flags, Path1) of
-			ok ->
-			    return(ok,Warnings,Flags);
-			Error ->
-			    return(Error,Warnings,Flags)
-		    end;
+		{ok, Release, Appls, Warnings0} ->
+		    Warnings = wsasl(Flags, Warnings0),
+		    case systools_lib:werror(Flags, Warnings) of
+			true ->
+                            Warnings1 = [W || {warning,W}<-Warnings],
+			    return({error,?MODULE,
+                                    {warnings_treated_as_errors,Warnings1}},
+                                   Warnings,
+                                   Flags);
+			false ->
+                            case catch mk_tar(RelName, Release, Appls, Flags, Path1) of
+                                ok ->
+                                    return(ok,Warnings,Flags);
+                                Error ->
+                                    return(Error,Warnings,Flags)
+                            end
+                    end;
 		Error ->
 		    return(Error,[],Flags)
 	    end;
@@ -643,6 +705,8 @@ get_items([], _Dict) ->
 
 check_item({_,{mod,{M,A}}},_) when is_atom(M) ->
     {M,A};
+check_item({_,{mod,[]}},_) -> % default mod is [], so accept as entry
+    [];
 check_item({_,{vsn,Vsn}},I) ->
     case string_p(Vsn) of
 	true -> Vsn;
@@ -678,6 +742,8 @@ check_item({_,{modules,Mods}},I) ->
 	true -> Mods;
 	_ -> throw({bad_param, I})
     end;
+check_item({_,{start_phases,undefined}},_) -> % default start_phase is undefined,
+    undefined;                                % so accept as entry
 check_item({_,{start_phases,Phase}},I) ->
     case t_list_p(Phase) of
 	true -> Phase;
@@ -1144,10 +1210,10 @@ generate_script(Output, Release, Appls, Flags) ->
 	     },
 
     ScriptFile = Output ++ ".script",
-    case file:open(ScriptFile, [write]) of
+    case file:open(ScriptFile, [write,{encoding,utf8}]) of
 	{ok, Fd} ->
-	    io:format(Fd, "%% script generated at ~w ~w\n~p.\n",
-		      [date(), time(), Script]),
+	    io:format(Fd, "%% ~s\n%% script generated at ~w ~w\n~tp.\n",
+		      [epp:encoding_to_string(utf8), date(), time(), Script]),
 	    case file:close(Fd) of
 		ok ->
 		    BootFile = Output ++ ".boot",
@@ -1480,6 +1546,12 @@ mandatory_modules() ->
      gen_server,
      heart,
      kernel,
+     logger,
+     logger_filters,
+     logger_server,
+     logger_backend,
+     logger_config,
+     logger_simple_h,
      lists,
      proc_lib,
      supervisor
@@ -1490,10 +1562,10 @@ mandatory_modules() ->
 
 preloaded() ->
     %% Sorted
-    [erl_prim_loader,erl_tracer,erlang,
-     erts_code_purger,erts_dirty_process_code_checker,
+    [atomics, counters, erl_prim_loader,erl_tracer,erlang,
+     erts_code_purger,erts_dirty_process_signal_handler,
      erts_internal,erts_literal_area_collector,
-     init,otp_ring0,prim_eval,prim_file,
+     init,otp_ring0,persistent_term,prim_buffer,prim_eval,prim_file,
      prim_inet,prim_zip,zlib].
 
 %%______________________________________________________________________
@@ -1504,7 +1576,7 @@ preloaded() ->
 
 kernel_processes() ->
     [{heart, heart, start, []},
-     {error_logger, error_logger, start_link, []},
+     {logger, logger_server, start_link, []},
      {application_controller, application_controller, start,
       fun(Appls) ->
               [{_,App}] = filter(fun({{kernel,_},_App}) -> true;
@@ -1544,6 +1616,7 @@ create_kernel_procs(Appls) ->
 %%                  RelVsn/start.boot
 %%                         relup
 %%                         sys.config
+%%                         sys.config.src
 %%         erts-EVsn[/bin]
 %%
 %% The VariableN.tar.gz files can also be stored as own files not
@@ -1699,14 +1772,18 @@ add_system_files(Tar, RelName, Release, Path1) ->
 	    add_to_tar(Tar, Relup, filename:join(RelVsnDir, "relup"))
     end,
 
-    case lookup_file("sys.config", Path) of
-	false ->
-	    ignore;
-	Sys ->
-	    check_sys_config(Sys),
-	    add_to_tar(Tar, Sys, filename:join(RelVsnDir, "sys.config"))
+    case lookup_file("sys.config.src", Path) of
+        false ->
+            case lookup_file("sys.config", Path) of
+                false ->
+                    ignore;
+                Sys ->
+	            check_sys_config(Sys),
+	            add_to_tar(Tar, Sys, filename:join(RelVsnDir, "sys.config"))
+            end;
+        SysSrc ->
+            add_to_tar(Tar, SysSrc, filename:join(RelVsnDir, "sys.config.src"))
     end,
-    
     ok.
 
 lookup_file(Name, [Dir|Path]) ->
@@ -1900,8 +1977,10 @@ del_tar(Tar, TarName) ->
     file:delete(TarName).
 
 add_to_tar(Tar, FromFile, ToFile) ->
-    case erl_tar:add(Tar, FromFile, ToFile, [compressed, dereference]) of
+    case catch erl_tar:add(Tar, FromFile, ToFile, [compressed, dereference]) of
 	ok -> ok;
+        {'EXIT', Reason} ->
+            throw({error, {tar_error, {add, FromFile, Reason}}});
 	{error, Error} ->
 	    throw({error, {tar_error, {add, FromFile, Error}}})
     end.
@@ -2109,90 +2188,80 @@ cas([Y | Args], X) ->
 
 %% Check Options for make_tar
 check_args_tar(Args) ->
-    cat(Args, {undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, []}). 
+    cat(Args, []).
 
-cat([], {_Path,_Sil,_Dirs,_Erts,_Test,_Var,_VarTar,_Mach,_Xref,_XrefApps, X}) ->
+cat([], X) ->
     X;
 %%% path ---------------------------------------------------------------
-cat([{path, P} | Args], {Path, Sil, Dirs, Erts, Test, 
-			 Var, VarTar, Mach, Xref, XrefApps, X}) when is_list(P) -> 
+cat([{path, P} | Args], X) when is_list(P) ->
     case check_path(P) of
 	ok ->
-	    cat(Args, {P, Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X});
+	    cat(Args, X);
 	error ->
-	    cat(Args, {Path, Sil, Dirs, Erts, Test, 
-		       Var, VarTar, Mach, Xref, XrefApps, X++[{path,P}]})
+	    cat(Args, X++[{path,P}])
     end;
 %%% silent -------------------------------------------------------------
-cat([silent | Args], {Path, _Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X}) ->
-    cat(Args, {Path, silent, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X});
+cat([silent | Args], X) ->
+    cat(Args, X);
 %%% dirs ---------------------------------------------------------------
-cat([{dirs, D} | Args], {Path, Sil, Dirs, Erts, Test, 
-			    Var, VarTar, Mach, Xref, XrefApps, X}) ->
+cat([{dirs, D} | Args], X) ->
     case check_dirs(D) of
 	ok ->
-	    cat(Args, {Path, Sil, D, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X});
+	    cat(Args, X);
 	error ->
-	    cat(Args, {Path, Sil, Dirs, Erts, Test, 
-		       Var, VarTar, Mach, Xref, XrefApps, X++[{dirs, D}]})
+	    cat(Args, X++[{dirs, D}])
     end;
 %%% erts ---------------------------------------------------------------
-cat([{erts, E} | Args], {Path, Sil, Dirs, _Erts, Test, 
-			 Var, VarTar, Mach, Xref, XrefApps, X}) when is_list(E)->
-    cat(Args, {Path, Sil, Dirs, E, Test, Var, VarTar, Mach, Xref, XrefApps, X});
+cat([{erts, E} | Args], X) when is_list(E)->
+    cat(Args, X);
 %%% src_tests ----------------------------------------------------
-cat([src_tests | Args], {Path, Sil, Dirs, Erts, _Test, Var, VarTar, Mach, Xref, XrefApps, X}) ->
-    cat(Args, {Path, Sil, Dirs, Erts, src_tests, Var, VarTar, Mach, 
-	       Xref, XrefApps, X});
+cat([src_tests | Args], X) ->
+    cat(Args, X);
 %%% variables ----------------------------------------------------------
-cat([{variables, V} | Args], {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X}) when is_list(V) ->
+cat([{variables, V} | Args], X) when is_list(V) ->
     case check_vars(V) of
 	ok ->
-	    cat(Args, {Path, Sil, Dirs, Erts, Test, V, VarTar, Mach, Xref, XrefApps, X});
+	    cat(Args, X);
 	error ->
-	    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, 
-			     Xref, XrefApps, X++[{variables, V}]})
+	    cat(Args, X++[{variables, V}])
     end;
 %%% var_tar ------------------------------------------------------------
-cat([{var_tar, VT} | Args], {Path, Sil, Dirs, Erts, Test, 
-			    Var, _VarTar, Mach, Xref, XrefApps, X}) when VT == include ->
-    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, include, Mach, Xref, XrefApps, X});
-cat([{var_tar, VT} | Args], {Path, Sil, Dirs, Erts, Test, 
-			    Var, _VarTar, Mach, Xref, XrefApps, X}) when VT == ownfile ->
-    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, ownfile, Mach, Xref, XrefApps, X});
-cat([{var_tar, VT} | Args], {Path, Sil, Dirs, Erts, Test, 
-			    Var, _VarTar, Mach, Xref, XrefApps, X}) when VT == omit ->
-    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, omit, Mach, Xref, XrefApps, X});
+cat([{var_tar, VT} | Args], X) when VT == include;
+                                    VT == ownfile;
+                                    VT == omit ->
+    cat(Args, X);
 %%% machine ------------------------------------------------------------
-cat([{machine, M} | Args], {Path, Sil, Dirs, Erts, Test, 
-			    Var, VarTar, Mach, Xref, XrefApps, X}) when is_atom(M) ->
-    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X});
+cat([{machine, M} | Args], X) when is_atom(M) ->
+    cat(Args, X);
 %%% exref --------------------------------------------------------------
-cat([exref | Args], {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, _Xref, XrefApps, X})  ->
-    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, exref, XrefApps, X});
+cat([exref | Args], X)  ->
+    cat(Args, X);
 %%% exref Apps ---------------------------------------------------------
-cat([{exref, Apps} | Args], {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X}) when is_list(Apps) ->
+cat([{exref, Apps} | Args], X) when is_list(Apps) ->
     case check_apps(Apps) of 
 	ok ->
-	    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, 
-			     Xref, Apps, X});
+	    cat(Args, X);
 	error ->
-	    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, 
-			     Xref, XrefApps, X++[{exref, Apps}]})
+	    cat(Args, X++[{exref, Apps}])
     end;
 %%% outdir Dir ---------------------------------------------------------
-cat([{outdir, Dir} | Args], {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X}) when is_list(Dir) ->
-    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach,
-	       Xref, XrefApps, X});
+cat([{outdir, Dir} | Args], X) when is_list(Dir) ->
+    cat(Args, X);
 %%% otp_build (secret, not documented) ---------------------------------
-cat([otp_build | Args], {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X})  ->
-    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X});
+cat([otp_build | Args], X)  ->
+    cat(Args, X);
+%%% warnings_as_errors ----
+cat([warnings_as_errors | Args], X) ->
+    cat(Args, X);
+%%% no_warn_sasl ----
+cat([no_warn_sasl | Args], X) ->
+    cat(Args, X);
 %%% no_module_tests (kept for backwards compatibility, but ignored) ----
-cat([no_module_tests | Args], {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X}) ->
-    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X});
+cat([no_module_tests | Args], X) ->
+    cat(Args, X);
 %%% ERROR --------------------------------------------------------------
-cat([Y | Args], {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X}) ->
-    cat(Args, {Path, Sil, Dirs, Erts, Test, Var, VarTar, Mach, Xref, XrefApps, X++[Y]}).
+cat([Y | Args], X) ->
+    cat(Args, X++[Y]).
 
 check_path([]) ->
     ok;
@@ -2234,9 +2303,9 @@ check_apps(_) ->
 format_error(badly_formatted_release) ->
     io_lib:format("Syntax error in the release file~n",[]);
 format_error({illegal_name, Name}) ->
-    io_lib:format("Illegal name (~p) in the release file~n",[Name]);
+    io_lib:format("Illegal name (~tp) in the release file~n",[Name]);
 format_error({illegal_form, Form}) ->
-    io_lib:format("Illegal tag in the release file: ~p~n",[Form]);
+    io_lib:format("Illegal tag in the release file: ~tp~n",[Form]);
 format_error({missing_parameter,Par}) ->
     io_lib:format("Missing parameter (~p) in the release file~n",[Par]);
 format_error({illegal_applications,Names}) ->
@@ -2251,7 +2320,7 @@ format_error({mandatory_app,Name,Type}) ->
 format_error({duplicate_register,Dups}) ->
     io_lib:format("Duplicated register names: ~n~ts",
 		  [map(fun({{Reg,App1,_,_},{Reg,App2,_,_}}) ->
-			       io_lib:format("\t~w registered in ~w and ~w~n",
+			       io_lib:format("\t~tw registered in ~w and ~w~n",
 					     [Reg,App1,App2])
 		       end, Dups)]);
 format_error({undefined_applications,Apps}) ->
@@ -2275,26 +2344,29 @@ format_error({modules,ModErrs}) ->
 format_error({circular_dependencies,Apps}) ->
     io_lib:format("Circular dependencies among applications: ~p~n",[Apps]);
 format_error({not_found,File}) ->
-    io_lib:format("File not found: ~p~n",[File]);
+    io_lib:format("File not found: ~tp~n",[File]);
 format_error({parse,File,{Line,Mod,What}}) ->
     Str = Mod:format_error(What),
     io_lib:format("~ts:~w: ~ts\n",[File, Line, Str]);
 format_error({read,File}) ->
-    io_lib:format("Cannot read ~p~n",[File]);
+    io_lib:format("Cannot read ~tp~n",[File]);
 format_error({open,File,Error}) ->
-    io_lib:format("Cannot open ~p - ~ts~n",
+    io_lib:format("Cannot open ~tp - ~ts~n",
 		  [File,file:format_error(Error)]);
 format_error({close,File,Error}) ->
-    io_lib:format("Cannot close ~p - ~ts~n",
+    io_lib:format("Cannot close ~tp - ~ts~n",
 		  [File,file:format_error(Error)]);
 format_error({delete,File,Error}) ->
-    io_lib:format("Cannot delete ~p - ~ts~n",
+    io_lib:format("Cannot delete ~tp - ~ts~n",
 		  [File,file:format_error(Error)]);
 format_error({tar_error,What}) ->
     form_tar_err(What);
+format_error({warnings_treated_as_errors,Warnings}) ->
+    io_lib:format("Warnings being treated as errors:~n~ts",
+                  [map(fun(W) -> form_warn("",W) end, Warnings)]);
 format_error(ListOfErrors) when is_list(ListOfErrors) ->
     format_errors(ListOfErrors);
-format_error(E) -> io_lib:format("~p~n",[E]).
+format_error(E) -> io_lib:format("~tp~n",[E]).
 
 format_errors(ListOfErrors) ->
     map(fun({error,E}) -> form_err(E);
@@ -2310,19 +2382,19 @@ form_err({module_not_found,App,Mod}) ->
 form_err({error_add_appl, {Name, {tar_error, What}}}) ->
     io_lib:format("~p: ~ts~n",[Name,form_tar_err(What)]);
 form_err(E) ->
-    io_lib:format("~p~n",[E]).
+    io_lib:format("~tp~n",[E]).
 
 form_reading({not_found,File}) ->
-    io_lib:format("File not found: ~p~n",[File]);
+    io_lib:format("File not found: ~tp~n",[File]);
 form_reading({application_vsn, {Name,Vsn}}) ->
-    io_lib:format("Application ~ts with version ~p not found~n",[Name, Vsn]);
+    io_lib:format("Application ~ts with version ~tp not found~n",[Name, Vsn]);
 form_reading({parse,File,{Line,Mod,What}}) ->
     Str = Mod:format_error(What),
     io_lib:format("~ts:~w: ~ts\n",[File, Line, Str]);
 form_reading({read,File}) ->
-    io_lib:format("Cannot read ~p~n",[File]);
+    io_lib:format("Cannot read ~tp~n",[File]);
 form_reading({{bad_param, P},_}) ->
-    io_lib:format("Bad parameter in .app file: ~p~n",[P]);
+    io_lib:format("Bad parameter in .app file: ~tp~n",[P]);
 form_reading({{missing_param,P},_}) ->
     io_lib:format("Missing parameter in .app file: ~p~n",[P]);
 form_reading({badly_formatted_application,_}) ->
@@ -2331,12 +2403,12 @@ form_reading({override_include,Apps}) ->
     io_lib:format("Tried to include not (in .app file) specified applications: ~p~n",
 		  [Apps]);
 form_reading({no_valid_version, {{_, SVsn}, {_, File, FVsn}}}) ->
-    io_lib:format("No valid version (~p) of .app file found. Found file ~p with version ~p~n", 
+    io_lib:format("No valid version (~tp) of .app file found. Found file ~tp with version ~tp~n", 
 		  [SVsn, File, FVsn]);
 form_reading({parse_error, {File, Line, Error}}) ->
-    io_lib:format("Parse error in file: ~p.  Line: ~w  Error: ~p; ~n", [File, Line, Error]);
+    io_lib:format("Parse error in file: ~tp.  Line: ~w  Error: ~tp; ~n", [File, Line, Error]);
 form_reading(W) ->
-    io_lib:format("~p~n",[W]).
+    io_lib:format("~tp~n",[W]).
 
 form_tar_err({open, File, Error}) ->
     io_lib:format("Cannot open tar file ~ts - ~ts~n",
@@ -2348,35 +2420,26 @@ form_tar_err({add, File, Error}) ->
 %% Format warning
 
 format_warning(Warnings) ->
-    format_warning(Warnings, false).
-
-format_warning(Warnings, Werror) ->
-    Prefix = case Werror of
-		 true ->
-		     "";
-		 false ->
-		     "*WARNING* "
-	     end,
-    map(fun({warning,W}) -> form_warn(Prefix, W) end, Warnings).
-
-form_warn(Prefix, {source_not_found,{Mod,_,App,_,_}}) ->
+    map(fun({warning,W}) -> form_warn("*WARNING* ", W) end, Warnings).
+
+form_warn(Prefix, {source_not_found,{Mod,App,_}}) ->
     io_lib:format("~ts~w: Source code not found: ~w.erl~n",
 		  [Prefix,App,Mod]);
 form_warn(Prefix, {{parse_error, File},{_,_,App,_,_}}) ->
-    io_lib:format("~ts~w: Parse error: ~p~n",
+    io_lib:format("~ts~w: Parse error: ~tp~n",
 		  [Prefix,App,File]);
-form_warn(Prefix, {obj_out_of_date,{Mod,_,App,_,_}}) ->
+form_warn(Prefix, {obj_out_of_date,{Mod,App,_}}) ->
     io_lib:format("~ts~w: Object code (~w) out of date~n",
 		  [Prefix,App,Mod]);
 form_warn(Prefix, {exref_undef, Undef}) ->
     F = fun({M,F,A}) ->
-		io_lib:format("~tsUndefined function ~w:~w/~w~n",
+		io_lib:format("~tsUndefined function ~w:~tw/~w~n",
 			      [Prefix,M,F,A])
 	end,
     map(F, Undef);
 form_warn(Prefix, missing_sasl) ->
-    io_lib:format("~ts: Missing application sasl. "
+    io_lib:format("~tsMissing application sasl. "
 		  "Can not upgrade with this release~n",
 		  [Prefix]);
 form_warn(Prefix, What) ->
-    io_lib:format("~ts ~p~n", [Prefix,What]).
+    io_lib:format("~ts~tp~n", [Prefix,What]).
diff --git a/lib/sasl/src/systools_rc.erl b/lib/sasl/src/systools_rc.erl
index 7722cef57b..c570ed00ab 100644
--- a/lib/sasl/src/systools_rc.erl
+++ b/lib/sasl/src/systools_rc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -942,41 +942,41 @@ format_error(too_many_point_of_no_return) ->
     io_lib:format("Too many point_of_no_return~n", []);
 
 format_error({bad_instruction, X}) ->
-    io_lib:format("Bad instruction: ~p~n", [X]);
+    io_lib:format("Bad instruction: ~tp~n", [X]);
 format_error({bad_module, X}) ->
-    io_lib:format("Bad module: ~p(should be atom())~n", [X]);
+    io_lib:format("Bad module: ~tp(should be atom())~n", [X]);
 format_error({bad_code_change, X}) ->
-    io_lib:format("Bad code_change: ~p(should be {Mod, Extra})~n", [X]);
+    io_lib:format("Bad code_change: ~tp(should be {Mod, Extra})~n", [X]);
 format_error({bad_change, X}) ->
-    io_lib:format("Bad change spec: ~p(should be soft | {advanced, E})~n", [X]);
+    io_lib:format("Bad change spec: ~tp(should be soft | {advanced, E})~n", [X]);
 format_error({bad_mod_type, X}) ->
-    io_lib:format("Bad module type: ~p(should be static | dynamic)~n", [X]);
+    io_lib:format("Bad module type: ~tp(should be static | dynamic)~n", [X]);
 format_error({bad_purge_method, X}) ->
-    io_lib:format("Bad purge method: ~p(should be soft_purge | brutal_purge)~n",
+    io_lib:format("Bad purge method: ~tp(should be soft_purge | brutal_purge)~n",
 		  [X]);
 format_error({bad_list, X}) ->
-    io_lib:format("Bad list: ~p~n", [X]);
+    io_lib:format("Bad list: ~tp~n", [X]);
 format_error({bad_args_list, X}) ->
-    io_lib:format("Bad argument list: ~p~n", [X]);
+    io_lib:format("Bad argument list: ~tp~n", [X]);
 format_error({bad_node, X}) ->
-    io_lib:format("Bad node: ~p(should be atom())~n", [X]);
+    io_lib:format("Bad node: ~tp(should be atom())~n", [X]);
 format_error({bad_application, X}) ->
-    io_lib:format("Bad application: ~p(should be atom())~n", [X]);
+    io_lib:format("Bad application: ~tp(should be atom())~n", [X]);
 format_error({bad_func, X}) ->
-    io_lib:format("Bad function: ~p(should be atom())~n", [X]);
+    io_lib:format("Bad function: ~tp(should be atom())~n", [X]);
 format_error({bad_lib, X}) ->
-    io_lib:format("Bad library: ~p(should be atom())~n", [X]);
+    io_lib:format("Bad library: ~tp(should be atom())~n", [X]);
 format_error({bad_lib_vsn, X}) ->
-    io_lib:format("Bad library version: ~p(should be string())~n", [X]);
+    io_lib:format("Bad library version: ~tp(should be string())~n", [X]);
 format_error({bad_timeout, X}) ->
-    io_lib:format("Bad timeout: ~p(should be infinity | int() > 0)~n", [X]);
+    io_lib:format("Bad timeout: ~tp(should be infinity | int() > 0)~n", [X]);
 
 format_error({undef_module, Mod}) ->
     io_lib:format("Undefined module: ~p~n", [Mod]);
 format_error({muldef_module, Mod}) ->
     io_lib:format("Multiply defined module: ~p~n", [Mod]);
 format_error(E) ->
-    io_lib:format("~p~n",[E]).
+    io_lib:format("~tp~n",[E]).
 
 
 %%-----------------------------------------------------------------
diff --git a/lib/sasl/src/systools_relup.erl b/lib/sasl/src/systools_relup.erl
index 28534dc0c8..e836d57670 100644
--- a/lib/sasl/src/systools_relup.erl
+++ b/lib/sasl/src/systools_relup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -155,36 +155,12 @@ mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs) ->
 mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs, Opts) ->
     case check_opts(Opts) of
 	[] ->
-	    R = (catch do_mk_relup(TopRelFile,BaseUpRelDcs,BaseDnRelDcs,
-				   add_code_path(Opts), Opts)),
-	    case {get_opt(silent, Opts), get_opt(noexec, Opts)} of
-		{false, false} ->
-		    case R of
-			{ok, _Res, _Mod, Ws} -> 
-			    print_warnings(Ws, Opts),
-			    case systools_lib:werror(Opts, Ws) of
-				true ->
-				    error;
-				false ->
-				    ok
-			    end;
-			Other -> 
-			    print_error(Other),
-			    error
-		    end;
-		_ ->
-		    case R of
-			{ok, _Res, _Mod, Ws} ->
-			    case systools_lib:werror(Opts, Ws) of
-				true ->
-				    error;
-				false ->
-				    R
-			    end;
-			R ->
-			    R
-		    end
-	    end;
+            R = try do_mk_relup(TopRelFile,BaseUpRelDcs,BaseDnRelDcs,
+                                          add_code_path(Opts), Opts)
+                catch throw:Error ->
+                        Error
+                end,
+            done_mk_relup(Opts, R);
 	BadArg ->
 	    erlang:error({badarg, BadArg})
     end.
@@ -224,17 +200,45 @@ do_mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs, Path, Opts) ->
 	    {Dn, Ws2} = foreach_baserel_dn(TopRel, TopApps, BaseDnRelDcs, 
 					  Path, Opts, Ws1),
 	    Relup = {TopRel#release.vsn, Up, Dn},
-	    case systools_lib:werror(Opts, Ws2) of
-		true ->
-		    ok;
-		false ->
-		    write_relup_file(Relup, Opts)
-	    end,
-	    {ok, Relup, ?MODULE, Ws2};
+
+            {ok, Relup, Ws2};
 	Other -> 
-	    throw(Other)
+	    Other
     end.
 
+done_mk_relup(Opts, {ok,Relup,Ws}) ->
+    WAE = get_opt(warnings_as_errors,Opts),
+    Silent = get_opt(silent,Opts),
+    Noexec = get_opt(noexec,Opts),
+
+    if WAE andalso Ws=/=[] ->
+            return_error(Silent,
+                         {error,?MODULE,{warnings_treated_as_errors, Ws}});
+       not Noexec ->
+            case write_relup_file(Relup,Opts) of
+                ok ->
+                    return_ok(Silent,Relup,Ws);
+                Error ->
+                    return_error(Silent,Error)
+            end;
+       true -> % noexec
+            return_ok(true,Relup,Ws)
+    end;
+done_mk_relup(Opts, Error) ->
+    return_error(get_opt(silent,Opts) orelse get_opt(noexec,Opts), Error).
+
+return_error(true, Error) ->
+    Error;
+return_error(false, Error) ->
+    print_error(Error),
+    error.
+
+return_ok(true,Relup,Ws) ->
+    {ok,Relup,?MODULE,Ws};
+return_ok(false,_Relup,Ws) ->
+    print_warnings(Ws),
+    ok.
+
 %%-----------------------------------------------------------------
 %% foreach_baserel_up(Rel, TopApps, BaseRelDcs, Path, Opts, Ws) -> Ret
 %% foreach_baserel_dn(Rel, TopApps, BaseRelDcs, Path, Opts, Ws) -> Ret
@@ -529,33 +533,18 @@ to_list(X) when is_list(X) -> X.
 %% Writes a relup file.
 %%
 write_relup_file(Relup, Opts) ->
-    case get_opt(noexec, Opts) of
-	true -> 
-	    ok;
-	_ ->
-	    Filename = case get_opt(outdir, Opts) of
-			   OutDir when is_list(OutDir) ->
-			       filename:join(filename:absname(OutDir),
-					     "relup");
-			   false ->
-			       "relup";
-			   Badarg ->
-			       throw({error, ?MODULE, {badarg, {outdir,Badarg}}})
-		       end,
-			   
-	    case file:open(Filename, [write]) of
-		{ok, Fd} ->
-		    io:format(Fd, "~p.~n", [Relup]),
-		    case file:close(Fd) of
-			ok -> ok;
-			{error,Reason} ->
-			    throw({error, ?MODULE,
-				   {file_problem, {"relup", {close,Reason}}}})
-		    end;
-		{error, Reason} ->
-		    throw({error, ?MODULE,
-			   {file_problem, {"relup", {open, Reason}}}})
-	    end
+    Filename = filename:join(filename:absname(get_opt(outdir,Opts)),
+                             "relup"),
+    case file:open(Filename, [write,{encoding,utf8}]) of
+        {ok, Fd} ->
+            io:format(Fd, "%% ~s~n~tp.~n", [epp:encoding_to_string(utf8),Relup]),
+            case file:close(Fd) of
+                ok -> ok;
+                {error,Reason} ->
+                    {error, ?MODULE, {file_problem, {"relup", {close,Reason}}}}
+            end;
+        {error, Reason} ->
+            {error, ?MODULE, {file_problem, {"relup", {open, Reason}}}}
     end.
 
 add_code_path(Opts) ->
@@ -593,15 +582,14 @@ default(path)   -> false;
 default(noexec) -> false;
 default(silent) -> false;
 default(restart_emulator) -> false;
-default(outdir) -> false.
+default(outdir) -> ".";
+default(warnings_as_errors) -> false.
 
-print_error({'EXIT', Err}) -> 
-    print_error(Err);
 print_error({error, Mod, Error}) ->
     S = apply(Mod, format_error, [Error]),
     io:format(S, []);
 print_error(Other) ->
-    io:format("Error: ~p~n", [Other]).
+    io:format("Error: ~tp~n", [Other]).
 
 format_error({file_problem, {File, What}}) ->
     io_lib:format("Could not ~w file ~ts~n", [get_reason(What), File]);
@@ -614,33 +602,31 @@ format_error({missing_sasl,Release}) ->
     io_lib:format("No sasl application in release ~ts, ~ts. "
 		  "Can not be upgraded.",
 		  [Release#release.name, Release#release.vsn]);
+format_error({warnings_treated_as_errors, Warnings}) ->
+    io_lib:format("Warnings being treated as errors:~n~ts",
+                  [[format_warning("",W) || W <- Warnings]]);
 format_error(Error) ->
-    io:format("~p~n", [Error]).
+    io_lib:format("~tp~n", [Error]).
 
 
-print_warnings(Ws, Opts) when is_list(Ws) ->
-    lists:foreach(fun(W) -> print_warning(W, Opts) end, Ws);
-print_warnings(W, Opts) ->
-    print_warning(W, Opts).
+print_warnings(Ws) when is_list(Ws) ->
+    lists:foreach(fun(W) -> print_warning(W) end, Ws);
+print_warnings(W) ->
+    print_warning(W).
 
-print_warning(W, Opts) ->
-    Prefix = case lists:member(warnings_as_errors, Opts) of
-		 true ->
-		     "";
-		 false ->
-		     "*WARNING* "
-	     end,
-    S = format_warning(Prefix, W),
-    io:format("~ts", [S]).
+print_warning(W) ->
+    io:format("~ts", [format_warning(W)]).
 
 format_warning(W) ->
     format_warning("*WARNING* ", W).
 
 format_warning(Prefix, {erts_vsn_changed, {Rel1, Rel2}}) ->
-    io_lib:format("~tsThe ERTS version changed between ~p and ~p~n",
+    io_lib:format("~tsThe ERTS version changed between ~tp and ~tp~n",
 		  [Prefix, Rel1, Rel2]);
+format_warning(Prefix, pre_R15_emulator_upgrade) ->
+    io_lib:format("~tsUpgrade from an OTP version earlier than R15. New code should be compiled with the old emulator.~n",[Prefix]);
 format_warning(Prefix, What) ->
-    io_lib:format("~ts~p~n",[Prefix, What]).
+    io_lib:format("~ts~tp~n",[Prefix, What]).
 
 
 get_reason({error, {open, _, _}}) -> open;
diff --git a/lib/sasl/test/rb_SUITE.erl b/lib/sasl/test/rb_SUITE.erl
index 426dedbab5..2b6e452d14 100644
--- a/lib/sasl/test/rb_SUITE.erl
+++ b/lib/sasl/test/rb_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@ no_group_cases() ->
 
 groups() ->
     [{running_error_logger,[shuffle],[show,
+                                      show_other,
 				      list,
 				      rescan,
 				      start_stop_log,
@@ -165,6 +166,23 @@ show(Config) ->
 
     ok.
 
+show_other(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+
+    %% Insert some reports in the error log and start rb
+    error_logger:info_report([rb_test_term_in_list]),
+    error_logger:info_report(rb_test_term_no_list),
+    ok = start_rb(OutFile),
+
+    %% Show by type and check content
+    [{_,I1},{_,I2}] = check_report(fun() -> rb:show(info_report) end,OutFile),
+
+    true = contains(I1,"rb_test_term_no_list"),
+    true = contains(I2,"rb_test_term_in_list"),
+
+    ok.
+
 list(Config) ->
     PrivDir = ?config(priv_dir,Config),
     OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 10d2539b7f..2ff2f29591 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,7 +22,8 @@
 -include_lib("common_test/include/ct.hrl").
 -include("test_lib.hrl").
 
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
+-export([scheduler_wall_time/0, garbage_collect/0]). %% rpc'ed
 
 % Default timetrap timeout (set in init_per_testcase).
 %-define(default_timeout, ?t:minutes(40)).
@@ -66,7 +67,7 @@ cases() ->
      supervisor_which_children_timeout,
      release_handler_which_releases, install_release_syntax_check,
      upgrade_supervisor, upgrade_supervisor_fail, otp_9864,
-     otp_10463_upgrade_script_regexp, no_dot_erlang].
+     otp_10463_upgrade_script_regexp, no_dot_erlang, unicode_upgrade].
 
 groups() ->
     [{release,[],
@@ -1085,8 +1086,9 @@ otp_9395_update_many_mods(Conf) when is_list(Conf) ->
     Rel2Dir = filename:dirname(Rel2),
 
     %% Start a slave node
+    PA = filename:dirname(code:which(?MODULE)),
     {ok, Node} = t_start_node(otp_9395_update_many_mods, Rel1,
-			      filename:join(Rel1Dir,"sys.config")),
+			      filename:join(Rel1Dir,"sys.config"), "-pa " ++ PA),
 
     %% Start a lot of processes on the new node, all with refs to each
     %% module that will be updated
@@ -1109,8 +1111,8 @@ otp_9395_update_many_mods(Conf) when is_list(Conf) ->
 		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
 
     %% First, install release directly and check how much time it takes
-    rpc:call(Node,erlang,garbage_collect,[]),
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
+    rpc:call(Node,?MODULE,garbage_collect,[]),
+    SWTFlag0 = spawn_link(Node, ?MODULE, scheduler_wall_time, []),
     {TInst0,{ok, _, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
     SWT0 = rpc:call(Node,erlang,statistics,[scheduler_wall_time]),
@@ -1135,9 +1137,9 @@ otp_9395_update_many_mods(Conf) when is_list(Conf) ->
 
     %% Finally install release after check and purge, and check that
     %% this install was faster than the first.
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,false]),
-    rpc:call(Node,erlang,garbage_collect,[]),
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
+    SWTFlag0 ! die,
+    rpc:call(Node,?MODULE,garbage_collect,[]),
+    _SWTFlag1 = spawn_link(Node, ?MODULE, scheduler_wall_time, []),
     {TInst2,{ok, _RelVsn1, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
     SWT2 = rpc:call(Node,erlang,statistics,[scheduler_wall_time]),
@@ -1161,6 +1163,15 @@ otp_9395_update_many_mods(Conf) when is_list(Conf) ->
 
     ok.
 
+scheduler_wall_time() ->
+    erlang:system_flag(scheduler_wall_time,true),
+    receive _Msg -> normal end.
+
+garbage_collect() ->
+    Pids = processes(),
+    [erlang:garbage_collect(Pid) || Pid <- Pids].
+
+
 otp_9395_update_many_mods(cleanup,_Conf) ->
     stop_node(node_name(otp_9395_update_many_mods)).
 
@@ -1190,8 +1201,9 @@ otp_9395_rm_many_mods(Conf) when is_list(Conf) ->
     Rel2Dir = filename:dirname(Rel2),
 
     %% Start a slave node
+    PA = filename:dirname(code:which(?MODULE)),
     {ok, Node} = t_start_node(otp_9395_rm_many_mods, Rel1,
-			      filename:join(Rel1Dir,"sys.config")),
+			      filename:join(Rel1Dir,"sys.config"), "-pa " ++ PA),
 
     %% Start a lot of processes on the new node, all with refs to each
     %% module that will be updated
@@ -1214,8 +1226,8 @@ otp_9395_rm_many_mods(Conf) when is_list(Conf) ->
 		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
 
     %% First, install release directly and check how much time it takes
-    rpc:call(Node,erlang,garbage_collect,[]),
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
+    rpc:call(Node,?MODULE,garbage_collect,[]),
+    SWTFlag0 = spawn_link(Node, ?MODULE, scheduler_wall_time, []),
     {TInst0,{ok, _, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
     SWT0 = rpc:call(Node,erlang,statistics,[scheduler_wall_time]),
@@ -1240,9 +1252,9 @@ otp_9395_rm_many_mods(Conf) when is_list(Conf) ->
 
     %% Finally install release after check and purge, and check that
     %% this install was faster than the first.
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,false]),
-    rpc:call(Node,erlang,garbage_collect,[]),
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
+    SWTFlag0 ! die,
+    rpc:call(Node,?MODULE,garbage_collect,[]),
+    _SWTFlag1 = spawn_link(Node, ?MODULE, scheduler_wall_time, []),
     {TInst2,{ok, _RelVsn1, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
     SWT2 = rpc:call(Node,erlang,statistics,[scheduler_wall_time]),
@@ -1384,9 +1396,9 @@ upgrade_supervisor(Conf) when is_list(Conf) ->
     %% Check that the restart strategy and child spec is updated
     {status, _, {module, _}, [_, _, _, _, [_,_,{data,[{"State",State}]}|_]]} =
 	rpc:call(Node,sys,get_status,[a_sup]),
-    {state,_,RestartStrategy,[Child],_,_,_,_,_,_,_} = State,
+    {state,_,RestartStrategy,{[a],Db},_,_,_,_,_,_,_} = State,
     one_for_all = RestartStrategy, % changed from one_for_one
-    {child,_,_,_,_,brutal_kill,_,_} = Child, % changed from timeout 2000
+    {child,_,_,_,_,brutal_kill,_,_} = maps:get(a,Db), % changed from timeout 2000
 
     ok.
 
@@ -1835,24 +1847,32 @@ otp_10463_upgrade_script_regexp(cleanup,Config) ->
     code:del_path(filename:join([DataDir,regexp_appup,app1,ebin])),
     ok.
 
-no_dot_erlang(Conf) ->
-    PrivDir = ?config(data_dir,Conf),
-    {ok, OrigWd} = file:get_cwd(),
-    try
-	ok = file:set_cwd(PrivDir),
-
-	{ok, Wd} = file:get_cwd(),
-	io:format("Dir ~ts~n", [Wd]),
+no_dot_erlang(_Conf) ->
+    case init:get_argument(home) of
+        {ok,[[Home]]} when is_list(Home) ->
+            no_dot_erlang_1(Home);
+        _ -> ok
+    end.
 
+no_dot_erlang_1(Home) ->
+    DotErlang = filename:join(Home, ".erlang"),
+    BupErlang = filename:join(Home, ".erlang_testbup"),
+    try
+        {ok, Wd} = file:get_cwd(),
+        case filelib:is_file(DotErlang) of
+            true -> {ok, _} = file:copy(DotErlang, BupErlang);
+            false -> ok
+        end,
 	Erl0 =  filename:join([code:root_dir(),"bin","erl"]),
 	Erl = filename:nativename(Erl0),
 	Quote = "\"",
 	Args = " -noinput -run c pwd -run erlang halt",
-	ok = file:write_file(".erlang", <<"io:put_chars(\"DOT_ERLANG_READ\\n\").\n">>),
+	ok = file:write_file(DotErlang, <<"io:put_chars(\"DOT_ERLANG_READ\\n\").\n">>),
 
 	CMD1 = Quote ++ Erl ++ Quote ++ Args ,
 	case os:cmd(CMD1) of
-	    "DOT_ERLANG_READ" ++ _ -> ok;
+	    "DOT_ERLANG_READ" ++ _ ->
+                io:format("~p: Success~n", [?LINE]);
 	    Other1 ->
 		io:format("Failed: ~ts~n",[CMD1]),
 		io:format("Expected: ~s ++ _~n",["DOT_ERLANG_READ "]),
@@ -1862,7 +1882,7 @@ no_dot_erlang(Conf) ->
 	NO_DOT_ERL = " -boot no_dot_erlang",
 	CMD2 = Quote ++ Erl ++ Quote ++ NO_DOT_ERL ++ Args,
 	case lists:prefix(Wd, Other2 = os:cmd(CMD2)) of
-	    true -> ok;
+	    true -> io:format("~p: Success~n", [?LINE]);
 	    false ->
 		io:format("Failed: ~ts~n",[CMD2]),
 		io:format("Expected: ~s~n",["TESTOK"]),
@@ -1870,11 +1890,95 @@ no_dot_erlang(Conf) ->
 		exit({failed_to_start, no_dot_erlang})
 	end
     after
-	_ = file:delete(".erlang"),
-	ok = file:set_cwd(OrigWd),
-	ok
+        case filelib:is_file(BupErlang) of
+            true ->
+                {ok, _} = file:copy(BupErlang, DotErlang),
+                _ = file:delete(BupErlang);
+            false ->
+                _ = file:delete(DotErlang)
+        end
     end.
 
+%%%-----------------------------------------------------------------
+%%% Test unicode handling. Make sure that release name, application
+%%% description, and application environment variables may contain
+%%% unicode characters.
+unicode_upgrade(Conf) ->
+    %% Set some paths
+    DataDir = ?config(data_dir, Conf),
+    PrivDir = priv_dir(Conf),
+    Dir = filename:join(PrivDir,"unicode"),
+    LibDir0 = filename:join(DataDir, "unicode"),
+    LibDir =
+        case {file:native_name_encoding(),os:type()} of
+            {utf8,{Os,_}} when Os =/= win32 ->
+                LD = filename:join(DataDir,"unicode_αβ"),
+                file:make_symlink("unicode",LD),
+                LD;
+            _ ->
+                LibDir0
+        end,
+
+    %% Create the releases
+    RelName = "unicode_rel_αβ",
+    Rel1 = create_and_install_fake_first_release(Dir,{RelName,"1"},
+						 [{u,"1.0",LibDir}]),
+    Rel2 = create_fake_upgrade_release(Dir,
+				       {RelName,"2"},
+				       [{u,"1.1",LibDir}],
+				       {[Rel1],[Rel1],[LibDir]}),
+    Rel1Dir = filename:dirname(Rel1),
+    Rel2Dir = filename:dirname(Rel2),
+
+    %% Start a slave node
+    {ok, Node} = t_start_node(unicode_upgrade, Rel1,
+                              filename:join(Rel1Dir,"sys.config"), "+pc unicode"),
+
+    %% Check
+    Dir1 = filename:join([LibDir, "u-1.0"]),
+    Dir1 = rpc:call(Node, code, lib_dir, [u]),
+    UBeam1 = filename:join([Dir1,"ebin","u.beam"]),
+    UBeam1 = rpc:call(Node,code,which,[u]),
+    {RelName,"1"} = rpc:call(Node,init,script_id,[]),
+    {Env,state} = rpc:call(Node,u,u,[]),
+    'val_αβ' = proplists:get_value('key_αβ',Env),
+    [{RelName,"1",_,permanent}|_] =
+        rpc:call(Node,release_handler,which_releases,[]),
+    {ok,ReleasesDir} = rpc:call(Node,application,get_env,[sasl,releases_dir]),
+    {ok,[[{release,RelName,"1",_,_,permanent}|_]]} =
+        file:consult(filename:join(ReleasesDir,"RELEASES")),
+
+    %% Install second release
+    {ok, RelVsn2} =
+	rpc:call(Node, release_handler, set_unpacked,
+		 [Rel2++".rel", [{u,"1.1",LibDir}]]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "relup")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "start.boot")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
+
+    {ok, _RelVsn1, []} =
+	rpc:call(Node, release_handler, install_release, [RelVsn2]),
+
+    %% And check
+    Dir2 = filename:join([LibDir, "u-1.1"]),
+    Dir2 = rpc:call(Node, code, lib_dir, [u]),
+    UBeam2 = filename:join([Dir2,"ebin","u.beam"]),
+    {file,UBeam2} = rpc:call(Node,code,is_loaded,[u]),
+    {RelName,"1"} = rpc:call(Node,init,script_id,[]),
+    {Env,{state,'αβ'}} = rpc:call(Node,u,u,[]),
+    [{RelName,"2",_,current}|_] =
+        rpc:call(Node,release_handler,which_releases,[]),
+    {ok,ReleasesDir2} = rpc:call(Node,application,get_env,[sasl,releases_dir]),
+    {ok,<<"%% coding: utf-8\n[{release,\"unicode_rel_αβ\",\"2\""/utf8,_/binary>>}=
+        file:read_file(filename:join(ReleasesDir2,"RELEASES")),
+    ok.
+
+unicode_upgrade(cleanup,_Conf) ->
+    stop_node(node_name(unicode_upgrade)).
+
 
 %%%=================================================================
 %%% Misceleaneous functions
@@ -2002,6 +2106,8 @@ are_names_reg_gg(Node, Names, N) ->
 
 
 t_start_node(Name, Boot, SysConfig) ->
+    t_start_node(Name, Boot, SysConfig, "").
+t_start_node(Name, Boot, SysConfig, ArgStr) ->
     Args = 
 	case Boot of
 	    [] -> [];
@@ -2010,8 +2116,9 @@ t_start_node(Name, Boot, SysConfig) ->
 	case SysConfig of
 	    [] -> [];
 	    _ -> " -config " ++ SysConfig
-	end,
-    test_server:start_node(Name, slave, [{args, Args}]).
+	end ++
+        " " ++ ArgStr,
+    test_server:start_node(Name, peer, [{args, Args}]).
 
 stop_node(Node) ->
     ?t:stop_node(Node).
@@ -2460,7 +2567,9 @@ create_rel_file(RelFile,RelName,RelVsn,Erts,ExtraApps) ->
 
 %% Insert a term in a file, which can be read with file:consult/1.
 write_term_file(File,Term) ->
-    ok = file:write_file(File,io_lib:format("~p.~n",[Term])).
+    Str = io_lib:format("%% ~s~n~tp.~n",[epp:encoding_to_string(utf8),Term]),
+    Bin = unicode:characters_to_binary(Str),
+    ok = file:write_file(File,Bin).
     
 
 %% Check that global group info is correct - try again for a maximum of 5 sec
@@ -2471,15 +2580,15 @@ check_gg_info(Node,OtherAlive,OtherDead,Synced,N) ->
     GGI = rpc:call(Node, global_group, info, []),
     GI = rpc:call(Node, global, info,[]),
     try do_check_gg_info(OtherAlive,OtherDead,Synced,GGI,GI) 
-    catch _:E when N==0 ->
+    catch _:E:Stacktrace when N==0 ->
 	    ?t:format("~nERROR: check_gg_info failed for ~p:~n~p~n"
 		      "when GGI was: ~p~nand GI was: ~p~n",
-		      [Node,{E,erlang:get_stacktrace()},GGI,GI]),
+		      [Node,{E,Stacktrace},GGI,GI]),
 	    ?t:fail("check_gg_info failed");
-	  _:E ->
+	  _:E:Stacktrace ->
 	    ?t:format("~nWARNING: check_gg_info failed for ~p:~n~p~n"
 		      "when GGI was: ~p~nand GI was: ~p~n",
-		      [Node,{E,erlang:get_stacktrace()},GGI,GI]),
+		      [Node,{E,Stacktrace},GGI,GI]),
 	    timer:sleep(1000),
 	    check_gg_info(Node,OtherAlive,OtherDead,Synced,N-1)
     end.
@@ -2719,8 +2828,8 @@ cover_fun(Node,Func) ->
 %% and possibly other applications if they are listed in AppDirs =
 %% [{App,Vsn,LibDir}]
 create_and_install_fake_first_release(Dir,AppDirs) ->
-    %% Create the first release
-    {RelName,RelVsn} = init:script_id(),
+    create_and_install_fake_first_release(Dir,init:script_id(),AppDirs).
+create_and_install_fake_first_release(Dir,{RelName,RelVsn},AppDirs) ->
     {Rel,_} = create_fake_release(Dir,RelName,RelVsn,AppDirs),
     ReleasesDir = filename:join(Dir, "releases"),
     RelDir = filename:dirname(Rel),
@@ -2744,9 +2853,11 @@ create_and_install_fake_first_release(Dir,AppDirs) ->
 %% be upgraded to from the release created by
 %% create_and_install_fake_first_release/2. Unpack first by calls to
 %% release_handler:set_unpacked and release_handler:install_file.
-create_fake_upgrade_release(Dir,RelVsn,AppDirs,{UpFrom,DownTo,ExtraLibs}) ->
-    %% Create a new release
+create_fake_upgrade_release(Dir,RelVsn,AppDirs,UpgrInstr) when not is_tuple(RelVsn) ->
     {RelName,_} = init:script_id(),
+    create_fake_upgrade_release(Dir,{RelName,RelVsn},AppDirs,UpgrInstr);
+create_fake_upgrade_release(Dir,{RelName,RelVsn},AppDirs,{UpFrom,DownTo,ExtraLibs}) ->
+    %% Create a new release
     {Rel,Paths} = create_fake_release(Dir,RelName,RelVsn,AppDirs),
     RelDir = filename:dirname(Rel),
 
diff --git a/lib/sasl/test/release_handler_SUITE_data/Makefile.src b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
index b794aa0e6f..113d3e2290 100644
--- a/lib/sasl/test/release_handler_SUITE_data/Makefile.src
+++ b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
@@ -76,7 +76,13 @@ SUP= \
 	 release_handler_timeouts/dummy-0.1/ebin/dummy_sup.@EMULATOR@ \
 	 release_handler_timeouts/dummy-0.1/ebin/dummy_sup_2.@EMULATOR@
 
-all: $(LIB) $(APP) $(OTP2740) $(C) $(SUP)
+UNICODE= \
+     unicode/u-1.0/ebin/u.@EMULATOR@ \
+     unicode/u-1.0/ebin/u_sup.@EMULATOR@ \
+     unicode/u-1.1/ebin/u.@EMULATOR@ \
+     unicode/u-1.1/ebin/u_sup.@EMULATOR@
+
+all: $(LIB) $(APP) $(OTP2740) $(C) $(SUP) $(UNICODE)
 
 lib/a-1.0/ebin/a.@EMULATOR@: lib/a-1.0/src/a.erl
 	erlc $(EFLAGS) -olib/a-1.0/ebin lib/a-1.0/src/a.erl
@@ -236,3 +242,13 @@ release_handler_timeouts/dummy-0.1/ebin/dummy_sup.@EMULATOR@: release_handler_ti
 	erlc $(EFLAGS) -orelease_handler_timeouts/dummy-0.1/ebin release_handler_timeouts/dummy-0.1/src/dummy_sup.erl
 release_handler_timeouts/dummy-0.1/ebin/dummy_sup_2.@EMULATOR@: release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl
 	erlc $(EFLAGS) -orelease_handler_timeouts/dummy-0.1/ebin release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl
+
+unicode/u-1.0/ebin/u.@EMULATOR@: unicode/u-1.0/src/u.erl
+	erlc $(EFLAGS) -ounicode/u-1.0/ebin unicode/u-1.0/src/u.erl
+unicode/u-1.0/ebin/u_sup.@EMULATOR@: unicode/u-1.0/src/u_sup.erl
+	erlc $(EFLAGS) -ounicode/u-1.0/ebin unicode/u-1.0/src/u_sup.erl
+
+unicode/u-1.1/ebin/u.@EMULATOR@: unicode/u-1.1/src/u.erl
+	erlc $(EFLAGS) -ounicode/u-1.1/ebin unicode/u-1.1/src/u.erl
+unicode/u-1.1/ebin/u_sup.@EMULATOR@: unicode/u-1.1/src/u_sup.erl
+	erlc $(EFLAGS) -ounicode/u-1.1/ebin unicode/u-1.1/src/u_sup.erl
diff --git a/lib/sasl/test/release_handler_SUITE_data/start b/lib/sasl/test/release_handler_SUITE_data/start
index 87275045b1..eab2b77aed 100755
--- a/lib/sasl/test/release_handler_SUITE_data/start
+++ b/lib/sasl/test/release_handler_SUITE_data/start
@@ -21,8 +21,7 @@ then
 fi
 
 HEART_COMMAND=$ROOTDIR/bin/start
-HW_WD_DISABLE=true
-export HW_WD_DISABLE HEART_COMMAND
+export HEART_COMMAND
 
 START_ERL_DATA=${1:-$RELDIR/start_erl.data}
 
diff --git a/lib/sasl/test/release_handler_SUITE_data/start_client b/lib/sasl/test/release_handler_SUITE_data/start_client
index 5ea94d6f7c..05d744f06e 100755
--- a/lib/sasl/test/release_handler_SUITE_data/start_client
+++ b/lib/sasl/test/release_handler_SUITE_data/start_client
@@ -24,8 +24,7 @@ RELDIR=$CLIENTDIR/releases
 # Note that this scripts is modified an copied to $CLIENTDIR/bin/start
 # in release_handler_SUITE:copy_client - therefore HEART_COMMAND is as follows:
 HEART_COMMAND=$CLIENTDIR/bin/start
-HW_WD_DISABLE=true
-export HW_WD_DISABLE HEART_COMMAND
+export HEART_COMMAND
 
 START_ERL_DATA=${1:-$RELDIR/start_erl.data}
 
diff --git a/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/ebin/u.app b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/ebin/u.app
new file mode 100644
index 0000000000..fea4f9992e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/ebin/u.app
@@ -0,0 +1,8 @@
+{application, u,
+	     [{description, "This app shall test unicode handling αβ"},
+              {vsn, "1.0"},
+	      {modules, [u, u_sup]},
+	      {registered, [u_sup]},
+	      {applications, [kernel, stdlib]},
+	      {env, [{'key_αβ', 'val_αβ'}]},
+	      {mod, {u_sup, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u.erl b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u.erl
new file mode 100644
index 0000000000..45fe098c0e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u.erl
@@ -0,0 +1,50 @@
+%% ``Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(u).
+
+
+-behaviour(gen_server).
+
+-vsn(1).
+
+%% External exports
+-export([start_link/0, u/0]).
+%% Internal exports
+-export([init/1, handle_call/3, handle_info/2, terminate/2]).
+
+start_link() -> gen_server:start_link({local, uu}, u, [], []).
+
+u() -> gen_server:call(uu, u).
+
+%%-----------------------------------------------------------------
+%% Callback functions from gen_server
+%%-----------------------------------------------------------------
+init([]) ->
+    process_flag(trap_exit, true),
+    {ok, state}.
+
+handle_call(u, _From, State) ->
+    X = application:get_all_env(u),
+    {reply, {X,State}, State}.
+
+handle_info(_, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u_sup.erl b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u_sup.erl
new file mode 100644
index 0000000000..b0d4a7b58f
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.0/src/u_sup.erl
@@ -0,0 +1,38 @@
+%% ``Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(u_sup).
+
+
+-behaviour(supervisor).
+
+%% External exports
+-export([start/2]).
+
+%% Internal exports
+-export([init/1]).
+
+start(_, _) ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+init([]) ->
+    SupFlags = {one_for_one, 4, 3600},
+    Config = {u,
+	      {u, start_link, []},
+	      permanent, 2000, worker, [u]},
+    {ok, {SupFlags, [Config]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.app b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.app
new file mode 100644
index 0000000000..8fcc3bba42
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.app
@@ -0,0 +1,8 @@
+{application, u,
+	     [{description, "This app shall test unicode handling αβ"},
+              {vsn, "1.1"},
+	      {modules, [u, u_sup]},
+	      {registered, [u_sup]},
+	      {applications, [kernel, stdlib]},
+	      {env, [{'key_αβ', 'val_αβ'}]},
+	      {mod, {u_sup, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.appup b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.appup
new file mode 100644
index 0000000000..0344ce92ab
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/ebin/u.appup
@@ -0,0 +1,3 @@
+{"1.1",
+ [{"1.0",[{update,u,{advanced,'αβ'}}]}],
+ [{"1.0",[{update,u,{advanced,'αβ'}}]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u.erl b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u.erl
new file mode 100644
index 0000000000..d2544d6fc1
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u.erl
@@ -0,0 +1,55 @@
+%% ``Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(u).
+
+
+-behaviour(gen_server).
+
+-vsn(1).
+
+%% External exports
+-export([start_link/0, u/0]).
+%% Internal exports
+-export([init/1, handle_call/3, handle_info/2, terminate/2, code_change/3]).
+
+start_link() -> gen_server:start_link({local, uu}, u, [], []).
+
+u() -> gen_server:call(uu, u).
+
+%%-----------------------------------------------------------------
+%% Callback functions from gen_server
+%%-----------------------------------------------------------------
+init([]) ->
+    process_flag(trap_exit, true),
+    {ok, {state,'αβ'}}.
+
+handle_call(u, _From, State) ->
+    X = application:get_all_env(u),
+    {reply, {X,State}, State}.
+
+handle_info(_, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change({down,_}, {State,_}, _Extra) ->
+    {ok, State};
+code_change(_, State, Extra) ->
+    {ok, {State, Extra}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u_sup.erl b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u_sup.erl
new file mode 100644
index 0000000000..b0d4a7b58f
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/unicode/u-1.1/src/u_sup.erl
@@ -0,0 +1,38 @@
+%% ``Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(u_sup).
+
+
+-behaviour(supervisor).
+
+%% External exports
+-export([start/2]).
+
+%% Internal exports
+-export([init/1]).
+
+start(_, _) ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+init([]) ->
+    SupFlags = {one_for_one, 4, 3600},
+    Config = {u,
+	      {u, start_link, []},
+	      permanent, 2000, worker, [u]},
+    {ok, {SupFlags, [Config]}}.
diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl
index f12bde9b3d..fc80e37210 100644
--- a/lib/sasl/test/sasl_SUITE.erl
+++ b/lib/sasl/test/sasl_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 -include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
+-export([init_per_suite/1,end_per_suite/1]).
 -export([all/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -37,6 +38,19 @@ all() ->
 groups() -> 
     [].
 
+init_per_suite(Config) ->
+    S = application:get_env(kernel,logger_sasl_compatible),
+    application:set_env(kernel,logger_sasl_compatible,true),
+    [{sasl_compatible,S}|Config].
+
+end_per_suite(Config) ->
+    case ?config(sasl_compatible,Config) of
+        {ok,X} ->
+            application:set_env(kernel,logger_sasl_compatible,X);
+        undefined ->
+            application:unset_env(kernel,logger_sasl_compatible)
+    end.
+
 init_per_group(_GroupName, Config) ->
     Config.
 
diff --git a/lib/sasl/test/sasl_report_SUITE.erl b/lib/sasl/test/sasl_report_SUITE.erl
index aa229726ae..e639b55cee 100644
--- a/lib/sasl/test/sasl_report_SUITE.erl
+++ b/lib/sasl/test/sasl_report_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -20,7 +20,8 @@
 -module(sasl_report_SUITE).
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
 	 init_per_group/2,end_per_group/2]).
--export([gen_server_crash/1]).
+-export([gen_server_crash/1, gen_server_crash_unicode/1]).
+-export([legacy_gen_server_crash/1, legacy_gen_server_crash_unicode/1]).
 
 -export([crash_me/0,start_link/0,init/1,handle_cast/2,terminate/2]).
 
@@ -29,7 +30,10 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    [gen_server_crash].
+    [gen_server_crash,
+     gen_server_crash_unicode,
+     legacy_gen_server_crash,
+     legacy_gen_server_crash_unicode].
 
 groups() ->
     [].
@@ -47,47 +51,123 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 gen_server_crash(Config) ->
+    gen_server_crash(Config, latin1).
+
+gen_server_crash_unicode(Config) ->
+    gen_server_crash(Config, unicode).
+
+legacy_gen_server_crash(Config) ->
+    legacy_gen_server_crash(Config,latin1).
+
+legacy_gen_server_crash_unicode(Config) ->
+    legacy_gen_server_crash(Config,unicode).
+
+gen_server_crash(Config, Encoding) ->
+    TC = list_to_atom(lists:concat([?FUNCTION_NAME,"_",Encoding])),
+    PrivDir = filename:join(?config(priv_dir,Config),?MODULE),
+    ConfigFileName = filename:join(PrivDir,TC),
+    KernelLog = filename:join(PrivDir,lists:concat([TC,"_kernel.log"])),
+    SaslLog = filename:join(PrivDir,lists:concat([TC,"_sasl.log"])),
+    KernelConfig = [{logger,[{handler,default,logger_std_h,
+                              #{config=>#{type=>{file,KernelLog}}}}]},
+                    {logger_sasl_compatible,true}],
+    Modes = [write, {encoding, Encoding}],
+    SaslConfig = [{sasl_error_logger,{file,SaslLog,Modes}}],
+    ok = filelib:ensure_dir(SaslLog),
+
+    ok = file:write_file(ConfigFileName ++ ".config",
+                         io_lib:format("[{kernel, ~p},~n{sasl, ~p}].",
+                                       [KernelConfig,SaslConfig])),
+    {ok,Node} =
+        test_server:start_node(
+          TC, peer,
+          [{args, ["-pa ",filename:dirname(code:which(?MODULE)),
+                   " -boot start_sasl -kernel start_timer true "
+                   "-config ",ConfigFileName]}]),
+
+    %% Set depth
+    ok = rpc:call(Node,logger,update_formatter_config,[default,depth,30]),
+    ok = rpc:call(Node,logger,update_formatter_config,[sasl,depth,30]),
+
+    %% Make sure remote node logs it's own logs, and current node does
+    %% not log them.
+    ok = rpc:call(Node,logger,remove_handler_filter,[default,remote_gl]),
+    ok = rpc:call(Node,logger,remove_handler_filter,[sasl,remote_gl]),
+    ok = logger:add_primary_filter(no_remote,{fun(#{meta:=#{pid:=Pid}},_)
+                                                 when node(Pid)=/=node() -> stop;
+                                              (_,_) -> ignore
+                                           end,[]}),
+    ct:log("Local node Logger config:~n~p",
+           [rpc:call(Node,logger,get_config,[])]),
+    ct:log("Remote node Logger config:~n~p",
+           [rpc:call(Node,logger,get_config,[])]),
+    ct:log("Remote node error_logger handlers: ~p",
+           [rpc:call(Node,error_logger,which_report_handlers,[])]),
+
+    ok = rpc:call(Node,?MODULE,crash_me,[]),
+
+    ok = rpc:call(Node,logger_std_h,filesync,[default]),
+    ok = rpc:call(Node,logger_std_h,filesync,[sasl]),
+
+    test_server:stop_node(Node),
+    ok = logger:remove_primary_filter(no_remote),
+
+    check_file(KernelLog, utf8, 70000, 150000),
+    check_file(SaslLog, Encoding, 70000, 150000),
+
+    ok = file:delete(KernelLog),
+    ok = file:delete(SaslLog),
+
+    ok.
+
+legacy_gen_server_crash(Config, Encoding) ->
+    StopFilter = {fun(_,_) -> stop end, ok},
+    logger:add_handler_filter(default,stop_all,StopFilter),
+    logger:add_handler_filter(sasl,stop_all,StopFilter),
+    logger:add_handler_filter(cth_log_redirect,stop_all,StopFilter),
     try
-	do_gen_server_crash(Config)
+	do_gen_server_crash(Config, Encoding)
     after
-	error_logger:tty(true),
-	ok = application:unset_env(sasl, sasl_error_logger),
-	ok = application:unset_env(kernel, error_logger_format_depth),
-	error_logger:add_report_handler(cth_log_redirect)
+        logger:remove_handler_filter(default,stop_all),
+        logger:remove_handler_filter(sasl,stop_all),
+        logger:remove_handler_filter(cth_log_redirect,stop_all)
     end,
     ok.
 
-do_gen_server_crash(Config) ->
+do_gen_server_crash(Config, Encoding) ->
     PrivDir = ?config(priv_dir, Config),
     LogDir = filename:join(PrivDir, ?MODULE),
     KernelLog = filename:join(LogDir, "kernel.log"),
     SaslLog = filename:join(LogDir, "sasl.log"),
     ok = filelib:ensure_dir(SaslLog),
 
-    error_logger:delete_report_handler(cth_log_redirect),
-    error_logger:tty(false),
-    application:stop(sasl),
-    ok = application:set_env(sasl, sasl_error_logger, {file,SaslLog},
-			     [{persistent,true}]),
+    Modes = [write, {encoding, Encoding}],
     application:set_env(kernel, error_logger_format_depth, 30),
     error_logger:logfile({open,KernelLog}),
-    application:start(sasl),
-    io:format("~p\n", [gen_event:which_handlers(error_logger)]),
+    error_logger:add_report_handler(sasl_report_file_h,{SaslLog,Modes,all}),
+    ct:log("Logger config:~n~p",[logger:get_config()]),
+    ct:log("error_logger handlers: ~p",[error_logger:which_report_handlers()]),
 
     crash_me(),
 
     error_logger:logfile(close),
+    error_logger:delete_report_handler(sasl_report_file_h),
 
-    check_file(KernelLog, 70000, 150000),
-    check_file(SaslLog, 50000, 100000),
+    check_file(KernelLog, utf8, 70000, 150000),
+    check_file(SaslLog, Encoding, 70000, 150000),
 
+    ok = file:delete(KernelLog),
+    ok = file:delete(SaslLog),
     ok.
 
-check_file(File, Min, Max) ->
+check_file(File, Encoding, Min, Max) ->
     {ok,Bin} = file:read_file(File),
     Base = filename:basename(File),
     io:format("*** Contents of ~s ***\n", [Base]),
-    io:put_chars([Bin,"\n"]),
+    case Encoding of
+        latin1 -> io:format("~s\n", [Bin]);
+        _ -> io:format("~ts\n", [Bin])
+    end,
     Sz = byte_size(Bin),
     io:format("Size: ~p (allowed range is ~p..~p)\n",
 	      [Sz,Min,Max]),
@@ -110,7 +190,9 @@ crash_me() ->
     {ok,SuperPid} = supervisor:start_link(sasl_report_suite_supervisor, []),
     [{Id,Pid,_,_}] = supervisor:which_children(SuperPid),
     HugeData = gb_sets:from_list(lists:seq(1, 100000)),
-    gen_server:cast(Pid, HugeData),
+    SomeData1 = list_to_atom([246]),
+    SomeData2 = list_to_atom([1024]),
+    gen_server:cast(Pid, {HugeData,SomeData1,SomeData2}),
     Ref = monitor(process, Pid),
     receive
 	{'DOWN',Ref,process,Pid,_} ->
@@ -129,6 +211,12 @@ init(_) ->
 
 handle_cast(Big, St) ->
     Seq = lists:seq(1, 10000),
+    Latin1Atom = list_to_atom([246]),
+    UnicodeAtom = list_to_atom([1024]),
+    put(Latin1Atom, Latin1Atom),
+    put(UnicodeAtom, UnicodeAtom),
+    self() ! Latin1Atom,
+    self() ! UnicodeAtom,
     self() ! Seq,
     self() ! Seq,
     self() ! Seq,
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index bf95ceb70c..1827974866 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,6 +29,8 @@
 
 -module(systools_SUITE).
 
+-compile(export_all).
+
 %%-define(debug, true).
 
 -include_lib("common_test/include/ct.hrl").
@@ -39,31 +41,6 @@
 
 -include_lib("kernel/include/file.hrl").
 
--export([all/0,suite/0,groups/0,init_per_group/2,end_per_group/2]).
-
--export([script_options/1, normal_script/1, unicode_script/1,
-	 unicode_script/2, no_mod_vsn_script/1,
-	 wildcard_script/1, variable_script/1, no_sasl_script/1,
-	 no_dot_erlang_script/1,
-	 abnormal_script/1, src_tests_script/1, crazy_script/1,
-	 included_script/1, included_override_script/1,
-	 included_fail_script/1, included_bug_script/1, exref_script/1,
-	 duplicate_modules_script/1,
-	 otp_3065_circular_dependenies/1, included_and_used_sort_script/1]).
--export([tar_options/1, normal_tar/1, no_mod_vsn_tar/1, system_files_tar/1,
-	 system_files_tar/2, invalid_system_files_tar/1,
-	 invalid_system_files_tar/2, variable_tar/1,
-	 src_tests_tar/1, var_tar/1, exref_tar/1, link_tar/1,
-	 otp_9507_path_ebin/1]).
--export([normal_relup/1, restart_relup/1, abnormal_relup/1, no_sasl_relup/1,
-	 no_appup_relup/1, bad_appup_relup/1, app_start_type_relup/1,
-	 regexp_relup/1]).
--export([normal_hybrid/1,hybrid_no_old_sasl/1,hybrid_no_new_sasl/1]).
--export([otp_6226_outdir/1]).
--export([init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, end_per_testcase/2]).
--export([delete_tree/1]).
-
 -import(lists, [foldl/3]).
 
 -define(default_timeout, ?t:minutes(20)).
@@ -90,14 +67,15 @@ groups() ->
        otp_3065_circular_dependenies, included_and_used_sort_script]},
      {tar, [],
       [tar_options, normal_tar, no_mod_vsn_tar, system_files_tar,
-       invalid_system_files_tar, variable_tar,
-       src_tests_tar, var_tar, exref_tar, link_tar, otp_9507_path_ebin]},
+       system_src_file_tar, invalid_system_files_tar, variable_tar,
+       src_tests_tar, var_tar, exref_tar, link_tar, no_sasl_tar,
+       otp_9507_path_ebin]},
      {relup, [],
       [normal_relup, restart_relup, abnormal_relup, no_sasl_relup,
        no_appup_relup, bad_appup_relup, app_start_type_relup, regexp_relup
       ]},
      {hybrid, [], [normal_hybrid,hybrid_no_old_sasl,hybrid_no_new_sasl]},
-     {options, [], [otp_6226_outdir]}].
+     {options, [], [otp_6226_outdir,app_file_defaults]}].
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -109,25 +87,25 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_suite(Config) when is_list(Config) ->
+    %% To use in end_per_testcase
+    Path = code:get_path(),
+    {ok,Cwd} = file:get_cwd(),
+
     %% Make of copy of the data directory.
     DataDir = ?datadir,
     PrivDir = ?privdir,
     CopyDir = fname(PrivDir, "datacopy"),
+    ok = file:make_dir(CopyDir),
     TarFile = fname(PrivDir, "datacopy.tgz"),
-    {ok, Tar} = erl_tar:open(TarFile, [write, compressed]),
-    ok = erl_tar:add(Tar, DataDir, CopyDir, [compressed]),
-    ok = erl_tar:close(Tar),
-    ok = erl_tar:extract(TarFile, [compressed]),
+    ok = file:set_cwd(DataDir),
+    ok = erl_tar:create(TarFile, ["."], [compressed]),
+    ok = erl_tar:extract(TarFile, [compressed, {cwd,CopyDir}]),
     ok = file:delete(TarFile),
 
     %% Compile source files in the copy directory.
     Sources = filelib:wildcard(fname([CopyDir,'*','*','*','*','*.erl'])),
     lists:foreach(fun compile_source/1, Sources),
 
-    %% To use in end_per_testcase
-    Path = code:get_path(),
-    {ok,Cwd} = file:get_cwd(),
-
     [{copy_dir, CopyDir}, {cwd,Cwd}, {path,Path} | Config].
 
 compile_source(File) ->
@@ -238,6 +216,7 @@ normal_script(Config) when is_list(Config) ->
 
     %% Check the same but w. silent flag
     {ok, _, []} = systools:make_script(LatestName, [silent]),
+    {ok, _, []} = systools:make_script(LatestName, [silent,warnings_as_errors]),
 
     %% Use the local option
     ok = systools:make_script(LatestName, [local]),
@@ -456,9 +435,16 @@ no_sasl_script(Config) when is_list(Config) ->
     {ok, _ , [{warning,missing_sasl}]} =
 	systools:make_script(LatestName,[{path, P},silent]),
 
+    {error, systools_make, {warnings_treated_as_errors,[missing_sasl]}} =
+	systools:make_script(LatestName,[{path, P},silent,warnings_as_errors]),
+
     {ok, _ , []} =
 	systools:make_script(LatestName,[{path, P},silent, no_warn_sasl]),
 
+    {ok, _ , []} =
+	systools:make_script(LatestName,[{path, P},silent, no_warn_sasl,
+                                         warnings_as_errors]),
+
     ok = file:set_cwd(OldDir),
     ok.
 
@@ -525,7 +511,9 @@ src_tests_script(Config) when is_list(Config) ->
     ok = file:delete(BootFile),
     false = filelib:is_regular(BootFile),
     %% With warnings_as_errors and src_tests option, an error should be issued
-    error =
+    {error, systools_make,
+     {warnings_treated_as_errors, [{obj_out_of_date,_},
+                                   {source_not_found,_}]}} =
 	systools:make_script(LatestName, [silent, {path, N}, src_tests,
 					  warnings_as_errors]),
     error =
@@ -745,7 +733,7 @@ exref_script(Config) when is_list(Config) ->
 
     ok = file:set_cwd(LatestDir),
 
-    {ok, _, _} = systools:make_script(LatestName, [{path,P}, silent]),
+    {ok, _, []} = systools:make_script(LatestName, [{path,P}, silent]),
 
     %% Complete exref
     {ok, _, W1} =
@@ -894,10 +882,10 @@ normal_tar(Config) when is_list(Config) ->
 
     ok = file:set_cwd(LatestDir),
 
-    {ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
+    {ok, _, []} = systools:make_script(LatestName, [silent, {path, P}]),
     ok = systools:make_tar(LatestName, [{path, P}]),
     ok = check_tar(fname([lib,'db-2.1',ebin,'db.app']), LatestName),
-    {ok, _, _} = systools:make_tar(LatestName, [{path, P}, silent]),
+    {ok, _, []} = systools:make_tar(LatestName, [{path, P}, silent]),
     ok = check_tar(fname([lib,'fe-3.1',ebin,'fe.app']), LatestName),
 
     ok = file:set_cwd(OldDir),
@@ -918,10 +906,10 @@ no_mod_vsn_tar(Config) when is_list(Config) ->
 
     ok = file:set_cwd(LatestDir),
 
-    {ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
+    {ok, _, []} = systools:make_script(LatestName, [silent, {path, P}]),
     ok = systools:make_tar(LatestName, [{path, P}]),
     ok = check_tar(fname([lib,'db-3.1',ebin,'db.app']), LatestName),
-    {ok, _, _} = systools:make_tar(LatestName, [{path, P}, silent]),
+    {ok, _, []} = systools:make_tar(LatestName, [{path, P}, silent]),
     ok = check_tar(fname([lib,'fe-3.1',ebin,'fe.app']), LatestName),
 
     ok = file:set_cwd(OldDir),
@@ -945,11 +933,11 @@ system_files_tar(Config) ->
     ok = file:write_file("sys.config","[].\n"),
     ok = file:write_file("relup","{\"LATEST\",[],[]}.\n"),
 
-    {ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
+    {ok, _, []} = systools:make_script(LatestName, [silent, {path, P}]),
     ok = systools:make_tar(LatestName, [{path, P}]),
     ok = check_tar(fname(["releases","LATEST","sys.config"]), LatestName),
     ok = check_tar(fname(["releases","LATEST","relup"]), LatestName),
-    {ok, _, _} = systools:make_tar(LatestName, [{path, P}, silent]),
+    {ok, _, []} = systools:make_tar(LatestName, [{path, P}, silent]),
     ok = check_tar(fname(["releases","LATEST","sys.config"]), LatestName),
     ok = check_tar(fname(["releases","LATEST","relup"]), LatestName),
 
@@ -957,12 +945,47 @@ system_files_tar(Config) ->
 
     ok.
 
+
 system_files_tar(cleanup,Config) ->
     Dir = ?privdir,
     file:delete(filename:join(Dir,"sys.config")),
     file:delete(filename:join(Dir,"relup")),
     ok.
 
+%% make_tar: Check that sys.config.src and not sys.config is included
+system_src_file_tar(Config) ->
+    {ok, OldDir} = file:get_cwd(),
+
+    {LatestDir, LatestName} = create_script(latest,Config),
+
+    DataDir = filename:absname(?copydir),
+    LibDir = fname([DataDir, d_normal, lib]),
+    P = [fname([LibDir, 'db-2.1', ebin]),
+         fname([LibDir, 'fe-3.1', ebin])],
+
+    ok = file:set_cwd(LatestDir),
+
+    %% Add dummy sys.config and sys.config.src
+    ok = file:write_file("sys.config.src","[${SOMETHING}].\n"),
+    ok = file:write_file("sys.config","[].\n"),
+
+    {ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
+    ok = systools:make_tar(LatestName, [{path, P}]),
+    ok = check_tar(fname(["releases","LATEST","sys.config.src"]), LatestName),
+    {error, _} = check_tar(fname(["releases","LATEST","sys.config"]), LatestName),
+    {ok, _, _} = systools:make_tar(LatestName, [{path, P}, silent]),
+    ok = check_tar(fname(["releases","LATEST","sys.config.src"]), LatestName),
+    {error, _} = check_tar(fname(["releases","LATEST","sys.config"]), LatestName),
+
+    ok = file:set_cwd(OldDir),
+
+    ok.
+
+system_src_file_tar(cleanup,Config) ->
+    Dir = ?privdir,
+    file:delete(filename:join(Dir,"sys.config")),
+    file:delete(filename:join(Dir,"sys.config.src")),
+    ok.
 
 %% make_tar: Check that make_tar fails if relup or sys.config exist
 %% but do not have valid content
@@ -978,7 +1001,7 @@ invalid_system_files_tar(Config) ->
 
     ok = file:set_cwd(LatestDir),
 
-    {ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
+    {ok, _, []} = systools:make_script(LatestName, [silent, {path, P}]),
 
     %% Add dummy relup and sys.config - faulty sys.config
     ok = file:write_file("sys.config","[]\n"), %!!! syntax error - missing '.'
@@ -1036,7 +1059,7 @@ variable_tar(Config) when is_list(Config) ->
 
     ok = file:set_cwd(LatestDir),
 
-    {ok, _, _} = systools:make_script(LatestName,
+    {ok, _, []} = systools:make_script(LatestName,
 				      [silent,
 				       {path, P},
 				       {variables,[{"TEST", LibDir}]}]),
@@ -1045,7 +1068,7 @@ variable_tar(Config) when is_list(Config) ->
 					{variables,[{"TEST", LibDir}]}]),
     ok = check_var_tar("TEST", LatestName),
 
-    {ok, _, _} = systools:make_tar(LatestName,
+    {ok, _, []} = systools:make_tar(LatestName,
 				   [{path, P}, silent,
 				    {variables,[{"TEST", LibDir}]}]),
     ok = check_var_tar("TEST", LatestName),
@@ -1174,7 +1197,7 @@ var_tar(Config) when is_list(Config) ->
 
     ok = file:set_cwd(LatestDir),
 
-    {ok, _, _} = systools:make_script(LatestName,
+    {ok, _, []} = systools:make_script(LatestName,
 				      [silent,
 				       {path, P},
 				       {variables,[{"TEST", LibDir}]}]),
@@ -1218,7 +1241,7 @@ exref_tar(Config) when is_list(Config) ->
 
     ok = file:set_cwd(LatestDir),
 
-    {ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
+    {ok, _, []} = systools:make_script(LatestName, [silent, {path, P}]),
 
     %% Complete exref
     {ok, _, W1} =
@@ -1248,7 +1271,41 @@ exref_tar(Config) when is_list(Config) ->
     ok = file:set_cwd(OldDir),
     ok.
 
+%% make_tar:  Create tar without sasl appl. Check warning.
+no_sasl_tar(Config) when is_list(Config) ->
+    {ok, OldDir} = file:get_cwd(),
 
+    {LatestDir, LatestName} = create_script(latest1_no_sasl,Config),
+
+    DataDir = filename:absname(?copydir),
+    LibDir = fname([DataDir, d_normal, lib]),
+    P = [fname([LibDir, '*', ebin]),
+	 fname([DataDir, lib, kernel, ebin]),
+	 fname([DataDir, lib, stdlib, ebin]),
+	 fname([DataDir, lib, sasl, ebin])],
+
+    ok = file:set_cwd(LatestDir),
+
+    {ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
+    ok = systools:make_tar(LatestName, [{path, P}]),
+    {ok, _, [{warning,missing_sasl}]} =
+        systools:make_tar(LatestName, [{path, P}, silent]),
+    {ok, _, []} =
+        systools:make_tar(LatestName, [{path, P}, silent, no_warn_sasl]),
+    {ok, _, []} =
+        systools:make_tar(LatestName, [{path, P}, silent, no_warn_sasl,
+                                       warnings_as_errors]),
+    TarFile = LatestName ++ ".tar.gz",
+    true = filelib:is_regular(TarFile),
+    ok = file:delete(TarFile),
+    {error, systools_make, {warnings_treated_as_errors,[missing_sasl]}} =
+        systools:make_tar(LatestName, [{path, P}, silent, warnings_as_errors]),
+    error =
+        systools:make_tar(LatestName, [{path, P}, warnings_as_errors]),
+    false = filelib:is_regular(TarFile),
+
+    ok = file:set_cwd(OldDir),
+    ok.
 
 %% make_tar: OTP-9507 - make_tar failed when path given as just 'ebin'.
 otp_9507_path_ebin(Config) when is_list(Config) ->
@@ -1268,7 +1325,7 @@ otp_9507_path_ebin(Config) when is_list(Config) ->
 	  fname([DataDir, lib, kernel, ebin]),
 	  fname([DataDir, lib, stdlib, ebin]),
 	  fname([DataDir, lib, sasl, ebin])],
-    {ok, _, _} = systools:make_script(RelName, [silent, {path, P1}]),
+    {ok, _, []} = systools:make_script(RelName, [silent, {path, P1}]),
     ok = systools:make_tar(RelName, [{path, P1}]),
     Content1 = tar_contents(RelName),
 
@@ -1309,7 +1366,7 @@ normal_relup(Config) when is_list(Config) ->
     ok = systools:make_relup(LatestName, [LatestName1], [LatestName1],
 			     [{path, P}]),
     ok = check_relup([{db, "2.1"}], [{db, "1.0"}]),
-    {ok, _, _, []} =
+    {ok, Relup, _, []} =
 	systools:make_relup(LatestName, [LatestName1], [LatestName1],
 			    [{path, P}, silent]),
     ok = check_relup([{db, "2.1"}], [{db, "1.0"}]),
@@ -1322,7 +1379,9 @@ normal_relup(Config) when is_list(Config) ->
     error =
 	systools:make_relup(LatestName, [LatestName2], [LatestName1],
 			    [{path, P}, warnings_as_errors]),
-    error =
+    {error, systools_relup,
+     {warnings_treated_as_errors,[pre_R15_emulator_upgrade,
+                                  {erts_vsn_changed, _}]}} =
 	systools:make_relup(LatestName, [LatestName2], [LatestName1],
 			    [{path, P}, silent, warnings_as_errors]),
 
@@ -1341,6 +1400,14 @@ normal_relup(Config) when is_list(Config) ->
     %% relup file should exist now
     true = filelib:is_regular("relup"),
 
+    %% file should not be written if noexec option is used.
+    %% delete before running tests.
+    ok = file:delete("relup"),
+    {ok,Relup,_,[]} =
+        systools:make_relup(LatestName, [LatestName1], [LatestName1],
+                            [{path, P}, noexec]),
+    false = filelib:is_regular("relup"),
+
     ok = file:set_cwd(OldDir),
     ok.
 
@@ -1728,27 +1795,28 @@ normal_hybrid(Config) ->
 
     ok = file:set_cwd(OldDir),
 
-    BasePaths = {"testkernelpath","teststdlibpath","testsaslpath"},
     {ok,Hybrid} = systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2,
-						 BasePaths, [dummy,args]),
+                                                 [dummy,args]),
 
     {script,{"Test release","tmp_vsn"},Script} = binary_to_term(Hybrid),
     ct:log("~p.~n",[Script]),
 
     %% Check that all paths to base apps are replaced by paths from BaseLib
     Boot1Str = io_lib:format("~p~n",[binary_to_term(Boot1)]),
+    Boot2Str = io_lib:format("~p~n",[binary_to_term(Boot2)]),
     HybridStr = io_lib:format("~p~n",[binary_to_term(Hybrid)]),
     ReOpts = [global,{capture,first,list},unicode],
     {match,OldKernelMatch} = re:run(Boot1Str,"kernel-[0-9\.]+",ReOpts),
     {match,OldStdlibMatch} = re:run(Boot1Str,"stdlib-[0-9\.]+",ReOpts),
     {match,OldSaslMatch} = re:run(Boot1Str,"sasl-[0-9\.]+",ReOpts),
 
-    nomatch = re:run(HybridStr,"kernel-[0-9\.]+",ReOpts),
-    nomatch = re:run(HybridStr,"stdlib-[0-9\.]+",ReOpts),
-    nomatch = re:run(HybridStr,"sasl-[0-9\.]+",ReOpts),
-    {match,NewKernelMatch} = re:run(HybridStr,"testkernelpath",ReOpts),
-    {match,NewStdlibMatch} = re:run(HybridStr,"teststdlibpath",ReOpts),
-    {match,NewSaslMatch} = re:run(HybridStr,"testsaslpath",ReOpts),
+    {match,NewKernelMatch} = re:run(Boot2Str,"kernel-[0-9\.]+",ReOpts),
+    {match,NewStdlibMatch} = re:run(Boot2Str,"stdlib-[0-9\.]+",ReOpts),
+    {match,NewSaslMatch} = re:run(Boot2Str,"sasl-[0-9\.]+",ReOpts),
+
+    {match,NewKernelMatch} = re:run(HybridStr,"kernel-[0-9\.]+",ReOpts),
+    {match,NewStdlibMatch} = re:run(HybridStr,"stdlib-[0-9\.]+",ReOpts),
+    {match,NewSaslMatch} = re:run(HybridStr,"sasl-[0-9\.]+",ReOpts),
 
     NewKernelN = length(NewKernelMatch),
     NewKernelN = length(OldKernelMatch),
@@ -1757,6 +1825,11 @@ normal_hybrid(Config) ->
     NewSaslN = length(NewSaslMatch),
     NewSaslN = length(OldSaslMatch),
 
+    %% Check that kernelProcesses are taken from new boot script
+    {script,_,Script2} = binary_to_term(Boot2),
+    NewKernelProcs = [KP || KP={kernelProcess,_,_} <- Script2],
+    NewKernelProcs = [KP || KP={kernelProcess,_,_} <- Script],
+
     %% Check that application load instruction has correct versions
     Apps = application:loaded_applications(),
     {_,_,KernelVsn} = lists:keyfind(kernel,1,Apps),
@@ -1827,10 +1900,8 @@ hybrid_no_old_sasl(Config) ->
     {ok,Boot1} = file:read_file(Name1 ++ ".boot"),
     {ok,Boot2} = file:read_file(Name2 ++ ".boot"),
 
-    BasePaths = {"testkernelpath","teststdlibpath","testsaslpath"},
     {error,{app_not_replaced,sasl}} =
-	systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2,
-				       BasePaths,[dummy,args]),
+	systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2,[dummy,args]),
 
     ok = file:set_cwd(OldDir),
     ok.
@@ -1860,10 +1931,8 @@ hybrid_no_new_sasl(Config) ->
     {ok,Boot1} = file:read_file(Name1 ++ ".boot"),
     {ok,Boot2} = file:read_file(Name2 ++ ".boot"),
 
-    BasePaths = {"testkernelpath","teststdlibpath","testsaslpath"},
     {error,{app_not_found,sasl}} =
-	systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2,
-				       BasePaths,[dummy,args]),
+	systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2,[dummy,args]),
 
     ok = file:set_cwd(OldDir),
     ok.
@@ -2014,6 +2083,37 @@ otp_6226_outdir(Config) when is_list(Config) ->
     ok.
 
 
+%% Test that all default values can be used as values in the .app file
+app_file_defaults(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    Name = app1,
+    NameStr = atom_to_list(Name),
+    Vsn = "1.0",
+    AppSpec = app_spec(Name,#{vsn=>"1.0"}),
+    ok = file:write_file(filename:join(PrivDir,NameStr ++ ".app"),
+			 io_lib:format("~p.~n",[AppSpec])),
+    {ok,_} = systools_make:read_application(NameStr,Vsn,[PrivDir],[]),
+    ok.
+
+app_spec(Name,New) ->
+    {application,Name,app_spec(New)}.
+
+app_spec(New) ->
+    Default = #{description => "",
+		id => "",
+		vsn => "",
+		modules => [],
+		maxP => infinity,
+		maxT => infinity,
+		registered => [],
+		included_applications => [],
+		applications => [],
+		env => [],
+		mod => [],
+		start_phases => undefined,
+		runtime_dependencies => []},
+    maps:to_list(maps:merge(Default,New)).
+
 %%%%%%
 %%%%%% Utilities
 %%%%%%
diff --git a/lib/sasl/test/test_lib.hrl b/lib/sasl/test/test_lib.hrl
index 2d897e9903..f5210d4f27 100644
--- a/lib/sasl/test/test_lib.hrl
+++ b/lib/sasl/test/test_lib.hrl
@@ -1,3 +1,3 @@
 -define(ertsvsn,"4.4").
--define(kernelvsn,"4.0").
--define(stdlibvsn,"2.5").
+-define(kernelvsn,"5.3").
+-define(stdlibvsn,"3.4").
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index a7d7c09cde..c1f80752a7 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 3.0.1
+SASL_VSN = 3.3