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

21 files changed, 623 insertions, 394 deletions

diff --git a/lib/reltool/doc/src/Makefile b/lib/reltool/doc/src/Makefile
index e378cdf980..dce8059616 100644
--- a/lib/reltool/doc/src/Makefile
+++ b/lib/reltool/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2009-2016. All Rights Reserved.
+# Copyright Ericsson AB 2009-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.
@@ -88,6 +88,7 @@ clean clean_docs:
                   fi \
         done
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index 2365a68feb..165ae6db6a 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2009</year>
-      <year>2016</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -38,7 +38,105 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Reltool.</p>
 
-  <section><title>Reltool 0.7.2</title>
+  <section><title>Reltool 0.7.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Reltool would earlier erroneously split paths like
+	    <c>"c:\foo"</c> into <c>["c","\foo"]</c> when reading the
+	    <c>$ERL_LIBS</c> variable on windows. This is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-15454</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Reltool 0.7.7</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>Reltool 0.7.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Calls to <c>erlang:get_stacktrace()</c> are removed.
+	    </p>
+          <p>
+	    Own Id: OTP-14861</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Reltool 0.7.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <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>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Reltool 0.7.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> The User's Guide examples are updated after removal
+	    of support for Dets files created with Erlang/OTP R7 and
+	    earlier. </p>
+          <p>
+	    Own Id: OTP-14422 Aux Id: OTP-13830 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Reltool 0.7.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed xml issues in old release notes</p>
+          <p>
+	    Own Id: OTP-14269</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Reltool 0.7.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -52,13 +150,13 @@
 	    Some dependency chains would even be missed for
 	    applications that are included in a 'rel' spec in the
 	    reltool config. E.g.</p>
-          <p>
+
 	    <list> <item>Application x has y as included application,
 	    and y in turn has z as included application. Then z is
 	    not included. </item> <item>Application x has y in its
 	    'applications' tag in the .app file, and y in turn has z
 	    as included application. Then z is not included.</item>
-	    </list></p>
+	    </list>
           <p>
 	    These bugs are now corrected.</p>
           <p>
diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml
index 5bfbee966b..874cda8369 100644
--- a/lib/reltool/doc/src/reltool.xml
+++ b/lib/reltool/doc/src/reltool.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2009</year>
-      <year>2016</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -806,7 +806,7 @@ target_spec()       = [target_spec()]
       <name>stop(Pid) -> ok | {error, Reason}</name>
       <fsummary>Stop a server or window process</fsummary>
       <type>
-        <v>Pid     = server_pid() | window_pid()()</v>
+        <v>Pid     = server_pid() | window_pid()</v>
         <v>Reason  = reason()</v>
       </type>
       <desc><p>Stop a server or window process</p></desc>
diff --git a/lib/reltool/doc/src/reltool_examples.xml b/lib/reltool/doc/src/reltool_examples.xml
index f735d914ea..2a103119e6 100644
--- a/lib/reltool/doc/src/reltool_examples.xml
+++ b/lib/reltool/doc/src/reltool_examples.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2009</year>
-      <year>2016</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -41,30 +41,31 @@
     <p>The main process in Reltool is the server. It can be used as it
     is or be used via the GUI frontend process. When the GUI is
     started, a server process will automatically be started. The GUI
-    process is started with <c>reltool:start/0</c>,
-    <c>reltool:start/1</c> or <c>reltool:start_link/1</c>. The pid of
-    its server can be obtained with <c>reltool:get_server/1</c></p>
+    process is started with
+    <seealso marker="reltool#start-0"><c>reltool:start/0</c></seealso>,
+    <seealso marker="reltool#start-1"><c>reltool:start/1</c></seealso> or
+    <seealso marker="reltool#start_link-1"><c>reltool:start_link/1</c></seealso>.
+    The pid of its server can be obtained with
+    <seealso marker="reltool#start_link-1"><c>reltool:get_server/1</c></seealso>
+    </p>
     
     <pre>
-Erlang R13B02 (erts-5.7.3) [source] [64-bit] [smp:4:4] [rq:4]
-                           [async-threads:0] [kernel-poll:false]
-
-Eshell V5.7.3  (abort with ^G)
+Erlang/OTP 20 [erts-9.0] [source-c13b302] [64-bit] [smp:4:4] [ds:4:4:10] [async-threads:10]
+[hipe] [kernel-poll:false]
+Eshell V9.0  (abort with ^G)
+1&gt;
 1&gt; {ok, Win} = reltool:start([]).
 {ok,&lt;0.36.01&gt;}
-2&gt; {ok, Server} = reltool:get_server([]).
+2&gt; {ok, Server} = reltool:get_server(Win).
 {ok,&lt;0.37.01&gt;}
 3&gt; reltool:get_config(Server).
 {ok,{sys,[]}}
-4&gt; reltool:stop(Win).
-ok
-
-
-5&gt; {ok, Server2} = reltool:start_server([]).
+4&gt;
+4&gt; {ok, Server2} = reltool:start_server([]).
 {ok,&lt;0.6535.01&gt;}
-6&gt; reltool:get_config(Server2).
+5&gt; reltool:get_config(Server2).
 {ok,{sys,[]}}
-7&gt; reltool:stop(Server2).
+6&gt; reltool:stop(Server2).
 ok
     </pre>
 
@@ -74,13 +75,11 @@ ok
     <title>Inspecting the configuration</title>
 
     <pre>
-Erlang R13B02 (erts-5.7.3) [source] [64-bit] [smp:4:4] [rq:4]
-                           [async-threads:0] [kernel-poll:false]
-
-Eshell V5.7.3  (abort with ^G)
-1&gt; Config = {sys, [{escript, 
-                    "examples/display_args",
-                    [{incl_cond, include}]},
+Erlang/OTP 20 [erts-9.0] [source-c13b302] [64-bit] [smp:4:4] [ds:4:4:10] [async-threads:10]
+[hipe] [kernel-poll:false]
+Eshell V9.0  (abort with ^G)
+1&gt;
+1&gt; Config = {sys, [{escript, "examples/display_args", [{incl_cond, include}]},
 		   {app, inets, [{incl_cond, include}]},
 		   {app, mnesia, [{incl_cond, exclude}]},
 		   {app, ssl, [{incl_cond, exclude}]},
@@ -92,88 +91,105 @@ Eshell V5.7.3  (abort with ^G)
       {app,ssl,[{incl_cond,exclude}]},
       {app,runtime_tools,[{incl_cond,exclude}]},
       {app,syntax_tools,[{incl_cond,exclude}]}]}
-
-
-
+2&gt;
 2&gt; {ok, Server} = reltool:start_server([Config]).
-{ok,&lt;0.35.0&gt;}
+{ok,&lt;0.66.0&gt;}
+3&gt;
 3&gt; reltool:get_config(Server).
-{ok,{sys,[{escript,"/clearcase/otp/tools/reltool/examples/display_args",
-                   [{incl_cond,include}]}]}}
+{ok,{sys,[{escript,"/usr/local/lib/erlang/lib/reltool-0.7.3/examples/display_args",
+                   [{incl_cond,include}]},
+          {app,inets,[{incl_cond,include}]},
+          {app,mnesia,[{incl_cond,exclude}]},
+          {app,runtime_tools,[{incl_cond,exclude}]},
+          {app,ssl,[{incl_cond,exclude}]},
+          {app,syntax_tools,[{incl_cond,exclude}]}]}}
+4&gt;
 4&gt; reltool:get_config(Server, false, false).
-{ok,{sys,[{escript,"/clearcase/otp/tools/reltool/examples/display_args",
-                   [{incl_cond,include}]}]}}
-
-
-
+{ok,{sys,[{escript,"/usr/local/lib/erlang/lib/reltool-0.7.3/examples/display_args",
+                   [{incl_cond,include}]},
+          {app,inets,[{incl_cond,include}]},
+          {app,mnesia,[{incl_cond,exclude}]},
+          {app,runtime_tools,[{incl_cond,exclude}]},
+          {app,ssl,[{incl_cond,exclude}]},
+          {app,syntax_tools,[{incl_cond,exclude}]}]}}
+5&gt;
 5&gt; reltool:get_config(Server, true, false).
-{ok,{sys,[{root_dir,"/ldisk/hakan/otp_test"},
+{ok,{sys,[{root_dir,"/usr/local/lib/erlang"},
           {lib_dirs,[]},
-          {escript,"/clearcase/otp/tools/reltool/examples/display_args",
+          {escript,"/usr/local/lib/erlang/lib/reltool-0.7.3/examples/display_args",
                    [{incl_cond,include}]},
           {mod_cond,all},
           {incl_cond,derived},
+          {app,inets,
+               [{incl_cond,include},{vsn,undefined},{lib_dir,undefined}]},
+          {app,mnesia,[{incl_cond,exclude}]},
+          {app,runtime_tools,[{incl_cond,exclude}]},
+          {app,ssl,[{incl_cond,exclude}]},
+          {app,syntax_tools,[{incl_cond,exclude}]},
           {boot_rel,"start_clean"},
+          {rel,"start_clean","1.0",[]},
+          {rel,"start_sasl","1.0",[sasl]},
           {emu_name,"beam"},
           {relocatable,true},
           {profile,development},
-          {incl_sys_files,[".*"]},
-          {excl_sys_files,[]},
-          {incl_app_files,[".*"]},
-          {excl_app_files,[]},
-          {incl_archive_dirs,[".*"]},
-          {excl_archive_dirs,["^include$","^priv$"]},
+          {incl_sys_filters,[".*"]},
+          {excl_sys_filters,[]},
+          {incl_app_filters,[".*"]},
+          {excl_app_filters,[]},
+          {incl_archive_filters,[".*"]},
+          {excl_archive_filters,[[...]|...]},
           {archive_opts,[]},
-          {app_type,permanent},
-          {app_file,keep},
-          {debug_info,keep}]}}
-
-
-
+          {rel_app_type,...},
+          {...}|...]}}
+6&gt;
 6&gt; reltool:get_config(Server, true, true).
-{ok,{sys,[{root_dir,"/ldisk/hakan/otp_test"},
+{ok,{sys,[{root_dir,"/usr/local/lib/erlang"},
           {lib_dirs,[]},
-          {escript,"/clearcase/otp/tools/reltool/examples/display_args",
+          {escript,"/usr/local/lib/erlang/lib/reltool-0.7.3/examples/display_args",
                    [{incl_cond,include}]},
           {mod_cond,all},
           {incl_cond,derived},
-          {erts,[{vsn,"5.7.3"},
-                 {mod,erl_prim_loader,[]},
-                 {mod,erlang,[]},
-                 {mod,init,[]},
-                 {mod,otp_ring0,[]},
-                 {mod,prim_file,[]},
-                 {mod,prim_inet,[]},
-                 {mod,prim_zip,[]},
-                 {mod,zlib,[]}]},
+          {erts,[{app,erts,
+                      [{vsn,"10.0"},
+                       {lib_dir,"/usr/local/lib/erlang/lib/erts-10.0"},
+                       {mod,erl_prim_loader,[]},
+                       {mod,erl_tracer,[]},
+                       {mod,erlang,[]},
+                       {mod,erts_code_purger,[]},
+                       {mod,erts_dirty_process_signal_handler,[]},
+                       {mod,erts_internal,[]},
+                       {mod,erts_literal_area_collector,[]},
+                       {mod,init,[]},
+                       {mod,otp_ring0,...},
+                       {mod,...},
+                       {...}|...]}]},
           {app,compiler,
-               [{vsn,"4.6.3"},
+               [{vsn,"7.0.4"},
+                {lib_dir,"/usr/local/lib/erlang/lib/compiler-7.0.4"},
+                {mod,beam_a,[]},
                 {mod,beam_asm,[]},
                 {mod,beam_block,[]},
-                {mod,beam_bool,[]},
+                {mod,beam_bs,[]},
                 {mod,beam_bsm,[]},
                 {mod,beam_clean,[]},
                 {mod,beam_dead,[]},
                 {mod,beam_dict,[]},
                 {mod,beam_disasm,[]},
-                {mod,beam_flatten,[]},
-                {mod,beam_jump,[]},
-                {mod,beam_listing,[]},
-                {mod,beam_opcodes,...},
+                {mod,beam_except,[]},
+                {mod,beam_flatten,...},
                 {mod,...},
                 {...}|...]},
           {app,crypto,
-               [{vsn,"1.6.1"},
+               [{vsn,"3.7.4"},
+                {lib_dir,"/usr/local/lib/erlang/lib/crypto-3.7.4"},
                 {mod,crypto,[]},
-                {mod,crypto_app,[]},
-                {mod,crypto_server,[]},
-                {mod,crypto_sup,[]}]},
+                {mod,crypto_ec_curves,[]}]},
           {app,hipe,
-               [{vsn,"3.7.3"},
+               [{vsn,"3.15.4"},
+                {lib_dir,"/usr/local/lib/erlang/lib/hipe-3.15.4"},
                 {mod,cerl_cconv,[]},
                 {mod,cerl_closurean,[]},
                 {mod,cerl_hipeify,[]},
-                {mod,cerl_hybrid_transform,[]},
                 {mod,cerl_lib,[]},
                 {mod,cerl_messagean,[]},
                 {mod,cerl_pmatch,[]},
@@ -182,65 +198,110 @@ Eshell V5.7.3  (abort with ^G)
                 {mod,cerl_typean,...},
                 {mod,...},
                 {...}|...]},
+          {app,inets,
+               [{incl_cond,include},
+                {vsn,"6.3.9"},
+                {lib_dir,"/usr/local/lib/erlang/lib/inets-6.3.9"},
+                {mod,ftp,[]},
+                {mod,ftp_progress,[]},
+                {mod,ftp_response,[]},
+                {mod,ftp_sup,[]},
+                {mod,http_chunk,[]},
+                {mod,http_request,[]},
+                {mod,http_response,...},
+                {mod,...},
+                {...}|...]},
           {app,kernel,
-               [{vsn,"2.13.3"},
+               [{vsn,"5.2"},
+                {lib_dir,"/usr/local/lib/erlang/lib/kernel-5.2"},
                 {mod,application,[]},
                 {mod,application_controller,[]},
                 {mod,application_master,[]},
                 {mod,application_starter,[]},
                 {mod,auth,[]},
                 {mod,code,[]},
-                {mod,code_server,[]},
-                {mod,disk_log,[]},
-                {mod,disk_log_1,...},
+                {mod,code_server,...},
+                {mod,...},
+                {...}|...]},
+          {app,mnesia,[{incl_cond,exclude}]},
+          {app,runtime_tools,[{incl_cond,exclude}]},
+          {app,sasl,
+               [{vsn,"3.0.3"},
+                {lib_dir,"/usr/local/lib/erlang/lib/sasl-3.0.3"},
+                {mod,alarm_handler,[]},
+                {mod,erlsrv,[]},
+                {mod,format_lib_supp,[]},
+                {mod,misc_supp,...},
                 {mod,...},
                 {...}|...]},
+          {app,ssl,[{incl_cond,exclude}]},
           {app,stdlib,
-               [{vsn,"1.16.3"},
+               [{vsn,"3.3"},
+                {lib_dir,"/usr/local/lib/erlang/lib/stdlib-3.3"},
                 {mod,array,[]},
-                {mod,base64,[]},
-                {mod,beam_lib,[]},
-                {mod,c,[]},
-                {mod,calendar,[]},
-                {mod,dets,[]},
-                {mod,dets_server,[]},
-                {mod,dets_sup,...},
+                {mod,base64,...},
                 {mod,...},
                 {...}|...]},
+          {app,syntax_tools,[{incl_cond,exclude}]},
+          {app,tools,
+               [{vsn,"2.9.1"},{lib_dir,[...]},{mod,...},{...}|...]},
           {boot_rel,"start_clean"},
+          {rel,"start_clean","1.0",[]},
+          {rel,"start_sasl","1.0",[...]},
           {emu_name,"beam"},
           {relocatable,true},
-          {profile,development},
-          {incl_sys_files,[".*"]},
-          {excl_sys_files,[]},
-          {incl_app_files,[".*"]},
-          {excl_app_files,[]},
-          {incl_archive_dirs,[".*"]},
-          {excl_archive_dirs,["^include$",[...]]},
-          {archive_opts,[]},
-          {app_type,permanent},
-          {app_file,...},
-          {...}]}}
-
-
-
-7&gt; reltool:get_config([{sys,[{profile, embedded}]}]).
-{ok,{sys,[{profile,embedded},
+          {profile,...},
+          {...}|...]}}
+7&gt;
+7&gt; reltool:get_config([{sys, [{profile, embedded}]}], true, false).
+{ok,{sys,[{root_dir,"/usr/local/lib/erlang"},
+          {lib_dirs,[]},
+          {mod_cond,all},
+          {incl_cond,derived},
+          {boot_rel,"start_clean"},
+          {rel,"start_clean","1.0",[]},
+          {rel,"start_sasl","1.0",[sasl]},
+          {emu_name,"beam"},
+          {relocatable,true},
+          {profile,embedded},
           {incl_sys_filters,["^bin","^erts","^lib","^releases"]},
           {excl_sys_filters,["^bin/(erlc|dialyzer|typer)(|\\.exe)$",
                              "^erts.*/bin/(erlc|dialyzer|typer)(|\\.exe)$",
                              "^erts.*/bin/.*(debug|pdb)"]},
-          {incl_app_filters,["^ebin","^include","^priv"]}]}}
-8&gt; reltool:get_config([{sys,[{profile, standalone}]}]).
-{ok,{sys,[{profile,standalone},
+          {incl_app_filters,["^ebin","^include","^priv"]},
+          {excl_app_filters,[]},
+          {incl_archive_filters,[".*"]},
+          {excl_archive_filters,["^include$","^priv$"]},
+          {archive_opts,[]},
+          {rel_app_type,permanent},
+          {embedded_app_type,load},
+          {app_file,keep},
+          {debug_info,keep}]}}
+8&gt;
+8&gt; reltool:get_config([{sys, [{profile, standalone}]}], true, false).
+{ok,{sys,[{root_dir,"/usr/local/lib/erlang"},
+          {lib_dirs,[]},
+          {mod_cond,all},
+          {incl_cond,derived},
+          {boot_rel,"start_clean"},
+          {rel,"start_clean","1.0",[]},
+          {rel,"start_sasl","1.0",[sasl]},
+          {emu_name,"beam"},
+          {relocatable,true},
+          {profile,standalone},
           {incl_sys_filters,["^bin/(erl|epmd)(|\\.exe|\\.ini)$",
                              "^bin/start(|_clean).boot$","^erts.*/bin","^lib$"]},
           {excl_sys_filters,["^erts.*/bin/(erlc|dialyzer|typer)(|\\.exe)$",
                              "^erts.*/bin/(start|escript|to_erl|run_erl)(|\\.exe)$",
                              "^erts.*/bin/.*(debug|pdb)"]},
           {incl_app_filters,["^ebin","^priv"]},
-          {excl_app_filters,["^ebin/.*\\.appup$"]}]}}
-
+          {excl_app_filters,["^ebin/.*\\.appup$"]},
+          {incl_archive_filters,[".*"]},
+          {excl_archive_filters,["^include$","^priv$"]},
+          {archive_opts,[]},
+          {rel_app_type,permanent},
+          {app_file,keep},
+          {debug_info,keep}]}}
     </pre>
 
   </section>
@@ -248,43 +309,51 @@ Eshell V5.7.3  (abort with ^G)
   <section>
     <title>Generate release and script files</title>
     <pre>
-5&gt; {ok, Server} = reltool:start_server([{config, {sys, [{boot_rel, "NAME"},
+Erlang/OTP 20 [erts-10.0] [source-c13b302] [64-bit] [smp:4:4] [ds:4:4:10] [async-threads:10]
+[hipe] [kernel-poll:false]
+Eshell V10.0  (abort with ^G)
+1&gt;
+1&gt; {ok, Server} = reltool:start_server([{config, {sys, [{boot_rel, "NAME"},
                                                         {rel, "NAME", "VSN",
                                                         [sasl]}]}}]).
 {ok,&lt;0.1288.0&gt;}
-6&gt;  reltool:get_config(Server).
+2&gt;
+2&gt; reltool:get_config(Server).
 {ok,{sys,[{boot_rel,"NAME"},
           {rel,"NAME","VSN",[sasl]}]}}
-7&gt;  reltool:get_rel(Server, "NAME").
+3&gt;
+3&gt; reltool:get_rel(Server, "NAME").
 {ok,{release,{"NAME","VSN"},
-             {erts,"5.7"},
-             [{kernel,"2.13"},{stdlib,"1.16"},{sasl,"2.1.6"}]}}
-8&gt;  reltool:get_script(Server, "NAME").
+             {erts,"10.0"},
+             [{kernel,"5.2"},{stdlib,"3.3"},{sasl,"3.0.3"}]}}
+4&gt;
+4&gt; reltool:get_script(Server, "NAME").
 {ok,{script,{"NAME","VSN"},
-            [{preLoaded,[erl_prim_loader,erlang,init,otp_ring0,
-                         prim_eval,prim_file,prim_inet,prim_zip,
-                         zlib]},
+            [{preLoaded,[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,prim_inet,prim_zip,zlib]},
              {progress,preloaded},
-             {path,["$ROOT/lib/kernel-2.13/ebin",
-                    "$ROOT/lib/stdlib-1.16/ebin"]},
+             {path,["$ROOT/lib/kernel-5.2/ebin",
+                    "$ROOT/lib/stdlib-3.3/ebin"]},
              {primLoad,[error_handler]},
              {kernel_load_completed},
              {progress,kernel_load_completed},
-             {path,["$ROOT/lib/kernel-2.13/ebin"]},
+             {path,["$ROOT/lib/kernel-5.2/ebin"]},
              {primLoad,[application,application_controller,
                         application_master,application_starter,auth,code,
                         code_server,disk_log,disk_log_1,disk_log_server,
                         disk_log_sup,dist_ac,dist_util,erl_boot_server|...]},
-             {path,["$ROOT/lib/stdlib-1.16/ebin"]},
-             {primLoad,[array,base64,beam_lib,c,calendar,dets,
-                        dets_server,dets_sup,dets_utils,dets_v8,dets_v9,dict|...]},
-             {path,["$ROOT/lib/sasl-2.1.6/ebin"]},
+             {path,["$ROOT/lib/stdlib-3.3/ebin"]},
+             {primLoad,[array,base64,beam_lib,binary,c,calendar,dets,
+                        dets_server,dets_sup,dets_utils,dets_v9,dict|...]},
+             {path,["$ROOT/lib/sasl-3.0.3/ebin"]},
              {primLoad,[alarm_handler,erlsrv,format_lib_supp,misc_supp,
-                        overload,rb,rb_format_supp,release_handler,
-                        release_handler_1,sasl|...]},
+                        rb,rb_format_supp,release_handler,release_handler_1,sasl,
+                        sasl_report|...]},
              {progress,modules_loaded},
-             {path,["$ROOT/lib/kernel-2.13/ebin",
-                    "$ROOT/lib/stdlib-1.16/ebin","$ROOT/lib/sasl-2.1.6/ebin"]},
+             {path,["$ROOT/lib/kernel-5.2/ebin",
+                    "$ROOT/lib/stdlib-3.3/ebin","$ROOT/lib/sasl-3.0.3/ebin"]},
              {kernelProcess,heart,{heart,start,[]}},
              {kernelProcess,error_logger,{error_logger,start_link,[]}},
              {kernelProcess,application_controller,
@@ -296,7 +365,8 @@ Eshell V5.7.3  (abort with ^G)
              {apply,{...}},
              {apply,...},
              {...}|...]}}
-9&gt;  reltool:stop(Server).
+5&gt;
+5&gt; reltool:stop(Server).
 ok
     </pre>
   </section>
@@ -304,13 +374,11 @@ ok
   <section>
     <title>Create a target system</title>
     <pre>
-Erlang R13B02 (erts-5.7.3) [source] [64-bit] [smp:4:4] [rq:4]
-                           [async-threads:0] [kernel-poll:false]
-
-Eshell V5.7.3  (abort with ^G)
-1&gt; Config = {sys, [{escript, 
-                    "examples/display_args", 
-                    [{incl_cond, include}]},
+Erlang/OTP 20 [erts-10.0] [source-c13b302] [64-bit] [smp:4:4] [ds:4:4:10] [async-threads:10]
+[hipe] [kernel-poll:false]
+Eshell V10.0  (abort with ^G)
+1&gt;
+1&gt; Config = {sys, [{escript, "examples/display_args", [{incl_cond, include}]},
 		   {app, inets, [{incl_cond, include}]},
 		   {app, mnesia, [{incl_cond, exclude}]},
 		   {app, ssl, [{incl_cond, exclude}]},
@@ -322,156 +390,183 @@ Eshell V5.7.3  (abort with ^G)
       {app,ssl,[{incl_cond,exclude}]},
       {app,runtime_tools,[{incl_cond,exclude}]},
       {app,syntax_tools,[{incl_cond,exclude}]}]}
-
-
-
+2&gt;
 2&gt; {ok, Spec} = reltool:get_target_spec([Config]).
 {ok,[{create_dir,"releases",
-                 [{write_file,"start_erl.data","5.7.3 1.0"},
-                  {create_dir,"1.0",
-                              [{write_file,"start_clean.rel",
-                                           [37,37,32,114,101,108,32,103,101,110,101|...]},
-                               {write_file,"start_clean.script",
-                                           [37,37,32,115,99,114,105,112,116,32|...]},
-                               {write_file,"start_clean.boot",
-                                           &lt;&lt;131,104,3,100,0,6,115,99,114,...&gt;&gt;},
-                               {write_file,"start_sasl.rel",
-                                           [37,37,32,114,101,108,32,103,101,110,101|...]},
-                               {write_file,"start_sasl.script",
-                                           [37,37,32,115,99,114,105,112,116,32|...]},
-                               {write_file,"start_sasl.boot",
-                                           &lt;&lt;131,104,3,100,0,6,115,99,114,...&gt;&gt;}]}]},
+         [{write_file,"start_erl.data","10.0 1.0\n"},
+          {create_dir,"1.0",
+              [{write_file,"start_clean.rel",
+                   [37,37,32,114,101,108,32,103,101,110,101,114,97,116|...]},
+               {write_file,"start_clean.script",
+                   [37,37,32,115,99,114,105,112,116,32,103,101,110|...]},
+               {write_file,"start_clean.boot",
+                   &lt;&lt;131,104,3,119,6,115,99,114,105,112,116,104,...&gt;&gt;},
+               {write_file,"start_sasl.rel",
+                   [37,37,32,114,101,108,32,103,101,110,101|...]},
+               {write_file,"start_sasl.script",
+                   [37,37,32,115,99,114,105,112,116,32|...]},
+               {write_file,"start_sasl.boot",
+                   &lt;&lt;131,104,3,119,6,115,99,114,105,...&gt;&gt;}]}]},
      {create_dir,"bin",
-                 [{copy_file,"display_args.escript",
-                             "/clearcase/otp/tools/reltool/examples/display_args"},
-                  {copy_file,"display_args","erts-5.7.3/bin/escript"},
-                  {copy_file,"start","erts-5.7.3/bin/start"},
-                  {copy_file,"erl","erts-5.7.3/bin/dyn_erl"},
-                  {copy_file,"epmd","erts-5.7.3/bin/epmd"},
-                  {copy_file,"to_erl","erts-5.7.3/bin/to_erl"},
-                  {copy_file,"run_erl","erts-5.7.3/bin/run_erl"},
-                  {copy_file,"escript","erts-5.7.3/bin/escript"},
-                  {copy_file,"erlc","erts-5.7.3/bin/erlc"},
-                  {copy_file,"dialyzer","erts-5.7.3/bin/dialyzer"},
-                  {copy_file,"typer","erts-5.7.3/bin/typer"},
-                  {write_file,"start_clean.boot",
-                              &lt;&lt;131,104,3,100,0,6,115,...&gt;&gt;},
-                  {write_file,"start_sasl.boot",&lt;&lt;131,104,3,100,0,6,...&gt;&gt;},
-                  {write_file,"start.boot",&lt;&lt;131,104,3,100,0,...&gt;&gt;}]},
-     {create_dir,"misc",
-                 [{copy_file,"makewhatis"},{copy_file,"format_man_pages"}]},
+         [{copy_file,"display_args.escript",
+              "/usr/local/lib/erlang/lib/reltool-0.7.3/examples/display_args"},
+          {copy_file,"display_args","erts-10.0/bin/escript"},
+          {copy_file,"start","erts-10.0/bin/start"},
+          {copy_file,"ct_run","erts-10.0/bin/ct_run"},
+          {copy_file,"dialyzer","erts-10.0/bin/dialyzer"},
+          {copy_file,"run_erl","erts-10.0/bin/run_erl"},
+          {copy_file,"erl","erts-10.0/bin/dyn_erl"},
+          {copy_file,"to_erl","erts-10.0/bin/to_erl"},
+          {copy_file,"epmd","erts-10.0/bin/epmd"},
+          {copy_file,"erlc","erts-10.0/bin/erlc"},
+          {copy_file,"typer","erts-10.0/bin/typer"},
+          {copy_file,"escript","erts-10.0/bin/escript"},
+          {write_file,"start_clean.boot",&lt;&lt;131,104,3,119,6,115,...&gt;&gt;},
+          {write_file,"start_sasl.boot",&lt;&lt;131,104,3,119,6,...&gt;&gt;},
+          {write_file,"start.boot",&lt;&lt;131,104,3,119,...&gt;&gt;}]},
      {copy_file,"Install"},
+     {create_dir,"misc",
+         [{copy_file,"makewhatis"},{copy_file,"format_man_pages"}]},
      {create_dir,"usr",
-                 [{create_dir,"lib",
-                              [{copy_file,"liberts_r.a"},{copy_file,"liberts.a"}]},
-                  {create_dir,"include",
-                              [{copy_file,"erl_fixed_size_int_types.h"},
-                               {copy_file,"erl_int_sizes_config.h"},
-                               {copy_file,"erl_memory_trace_parser.h"},
-                               {create_dir,"obsolete",[{copy_file,"driver.h"}]},
-                               {copy_file,"driver_int.h"},
-                               {copy_file,"erl_driver.h"}]}]},
-     {create_dir,"erts-5.7.3",
-                 [{create_dir,"lib",
-                              [{create_dir,"internal",
-                                           [{copy_file,"liberts_internal_r.a"},
-                                            {copy_file,"liberts_internal.a"},
-                                            {copy_file,"libethread.a"},
-                                            {copy_file,"README"}]},
-                               {copy_file,"liberts_r.a"},
-                               {copy_file,"liberts.a"}]},
-                  {create_dir,"bin",
-                              [{copy_file,"start"},
-                               {copy_file,"erl","erts-5.7.3/bin/dyn_erl"},
-                               {copy_file,"epmd"},
-                               {copy_file,"to_erl"},
-                               {copy_file,"run_erl"},
-                               {copy_file,"escript"},
-                               {copy_file,"erlc"},
-                               {copy_file,"dialyzer"},
-                               {copy_file,"typer"},
-                               {copy_file,"erlexec"},
-                               {copy_file,[...]},
-                               {copy_file,...},
-                               {...}|...]},
-                  {create_dir,"doc",[]},
-                  {create_dir,"man",[]},
-                  {create_dir,"include",
-                              [{create_dir,"internal",
-                                           [{create_dir,"tile",[{copy_file,...},{...}]},
-                                            {create_dir,"sparc64",[{...}]},
-                                            {create_dir,"sparc32",[...]},
-                                            {create_dir,[...],...},
-                                            {create_dir,...},
-                                            {...}|...]},
-                               {copy_file,"erl_fixed_size_int_types.h"},
-                               {copy_file,"erl_int_sizes_config.h"},
-                               {copy_file,"erl_memory_trace_parser.h"},
-                               {copy_file,"driver_int.h"},
-                               {copy_file,"erl_driver.h"}]},
-                  {create_dir,"src",[{copy_file,"setuid_socket_wrap.c"}]}]},
+         [{create_dir,"lib",
+              [{copy_file,"liberts.a"},
+               {copy_file,"liberl_interface_st.a"},
+               {copy_file,"liberts_r.a"},
+               {copy_file,"libic.a"},
+               {copy_file,"liberl_interface.a"},
+               {copy_file,"libei_st.a"},
+               {copy_file,"libei.a"}]},
+          {create_dir,"include",
+              [{copy_file,"erl_memory_trace_parser.h"},
+               {copy_file,"driver_int.h"},
+               {copy_file,"ei_connect.h"},
+               {copy_file,"ei.h"},
+               {copy_file,"erl_nif_api_funcs.h"},
+               {copy_file,"erl_fixed_size_int_types.h"},
+               {copy_file,"erl_int_sizes_config.h"},
+               {copy_file,"erl_interface.h"},
+               {copy_file,"eicode.h"},
+               {copy_file,"erl_driver.h"},
+               {copy_file,"erlang.idl"},
+               {copy_file,[...]},
+               {copy_file,...},
+               {...}]}]},
+     {create_dir,"erts-10.0",
+         [{create_dir,"bin",
+              [{copy_file,"start"},
+               {copy_file,"ct_run"},
+               {copy_file,"erlexec"},
+               {copy_file,"dialyzer"},
+               {copy_file,"beam.smp"},
+               {copy_file,"run_erl"},
+               {copy_file,"erl","erts-10.0/bin/dyn_erl"},
+               {copy_file,"to_erl"},
+               {copy_file,"epmd"},
+               {copy_file,"erl_child_setup"},
+               {copy_file,"heart"},
+               {copy_file,[...]},
+               {copy_file,...},
+               {...}|...]},
+          {create_dir,"lib",
+              [{create_dir,"internal",
+                   [{copy_file,"liberts_internal.a"},
+                    {copy_file,"liberts_internal_r.a"},
+                    {copy_file,"libethread.a"},
+                    {copy_file,"README"}]},
+               {copy_file,"liberts.a"},
+               {copy_file,"liberts_r.a"}]},
+          {create_dir,"src",[{copy_file,"setuid_socket_wrap.c"}]},
+          {create_dir,"doc",[]},
+          {create_dir,"man",[]},
+          {create_dir,"include",
+              [{create_dir,"internal",
+                   [{create_dir,"i386",[{...}|...]},
+                    {copy_file,"erl_errno.h"},
+                    {copy_file,[...]},
+                    {copy_file,...},
+                    {...}|...]},
+               {copy_file,"erl_memory_trace_parser.h"},
+               {copy_file,"driver_int.h"},
+               {copy_file,"erl_nif_api_funcs.h"},
+               {copy_file,"erl_fixed_size_int_types.h"},
+               {copy_file,"erl_int_sizes_config.h"},
+               {copy_file,[...]},
+               {copy_file,...},
+               {...}]}]},
      {create_dir,"lib",
-                 [{archive,"compiler-4.6.3.ez",[],
-                           [{create_dir,"compiler-4.6.3",
-                                        [{create_dir,"ebin",
-                                                     [{copy_file,"compiler.appup"},
-                                                      {copy_file,[...]},
-                                                      {copy_file,...},
-                                                      {...}|...]},
-                                         {create_dir,"src",
-                                                     [{copy_file,[...]},
-                                                      {copy_file,...},{...}|...]}]}]},
-                  {archive,"crypto-1.6.1.ez",[],
-                           [{create_dir,"crypto-1.6.1",
-                                        [{create_dir,"ebin",
-                                                     [{copy_file,[...]},
-                                                      {copy_file,...},{...}|...]},
-                                         {create_dir,"src",[{copy_file,...},{...}|...]}]}]},
-                  {create_dir,"crypto-1.6.1",
-                              [{create_dir,"priv",
-                                           [{create_dir,"lib",[{copy_file,[...]}]},
-                                            {create_dir,"obj",[{copy_file,...},{...}]}]}]},
-                  {archive,"erts-5.7.3.ez",[],
-                           [{create_dir,"erts-5.7.3",
-                                        [{create_dir,"ebin",[{...}|...]},
-                                         {create_dir,"src",[...]}]}]},
-                  {archive,"hipe-3.7.3.ez",[],
-                           [{create_dir,"hipe-3.7.3",
-                                        [{create_dir,"util",[...]},
-                                         {create_dir,[...],...},
-                                         {create_dir,...},
-                                         {...}|...]}]},
-                  {archive,"kernel-2.13.3.ez",[],
-                           [{create_dir,"kernel-2.13.3",
-                                        [{create_dir,[...],...},{create_dir,...},{...}]}]},
-                  {create_dir,"kernel-2.13.3",
-                              [{create_dir,"include",
-                                           [{copy_file,[...]},{copy_file,...},{...}]}]},
-                  {archive,"stdlib-1.16.3.ez",[],
-                           [{create_dir,"stdlib-1.16.3",[{...}|...]}]},
-                  {create_dir,"stdlib-1.16.3",
-                              [{create_dir,"include",[{...}|...]}]}]}]}
-
-
-
-3&gt; TargetDir = "my_target_dir".
-"my_target_dir"
+         [{archive,"compiler-7.0.4.ez",[],
+              [{create_dir,"compiler-7.0.4",
+                   [{create_dir,"src",
+                        [{copy_file,"beam_flatten.erl"},
+                         {copy_file,[...]},
+                         {copy_file,...},
+                         {...}|...]},
+                    {create_dir,"ebin",
+                        [{copy_file,[...]},{copy_file,...},{...}|...]}]}]},
+          {archive,"crypto-3.7.4.ez",[],
+              [{create_dir,"crypto-3.7.4",
+                   [{create_dir,"src",[{copy_file,[...]},{copy_file,...}]},
+                    {create_dir,"ebin",[{copy_file,...},{...}|...]}]}]},
+          {create_dir,"crypto-3.7.4",
+              [{create_dir,"priv",
+                   [{create_dir,"lib",[{copy_file,[...]},{copy_file,...}]},
+                    {create_dir,"obj",[{copy_file,...},{...}|...]}]}]},
+          {archive,"erts-10.0.ez",[],
+              [{create_dir,"erts-10.0",
+                   [{create_dir,"src",[{...}|...]},
+                    {create_dir,"ebin",[...]}]}]},
+          {archive,"hipe-3.15.4.ez",[],
+              [{create_dir,"hipe-3.15.4",
+                   [{create_dir,"flow",[...]},
+                    {copy_file,[...]},
+                    {create_dir,...},
+                    {...}|...]}]},
+          {archive,"inets-6.3.9.ez",[],
+              [{create_dir,"inets-6.3.9",
+                   [{create_dir,[...],...},{create_dir,...},{...}]}]},
+          {create_dir,"inets-6.3.9",
+              [{create_dir,"priv",[{create_dir,[...],...}]},
+               {create_dir,"include",[{copy_file,...},{...}]}]},
+          {archive,"kernel-5.2.ez",[],
+              [{create_dir,"kernel-5.2",[{...}|...]}]},
+          {create_dir,"kernel-5.2",
+              [{create_dir,"include",[{...}|...]}]},
+          {archive,"sasl-3.0.3.ez",[],[{create_dir,[...],...}]},
+          {archive,"stdlib-3.3.ez",[],[{create_dir,...}]},
+          {create_dir,"stdlib-3.3",[{create_dir,...}]},
+          {archive,"tools-2.9.1.ez",[],[...]}]}]}
+3&gt;
+3&gt; TargetDir = "/tmp/my_target_dir".
+"/tmp/my_target_dir"
+4&gt;
 4&gt; reltool:eval_target_spec(Spec, code:root_dir(), TargetDir).
-{error,"/clearcase/otp/tools/reltool/my_target_dir: no such file or directory"}
-5&gt; file:make_dir("my_target_dir").
+{error,"/tmp/my_target_dir: no such file or directory"}
+5&gt;
+5&gt; file:make_dir(TargetDir).
 ok
+6&gt;
 6&gt; reltool:eval_target_spec(Spec, code:root_dir(), TargetDir).
 ok
+7&gt;
 7&gt; file:list_dir(TargetDir).
-{ok,["lib","erts-5.7.3","usr","Install","misc","bin","releases"]}
+{ok,["bin","Install","lib","misc","usr","erts-10.0",
+     "releases"]}
+8&gt;
 8&gt; file:list_dir(filename:join([TargetDir,"lib"])).
-{ok,["stdlib-1.16.3","stdlib-1.16.3.ez","kernel-2.13.3",
-     "kernel-2.13.3.ez","hipe-3.7.3.ez","erts-5.7.3.ez",
-     "crypto-1.6.1","crypto-1.6.1.ez","compiler-4.6.3.ez"]}
-9&gt; file:make_dir("yet_another_target_dir").
+{ok,["tools-2.9.1.ez","kernel-5.2.ez","inets-6.3.9.ez",
+     "kernel-5.2","sasl-3.0.3.ez","hipe-3.15.4.ez","inets-6.3.9",
+     "crypto-3.7.4","crypto-3.7.4.ez","stdlib-3.3.ez",
+     "erts-10.0.ez","stdlib-3.3","compiler-7.0.4.ez"]}
+9&gt;
+9&gt; file:make_dir("/tmp/yet_another_target_dir").
 ok
-10&gt; reltool:create_target(Config, "yet_another_target_dir").
+10&gt;
+10&gt; reltool:create_target([Config], "/tmp/yet_another_target_dir").
 ok
+11&gt;
+11&gt; file:list_dir("/tmp/yet_another_target_dir").
+{ok,["bin","Install","lib","misc","usr","erts-10.0",
+     "releases"]}
     </pre>
 
   </section>
diff --git a/lib/reltool/src/reltool.app.src b/lib/reltool/src/reltool.app.src
index 90f93d2901..dc85464750 100644
--- a/lib/reltool/src/reltool.app.src
+++ b/lib/reltool/src/reltool.app.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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,6 @@
   {registered, []},
   {applications, [stdlib, kernel]},
   {env, []},
-  {runtime_dependencies, ["wx-1.2","tools-2.6.14","stdlib-2.0","sasl-2.4",
+  {runtime_dependencies, ["wx-1.2","tools-2.6.14","stdlib-3.4","sasl-2.4",
 			  "kernel-3.0","erts-7.0"]}
  ]}.
diff --git a/lib/reltool/src/reltool.erl b/lib/reltool/src/reltool.erl
index f6ce5578bc..2e1dbfd713 100644
--- a/lib/reltool/src/reltool.erl
+++ b/lib/reltool/src/reltool.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -80,7 +80,7 @@ get_server(WinPid) ->
         {ok, _ServerPid} = OK ->
             OK;
         {error, Reason} ->
-            {error, lists:flatten(io_lib:format("~p", [Reason]))}
+            {error, lists:flatten(io_lib:format("~tp", [Reason]))}
     end.
 
 %% Stop a server or window process
@@ -93,7 +93,7 @@ stop(Pid) when is_pid(Pid) ->
         {'DOWN', Ref, _, _, shutdown} ->
             ok;
         {'DOWN', Ref, _, _, Reason} ->
-            {error, lists:flatten(io_lib:format("~p", [Reason]))}
+            {error, lists:flatten(io_lib:format("~tp", [Reason]))}
     end.
 
 %% Internal library function
diff --git a/lib/reltool/src/reltool.hrl b/lib/reltool/src/reltool.hrl
index 89b5f3a997..d133762818 100644
--- a/lib/reltool/src/reltool.hrl
+++ b/lib/reltool/src/reltool.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -119,7 +119,7 @@
                           | {archive, base_file(), [archive_opt()], [target_spec()]}
                           | {copy_file, base_file()}
                           | {copy_file, base_file(), top_file()}
-                          | {write_file, base_file(), iolist()}
+                          | {write_file, base_file(), binary()}
                           | {strip_beam_file, base_file()}.
 -type target_dir()       :: dir().
 -type incl_defaults()    :: boolean().
@@ -220,7 +220,8 @@
         {
           name     :: rel_name(),
           vsn      :: rel_vsn(),
-          rel_apps :: [#rel_app{}]
+          rel_apps :: [#rel_app{}],
+          load_dot_erlang = true :: boolean()
 	}).
 
 -record(sys,
@@ -300,6 +301,7 @@
 
 -define(STANDALONE_INCL_SYS_FILTERS,  ["^bin/(erl|epmd)(|\\.exe|\\.ini)\$",
 				       "^bin/start(|_clean).boot\$",
+				       "^bin/no_dot_erlang\\.boot\$",
 				       "^erts.*/bin",
 				       "^lib\$"]).
 -define(STANDALONE_EXCL_SYS_FILTERS,
diff --git a/lib/reltool/src/reltool_app_win.erl b/lib/reltool/src/reltool_app_win.erl
index 468ba297bb..c84c1562ee 100644
--- a/lib/reltool/src/reltool_app_win.erl
+++ b/lib/reltool/src/reltool_app_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -102,8 +102,8 @@ init(Parent, WxEnv, Xref, C, AppName) ->
     try
 	do_init(Parent, WxEnv, Xref, C, AppName)
     catch
-	error:Reason ->
-	    exit({Reason, erlang:get_stacktrace()})
+	error:Reason:Stacktrace ->
+	    exit({Reason, Stacktrace})
     end.
 
 do_init(Parent, WxEnv, Xref, C, AppName) ->
@@ -174,7 +174,7 @@ loop(#state{xref_pid = Xref, common = C, app = App} = S) ->
 						    S#state.mod_wins)},
             ?MODULE:loop(S2);
         Msg ->
-            error_logger:format("~w~w got unexpected message:\n\t~p\n",
+            error_logger:format("~w~w got unexpected message:\n\t~tp\n",
                                 [?MODULE, self(), Msg]),
             ?MODULE:loop(S)
     end.
@@ -182,7 +182,7 @@ loop(#state{xref_pid = Xref, common = C, app = App} = S) ->
 exit_warning({'EXIT', _Pid, shutdown}) ->
     ok;
 exit_warning({'EXIT', _Pid, _Reason} = Msg) ->
-    error_logger:format("~w~w got unexpected message:\n\t~p\n",
+    error_logger:format("~w~w got unexpected message:\n\t~tp\n",
 			[?MODULE, self(), Msg]).
 
 create_window(#state{app = App} = S) ->
@@ -629,7 +629,7 @@ handle_event(#state{sys = Sys, app = App} = S, Wx) ->
 	    handle_mod_button(S, Items, Action);
         _ ->
             error_logger:format("~w~w got unexpected app event from "
-				"wx:\n\t~p\n",
+				"wx:\n\t~tp\n",
                                 [?MODULE, self(), Wx]),
             S
     end.
@@ -676,7 +676,7 @@ move_mod(App, {_ItemNo, ModStr}, Action) ->
 		undefined;
 	    _ ->
 		error_logger:format("~w~w got unexpected mod "
-				    "button event: ~w\n\t ~p\n",
+				    "button event: ~w\n\t ~tp\n",
 				    [?MODULE, self(), ModName, Action]),
 		M#mod.incl_cond
 	end,
diff --git a/lib/reltool/src/reltool_fgraph_win.erl b/lib/reltool/src/reltool_fgraph_win.erl
index 915330794c..0875d5dd7d 100644
--- a/lib/reltool/src/reltool_fgraph_win.erl
+++ b/lib/reltool/src/reltool_fgraph_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -526,7 +526,7 @@ loop(S, G) ->
 	    exit(Reason);
 
         Other ->
-            error_logger:format("~w~w got unexpected message:\n\t~p\n",
+            error_logger:format("~w~w got unexpected message:\n\t~tp\n",
                                 [?MODULE, self(), Other]),
             loop(S, G)
     end.
diff --git a/lib/reltool/src/reltool_mod_win.erl b/lib/reltool/src/reltool_mod_win.erl
index 8cd63bdda1..7df62b71be 100644
--- a/lib/reltool/src/reltool_mod_win.erl
+++ b/lib/reltool/src/reltool_mod_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -107,8 +107,8 @@ init(Parent, WxEnv, Xref, RelPid, C, ModName) ->
     try
 	do_init(Parent, WxEnv, Xref, RelPid, C, ModName)
     catch
-	error:Reason ->
-	    exit({Reason, erlang:get_stacktrace()})
+	error:Reason:Stacktrace ->
+	    exit({Reason, Stacktrace})
     end.
 
 do_init(Parent, WxEnv, Xref, RelPid, C, ModName) ->
@@ -171,7 +171,7 @@ loop(#state{xref_pid = Xref, common = C, mod = Mod} = S) ->
 		    S2 = handle_event(S, Wx),
 		    ?MODULE:loop(S2);
 		_ ->
-		    error_logger:format("~w~w got unexpected message:\n\t~p\n",
+		    error_logger:format("~w~w got unexpected message:\n\t~tp\n",
 					[?MODULE, self(), Msg]),
 		    ?MODULE:loop(S)
 	    end
@@ -487,7 +487,7 @@ handle_event(#state{xref_pid = Xref} = S, Wx) ->
 	    S;
 	_ ->
             error_logger:format("~w~w got unexpected mod event from "
-				"wx:\n\t~p\n",
+				"wx:\n\t~tp\n",
                                 [?MODULE, self(), Wx]),
             S
     end.
@@ -667,7 +667,7 @@ goto_function(S, Editor) ->
 	    wxStyledTextCtrl:setSelection(Editor, Left2, Right2),
 	    Text = wxStyledTextCtrl:getSelectedText(Editor),
 	    S2 = add_pos_to_history(S, CurrentPos),
-	    do_goto_function(S2, string:tokens(Text, ":"));
+	    do_goto_function(S2, string:lexemes(Text, ":"));
 	_ ->
 	    %% No function call
 	    wxStyledTextCtrl:hideSelection(Editor, false),
@@ -833,7 +833,7 @@ load_code(Ed, Code) when is_binary(Code) ->
 
 keyWords() ->
     L = ["after","begin","case","try","cond","catch","andalso","orelse",
-	 "end","fun","if","let","of","query","receive","when","bnot","not",
+	 "end","fun","if","let","of","receive","when","bnot","not",
 	 "div","rem","band","and","bor","bxor","bsl","bsr","or","xor"],
     lists:flatten([K ++ " " || K <- L] ++ [0]).
 
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index 89e90670cf..af71b0cf2a 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -135,8 +135,8 @@ init([{parent,Parent}|_] = Options) ->
     catch
 	throw:{error,Reason} ->
 	    proc_lib:init_ack(Parent,{error,Reason});
-        error:Reason ->
-            exit({Reason, erlang:get_stacktrace()})
+        error:Reason:Stacktrace ->
+            exit({Reason, Stacktrace})
     end.
 
 do_init(Options) ->
@@ -225,12 +225,12 @@ parse_options([{Key, Val} | KeyVals], S, C, Sys) ->
             Sys2 = read_config(Sys, {sys, Val}),
             parse_options(KeyVals, S, C, Sys2);
         _ ->
-	    reltool_utils:throw_error("Illegal option: ~p", [{Key, Val}])
+	    reltool_utils:throw_error("Illegal option: ~tp", [{Key, Val}])
     end;
 parse_options([], S, C, Sys) ->
     S#state{common = C, sys = Sys};
 parse_options(KeyVals, _S, _C, _Sys) ->
-    reltool_utils:throw_error("Illegal option: ~p", [KeyVals]).
+    reltool_utils:throw_error("Illegal option: ~tp", [KeyVals]).
 
 loop(#state{sys = Sys} = S) ->
     receive
@@ -400,12 +400,12 @@ loop(#state{sys = Sys} = S) ->
         {'EXIT', Pid, Reason} when Pid =:= S#state.parent_pid ->
             exit(Reason);
         {call, ReplyTo, Ref, Msg} when is_pid(ReplyTo), is_reference(Ref) ->
-            error_logger:format("~w~w got unexpected call:\n\t~p\n",
+            error_logger:format("~w~w got unexpected call:\n\t~tp\n",
                                 [?MODULE, self(), Msg]),
             reltool_utils:reply(ReplyTo, Ref, {error, {invalid_call, Msg}}),
             ?MODULE:loop(S);
         Msg ->
-            error_logger:format("~w~w got unexpected message:\n\t~p\n",
+            error_logger:format("~w~w got unexpected message:\n\t~tp\n",
                                 [?MODULE, self(), Msg]),
             ?MODULE:loop(S)
     end.
@@ -1232,7 +1232,7 @@ parse_app_info(File, [{Key, Val} | KeyVals], AI, Status) ->
 			   Status);
         _ ->
 	    Status2 =
-		reltool_utils:add_warning("Unexpected item ~p in app file ~tp.",
+		reltool_utils:add_warning("Unexpected item ~tp in app file ~tp.",
 					  [Key,File],
 					  Status),
 	    parse_app_info(File, KeyVals, AI, Status2)
@@ -1417,9 +1417,12 @@ shrink_app(A) ->
 
 do_save_config(S, Filename, InclDef, InclDeriv) ->
     {ok, Config} = do_get_config(S, InclDef, InclDeriv),
-    IoList = io_lib:format("%% config generated at ~w ~w\n~p.\n\n",
-                           [date(), time(), Config]),
-    file:write_file(Filename, IoList).
+    IoList = io_lib:format("%% ~s\n"
+                           "%% config generated at ~w ~w\n"
+                           "~tp.\n\n",
+                           [epp:encoding_to_string(utf8),date(), time(), Config]),
+    Bin = unicode:characters_to_binary(IoList),
+    file:write_file(Filename, Bin).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1455,7 +1458,7 @@ read_config(OldSys, {sys, KeyVals}) ->
 	      [NewSys2#sys.boot_rel])
     end;
 read_config(_OldSys, BadConfig) ->
-    reltool_utils:throw_error("Illegal content: ~p", [BadConfig]).
+    reltool_utils:throw_error("Illegal content: ~tp", [BadConfig]).
 
 decode(#sys{apps = Apps} = Sys, [{erts = Name, AppKeyVals} | SysKeyVals])
   when is_atom(Name), is_list(AppKeyVals) ->
@@ -1565,7 +1568,7 @@ decode(#sys{} = Sys, [{Key, Val} | KeyVals]) ->
             debug_info when Val =:= keep; Val =:= strip ->
                 Sys#sys{debug_info = Val};
             _ ->
-		reltool_utils:throw_error("Illegal option: ~p", [{Key, Val}])
+		reltool_utils:throw_error("Illegal option: ~tp", [{Key, Val}])
         end,
     decode(Sys3, KeyVals);
 decode(#app{} = App, [{Key, Val} | KeyVals]) ->
@@ -1620,14 +1623,14 @@ decode(#app{} = App, [{Key, Val} | KeyVals]) ->
 				active_dir = Dir,
 				sorted_dirs = [Dir]};
 		    false ->
-			reltool_utils:throw_error("Illegal lib dir for ~w: ~p",
+			reltool_utils:throw_error("Illegal lib dir for ~w: ~tp",
 						  [App#app.name, Val])
 		end;
 	    SelectVsn when SelectVsn=:=vsn; SelectVsn=:=lib_dir ->
 		reltool_utils:throw_error("Mutual exclusive options "
 					  "'vsn' and 'lib_dir'",[]);
             _ ->
-		reltool_utils:throw_error("Illegal option: ~p", [{Key, Val}])
+		reltool_utils:throw_error("Illegal option: ~tp", [{Key, Val}])
         end,
     decode(App2, KeyVals);
 decode(#app{mods = Mods} = App, [{mod, Name, ModKeyVals} | AppKeyVals]) ->
@@ -1641,7 +1644,7 @@ decode(#mod{} = Mod, [{Key, Val} | KeyVals]) ->
             debug_info when Val =:= keep; Val =:= strip ->
                 Mod#mod{debug_info = Val};
             _ ->
-		reltool_utils:throw_error("Illegal option: ~p", [{Key, Val}])
+		reltool_utils:throw_error("Illegal option: ~tp", [{Key, Val}])
         end,
     decode(Mod2, KeyVals);
 decode(#rel{rel_apps = RelApps} = Rel, [RelApp | KeyVals]) ->
@@ -1666,12 +1669,12 @@ decode(#rel{rel_apps = RelApps} = Rel, [RelApp | KeyVals]) ->
 	true ->
             decode(Rel#rel{rel_apps = RelApps ++ [RA]}, KeyVals);
         false ->
-	    reltool_utils:throw_error("Illegal option: ~p", [RelApp])
+	    reltool_utils:throw_error("Illegal option: ~tp", [RelApp])
     end;
 decode(Acc, []) ->
     Acc;
 decode(_Acc, KeyVal) ->
-    reltool_utils:throw_error("Illegal option: ~p", [KeyVal]).
+    reltool_utils:throw_error("Illegal option: ~tp", [KeyVal]).
 
 is_type(Type) ->
     case Type of
@@ -1866,7 +1869,7 @@ escripts_to_apps([Escript | Escripts], Apps, Status) ->
 	    {ok, AF} ->
 		AF;
 	    {error, Reason1} ->
-		reltool_utils:throw_error("Illegal escript ~tp: ~p",
+		reltool_utils:throw_error("Illegal escript ~tp: ~tp",
 					  [Escript,Reason1])
 	end,
 
@@ -1950,7 +1953,7 @@ escripts_to_apps([Escript | Escripts], Apps, Status) ->
 				      Status2),
 	    escripts_to_apps(Escripts, Apps2, Status3);
 	{error, Reason2} ->
-	    reltool_utils:throw_error("Illegal escript ~tp: ~p",
+	    reltool_utils:throw_error("Illegal escript ~tp: ~tp",
 				      [Escript,Reason2])
     end;
 escripts_to_apps([], Apps, Status) ->
@@ -2013,7 +2016,7 @@ init_escript_app(AppName, EscriptAppName, Dir, Info, Mods, Apps, Status) ->
     case lists:keymember(AppName, #app.name, Apps) of
         true ->
 	    reltool_utils:throw_error(
-	      "~w: Application name clash. Escript ~tp contains application ~tp.",
+	      "~w: Application name clash. Escript ~tp contains application ~w.",
 	      [AppName,Dir,AppName]);
         false ->
             {App2, Status}
diff --git a/lib/reltool/src/reltool_sys_win.erl b/lib/reltool/src/reltool_sys_win.erl
index ba0d90ef5f..e24f468f67 100644
--- a/lib/reltool/src/reltool_sys_win.erl
+++ b/lib/reltool/src/reltool_sys_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -135,9 +135,9 @@ init(Options) ->
     try
 	do_init(Options)
     catch
-	error:Reason ->
-	    io:format("~p: ~p~n",[Reason, erlang:get_stacktrace()]),
-	    exit({Reason, erlang:get_stacktrace()})
+	error:Reason:Stacktrace ->
+	    io:format("~tp: ~tp~n",[Reason, Stacktrace]),
+	    exit({Reason, Stacktrace})
     end.
 
 do_init([{safe_config, Safe}, {parent, Parent} | Options]) ->
@@ -182,7 +182,7 @@ do_init([{safe_config, Safe}, {parent, Parent} | Options]) ->
     end.
 
 restart_server_safe_config(true,Parent,Reason) ->
-    io:format("~w(~w): <ERROR> ~p\n", [?MODULE, ?LINE, Reason]),
+    io:format("~w(~w): <ERROR> ~tp\n", [?MODULE, ?LINE, Reason]),
     proc_lib:init_ack(Parent, {error,Reason});
 restart_server_safe_config(false,Parent,Reason) ->
     wx:new(),
@@ -199,7 +199,7 @@ restart_server_safe_config(false,Parent,Reason) ->
 	?wxID_OK ->
 	    do_init([{safe_config,true},{parent,Parent},?safe_config]);
 	?wxID_CANCEL ->
-	    io:format("~w(~w): <ERROR> ~p\n", [?MODULE, ?LINE, Reason]),
+	    io:format("~w(~w): <ERROR> ~tp\n", [?MODULE, ?LINE, Reason]),
 	    proc_lib:init_ack(Parent,{error,Reason})
     end.
 
@@ -251,7 +251,7 @@ loop(S) ->
 				    ?MODULE:loop(S#state{warning_wins = WWs2});
 				false ->
 				    error_logger:format("~w~w got unexpected "
-							"message:\n\t~p\n",
+							"message:\n\t~tp\n",
 							[?MODULE, self(), Msg]),
 				    ?MODULE:loop(S)
 			    end
@@ -292,7 +292,7 @@ loop(S) ->
 					   S#state.app_wins),
             ?MODULE:loop(S#state{fgraph_wins = FWs, app_wins = AWs});
         Msg ->
-            error_logger:format("~w~w got unexpected message:\n\t~p\n",
+            error_logger:format("~w~w got unexpected message:\n\t~tp\n",
                                 [?MODULE, self(), Msg]),
             ?MODULE:loop(S)
     end.
@@ -316,7 +316,7 @@ handle_child_exit({'EXIT', Pid, _Reason} = Exit, FWs, AWs) ->
 msg_warning({'EXIT', _Pid, shutdown}, Type) when Type =/= unknown ->
     ok;
 msg_warning(Exit, Type) ->
-    error_logger:format("~w~w got unexpected message (~w):\n\t~p\n",
+    error_logger:format("~w~w got unexpected message (~w):\n\t~tp\n",
                         [?MODULE, self(), Type, Exit]).
 
 create_window(S) ->
@@ -1163,12 +1163,12 @@ handle_system_event(#state{sys = Sys} = S,
     do_set_sys(S#state{sys = Sys2});
 handle_system_event(S, Event, ObjRef, UserData) ->
     error_logger:format("~w~w got unexpected wx sys event to ~p "
-			"with user data: ~p\n\t ~p\n",
+			"with user data: ~tp\n\t ~tp\n",
                         [?MODULE, self(), ObjRef, UserData, Event]),
     S.
 
 handle_release_event(S, _Event, _ObjRef, UserData) ->
-    io:format("Release data: ~p\n", [UserData]),
+    io:format("Release data: ~tp\n", [UserData]),
     S.
 
 handle_source_event(S,
@@ -1225,7 +1225,7 @@ handle_app_event(S,
     handle_app_button(S, Items, Action);
 handle_app_event(S, Event, ObjRef, UserData) ->
     error_logger:format("~w~w got unexpected wx app event to "
-			"~p with user data: ~p\n\t ~p\n",
+			"~p with user data: ~tp\n\t ~tp\n",
                         [?MODULE, self(), ObjRef, UserData, Event]),
     S.
 
@@ -1269,7 +1269,7 @@ move_app(S, {_ItemNo, AppBase}, Action) ->
                 undefined;
             _ ->
                 error_logger:format("~w~w got unexpected app "
-				    "button event: ~p ~p\n",
+				    "button event: ~tp ~tp\n",
                                     [?MODULE, self(), Action, AppBase]),
                 OldApp#app.incl_cond
         end,
@@ -1543,7 +1543,7 @@ check_and_refresh(S, Status) ->
             display_message(Reason, ?wxICON_ERROR),
 	    false;
         {error, Reason} ->
-            Msg = lists:flatten(io_lib:format("Error:\n\n~p\n", [Reason])),
+            Msg = lists:flatten(io_lib:format("Error:\n\n~tp\n", [Reason])),
             display_message(Msg, ?wxICON_ERROR),
 	    false
     end,
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index 1615a3e9b7..64834ecc1d 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -55,7 +55,7 @@ mandatory_modules() ->
 kernel_processes(KernelApp) ->
     [
      {kernelProcess, heart, {heart, start, []}},
-     {kernelProcess, error_logger , {error_logger, start_link, []}},
+     {kernelProcess, logger , {logger_server, start_link, []}},
      {kernelProcess,
       application_controller,
       {application_controller, start, [KernelApp]}}
@@ -424,7 +424,7 @@ gen_script(Rel, Sys, PathFlag, Variables) ->
             {error, Text}
     end.
 
-do_gen_script(#rel{name = RelName, vsn = RelVsn},
+do_gen_script(#rel{name = RelName, vsn = RelVsn, load_dot_erlang=LoadErlangRc},
               #sys{apps = Apps},
 	      MergedApps,
               PathFlag,
@@ -474,9 +474,11 @@ do_gen_script(#rel{name = RelName, vsn = RelVsn},
              Type =/= none,
              Type =/= load,
              not lists:member(Name, InclApps)],
-
          %% Apply user specific customizations
-         {apply, {c, erlangrc, []}},
+         case LoadErlangRc of
+             true -> {apply, {c, erlangrc, []}};
+             false -> []
+         end,
          {progress, started}
         ],
     {ok, {script, {RelName, RelVsn}, lists:flatten(DeepList)}}.
@@ -787,16 +789,20 @@ do_spec_rel_files(#rel{name = RelName} = Rel,  Sys) ->
     {ok, BootBin} = gen_boot(Script),
     Date = date(),
     Time = time(),
-    RelIoList = io_lib:format("%% rel generated at ~w ~w\n~p.\n\n",
+    RelIoList = io_lib:format("%% rel generated at ~w ~w\n~tp.\n\n",
                               [Date, Time, GenRel]),
-    ScriptIoList = io_lib:format("%% script generated at ~w ~w\n~p.\n\n",
+    ScriptIoList = io_lib:format("%% script generated at ~w ~w\n~tp.\n\n",
                                  [Date, Time, Script]),
     [
-     {write_file, RelFile, RelIoList},
-     {write_file, ScriptFile, ScriptIoList},
+     {write_file, RelFile, to_utf8_bin_with_enc_comment(RelIoList)},
+     {write_file, ScriptFile, to_utf8_bin_with_enc_comment(ScriptIoList)},
      {write_file, BootFile, BootBin}
     ].
 
+to_utf8_bin_with_enc_comment(IoList) when is_list(IoList) ->
+    unicode:characters_to_binary("%% " ++ epp:encoding_to_string(utf8) ++ "\n"
+                                 ++ IoList).
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Generate a complete target system
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1001,7 +1007,8 @@ spec_start_file(#sys{boot_rel = BootRelName,
     {value, Erts} = lists:keysearch(erts, #app.name, Apps),
     {value, BootRel} = lists:keysearch(BootRelName, #rel.name, Rels),
     Data = Erts#app.vsn ++ " " ++ BootRel#rel.vsn ++ "\n",
-    {BootRel#rel.vsn, {write_file, "start_erl.data", Data}}.
+    {BootRel#rel.vsn, {write_file, "start_erl.data",
+                       unicode:characters_to_binary(Data)}}.
 
 lookup_spec(Prefix, Specs) ->
     lists:filter(fun(S) -> lists:prefix(Prefix, element(2, S)) end, Specs).
@@ -1183,18 +1190,18 @@ spec_app_file(#app{name = Name,
                                                    Info#app_info.modules)],
             App2 = App#app{info = Info#app_info{modules = ModNames}},
             Contents = gen_app(App2),
-            AppIoList = io_lib:format("%% app generated at ~w ~w\n~p.\n\n",
+            AppIoList = io_lib:format("%% app generated at ~w ~w\n~tp.\n\n",
                                       [date(), time(), Contents]),
-            [{write_file, AppFilename, AppIoList}];
+            [{write_file, AppFilename, to_utf8_bin_with_enc_comment(AppIoList)}];
         all ->
             %% Include all included modules
             %% Generate new file
             ModNames = [M#mod.name || M <- Mods, M#mod.is_included],
             App2 = App#app{info = Info#app_info{modules = ModNames}},
             Contents = gen_app(App2),
-            AppIoList = io_lib:format("%% app generated at ~w ~w\n~p.\n\n",
+            AppIoList = io_lib:format("%% app generated at ~w ~w\n~tp.\n\n",
                                       [date(), time(), Contents]),
-            [{write_file, AppFilename, AppIoList}]
+            [{write_file, AppFilename, to_utf8_bin_with_enc_comment(AppIoList)}]
 
     end.
 
@@ -1285,7 +1292,7 @@ do_eval_spec({archive, Archive, Options, Files},
         {ok, _} ->
             ok;
         {error, Reason} ->
-            reltool_utils:throw_error("create archive ~ts failed: ~p",
+            reltool_utils:throw_error("create archive ~ts failed: ~tp",
 				      [ArchiveFile, Reason])
     end;
 do_eval_spec({copy_file, File}, _OrigSourceDir, SourceDir, TargetDir) ->
@@ -1299,12 +1306,12 @@ do_eval_spec({copy_file, File, OldFile},
     SourceFile = filename:join([OrigSourceDir, OldFile]),
     TargetFile = filename:join([TargetDir, File]),
     reltool_utils:copy_file(SourceFile, TargetFile);
-do_eval_spec({write_file, File, IoList},
+do_eval_spec({write_file, File, Bin},
 	     _OrigSourceDir,
 	     _SourceDir,
 	     TargetDir) ->
     TargetFile = filename:join([TargetDir, File]),
-    reltool_utils:write_file(TargetFile, IoList);
+    reltool_utils:write_file(TargetFile, Bin);
 do_eval_spec({strip_beam, File}, _OrigSourceDir, SourceDir, TargetDir) ->
     SourceFile = filename:join([SourceDir, File]),
     TargetFile = filename:join([TargetDir, File]),
@@ -1336,7 +1343,7 @@ cleanup_spec({copy_file, File}, TargetDir) ->
 cleanup_spec({copy_file, NewFile, _OldFile}, TargetDir) ->
     TargetFile = filename:join([TargetDir, NewFile]),
     file:delete(TargetFile);
-cleanup_spec({write_file, File, _IoList}, TargetDir) ->
+cleanup_spec({write_file, File, _}, TargetDir) ->
     TargetFile = filename:join([TargetDir, File]),
     file:delete(TargetFile);
 cleanup_spec({strip_beam, File}, TargetDir) ->
@@ -1406,7 +1413,7 @@ do_filter_spec(Path,
 	       ExclRegexps) ->
     Path2 = opt_join(Path, NewFile),
     match(Path2, InclRegexps, ExclRegexps);
-do_filter_spec(Path, {write_file, File, _IoList}, InclRegexps, ExclRegexps) ->
+do_filter_spec(Path, {write_file, File, _}, InclRegexps, ExclRegexps) ->
     Path2 = opt_join(Path, File),
     match(Path2, InclRegexps, ExclRegexps);
 do_filter_spec(Path, {strip_beam, File}, InclRegexps, ExclRegexps) ->
@@ -1448,7 +1455,7 @@ do_install(RelName, TargetDir) ->
     RelDir = filename:join([TargetDir2, "releases"]),
     DataFile = filename:join([RelDir, "start_erl.data"]),
     Bin = reltool_utils:read_file(DataFile),
-    case string:tokens(binary_to_list(Bin), " \n") of
+    case string:lexemes(unicode:characters_to_list(Bin), " \n") of
         [ErlVsn, RelVsn | _] ->
             ErtsBinDir = filename:join([TargetDir2, "erts-" ++ ErlVsn, "bin"]),
             BinDir = filename:join([TargetDir2, "bin"]),
@@ -1501,8 +1508,8 @@ subst_src_script(Script, SrcDir, DestDir, Vars, Opts) ->
 
 subst_file(Src, Dest, Vars, Opts) ->
     Bin = reltool_utils:read_file(Src),
-    Chars = subst(binary_to_list(Bin), Vars),
-    reltool_utils:write_file(Dest, Chars),
+    Chars = subst(unicode:characters_to_list(Bin), Vars),
+    reltool_utils:write_file(Dest, unicode:characters_to_binary(Chars)),
     case lists:member(preserve, Opts) of
         true ->
             FileInfo = reltool_utils:read_file_info(Src),
diff --git a/lib/reltool/src/reltool_utils.erl b/lib/reltool/src/reltool_utils.erl
index 60edc9f3ca..2afa386cb3 100644
--- a/lib/reltool/src/reltool_utils.erl
+++ b/lib/reltool/src/reltool_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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,9 @@
 
 	 call/2, cast/2, reply/3]).
 
+%% For testing
+-export([erl_libs/2]).
+
 -include_lib("kernel/include/file.hrl").
 -include_lib("wx/include/wx.hrl").
 -include("reltool.hrl").
@@ -55,7 +58,15 @@ root_dir() ->
     code:root_dir().
 
 erl_libs() ->
-    string:tokens(os:getenv("ERL_LIBS", ""), ":;").
+    erl_libs(os:getenv("ERL_LIBS", ""), os:type()).
+
+erl_libs(ErlLibs, OsType) when is_list(ErlLibs) ->
+  Sep =
+    case OsType of
+      {win32, _} -> ";";
+      _          -> ":"
+    end,
+  string:lexemes(ErlLibs, Sep).
 
 lib_dirs(Dir) ->
     case erl_prim_loader:list_dir(Dir) of
@@ -154,7 +165,12 @@ default_rels() ->
 	  rel_apps = []},
      #rel{name = "start_sasl",
 	  vsn = "1.0",
-	  rel_apps = [#rel_app{name = sasl}]}
+          rel_apps = [#rel_app{name = sasl}]},
+     #rel{name = "no_dot_erlang", %% Needed by escript and erlc
+          vsn = "1.0",
+          rel_apps = [],
+          load_dot_erlang = false
+         }
     ].
 
 choose_default(Tag, Profile, InclDefs)
@@ -286,7 +302,7 @@ split_app_dir(Dir) ->
     {Name, Vsn} = split_app_name(Base),
     Vsn2 =
 	try
-	    [list_to_integer(N) || N <- string:tokens(Vsn, ".")]
+	    [list_to_integer(N) || N <- string:lexemes(Vsn, ".")]
 	catch
 	    _:_ ->
 		Vsn
@@ -427,7 +443,7 @@ scroll_size(ObjRef) ->
 safe_keysearch(Key, Pos, List, Mod, Line) ->
     case lists:keysearch(Key, Pos, List) of
         false ->
-            io:format("~w(~w): lists:keysearch(~p, ~w, ~p) -> false\n",
+            io:format("~w(~w): lists:keysearch(~tp, ~w, ~tp) -> false\n",
                       [Mod, Line, Key, Pos, List]),
             erlang:error({Mod, Line, lists, keysearch, [Key, Pos, List]});
         {value, Val} ->
@@ -498,8 +514,8 @@ read_file(File) ->
             throw_error("read file ~ts: ~ts", [File, Text])
     end.
 
-write_file(File, IoList) ->
-    case file:write_file(File, IoList) of
+write_file(File, Bin) ->
+    case file:write_file(File, Bin) of
         ok ->
 	    ok;
         {error, Reason} ->
@@ -601,7 +617,7 @@ do_decode_regexps(Key, [Regexp | Regexps], Acc) ->
 			      Regexps,
 			      [#regexp{source = Regexp, compiled = MP} | Acc]);
         _ ->
-            Text = lists:flatten(io_lib:format("~p", [{Key, Regexp}])),
+            Text = lists:flatten(io_lib:format("~tp", [{Key, Regexp}])),
             throw({error, "Illegal option: " ++ Text})
     end;
 do_decode_regexps(_Key, [], Acc) ->
diff --git a/lib/reltool/test/reltool_app_SUITE.erl b/lib/reltool/test/reltool_app_SUITE.erl
index 18c74bea6c..bd0ed5edca 100644
--- a/lib/reltool/test/reltool_app_SUITE.erl
+++ b/lib/reltool/test/reltool_app_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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.
@@ -24,7 +24,7 @@
 %%----------------------------------------------------------------------
 -module(reltool_app_SUITE).
 
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 
 -include("reltool_test_lib.hrl").
 -include_lib("common_test/include/ct.hrl").
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE.erl b/lib/reltool/test/reltool_manual_gui_SUITE.erl
index eebe2303fb..3a4b012d2e 100644
--- a/lib/reltool/test/reltool_manual_gui_SUITE.erl
+++ b/lib/reltool/test/reltool_manual_gui_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.
@@ -23,7 +23,7 @@
 	 init_per_suite/1, end_per_suite/1,
 	 init_per_testcase/2, end_per_testcase/2]).
 
--compile(export_all).
+-export([config/1, depgraphs/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include("reltool_test_lib.hrl").
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index e8dfea94da..9ee61b595d 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -19,11 +19,7 @@
 
 -module(reltool_server_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 init_per_suite/1, end_per_suite/1, 
-         init_per_testcase/2, end_per_testcase/2]).
-
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 
 -include_lib("reltool/src/reltool.hrl").
 -include("reltool_test_lib.hrl").
@@ -146,7 +142,8 @@ all() ->
      use_selected_vsn,
      use_selected_vsn_relative_path,
      non_standard_vsn_id,
-     undefined_regexp].
+     undefined_regexp,
+     windows_erl_libs].
 
 groups() -> 
     [].
@@ -251,6 +248,7 @@ get_config(_Config) ->
 		    {app,stdlib,[{incl_cond,include},{vsn,undefined},
 				 {lib_dir,StdLibDir}]},
 		    {boot_rel,"start_clean"},
+                    {rel,"no_dot_erlang","1.0",[]},
 		    {rel,"start_clean","1.0",[]},
 		    {rel,"start_sasl","1.0",[sasl]},
 		    {emu_name,"beam"},
@@ -281,6 +279,7 @@ get_config(_Config) ->
 		    {app,stdlib,[{incl_cond,include},{vsn,StdVsn},
 				 {lib_dir,StdLibDir},{mod,_,[]}|_]},
 		    {boot_rel,"start_clean"},
+                    {rel,"no_dot_erlang","1.0",[]},
 		    {rel,"start_clean","1.0",[]},
 		    {rel,"start_sasl","1.0",[sasl]},
 		    {emu_name,"beam"},
@@ -2108,6 +2107,7 @@ save_config(Config) ->
 		     {app,stdlib,[{incl_cond,include},{vsn,undefined},
 				  {lib_dir,undefined}]},
 		     {boot_rel,"start_clean"},
+                     {rel,"no_dot_erlang","1.0",[]},
 		     {rel,"start_clean","1.0",[]},
 		     {rel,"start_sasl","1.0",[sasl]},
 		     {emu_name,"beam"},
@@ -2148,6 +2148,7 @@ save_config(Config) ->
 		     {app,stdlib,[{incl_cond,include},{vsn,StdVsn},
 				  {lib_dir,StdLibDir},{mod,_,[]}|_]},
 		     {boot_rel,"start_clean"},
+                     {rel,"no_dot_erlang","1.0",[]},
 		     {rel,"start_clean","1.0",[]},
 		     {rel,"start_sasl","1.0",[sasl]},
 		     {emu_name,"beam"},
@@ -2546,10 +2547,21 @@ undefined_regexp(_Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Checks that reltool_utils can correctly read Windows ERL_LIBS
+
+windows_erl_libs(_Config) ->
+    WinErlLibs =
+        "C:\\Program Files\\Erlang Libs;C:\\Program Files\\More Erlang Libs",
+    Ret = reltool_utils:erl_libs(WinErlLibs, {win32, nt}),
+    ?m(["C:\\Program Files\\Erlang Libs","C:\\Program Files\\More Erlang Libs"],
+       Ret),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Library functions
 
 erl_libs() ->
-    string:tokens(os:getenv("ERL_LIBS", ""), ":;").
+    reltool_utils:erl_libs().
 
 datadir(Config) ->
     %% Removes the trailing slash...
@@ -2559,7 +2571,7 @@ latest(App) ->
     AppStr = atom_to_list(App),
     AppDirs = filelib:wildcard(filename:join(code:lib_dir(),AppStr++"-*")),
     [LatestAppDir|_] = lists:reverse(AppDirs),
-    [_,Vsn] = string:tokens(filename:basename(LatestAppDir),"-"),
+    [_,Vsn] = string:lexemes(filename:basename(LatestAppDir),"-"),
     Vsn.
 
 rm_missing_app(Apps) ->
@@ -2635,16 +2647,11 @@ os_cmd(Cmd) when is_list(Cmd) ->
         Return->
             %% Find the position of the status code wich is last in the string
             %% prepended with #
-            case string:rchr(Return, $#) of
-                
-                %% This happens only if the sh command pipe is somehow interrupted
-                0->
-                {98, Return};
-                
-                Position->
-                Result = string:left(Return,Position - 1),
-                Status = string:substr(Return,Position + 1, length(Return) - Position - 1),
-                {list_to_integer(Status), Result}
+            case string:split(Return, "$#", trailing) of
+                [_] -> %% This happens only if the sh command pipe is somehow interrupted
+                    {98, Return};
+                [Result, Status0] ->
+                    {list_to_integer(string:trim(Status0)), Result}
             end
     end.
 
diff --git a/lib/reltool/test/reltool_test_lib.erl b/lib/reltool/test/reltool_test_lib.erl
index 6cc2d259fb..be48ea4726 100644
--- a/lib/reltool/test/reltool_test_lib.erl
+++ b/lib/reltool/test/reltool_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 
 -module(reltool_test_lib).
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 
 -include("reltool_test_lib.hrl").
 -define(timeout, 20). % minutes
diff --git a/lib/reltool/test/reltool_wx_SUITE.erl b/lib/reltool/test/reltool_wx_SUITE.erl
index ac820db21c..f6f7721762 100644
--- a/lib/reltool/test/reltool_wx_SUITE.erl
+++ b/lib/reltool/test/reltool_wx_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -23,7 +23,7 @@
 	 init_per_suite/1, end_per_suite/1, 
 	 init_per_testcase/2, end_per_testcase/2]).
 
--compile(export_all).
+-export([start_all_windows/1, check_no_win_crash/0, wait_terminate/1]).
 
 -include("reltool_test_lib.hrl").
 
diff --git a/lib/reltool/test/rtt.erl b/lib/reltool/test/rtt.erl
index 173ffc5166..479241d86b 100644
--- a/lib/reltool/test/rtt.erl
+++ b/lib/reltool/test/rtt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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.
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 
 -module(rtt).
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 
 %%  Modules or suites can be shortcuts, for example server expands to reltool_server_SUITE.
 %%  
diff --git a/lib/reltool/vsn.mk b/lib/reltool/vsn.mk
index 2b23ff6f20..a649a3e0c0 100644
--- a/lib/reltool/vsn.mk
+++ b/lib/reltool/vsn.mk
@@ -1 +1 @@
-RELTOOL_VSN = 0.7.2
+RELTOOL_VSN = 0.7.8