1281 files changed, 54780 insertions, 34145 deletions

diff --git a/.gitignore b/.gitignore
index 7bc051278c..cbf7881ae7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ autom4te.cache
 # Do not use too creative wildcards.
 # Those might ignore files that should not be ignored.
 
+armv7l-unknown-linux-gnueabihf
 i686-pc-linux-gnu
 x86_64-unknown-linux-gnu
 i386-apple-darwin[0-9]*.[0-9]*.[0-9]*
@@ -131,6 +132,7 @@ JAVADOC-GENERATED
 /bootstrap/lib/ic
 /bootstrap/lib/orber
 /bootstrap/lib/parsetools
+/bootstrap/lib/runtime_tools
 /bootstrap/lib/sasl
 /bootstrap/lib/snmp
 /bootstrap/lib/syntax_tools
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ca9674d103..c89301d0eb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,38 @@
 # Contributing to Erlang/OTP
 
+## License
+
+By making a contribution to this project, I certify that:
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the 
+    best of my knowledge, is covered under an appropriate open 
+    source license and I have the right under that license to   
+    submit that work with modifications, whether created in whole
+    or in part by me, under the same open source license (unless
+    I am permitted to submit under a different license), as 
+    Indicated in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including 
+    all personal information I submit with it, including my
+    sign-off) is maintained indefinitely and may be redistributed
+    consistent with this project or the open source license(s)
+    involved.
+
+Erlang/otp is licensed under the
+Apache License 2.0
+
+As stated in: LICENSE.txt 
+
+http://developercertificate.org/
+
 ## Reporting a bug
 
 Report bugs at https://bugs.erlang.org. See [Bug reports](https://github.com/erlang/otp/wiki/Bug-reports)
diff --git a/HOWTO/DTRACE.md b/HOWTO/DTRACE.md
index 90f4addefd..28712dab88 100644
--- a/HOWTO/DTRACE.md
+++ b/HOWTO/DTRACE.md
@@ -44,348 +44,13 @@ Status
 As of R15B01, the dynamic trace code is included in the OTP source distribution,
 although it's considered experimental. The main development of the dtrace code 
 still happens outside of Ericsson, but there is no need to fetch a patched 
-version of the OTP source to get the basic funtionality.
+version of the OTP source to get the basic functionality.
 
-Implementation summary
-----------------------
+DTrace probe specifications
+---------------------------
 
-So far, most effort has been focused on the `efile_drv.c` code,
-which implements most file I/O on behalf of the Erlang virtual
-machine.  This driver also presents a big challenge: its use of an I/O
-worker pool (enabled by using the `erl +A 8` flag, for example) makes
-it much more difficult to trace I/O activity because each of the
-following may be executed in a different Pthread:
-
-* I/O initiation (Erlang code)
-* I/O proxy process handling, e.g. read/write when file is not opened
-  in `raw` mode, operations executed by the code & file server processes.
-  (Erlang code)
-* `efile_drv` command setup (C code)
-* `efile_drv` command execution (C code)
-* `efile_drv` status return (C code)
-
-Example output from `lib/runtime_tools/examples/efile_drv.d` while executing
-`file:rename("old-name", "new-name")`:
-
-    efile_drv enter tag={3,84} user tag some-user-tag | RENAME (12) | args: old-name new-name ,\
-          0 0 (port #Port<0.59>)
-    async I/O worker tag={3,83} | RENAME (12) | efile_drv-int_entry
-    async I/O worker tag={3,83} | RENAME (12) | efile_drv-int_return
-    efile_drv return tag={3,83} user tag  | RENAME (12) | errno 2
-
-... where the following key can help decipher the output:
-
-* `{3,83}` is the Erlang scheduler thread number (3) and operation
-  counter number (83) assigned to this I/O operation.  Together,
-  these two numbers form a unique ID for the I/O operation.
-* `12` is the command number for the rename operation.  See the
-  definition for `FILE_RENAME` in the source code file `efile_drv.c`
-  or the `BEGIN` section of the D script `lib/runtime_tools/examples/efile_drv.d`.
-* `old-name` and `new-name` are the two string arguments for the
-  source and destination of the `rename(2)` system call.
-  The two integer arguments are unused; the simple formatting code
-  prints the arguments anyway, 0 and 0.
-* The worker pool code was called on behalf of Erlang port `#Port<0.59>`.
-* The system call failed with a POSIX errno value of 2: `ENOENT`,
-  because the path `old-name` does not exist.
-* The `efile_drv-int_entry` and `efile_drv_int_return` probes are
-  provided in case the user is
-  interested in measuring only the latency of code executed by
-  `efile_drv` asynchronous functions by I/O worker pool threads
-  and the OS system call that they encapsulate.
-
-So, where does the `some-user-tag` string come from?
-
-At the moment, the user tag comes from code like the following:
-
-    dyntrace:put_tag("some-user-tag"),
-    file:rename("old-name", "new-name"),
-
-This method of tagging I/O at the Erlang level is subject to change.
-
-Example DTrace probe specification
-----------------------------------
-
-    /**
-     * Fired when a message is sent from one local process to another.
-     *
-     * NOTE: The 'size' parameter is in machine-dependent words and
-     *       that the actual size of any binary terms in the message
-     *       are not included.
-     *
-     * @param sender the PID (string form) of the sender
-     * @param receiver the PID (string form) of the receiver
-     * @param size the size of the message being delivered (words)
-     * @param token_label for the sender's sequential trace token
-     * @param token_previous count for the sender's sequential trace token
-     * @param token_current count for the sender's sequential trace token
-     */
-    probe message__send(char *sender, char *receiver, uint32_t size,
-                        int token_label, int token_previous, int token_current);
-
-    /**
-     * Fired when a message is sent from a local process to a remote process.
-     *
-     * NOTE: The 'size' parameter is in machine-dependent words and
-     *       that the actual size of any binary terms in the message
-     *       are not included.
-     *
-     * @param sender the PID (string form) of the sender
-     * @param node_name the Erlang node name (string form) of the receiver
-     * @param receiver the PID/name (string form) of the receiver
-     * @param size the size of the message being delivered (words)
-     * @param token_label for the sender's sequential trace token
-     * @param token_previous count for the sender's sequential trace token
-     * @param token_current count for the sender's sequential trace token
-     */
-    probe message__send__remote(char *sender, char *node_name, char *receiver,
-                                uint32_t size,
-                        int token_label, int token_previous, int token_current);
-
-    /**
-     * Fired when a message is queued to a local process.  This probe
-     * will not fire if the sender's pid == receiver's pid.
-     *
-     * NOTE: The 'size' parameter is in machine-dependent words and
-     *       that the actual size of any binary terms in the message
-     *       are not included.
-     *
-     * @param receiver the PID (string form) of the receiver
-     * @param size the size of the message being delivered (words)
-     * @param queue_len length of the queue of the receiving process
-     * @param token_label for the sender's sequential trace token
-     * @param token_previous count for the sender's sequential trace token
-     * @param token_current count for the sender's sequential trace token
-     */
-    probe message__queued(char *receiver, uint32_t size, uint32_t queue_len,
-                        int token_label, int token_previous, int token_current);
-
-    /**
-     * Fired when a message is 'receive'd by a local process and removed
-     * from its mailbox.
-     *
-     * NOTE: The 'size' parameter is in machine-dependent words and
-     *       that the actual size of any binary terms in the message
-     *       are not included.
-     *
-     * @param receiver the PID (string form) of the receiver
-     * @param size the size of the message being delivered (words)
-     * @param queue_len length of the queue of the receiving process
-     * @param token_label for the sender's sequential trace token
-     * @param token_previous count for the sender's sequential trace token
-     * @param token_current count for the sender's sequential trace token
-     */
-    probe message__receive(char *receiver, uint32_t size, uint32_t queue_len,
-                        int token_label, int token_previous, int token_current);
-
-    /* ... */
-
-    /* Async driver pool */
-
-    /**
-     * Show the post-add length of the async driver thread pool member's queue.
-     *
-     * NOTE: The port name is not available: additional lock(s) must
-     *       be acquired in order to get the port name safely in an SMP
-     *       environment.  The same is true for the aio__pool_get probe.
-     *
-     * @param port the Port (string form)
-     * @param new queue length
-     */
-    probe aio_pool__add(char *, int);
-
-    /**
-     * Show the post-get length of the async driver thread pool member's queue.
-     *
-     * @param port the Port (string form)
-     * @param new queue length
-     */
-    probe aio_pool__get(char *, int);
-
-    /* Probes for efile_drv.c */
-
-    /**
-     * Entry into the efile_drv.c file I/O driver
-     *
-     * For a list of command numbers used by this driver, see the section
-     * "Guide to probe arguments" in ../../../README.md.  That section
-     * also contains explanation of the various integer and string
-     * arguments that may be present when any particular probe fires.
-     *
-     * TODO: Adding the port string, args[10], is a pain.  Making that
-     *       port string available to all the other efile_drv.c probes
-     *       will be more pain.  Is the pain worth it?  If yes, then
-     *       add them everywhere else and grit our teeth.  If no, then
-     *       rip it out.
-     *
-     * @param thread-id number of the scheduler Pthread                   arg0
-     * @param tag number: {thread-id, tag} uniquely names a driver operation
-     * @param user-tag string                                             arg2
-     * @param command number                                              arg3
-     * @param string argument 1                                           arg4
-     * @param string argument 2                                           arg5
-     * @param integer argument 1                                          arg6
-     * @param integer argument 2                                          arg7
-     * @param integer argument 3                                          arg8
-     * @param integer argument 4                                          arg9
-     * @param port the port ID of the busy port                       args[10]
-     */
-    probe efile_drv__entry(int, int, char *, int, char *, char *,
-                           int64_t, int64_t, int64_t, int64_t, char *);
-
-    /**
-     * Entry into the driver's internal work function.  Computation here
-     * is performed by a async worker pool Pthread.
-     *
-     * @param thread-id number
-     * @param tag number
-     * @param command number
-     */
-    probe efile_drv__int_entry(int, int, int);
-
-    /**
-     * Return from the driver's internal work function.
-     *
-     * @param thread-id number
-     * @param tag number
-     * @param command number
-     */
-    probe efile_drv__int_return(int, int, int);
-
-    /**
-     * Return from the efile_drv.c file I/O driver
-     *
-     * @param thread-id number                                            arg0
-     * @param tag number                                                  arg1
-     * @param user-tag string                                             arg2
-     * @param command number                                              arg3
-     * @param Success? 1 is success, 0 is failure                         arg4
-     * @param If failure, the errno of the error.                         arg5
-     */
-    probe efile_drv__return(int, int, char *, int, int, int);
-
-Guide to efile_drv.c probe arguments
-------------------------------------
-
-    /* Driver op code: used by efile_drv-entry      arg3 */
-    /*                 used by efile_drv-int_entry  arg3 */
-    /*                 used by efile_drv-int_return arg3 */
-    /*                 used by efile_drv-return     arg3 */
-
-    #define FILE_OPEN            1                 (probe arg3)
-            probe arg6 = C driver dt_i1 = flags;
-            probe arg4 = C driver dt_s1 = path;
-
-    #define FILE_READ            2                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-            probe arg7 = C driver dt_i2 = flags;
-            probe arg8 = C driver dt_i3 = size;
-
-    #define FILE_LSEEK           3                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-            probe arg7 = C driver dt_i2 = offset;
-            probe arg8 = C driver dt_i3 = origin;
-
-    #define FILE_WRITE           4                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-            probe arg7 = C driver dt_i2 = flags;
-            probe arg8 = C driver dt_i3 = size;
-
-    #define FILE_FSTAT           5                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-
-    #define FILE_PWD             6                 (probe arg3)
-            none
-
-    #define FILE_READDIR         7                 (probe arg3)
-            probe arg4 = C driver dt_s1 = path;
-
-    #define FILE_CHDIR           8                 (probe arg3)
-            probe arg4 = C driver dt_s1 = path;
-
-    #define FILE_FSYNC           9                 (probe arg3)
-                probe arg6 = C driver dt_i1 = fd;
-
-    #define FILE_MKDIR          10                 (probe arg3)
-            probe arg4 = C driver dt_s1 = path;
-
-    #define FILE_DELETE         11                 (probe arg3)
-            probe arg4 = C driver dt_s1 = path;
-
-    #define FILE_RENAME         12                 (probe arg3)
-            probe arg4 = C driver dt_s1 = old_name;
-            probe arg5 = C driver dt_s2 = new_name;
-
-    #define FILE_RMDIR          13                 (probe arg3)
-            probe arg4 = C driver dt_s1 = path;
-
-    #define FILE_TRUNCATE       14                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-            probe arg7 = C driver dt_i2 = flags;
-
-    #define FILE_READ_FILE      15                 (probe arg3)
-            probe arg4 = C driver dt_s1 = path;
-
-    #define FILE_WRITE_INFO     16                 (probe arg3)
-            probe arg6 = C driver dt_i1 = mode;
-            probe arg7 = C driver dt_i2 = uid;
-            probe arg8 = C driver dt_i3 = gid;
-
-    #define FILE_LSTAT          19                 (probe arg3)
-            probe arg4 = C driver dt_s1 = path;
-
-    #define FILE_READLINK       20                 (probe arg3)
-            probe arg4 = C driver dt_s1 = path;
-
-    #define FILE_LINK           21                 (probe arg3)
-            probe arg4 = C driver dt_s1 = existing_path;
-            probe arg5 = C driver dt_s2 = new_path;
-
-    #define FILE_SYMLINK        22                 (probe arg3)
-            probe arg4 = C driver dt_s1 = existing_path;
-            probe arg5 = C driver dt_s2 = new_path;
-
-    #define FILE_CLOSE          23                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-            probe arg7 = C driver dt_i2 = flags;
-
-    #define FILE_PWRITEV        24                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-            probe arg7 = C driver dt_i2 = flags;
-            probe arg8 = C driver dt_i3 = size;
-
-    #define FILE_PREADV         25                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-            probe arg7 = C driver dt_i2 = flags;
-            probe arg8 = C driver dt_i3 = size;
-
-    #define FILE_SETOPT         26                 (probe arg3)
-            probe arg6 = C driver dt_i1 = opt_name;
-            probe arg7 = C driver dt_i2 = opt_specific_value;
-
-    #define FILE_IPREAD         27                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-            probe arg7 = C driver dt_i2 = flags;
-            probe arg8 = C driver dt_i3 = offsets[0];
-            probe arg9 = C driver dt_i4 = size;
-
-    #define FILE_ALTNAME        28                 (probe arg3)
-            probe arg4 = C driver dt_s1 = path;
-
-    #define FILE_READ_LINE      29                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-            probe arg7 = C driver dt_i2 = flags;
-            probe arg8 = C driver dt_i3 = read_offset;
-            probe arg9 = C driver dt_i4 = read_ahead;
-
-    #define FILE_FDATASYNC      30                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-
-    #define FILE_FADVISE        31                 (probe arg3)
-            probe arg6 = C driver dt_i1 = fd;
-            probe arg7 = C driver dt_i2 = offset;
-            probe arg8 = C driver dt_i3 = length;
-            probe arg9 = C driver dt_i4 = advise_type;
+Probe specifications can be found in `erts/emulator/beam/erlang_dtrace.d`, and
+a few example scripts can be found under `lib/runtime_tools/examples/`.
 
    [1]: http://www.erlang.org/euc/08/
    [$ERL_TOP/HOWTO/SYSTEMTAP.md]: SYSTEMTAP.md
diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md
index f62429a3ff..f7de69166a 100644
--- a/HOWTO/INSTALL.md
+++ b/HOWTO/INSTALL.md
@@ -506,12 +506,26 @@ If you have Xcode 4.3, or later, you will also need to download
 #### Building with wxErlang ####
 
 If you want to build the `wx` application, you will need to get wxWidgets-3.0
-(`wxWidgets-3.0.0.tar.bz2` from <http://sourceforge.net/projects/wxwindows/files/3.0.0/>) or get it from github with bug fixes:
+(`wxWidgets-3.0.3.tar.bz2` from <https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3/wxWidgets-3.0.3.tar.bz2>) or get it from github with bug fixes:
 
     $ git clone --branch WX_3_0_BRANCH [email protected]:wxWidgets/wxWidgets.git
 
-Be aware that the wxWidgets-3.0 is a new release of wxWidgets, it is not as
-mature as the old releases and the OS X port still lags behind the other ports.
+The wxWidgets-3.1 version should also work if 2.8 compatibility is enabled,
+add `--enable-compat28` to configure commands below.
+
+Configure and build wxWidgets (shared library on linux):
+
+    $ ./configure --prefix=/usr/local
+    $ make && sudo make install
+    $ export PATH=/usr/local/bin:$PATH
+
+Configure and build wxWidgets (static library on linux):
+
+    $ export CFLAGS=-fPIC
+    $ export CXXFLAGS=-fPIC
+    $ ./configure --prefix=/usr/local --disable-shared
+    $ make && sudo make install
+    $ export PATH=/usr/local/bin:$PATH
 
 Configure and build wxWidgets (on Mavericks - 10.9):
 
diff --git a/HOWTO/TESTING.md b/HOWTO/TESTING.md
index 34eaa68df8..ad59319efa 100644
--- a/HOWTO/TESTING.md
+++ b/HOWTO/TESTING.md
@@ -80,7 +80,7 @@ To configure and run the tests `ts` is used. `ts` is a wrapper module to
 [common_test][] which takes care of configuration and build issues before
 [common_test][] is started.
 
-`ts` has a lot of special options and functions which can be usefull when
+`ts` has a lot of special options and functions which can be useful when
 testing Erlang/OTP. For a full listing issue `ts:help()` in the erlang shell.
 
 ### Configuring the test environment
diff --git a/Makefile.in b/Makefile.in
index b3ab11d29a..ca31955c7d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -428,6 +428,18 @@ ifneq  ($(OTP_SMALL_BUILD),true)
 	echo "OTP doc built" > $(ERL_TOP)/make/otp_doc_built
 endif
 
+xmllint: docs
+	PATH=$(BOOT_PREFIX)"$${PATH}" ERL_TOP=$(ERL_TOP) \
+	$(MAKE) -C erts/ $@
+ifeq ($(OTP_SMALL_BUILD),true)
+	PATH=$(BOOT_PREFIX)"$${PATH}" ERL_TOP=$(ERL_TOP) \
+	$(MAKE) -C lib/ $@
+else
+	PATH=$(BOOT_PREFIX)"$${PATH}" ERL_TOP=$(ERL_TOP) \
+	$(MAKE) BUILD_ALL=1 -C lib/ $@
+	PATH=$(BOOT_PREFIX)"$${PATH}" ERL_TOP=$(ERL_TOP) \
+	$(MAKE) -C system/doc $@
+endif
 
 mod2app: 
 	PATH=$(BOOT_PREFIX)"$${PATH}" escript $(BOOTSTRAP_ROOT)/bootstrap/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml
@@ -682,6 +694,8 @@ tertiary_bootstrap_copy:
 	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/include ; fi
 	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test ; fi
 	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test/include ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/runtime_tools ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/runtime_tools ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/runtime_tools/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/runtime_tools/include ; fi
 	$(V_at)for x in lib/ic/ebin/*.beam; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/ic/ebin/$$BN; \
@@ -770,6 +784,18 @@ tertiary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
+
+#	copy runtime_tool includes to be able to compile with include_lib
+	$(V_at)for x in lib/runtime_tools/include/*.hrl; do \
+		BN=`basename $$x`; \
+		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/runtime_tools/include/$$BN; \
+		test -f  $$TF && \
+		test '!' -z "`find $$x -newer $$TF -print`" && \
+			cp $$x $$TF; \
+		test '!' -f $$TF && \
+			cp $$x $$TF; \
+		true; \
+	done
 #	$(V_at)cp lib/syntax_tools/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin
 
 doc_bootstrap_build:
diff --git a/OTP_VERSION b/OTP_VERSION
index a56f451a4e..06d4ac2bfd 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1,2 +1 @@
 21.0-rc0
-
diff --git a/README.md b/README.md
index b3d1aaaad1..5e051388d1 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ We are grateful to the community for contributing bug fixes and improvements. Re
 
 ### Contribution Guide
 
-Read our [contribution guide](https://github.com/erlang/otp/wiki/contribution-guidelines) to learn about our development process, how to propose fixes and improvements, and how to test your changes to Erlang/OTP before submitting a pull request.
+Read our [contribution guide](CONTRIBUTING.md) to learn about our development process, how to propose fixes and improvements, and how to test your changes to Erlang/OTP before submitting a pull request.
 
 ### Help Wanted
 
diff --git a/bootstrap/bin/no_dot_erlang.boot b/bootstrap/bin/no_dot_erlang.boot
index fc355b9c10..a94d524db7 100644
--- a/bootstrap/bin/no_dot_erlang.boot
+++ b/bootstrap/bin/no_dot_erlang.boot
diff --git a/bootstrap/bin/start.boot b/bootstrap/bin/start.boot
index fc355b9c10..a94d524db7 100644
--- a/bootstrap/bin/start.boot
+++ b/bootstrap/bin/start.boot
diff --git a/bootstrap/bin/start_clean.boot b/bootstrap/bin/start_clean.boot
index fc355b9c10..a94d524db7 100644
--- a/bootstrap/bin/start_clean.boot
+++ b/bootstrap/bin/start_clean.boot
diff --git a/bootstrap/lib/compiler/ebin/beam_a.beam b/bootstrap/lib/compiler/ebin/beam_a.beam
index 1c8753b2d1..72f044da26 100644
--- a/bootstrap/lib/compiler/ebin/beam_a.beam
+++ b/bootstrap/lib/compiler/ebin/beam_a.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_asm.beam b/bootstrap/lib/compiler/ebin/beam_asm.beam
index 62f4438b43..cca4e97485 100644
--- a/bootstrap/lib/compiler/ebin/beam_asm.beam
+++ b/bootstrap/lib/compiler/ebin/beam_asm.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_block.beam b/bootstrap/lib/compiler/ebin/beam_block.beam
index f2d8c1c51d..18f5dc6967 100644
--- a/bootstrap/lib/compiler/ebin/beam_block.beam
+++ b/bootstrap/lib/compiler/ebin/beam_block.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_bs.beam b/bootstrap/lib/compiler/ebin/beam_bs.beam
index 9c398ae80c..1361b0b08d 100644
--- a/bootstrap/lib/compiler/ebin/beam_bs.beam
+++ b/bootstrap/lib/compiler/ebin/beam_bs.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_bsm.beam b/bootstrap/lib/compiler/ebin/beam_bsm.beam
index 24992e9b90..6bf3b576b2 100644
--- a/bootstrap/lib/compiler/ebin/beam_bsm.beam
+++ b/bootstrap/lib/compiler/ebin/beam_bsm.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_clean.beam b/bootstrap/lib/compiler/ebin/beam_clean.beam
index 0985c13769..ab18a32fa8 100644
--- a/bootstrap/lib/compiler/ebin/beam_clean.beam
+++ b/bootstrap/lib/compiler/ebin/beam_clean.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_dead.beam b/bootstrap/lib/compiler/ebin/beam_dead.beam
index 46e7e4c530..33ee4dea87 100644
--- a/bootstrap/lib/compiler/ebin/beam_dead.beam
+++ b/bootstrap/lib/compiler/ebin/beam_dead.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_dict.beam b/bootstrap/lib/compiler/ebin/beam_dict.beam
index a9ea05ab77..2e9c7d0f00 100644
--- a/bootstrap/lib/compiler/ebin/beam_dict.beam
+++ b/bootstrap/lib/compiler/ebin/beam_dict.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_disasm.beam b/bootstrap/lib/compiler/ebin/beam_disasm.beam
index 132b756895..5983f341f5 100644
--- a/bootstrap/lib/compiler/ebin/beam_disasm.beam
+++ b/bootstrap/lib/compiler/ebin/beam_disasm.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_except.beam b/bootstrap/lib/compiler/ebin/beam_except.beam
index 8c94b74d8c..6eed82587a 100644
--- a/bootstrap/lib/compiler/ebin/beam_except.beam
+++ b/bootstrap/lib/compiler/ebin/beam_except.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_flatten.beam b/bootstrap/lib/compiler/ebin/beam_flatten.beam
index 50e2ce7ab4..8758e98a71 100644
--- a/bootstrap/lib/compiler/ebin/beam_flatten.beam
+++ b/bootstrap/lib/compiler/ebin/beam_flatten.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_jump.beam b/bootstrap/lib/compiler/ebin/beam_jump.beam
index 6840f1e750..5551ba9f90 100644
--- a/bootstrap/lib/compiler/ebin/beam_jump.beam
+++ b/bootstrap/lib/compiler/ebin/beam_jump.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_listing.beam b/bootstrap/lib/compiler/ebin/beam_listing.beam
index 281e9c2d03..87a8791bc4 100644
--- a/bootstrap/lib/compiler/ebin/beam_listing.beam
+++ b/bootstrap/lib/compiler/ebin/beam_listing.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_opcodes.beam b/bootstrap/lib/compiler/ebin/beam_opcodes.beam
index b8b04bbe8b..98b2c19b48 100644
--- a/bootstrap/lib/compiler/ebin/beam_opcodes.beam
+++ b/bootstrap/lib/compiler/ebin/beam_opcodes.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_peep.beam b/bootstrap/lib/compiler/ebin/beam_peep.beam
index 2bb2df33a3..d2b10e030b 100644
--- a/bootstrap/lib/compiler/ebin/beam_peep.beam
+++ b/bootstrap/lib/compiler/ebin/beam_peep.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_receive.beam b/bootstrap/lib/compiler/ebin/beam_receive.beam
index e09c50db25..8d16d7d39d 100644
--- a/bootstrap/lib/compiler/ebin/beam_receive.beam
+++ b/bootstrap/lib/compiler/ebin/beam_receive.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_record.beam b/bootstrap/lib/compiler/ebin/beam_record.beam
index 6ca907ac26..55cac5310d 100644
--- a/bootstrap/lib/compiler/ebin/beam_record.beam
+++ b/bootstrap/lib/compiler/ebin/beam_record.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_reorder.beam b/bootstrap/lib/compiler/ebin/beam_reorder.beam
index 1d5f5e3dcd..05562e19ea 100644
--- a/bootstrap/lib/compiler/ebin/beam_reorder.beam
+++ b/bootstrap/lib/compiler/ebin/beam_reorder.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_split.beam b/bootstrap/lib/compiler/ebin/beam_split.beam
index 12c532b465..8165aab002 100644
--- a/bootstrap/lib/compiler/ebin/beam_split.beam
+++ b/bootstrap/lib/compiler/ebin/beam_split.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_trim.beam b/bootstrap/lib/compiler/ebin/beam_trim.beam
index 5338e9079f..75fcff822e 100644
--- a/bootstrap/lib/compiler/ebin/beam_trim.beam
+++ b/bootstrap/lib/compiler/ebin/beam_trim.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_type.beam b/bootstrap/lib/compiler/ebin/beam_type.beam
index 893a91a4ad..0c8341a6c9 100644
--- a/bootstrap/lib/compiler/ebin/beam_type.beam
+++ b/bootstrap/lib/compiler/ebin/beam_type.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_utils.beam b/bootstrap/lib/compiler/ebin/beam_utils.beam
index 8d83f5eadc..1e9c30d00a 100644
--- a/bootstrap/lib/compiler/ebin/beam_utils.beam
+++ b/bootstrap/lib/compiler/ebin/beam_utils.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_validator.beam b/bootstrap/lib/compiler/ebin/beam_validator.beam
index 9c2e1a2c4c..25f8772409 100644
--- a/bootstrap/lib/compiler/ebin/beam_validator.beam
+++ b/bootstrap/lib/compiler/ebin/beam_validator.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_z.beam b/bootstrap/lib/compiler/ebin/beam_z.beam
index fafd2065e5..57698dbb3b 100644
--- a/bootstrap/lib/compiler/ebin/beam_z.beam
+++ b/bootstrap/lib/compiler/ebin/beam_z.beam
diff --git a/bootstrap/lib/compiler/ebin/cerl.beam b/bootstrap/lib/compiler/ebin/cerl.beam
index 0ce3fbe876..61515da20a 100644
--- a/bootstrap/lib/compiler/ebin/cerl.beam
+++ b/bootstrap/lib/compiler/ebin/cerl.beam
diff --git a/bootstrap/lib/compiler/ebin/cerl_clauses.beam b/bootstrap/lib/compiler/ebin/cerl_clauses.beam
index 3e7a816876..fdd67aebde 100644
--- a/bootstrap/lib/compiler/ebin/cerl_clauses.beam
+++ b/bootstrap/lib/compiler/ebin/cerl_clauses.beam
diff --git a/bootstrap/lib/compiler/ebin/cerl_inline.beam b/bootstrap/lib/compiler/ebin/cerl_inline.beam
index 0fa0d82191..36888f6363 100644
--- a/bootstrap/lib/compiler/ebin/cerl_inline.beam
+++ b/bootstrap/lib/compiler/ebin/cerl_inline.beam
diff --git a/bootstrap/lib/compiler/ebin/cerl_trees.beam b/bootstrap/lib/compiler/ebin/cerl_trees.beam
index 6d64dd7da0..3deb60c450 100644
--- a/bootstrap/lib/compiler/ebin/cerl_trees.beam
+++ b/bootstrap/lib/compiler/ebin/cerl_trees.beam
diff --git a/bootstrap/lib/compiler/ebin/compile.beam b/bootstrap/lib/compiler/ebin/compile.beam
index 5387a0074d..82d601c128 100644
--- a/bootstrap/lib/compiler/ebin/compile.beam
+++ b/bootstrap/lib/compiler/ebin/compile.beam
diff --git a/bootstrap/lib/compiler/ebin/compiler.app b/bootstrap/lib/compiler/ebin/compiler.app
index 01e2c478d4..286b48ec23 100644
--- a/bootstrap/lib/compiler/ebin/compiler.app
+++ b/bootstrap/lib/compiler/ebin/compiler.app
@@ -19,7 +19,7 @@
 
 {application, compiler,
  [{description, "ERTS  CXC 138 10"},
-  {vsn, "7.1.3"},
+  {vsn, "7.1.4"},
   {modules, [
 	     beam_a,
 	     beam_asm,
diff --git a/bootstrap/lib/compiler/ebin/compiler.appup b/bootstrap/lib/compiler/ebin/compiler.appup
index 277b35faa8..2973178217 100644
--- a/bootstrap/lib/compiler/ebin/compiler.appup
+++ b/bootstrap/lib/compiler/ebin/compiler.appup
@@ -16,7 +16,7 @@
 %% limitations under the License.
 %%
 %% %CopyrightEnd%
-{"7.1.1",
+{"7.1.3",
  [{<<".*">>,[{restart_application, compiler}]}],
  [{<<".*">>,[{restart_application, compiler}]}]
 }.
diff --git a/bootstrap/lib/compiler/ebin/core_lib.beam b/bootstrap/lib/compiler/ebin/core_lib.beam
index b8b5f2d2b0..f3737ecc26 100644
--- a/bootstrap/lib/compiler/ebin/core_lib.beam
+++ b/bootstrap/lib/compiler/ebin/core_lib.beam
diff --git a/bootstrap/lib/compiler/ebin/core_lint.beam b/bootstrap/lib/compiler/ebin/core_lint.beam
index 9c5dee5418..f3b420121a 100644
--- a/bootstrap/lib/compiler/ebin/core_lint.beam
+++ b/bootstrap/lib/compiler/ebin/core_lint.beam
diff --git a/bootstrap/lib/compiler/ebin/core_parse.beam b/bootstrap/lib/compiler/ebin/core_parse.beam
index 540a6d8658..cd4a22c6d8 100644
--- a/bootstrap/lib/compiler/ebin/core_parse.beam
+++ b/bootstrap/lib/compiler/ebin/core_parse.beam
diff --git a/bootstrap/lib/compiler/ebin/core_pp.beam b/bootstrap/lib/compiler/ebin/core_pp.beam
index f0573bd200..59503a2933 100644
--- a/bootstrap/lib/compiler/ebin/core_pp.beam
+++ b/bootstrap/lib/compiler/ebin/core_pp.beam
diff --git a/bootstrap/lib/compiler/ebin/core_scan.beam b/bootstrap/lib/compiler/ebin/core_scan.beam
index 398c538178..bc0190fdb1 100644
--- a/bootstrap/lib/compiler/ebin/core_scan.beam
+++ b/bootstrap/lib/compiler/ebin/core_scan.beam
diff --git a/bootstrap/lib/compiler/ebin/rec_env.beam b/bootstrap/lib/compiler/ebin/rec_env.beam
index 17cc7fec75..bd0b9c004c 100644
--- a/bootstrap/lib/compiler/ebin/rec_env.beam
+++ b/bootstrap/lib/compiler/ebin/rec_env.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_alias.beam b/bootstrap/lib/compiler/ebin/sys_core_alias.beam
index d1fe157419..52e46da7ad 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_alias.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_alias.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_bsm.beam b/bootstrap/lib/compiler/ebin/sys_core_bsm.beam
index d5e06493c5..451b2ff3b5 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_bsm.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_bsm.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam b/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam
index afe4cd4517..c189549b16 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_fold.beam b/bootstrap/lib/compiler/ebin/sys_core_fold.beam
index 06675205bc..62e56d92b0 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_fold.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_fold.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_fold_lists.beam b/bootstrap/lib/compiler/ebin/sys_core_fold_lists.beam
index 092ac1242d..0ad7ab7f9c 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_fold_lists.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_fold_lists.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_inline.beam b/bootstrap/lib/compiler/ebin/sys_core_inline.beam
index f9abd6c887..40f6ebf167 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_inline.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_inline.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_pre_attributes.beam b/bootstrap/lib/compiler/ebin/sys_pre_attributes.beam
index b854db12c4..91a29c5266 100644
--- a/bootstrap/lib/compiler/ebin/sys_pre_attributes.beam
+++ b/bootstrap/lib/compiler/ebin/sys_pre_attributes.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_codegen.beam b/bootstrap/lib/compiler/ebin/v3_codegen.beam
index 09ff7b253d..bf1bcaafd2 100644
--- a/bootstrap/lib/compiler/ebin/v3_codegen.beam
+++ b/bootstrap/lib/compiler/ebin/v3_codegen.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_core.beam b/bootstrap/lib/compiler/ebin/v3_core.beam
index 59717eae84..b4672b1315 100644
--- a/bootstrap/lib/compiler/ebin/v3_core.beam
+++ b/bootstrap/lib/compiler/ebin/v3_core.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_kernel.beam b/bootstrap/lib/compiler/ebin/v3_kernel.beam
index 56af498763..082bd6b75d 100644
--- a/bootstrap/lib/compiler/ebin/v3_kernel.beam
+++ b/bootstrap/lib/compiler/ebin/v3_kernel.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam b/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam
index b67d012f34..fb780c2a43 100644
--- a/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam
+++ b/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam
diff --git a/bootstrap/lib/kernel/ebin/application.beam b/bootstrap/lib/kernel/ebin/application.beam
index d242e045a1..58f1681fba 100644
--- a/bootstrap/lib/kernel/ebin/application.beam
+++ b/bootstrap/lib/kernel/ebin/application.beam
diff --git a/bootstrap/lib/kernel/ebin/application_controller.beam b/bootstrap/lib/kernel/ebin/application_controller.beam
index 834cabf0fc..5e63aa4e8a 100644
--- a/bootstrap/lib/kernel/ebin/application_controller.beam
+++ b/bootstrap/lib/kernel/ebin/application_controller.beam
diff --git a/bootstrap/lib/kernel/ebin/application_master.beam b/bootstrap/lib/kernel/ebin/application_master.beam
index 7b15fc7633..4bafc43619 100644
--- a/bootstrap/lib/kernel/ebin/application_master.beam
+++ b/bootstrap/lib/kernel/ebin/application_master.beam
diff --git a/bootstrap/lib/kernel/ebin/application_starter.beam b/bootstrap/lib/kernel/ebin/application_starter.beam
index 32a6ad752d..ca7b77abcb 100644
--- a/bootstrap/lib/kernel/ebin/application_starter.beam
+++ b/bootstrap/lib/kernel/ebin/application_starter.beam
diff --git a/bootstrap/lib/kernel/ebin/auth.beam b/bootstrap/lib/kernel/ebin/auth.beam
index 45afd111e8..e8904c142a 100644
--- a/bootstrap/lib/kernel/ebin/auth.beam
+++ b/bootstrap/lib/kernel/ebin/auth.beam
diff --git a/bootstrap/lib/kernel/ebin/code.beam b/bootstrap/lib/kernel/ebin/code.beam
index 9ebd823d58..102ac41ac2 100644
--- a/bootstrap/lib/kernel/ebin/code.beam
+++ b/bootstrap/lib/kernel/ebin/code.beam
diff --git a/bootstrap/lib/kernel/ebin/code_server.beam b/bootstrap/lib/kernel/ebin/code_server.beam
index f9ca469b0d..922c5e6308 100644
--- a/bootstrap/lib/kernel/ebin/code_server.beam
+++ b/bootstrap/lib/kernel/ebin/code_server.beam
diff --git a/bootstrap/lib/kernel/ebin/disk_log.beam b/bootstrap/lib/kernel/ebin/disk_log.beam
index fc71affe55..76264b975b 100644
--- a/bootstrap/lib/kernel/ebin/disk_log.beam
+++ b/bootstrap/lib/kernel/ebin/disk_log.beam
diff --git a/bootstrap/lib/kernel/ebin/disk_log_1.beam b/bootstrap/lib/kernel/ebin/disk_log_1.beam
index a42a4c1b86..05c002ba67 100644
--- a/bootstrap/lib/kernel/ebin/disk_log_1.beam
+++ b/bootstrap/lib/kernel/ebin/disk_log_1.beam
diff --git a/bootstrap/lib/kernel/ebin/disk_log_server.beam b/bootstrap/lib/kernel/ebin/disk_log_server.beam
index 96bad0104e..f3ca0687dd 100644
--- a/bootstrap/lib/kernel/ebin/disk_log_server.beam
+++ b/bootstrap/lib/kernel/ebin/disk_log_server.beam
diff --git a/bootstrap/lib/kernel/ebin/dist_ac.beam b/bootstrap/lib/kernel/ebin/dist_ac.beam
index bcc27081b2..7419ba7c27 100644
--- a/bootstrap/lib/kernel/ebin/dist_ac.beam
+++ b/bootstrap/lib/kernel/ebin/dist_ac.beam
diff --git a/bootstrap/lib/kernel/ebin/dist_util.beam b/bootstrap/lib/kernel/ebin/dist_util.beam
index fd4e4fb5de..3a4d230a7f 100644
--- a/bootstrap/lib/kernel/ebin/dist_util.beam
+++ b/bootstrap/lib/kernel/ebin/dist_util.beam
diff --git a/bootstrap/lib/kernel/ebin/erl_boot_server.beam b/bootstrap/lib/kernel/ebin/erl_boot_server.beam
index d9de814e60..d921ffabd9 100644
--- a/bootstrap/lib/kernel/ebin/erl_boot_server.beam
+++ b/bootstrap/lib/kernel/ebin/erl_boot_server.beam
diff --git a/bootstrap/lib/kernel/ebin/erl_ddll.beam b/bootstrap/lib/kernel/ebin/erl_ddll.beam
index 940a74c1c3..b672c39f5d 100644
--- a/bootstrap/lib/kernel/ebin/erl_ddll.beam
+++ b/bootstrap/lib/kernel/ebin/erl_ddll.beam
diff --git a/bootstrap/lib/kernel/ebin/erl_distribution.beam b/bootstrap/lib/kernel/ebin/erl_distribution.beam
index fcf8d7fef0..8c8cba9068 100644
--- a/bootstrap/lib/kernel/ebin/erl_distribution.beam
+++ b/bootstrap/lib/kernel/ebin/erl_distribution.beam
diff --git a/bootstrap/lib/kernel/ebin/erl_epmd.beam b/bootstrap/lib/kernel/ebin/erl_epmd.beam
index 717d7937da..d06aa1add3 100644
--- a/bootstrap/lib/kernel/ebin/erl_epmd.beam
+++ b/bootstrap/lib/kernel/ebin/erl_epmd.beam
diff --git a/bootstrap/lib/kernel/ebin/erl_reply.beam b/bootstrap/lib/kernel/ebin/erl_reply.beam
index d9dee00b6a..25b4b6c55e 100644
--- a/bootstrap/lib/kernel/ebin/erl_reply.beam
+++ b/bootstrap/lib/kernel/ebin/erl_reply.beam
diff --git a/bootstrap/lib/kernel/ebin/erl_signal_handler.beam b/bootstrap/lib/kernel/ebin/erl_signal_handler.beam
index b2498def7f..881e36e6fb 100644
--- a/bootstrap/lib/kernel/ebin/erl_signal_handler.beam
+++ b/bootstrap/lib/kernel/ebin/erl_signal_handler.beam
diff --git a/bootstrap/lib/kernel/ebin/error_handler.beam b/bootstrap/lib/kernel/ebin/error_handler.beam
index 92bec1ead8..1ce96ca432 100644
--- a/bootstrap/lib/kernel/ebin/error_handler.beam
+++ b/bootstrap/lib/kernel/ebin/error_handler.beam
diff --git a/bootstrap/lib/kernel/ebin/error_logger.beam b/bootstrap/lib/kernel/ebin/error_logger.beam
index 2415215395..4490480184 100644
--- a/bootstrap/lib/kernel/ebin/error_logger.beam
+++ b/bootstrap/lib/kernel/ebin/error_logger.beam
diff --git a/bootstrap/lib/kernel/ebin/erts_debug.beam b/bootstrap/lib/kernel/ebin/erts_debug.beam
index 41ce96a83d..d59aed49df 100644
--- a/bootstrap/lib/kernel/ebin/erts_debug.beam
+++ b/bootstrap/lib/kernel/ebin/erts_debug.beam
diff --git a/bootstrap/lib/kernel/ebin/file.beam b/bootstrap/lib/kernel/ebin/file.beam
index 6d45887800..df612743bd 100644
--- a/bootstrap/lib/kernel/ebin/file.beam
+++ b/bootstrap/lib/kernel/ebin/file.beam
diff --git a/bootstrap/lib/kernel/ebin/file_io_server.beam b/bootstrap/lib/kernel/ebin/file_io_server.beam
index 74a62d6388..d37ed85781 100644
--- a/bootstrap/lib/kernel/ebin/file_io_server.beam
+++ b/bootstrap/lib/kernel/ebin/file_io_server.beam
diff --git a/bootstrap/lib/kernel/ebin/file_server.beam b/bootstrap/lib/kernel/ebin/file_server.beam
index d609725fa8..4f1d53cb39 100644
--- a/bootstrap/lib/kernel/ebin/file_server.beam
+++ b/bootstrap/lib/kernel/ebin/file_server.beam
diff --git a/bootstrap/lib/kernel/ebin/gen_sctp.beam b/bootstrap/lib/kernel/ebin/gen_sctp.beam
index e56d7fd978..dcd81b1c6f 100644
--- a/bootstrap/lib/kernel/ebin/gen_sctp.beam
+++ b/bootstrap/lib/kernel/ebin/gen_sctp.beam
diff --git a/bootstrap/lib/kernel/ebin/gen_tcp.beam b/bootstrap/lib/kernel/ebin/gen_tcp.beam
index 9d9828c266..0e492978d5 100644
--- a/bootstrap/lib/kernel/ebin/gen_tcp.beam
+++ b/bootstrap/lib/kernel/ebin/gen_tcp.beam
diff --git a/bootstrap/lib/kernel/ebin/gen_udp.beam b/bootstrap/lib/kernel/ebin/gen_udp.beam
index b181c70e6a..323b6cd4bb 100644
--- a/bootstrap/lib/kernel/ebin/gen_udp.beam
+++ b/bootstrap/lib/kernel/ebin/gen_udp.beam
diff --git a/bootstrap/lib/kernel/ebin/global.beam b/bootstrap/lib/kernel/ebin/global.beam
index ff9a409bf8..8b057dff1a 100644
--- a/bootstrap/lib/kernel/ebin/global.beam
+++ b/bootstrap/lib/kernel/ebin/global.beam
diff --git a/bootstrap/lib/kernel/ebin/global_group.beam b/bootstrap/lib/kernel/ebin/global_group.beam
index 1e496fdbbf..b072f96e5d 100644
--- a/bootstrap/lib/kernel/ebin/global_group.beam
+++ b/bootstrap/lib/kernel/ebin/global_group.beam
diff --git a/bootstrap/lib/kernel/ebin/global_search.beam b/bootstrap/lib/kernel/ebin/global_search.beam
index 255886f9fe..653d2a8699 100644
--- a/bootstrap/lib/kernel/ebin/global_search.beam
+++ b/bootstrap/lib/kernel/ebin/global_search.beam
diff --git a/bootstrap/lib/kernel/ebin/group.beam b/bootstrap/lib/kernel/ebin/group.beam
index 5eecaecec8..43c35f0a3a 100644
--- a/bootstrap/lib/kernel/ebin/group.beam
+++ b/bootstrap/lib/kernel/ebin/group.beam
diff --git a/bootstrap/lib/kernel/ebin/group_history.beam b/bootstrap/lib/kernel/ebin/group_history.beam
index 80afde896f..97f98ebe2f 100644
--- a/bootstrap/lib/kernel/ebin/group_history.beam
+++ b/bootstrap/lib/kernel/ebin/group_history.beam
diff --git a/bootstrap/lib/kernel/ebin/heart.beam b/bootstrap/lib/kernel/ebin/heart.beam
index be58924715..0c3caaf969 100644
--- a/bootstrap/lib/kernel/ebin/heart.beam
+++ b/bootstrap/lib/kernel/ebin/heart.beam
diff --git a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
index 286f4aa309..16841cc417 100644
--- a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
+++ b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
diff --git a/bootstrap/lib/kernel/ebin/inet.beam b/bootstrap/lib/kernel/ebin/inet.beam
index 667c67acb8..c1f7d2e8b0 100644
--- a/bootstrap/lib/kernel/ebin/inet.beam
+++ b/bootstrap/lib/kernel/ebin/inet.beam
diff --git a/bootstrap/lib/kernel/ebin/inet6_sctp.beam b/bootstrap/lib/kernel/ebin/inet6_sctp.beam
index 632e16bd1d..bea47a3591 100644
--- a/bootstrap/lib/kernel/ebin/inet6_sctp.beam
+++ b/bootstrap/lib/kernel/ebin/inet6_sctp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet6_tcp.beam b/bootstrap/lib/kernel/ebin/inet6_tcp.beam
index 7a2649e560..db0ead9cdd 100644
--- a/bootstrap/lib/kernel/ebin/inet6_tcp.beam
+++ b/bootstrap/lib/kernel/ebin/inet6_tcp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet6_udp.beam b/bootstrap/lib/kernel/ebin/inet6_udp.beam
index 6335a596d1..abc4b650ae 100644
--- a/bootstrap/lib/kernel/ebin/inet6_udp.beam
+++ b/bootstrap/lib/kernel/ebin/inet6_udp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_config.beam b/bootstrap/lib/kernel/ebin/inet_config.beam
index 6e02c48609..5b50b553d7 100644
--- a/bootstrap/lib/kernel/ebin/inet_config.beam
+++ b/bootstrap/lib/kernel/ebin/inet_config.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_db.beam b/bootstrap/lib/kernel/ebin/inet_db.beam
index 0c77cee005..e86ce51920 100644
--- a/bootstrap/lib/kernel/ebin/inet_db.beam
+++ b/bootstrap/lib/kernel/ebin/inet_db.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_dns.beam b/bootstrap/lib/kernel/ebin/inet_dns.beam
index f36b12952e..c437ed85d7 100644
--- a/bootstrap/lib/kernel/ebin/inet_dns.beam
+++ b/bootstrap/lib/kernel/ebin/inet_dns.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_gethost_native.beam b/bootstrap/lib/kernel/ebin/inet_gethost_native.beam
index c68dd12796..ccd9f21cd4 100644
--- a/bootstrap/lib/kernel/ebin/inet_gethost_native.beam
+++ b/bootstrap/lib/kernel/ebin/inet_gethost_native.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_hosts.beam b/bootstrap/lib/kernel/ebin/inet_hosts.beam
index 6a66d00d1e..601a6704ee 100644
--- a/bootstrap/lib/kernel/ebin/inet_hosts.beam
+++ b/bootstrap/lib/kernel/ebin/inet_hosts.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_parse.beam b/bootstrap/lib/kernel/ebin/inet_parse.beam
index cd27ee7265..561e53dcbd 100644
--- a/bootstrap/lib/kernel/ebin/inet_parse.beam
+++ b/bootstrap/lib/kernel/ebin/inet_parse.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_res.beam b/bootstrap/lib/kernel/ebin/inet_res.beam
index d0bef34afd..8c18d0d1ad 100644
--- a/bootstrap/lib/kernel/ebin/inet_res.beam
+++ b/bootstrap/lib/kernel/ebin/inet_res.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_sctp.beam b/bootstrap/lib/kernel/ebin/inet_sctp.beam
index a12c138257..5107eb63b8 100644
--- a/bootstrap/lib/kernel/ebin/inet_sctp.beam
+++ b/bootstrap/lib/kernel/ebin/inet_sctp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_tcp.beam b/bootstrap/lib/kernel/ebin/inet_tcp.beam
index 8453fe15e8..304272a20d 100644
--- a/bootstrap/lib/kernel/ebin/inet_tcp.beam
+++ b/bootstrap/lib/kernel/ebin/inet_tcp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
index f25d7689f5..2aa0a7270a 100644
--- a/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
+++ b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_udp.beam b/bootstrap/lib/kernel/ebin/inet_udp.beam
index 17fef57714..d358ee15dc 100644
--- a/bootstrap/lib/kernel/ebin/inet_udp.beam
+++ b/bootstrap/lib/kernel/ebin/inet_udp.beam
diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app
index 68dcf6b930..d027eb6bcb 100644
--- a/bootstrap/lib/kernel/ebin/kernel.app
+++ b/bootstrap/lib/kernel/ebin/kernel.app
@@ -22,7 +22,7 @@
 {application, kernel,
  [
   {description, "ERTS  CXC 138 10"},
-  {vsn, "5.4"},
+  {vsn, "5.4.2"},
   {modules, [application,
 	     application_controller,
 	     application_master,
@@ -57,6 +57,7 @@
 	     inet_tcp_dist,
 	     kernel,
 	     kernel_config,
+	     kernel_refc,
 	     local_tcp,
 	     local_udp,
 	     net,
@@ -88,6 +89,13 @@
              inet_udp,
 	     inet_sctp,
              pg2,
+             raw_file_io,
+             raw_file_io_compressed,
+             raw_file_io_deflate,
+             raw_file_io_delayed,
+             raw_file_io_inflate,
+             raw_file_io_list,
+             raw_file_io_raw,
 	     seq_trace,
 	     standard_error,
 	     wrap_log_reader]},
@@ -107,6 +115,7 @@
 		heart,
 		init,
 		kernel_config,
+		kernel_refc,
 		kernel_sup,
 		net_kernel,
 		net_sup,
diff --git a/bootstrap/lib/kernel/ebin/kernel.beam b/bootstrap/lib/kernel/ebin/kernel.beam
index 4000653c44..3b99f49822 100644
--- a/bootstrap/lib/kernel/ebin/kernel.beam
+++ b/bootstrap/lib/kernel/ebin/kernel.beam
diff --git a/bootstrap/lib/kernel/ebin/kernel_config.beam b/bootstrap/lib/kernel/ebin/kernel_config.beam
index c557c45967..85b517fe0f 100644
--- a/bootstrap/lib/kernel/ebin/kernel_config.beam
+++ b/bootstrap/lib/kernel/ebin/kernel_config.beam
diff --git a/bootstrap/lib/kernel/ebin/kernel_refc.beam b/bootstrap/lib/kernel/ebin/kernel_refc.beam
new file mode 100644
index 0000000000..2fca33154c
--- /dev/null
+++ b/bootstrap/lib/kernel/ebin/kernel_refc.beam
diff --git a/bootstrap/lib/kernel/ebin/local_tcp.beam b/bootstrap/lib/kernel/ebin/local_tcp.beam
index a21fed9c88..02c5848f11 100644
--- a/bootstrap/lib/kernel/ebin/local_tcp.beam
+++ b/bootstrap/lib/kernel/ebin/local_tcp.beam
diff --git a/bootstrap/lib/kernel/ebin/net_adm.beam b/bootstrap/lib/kernel/ebin/net_adm.beam
index f50856393d..05aa46dcb8 100644
--- a/bootstrap/lib/kernel/ebin/net_adm.beam
+++ b/bootstrap/lib/kernel/ebin/net_adm.beam
diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam
index 3d59085f05..d9abceade5 100644
--- a/bootstrap/lib/kernel/ebin/net_kernel.beam
+++ b/bootstrap/lib/kernel/ebin/net_kernel.beam
diff --git a/bootstrap/lib/kernel/ebin/os.beam b/bootstrap/lib/kernel/ebin/os.beam
index e8cac1d153..f2a003d44f 100644
--- a/bootstrap/lib/kernel/ebin/os.beam
+++ b/bootstrap/lib/kernel/ebin/os.beam
diff --git a/bootstrap/lib/kernel/ebin/pg2.beam b/bootstrap/lib/kernel/ebin/pg2.beam
index 56f75405fd..4661129bc9 100644
--- a/bootstrap/lib/kernel/ebin/pg2.beam
+++ b/bootstrap/lib/kernel/ebin/pg2.beam
diff --git a/bootstrap/lib/kernel/ebin/ram_file.beam b/bootstrap/lib/kernel/ebin/ram_file.beam
index af9159a318..d426a75ed9 100644
--- a/bootstrap/lib/kernel/ebin/ram_file.beam
+++ b/bootstrap/lib/kernel/ebin/ram_file.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io.beam b/bootstrap/lib/kernel/ebin/raw_file_io.beam
new file mode 100644
index 0000000000..734a051882
--- /dev/null
+++ b/bootstrap/lib/kernel/ebin/raw_file_io.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io_compressed.beam b/bootstrap/lib/kernel/ebin/raw_file_io_compressed.beam
new file mode 100644
index 0000000000..caa3d9ac6b
--- /dev/null
+++ b/bootstrap/lib/kernel/ebin/raw_file_io_compressed.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io_deflate.beam b/bootstrap/lib/kernel/ebin/raw_file_io_deflate.beam
new file mode 100644
index 0000000000..222817d912
--- /dev/null
+++ b/bootstrap/lib/kernel/ebin/raw_file_io_deflate.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io_delayed.beam b/bootstrap/lib/kernel/ebin/raw_file_io_delayed.beam
new file mode 100644
index 0000000000..dcda821d8e
--- /dev/null
+++ b/bootstrap/lib/kernel/ebin/raw_file_io_delayed.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io_inflate.beam b/bootstrap/lib/kernel/ebin/raw_file_io_inflate.beam
new file mode 100644
index 0000000000..228a8f28a5
--- /dev/null
+++ b/bootstrap/lib/kernel/ebin/raw_file_io_inflate.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io_list.beam b/bootstrap/lib/kernel/ebin/raw_file_io_list.beam
new file mode 100644
index 0000000000..85deafd35a
--- /dev/null
+++ b/bootstrap/lib/kernel/ebin/raw_file_io_list.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io_raw.beam b/bootstrap/lib/kernel/ebin/raw_file_io_raw.beam
new file mode 100644
index 0000000000..b47a67055d
--- /dev/null
+++ b/bootstrap/lib/kernel/ebin/raw_file_io_raw.beam
diff --git a/bootstrap/lib/kernel/ebin/rpc.beam b/bootstrap/lib/kernel/ebin/rpc.beam
index aaf7ef0483..e4ed087628 100644
--- a/bootstrap/lib/kernel/ebin/rpc.beam
+++ b/bootstrap/lib/kernel/ebin/rpc.beam
diff --git a/bootstrap/lib/kernel/ebin/seq_trace.beam b/bootstrap/lib/kernel/ebin/seq_trace.beam
index 3de0a5d940..1d1e277bf3 100644
--- a/bootstrap/lib/kernel/ebin/seq_trace.beam
+++ b/bootstrap/lib/kernel/ebin/seq_trace.beam
diff --git a/bootstrap/lib/kernel/ebin/standard_error.beam b/bootstrap/lib/kernel/ebin/standard_error.beam
index e50302a387..8c598615f8 100644
--- a/bootstrap/lib/kernel/ebin/standard_error.beam
+++ b/bootstrap/lib/kernel/ebin/standard_error.beam
diff --git a/bootstrap/lib/kernel/ebin/user.beam b/bootstrap/lib/kernel/ebin/user.beam
index e8b49b2b33..e57d6896bd 100644
--- a/bootstrap/lib/kernel/ebin/user.beam
+++ b/bootstrap/lib/kernel/ebin/user.beam
diff --git a/bootstrap/lib/kernel/ebin/user_drv.beam b/bootstrap/lib/kernel/ebin/user_drv.beam
index b6ac29d5c4..d2631be5af 100644
--- a/bootstrap/lib/kernel/ebin/user_drv.beam
+++ b/bootstrap/lib/kernel/ebin/user_drv.beam
diff --git a/bootstrap/lib/kernel/ebin/user_sup.beam b/bootstrap/lib/kernel/ebin/user_sup.beam
index f5e0d1112a..6aa34138c8 100644
--- a/bootstrap/lib/kernel/ebin/user_sup.beam
+++ b/bootstrap/lib/kernel/ebin/user_sup.beam
diff --git a/bootstrap/lib/kernel/ebin/wrap_log_reader.beam b/bootstrap/lib/kernel/ebin/wrap_log_reader.beam
index 57038df042..a0f24625b4 100644
--- a/bootstrap/lib/kernel/ebin/wrap_log_reader.beam
+++ b/bootstrap/lib/kernel/ebin/wrap_log_reader.beam
diff --git a/bootstrap/lib/stdlib/ebin/array.beam b/bootstrap/lib/stdlib/ebin/array.beam
index ce8145374e..1dd8846725 100644
--- a/bootstrap/lib/stdlib/ebin/array.beam
+++ b/bootstrap/lib/stdlib/ebin/array.beam
diff --git a/bootstrap/lib/stdlib/ebin/base64.beam b/bootstrap/lib/stdlib/ebin/base64.beam
index 4d8141a9c1..902d8edc6c 100644
--- a/bootstrap/lib/stdlib/ebin/base64.beam
+++ b/bootstrap/lib/stdlib/ebin/base64.beam
diff --git a/bootstrap/lib/stdlib/ebin/beam_lib.beam b/bootstrap/lib/stdlib/ebin/beam_lib.beam
index a9643f6a83..7ffab34254 100644
--- a/bootstrap/lib/stdlib/ebin/beam_lib.beam
+++ b/bootstrap/lib/stdlib/ebin/beam_lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/binary.beam b/bootstrap/lib/stdlib/ebin/binary.beam
index c392aa2871..e712319947 100644
--- a/bootstrap/lib/stdlib/ebin/binary.beam
+++ b/bootstrap/lib/stdlib/ebin/binary.beam
diff --git a/bootstrap/lib/stdlib/ebin/c.beam b/bootstrap/lib/stdlib/ebin/c.beam
index 3baf074b66..b3f62c467d 100644
--- a/bootstrap/lib/stdlib/ebin/c.beam
+++ b/bootstrap/lib/stdlib/ebin/c.beam
diff --git a/bootstrap/lib/stdlib/ebin/calendar.beam b/bootstrap/lib/stdlib/ebin/calendar.beam
index fb7b882218..89a9168805 100644
--- a/bootstrap/lib/stdlib/ebin/calendar.beam
+++ b/bootstrap/lib/stdlib/ebin/calendar.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets.beam b/bootstrap/lib/stdlib/ebin/dets.beam
index e57da59d9d..9384a4379f 100644
--- a/bootstrap/lib/stdlib/ebin/dets.beam
+++ b/bootstrap/lib/stdlib/ebin/dets.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets_server.beam b/bootstrap/lib/stdlib/ebin/dets_server.beam
index d67eda05c6..31f0f2701a 100644
--- a/bootstrap/lib/stdlib/ebin/dets_server.beam
+++ b/bootstrap/lib/stdlib/ebin/dets_server.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets_utils.beam b/bootstrap/lib/stdlib/ebin/dets_utils.beam
index 3a3801fd5d..265facaa57 100644
--- a/bootstrap/lib/stdlib/ebin/dets_utils.beam
+++ b/bootstrap/lib/stdlib/ebin/dets_utils.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets_v9.beam b/bootstrap/lib/stdlib/ebin/dets_v9.beam
index 7328637dde..f53f9fcf85 100644
--- a/bootstrap/lib/stdlib/ebin/dets_v9.beam
+++ b/bootstrap/lib/stdlib/ebin/dets_v9.beam
diff --git a/bootstrap/lib/stdlib/ebin/dict.beam b/bootstrap/lib/stdlib/ebin/dict.beam
index 08fd0f07a7..345df4c87f 100644
--- a/bootstrap/lib/stdlib/ebin/dict.beam
+++ b/bootstrap/lib/stdlib/ebin/dict.beam
diff --git a/bootstrap/lib/stdlib/ebin/digraph.beam b/bootstrap/lib/stdlib/ebin/digraph.beam
index 7434821dda..c51ecf54fc 100644
--- a/bootstrap/lib/stdlib/ebin/digraph.beam
+++ b/bootstrap/lib/stdlib/ebin/digraph.beam
diff --git a/bootstrap/lib/stdlib/ebin/digraph_utils.beam b/bootstrap/lib/stdlib/ebin/digraph_utils.beam
index a1fd652de6..6b0158ce48 100644
--- a/bootstrap/lib/stdlib/ebin/digraph_utils.beam
+++ b/bootstrap/lib/stdlib/ebin/digraph_utils.beam
diff --git a/bootstrap/lib/stdlib/ebin/edlin.beam b/bootstrap/lib/stdlib/ebin/edlin.beam
index 06b7ba8b81..c8d4cac351 100644
--- a/bootstrap/lib/stdlib/ebin/edlin.beam
+++ b/bootstrap/lib/stdlib/ebin/edlin.beam
diff --git a/bootstrap/lib/stdlib/ebin/edlin_expand.beam b/bootstrap/lib/stdlib/ebin/edlin_expand.beam
index 8579266b8f..62e209dcc7 100644
--- a/bootstrap/lib/stdlib/ebin/edlin_expand.beam
+++ b/bootstrap/lib/stdlib/ebin/edlin_expand.beam
diff --git a/bootstrap/lib/stdlib/ebin/epp.beam b/bootstrap/lib/stdlib/ebin/epp.beam
index b41a852d89..58e29d0c3b 100644
--- a/bootstrap/lib/stdlib/ebin/epp.beam
+++ b/bootstrap/lib/stdlib/ebin/epp.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_abstract_code.beam b/bootstrap/lib/stdlib/ebin/erl_abstract_code.beam
index 7db89cb79e..e6042b9715 100644
--- a/bootstrap/lib/stdlib/ebin/erl_abstract_code.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_abstract_code.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_anno.beam b/bootstrap/lib/stdlib/ebin/erl_anno.beam
index 8797a1a2b8..710a82f1fa 100644
--- a/bootstrap/lib/stdlib/ebin/erl_anno.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_anno.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_bits.beam b/bootstrap/lib/stdlib/ebin/erl_bits.beam
index 944b7e3d0f..b9b75ecaef 100644
--- a/bootstrap/lib/stdlib/ebin/erl_bits.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_bits.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_compile.beam b/bootstrap/lib/stdlib/ebin/erl_compile.beam
index 749c05c54f..a317ae28a1 100644
--- a/bootstrap/lib/stdlib/ebin/erl_compile.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_compile.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_eval.beam b/bootstrap/lib/stdlib/ebin/erl_eval.beam
index fc33e5d727..eb913d070d 100644
--- a/bootstrap/lib/stdlib/ebin/erl_eval.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_eval.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_expand_records.beam b/bootstrap/lib/stdlib/ebin/erl_expand_records.beam
index 146f0cc6bd..1869788f7b 100644
--- a/bootstrap/lib/stdlib/ebin/erl_expand_records.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_expand_records.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_internal.beam b/bootstrap/lib/stdlib/ebin/erl_internal.beam
index beaab5658b..fd21c22f81 100644
--- a/bootstrap/lib/stdlib/ebin/erl_internal.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_internal.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_lint.beam b/bootstrap/lib/stdlib/ebin/erl_lint.beam
index 616c211390..b8350e8975 100644
--- a/bootstrap/lib/stdlib/ebin/erl_lint.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_lint.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_parse.beam b/bootstrap/lib/stdlib/ebin/erl_parse.beam
index 5bcbf9189f..bfc5843912 100644
--- a/bootstrap/lib/stdlib/ebin/erl_parse.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_parse.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_pp.beam b/bootstrap/lib/stdlib/ebin/erl_pp.beam
index e2886be779..ca3d18a5db 100644
--- a/bootstrap/lib/stdlib/ebin/erl_pp.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_pp.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_scan.beam b/bootstrap/lib/stdlib/ebin/erl_scan.beam
index d36202515a..4bc9f7cbc3 100644
--- a/bootstrap/lib/stdlib/ebin/erl_scan.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_scan.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_tar.beam b/bootstrap/lib/stdlib/ebin/erl_tar.beam
index df0d6cf1b8..ba7382f874 100644
--- a/bootstrap/lib/stdlib/ebin/erl_tar.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_tar.beam
diff --git a/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam b/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam
index 579a564783..2f2e54de1a 100644
--- a/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam
+++ b/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam
diff --git a/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam b/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam
index 5152c14d82..d504f97f9f 100644
--- a/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam
+++ b/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam
diff --git a/bootstrap/lib/stdlib/ebin/escript.beam b/bootstrap/lib/stdlib/ebin/escript.beam
index 10982c84ce..5ae2752a6d 100644
--- a/bootstrap/lib/stdlib/ebin/escript.beam
+++ b/bootstrap/lib/stdlib/ebin/escript.beam
diff --git a/bootstrap/lib/stdlib/ebin/ets.beam b/bootstrap/lib/stdlib/ebin/ets.beam
index 95fbd243c3..f2a649e0d1 100644
--- a/bootstrap/lib/stdlib/ebin/ets.beam
+++ b/bootstrap/lib/stdlib/ebin/ets.beam
diff --git a/bootstrap/lib/stdlib/ebin/eval_bits.beam b/bootstrap/lib/stdlib/ebin/eval_bits.beam
index 9b9c9fe3f6..0a3c0b47fb 100644
--- a/bootstrap/lib/stdlib/ebin/eval_bits.beam
+++ b/bootstrap/lib/stdlib/ebin/eval_bits.beam
diff --git a/bootstrap/lib/stdlib/ebin/file_sorter.beam b/bootstrap/lib/stdlib/ebin/file_sorter.beam
index c5d371f463..8a9e501e1b 100644
--- a/bootstrap/lib/stdlib/ebin/file_sorter.beam
+++ b/bootstrap/lib/stdlib/ebin/file_sorter.beam
diff --git a/bootstrap/lib/stdlib/ebin/filelib.beam b/bootstrap/lib/stdlib/ebin/filelib.beam
index 4921d0631d..7fc4d0b06a 100644
--- a/bootstrap/lib/stdlib/ebin/filelib.beam
+++ b/bootstrap/lib/stdlib/ebin/filelib.beam
diff --git a/bootstrap/lib/stdlib/ebin/filename.beam b/bootstrap/lib/stdlib/ebin/filename.beam
index 9ac0d3272c..42e8e24580 100644
--- a/bootstrap/lib/stdlib/ebin/filename.beam
+++ b/bootstrap/lib/stdlib/ebin/filename.beam
diff --git a/bootstrap/lib/stdlib/ebin/gb_sets.beam b/bootstrap/lib/stdlib/ebin/gb_sets.beam
index 4dec91bb83..4b524f17a3 100644
--- a/bootstrap/lib/stdlib/ebin/gb_sets.beam
+++ b/bootstrap/lib/stdlib/ebin/gb_sets.beam
diff --git a/bootstrap/lib/stdlib/ebin/gb_trees.beam b/bootstrap/lib/stdlib/ebin/gb_trees.beam
index dd3a7076bc..e62ee69cec 100644
--- a/bootstrap/lib/stdlib/ebin/gb_trees.beam
+++ b/bootstrap/lib/stdlib/ebin/gb_trees.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen.beam b/bootstrap/lib/stdlib/ebin/gen.beam
index 916bafd013..0c36dfe05a 100644
--- a/bootstrap/lib/stdlib/ebin/gen.beam
+++ b/bootstrap/lib/stdlib/ebin/gen.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_event.beam b/bootstrap/lib/stdlib/ebin/gen_event.beam
index 8e7696b689..21806df360 100644
--- a/bootstrap/lib/stdlib/ebin/gen_event.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_event.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_fsm.beam b/bootstrap/lib/stdlib/ebin/gen_fsm.beam
index ab6419dd87..fccfecd7d8 100644
--- a/bootstrap/lib/stdlib/ebin/gen_fsm.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_fsm.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_server.beam b/bootstrap/lib/stdlib/ebin/gen_server.beam
index ffa191a785..3f2d31465f 100644
--- a/bootstrap/lib/stdlib/ebin/gen_server.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_server.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_statem.beam b/bootstrap/lib/stdlib/ebin/gen_statem.beam
index 9b86faed77..c79b4a16f9 100644
--- a/bootstrap/lib/stdlib/ebin/gen_statem.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_statem.beam
diff --git a/bootstrap/lib/stdlib/ebin/io.beam b/bootstrap/lib/stdlib/ebin/io.beam
index 18f66f5443..e1841e184c 100644
--- a/bootstrap/lib/stdlib/ebin/io.beam
+++ b/bootstrap/lib/stdlib/ebin/io.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib.beam b/bootstrap/lib/stdlib/ebin/io_lib.beam
index 3884967cba..adb2ac56b0 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib_format.beam b/bootstrap/lib/stdlib/ebin/io_lib_format.beam
index c02da85965..713f6236aa 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib_format.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib_format.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib_fread.beam b/bootstrap/lib/stdlib/ebin/io_lib_fread.beam
index a1c1e35ff6..2eebe1c85d 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib_fread.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib_fread.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
index 183e5b6278..bf9e95e6be 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
diff --git a/bootstrap/lib/stdlib/ebin/lib.beam b/bootstrap/lib/stdlib/ebin/lib.beam
index d7bf939406..7d342a59a9 100644
--- a/bootstrap/lib/stdlib/ebin/lib.beam
+++ b/bootstrap/lib/stdlib/ebin/lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/lists.beam b/bootstrap/lib/stdlib/ebin/lists.beam
index f1c5f21315..bfcebe04a4 100644
--- a/bootstrap/lib/stdlib/ebin/lists.beam
+++ b/bootstrap/lib/stdlib/ebin/lists.beam
diff --git a/bootstrap/lib/stdlib/ebin/log_mf_h.beam b/bootstrap/lib/stdlib/ebin/log_mf_h.beam
index 920286c40e..b27db50f62 100644
--- a/bootstrap/lib/stdlib/ebin/log_mf_h.beam
+++ b/bootstrap/lib/stdlib/ebin/log_mf_h.beam
diff --git a/bootstrap/lib/stdlib/ebin/maps.beam b/bootstrap/lib/stdlib/ebin/maps.beam
index f07f4f922d..85e997bb1c 100644
--- a/bootstrap/lib/stdlib/ebin/maps.beam
+++ b/bootstrap/lib/stdlib/ebin/maps.beam
diff --git a/bootstrap/lib/stdlib/ebin/ms_transform.beam b/bootstrap/lib/stdlib/ebin/ms_transform.beam
index b4c8527161..8228a076ba 100644
--- a/bootstrap/lib/stdlib/ebin/ms_transform.beam
+++ b/bootstrap/lib/stdlib/ebin/ms_transform.beam
diff --git a/bootstrap/lib/stdlib/ebin/orddict.beam b/bootstrap/lib/stdlib/ebin/orddict.beam
index 9d65872e90..57a23fbe98 100644
--- a/bootstrap/lib/stdlib/ebin/orddict.beam
+++ b/bootstrap/lib/stdlib/ebin/orddict.beam
diff --git a/bootstrap/lib/stdlib/ebin/ordsets.beam b/bootstrap/lib/stdlib/ebin/ordsets.beam
index 487a232b15..b966590d8d 100644
--- a/bootstrap/lib/stdlib/ebin/ordsets.beam
+++ b/bootstrap/lib/stdlib/ebin/ordsets.beam
diff --git a/bootstrap/lib/stdlib/ebin/pool.beam b/bootstrap/lib/stdlib/ebin/pool.beam
index 160474fc2a..b056cf44ec 100644
--- a/bootstrap/lib/stdlib/ebin/pool.beam
+++ b/bootstrap/lib/stdlib/ebin/pool.beam
diff --git a/bootstrap/lib/stdlib/ebin/proc_lib.beam b/bootstrap/lib/stdlib/ebin/proc_lib.beam
index 7c9cfad78e..6689783d5d 100644
--- a/bootstrap/lib/stdlib/ebin/proc_lib.beam
+++ b/bootstrap/lib/stdlib/ebin/proc_lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/proplists.beam b/bootstrap/lib/stdlib/ebin/proplists.beam
index 176a0e0db5..a9768d2929 100644
--- a/bootstrap/lib/stdlib/ebin/proplists.beam
+++ b/bootstrap/lib/stdlib/ebin/proplists.beam
diff --git a/bootstrap/lib/stdlib/ebin/qlc.beam b/bootstrap/lib/stdlib/ebin/qlc.beam
index f0e42efbaa..6c2895ac79 100644
--- a/bootstrap/lib/stdlib/ebin/qlc.beam
+++ b/bootstrap/lib/stdlib/ebin/qlc.beam
diff --git a/bootstrap/lib/stdlib/ebin/qlc_pt.beam b/bootstrap/lib/stdlib/ebin/qlc_pt.beam
index c64367d023..d40c197029 100644
--- a/bootstrap/lib/stdlib/ebin/qlc_pt.beam
+++ b/bootstrap/lib/stdlib/ebin/qlc_pt.beam
diff --git a/bootstrap/lib/stdlib/ebin/queue.beam b/bootstrap/lib/stdlib/ebin/queue.beam
index fb24f979e1..8c6b611247 100644
--- a/bootstrap/lib/stdlib/ebin/queue.beam
+++ b/bootstrap/lib/stdlib/ebin/queue.beam
diff --git a/bootstrap/lib/stdlib/ebin/rand.beam b/bootstrap/lib/stdlib/ebin/rand.beam
index 2877b269c9..6574df6c6f 100644
--- a/bootstrap/lib/stdlib/ebin/rand.beam
+++ b/bootstrap/lib/stdlib/ebin/rand.beam
diff --git a/bootstrap/lib/stdlib/ebin/random.beam b/bootstrap/lib/stdlib/ebin/random.beam
index dcb2b6850b..37f12f8a36 100644
--- a/bootstrap/lib/stdlib/ebin/random.beam
+++ b/bootstrap/lib/stdlib/ebin/random.beam
diff --git a/bootstrap/lib/stdlib/ebin/re.beam b/bootstrap/lib/stdlib/ebin/re.beam
index e59c6b0bc6..784cf2fe7a 100644
--- a/bootstrap/lib/stdlib/ebin/re.beam
+++ b/bootstrap/lib/stdlib/ebin/re.beam
diff --git a/bootstrap/lib/stdlib/ebin/sets.beam b/bootstrap/lib/stdlib/ebin/sets.beam
index 48165b7598..3f90d78b8f 100644
--- a/bootstrap/lib/stdlib/ebin/sets.beam
+++ b/bootstrap/lib/stdlib/ebin/sets.beam
diff --git a/bootstrap/lib/stdlib/ebin/shell.beam b/bootstrap/lib/stdlib/ebin/shell.beam
index 0c4edd211d..e2dfa3c636 100644
--- a/bootstrap/lib/stdlib/ebin/shell.beam
+++ b/bootstrap/lib/stdlib/ebin/shell.beam
diff --git a/bootstrap/lib/stdlib/ebin/slave.beam b/bootstrap/lib/stdlib/ebin/slave.beam
index abab0acf33..596dda4ed5 100644
--- a/bootstrap/lib/stdlib/ebin/slave.beam
+++ b/bootstrap/lib/stdlib/ebin/slave.beam
diff --git a/bootstrap/lib/stdlib/ebin/sofs.beam b/bootstrap/lib/stdlib/ebin/sofs.beam
index 2e6cea119a..bfefd0c3a9 100644
--- a/bootstrap/lib/stdlib/ebin/sofs.beam
+++ b/bootstrap/lib/stdlib/ebin/sofs.beam
diff --git a/bootstrap/lib/stdlib/ebin/stdlib.app b/bootstrap/lib/stdlib/ebin/stdlib.app
index 07309b88c4..d542c669f8 100644
--- a/bootstrap/lib/stdlib/ebin/stdlib.app
+++ b/bootstrap/lib/stdlib/ebin/stdlib.app
@@ -20,7 +20,7 @@
 %%
 {application, stdlib,
  [{description, "ERTS  CXC 138 10"},
-  {vsn, "3.4.2"},
+  {vsn, "3.4.3"},
   {modules, [array,
 	     base64,
 	     beam_lib,
@@ -101,6 +101,7 @@
 	     timer,
 	     unicode,
              unicode_util,
+	     uri_string,
 	     win32reg,
 	     zip]},
   {registered,[timer_server,rsh_starter,take_over_monitor,pool_master,
diff --git a/bootstrap/lib/stdlib/ebin/string.beam b/bootstrap/lib/stdlib/ebin/string.beam
index 406b2e19de..feeeec6a84 100644
--- a/bootstrap/lib/stdlib/ebin/string.beam
+++ b/bootstrap/lib/stdlib/ebin/string.beam
diff --git a/bootstrap/lib/stdlib/ebin/supervisor.beam b/bootstrap/lib/stdlib/ebin/supervisor.beam
index f7f11b9b26..61e8fca92c 100644
--- a/bootstrap/lib/stdlib/ebin/supervisor.beam
+++ b/bootstrap/lib/stdlib/ebin/supervisor.beam
diff --git a/bootstrap/lib/stdlib/ebin/supervisor_bridge.beam b/bootstrap/lib/stdlib/ebin/supervisor_bridge.beam
index 4d913ca680..800c167237 100644
--- a/bootstrap/lib/stdlib/ebin/supervisor_bridge.beam
+++ b/bootstrap/lib/stdlib/ebin/supervisor_bridge.beam
diff --git a/bootstrap/lib/stdlib/ebin/sys.beam b/bootstrap/lib/stdlib/ebin/sys.beam
index 291c750da3..0cec9f4be8 100644
--- a/bootstrap/lib/stdlib/ebin/sys.beam
+++ b/bootstrap/lib/stdlib/ebin/sys.beam
diff --git a/bootstrap/lib/stdlib/ebin/timer.beam b/bootstrap/lib/stdlib/ebin/timer.beam
index 25ab0d760f..7baece7eb2 100644
--- a/bootstrap/lib/stdlib/ebin/timer.beam
+++ b/bootstrap/lib/stdlib/ebin/timer.beam
diff --git a/bootstrap/lib/stdlib/ebin/unicode.beam b/bootstrap/lib/stdlib/ebin/unicode.beam
index 8d5ad0ce98..b3b0a4637a 100644
--- a/bootstrap/lib/stdlib/ebin/unicode.beam
+++ b/bootstrap/lib/stdlib/ebin/unicode.beam
diff --git a/bootstrap/lib/stdlib/ebin/unicode_util.beam b/bootstrap/lib/stdlib/ebin/unicode_util.beam
index 1532f67ef4..ab18c78028 100644
--- a/bootstrap/lib/stdlib/ebin/unicode_util.beam
+++ b/bootstrap/lib/stdlib/ebin/unicode_util.beam
diff --git a/bootstrap/lib/stdlib/ebin/uri_string.beam b/bootstrap/lib/stdlib/ebin/uri_string.beam
new file mode 100644
index 0000000000..95b7a2e6ae
--- /dev/null
+++ b/bootstrap/lib/stdlib/ebin/uri_string.beam
diff --git a/bootstrap/lib/stdlib/ebin/win32reg.beam b/bootstrap/lib/stdlib/ebin/win32reg.beam
index 49d62a74e1..3194d09463 100644
--- a/bootstrap/lib/stdlib/ebin/win32reg.beam
+++ b/bootstrap/lib/stdlib/ebin/win32reg.beam
diff --git a/bootstrap/lib/stdlib/ebin/zip.beam b/bootstrap/lib/stdlib/ebin/zip.beam
index 1582220c5d..3e19c83090 100644
--- a/bootstrap/lib/stdlib/ebin/zip.beam
+++ b/bootstrap/lib/stdlib/ebin/zip.beam
diff --git a/bootstrap/lib/stdlib/include/assert.hrl b/bootstrap/lib/stdlib/include/assert.hrl
index 2fbaeba0b2..2ec89e7d8a 100644
--- a/bootstrap/lib/stdlib/include/assert.hrl
+++ b/bootstrap/lib/stdlib/include/assert.hrl
@@ -309,7 +309,7 @@
                                        {unexpected_success, __V}]})
             catch
                 Class:Term -> ok;
-                __C:__T ->
+                __C:__T:__S ->
                     erlang:error({assertException,
                                   [{module, ?MODULE},
                                    {line, ?LINE},
@@ -318,8 +318,7 @@
                                     "{ "++(??Class)++" , "++(??Term)
                                     ++" , [...] }"},
                                    {unexpected_exception,
-                                    {__C, __T,
-                                     erlang:get_stacktrace()}}]})
+                                    {__C, __T, __S}}]})
             end
           end)())
         end).
@@ -338,7 +337,7 @@
                                        {unexpected_success, __V}]})
             catch
                 Class:Term -> ok;
-                __C:__T ->
+                __C:__T:__S ->
                     erlang:error({assertException,
                                   [{module, ?MODULE},
                                    {line, ?LINE},
@@ -348,8 +347,7 @@
                                     "{ "++(??Class)++" , "++(??Term)
                                     ++" , [...] }"},
                                    {unexpected_exception,
-                                    {__C, __T,
-                                     erlang:get_stacktrace()}}]})
+                                    {__C, __T, __S}}]})
             end
           end)())
         end).
@@ -378,7 +376,7 @@
             try (Expr) of
                 _ -> ok
             catch
-                __C:__T ->
+                __C:__T:__S ->
                     case __C of
                         Class ->
                             case __T of
@@ -391,9 +389,7 @@
                                                     "{ "++(??Class)++" , "
                                                     ++(??Term)++" , [...] }"},
                                                    {unexpected_exception,
-                                                    {__C, __T,
-                                                     erlang:get_stacktrace()
-                                                    }}]});
+                                                    {__C, __T, __S}}]});
                                 _ -> ok
                             end;
                         _ -> ok
@@ -407,7 +403,7 @@
             try (Expr) of
                 _ -> ok
             catch
-                __C:__T ->
+                __C:__T:__S ->
                     case __C of
                         Class ->
                             case __T of
@@ -421,9 +417,7 @@
                                                     "{ "++(??Class)++" , "
                                                     ++(??Term)++" , [...] }"},
                                                    {unexpected_exception,
-                                                    {__C, __T,
-                                                     erlang:get_stacktrace()
-                                                    }}]});
+                                                    {__C, __T, __S}}]});
                                 _ -> ok
                             end;
                         _ -> ok
diff --git a/erts/Makefile b/erts/Makefile
index 0393ccc759..60c70b6a2c 100644
--- a/erts/Makefile
+++ b/erts/Makefile
@@ -145,3 +145,7 @@ release:
 .PHONY: release_docs
 release_docs:
 	$(V_at)( cd doc/src && $(MAKE) $@ )
+
+.PHONY: xmllint
+xmllint:
+	$(MAKE) -C doc/src $@
diff --git a/erts/configure.in b/erts/configure.in
index 2f6043ee85..b2435f1ac9 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -1356,12 +1356,16 @@ error
 ],[
  AC_MSG_RESULT(no)
 ])
+
+if test "$Z_LIB" != ""; then
+  AC_MSG_CHECKING(for zlib inflateGetDictionary presence)
+  AC_SEARCH_LIBS(inflateGetDictionary, [z],
+                 AC_DEFINE(HAVE_ZLIB_INFLATEGETDICTIONARY, 1,
+                           [Define if your zlib version defines inflateGetDictionary.]))
+fi
+
 LIBS=$zlib_save_LIBS
 
-AC_MSG_CHECKING(for zlib inflateGetDictionary presence)
-AC_SEARCH_LIBS(inflateGetDictionary, [z],
-               AC_DEFINE(HAVE_ZLIB_INFLATEGETDICTIONARY, 1,
-                         [Define if your zlib version defines inflateGetDictionary.]))
 fi
 AC_SUBST(Z_LIB)
 
@@ -1756,6 +1760,25 @@ if test $ac_cv_sizeof_void_p = 8; then
 fi
 AC_SUBST(BITS64)
 
+AC_MSG_CHECKING([for C compiler 'restrict' support])
+restrict_keyword=""
+for x in restrict __restrict; do
+    AC_TRY_COMPILE([int * $x foo(int * $x arg);
+		    int * $x foo(int * $x arg)
+		        { int * $x var=arg; return var;}
+		   ],[],
+		   [restrict_keyword=$x],[])
+    if test "x$restrict_keyword" != "x"; then
+	break
+    fi
+done
+AC_DEFINE_UNQUOTED(ERTS_RESTRICT,[$restrict_keyword],[Type qualifier restrict])
+if test "x$restrict_keyword" != "x"; then
+   AC_MSG_RESULT(yes)
+else
+   AC_MSG_RESULT(no)
+fi
+
 if test "x$ac_compiler_gnu" = "xyes"; then
 AC_MSG_CHECKING([if we should add -fno-tree-copyrename to CFLAGS for computed gotos to work properly])
 AC_TRY_COMPILE([],[
@@ -1775,8 +1798,6 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-
-
 AC_MSG_CHECKING([for broken gcc-4.3.0 compiler])
 AC_TRY_RUN([
 /* pr36339.c */
@@ -2745,23 +2766,6 @@ if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then
   fi
 fi
 
-dnl Check to disable -fPIE and friends for HiPE on amd64
-if test X${enable_hipe} = Xyes && test X$ARCH = Xamd64; then
-   AC_TRY_COMPILE(, [#if defined(__pie__) || defined(__PIE__)
-		     #error -fPIE is enabled by default
-		     #endif],
-		    [AC_MSG_NOTICE([No -fPIE enabled by default])],
-		    [AC_MSG_WARN([Security feature -fPIE will be disabled for HiPE])
-		     STATIC_CFLAGS="-fno-PIE $STATIC_CFLAGS"
-		     saved_LDFLAGS=$LDFLAGS
-		     LDFLAGS="-no-pie $LDFLAGS"
-		     AC_TRY_LINK(,, [],
-			[LDFLAGS="-fno-PIE $saved_LDFLAGS"
-			 AC_TRY_LINK(,, [],
-			    [AC_MSG_WARN([Linked does not accept option -no-pie nor -fno-PIE])
-			     LDFLAGS=$saved_LDFLAGS])])])
-fi
-
 if test X${enable_hipe} = Xyes; then
    case $OPSYS in
 	linux)
diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
index 9e68373af8..c4f1baf89e 100644
--- a/erts/doc/src/Makefile
+++ b/erts/doc/src/Makefile
@@ -69,6 +69,7 @@ XML_PART_FILES = \
 	part.xml
 
 XML_CHAPTER_FILES = \
+	introduction.xml \
 	tty.xml \
 	match_spec.xml \
 	crash_dump.xml \
@@ -80,8 +81,7 @@ XML_CHAPTER_FILES = \
 	erl_dist_protocol.xml \
 	communication.xml \
 	time_correction.xml \
-	notes.xml \
-	notes_history.xml
+	notes.xml
 
 TOPDOCDIR=../../../doc
 
diff --git a/erts/doc/src/absform.xml b/erts/doc/src/absform.xml
index e49c8c32e9..2ada903edb 100644
--- a/erts/doc/src/absform.xml
+++ b/erts/doc/src/absform.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2017</year>
+      <year>2001</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -614,26 +614,58 @@
       <item>
         <p>If C is a catch clause <c>P -> B</c>,
           where <c>P</c> is a pattern and <c>B</c> is a body, then
-          Rep(C) = <c>{clause,LINE,[Rep({throw,P,_})],[],Rep(B)}</c>.</p>
+          Rep(C) = <c>{clause,LINE,[Rep({throw,P,_})],[],Rep(B)}</c>,
+	  that is, a catch clause with an explicit exception class
+	  <c>throw</c> and with or without an explicit stacktrace
+	  variable <c>_</c> cannot be distinguished from a catch clause
+	  without an explicit exception class and without an explicit
+	  stacktrace variable.</p>
       </item>
       <item>
         <p>If C is a catch clause <c>X : P -> B</c>,
           where <c>X</c> is an atomic literal or a variable pattern,
           <c>P</c> is a pattern, and <c>B</c> is a body, then
-          Rep(C) = <c>{clause,LINE,[Rep({X,P,_})],[],Rep(B)}</c>.</p>
+          Rep(C) = <c>{clause,LINE,[Rep({X,P,_})],[],Rep(B)}</c>,
+	  that is, a catch clause with an explicit exception class and
+	  with an explicit stacktrace variable <c>_</c> cannot be
+	  distinguished from a catch clause with an explicit exception
+	  class and without an explicit stacktrace variable.</p>
+      </item>
+      <item>
+        <p>If C is a catch clause <c>X : P : S -> B</c>,
+          where <c>X</c> is an atomic literal or a variable pattern,
+          <c>P</c> is a pattern, <c>S</c> is a variable, and <c>B</c>
+	  is a body, then
+          Rep(C) = <c>{clause,LINE,[Rep({X,P,S})],[],Rep(B)}</c>.</p>
       </item>
       <item>
         <p>If C is a catch clause <c>P when Gs -> B</c>,
           where <c>P</c> is a pattern, <c>Gs</c> is a guard sequence,
           and <c>B</c> is a body, then
-          Rep(C) = <c>{clause,LINE,[Rep({throw,P,_})],Rep(Gs),Rep(B)}</c>.</p>
+          Rep(C) = <c>{clause,LINE,[Rep({throw,P,_})],Rep(Gs),Rep(B)}</c>,
+	  that is, a catch clause with an explicit exception class
+	  <c>throw</c> and with or without an explicit stacktrace
+	  variable <c>_</c> cannot be distinguished from a catch clause
+	  without an explicit exception class and without an explicit
+	  stacktrace variable.</p>
       </item>
       <item>
         <p>If C is a catch clause <c>X : P when Gs -> B</c>,
           where <c>X</c> is an atomic literal or a variable pattern,
           <c>P</c> is a pattern, <c>Gs</c> is a guard sequence,
           and <c>B</c> is a body, then
-          Rep(C) = <c>{clause,LINE,[Rep({X,P,_})],Rep(Gs),Rep(B)}</c>.</p>
+          Rep(C) = <c>{clause,LINE,[Rep({X,P,_})],Rep(Gs),Rep(B)}</c>,
+	  that is, a catch clause with an explicit exception class and
+	  with an explicit stacktrace variable <c>_</c> cannot be
+	  distinguished from a catch clause with an explicit exception
+	  class and without an explicit stacktrace variable.</p>
+      </item>
+      <item>
+        <p>If C is a catch clause <c>X : P : S when Gs -> B</c>,
+          where <c>X</c> is an atomic literal or a variable pattern,
+          <c>P</c> is a pattern, <c>Gs</c> is a guard sequence,
+          <c>S</c> is a variable, and <c>B</c> is a body, then
+          Rep(C) = <c>{clause,LINE,[Rep({X,P,S})],Rep(Gs),Rep(B)}</c>.</p>
       </item>
       <item>
         <p>If C is a function clause <c>( Ps ) -> B</c>,
diff --git a/erts/doc/src/alt_dist.xml b/erts/doc/src/alt_dist.xml
index d3731a5391..92d40d8558 100644
--- a/erts/doc/src/alt_dist.xml
+++ b/erts/doc/src/alt_dist.xml
@@ -782,10 +782,9 @@
 	  <taglist>
 	    <tag><c>DFLAG_DIST_HDR_ATOM_CACHE</c></tag>
 	    <item>Do not use atom cache over this connection.</item>
-	    <tag><c>DFLAGS_STRICT_ORDER_DELIVERY</c></tag>
-	    <item>Do not use any features that require strict
-	    order delivery.</item>
 	  </taglist>
+	  <p>Use function <c>dist_util:strict_order_flags/0</c> to get all flags
+	    for features that require strict order delivery.</p>
 	  <p>
 	    This flag field is optional.
 	  </p>
@@ -819,9 +818,9 @@
       <p>
 	The data delivery order can be relaxed by disabling
 	features that require strict ordering. This is done by
-	passing the <c>?DFLAGS_STRICT_ORDER_DELIVERY</c>
-	<seealso marker="erl_dist_protocol#dflags">distribution
-	flags</seealso> in the
+	passing the
+	<seealso marker="erl_dist_protocol#dflags">distribution	flags</seealso>
+	returned by <c>dist_util:strict_order_flags/0</c> in the
 	<seealso marker="alt_dist#hs_data_reject_flags"><c>reject_flags</c></seealso>
 	field of the <seealso marker="#hs_data_record"><c>#hs_data{}</c></seealso>
 	record used when setting up the connection. When relaxed
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index bd824b3405..99f0421080 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -360,11 +360,12 @@
       </item>
       <tag><c><![CDATA[-mode interactive | embedded]]></c></tag>
       <item>
-        <p>Indicates if the system is to load code dynamically
-          (<c><![CDATA[interactive]]></c>), or if all code is to be loaded
-          during system initialization (<c><![CDATA[embedded]]></c>); see
-          <seealso marker="kernel:code"><c>code(3)</c></seealso>.
-          Defaults to <c><![CDATA[interactive]]></c>.</p>
+        <p>Modules are auto loaded when they are first referenced if the
+          runtime system runs in <c><![CDATA[interactive]]></c> mode, which is
+          the default. In <c><![CDATA[embedded]]></c> mode modules are not auto
+          loaded. The latter is recommended when the boot script preloads all
+          modules, as conventionally happens in OTP releases. See
+          <seealso marker="kernel:code"><c>code(3)</c></seealso></p>.
       </item>
       <tag><c><![CDATA[-name Name]]></c></tag>
       <item>
@@ -1693,4 +1694,3 @@ code:load_abs("..../user_default").    ]]></code>
       <seealso marker="tools:make"><c>make(3)</c></seealso></p>
   </section>
 </comref>
-
diff --git a/erts/doc/src/erl_dist_protocol.xml b/erts/doc/src/erl_dist_protocol.xml
index a78b13aaa4..98a9a76b60 100644
--- a/erts/doc/src/erl_dist_protocol.xml
+++ b/erts/doc/src/erl_dist_protocol.xml
@@ -849,10 +849,9 @@ DiB == gen_digest(ChA, ICA)?
         </item>
       </taglist>
       <p>
-	There are also a collection of <c>DFLAG</c>s bitwise or:ed
-	together in the <c>DFLAGS_STRICT_ORDER_DELIVERY</c> macro.
-	These flags corresponds to features that require strict
-	ordering of data over distribution channels.
+	There is also function <c>dist_util:strict_order_flags/0</c>
+	returning all flags (bitwise or:ed together) corresponding to features
+	that require strict ordering of data over distribution channels.
       </p>
     </section>
   </section>
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index ca9d458e1e..c790872fe4 100644
--- a/erts/doc/src/erl_driver.xml
+++ b/erts/doc/src/erl_driver.xml
@@ -2304,8 +2304,13 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
           buffer is too small, a value &gt; <c>0</c> is returned and
           <c>*value_size</c> has been set to the buffer size needed.</p>
         <warning>
-          <p>Do <em>not</em> use libc's <c>getenv</c> or similar C library
-            interfaces from a driver.</p>
+          <p>This function reads the emulated environment used by
+            <seealso marker="os:getenv/1"><c>os:getenv/1</c></seealso> and not
+            the environment used by libc's <c>getenv(3)</c> or similar. Drivers
+            that <em>require</em> that these are in sync will need to do so
+            themselves, but keep in mind that they are segregated for a reason;
+            <c>getenv(3)</c> and its friends are <em>not thread-safe</em> and
+            may cause unrelated code to misbehave or crash the emulator.</p>
         </warning>
         <p>This function is thread-safe.</p>
       </desc>
@@ -2650,8 +2655,13 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
             environment variable is removed.</p>
         </note>
         <warning>
-          <p>Do <em>not</em> use libc's <c>putenv</c> or similar C library
-            interfaces from a driver.</p>
+          <p>This function modifies the emulated environment used by
+            <seealso marker="os:putenv/2"><c>os:putenv/2</c></seealso> and not
+            the environment used by libc's <c>putenv(3)</c> or similar. Drivers
+            that <em>require</em> that these are in sync will need to do so
+            themselves, but keep in mind that they are segregated for a reason;
+            <c>putenv(3)</c> and its friends are <em>not thread-safe</em> and
+            may cause unrelated code to misbehave or crash the emulator.</p>
         </warning>
         <p>This function is thread-safe.</p>
       </desc>
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index 419e41693e..9b446615a4 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -367,6 +367,8 @@ return term;</code>
             <c>enif_ioq_deq()</c></seealso></item>
             <item><seealso marker="#enif_ioq_peek">
             <c>enif_ioq_peek()</c></seealso></item>
+            <item><seealso marker="#enif_ioq_peek_head">
+            <c>enif_ioq_peek_head()</c></seealso></item>
             <item><seealso marker="#enif_inspect_iovec">
             <c>enif_inspect_iovec()</c></seealso></item>
             <item><seealso marker="#enif_free_iovec">
@@ -952,6 +954,8 @@ typedef struct {
       <desc>
         <p>Allocates memory of <c>size</c> bytes.</p>
         <p>Returns <c>NULL</c> if the allocation fails.</p>
+        <p>The returned pointer is suitably aligned for any built-in type that
+          fit in the allocated memory.</p>
       </desc>
     </func>
 
@@ -970,6 +974,10 @@ typedef struct {
           <seealso marker="#enif_make_binary"><c>enif_make_binary</c></seealso>.
           An allocated (and owned) <c>ErlNifBinary</c> can be kept between NIF
           calls.</p>
+        <p>If you do not need to reallocate or keep the data alive across NIF
+          calls, consider using <seealso marker="#enif_make_new_binary">
+          <c>enif_make_new_binary</c></seealso> instead as it will allocate
+          small binaries on the process heap when possible.</p>
         <p>Returns <c>true</c> on success, or <c>false</c> if allocation
           fails.</p>
       </desc>
@@ -1228,6 +1236,17 @@ typedef struct {
     </func>
 
     <func>
+      <name><ret>int</ret><nametext>enif_fprintf(FILE *stream, const char *format, ...)</nametext></name>
+      <fsummary>Format strings and Erlang terms.</fsummary>
+      <desc>
+        <p>Similar to <c>fprintf</c> but this format string also accepts
+          <c>"%T"</c>, which formats Erlang terms.</p>
+	<p>This function was originally intenden for debugging purpose. It is not
+	  recommended to print very large terms with <c>%T</c>.</p>
+      </desc>
+    </func>
+
+    <func>
       <name><ret>void</ret><nametext>enif_free(void* ptr)</nametext></name>
       <fsummary>Free dynamic memory.</fsummary>
       <desc>
@@ -1681,8 +1700,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
       <fsummary>Peek inside the IO Queue</fsummary>
       <desc>
         <p>Get the I/O queue as a pointer to an array of <c>SysIOVec</c>s.
-          It also returns the number of elements in <c>iovlen</c>.
-          This is the only way to get data out of the queue.</p>
+           It also returns the number of elements in <c>iovlen</c>.</p>
         <p>Nothing is removed from the queue by this function, that must be done
           with <seealso marker="#enif_ioq_deq"><c>enif_ioq_deq</c></seealso>.</p>
          <p>The returned array is suitable to use with the Unix system
@@ -1691,6 +1709,21 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
+      <name><ret>int</ret>
+      <nametext>enif_ioq_peek_head(ErlNifEnv *env, ErlNifIOQueue *q, size_t *size, ERL_NIF_TERM *bin_term)</nametext></name>
+      <fsummary>Peek the head of the IO Queue.</fsummary>
+      <desc>
+        <p>Get the head of the IO Queue as a binary term.</p>
+        <p>If <c>size</c> is not <c>NULL</c>, the size of the head is placed
+           there.</p>
+        <p>Nothing is removed from the queue by this function, that must be done
+           with <seealso marker="#enif_ioq_deq"><c>enif_ioq_deq</c></seealso>.</p>
+        <p>Returns <c>true</c> on success, or <c>false</c> if the queue is
+           empty.</p>
+      </desc>
+    </func>
+
+    <func>
       <name><ret>size_t</ret>
       <nametext>enif_ioq_size(ErlNifIOQueue *q)</nametext></name>
       <fsummary>Get the current size of the IO Queue</fsummary>
@@ -2760,6 +2793,20 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
+      <name><ret>void *</ret>
+        <nametext>enif_realloc(void* ptr, size_t size)</nametext></name>
+      <fsummary>Reallocate dynamic memory.</fsummary>
+      <desc>
+        <p>Reallocates memory allocated by
+          <seealso marker="#enif_alloc"><c>enif_alloc</c></seealso> to
+          <c>size</c> bytes.</p>
+        <p>Returns <c>NULL</c> if the reallocation fails.</p>
+        <p>The returned pointer is suitably aligned for any built-in type that
+          fit in the allocated memory.</p>
+      </desc>
+    </func>
+
+    <func>
       <name><ret>int</ret>
         <nametext>enif_realloc_binary(ErlNifBinary* bin, size_t size)</nametext>
       </name>
@@ -3028,9 +3075,10 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
       </name>
       <fsummary>Get the pid of the calling process.</fsummary>
       <desc>
-        <p>Initializes the pid variable <c>*pid</c> to represent the
-          calling process.</p>
-        <p>Returns <c>pid</c>.</p>
+        <p>Initializes the <seealso marker="#ErlNifPid"><c>ErlNifPid</c></seealso>
+	variable at <c>*pid</c> to represent the calling process.</p>
+        <p>Returns <c>pid</c> if successful, or NULL if <c>caller_env</c> is not
+	a <seealso marker="#ErlNifEnv">process-bound environment</seealso>.</p>
       </desc>
     </func>
 
@@ -3099,6 +3147,8 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
       <desc>
         <p>Similar to <c>snprintf</c> but this format string also accepts
           <c>"%T"</c>, which formats Erlang terms.</p>
+	<p>This function was originally intenden for debugging purpose. It is not
+	  recommended to print very large terms with <c>%T</c>.</p>
       </desc>
     </func>
 
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index d0588fe3c1..8250ca5aff 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -557,9 +557,7 @@ hello
       <name name="binary_to_term" arity="2"/>
       <fsummary>Decode an Erlang external term format binary.</fsummary>
       <desc>
-        <p>As <c>binary_to_term/1</c>, but takes options that affect decoding
-          of the binary.</p>
-        <p>Option:</p>
+        <p>As <c>binary_to_term/1</c>, but takes these options:</p>
         <taglist>
           <tag><c>safe</c></tag>
           <item>
@@ -575,18 +573,31 @@ hello
               creation of new external function references.
               None of those resources are garbage collected, so unchecked
               creation of them can exhaust available memory.</p>
-          </item>
-        </taglist>
-        <p>Failure: <c>badarg</c> if <c>safe</c> is specified and unsafe
-          data is decoded.</p>
         <pre>
-> <input>binary_to_term(&lt;&lt;131,100,0,5,104,101,108,108,111>>, [safe]).</input>
+> <input>binary_to_term(&lt;&lt;131,100,0,5,"hello">>, [safe]).</input>
 ** exception error: bad argument
 > <input>hello.</input>
 hello
-> <input>binary_to_term(&lt;&lt;131,100,0,5,104,101,108,108,111>>, [safe]).</input>
+> <input>binary_to_term(&lt;&lt;131,100,0,5,"hello">>, [safe]).</input>
 hello
 </pre>
+          </item>
+          <tag><c>used</c></tag>
+          <item>
+	    <p>Changes the return value to <c>{Term, Used}</c> where <c>Used</c>
+	    is the number of bytes actually read from <c>Binary</c>.</p>
+        <pre>
+> <input>Input = &lt;&lt;131,100,0,5,"hello","world">>.</input>
+&lt;&lt;131,100,0,5,104,101,108,108,111,119,111,114,108,100>>
+> <input>{Term, Used} = binary_to_term(Input, [used]).</input>
+{hello, 9}
+> <input>split_binary(Input, Used).</input>
+{&lt;&lt;131,100,0,5,104,101,108,108,111>>, &lt;&lt;"world">>}
+</pre>
+          </item>
+        </taglist>
+        <p>Failure: <c>badarg</c> if <c>safe</c> is specified and unsafe
+          data is decoded.</p>
         <p>See also
           <seealso marker="#term_to_binary/1"><c>term_to_binary/1</c></seealso>,
           <seealso marker="#binary_to_term/1">
@@ -1433,11 +1444,14 @@ b</pre>
           the process to terminate, it has no return value. Example:</p>
         <pre>
 > <input>catch error(foobar).</input>
-{'EXIT',{foobar,[{erl_eval,do_apply,5},
-                 {erl_eval,expr,5},
-                 {shell,exprs,6},
-                 {shell,eval_exprs,6},
-                 {shell,eval_loop,3}]}}</pre>
+{'EXIT',{foobar,[{shell,apply_fun,3,
+                        [{file,"shell.erl"},{line,906}]},
+                 {erl_eval,do_apply,6,[{file,"erl_eval.erl"},{line,677}]},
+                 {erl_eval,expr,5,[{file,"erl_eval.erl"},{line,430}]},
+                 {shell,exprs,7,[{file,"shell.erl"},{line,687}]},
+                 {shell,eval_exprs,7,[{file,"shell.erl"},{line,642}]},
+                 {shell,eval_loop,3,[{file,"shell.erl"},{line,627}]}]}}
+</pre>
       </desc>
     </func>
 
@@ -1974,39 +1988,26 @@ true</pre>
       <fsummary>Get the call stack back-trace of the last exception.</fsummary>
       <type name="stack_item"/>
       <desc>
-        <p>Gets the call stack back-trace (<em>stacktrace</em>) for an
-          exception that has just been caught
-	  in the calling process as a list of
-          <c>{<anno>Module</anno>,<anno>Function</anno>,<anno>Arity</anno>,<anno>Location</anno>}</c>
-          tuples. Field <c><anno>Arity</anno></c> in the first tuple can be the
-          argument list of that function call instead of an arity integer,
-          depending on the exception.</p>
-        <p>If there has not been any exceptions in a process, the
-          stacktrace is <c>[]</c>. After a code change for the process,
-          the stacktrace can also be reset to <c>[]</c>.</p>
-	<p><c>erlang:get_stacktrace/0</c> is only guaranteed to return
-	a stacktrace if called (directly or indirectly) from within the
-	scope of a <c>try</c> expression. That is, the following call works:</p>
+	<warning><p><c>erlang:get_stacktrace/0</c> is deprecated and will stop working
+	in a future release.</p></warning>
+      <p>Instead of using <c>erlang:get_stacktrace/0</c> to retrieve
+      the call stack back-trace, use the following syntax:</p>
 <pre>
 try Expr
 catch
-  C:R ->
-   {C,R,erlang:get_stacktrace()}
+  Class:Reason:Stacktrace ->
+   {Class,Reason,Stacktrace}
 end</pre>
-	<p>As does this call:</p>
-<pre>
-try Expr
-catch
-  C:R ->
-   {C,R,helper()}
-end
-
-helper() ->
-  erlang:get_stacktrace().</pre>
-
-        <warning><p>In a future release,
-        <c>erlang:get_stacktrace/0</c> will return <c>[]</c> if called
-        from outside a <c>try</c> expression.</p></warning>
+        <p><c>erlang:get_stacktrace/0</c> retrieves the call stack back-trace
+        (<em>stacktrace</em>) for an exception that has just been
+        caught in the calling process as a list of
+        <c>{<anno>Module</anno>,<anno>Function</anno>,<anno>Arity</anno>,<anno>Location</anno>}</c>
+        tuples. Field <c><anno>Arity</anno></c> in the first tuple can
+        be the argument list of that function call instead of an arity
+        integer, depending on the exception.</p>
+        <p>If there has not been any exceptions in a process, the
+          stacktrace is <c>[]</c>. After a code change for the process,
+          the stacktrace can also be reset to <c>[]</c>.</p>
         <p>The stacktrace is the same data as operator <c>catch</c>
           returns, for example:</p>
         <pre>
@@ -3110,7 +3111,10 @@ os_prompt%</pre>
             <p>The total amount of memory currently allocated for
               the emulator that is not directly related to any Erlang
               process. Memory presented as <c>processes</c> is not
-              included in this memory.</p>
+              included in this memory. <seealso marker="tools:instrument">
+              <c>instrument(3)</c></seealso> can be used to
+              get a more detailed breakdown of what memory is part
+              of this type.</p>
           </item>
           <tag><c>atom</c></tag>
           <item>
@@ -3347,25 +3351,6 @@ RealSystem = system + MissedSystem</code>
               monitored process resides). </p></item>
         </taglist>
 
-        <p>If an attempt is made to monitor a process on an older node
-          (where remote process monitoring is not implemented or
-          where remote process monitoring by registered name is not
-          implemented), the call fails with <c>badarg</c>.</p>
-        <note>
-          <p>The format of the <c>'DOWN'</c> message changed in ERTS
-            5.2 (Erlang/OTP R9B) for monitoring
-            <em>by registered name</em>. Element <c>Object</c> of
-            the <c>'DOWN'</c> message could in earlier versions
-            sometimes be the process identifier of the monitored process and sometimes
-            be the registered name. Now element <c>Object</c> is
-            always a tuple consisting of the registered name and
-            the node name. Processes on new nodes (ERTS 5.2
-            or higher versions) always get <c>'DOWN'</c> messages on
-            the new format even if they are monitoring processes on old
-            nodes. Processes on old nodes always get <c>'DOWN'</c>
-            messages on the old format.</p>
-        </note>
-
         <taglist>
         <tag>Monitoring a <marker id="monitor_process"/><c>process</c></tag>
         <item>
@@ -3373,7 +3358,19 @@ RealSystem = system + MissedSystem</code>
             process identified by <c><anno>Item</anno></c>, which can be a
             <c>pid()</c> (local or remote), an atom <c>RegisteredName</c> or
             a tuple <c>{RegisteredName, Node}</c> for a registered process,
-            located elsewhere.</p>
+          located elsewhere.</p>
+
+        <note><p>Before ERTS 10.0 (OTP 21.0), monitoring a process could fail with
+	  <c>badarg</c> if the monitored process resided on a primitive node
+	  (such as erl_interface or jinterface), where remote process monitoring
+	  is not implemented.</p>
+	  <p>Now, such a call to <c>monitor</c> will instead succeed and a
+	  monitor is created. But the monitor will only supervise the
+	  connection. That is, a <c>{'DOWN', _, process, _, noconnection}</c> is
+	  the only message that may be received, as the primitive node have no
+	  way of reporting the status of the monitored process.</p>
+	</note>
+
         </item>
 
         <tag>Monitoring a <marker id="monitor_port"/><c>port</c></tag>
@@ -4730,11 +4727,11 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_flag" arity="2" clause_i="3"/>
+      <name name="process_flag" arity="2" clause_i="3"
+	    anchor="process_flag_min_heap_size"/>
       <fsummary>Set process flag min_heap_size for the calling process.
       </fsummary>
       <desc>
-        <marker id="process_flag_min_heap_size"/>
         <p>Changes the minimum heap size for the calling process.</p>
         <p>Returns the old value of the flag.</p>
       </desc>
@@ -4752,12 +4749,12 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_flag" arity="2" clause_i="5"/>
+      <name name="process_flag" arity="2" clause_i="5"
+	    anchor="process_flag_max_heap_size"/>
       <fsummary>Set process flag max_heap_size for the calling process.
       </fsummary>
       <type name="max_heap_size"/>
       <desc>
-        <marker id="process_flag_max_heap_size"/>
         <p>This flag sets the maximum heap size for the calling process.
           If <c><anno>MaxHeapSize</anno></c> is an integer, the system default
           values for <c>kill</c> and <c>error_logger</c> are used.
@@ -4826,12 +4823,12 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_flag" arity="2" clause_i="6"/>
+      <name name="process_flag" arity="2" clause_i="6"
+	    anchor="process_flag_message_queue_data"/>
       <fsummary>Set process flag message_queue_data for the calling process.
       </fsummary>
       <type name="message_queue_data"/>
       <desc>
-        <marker id="process_flag_message_queue_data"/>
         <p>This flag determines how messages in the message queue
           are stored, as follows:</p>
         <taglist>
@@ -4853,7 +4850,7 @@ RealSystem = system + MissedSystem</code>
         <p>The default <c>message_queue_data</c> process flag is determined
           by command-line argument <seealso marker="erl#+hmqd">
           <c>+hmqd</c></seealso> in <c>erl(1)</c>.</p>
-        <p>If the process potentially can get many messages,
+        <p>If the process potentially can get many messages in its queue,
           you are advised to set the flag to <c>off_heap</c>. This
           because a garbage collection with many messages placed on
           the heap can become extremely expensive and the process can
@@ -4868,11 +4865,12 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_flag" arity="2" clause_i="7"/>
+      <name name="process_flag" arity="2" clause_i="7"
+	    anchor="process_flag_priority"/>
       <fsummary>Set process flag priority for the calling process.</fsummary>
       <type name="priority_level"/>
       <desc>
-        <p><marker id="process_flag_priority"></marker>
+        <p>
           Sets the process priority. <c><anno>Level</anno></c> is an atom.
           Four priority levels exist: <c>low</c>,
           <c>normal</c>, <c>high</c>, and <c>max</c>. Default
@@ -5124,11 +5122,15 @@ RealSystem = system + MissedSystem</code>
           <tag><c>{binary, <anno>BinInfo</anno>}</c></tag>
           <item>
             <p><c><anno>BinInfo</anno></c> is a list containing miscellaneous
-              information about binaries currently referred to by this
-              process. This <c><anno>InfoTuple</anno></c> can be changed or
+              information about binaries on the heap of this
+              process.
+              This <c><anno>InfoTuple</anno></c> can be changed or
               removed without prior notice. In the current implementation
               <c><anno>BinInfo</anno></c> is a list of tuples. The tuples
               contain; <c>BinaryId</c>, <c>BinarySize</c>, <c>BinaryRefcCount</c>.</p>
+            <p>The message queue is on the heap depending on the
+              process flag <seealso marker="#process_flag_message_queue_data">
+            <c>message_queue_data</c></seealso>.</p>
           </item>
           <tag><c>{catchlevel, <anno>CatchLevel</anno>}</c></tag>
           <item>
@@ -5698,11 +5700,17 @@ true</pre>
       <type name="dst"/>
       <desc>
         <p>Sends a message and returns <c><anno>Msg</anno></c>. This
-          is the same as <c><anno>Dest</anno> ! <anno>Msg</anno></c>.</p>
+        is the same as using the <seealso marker="doc/reference_manual:expressions#send">
+	send operator</seealso>:
+	<c><anno>Dest</anno> ! <anno>Msg</anno></c>.</p>
         <p><c><anno>Dest</anno></c> can be a remote or local process identifier,
           a (local) port, a locally registered name, or a tuple
           <c>{<anno>RegName</anno>, <anno>Node</anno>}</c>
-          for a registered name at another node.</p>
+        for a registered name at another node.</p>
+	<p>The function fails with a <c>badarg</c> run-time error if
+	<c><anno>Dest</anno></c> is an atom name, but this name is not
+	registered. This is the only case when <c>send</c> fails for an
+	unreachable destination <c><anno>Dest</anno></c> (of correct type).</p>
       </desc>
     </func>
 
@@ -6347,10 +6355,10 @@ true</pre>
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="1"/>
+      <name name="statistics" arity="1" clause_i="1"
+	    anchor="statistics_active_tasks"/>
       <fsummary>Information about active processes and ports.</fsummary>
       <desc>
-        <marker id="statistics_active_tasks"></marker>
         <p>Returns the same as
 	<seealso marker="#statistics_active_tasks_all">
         <c>statistics(active_tasks_all)</c></seealso>
@@ -6362,10 +6370,10 @@ true</pre>
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="2"/>
+      <name name="statistics" arity="1" clause_i="2"
+	    anchor="statistics_active_tasks_all"/>
       <fsummary>Information about active processes and ports.</fsummary>
       <desc>
-        <marker id="statistics_active_tasks_all"></marker>
         <p>Returns a list where each element represents the amount
           of active processes and ports on each run queue and its
           associated schedulers. That is, the number of processes and
@@ -6413,10 +6421,10 @@ true</pre>
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="4"/>
+      <name name="statistics" arity="1" clause_i="4"
+	    anchor="statistics_exact_reductions"/>
       <fsummary>Information about exact reductions.</fsummary>
       <desc>
-        <marker id="statistics_exact_reductions"></marker>
         <p>Returns the number of exact reductions.</p>
         <note>
           <p><c>statistics(exact_reductions)</c> is
@@ -6451,10 +6459,10 @@ true</pre>
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="7"/>
+      <name name="statistics" arity="1" clause_i="7"
+	    anchor="statistics_microstate_accounting"/>
       <fsummary>Information about microstate accounting.</fsummary>
       <desc>
-        <marker id="statistics_microstate_accounting"></marker>
         <p>Microstate accounting can be used to measure how much time the Erlang
           runtime system spends doing various tasks. It is designed to be as
           lightweight as possible, but some overhead exists when this
@@ -6594,10 +6602,10 @@ lists:map(
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="8"/>
+      <name name="statistics" arity="1" clause_i="8"
+	    anchor="statistics_reductions"/>
       <fsummary>Information about reductions.</fsummary>
       <desc>
-        <marker id="statistics_reductions"></marker>
         <p>Returns information about reductions, for example:</p>
         <pre>
 > <input>statistics(reductions).</input>
@@ -6613,9 +6621,10 @@ lists:map(
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="9"/>
+      <name name="statistics" arity="1" clause_i="9"
+	    anchor="statistics_run_queue"/>
       <fsummary>Information about the run-queues.</fsummary>
-      <desc><marker id="statistics_run_queue"></marker>
+      <desc>
         <p>Returns the total length of all normal run-queues. That is, the number
           of processes and ports that are ready to run on all available
           normal run-queues. Dirty run queues are not part of the
@@ -6629,9 +6638,10 @@ lists:map(
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="10"/>
+      <name name="statistics" arity="1" clause_i="10"
+	    anchor="statistics_run_queue_lengths"/>
       <fsummary>Information about the run-queue lengths.</fsummary>
-      <desc><marker id="statistics_run_queue_lengths"></marker>
+      <desc>
         <p>Returns the same as
 	<seealso marker="#statistics_run_queue_lengths_all">
         <c>statistics(run_queue_lengths_all)</c></seealso>
@@ -6643,9 +6653,10 @@ lists:map(
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="11"/>
+      <name name="statistics" arity="1" clause_i="11"
+	    anchor="statistics_run_queue_lengths_all"/>
       <fsummary>Information about the run-queue lengths.</fsummary>
-      <desc><marker id="statistics_run_queue_lengths_all"></marker>
+      <desc>
         <p>Returns a list where each element represents the amount
           of processes and ports ready to run for each run queue.
 	  Values for normal run queues are located first in the
@@ -6703,10 +6714,10 @@ lists:map(
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="13"/>
+      <name name="statistics" arity="1" clause_i="13"
+	    anchor="statistics_scheduler_wall_time"/>
       <fsummary>Information about each schedulers work time.</fsummary>
       <desc>
-        <marker id="statistics_scheduler_wall_time"></marker>
         <p>Returns a list of tuples with
           <c>{<anno>SchedulerId</anno>, <anno>ActiveTime</anno>,
           <anno>TotalTime</anno>}</c>, where
@@ -6748,17 +6759,20 @@ lists:map(
 	be included in the result. That is, all scheduler threads
 	that are expected to handle CPU bound work. If you also
 	want information about dirty I/O schedulers, use
-	<seealso marker="#statistics_scheduler_wall_time_all"><c>statistics(scheduler_wall_time_all)</c></seealso>
+	<seealso marker="#statistics_scheduler_wall_time_all">
+        <c>statistics(scheduler_wall_time_all)</c></seealso>
 	instead.</p>
 	
 	<p>Normal schedulers will have scheduler identifiers in
 	the range <c>1 =&lt; <anno>SchedulerId</anno> =&lt;
-	</c><seealso marker="#system_info_schedulers"><c>erlang:system_info(schedulers)</c></seealso>.
+	</c><seealso marker="#system_info_schedulers">
+        <c>erlang:system_info(schedulers)</c></seealso>.
 	Dirty CPU schedulers will have scheduler identifiers in
 	the range <c>erlang:system_info(schedulers) &lt;
 	<anno>SchedulerId</anno> =&lt; erlang:system_info(schedulers)
 	+
-	</c><seealso marker="#system_info_dirty_cpu_schedulers"><c>erlang:system_info(dirty_cpu_schedulers)</c></seealso>.
+	</c><seealso marker="#system_info_dirty_cpu_schedulers">
+        <c>erlang:system_info(dirty_cpu_schedulers)</c></seealso>.
 	</p>
 	<note><p>The different types of schedulers handle
 	specific types of jobs. Every job is assigned to a specific
@@ -6824,23 +6838,26 @@ ok
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="14"/>
+      <name name="statistics" arity="1" clause_i="14"
+	    anchor="statistics_scheduler_wall_time_all"/>
       <fsummary>Information about each schedulers work time.</fsummary>
       <desc>
-        <marker id="statistics_scheduler_wall_time_all"></marker>
 	<p>The same as
 	<seealso marker="#statistics_scheduler_wall_time"><c>statistics(scheduler_wall_time)</c></seealso>,
 	except that it also include information about all dirty I/O
 	schedulers.</p>
 	<p>Dirty IO schedulers will have scheduler identifiers in
 	the range
-	<seealso marker="#system_info_schedulers"><c>erlang:system_info(schedulers)</c></seealso><c>
+	<seealso marker="#system_info_schedulers">
+          <c>erlang:system_info(schedulers)</c></seealso><c>
 	+
-	</c><seealso marker="#system_info_dirty_cpu_schedulers"><c>erlang:system_info(dirty_cpu_schedulers)</c></seealso><c> &lt;
+	</c><seealso marker="#system_info_dirty_cpu_schedulers">
+        <c>erlang:system_info(dirty_cpu_schedulers)</c></seealso><c> &lt;
 	<anno>SchedulerId</anno> =&lt; erlang:system_info(schedulers)
 	+ erlang:system_info(dirty_cpu_schedulers)
 	+
-	</c><seealso marker="#system_info_dirty_io_schedulers"><c>erlang:system_info(dirty_io_schedulers)</c></seealso>.</p>
+	</c><seealso marker="#system_info_dirty_io_schedulers">
+        <c>erlang:system_info(dirty_io_schedulers)</c></seealso>.</p>
 	<note><p>Note that work executing on dirty I/O schedulers
 	are expected to mainly wait for I/O. That is, when you
 	get high scheduler utilization on dirty I/O schedulers,
@@ -6849,9 +6866,10 @@ ok
       </desc>
     </func>
     <func>
-      <name name="statistics" arity="1" clause_i="15"/>
+      <name name="statistics" arity="1" clause_i="15"
+	    anchor="statistics_total_active_tasks"/>
       <fsummary>Information about active processes and ports.</fsummary>
-      <desc><marker id="statistics_total_active_tasks"></marker>
+      <desc>
         <p>The same as calling
 	<c>lists:sum(</c><seealso marker="#statistics_active_tasks"><c>statistics(active_tasks)</c></seealso><c>)</c>,
 	but more efficient.</p>
@@ -6859,9 +6877,10 @@ ok
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="16"/>
+      <name name="statistics" arity="1" clause_i="16"
+	    anchor="statistics_total_active_tasks_all"/>
       <fsummary>Information about active processes and ports.</fsummary>
-      <desc><marker id="statistics_total_active_tasks_all"></marker>
+      <desc>
         <p>The same as calling
 	<c>lists:sum(</c><seealso marker="#statistics_active_tasks_all"><c>statistics(active_tasks_all)</c></seealso><c>)</c>,
 	but more efficient.</p>
@@ -6869,9 +6888,10 @@ ok
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="17"/>
+      <name name="statistics" arity="1" clause_i="17"
+	    anchor="statistics_total_run_queue_lengths"/>
       <fsummary>Information about the run-queue lengths.</fsummary>
-      <desc><marker id="statistics_total_run_queue_lengths"></marker>
+      <desc>
         <p>The same as calling
 	<c>lists:sum(</c><seealso marker="#statistics_run_queue_lengths"><c>statistics(run_queue_lengths)</c></seealso><c>)</c>,
 	but more efficient.</p>
@@ -6879,9 +6899,10 @@ ok
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="18"/>
+      <name name="statistics" arity="1" clause_i="18"
+	    anchor="statistics_total_run_queue_lengths_all"/>
       <fsummary>Information about the run-queue lengths.</fsummary>
-      <desc><marker id="statistics_total_run_queue_lengths_all"></marker>
+      <desc>
         <p>The same as calling
 	<c>lists:sum(</c><seealso marker="#statistics_run_queue_lengths_all"><c>statistics(run_queue_lengths_all)</c></seealso><c>)</c>,
 	but more efficient.</p>
@@ -7029,7 +7050,8 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="2"/>
+      <name name="system_flag" arity="2" clause_i="2"
+	    anchor="system_flag_cpu_topology"/>
       <fsummary>Set system flag <c>cpu_topology</c>.</fsummary>
       <type name="cpu_topology"/>
       <type name="level_entry"/>
@@ -7038,7 +7060,7 @@ ok
       <type name="info_list"/>
       <desc>
         <warning>
-          <p><marker id="system_flag_cpu_topology"></marker>
+          <p>
             <em>This argument is deprecated.</em>
             Instead of using this argument, use command-line argument
             <seealso marker="erts:erl#+sct"><c>+sct</c></seealso> in
@@ -7076,10 +7098,11 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="3"/>
+      <name name="system_flag" arity="2" clause_i="3"
+	    anchor="system_flag_dirty_cpu_schedulers_online"/>
       <fsummary>Set system_flag_dirty_cpu_schedulers_online.</fsummary>
       <desc>
-        <p><marker id="system_flag_dirty_cpu_schedulers_online"></marker>
+        <p>
           Sets the number of dirty CPU schedulers online. Range is
           <c><![CDATA[1 <= DirtyCPUSchedulersOnline <= N]]></c>, where <c>N</c>
           is the smallest of the return values of
@@ -7105,6 +7128,23 @@ ok
 
     <func>
       <name name="system_flag" arity="2" clause_i="4"/>
+      <fsummary>Set system flag for erts_alloc.</fsummary>
+      <desc>
+        <p>Sets system flags for
+	<seealso marker="erts:erts_alloc"><c>erts_alloc(3)</c></seealso>.
+        <c><anno>Alloc</anno></c> is the allocator to affect, for example
+	<c>binary_alloc</c>. <c><anno>F</anno></c> is the flag to change and
+	<c><anno>V</anno></c> is the new value.</p>
+	<p>Only a subset of all <c>erts_alloc</c> flags can be changed
+	at run time. This subset is currently only the flag
+	<seealso marker="erts:erts_alloc#M_sbct"><c>sbct</c></seealso>.</p>
+        <p>Returns <c>ok</c> if the flag was set or <c>notsup</c> if not
+	supported by <c>erts_alloc</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="system_flag" arity="2" clause_i="5"/>
       <fsummary>Set system flag fullsweep_after.</fsummary>
       <desc>
         <p>Sets system flag <c>fullsweep_after</c>.
@@ -7123,10 +7163,11 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="5"/>
+      <name name="system_flag" arity="2" clause_i="6"
+	    anchor="system_flag_microstate_accounting"/>
       <fsummary>Set system flag microstate_accounting.</fsummary>
       <desc>
-        <p><marker id="system_flag_microstate_accounting"></marker>
+        <p>
           Turns on/off microstate accounting measurements. When passing reset,
           all counters are reset to 0.</p>
         <p>For more information see
@@ -7136,7 +7177,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="6"/>
+      <name name="system_flag" arity="2" clause_i="7"/>
       <fsummary>Set system flag min_heap_size.</fsummary>
       <desc>
         <p>Sets the default minimum heap size for processes. The size
@@ -7151,7 +7192,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="7"/>
+      <name name="system_flag" arity="2" clause_i="8"/>
       <fsummary>Set system flag min_bin_vheap_size.</fsummary>
       <desc>
         <p>Sets the default minimum binary virtual heap size for
@@ -7168,28 +7209,29 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="8"/>
+      <name name="system_flag" arity="2" clause_i="9"
+	    anchor="system_flag_max_heap_size"/>
       <fsummary>Set system flag max_heap_size.</fsummary>
       <type name="max_heap_size"/>
       <desc>
-        <marker id="system_flag_max_heap_size"></marker>
         <p>
           Sets the default maximum heap size settings for processes.
           The size is specified in words. The new <c>max_heap_size</c>
           effects only processes spawned efter the change has been made.
           <c>max_heap_size</c> can be set for individual processes using
           <seealso marker="#spawn_opt/4"><c>spawn_opt/2,3,4</c></seealso> or
-          <seealso marker="#process_flag_message_queue_data">
+          <seealso marker="#process_flag_max_heap_size">
           <c>process_flag/2</c></seealso>.</p>
         <p>Returns the old value of the flag.</p>
       </desc>
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="9"/>
+      <name name="system_flag" arity="2" clause_i="10"
+	    anchor="system_flag_multi_scheduling"/>
       <fsummary>Set system flag multi_scheduling.</fsummary>
       <desc>
-        <p><marker id="system_flag_multi_scheduling"></marker>
+        <p>
           If multi-scheduling is enabled, more than one scheduler
           thread is used by the emulator. Multi-scheduling can be
           blocked in two different ways. Either all schedulers but
@@ -7241,12 +7283,13 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="10"/>
+      <name name="system_flag" arity="2" clause_i="11"
+	    anchor="system_flag_scheduler_bind_type"/>
       <fsummary>Set system flag scheduler_bind_type.</fsummary>
       <type name="scheduler_bind_type"/>
       <desc>
         <warning>
-          <p><marker id="system_flag_scheduler_bind_type"></marker>
+          <p>
             <em>This argument is deprecated.</em>
             Instead of using this argument, use command-line argument
             <seealso marker="erts:erl#+sbt"><c>+sbt</c></seealso> in
@@ -7367,10 +7410,11 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="11"/>
+      <name name="system_flag" arity="2" clause_i="12"
+	    anchor="system_flag_scheduler_wall_time"/>
       <fsummary>Set system flag scheduler_wall_time.</fsummary>
       <desc>
-        <p><marker id="system_flag_scheduler_wall_time"></marker>
+        <p>
           Turns on or off scheduler wall time measurements.</p>
         <p>For more information, see
           <seealso marker="#statistics_scheduler_wall_time">
@@ -7379,10 +7423,11 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="12"/>
+      <name name="system_flag" arity="2" clause_i="13"
+	    anchor="system_flag_schedulers_online"/>
       <fsummary>Set system flag schedulers_online.</fsummary>
       <desc>
-        <p><marker id="system_flag_schedulers_online"></marker>
+        <p>
           Sets the number of schedulers online. Range is
           <c><![CDATA[1 <= SchedulersOnline <=
           erlang:system_info(schedulers)]]></c>.</p>
@@ -7407,7 +7452,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="13"/>
+      <name name="system_flag" arity="2" clause_i="14"/>
       <fsummary>Set system flag trace_control_word.</fsummary>
       <desc>
         <p>Sets the value of the node trace control word to
@@ -7421,10 +7466,11 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="14"/>
+      <name name="system_flag" arity="2" clause_i="15"
+	    anchor="system_flag_time_offset"/>
       <fsummary>Finalize the time offset.</fsummary>
       <desc>
-        <p><marker id="system_flag_time_offset"></marker>
+        <p>
           Finalizes the <seealso marker="#time_offset/0">time offset</seealso>
           when <seealso marker="time_correction#Single_Time_Warp_Mode">single
           time warp mode</seealso> is used. If another time warp mode
@@ -7450,11 +7496,144 @@ ok
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="1"/>
-      <name name="system_info" arity="1" clause_i="2"/>
-      <name name="system_info" arity="1" clause_i="3"/>
-      <name name="system_info" arity="1" clause_i="4"/>
-      <name name="system_info" arity="1" clause_i="5"/>
+      <name name="system_info" arity="1" clause_i="75"/>
+      <fsummary>System info overview.</fsummary>
+      <desc>
+        <p>Returns information about the current system.
+        The documentation of this function is broken into the following
+        sections in order to make it easier to navigate.</p>
+        <taglist>
+          <tag><seealso marker="#system_info_allocator">
+          <c>Memory Allocation</c></seealso></tag>
+          <item>
+            <p>
+              <seealso marker="#system_info_allocated_areas"><c>allocated_areas</c></seealso>,
+              <seealso marker="#system_info_allocator"><c>allocator</c></seealso>,
+              <seealso marker="#system_info_alloc_util_allocators"><c>alloc_util_allocators</c></seealso>,
+              <seealso marker="#system_info_allocator_sizes"><c>allocator_sizes</c></seealso>,
+              <seealso marker="#system_info_elib_malloc"><c>elib_malloc</c></seealso>
+            </p>
+          </item>
+          <tag><seealso marker="#system_info_cpu_topology">
+           <c>CPU Topology</c></seealso></tag>
+           <item>
+             <p>
+               <seealso marker="#system_info_cpu_topology"><c>cpu_topology</c></seealso>,
+               <seealso marker="#system_info_logical_processors"><c>logical_processors</c></seealso>,
+               <seealso marker="#system_info_update_cpu_info"><c>update_cpu_info</c></seealso>
+             </p>
+           </item>
+          <tag><seealso marker="#system_info_process">
+           <c>Process Information</c></seealso></tag>
+          <item>
+            <p>
+              <seealso marker="#system_info_fullsweep_after"><c>fullsweep_after</c></seealso>,
+              <seealso marker="#system_info_garbage_collection"><c>garbage_collection</c></seealso>,
+              <seealso marker="#system_info_heap_sizes"><c>heap_sizes</c></seealso>,
+              <seealso marker="#system_info_heap_type"><c>heap_type</c></seealso>,
+              <seealso marker="#system_info_max_heap_size"><c>max_heap_size</c></seealso>,
+              <seealso marker="#system_info_message_queue_data"><c>message_queue_data</c></seealso>,
+              <seealso marker="#system_info_min_heap_size"><c>min_heap_size</c></seealso>,
+              <seealso marker="#system_info_min_bin_vheap_size"><c>min_bin_vheap_size</c></seealso>,
+              <seealso marker="#system_info_procs"><c>procs</c></seealso>
+            </p>
+          </item>
+          <tag><seealso marker="#system_info_limits">
+           <c>System Limits</c></seealso></tag>
+          <item>
+            <p>
+              <seealso marker="#system_info_atom_count"><c>atom_count</c></seealso>,
+              <seealso marker="#system_info_atom_limit"><c>atom_limit</c></seealso>,
+              <seealso marker="#system_info_ets_limit"><c>ets_limit</c></seealso>,
+              <seealso marker="#system_info_port_count"><c>port_count</c></seealso>,
+              <seealso marker="#system_info_port_limit"><c>port_limit</c></seealso>,
+              <seealso marker="#system_info_process_count"><c>process_count</c></seealso>,
+              <seealso marker="#system_info_process_limit"><c>process_limit</c></seealso>
+            </p>
+          </item>
+          <tag><seealso marker="#system_info_time">
+           <c>System Time</c></seealso></tag>
+          <item>
+            <p>
+              <seealso marker="#system_info_end_time"><c>end_time</c></seealso>,
+              <seealso marker="#system_info_os_monotonic_time_source"><c>os_monotonic_time_source</c></seealso>,
+              <seealso marker="#system_info_os_system_time_source"><c>os_system_time_source</c></seealso>,
+              <seealso marker="#system_info_start_time"><c>start_time</c></seealso>,
+              <seealso marker="#system_info_time_correction"><c>time_correction</c></seealso>,
+              <seealso marker="#system_info_time_offset"><c>time_offset</c></seealso>,
+              <seealso marker="#system_info_time_warp_mode"><c>time_warp_mode</c></seealso>,
+              <seealso marker="#system_info_tolerant_timeofday"><c>tolerant_timeofday</c></seealso>
+            </p>
+          </item>
+          <tag><seealso marker="#system_info_scheduler">
+           <c>Scheduler Information</c></seealso></tag>
+          <item>
+            <p>
+              <seealso marker="#system_info_dirty_cpu_schedulers"><c>dirty_cpu_schedulers</c></seealso>,
+              <seealso marker="#system_info_dirty_cpu_schedulers_online"><c>dirty_cpu_schedulers_online</c></seealso>,
+              <seealso marker="#system_info_dirty_io_schedulers"><c>dirty_io_schedulers</c></seealso>,
+              <seealso marker="#system_info_multi_scheduling"><c>multi_scheduling</c></seealso>,
+              <seealso marker="#system_info_multi_scheduling_blockers"><c>multi_scheduling_blockers</c></seealso>,
+              <seealso marker="#system_info_normal_multi_scheduling_blockers"><c>normal_multi_scheduling_blockers</c></seealso>,
+              <seealso marker="#system_info_scheduler_bind_type"><c>scheduler_bind_type</c></seealso>,
+              <seealso marker="#system_info_scheduler_bindings"><c>scheduler_bindings</c></seealso>,
+              <seealso marker="#system_info_scheduler_id"><c>scheduler_id</c></seealso>,
+              <seealso marker="#system_info_schedulers"><c>schedulers</c></seealso>,
+              <seealso marker="#system_info_smp_support"><c>smp_support</c></seealso>,
+              <seealso marker="#system_info_threads"><c>threads</c></seealso>,
+              <seealso marker="#system_info_thread_pool_size"><c>thread_pool_size</c></seealso>
+            </p>
+          </item>
+          <tag><seealso marker="#system_info_dist">
+          <c>Distribution Information</c></seealso></tag>
+          <item>
+            <p>
+              <seealso marker="#system_info_creation"><c>creation</c></seealso>,
+              <seealso marker="#system_info_delayed_node_table_gc"><c>delayed_node_table_gc</c></seealso>,
+              <seealso marker="#system_info_dist"><c>dist</c></seealso>,
+              <seealso marker="#system_info_dist_buf_busy_limit"><c>dist_buf_busy_limit</c></seealso>,
+              <seealso marker="#system_info_dist_ctrl"><c>dist_ctrl</c></seealso>
+            </p>
+          </item>
+          <tag><seealso marker="#system_info_misc">
+           <c>System Information</c></seealso></tag>
+          <item>
+            <p>
+              <seealso marker="#system_info_build_type"><c>build_type</c></seealso>,
+              <seealso marker="#system_info_c_compiler_used"><c>c_compiler_used</c></seealso>,
+              <seealso marker="#system_info_check_io"><c>check_io</c></seealso>,
+              <seealso marker="#system_info_compat_rel"><c>compat_rel</c></seealso>,
+              <seealso marker="#system_info_debug_compiled"><c>debug_compiled</c></seealso>,
+              <seealso marker="#system_info_driver_version"><c>driver_version</c></seealso>,
+              <seealso marker="#system_info_dynamic_trace"><c>dynamic_trace</c></seealso>,
+              <seealso marker="#system_info_dynamic_trace_probes"><c>dynamic_trace_probes</c></seealso>,
+              <seealso marker="#system_info_info"><c>info</c></seealso>,
+              <seealso marker="#system_info_kernel_poll"><c>kernel_poll</c></seealso>,
+              <seealso marker="#system_info_loaded"><c>loaded</c></seealso>,
+              <seealso marker="#system_info_machine"><c>machine</c></seealso>,
+              <seealso marker="#system_info_modified_timing_level"><c>modified_timing_level</c></seealso>,
+              <seealso marker="#system_info_nif_version"><c>nif_version</c></seealso>,
+              <seealso marker="#system_info_otp_release"><c>otp_release</c></seealso>,
+              <seealso marker="#system_info_port_parallelism"><c>port_parallelism</c></seealso>,
+              <seealso marker="#system_info_system_version"><c>system_version</c></seealso>,
+              <seealso marker="#system_info_system_architecture"><c>system_architecture</c></seealso>,
+              <seealso marker="#system_info_trace_control_word"><c>trace_control_word</c></seealso>,
+              <seealso marker="#system_info_version"><c>version</c></seealso>,
+              <seealso marker="#system_info_wordsize"><c>wordsize</c></seealso>
+            </p>
+          </item>
+        </taglist>
+      </desc>
+    </func>
+
+    <func>
+      <name name="system_info" arity="1" clause_i="1"
+	    anchor="system_info_allocator"/>   <!-- allocated_areas -->
+      <name name="system_info" arity="1" clause_i="2"/>   <!-- allocator -->
+      <name name="system_info" arity="1" clause_i="3"/>   <!-- {allocator, _} -->
+      <name name="system_info" arity="1" clause_i="4"/>   <!-- alloc_util_allocators -->
+      <name name="system_info" arity="1" clause_i="5"/>   <!-- {allocator_sizes, _} -->
+      <name name="system_info" arity="1" clause_i="27"/>  <!-- elib_malloc -->
       <fsummary>Information about the system allocators.</fsummary>
       <type variable="Allocator" name_i="2"/>
       <type variable="Version" name_i="2"/>
@@ -7463,12 +7642,13 @@ ok
       <type variable="Alloc" name_i="3"/>
       <desc>
         <marker id="system_info_allocator_tags"></marker>
-        <p>Returns various information about the allocators of the
-          current system (emulator) as specified by
+        <p>Returns various information about the memory allocators
+          of the current system (emulator) as specified by
           <c><anno>Item</anno></c>:</p>
         <marker id="system_info_allocated_areas"></marker>
         <taglist>
-          <tag><c>allocated_areas</c></tag>
+          <tag><marker id="system_info_allocated_areas"/>
+            <c>allocated_areas</c></tag>
           <item>
             <p>Returns a list of tuples with information about
               miscellaneous allocated memory areas.</p>
@@ -7490,9 +7670,9 @@ ok
               <seealso marker="#memory/0">
               <c>erlang:memory/0,1</c></seealso>.</p>
           </item>
-          <tag><c>allocator</c></tag>
+          <tag><marker id="system_info_allocator"/>
+            <c>allocator</c></tag>
           <item>
-            <marker id="system_info_allocator"></marker>
             <p>Returns <c>{<anno>Allocator</anno>, <anno>Version</anno>,
               <anno>Features</anno>, <anno>Settings</anno></c>, where:</p>
             <list type="bulleted">
@@ -7525,19 +7705,9 @@ ok
               <seealso marker="erts:erts_alloc#flags">
               <c>erts_alloc(3)</c></seealso>.</p>
           </item>
-          <tag><c>alloc_util_allocators</c></tag>
-          <item>
-            <marker id="system_info_alloc_util_allocators"></marker>
-            <p>Returns a list of the names of all allocators using
-              the ERTS internal <c>alloc_util</c> framework
-              as atoms. For more information, see section
-              <seealso marker="erts:erts_alloc#alloc_util">The
-              alloc_util framework</seealso>
-              in <c>erts_alloc(3)</c>.</p>
-          </item>
-          <tag><c>{allocator, <anno>Alloc</anno>}</c></tag>
+          <tag><marker id="system_info_allocator_tuple"></marker>
+            <c>{allocator, <anno>Alloc</anno>}</c></tag>
           <item>
-            <marker id="system_info_allocator_tuple"></marker>
             <p>Returns information about the specified allocator.
               As from ERTS 5.6.1, the return value is a list
               of <c>{instance, InstanceNo, InstanceInfo}</c> tuples,
@@ -7582,9 +7752,19 @@ ok
               values. The first value is the memory pool size and
               the second value is the used memory size.</p>
           </item>
-          <tag><c>{allocator_sizes, <anno>Alloc</anno>}</c></tag>
+          <tag><marker id="system_info_alloc_util_allocators"/>
+            <c>alloc_util_allocators</c></tag>
+          <item>
+            <p>Returns a list of the names of all allocators using
+              the ERTS internal <c>alloc_util</c> framework
+              as atoms. For more information, see section
+              <seealso marker="erts:erts_alloc#alloc_util">The
+              alloc_util framework</seealso>
+              in <c>erts_alloc(3)</c>.</p>
+          </item>
+          <tag><marker id="system_info_allocator_sizes"/>
+            <c>{allocator_sizes, <anno>Alloc</anno>}</c></tag>
           <item>
-            <marker id="system_info_allocator_sizes"></marker>
             <p>Returns various size information for the specified
               allocator. The information returned is a subset of the
               information returned by
@@ -7592,13 +7772,23 @@ ok
               <c>erlang:system_info({allocator,
               <anno>Alloc</anno>})</c></seealso>.</p>
           </item>
+          <tag><marker id="system_info_elib_malloc"/>
+            <c>elib_malloc</c></tag>
+          <item>
+            <p>This option will be removed in a future release.
+              The return value will always be <c>false</c>, as the
+              <c>elib_malloc</c> allocator has been removed.</p>
+          </item>
         </taglist>
       </desc>
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="12"/>
-      <name name="system_info" arity="1" clause_i="13"/>
+      <name name="system_info" arity="1" clause_i="12"
+	    anchor="system_info_cpu_topology"/>           <!-- cpu_topology -->
+      <name name="system_info" arity="1" clause_i="13"/>  <!-- {cpu_topology, _} -->
+      <name name="system_info" arity="1" clause_i="37"/>  <!-- logical_processors -->
+      <name name="system_info" arity="1" clause_i="72"/>  <!-- update_cpu_info -->
       <fsummary>Information about the CPU topology of the system.</fsummary>
       <type name="cpu_topology"/>
       <type name="level_entry"/>
@@ -7625,12 +7815,12 @@ ok
       </type_desc>
       <desc>
         <marker id="system_info_cpu_topology_tags"></marker>
-        <marker id="system_info_cpu_topology"></marker>
         <p>Returns various information about the CPU topology of
           the current system (emulator) as specified by
           <c><anno>Item</anno></c>:</p>
         <taglist>
-          <tag><c>cpu_topology</c></tag>
+          <tag><marker id="system_info_cpu_topology"/>
+            <c>cpu_topology</c></tag>
           <item>
             <p>Returns the <c><anno>CpuTopology</anno></c> currently used by
               the emulator. The CPU topology is used when binding schedulers
@@ -7693,31 +7883,89 @@ ok
               <seealso marker="#system_info_cpu_topology">
               <c>cpu_topology</c></seealso>.</p>
           </item>
+          <tag><marker id="system_info_logical_processors"/>
+            <c>logical_processors</c></tag>
+          <item>
+            <p>Returns the detected number of logical processors configured
+              in the system. The return value is either an integer, or
+              the atom <c>unknown</c> if the emulator cannot
+              detect the configured logical processors.</p>
+          </item>
+          <tag><marker id="system_info_logical_processors_available"/>
+            <c>logical_processors_available</c></tag>
+          <item>
+            <p>Returns the detected number of logical processors available
+              to the Erlang runtime system. The return value is either an
+              integer, or the atom <c>unknown</c> if the emulator
+              cannot detect the available logical processors. The number
+              of available logical processors is less than or equal to
+              the number of <seealso marker="#system_info_logical_processors_online">
+              logical processors online</seealso>.</p>
+          </item>
+          <tag><marker id="system_info_logical_processors_online"/>
+            <c>logical_processors_online</c></tag>
+          <item>
+            <p>Returns the detected number of logical processors online on
+              the system. The return value is either an integer,
+              or the atom <c>unknown</c> if the emulator cannot
+              detect logical processors online. The number of logical
+              processors online is less than or equal to the number of
+              <seealso marker="#system_info_logical_processors">logical processors
+              configured</seealso>.</p>
+          </item>
+          <tag><marker id="system_info_update_cpu_info"/>
+            <c>update_cpu_info</c></tag>
+          <item>
+            <p>The runtime system rereads the CPU information available
+              and updates its internally stored information about the
+              <seealso marker="#system_info_cpu_topology_detected">detected
+              CPU topology</seealso> and the number of logical processors
+              <seealso marker="#system_info_logical_processors">configured</seealso>,
+              <seealso marker="#system_info_logical_processors_online">online</seealso>,
+              and <seealso marker="#system_info_logical_processors_available">
+              available</seealso>.</p>
+            <p>If the CPU information has changed since the last time
+              it was read, the atom <c>changed</c> is returned, otherwise
+              the atom <c>unchanged</c>. If the CPU information has changed,
+              you probably want to
+              <seealso marker="#system_flag_schedulers_online">adjust the
+              number of schedulers online</seealso>. You typically want
+              to have as many schedulers online as
+              <seealso marker="#system_info_logical_processors_available">logical
+              processors available</seealso>.</p>
+          </item>
         </taglist>
       </desc>
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="29"/>
-      <name name="system_info" arity="1" clause_i="30"/>
-      <name name="system_info" arity="1" clause_i="38"/>
-      <name name="system_info" arity="1" clause_i="39"/>
-      <name name="system_info" arity="1" clause_i="40"/>
-      <name name="system_info" arity="1" clause_i="41"/>
+      <name name="system_info" arity="1" clause_i="30"
+	    anchor="system_info_process"/>  <!-- fullsweep_after -->
+      <name name="system_info" arity="1" clause_i="31"/>  <!-- garbage_collection -->
+      <name name="system_info" arity="1" clause_i="32"/>  <!-- heap_sizes -->
+      <name name="system_info" arity="1" clause_i="33"/>  <!-- heap_type -->
+      <name name="system_info" arity="1" clause_i="39"/>  <!-- max_heap_size -->
+      <name name="system_info" arity="1" clause_i="40"/>  <!-- message_queue_data -->
+      <name name="system_info" arity="1" clause_i="41"/>  <!-- min_heap_size -->
+      <name name="system_info" arity="1" clause_i="42"/>  <!-- min_bin_vheap_size -->
+      <name name="system_info" arity="1" clause_i="56"/>  <!-- procs -->
       <fsummary>Information about the default process heap settings.</fsummary>
       <type name="message_queue_data"/>
       <type name="max_heap_size"/>
       <desc>
+        <marker id="system_info_process_tags"/>
         <p>Returns information about the default process heap settings:</p>
         <taglist>
-          <tag><c>fullsweep_after</c></tag>
+          <tag><marker id="system_info_fullsweep_after"/>
+            <c>fullsweep_after</c></tag>
           <item>
             <p>Returns <c>{fullsweep_after, integer() >= 0}</c>, which is
               the <c>fullsweep_after</c> garbage collection setting used
               by default. For more information, see
               <c>garbage_collection</c> described below.</p>
           </item>
-          <tag><c>garbage_collection</c></tag>
+          <tag><marker id="system_info_garbage_collection"/>
+            <c>garbage_collection</c></tag>
           <item>
             <p>Returns a list describing the default garbage collection
               settings. A process spawned on the local node by a
@@ -7730,7 +7978,30 @@ ok
               can spawn a process that does not use the default
               settings.</p>
           </item>
-          <tag><c>max_heap_size</c></tag>
+          <tag><marker id="system_info_heap_sizes"/>
+            <c>heap_sizes</c></tag>
+          <item>
+            <p>Returns a list of integers representing valid heap sizes 
+              in words. All Erlang heaps are sized from sizes in this
+              list.</p>
+          </item>
+          <tag><marker id="system_info_heap_type"/>
+            <c>heap_type</c></tag>
+          <item>
+            <p>Returns the heap type used by the current emulator. One
+              heap type exists:</p>
+            <taglist>
+              <tag><c>private</c></tag>
+              <item>
+                Each process has a heap reserved for its use and no
+                references between heaps of different processes are
+                allowed. Messages passed between processes are copied
+                between heaps.
+              </item>
+            </taglist>
+          </item>
+          <tag><marker id="system_info_max_heap_size"/>
+            <c>max_heap_size</c></tag>
           <item>
             <p>Returns <c>{max_heap_size, <anno>MaxHeapSize</anno>}</c>,
               where <c><anno>MaxHeapSize</anno></c> is the current
@@ -7758,173 +8029,364 @@ ok
               <seealso marker="#process_flag_message_queue_data">
               <c>process_flag(message_queue_data, MQD)</c></seealso>.</p>
           </item>
-          <tag><c>min_heap_size</c></tag>
+          <tag><marker id="system_info_min_heap_size"/>
+            <c>min_heap_size</c></tag>
           <item>
             <p>Returns <c>{min_heap_size, <anno>MinHeapSize</anno>}</c>,
               where <c><anno>MinHeapSize</anno></c> is the current
               system-wide minimum heap size for spawned processes.</p>
           </item>
-          <tag><c>min_bin_vheap_size</c></tag>
+          <tag><marker id="system_info_min_bin_vheap_size"/>
+            <c>min_bin_vheap_size</c></tag>
           <item>
             <p>Returns <c>{min_bin_vheap_size,
               <anno>MinBinVHeapSize</anno>}</c>, where
               <c><anno>MinBinVHeapSize</anno></c> is the current system-wide
               minimum binary virtual heap size for spawned processes.</p>
           </item>
+          <tag><marker id="system_info_procs"/>
+            <c>procs</c></tag>
+          <item>
+            <p>Returns a binary containing a string of process and port
+              information formatted as in Erlang crash dumps. For more
+              information, see section <seealso marker="erts:crash_dump">
+              How to interpret the Erlang crash dumps</seealso>
+              in the User's Guide.</p>
+          </item>
         </taglist>
       </desc>
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="6"/>
-      <name name="system_info" arity="1" clause_i="7"/>
-      <name name="system_info" arity="1" clause_i="8"/>
-      <name name="system_info" arity="1" clause_i="9"/>
-      <name name="system_info" arity="1" clause_i="10"/>
-      <name name="system_info" arity="1" clause_i="11"/>
-      <name name="system_info" arity="1" clause_i="14"/>
-      <name name="system_info" arity="1" clause_i="15"/>
-      <name name="system_info" arity="1" clause_i="16"/>
-      <name name="system_info" arity="1" clause_i="17"/>
-      <name name="system_info" arity="1" clause_i="18"/>
-      <name name="system_info" arity="1" clause_i="19"/>
-      <name name="system_info" arity="1" clause_i="20"/>
-      <name name="system_info" arity="1" clause_i="21"/>
-      <name name="system_info" arity="1" clause_i="22"/>
-      <name name="system_info" arity="1" clause_i="23"/>
-      <name name="system_info" arity="1" clause_i="24"/>
-      <name name="system_info" arity="1" clause_i="25"/>
-      <name name="system_info" arity="1" clause_i="26"/>
-      <name name="system_info" arity="1" clause_i="27"/>
-      <name name="system_info" arity="1" clause_i="28"/>
-      <name name="system_info" arity="1" clause_i="31"/>
-      <name name="system_info" arity="1" clause_i="32"/>
-      <name name="system_info" arity="1" clause_i="33"/>
-      <name name="system_info" arity="1" clause_i="34"/>
-      <name name="system_info" arity="1" clause_i="35"/>
-      <name name="system_info" arity="1" clause_i="36"/>
-      <name name="system_info" arity="1" clause_i="37"/>
-      <name name="system_info" arity="1" clause_i="42"/>
-      <name name="system_info" arity="1" clause_i="43"/>
-      <name name="system_info" arity="1" clause_i="44"/>
-      <name name="system_info" arity="1" clause_i="45"/>
-      <name name="system_info" arity="1" clause_i="46"/>
-      <name name="system_info" arity="1" clause_i="47"/>
-      <name name="system_info" arity="1" clause_i="48"/>
-      <name name="system_info" arity="1" clause_i="49"/>
-      <name name="system_info" arity="1" clause_i="50"/>
-      <name name="system_info" arity="1" clause_i="51"/>
-      <name name="system_info" arity="1" clause_i="52"/>
-      <name name="system_info" arity="1" clause_i="53"/>
-      <name name="system_info" arity="1" clause_i="54"/>
-      <name name="system_info" arity="1" clause_i="55"/>
-      <name name="system_info" arity="1" clause_i="56"/>
-      <name name="system_info" arity="1" clause_i="57"/>
-      <name name="system_info" arity="1" clause_i="58"/>
-      <name name="system_info" arity="1" clause_i="59"/>
-      <name name="system_info" arity="1" clause_i="60"/>
-      <name name="system_info" arity="1" clause_i="61"/>
-      <name name="system_info" arity="1" clause_i="62"/>
-      <name name="system_info" arity="1" clause_i="63"/>
-      <name name="system_info" arity="1" clause_i="64"/>
-      <name name="system_info" arity="1" clause_i="65"/>
-      <name name="system_info" arity="1" clause_i="66"/>
-      <name name="system_info" arity="1" clause_i="67"/>
-      <name name="system_info" arity="1" clause_i="68"/>
-      <name name="system_info" arity="1" clause_i="69"/>
-      <name name="system_info" arity="1" clause_i="70"/>
-      <name name="system_info" arity="1" clause_i="71"/>
-      <fsummary>Information about the system.</fsummary>
+      <name name="system_info" arity="1" clause_i="6"
+	    anchor="system_info_limits"/>   <!-- atom_count -->
+      <name name="system_info" arity="1" clause_i="7"/>   <!-- atom_limit -->
+      <name name="system_info" arity="1" clause_i="29"/>  <!-- ets_limit -->
+      <name name="system_info" arity="1" clause_i="52"/>  <!-- port_count -->
+      <name name="system_info" arity="1" clause_i="53"/>  <!-- port_limit -->
+      <name name="system_info" arity="1" clause_i="54"/>  <!-- process_count -->
+      <name name="system_info" arity="1" clause_i="55"/>  <!-- process_limit -->
+      <fsummary>Information about various system limits.</fsummary>
       <desc>
-        <p>Returns various information about the current system
-          (emulator) as specified by <c><anno>Item</anno></c>:</p>
+        <marker id="system_info_limits"/>
+        <p>Returns information about the current system
+        (emulator) limits as specified by <c><anno>Item</anno></c>:</p>
         <taglist>
-          <tag><c>atom_count</c></tag>
+          <tag><marker id="system_info_atom_count"/>
+            <c>atom_count</c></tag>
           <item>
-            <marker id="system_info_atom_count"></marker>
             <p>Returns the number of atoms currently existing at the
-              local node. The value is given as an integer.</p>
+            local node. The value is given as an integer.</p>
           </item>
-          <tag><c>atom_limit</c></tag>
+          <tag><marker id="system_info_atom_limit"/>
+            <c>atom_limit</c></tag>
           <item>
-            <marker id="system_info_atom_limit"></marker>
             <p>Returns the maximum number of atoms allowed.
-              This limit can be increased at startup by passing
-              command-line flag
-              <seealso marker="erts:erl#+t"><c>+t</c></seealso> to
-              <c>erl(1)</c>.
+            This limit can be increased at startup by passing
+            command-line flag
+            <seealso marker="erts:erl#+t"><c>+t</c></seealso> to
+            <c>erl(1)</c>.
             </p>
           </item>
-          <tag><c>build_type</c></tag>
+          <tag><marker id="system_info_ets_limit"/>
+            <c>ets_limit</c></tag>
           <item>
-            <p>Returns an atom describing the build type of the runtime
-              system. This is normally the atom <c>opt</c> for optimized.
-              Other possible return values are <c>debug</c>, <c>purify</c>,
-              <c>quantify</c>, <c>purecov</c>, <c>gcov</c>, <c>valgrind</c>,
-              <c>gprof</c>, and <c>lcnt</c>. Possible return values
-              can be added or removed at any time without prior notice.</p>
+            <p>Returns the maximum number of ETS tables allowed. This
+              limit can be increased at startup by passing
+              command-line flag
+              <seealso marker="erts:erl#+e"><c>+e</c></seealso> to
+              <c>erl(1)</c> or by setting environment variable
+              <c>ERL_MAX_ETS_TABLES</c> before starting the Erlang
+              runtime system.</p>
           </item>
-          <tag><c>c_compiler_used</c></tag>
+          <tag><marker id="system_info_port_count"/><c>port_count</c></tag>
           <item>
-            <p>Returns a two-tuple describing the C compiler used when
-              compiling the runtime system. The first element is an
-              atom describing the name of the compiler, or <c>undefined</c>
-              if unknown. The second element is a term describing the
-              version of the compiler, or <c>undefined</c> if unknown.</p>
+            <p>Returns the number of ports currently existing at the
+              local node. The value is given as an integer. This is
+              the same value as returned by
+              <c>length(erlang:ports())</c>, but more efficient.</p>
           </item>
-          <tag><c>check_io</c></tag>
+          <tag><marker id="system_info_port_limit"/>
+            <c>port_limit</c></tag>
           <item>
-            <p>Returns a list containing miscellaneous information
-              about the emulators internal I/O checking. Notice that
-              the content of the returned list can vary between
-              platforms and over time. It is only guaranteed
-              that a list is returned.</p>
+            <p>Returns the maximum number of simultaneously existing
+            ports at the local node as an integer. This limit can be
+            configured at startup by using command-line flag
+            <seealso marker="erl#+Q"><c>+Q</c></seealso> in <c>erl(1)</c>.</p>
           </item>
-          <tag><c>compat_rel</c></tag>
+          <tag><marker id="system_info_process_count"/>
+          <c>process_count</c></tag>
           <item>
-            <p>Returns the compatibility mode of the local node as
-              an integer. The integer returned represents the
-              Erlang/OTP release that the current emulator has been
-              set to be backward compatible with. The compatibility
-              mode can be configured at startup by using command-line flag
-              <seealso marker="erts:erl#compat_rel"><c>+R</c></seealso> in
-              <c>erl(1)</c>.</p>
+            <p>Returns the number of processes currently existing at the
+            local node. The value is given as an integer. This is
+            the same value as returned by
+            <c>length(processes())</c>, but more efficient.</p>
           </item>
-          <tag><c>cpu_topology</c></tag>
+          <tag><marker id="system_info_process_limit"/>
+            <c>process_limit</c></tag>
           <item>
-            <p>See <seealso
-              marker="#system_info_cpu_topology_tags">above</seealso>.</p>
+            <p>Returns the maximum number of simultaneously existing
+            processes at the local node. The value is given as an
+            integer. This limit can be configured at startup by using
+            command-line flag <seealso marker="erl#+P"><c>+P</c></seealso>
+            in <c>erl(1)</c>.</p>
           </item>
-          <tag><c>creation</c></tag>
+        </taglist>
+      </desc>
+    </func>
+
+    <func>
+      <name name="system_info" arity="1" clause_i="26"
+	    anchor="system_info_time"/>  <!-- end_time -->
+      <name name="system_info" arity="1" clause_i="49"/>  <!-- os_monotonic_time_source -->
+      <name name="system_info" arity="1" clause_i="50"/>  <!-- os_system_time_source -->
+      <name name="system_info" arity="1" clause_i="62"/>  <!-- start_time -->
+      <name name="system_info" arity="1" clause_i="67"/>  <!-- time_correction -->
+      <name name="system_info" arity="1" clause_i="68"/>  <!-- time_offset -->
+      <name name="system_info" arity="1" clause_i="69"/>  <!-- time_warp_mode -->
+      <name name="system_info" arity="1" clause_i="70"/>  <!-- tolerant_timeofday -->
+      <fsummary>Information about system time.</fsummary>
+      <desc>
+        <marker id="system_info_time_tags"/>
+        <p>Returns information about the current system
+        (emulator) time as specified by <c><anno>Item</anno></c>:</p>
+        <taglist>
+          <tag><marker id="system_info_end_time"/><c>end_time</c></tag>
           <item>
-            <p>Returns the creation of the local node as an integer.
-              The creation is changed when a node is restarted. The
-              creation of a node is stored in process identifiers, port
-              identifiers, and references. This makes it (to some
-              extent) possible to distinguish between identifiers from
-              different incarnations of a node. The valid
-              creations are integers in the range 1..3, but this will
-              probably change in a future release. If the node is not
-              alive, <c>0</c> is returned.</p>
+            <p>The last <seealso marker="#monotonic_time/0">Erlang monotonic
+            time</seealso> in <c>native</c>
+            <seealso marker="#type_time_unit">time unit</seealso> that
+            can be represented internally in the current Erlang runtime system
+            instance. The time between the
+            <seealso marker="#system_info_start_time">start time</seealso> and
+            the end time is at least a quarter of a millennium.</p>
           </item>
-          <tag><c>debug_compiled</c></tag>
+          <tag><marker id="system_info_os_monotonic_time_source"/>
+            <c>os_monotonic_time_source</c></tag>
           <item>
-            <p>Returns <c>true</c> if the emulator has been
-              debug-compiled, otherwise <c>false</c>.</p>
+            <p>Returns a list containing information about the source of
+              <seealso marker="erts:time_correction#OS_Monotonic_Time">OS
+              monotonic time</seealso> that is used by the runtime system.</p>
+            <p>If <c>[]</c> is returned, no OS monotonic time is
+              available. The list contains two-tuples with <c>Key</c>s
+              as first element, and <c>Value</c>s as second element. The
+              order of these tuples is undefined. The following
+              tuples can be part of the list, but more tuples can be
+              introduced in the future:</p>
+            <taglist>
+              <tag><c>{function, Function}</c></tag>
+              <item><p><c>Function</c> is the name of the function
+                used. This tuple always exists if OS monotonic time is
+                available to the runtime system.</p>
+              </item>
+              <tag><c>{clock_id, ClockId}</c></tag>
+              <item><p>This tuple only exists if <c>Function</c>
+                can be used with different clocks. <c>ClockId</c>
+                corresponds to the clock identifier used when calling
+                <c>Function</c>.</p>
+              </item>
+              <tag><c>{resolution, OsMonotonicTimeResolution}</c></tag>
+              <item><p>Highest possible
+                <seealso marker="time_correction#Time_Resolution">
+                resolution</seealso>
+                of current OS monotonic time source as parts per
+                second. If no resolution information can be retrieved
+                from the OS, <c>OsMonotonicTimeResolution</c> is
+                set to the resolution of the time unit of
+                <c>Function</c>s return value. That is, the actual
+                resolution can be lower than
+                <c>OsMonotonicTimeResolution</c>. Notice that
+                the resolution does not say anything about the
+                <seealso marker="time_correction#Time_Accuracy">
+                accuracy</seealso> or whether the
+                <seealso marker="time_correction#Time_Precision">
+                precision</seealso> aligns with the resolution. You do,
+                however, know that the precision is not better than
+                <c>OsMonotonicTimeResolution</c>.</p>
+              </item>
+              <tag><c>{extended, Extended}</c></tag>
+              <item><p><c>Extended</c> equals <c>yes</c> if
+                the range of time values has been extended;
+                otherwise <c>Extended</c> equals <c>no</c>. The
+                range must be extended if <c>Function</c>
+                returns values that wrap fast. This typically
+                is the case when the return value is a 32-bit value.</p>
+              </item>
+              <tag><c>{parallel, Parallel}</c></tag>
+              <item><p><c>Parallel</c> equals <c>yes</c> if
+                <c>Function</c> is called in parallel from multiple
+                threads. If it is not called in parallel, because
+                calls must be serialized, <c>Parallel</c> equals
+                <c>no</c>.</p>
+              </item>
+              <tag><c>{time, OsMonotonicTime}</c></tag>
+              <item><p><c>OsMonotonicTime</c> equals current OS
+                monotonic time in <c>native</c>
+                <seealso marker="#type_time_unit">time unit</seealso>.</p>
+              </item>
+            </taglist>
           </item>
-          <tag><c>delayed_node_table_gc</c></tag>
+          <tag><marker id="system_info_os_system_time_source"/>
+            <c>os_system_time_source</c></tag>
           <item>
-            <marker id="system_info_delayed_node_table_gc"></marker>
-            <p>Returns the amount of time in seconds garbage collection
-              of an entry in a node table is delayed. This limit can be set
-              on startup by passing command-line flag
-              <seealso marker="erts:erl#+zdntgc"><c>+zdntgc</c></seealso>
-              to <c>erl(1)</c>. For more information, see the documentation of
-              the command-line flag.</p>
+            <p>Returns a list containing information about the source of
+              <seealso marker="erts:time_correction#OS_System_Time">OS
+              system time</seealso> that is used by the runtime system.</p>
+            <p>The list contains two-tuples with <c>Key</c>s
+              as first element, and <c>Value</c>s as second element. The
+              order if these tuples is undefined. The following
+              tuples can be part of the list, but more tuples can be
+              introduced in the future:</p>
+            <taglist>
+              <tag><c>{function, Function}</c></tag>
+              <item><p><c>Function</c> is the name of the funcion used.</p>
+              </item>
+              <tag><c>{clock_id, ClockId}</c></tag>
+              <item><p>Exists only if <c>Function</c>
+                can be used with different clocks. <c>ClockId</c>
+                corresponds to the clock identifier used when calling
+                <c>Function</c>.</p>
+              </item>
+              <tag><c>{resolution, OsSystemTimeResolution}</c></tag>
+              <item><p>Highest possible
+                <seealso marker="time_correction#Time_Resolution">
+                resolution</seealso>
+                of current OS system time source as parts per
+                second. If no resolution information can be retrieved
+                from the OS, <c>OsSystemTimeResolution</c> is
+                set to the resolution of the time unit of
+                <c>Function</c>s return value. That is, the actual
+                resolution can be lower than
+                <c>OsSystemTimeResolution</c>. Notice that
+                the resolution does not say anything about the
+                <seealso marker="time_correction#Time_Accuracy">
+                accuracy</seealso> or whether the
+                <seealso marker="time_correction#Time_Precision">
+                precision</seealso> do align with the resolution. You do,
+                however, know that the precision is not better than
+                <c>OsSystemTimeResolution</c>.</p>
+              </item>
+              <tag><c>{parallel, Parallel}</c></tag>
+              <item><p><c>Parallel</c> equals <c>yes</c> if
+                <c>Function</c> is called in parallel from multiple
+                threads. If it is not called in parallel, because
+                calls needs to be serialized, <c>Parallel</c> equals
+                <c>no</c>.</p>
+              </item>
+              <tag><c>{time, OsSystemTime}</c></tag>
+              <item><p><c>OsSystemTime</c> equals current OS
+                system time in <c>native</c>
+                <seealso marker="#type_time_unit">time unit</seealso>.</p>
+              </item>
+            </taglist>
+          </item>
+          <tag><marker id="system_info_start_time"/><c>start_time</c></tag>
+          <item>
+            <p>The <seealso marker="#monotonic_time/0">Erlang monotonic
+              time</seealso> in <c>native</c>
+              <seealso marker="#type_time_unit">time unit</seealso> at the
+              time when current Erlang runtime system instance started.</p>
+            <p>See also <seealso marker="#system_info_end_time">
+              <c>erlang:system_info(end_time)</c></seealso>.</p>
+          </item>
+          <tag><marker id="system_info_time_correction"/>
+            <c>time_correction</c></tag>
+          <item>
+            <p>Returns a boolean value indicating whether
+              <seealso marker="time_correction#Time_Correction">
+              time correction</seealso> is enabled or not.</p>
+          </item>
+          <tag><marker id="system_info_time_offset"/>
+            <c>time_offset</c></tag>
+          <item>
+            <p>Returns the state of the time offset:</p>
+            <taglist>
+              <tag><c>preliminary</c></tag>
+              <item>
+                <p>The time offset is preliminary, and will be changed
+                  and finalized later. The preliminary time offset
+                  is used during the preliminary phase of the
+                  <seealso marker="time_correction#Single_Time_Warp_Mode">
+                  single time warp mode</seealso>.</p>
+              </item>
+              <tag><c>final</c></tag>
+              <item>
+                <p>The time offset is final. This either because
+                  <seealso marker="time_correction#No_Time_Warp_Mode">
+                  no time warp mode</seealso> is used, or because the time
+                  offset have been finalized when
+                  <seealso marker="time_correction#Single_Time_Warp_Mode">
+                  single time warp mode</seealso> is used.</p>
+              </item>
+              <tag><c>volatile</c></tag>
+              <item>
+                <p>The time offset is volatile. That is, it can
+                  change at any time. This is because
+                  <seealso marker="time_correction#Multi_Time_Warp_Mode">
+                  multi-time warp mode</seealso> is used.</p>
+              </item>
+            </taglist>
+          </item>
+          <tag><marker id="system_info_time_warp_mode"/>
+            <c>time_warp_mode</c></tag>
+          <item>
+            <p>Returns a value identifying the
+              <seealso marker="time_correction#Time_Warp_Modes">
+              time warp mode</seealso> that is used:</p>
+            <taglist>
+              <tag><c>no_time_warp</c></tag>
+              <item>The <seealso marker="time_correction#No_Time_Warp_Mode">
+                no time warp mode</seealso> is used.
+              </item>
+              <tag><c>single_time_warp</c></tag>
+              <item>The <seealso marker="time_correction#Single_Time_Warp_Mode">
+                single time warp mode</seealso> is used.
+              </item>
+              <tag><c>multi_time_warp</c></tag>
+              <item>The <seealso marker="time_correction#Multi_Time_Warp_Mode">
+                multi-time warp mode</seealso> is used.
+              </item>
+            </taglist>
+          </item>
+          <tag><marker id="system_info_tolerant_timeofday"/>
+            <c>tolerant_timeofday</c></tag>
+          <item>
+            <p>Returns whether a pre ERTS 7.0 backwards compatible
+              compensation for sudden changes of system time is <c>enabled</c>
+              or <c>disabled</c>. Such compensation is <c>enabled</c> when the
+              <seealso marker="#system_info_time_offset">time offset</seealso>
+              is <c>final</c>, and
+              <seealso marker="#system_info_time_correction">
+              time correction</seealso> is enabled.</p>
           </item>
-          <tag><c>dirty_cpu_schedulers</c></tag>
+        </taglist>
+      </desc>
+    </func>
+
+    <func>
+      <name name="system_info" arity="1" clause_i="17"
+	    anchor="system_info_scheduler"/>  <!-- dirty_cpu_schedulers -->
+      <name name="system_info" arity="1" clause_i="18"/>  <!-- dirty_cpu_schedulers_online -->
+      <name name="system_info" arity="1" clause_i="19"/>  <!-- dirty_io_schedulers -->
+      <name name="system_info" arity="1" clause_i="44"/>  <!-- multi_scheduling -->
+      <name name="system_info" arity="1" clause_i="45"/>  <!-- multi_scheduling_blockers -->
+      <name name="system_info" arity="1" clause_i="47"/>  <!-- normal_multi_scheduling_blockers -->
+      <name name="system_info" arity="1" clause_i="57"/>  <!-- scheduler_bind_type -->
+      <name name="system_info" arity="1" clause_i="58"/>  <!-- scheduler_bindings -->
+      <name name="system_info" arity="1" clause_i="59"/>  <!-- scheduler_id -->
+      <name name="system_info" arity="1" clause_i="60"/>  <!-- schedulers -->
+      <name name="system_info" arity="1" clause_i="61"/>  <!-- smp_support -->
+      <name name="system_info" arity="1" clause_i="65"/>  <!-- threads -->
+      <name name="system_info" arity="1" clause_i="66"/>  <!-- thread_pool_size -->
+      <fsummary>Information about system schedulers.</fsummary>
+      <desc>
+        <marker id="system_info_scheduler_tags"/>
+        <p>Returns information about schedulers, scheduling and threads in the
+          current system as specified by <c><anno>Item</anno></c>:</p>
+        <taglist>
+          <tag><marker id="system_info_dirty_cpu_schedulers"/>
+            <c>dirty_cpu_schedulers</c></tag>
           <item>
-            <marker id="system_info_dirty_cpu_schedulers"></marker>
             <p>Returns the number of dirty CPU scheduler threads used by
               the emulator. Dirty CPU schedulers execute CPU-bound
               native functions, such as NIFs, linked-in driver code,
@@ -7955,9 +8417,9 @@ ok
               <c>erlang:system_flag(schedulers_online,
               SchedulersOnline)</c></seealso>.</p>
           </item>
-          <tag><c>dirty_cpu_schedulers_online</c></tag>
+          <tag><marker id="system_info_dirty_cpu_schedulers_online"/>
+            <c>dirty_cpu_schedulers_online</c></tag>
           <item>
-            <marker id="system_info_dirty_cpu_schedulers_online"></marker>
             <p>Returns the number of dirty CPU schedulers online.
               The return value satisfies
               <c><![CDATA[1 <= DirtyCPUSchedulersOnline <= N]]></c>,
@@ -7979,9 +8441,9 @@ ok
               <c>erlang:system_flag(dirty_cpu_schedulers_online,
               DirtyCPUSchedulersOnline)</c></seealso>.</p>
           </item>
-          <tag><c>dirty_io_schedulers</c></tag>
+          <tag><marker id="system_info_dirty_io_schedulers"/>
+            <c>dirty_io_schedulers</c></tag>
           <item>
-            <marker id="system_info_dirty_io_schedulers"></marker>
             <p>Returns the number of dirty I/O schedulers as an integer.
               Dirty I/O schedulers execute I/O-bound native functions,
               such as NIFs and linked-in driver code, which cannot be
@@ -7998,179 +8460,9 @@ ok
               <c>erlang:system_flag(dirty_cpu_schedulers_online,
               DirtyCPUSchedulersOnline)</c></seealso>.</p>
           </item>
-          <tag><c>dist</c></tag>
-          <item>
-            <p>Returns a binary containing a string of distribution
-              information formatted as in Erlang crash dumps. For more
-              information, see section <seealso marker="erts:crash_dump">
-              How to interpret the Erlang crash dumps</seealso>
-              in the User's Guide.</p>
-          </item>
-          <tag><c>dist_buf_busy_limit</c></tag>
-          <item>
-            <marker id="system_info_dist_buf_busy_limit"></marker>
-            <p>Returns the value of the distribution buffer busy limit
-              in bytes. This limit can be set at startup by passing
-              command-line flag
-              <seealso marker="erts:erl#+zdbbl"><c>+zdbbl</c></seealso>
-              to <c>erl(1)</c>.</p>
-          </item>
-          <tag><c>dist_ctrl</c></tag>
+          <tag><marker id="system_info_multi_scheduling"/>
+            <c>multi_scheduling</c></tag>
           <item>
-            <p>Returns a list of tuples
-              <c>{<anno>Node</anno>, <anno>ControllingEntity</anno>}</c>,
-              one entry for each connected remote node.
-              <c><anno>Node</anno></c> is the node name
-              and <c><anno>ControllingEntity</anno></c> is the port or process
-              identifier responsible for the communication to that node.
-              More specifically, <c><anno>ControllingEntity</anno></c> for
-              nodes connected through TCP/IP (the normal case) is the socket
-              used in communication with the specific node.</p>
-          </item>
-          <tag><c>driver_version</c></tag>
-          <item>
-            <p>Returns a string containing the Erlang driver version
-              used by the runtime system. It has the form
-              <seealso marker="erts:erl_driver#version_management">
-              "&lt;major ver&gt;.&lt;minor ver&gt;"</seealso>.</p>
-          </item>
-          <tag><c>dynamic_trace</c></tag>
-          <item>
-            <p>Returns an atom describing the dynamic trace framework
-              compiled into the virtual machine. It can be
-              <c>dtrace</c>, <c>systemtap</c>, or <c>none</c>. For a
-              commercial or standard build, it is always <c>none</c>.
-              The other return values indicate a custom configuration
-              (for example, <c>./configure --with-dynamic-trace=dtrace</c>).
-              For more information about dynamic tracing, see
-              <seealso marker="runtime_tools:dyntrace">
-              <c>dyntrace(3)</c></seealso> manual page and the
-              <c>README.dtrace</c>/<c>README.systemtap</c> files in the
-              Erlang source code top directory.</p>
-          </item>
-          <tag><c>dynamic_trace_probes</c></tag>
-          <item>
-            <p>Returns a <c>boolean()</c> indicating if dynamic trace
-              probes (<c>dtrace</c> or <c>systemtap</c>) are built into
-              the emulator. This can only be <c>true</c> if the virtual
-              machine was built for dynamic tracing (that is,
-              <c>system_info(dynamic_trace)</c> returns
-              <c>dtrace</c> or <c>systemtap</c>).</p>
-          </item>
-          <tag><marker id="system_info_end_time"/><c>end_time</c></tag>
-          <item>
-            <p>The last <seealso marker="#monotonic_time/0">Erlang monotonic
-              time</seealso> in <c>native</c>
-              <seealso marker="#type_time_unit">time unit</seealso> that
-              can be represented internally in the current Erlang runtime system
-              instance. The time between the
-              <seealso marker="#system_info_start_time">start time</seealso> and
-              the end time is at least a quarter of a millennium.</p>
-          </item>
-          <tag><c>elib_malloc</c></tag>
-          <item>
-            <p>This option will be removed in a future release.
-              The return value will always be <c>false</c>, as the
-              <c>elib_malloc</c> allocator has been removed.</p>
-          </item>
-          <tag><c>ets_limit</c></tag>
-          <item>
-            <p>Returns the maximum number of ETS tables allowed. This
-              limit can be increased at startup by passing
-              command-line flag
-              <seealso marker="erts:erl#+e"><c>+e</c></seealso> to
-              <c>erl(1)</c> or by setting environment variable
-              <c>ERL_MAX_ETS_TABLES</c> before starting the Erlang
-              runtime system.</p>
-          </item>
-          <tag><c>heap_sizes</c></tag>
-          <item>
-            <p>Returns a list of integers representing valid heap sizes 
-              in words. All Erlang heaps are sized from sizes in this
-              list.</p>
-          </item>
-          <tag><c>heap_type</c></tag>
-          <item>
-            <p>Returns the heap type used by the current emulator. One
-              heap type exists:</p>
-            <taglist>
-              <tag><c>private</c></tag>
-              <item>
-                Each process has a heap reserved for its use and no
-                references between heaps of different processes are
-                allowed. Messages passed between processes are copied
-                between heaps.
-              </item>
-            </taglist>
-          </item>
-          <tag><c>info</c></tag>
-          <item>
-            <p>Returns a binary containing a string of miscellaneous
-              system information formatted as in Erlang crash dumps.
-              For more information, see section
-              <seealso marker="erts:crash_dump">
-              How to interpret the Erlang crash dumps</seealso>
-              in the User's Guide.</p>
-          </item>
-          <tag><c>kernel_poll</c></tag>
-          <item>
-            <p>Returns <c>true</c> if the emulator uses some kind of
-              kernel-poll implementation, otherwise <c>false</c>.</p>
-          </item>
-          <tag><c>loaded</c></tag>
-          <item>
-            <p>Returns a binary containing a string of loaded module
-              information formatted as in Erlang crash dumps. For more
-              information, see section
-              <seealso marker="erts:crash_dump">How to interpret the Erlang
-              crash dumps</seealso> in the User's Guide.</p>
-          </item>
-          <tag><c>logical_processors</c></tag>
-          <item>
-            <marker id="logical_processors"></marker>
-            <p>Returns the detected number of logical processors configured
-              in the system. The return value is either an integer, or
-              the atom <c>unknown</c> if the emulator cannot
-              detect the configured logical processors.</p>
-          </item>
-          <tag><c>logical_processors_available</c></tag>
-          <item>
-            <marker id="logical_processors_available"></marker>
-            <p>Returns the detected number of logical processors available
-              to the Erlang runtime system. The return value is either an
-              integer, or the atom <c>unknown</c> if the emulator
-              cannot detect the available logical processors. The number
-              of available logical processors is less than or equal to
-              the number of <seealso marker="#logical_processors_online">
-              logical processors online</seealso>.</p>
-          </item>
-          <tag><c>logical_processors_online</c></tag>
-          <item>
-            <marker id="logical_processors_online"></marker>
-            <p>Returns the detected number of logical processors online on
-              the system. The return value is either an integer,
-              or the atom <c>unknown</c> if the emulator cannot
-              detect logical processors online. The number of logical
-              processors online is less than or equal to the number of
-              <seealso marker="#logical_processors">logical processors
-              configured</seealso>.</p>
-          </item>
-          <tag><c>machine</c></tag>
-          <item>
-            <p>Returns a string containing the Erlang machine name.</p>
-          </item>
-          <tag><c>modified_timing_level</c></tag>
-          <item>
-            <p>Returns the modified timing-level (an integer) if
-              modified timing is enabled, otherwise <c>undefined</c>.
-              For more information about modified timing, see
-              command-line flag
-              <seealso marker="erts:erl#+T"><c>+T</c></seealso>
-              in <c>erl(1)</c></p>
-          </item>
-          <tag><c>multi_scheduling</c></tag>
-          <item>
-            <marker id="system_info_multi_scheduling"></marker>
             <p>Returns one of the following:</p>
             <taglist>
               <tag><c>disabled</c></tag>
@@ -8210,9 +8502,9 @@ ok
               and <seealso marker="#system_info_schedulers">
               <c>erlang:system_info(schedulers)</c></seealso>.</p>
           </item>
-          <tag><c>multi_scheduling_blockers</c></tag>
+          <tag><marker id="system_info_multi_scheduling_blockers"/>
+            <c>multi_scheduling_blockers</c></tag>
           <item>
-            <marker id="system_info_multi_scheduling_blockers"></marker>
             <p>Returns a list of <c><anno>Pid</anno></c>s when
               multi-scheduling is blocked, otherwise the empty list is
               returned. The <c><anno>Pid</anno></c>s in the list
@@ -8230,15 +8522,9 @@ ok
               and <seealso marker="#system_info_schedulers">
               <c>erlang:system_info(schedulers)</c></seealso>.</p>
           </item>
-          <tag><c>nif_version</c></tag>
+          <tag><marker id="system_info_normal_multi_scheduling_blockers"/>
+            <c>normal_multi_scheduling_blockers</c></tag>
           <item>
-            <p>Returns a string containing the version of the Erlang NIF
-              interface used by the runtime system. It is on the form
-              "&lt;major ver&gt;.&lt;minor ver&gt;".</p>
-          </item>
-          <tag><c>normal_multi_scheduling_blockers</c></tag>
-          <item>
-            <marker id="system_info_normal_multi_scheduling_blockers"></marker>
             <p>Returns a list of <c><anno>Pid</anno></c>s when
               normal multi-scheduling is blocked (that is, all normal schedulers
               but one is blocked), otherwise the empty list is returned.
@@ -8256,192 +8542,9 @@ ok
               and <seealso marker="#system_info_schedulers">
               <c>erlang:system_info(schedulers)</c></seealso>.</p>
           </item>
-          <tag><marker id="system_info_otp_release"/>
-            <c>otp_release</c></tag>
-          <item>
-            <marker id="system_info_otp_release"></marker>
-            <p>Returns a string containing the OTP release number of the
-              OTP release that the currently executing ERTS application
-              is part of.</p>
-            <p>As from Erlang/OTP 17, the OTP release number corresponds to
-              the major OTP version number. No
-              <c>erlang:system_info()</c> argument gives the exact OTP
-              version. This is because the exact OTP version in the general case
-              is difficult to determine. For more information, see the
-              description of versions in
-              <seealso marker="doc/system_principles:versions">
-              System principles</seealso> in System Documentation.</p>
-          </item>
-          <tag><marker id="system_info_os_monotonic_time_source"/>
-            <c>os_monotonic_time_source</c></tag>
-          <item>
-            <p>Returns a list containing information about the source of
-              <seealso marker="erts:time_correction#OS_Monotonic_Time">OS
-              monotonic time</seealso> that is used by the runtime system.</p>
-            <p>If <c>[]</c> is returned, no OS monotonic time is
-              available. The list contains two-tuples with <c>Key</c>s
-              as first element, and <c>Value</c>s as second element. The
-              order of these tuples is undefined. The following
-              tuples can be part of the list, but more tuples can be
-              introduced in the future:</p>
-            <taglist>
-              <tag><c>{function, Function}</c></tag>
-              <item><p><c>Function</c> is the name of the function
-                used. This tuple always exists if OS monotonic time is
-                available to the runtime system.</p>
-              </item>
-              <tag><c>{clock_id, ClockId}</c></tag>
-              <item><p>This tuple only exists if <c>Function</c>
-                can be used with different clocks. <c>ClockId</c>
-                corresponds to the clock identifier used when calling
-                <c>Function</c>.</p>
-              </item>
-              <tag><c>{resolution, OsMonotonicTimeResolution}</c></tag>
-              <item><p>Highest possible
-                <seealso marker="time_correction#Time_Resolution">
-                resolution</seealso>
-                of current OS monotonic time source as parts per
-                second. If no resolution information can be retrieved
-                from the OS, <c>OsMonotonicTimeResolution</c> is
-                set to the resolution of the time unit of
-                <c>Function</c>s return value. That is, the actual
-                resolution can be lower than
-                <c>OsMonotonicTimeResolution</c>. Notice that
-                the resolution does not say anything about the
-                <seealso marker="time_correction#Time_Accuracy">
-                accuracy</seealso> or whether the
-                <seealso marker="time_correction#Time_Precision">
-                precision</seealso> aligns with the resolution. You do,
-                however, know that the precision is not better than
-                <c>OsMonotonicTimeResolution</c>.</p>
-              </item>
-              <tag><c>{extended, Extended}</c></tag>
-              <item><p><c>Extended</c> equals <c>yes</c> if
-                the range of time values has been extended;
-                otherwise <c>Extended</c> equals <c>no</c>. The
-                range must be extended if <c>Function</c>
-                returns values that wrap fast. This typically
-                is the case when the return value is a 32-bit value.</p>
-              </item>
-              <tag><c>{parallel, Parallel}</c></tag>
-              <item><p><c>Parallel</c> equals <c>yes</c> if
-                <c>Function</c> is called in parallel from multiple
-                threads. If it is not called in parallel, because
-                calls must be serialized, <c>Parallel</c> equals
-                <c>no</c>.</p>
-              </item>
-              <tag><c>{time, OsMonotonicTime}</c></tag>
-              <item><p><c>OsMonotonicTime</c> equals current OS
-                monotonic time in <c>native</c>
-                <seealso marker="#type_time_unit">time unit</seealso>.</p>
-              </item>
-            </taglist>
-          </item>
-          <tag><marker id="system_info_os_system_time_source"/>
-          <c>os_system_time_source</c></tag>
+          <tag><marker id="system_info_scheduler_bind_type"/>
+            <c>scheduler_bind_type</c></tag>
           <item>
-            <p>Returns a list containing information about the source of
-              <seealso marker="erts:time_correction#OS_System_Time">OS
-              system time</seealso> that is used by the runtime system.</p>
-            <p>The list contains two-tuples with <c>Key</c>s
-              as first element, and <c>Value</c>s as second element. The
-              order if these tuples is undefined. The following
-              tuples can be part of the list, but more tuples can be
-              introduced in the future:</p>
-            <taglist>
-              <tag><c>{function, Function}</c></tag>
-              <item><p><c>Function</c> is the name of the funcion used.</p>
-              </item>
-              <tag><c>{clock_id, ClockId}</c></tag>
-              <item><p>Exists only if <c>Function</c>
-                can be used with different clocks. <c>ClockId</c>
-                corresponds to the clock identifier used when calling
-                <c>Function</c>.</p>
-              </item>
-              <tag><c>{resolution, OsSystemTimeResolution}</c></tag>
-              <item><p>Highest possible
-                <seealso marker="time_correction#Time_Resolution">
-                resolution</seealso>
-                of current OS system time source as parts per
-                second. If no resolution information can be retrieved
-                from the OS, <c>OsSystemTimeResolution</c> is
-                set to the resolution of the time unit of
-                <c>Function</c>s return value. That is, the actual
-                resolution can be lower than
-                <c>OsSystemTimeResolution</c>. Notice that
-                the resolution does not say anything about the
-                <seealso marker="time_correction#Time_Accuracy">
-                accuracy</seealso> or whether the
-                <seealso marker="time_correction#Time_Precision">
-                precision</seealso> do align with the resolution. You do,
-                however, know that the precision is not better than
-                <c>OsSystemTimeResolution</c>.</p>
-              </item>
-              <tag><c>{parallel, Parallel}</c></tag>
-              <item><p><c>Parallel</c> equals <c>yes</c> if
-                <c>Function</c> is called in parallel from multiple
-                threads. If it is not called in parallel, because
-                calls needs to be serialized, <c>Parallel</c> equals
-                <c>no</c>.</p>
-              </item>
-              <tag><c>{time, OsSystemTime}</c></tag>
-              <item><p><c>OsSystemTime</c> equals current OS
-                system time in <c>native</c>
-                <seealso marker="#type_time_unit">time unit</seealso>.</p>
-              </item>
-            </taglist>
-          </item>
-          <tag><c>port_parallelism</c></tag>
-          <item>
-            <marker id="system_info_port_parallelism"></marker>
-            <p>Returns the default port parallelism scheduling hint used.
-              For more information, see command-line argument
-              <seealso marker="erl#+spp"><c>+spp</c></seealso>
-              in <c>erl(1)</c>.</p>
-          </item>
-          <tag><marker id="system_info_port_count"/><c>port_count</c></tag>
-          <item>
-            <p>Returns the number of ports currently existing at the
-              local node. The value is given as an integer. This is
-              the same value as returned by
-              <c>length(erlang:ports())</c>, but more efficient.</p>
-          </item>
-          <tag><c>port_limit</c></tag>
-          <item>
-          <marker id="system_info_port_limit"></marker>
-            <p>Returns the maximum number of simultaneously existing
-              ports at the local node as an integer. This limit can be
-              configured at startup by using command-line flag
-              <seealso marker="erl#+Q"><c>+Q</c></seealso> in <c>erl(1)</c>.</p>
-          </item>
-          <tag><marker id="system_info_process_count"/>
-            <c>process_count</c></tag>
-          <item>
-            <p>Returns the number of processes currently existing at the
-              local node. The value is given as an integer. This is
-              the same value as returned by
-              <c>length(processes())</c>, but more efficient.</p>
-          </item>
-          <tag><c>process_limit</c></tag>
-          <item>
-            <marker id="system_info_process_limit"></marker>
-            <p>Returns the maximum number of simultaneously existing
-              processes at the local node. The value is given as an
-              integer. This limit can be configured at startup by using
-              command-line flag <seealso marker="erl#+P"><c>+P</c></seealso>
-              in <c>erl(1)</c>.</p>
-          </item>
-          <tag><c>procs</c></tag>
-          <item>
-            <p>Returns a binary containing a string of process and port
-              information formatted as in Erlang crash dumps. For more
-              information, see section <seealso marker="erts:crash_dump">
-              How to interpret the Erlang crash dumps</seealso>
-              in the User's Guide.</p>
-          </item>
-          <tag><c>scheduler_bind_type</c></tag>
-          <item>
-            <marker id="system_info_scheduler_bind_type"></marker>
             <p>Returns information about how the user has requested
               schedulers to be bound or not bound.</p>
             <p>Notice that although a user has requested
@@ -8455,9 +8558,9 @@ ok
               <seealso marker="#system_info_scheduler_bindings">
               <c>erlang:system_info(scheduler_bindings)</c></seealso>.</p>
           </item>
-          <tag><c>scheduler_bindings</c></tag>
+          <tag><marker id="system_info_scheduler_bindings"/>
+            <c>scheduler_bindings</c></tag>
           <item>
-            <marker id="system_info_scheduler_bindings"></marker>
             <p>Returns information about the currently used scheduler
               bindings.</p>
             <p>A tuple of a size equal to
@@ -8481,9 +8584,9 @@ ok
               <seealso marker="#system_info_schedulers_online">
               <c>erlang:system_info(schedulers_online)</c></seealso>.</p>
           </item>
-          <tag><c>scheduler_id</c></tag>
+          <tag><marker id="system_info_scheduler_id"/>
+            <c>scheduler_id</c></tag>
           <item>
-            <marker id="system_info_scheduler_id"></marker>
             <p>Returns the scheduler ID (<c>SchedulerId</c>) of the
               scheduler thread that the calling process is executing
               on. <c><anno>SchedulerId</anno></c> is a positive integer,
@@ -8493,9 +8596,9 @@ ok
               <seealso marker="#system_info_schedulers">
               <c>erlang:system_info(schedulers)</c></seealso>.</p>
           </item>
-          <tag><c>schedulers</c></tag>
+          <tag><marker id="system_info_schedulers"/>
+            <c>schedulers</c></tag>
           <item>
-            <marker id="system_info_schedulers"></marker>
             <p>Returns the number of scheduler threads used by
               the emulator. Scheduler threads online schedules Erlang
               processes and Erlang ports, and execute Erlang code
@@ -8522,9 +8625,9 @@ ok
               <c>erlang:system_info(multi_scheduling_blockers)</c></seealso>.
             </p>
           </item>
-          <tag><c>schedulers_online</c></tag>
+          <tag><marker id="system_info_schedulers_online"/>
+            <c>schedulers_online</c></tag>
           <item>
-            <marker id="system_info_schedulers_online"></marker>
             <p>Returns the number of schedulers online. The scheduler
               identifiers of schedulers online satisfy the relationship
               <c><![CDATA[1 <= SchedulerId <=
@@ -8536,34 +8639,18 @@ ok
               <c>erlang:system_flag(schedulers_online,
               SchedulersOnline)</c></seealso>.</p>
           </item>
-          <tag><c>smp_support</c></tag>
+          <tag><marker id="system_info_smp_support"/>
+            <c>smp_support</c></tag>
           <item>
             <p>Returns <c>true</c>.</p>
           </item>
-          <tag><marker id="system_info_start_time"/><c>start_time</c></tag>
-          <item>
-            <p>The <seealso marker="#monotonic_time/0">Erlang monotonic
-              time</seealso> in <c>native</c>
-              <seealso marker="#type_time_unit">time unit</seealso> at the
-              time when current Erlang runtime system instance started.</p>
-            <p>See also <seealso marker="#system_info_end_time">
-              <c>erlang:system_info(end_time)</c></seealso>.</p>
-          </item>
-          <tag><c>system_version</c></tag>
-          <item>
-            <p>Returns a string containing version number and
-              some important properties, such as the number of schedulers.</p>
-          </item>
-          <tag><c>system_architecture</c></tag>
-          <item>
-            <p>Returns a string containing the processor and OS
-              architecture the emulator is built for.</p>
-          </item>
-          <tag><c>threads</c></tag>
+          <tag><marker id="system_info_threads"/>
+            <c>threads</c></tag>
           <item>
             <p>Returns <c>true</c>.</p>
           </item>
-          <tag><c>thread_pool_size</c></tag>
+          <tag><marker id="system_info_thread_pool_size"/>
+            <c>thread_pool_size</c></tag>
           <item>
             <marker id="system_info_thread_pool_size"></marker>
             <p>Returns the number of async threads in the async thread
@@ -8572,111 +8659,341 @@ ok
               <c>erl_driver:driver_async()</c></seealso>).
               The value is given as an integer.</p>
           </item>
-          <tag><c>time_correction</c></tag>
+        </taglist>
+      </desc>
+    </func>
+
+    <func>
+      <name name="system_info" arity="1" clause_i="14"
+	    anchor="system_info_dist"/>  <!-- creation -->
+      <name name="system_info" arity="1" clause_i="16"/>  <!-- delayed_node_table_gc -->
+      <name name="system_info" arity="1" clause_i="20"/>  <!-- dist -->
+      <name name="system_info" arity="1" clause_i="21"/>  <!-- dist_buf_busy_limit -->
+      <name name="system_info" arity="1" clause_i="22"/>  <!-- dist_ctrl -->
+      <fsummary>Information about erlang distribution.</fsummary>
+      <desc>
+        <marker id="system_info_dist_tags"/>
+        <p>Returns information about Erlang Distribution in the
+        current system as specified by <c><anno>Item</anno></c>:</p>
+        <taglist>
+          <tag><marker id="system_info_creation"/>
+            <c>creation</c></tag>
           <item>
-            <marker id="system_info_time_correction"></marker>
-            <p>Returns a boolean value indicating whether
-              <seealso marker="time_correction#Time_Correction">
-              time correction</seealso> is enabled or not.</p>
+            <p>Returns the creation of the local node as an integer.
+              The creation is changed when a node is restarted. The
+              creation of a node is stored in process identifiers, port
+              identifiers, and references. This makes it (to some
+              extent) possible to distinguish between identifiers from
+              different incarnations of a node. The valid
+              creations are integers in the range 1..3, but this will
+              probably change in a future release. If the node is not
+              alive, <c>0</c> is returned.</p>
           </item>
-          <tag><c>time_offset</c></tag>
+          <tag><marker id="system_info_delayed_node_table_gc"/>
+            <c>delayed_node_table_gc</c></tag>
           <item>
-            <marker id="system_info_time_offset"></marker>
-            <p>Returns the state of the time offset:</p>
-            <taglist>
-              <tag><c>preliminary</c></tag>
-              <item>
-                <p>The time offset is preliminary, and will be changed
-                  and finalized later. The preliminary time offset
-                  is used during the preliminary phase of the
-                  <seealso marker="time_correction#Single_Time_Warp_Mode">
-                  single time warp mode</seealso>.</p>
-              </item>
-              <tag><c>final</c></tag>
-              <item>
-                <p>The time offset is final. This either because
-                  <seealso marker="time_correction#No_Time_Warp_Mode">
-                  no time warp mode</seealso> is used, or because the time
-                  offset have been finalized when
-                  <seealso marker="time_correction#Single_Time_Warp_Mode">
-                  single time warp mode</seealso> is used.</p>
-              </item>
-              <tag><c>volatile</c></tag>
-              <item>
-                <p>The time offset is volatile. That is, it can
-                  change at any time. This is because
-                  <seealso marker="time_correction#Multi_Time_Warp_Mode">
-                  multi-time warp mode</seealso> is used.</p>
-              </item>
-            </taglist>
+            <p>Returns the amount of time in seconds garbage collection
+              of an entry in a node table is delayed. This limit can be set
+              on startup by passing command-line flag
+              <seealso marker="erts:erl#+zdntgc"><c>+zdntgc</c></seealso>
+              to <c>erl(1)</c>. For more information, see the documentation of
+              the command-line flag.</p>
           </item>
-          <tag><marker id="system_info_time_warp_mode"/>
-            <c>time_warp_mode</c></tag>
+          <tag><marker id="system_info_dist"/>
+            <c>dist</c></tag>
           <item>
-            <p>Returns a value identifying the
-              <seealso marker="time_correction#Time_Warp_Modes">
-              time warp mode</seealso> that is used:</p>
-            <taglist>
-              <tag><c>no_time_warp</c></tag>
-              <item>The <seealso marker="time_correction#No_Time_Warp_Mode">
-                no time warp mode</seealso> is used.
-              </item>
-              <tag><c>single_time_warp</c></tag>
-              <item>The <seealso marker="time_correction#Single_Time_Warp_Mode">
-                single time warp mode</seealso> is used.
-              </item>
-              <tag><c>multi_time_warp</c></tag>
-              <item>The <seealso marker="time_correction#Multi_Time_Warp_Mode">
-                multi-time warp mode</seealso> is used.
-              </item>
-            </taglist>
+            <p>Returns a binary containing a string of distribution
+              information formatted as in Erlang crash dumps. For more
+              information, see section <seealso marker="erts:crash_dump">
+              How to interpret the Erlang crash dumps</seealso>
+              in the User's Guide.</p>
           </item>
-          <tag><c>tolerant_timeofday</c></tag>
+          <tag><marker id="system_info_dist_buf_busy_limit"/>
+            <c>dist_buf_busy_limit</c></tag>
           <item>
-            <marker id="system_info_tolerant_timeofday"></marker>
-            <p>Returns whether a pre ERTS 7.0 backwards compatible
-              compensation for sudden changes of system time is <c>enabled</c>
-              or <c>disabled</c>. Such compensation is <c>enabled</c> when the
-              <seealso marker="#system_info_time_offset">time offset</seealso>
-              is <c>final</c>, and
-              <seealso marker="#system_info_time_correction">
-              time correction</seealso> is enabled.</p>
+            <p>Returns the value of the distribution buffer busy limit
+              in bytes. This limit can be set at startup by passing
+              command-line flag
+              <seealso marker="erts:erl#+zdbbl"><c>+zdbbl</c></seealso>
+              to <c>erl(1)</c>.</p>
           </item>
-          <tag><c>trace_control_word</c></tag>
+          <tag><marker id="system_info_dist_ctrl"/>
+            <c>dist_ctrl</c></tag>
+          <item>
+            <p>Returns a list of tuples
+              <c>{<anno>Node</anno>, <anno>ControllingEntity</anno>}</c>,
+              one entry for each connected remote node.
+              <c><anno>Node</anno></c> is the node name
+              and <c><anno>ControllingEntity</anno></c> is the port or process
+              identifier responsible for the communication to that node.
+              More specifically, <c><anno>ControllingEntity</anno></c> for
+              nodes connected through TCP/IP (the normal case) is the socket
+              used in communication with the specific node.</p>
+          </item>
+        </taglist>
+      </desc>
+    </func>
+
+    <func>
+      <!-- <name name="system_info" arity="1" clause_i="1"/>   allocated_areas -->
+      <!-- <name name="system_info" arity="1" clause_i="2"/>   allocated -->
+      <!-- <name name="system_info" arity="1" clause_i="3"/>   {allocator, _} -->
+      <!-- <name name="system_info" arity="1" clause_i="4"/>   alloc_util_allocators -->
+      <!-- <name name="system_info" arity="1" clause_i="5"/>   {allocator_sizes, _} -->
+      <!-- <name name="system_info" arity="1" clause_i="6"/>   atom_count -->
+      <!-- <name name="system_info" arity="1" clause_i="7"/>   atom_limit -->
+      <name name="system_info" arity="1" clause_i="8"
+	    anchor="system_info_misc"/>   <!-- build_type -->
+      <name name="system_info" arity="1" clause_i="9"/>   <!-- c_compiler_used -->
+      <name name="system_info" arity="1" clause_i="10"/>  <!-- check_io -->
+      <name name="system_info" arity="1" clause_i="11"/>  <!-- compat_rel -->
+      <!-- <name name="system_info" arity="1" clause_i="12"/>  cpu_topology -->
+      <!-- <name name="system_info" arity="1" clause_i="13"/>  {cpu_topology, _} -->
+      <!-- <name name="system_info" arity="1" clause_i="14"/>  creation -->
+      <name name="system_info" arity="1" clause_i="15"/>  <!-- debug_compiled -->
+      <!-- <name name="system_info" arity="1" clause_i="16"/>  delayed_node_table_gc -->
+      <!-- <name name="system_info" arity="1" clause_i="17"/>  dirty_cpu_schedulers -->
+      <!-- <name name="system_info" arity="1" clause_i="18"/>  dirty_cpu_schedulers_online -->
+      <!-- <name name="system_info" arity="1" clause_i="19"/>  dirty_io_schedulers -->
+      <!-- <name name="system_info" arity="1" clause_i="20"/>  dist -->
+      <!-- <name name="system_info" arity="1" clause_i="21"/>  dist_buf_busy_limit -->
+      <!-- <name name="system_info" arity="1" clause_i="22"/>  dist_ctrl -->
+      <name name="system_info" arity="1" clause_i="23"/>  <!-- driver_version -->
+      <name name="system_info" arity="1" clause_i="24"/>  <!-- dynamic_trace -->
+      <name name="system_info" arity="1" clause_i="25"/>  <!-- dynamic_trace_probes -->
+      <!-- <name name="system_info" arity="1" clause_i="26"/>  end_time -->
+      <!-- <name name="system_info" arity="1" clause_i="27"/>  elib_malloc -->
+      <!-- <name name="system_info" arity="1" clause_i="28"/>  eager_check_io, removed -->
+      <!-- <name name="system_info" arity="1" clause_i="29"/>  ets_limit -->
+      <!-- <name name="system_info" arity="1" clause_i="30"/>  fullsweep_after -->
+      <!-- <name name="system_info" arity="1" clause_i="31"/>  garbage_collection -->
+      <!-- <name name="system_info" arity="1" clause_i="32"/>  heap_sizes -->
+      <!-- <name name="system_info" arity="1" clause_i="33"/>  heap_type -->
+      <name name="system_info" arity="1" clause_i="34"/>  <!-- info -->
+      <name name="system_info" arity="1" clause_i="35"/>  <!-- kernel_poll -->
+      <name name="system_info" arity="1" clause_i="36"/>  <!-- loaded -->
+      <!-- <name name="system_info" arity="1" clause_i="37"/>  logical_processors -->
+      <name name="system_info" arity="1" clause_i="38"/>  <!-- machine -->
+      <!-- <name name="system_info" arity="1" clause_i="39"/>  max_heap_size -->
+      <!-- <name name="system_info" arity="1" clause_i="40"/>  message_queue_data -->
+      <!-- <name name="system_info" arity="1" clause_i="41"/>  min_heap_size -->
+      <!-- <name name="system_info" arity="1" clause_i="42"/>  min_bin_vheap_size -->
+      <name name="system_info" arity="1" clause_i="43"/>  <!-- modified_timing_level -->
+      <!-- <name name="system_info" arity="1" clause_i="44"/>  multi_scheduling -->
+      <!-- <name name="system_info" arity="1" clause_i="45"/>  multi_scheduling_blockers -->
+      <name name="system_info" arity="1" clause_i="46"/>  <!-- nif_version -->
+      <!-- n<name name="system_info" arity="1" clause_i="47"/>  ormal_multi_scheduling_blockers -->
+      <name name="system_info" arity="1" clause_i="48"/>  <!-- otp_release -->
+      <!-- <name name="system_info" arity="1" clause_i="49"/>  os_monotonic_time_source -->
+      <!-- <name name="system_info" arity="1" clause_i="50"/>  os_system_time_source -->
+      <name name="system_info" arity="1" clause_i="51"/>  <!-- port_parallelism -->
+      <!-- <name name="system_info" arity="1" clause_i="52"/>  port_count -->
+      <!-- <name name="system_info" arity="1" clause_i="53"/>  port_limit -->
+      <!-- <name name="system_info" arity="1" clause_i="54"/>  process_count -->
+      <!-- <name name="system_info" arity="1" clause_i="55"/>  process_limit -->
+      <!-- <name name="system_info" arity="1" clause_i="56"/>  procs -->
+      <!-- <name name="system_info" arity="1" clause_i="57"/>  scheduler_bind_type -->
+      <!-- <name name="system_info" arity="1" clause_i="58"/>  scheduler_bindings -->
+      <!-- <name name="system_info" arity="1" clause_i="59"/>  scheduler_id -->
+      <!-- <name name="system_info" arity="1" clause_i="60"/>  schedulers -->
+      <!-- <name name="system_info" arity="1" clause_i="61"/>  smp_support -->
+      <!-- <name name="system_info" arity="1" clause_i="62"/>  start_time -->
+      <name name="system_info" arity="1" clause_i="63"/>  <!-- system_version -->
+      <name name="system_info" arity="1" clause_i="64"/>  <!-- system_architecture -->
+      <!-- <name name="system_info" arity="1" clause_i="65"/>  threads -->
+      <!-- <name name="system_info" arity="1" clause_i="66"/>  thread_pool_size -->
+      <!-- <name name="system_info" arity="1" clause_i="67"/>  time_correction -->
+      <!-- <name name="system_info" arity="1" clause_i="68"/>  time_offset -->
+      <!-- <name name="system_info" arity="1" clause_i="69"/>  time_warp_mode -->
+      <!-- <name name="system_info" arity="1" clause_i="70"/>  tolerant_timeofday -->
+      <name name="system_info" arity="1" clause_i="71"/>  <!-- trace_control_word -->
+      <!-- <name name="system_info" arity="1" clause_i="72"/>  update_cpu_info -->
+      <name name="system_info" arity="1" clause_i="73"/>  <!-- version -->
+      <name name="system_info" arity="1" clause_i="74"/>  <!-- wordsize -->
+      <!-- <name name="system_info" arity="1" clause_i="75"/>  overview -->
+      <fsummary>Information about the system.</fsummary>
+      <desc>
+        <marker id="system_info_misc_tags"/>
+        <p>Returns various information about the current system
+          (emulator) as specified by <c><anno>Item</anno></c>:</p>
+        <taglist>
+          <tag><marker id="system_info_build_type"/>
+            <c>build_type</c></tag>
+          <item>
+            <p>Returns an atom describing the build type of the runtime
+              system. This is normally the atom <c>opt</c> for optimized.
+              Other possible return values are <c>debug</c>, <c>purify</c>,
+              <c>quantify</c>, <c>purecov</c>, <c>gcov</c>, <c>valgrind</c>,
+              <c>gprof</c>, and <c>lcnt</c>. Possible return values
+              can be added or removed at any time without prior notice.</p>
+          </item>
+          <tag><marker id="system_info_c_compiler_used"/>
+            <c>c_compiler_used</c></tag>
+          <item>
+            <p>Returns a two-tuple describing the C compiler used when
+              compiling the runtime system. The first element is an
+              atom describing the name of the compiler, or <c>undefined</c>
+              if unknown. The second element is a term describing the
+              version of the compiler, or <c>undefined</c> if unknown.</p>
+          </item>
+          <tag><marker id="system_info_check_io"/>
+            <c>check_io</c></tag>
+          <item>
+            <p>Returns a list containing miscellaneous information
+              about the emulators internal I/O checking. Notice that
+              the content of the returned list can vary between
+              platforms and over time. It is only guaranteed
+              that a list is returned.</p>
+          </item>
+          <tag><marker id="system_info_compat_rel"/>
+            <c>compat_rel</c></tag>
+          <item>
+            <p>Returns the compatibility mode of the local node as
+              an integer. The integer returned represents the
+              Erlang/OTP release that the current emulator has been
+              set to be backward compatible with. The compatibility
+              mode can be configured at startup by using command-line flag
+              <seealso marker="erts:erl#compat_rel"><c>+R</c></seealso> in
+              <c>erl(1)</c>.</p>
+          </item>
+          <tag><marker id="system_info_debug_compiled"/>
+            <c>debug_compiled</c></tag>
+          <item>
+            <p>Returns <c>true</c> if the emulator has been
+              debug-compiled, otherwise <c>false</c>.</p>
+          </item>
+          <tag><marker id="system_info_driver_version"/>
+            <c>driver_version</c></tag>
+          <item>
+            <p>Returns a string containing the Erlang driver version
+              used by the runtime system. It has the form
+              <seealso marker="erts:erl_driver#version_management">
+              "&lt;major ver&gt;.&lt;minor ver&gt;"</seealso>.</p>
+          </item>
+          <tag><marker id="system_info_dynamic_trace"/>
+            <c>dynamic_trace</c></tag>
+          <item>
+            <p>Returns an atom describing the dynamic trace framework
+              compiled into the virtual machine. It can be
+              <c>dtrace</c>, <c>systemtap</c>, or <c>none</c>. For a
+              commercial or standard build, it is always <c>none</c>.
+              The other return values indicate a custom configuration
+              (for example, <c>./configure --with-dynamic-trace=dtrace</c>).
+              For more information about dynamic tracing, see
+              <seealso marker="runtime_tools:dyntrace">
+              <c>dyntrace(3)</c></seealso> manual page and the
+              <c>README.dtrace</c>/<c>README.systemtap</c> files in the
+              Erlang source code top directory.</p>
+          </item>
+          <tag><marker id="system_info_dynamic_trace_probes"/>
+            <c>dynamic_trace_probes</c></tag>
+          <item>
+            <p>Returns a <c>boolean()</c> indicating if dynamic trace
+              probes (<c>dtrace</c> or <c>systemtap</c>) are built into
+              the emulator. This can only be <c>true</c> if the virtual
+              machine was built for dynamic tracing (that is,
+              <c>system_info(dynamic_trace)</c> returns
+              <c>dtrace</c> or <c>systemtap</c>).</p>
+          </item>
+          <tag><marker id="system_info_info"/>
+            <c>info</c></tag>
+          <item>
+            <p>Returns a binary containing a string of miscellaneous
+              system information formatted as in Erlang crash dumps.
+              For more information, see section
+              <seealso marker="erts:crash_dump">
+              How to interpret the Erlang crash dumps</seealso>
+              in the User's Guide.</p>
+          </item>
+          <tag><marker id="system_info_kernel_poll"/>
+            <c>kernel_poll</c></tag>
+          <item>
+            <p>Returns <c>true</c> if the emulator uses some kind of
+              kernel-poll implementation, otherwise <c>false</c>.</p>
+          </item>
+          <tag><marker id="system_info_loaded"/>
+            <c>loaded</c></tag>
+          <item>
+            <p>Returns a binary containing a string of loaded module
+              information formatted as in Erlang crash dumps. For more
+              information, see section
+              <seealso marker="erts:crash_dump">How to interpret the Erlang
+              crash dumps</seealso> in the User's Guide.</p>
+          </item>
+          <tag><marker id="system_info_machine"/>
+            <c>machine</c></tag>
+          <item>
+            <p>Returns a string containing the Erlang machine name.</p>
+          </item>
+          <tag><marker id="system_info_modified_timing_level"/>
+            <c>modified_timing_level</c></tag>
+          <item>
+            <p>Returns the modified timing-level (an integer) if
+              modified timing is enabled, otherwise <c>undefined</c>.
+              For more information about modified timing, see
+              command-line flag
+              <seealso marker="erts:erl#+T"><c>+T</c></seealso>
+              in <c>erl(1)</c></p>
+          </item>
+          <tag><marker id="system_info_nif_version"/>
+            <c>nif_version</c></tag>
+          <item>
+            <p>Returns a string containing the version of the Erlang NIF
+              interface used by the runtime system. It is on the form
+              "&lt;major ver&gt;.&lt;minor ver&gt;".</p>
+          </item>
+          <tag><marker id="system_info_otp_release"/>
+            <c>otp_release</c></tag>
+          <item>
+            <marker id="system_info_otp_release"></marker>
+            <p>Returns a string containing the OTP release number of the
+              OTP release that the currently executing ERTS application
+              is part of.</p>
+            <p>As from Erlang/OTP 17, the OTP release number corresponds to
+              the major OTP version number. No
+              <c>erlang:system_info()</c> argument gives the exact OTP
+              version. This is because the exact OTP version in the general case
+              is difficult to determine. For more information, see the
+              description of versions in
+              <seealso marker="doc/system_principles:versions">
+              System principles</seealso> in System Documentation.</p>
+          </item>
+          <tag><marker id="system_info_port_parallelism"/>
+            <c>port_parallelism</c></tag>
+          <item>
+            <p>Returns the default port parallelism scheduling hint used.
+              For more information, see command-line argument
+              <seealso marker="erl#+spp"><c>+spp</c></seealso>
+              in <c>erl(1)</c>.</p>
+          </item>
+          <tag><marker id="system_info_system_version"/>
+            <c>system_version</c></tag>
+          <item>
+            <p>Returns a string containing version number and
+              some important properties, such as the number of schedulers.</p>
+          </item>
+          <tag><marker id="system_info_system_architecture"/>
+            <c>system_architecture</c></tag>
+          <item>
+            <p>Returns a string containing the processor and OS
+              architecture the emulator is built for.</p>
+          </item>
+          <tag><marker id="system_info_trace_control_word"/>
+            <c>trace_control_word</c></tag>
           <item>
             <p>Returns the value of the node trace control word. For
               more information, see function <c>get_tcw</c> in section
               <seealso marker="erts:match_spec#get_tcw">
               Match Specifications in Erlang</seealso> in the User's Guide.</p>
           </item>
-          <tag><c>update_cpu_info</c></tag>
+          <tag><marker id="system_info_version"/>
+            <c>version</c></tag>
           <item>
-            <marker id="update_cpu_info"></marker>
-            <p>The runtime system rereads the CPU information available
-              and updates its internally stored information about the
-              <seealso marker="#system_info_cpu_topology_detected">detected
-              CPU topology</seealso> and the number of logical processors
-              <seealso marker="#logical_processors">configured</seealso>,
-              <seealso marker="#logical_processors_online">online</seealso>,
-              and <seealso marker="#logical_processors_available">
-              available</seealso>.</p>
-            <p>If the CPU information has changed since the last time
-              it was read, the atom <c>changed</c> is returned, otherwise
-              the atom <c>unchanged</c>. If the CPU information has changed,
-              you probably want to
-              <seealso marker="#system_flag_schedulers_online">adjust the
-              number of schedulers online</seealso>. You typically want
-              to have as many schedulers online as
-              <seealso marker="#logical_processors_available">logical
-              processors available</seealso>.</p>
-          </item>
-          <tag><c>version</c></tag>
-          <item>
-            <marker id="system_info_version"></marker>
             <p>Returns a string containing the version number of the
               emulator.</p>
           </item>
-          <tag><c>wordsize</c></tag>
+          <tag><marker id="system_info_wordsize"/>
+            <c>wordsize</c></tag>
           <item>
             <p>Same as <c>{wordsize, internal}</c>.</p>
           </item>
@@ -8698,13 +9015,6 @@ ok
               64-bit architecture, 8 is returned.</p>
           </item>
         </taglist>
-        <note>
-          <p>Argument <c>scheduler</c> has changed name to
-            <c>scheduler_id</c> to avoid mix up with argument
-            <c>schedulers</c>. Argument <c>scheduler</c> was
-            introduced in ERTS 5.5 and renamed in
-            ERTS 5.5.1.</p>
-        </note>
       </desc>
     </func>
 
@@ -8949,7 +9259,7 @@ ok
               <c>erlang:now()</c>. This is also the default if no
               time stamp flag is specified. If <c>cpu_timestamp</c> has
               been enabled through
-              <seealso marker="erlang:trace/3"><c>erlang:trace/3</c></seealso>,
+              <seealso marker="#trace/3"><c>erlang:trace/3</c></seealso>,
               this also effects the time stamp produced in profiling messages
               when flag <c>timestamp</c> is enabled.</p>
           </item>
@@ -9026,6 +9336,10 @@ hello
 </pre>
         <p>See also <seealso marker="#binary_to_term/1">
           <c>binary_to_term/1</c></seealso>.</p>
+        <note>
+          <p>There is no guarantee that this function will return
+            the same encoded representation for the same term.</p>
+        </note>
       </desc>
     </func>
 
diff --git a/erts/doc/src/erlc.xml b/erts/doc/src/erlc.xml
index 7355be488b..2214b76a51 100644
--- a/erts/doc/src/erlc.xml
+++ b/erts/doc/src/erlc.xml
@@ -143,6 +143,14 @@
         <p>Produces a Makefile rule to track header dependencies. The
           rule is sent to <c>stdout</c>. No object file is produced.</p>
       </item>
+
+      <tag><c>-MMD</c></tag>
+      <item>
+        <p>Generate dependencies as a side-effect. The object file
+	will be produced as normal. This option overrides the
+	option <c><![CDATA[-M]]></c>.</p>
+      </item>
+
       <tag><c>-MF &lt;Makefile&gt;</c></tag>
       <item>
         <p>As option <c><![CDATA[-M]]></c>, except that the
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index 580780e73b..049ffe560a 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -225,6 +225,33 @@
           used. The time complexity is proportional to log N, where
           N is the number of free blocks.</p>
       </item>
+      <tag>Age order first fit carrier address order first fit</tag>
+      <item>
+	<p>Strategy: Find the <em>oldest carrier</em> that
+          can satisfy the requested block size, then find a block within
+          that carrier using the "address order first fit" strategy.</p>
+        <p>Implementation: A balanced binary search tree is
+          used. The time complexity is proportional to log N, where
+          N is the number of free blocks.</p>
+      </item>
+      <tag>Age order first fit carrier best fit</tag>
+      <item>
+        <p>Strategy: Find the <em>oldest carrier</em> that
+          can satisfy the requested block size, then find a block within
+          that carrier using the "best fit" strategy.</p>
+        <p>Implementation: Balanced binary search trees are
+          used. The time complexity is proportional to log N, where
+          N is the number of free blocks.</p>
+      </item>
+      <tag>Age order first fit carrier address order best fit</tag>
+      <item>
+        <p>Strategy: Find the <em>oldest carrier</em> that
+          can satisfy the requested block size, then find a block within
+          that carrier using the "address order best fit" strategy.</p>
+        <p>Implementation: Balanced binary search trees are
+          used. The time complexity is proportional to log N, where
+          N is the number of free blocks.</p>
+      </item>
       <tag>Good fit</tag>
       <item>
         <p>Strategy: Try to find the best fit, but settle for the best fit
@@ -467,7 +494,8 @@
             fetched, it will function as an ordinary carrier. This feature has
             special requirements on the
             <seealso marker="#M_as">allocation strategy</seealso> used. Only
-            the strategies <c>aoff</c>, <c>aoffcbf</c>, and <c>aoffcaobf</c>
+            the strategies <c>aoff</c>, <c>aoffcbf</c>, <c>aoffcaobf</c>,
+	    <c>ageffcaoff</c>m, <c>ageffcbf</c> and <c>ageffcaobf</c>
             support abandoned carriers.</p>
           <p>This feature also requires
             <seealso marker="#M_t">multiple thread specific instances</seealso>
@@ -478,8 +506,30 @@
             allocators based on the <c>alloc_util</c> framework, except
             <c>temp_alloc</c> (which would be pointless).</p>
         </item>
+
+	<tag><marker id="M_acfml"/><c><![CDATA[+M<S>acfml <bytes>]]></c>
+        </tag>
+        <item>
+          <p>Abandon carrier free block min limit. A valid <c><![CDATA[<bytes>]]></c>
+            is a positive integer representing a block size limit. The largest
+	    free block in a carrier must be at least <c>bytes</c> large, for the
+	    carrier to be abandoned. The default is zero but can be changed
+	    in the future.</p>
+	  <p>See also <seealso marker="#M_acul"><c>acul</c></seealso>.</p>
+        </item>
+
+        <tag><marker id="M_acnl"/><c><![CDATA[+M<S>acnl <amount>]]></c>
+        </tag>
+        <item>
+          <p>Abandon carrier number limit. A valid <c><![CDATA[<amount>]]></c>
+            is a positive integer representing max number of abandoned carriers per
+	    allocator instance. Defaults to 1000 which will practically disable
+	    the limit, but this can be changed in the future.</p>
+	  <p>See also <seealso marker="#M_acul"><c>acul</c></seealso>.</p>
+        </item>
+
         <tag><marker id="M_as"/>
-          <c><![CDATA[+M<S>as bf|aobf|aoff|aoffcbf|aoffcaobf|gf|af]]></c></tag>
+          <c><![CDATA[+M<S>as bf|aobf|aoff|aoffcbf|aoffcaobf|ageffcaoff|ageffcbf|ageffcaobf|gf|af]]></c></tag>
         <item>
           <p>Allocation strategy. The following strategies are valid:</p>
           <list type="bulleted">
@@ -490,6 +540,11 @@
             </item>
             <item><c>aoffcaobf</c> (address order first fit carrier address
               order best fit)</item>
+            <item><c>ageffcaoff</c> (age order first fit carrier address order first fit)</item>
+            <item><c>ageffcbf</c> (age order first fit carrier best fit)
+            </item>
+            <item><c>ageffcaobf</c> (age order first fit carrier address
+              order best fit)</item>
             <item><c>gf</c> (good fit)</item>
             <item><c>af</c> (a fit)</item>
           </list>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 25b72ce774..7ef42c2318 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,254 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 9.2.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improve search algorithm of abandoned memory carriers.
+	    Instead of limited linear search, each allocator instance
+	    maintain a balanced search tree of all its abandoned
+	    carriers for faster and more exhaustive search.</p>
+          <p>
+	    Own Id: OTP-14915 Aux Id: ERIERL-88 </p>
+        </item>
+        <item>
+          <p>
+	    New erts_alloc command line options <c>+M_acnl</c> and
+	    <c>+M_acfml</c> to limit carrier abandonment.</p>
+          <p>
+	    Own Id: OTP-14916 Aux Id: ERIERL-88 </p>
+        </item>
+        <item>
+          <p>
+	    New family of <c>erts_alloc</c> strategies: Age Order
+	    First Fit. Similar to "address order", but instead the
+	    oldest possible carrier is always chosen for allocation.</p>
+          <p>
+	    Own Id: OTP-14917 Aux Id: ERIERL-88 </p>
+        </item>
+        <item>
+          <p>
+	    Add possibility to change allocator options at runtime
+	    with <c>system_info(erts_alloc, ...)</c>. Only option
+	    <c>sbct</c> (single block carrier threshold) is currently
+	    supported via this interface.</p>
+          <p>
+	    Own Id: OTP-14918 Aux Id: ERIERL-88 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 9.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix a bug in tracing where the {caller} match spec
+	    function would be set to undefined incorrectly when used
+	    in conjunction with return_to or return_trace on some
+	    functions.</p>
+          <p>
+	    The functions effected are: erlang:put/2, erlang:erase/1,
+	    erlang:process_info/1,2, erlang:nif_load/2,
+	    erts_internal:garbage_collection/1 and
+	    erts_internal:check_process_code/1.</p>
+          <p>
+	    Because of this bug, the analysis done by fprof could
+	    become incorrect when the functions above are the
+	    tail-call in a function.</p>
+          <p>
+	    Own Id: OTP-14677</p>
+        </item>
+        <item>
+          <p>
+	    Fix emulator deadlock that would happen if
+	    <c>trap_exit</c> was set to true and a process sends an
+	    exit signal to itself using <c>exit(self(), Reason)</c>
+	    while receive tracing was enabled for that process.</p>
+          <p>
+	    Own Id: OTP-14678 Aux Id: ERL-495 </p>
+        </item>
+        <item>
+	    <p>Writing of crash dumps is significantly faster.</p>
+	    <p>Maps are now included in crash dumps.</p>
+	    <p>Constants terms would only be shown in one process,
+	    while other processes referencing the same constant term
+	    would show a marker for incomplete heap. </p>
+          <p>
+	    Own Id: OTP-14685 Aux Id: OTP-14611, OTP-14603, OTP-14595 </p>
+        </item>
+        <item>
+          <p>
+	    The fallback home directory for windows has been changed
+	    to be the PROFILE directory instead of the WINDOWS
+	    directory. The fallback is used when the environment
+	    variables HOMEDRIVE and HOMEPATH have not been set.</p>
+          <p>
+	    Own Id: OTP-14691</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug for hipe compiled code using
+	    <c>&lt;&lt;X/utf32&gt;&gt;</c> binary construction that
+	    could cause faulty result or even VM crash.</p>
+          <p>
+	    On architectures other than x86_64, code need to be
+	    recompiled to benefit from this fix.</p>
+          <p>
+	    Own Id: OTP-14740</p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in <c>erlang:garbage_collect/2</c> and
+	    <c>erlang:check_process_code/3</c>, when called with
+	    option <c>{async,ReqestId}</c>. Could cause VM crash or
+	    heap corruption if <c>RequestId</c> was an immediate term
+	    (like a pid, atom or small integer). Bug exists since
+	    OTP-17.0.</p>
+          <p>
+	    Own Id: OTP-14752</p>
+        </item>
+        <item>
+	    <p>ERL_NIF_MINOR_VERSION wasn't bumped with the addition
+	    of <c>enif_ioq_*</c>.</p>
+          <p>
+	    Own Id: OTP-14779</p>
+        </item>
+        <item>
+	    <p>Purging of loaded code that contained "fake literals"
+	    (for example the magic reference obtained from
+	    '<c>ets:new/2</c>') would crash the runtime system.
+	    Corrected.</p>
+          <p>
+	    Own Id: OTP-14791</p>
+        </item>
+        <item>
+	    <p>Setting the size of the atom table to a number near
+	    2147483647 (using the '<c>+t</c>' option) would cause the
+	    emulator to exit with a failure to allocate a huge amount
+	    of memory. This has been corrected. Also the usage
+	    message for the '<c>+t</c>' option has been corrected to
+	    show the correct upper limit 2147483647 instead of 0.</p>
+          <p>
+	    Own Id: OTP-14796</p>
+        </item>
+        <item>
+	    <p>Fixed a bug that prevented registered process names
+	    from being resolved in lcnt results.</p>
+          <p>
+	    Own Id: OTP-14803</p>
+        </item>
+        <item>
+	    <p>Formatting bugs were fixed in several HiPE debug
+	    BIFs.</p>
+          <p>
+	    Own Id: OTP-14804</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Binaries and some other data in crash dumps are now
+	    encoded in base64 (instead of in hex), which will reduce
+	    the size of crash dumps.</p>
+	    <p>A few bugs in the handling of sub binaries in
+	    <c>crashdump_viewer</c> have been fixed.</p>
+          <p>
+	    Own Id: OTP-14686</p>
+        </item>
+        <item>
+          <p>
+	    Micro optimization for send operations of messages to
+	    other nodes. The local ack-message, which is otherwise
+	    sent back from TPC/IP port driver to sending client
+	    process, is now ignored earlier for distributed send
+	    operations.</p>
+          <p>
+	    Own Id: OTP-14689</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 9.1.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a bug in file closure on Unix; close(2) was
+	    retried on EINTR which could cause a different (recently
+	    opened) file to be closed as well.</p>
+          <p>
+	    Own Id: OTP-14775</p>
+        </item>
+        <item>
+          <p>
+	    A race-condition when tearing down a connection with
+	    active node monitors could cause the runtime system to
+	    crash.</p>
+          <p>
+	    This bug was introduced in ERTS version 8.0 (OTP 19.0).</p>
+          <p>
+	    Own Id: OTP-14781 Aux Id: OTP-13047 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 9.1.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Microstate accounting sometimes produced incorrect
+	    results for dirty schedulers.</p>
+          <p>
+	    Own Id: OTP-14707</p>
+        </item>
+        <item>
+	    <p>Fixed a regression in <c>zlib:gunzip/1</c> that
+	    prevented it from working when the decompressed size was
+	    a perfect multiple of 16384. This regression was
+	    introduced in 20.1.1</p>
+          <p>
+	    Own Id: OTP-14730 Aux Id: ERL-507 </p>
+        </item>
+        <item>
+	    <p>Fixed a memory corruption bug in
+	    <c>enif_inspect_iovec</c>; writable binaries stayed
+	    writable after entering the iovec.</p>
+          <p>
+	    Own Id: OTP-14745</p>
+        </item>
+        <item>
+	    <p>Fixed a crash in <c>enif_inspect_iovec</c> on
+	    encountering empty binaries.</p>
+          <p>
+	    Own Id: OTP-14750</p>
+        </item>
+        <item>
+	    <p><c>zlib:deflateParams/3</c> will no longer return
+	    <c>buf_error</c> when called after <c>zlib:deflate/2</c>
+	    with zlib <c>1.2.11</c>.</p>
+          <p>
+	    Own Id: OTP-14751</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 9.1.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -2850,6 +3098,58 @@
 
 </section>
 
+<section><title>Erts 7.3.1.4</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix performance bug in pre-allocators that could cause
+	    them to permanently fall back on normal more expensive
+	    memory allocation. Pre-allocators are used for quick
+	    allocation of short lived meta data used by messages and
+	    other scheduled tasks. Bug exists since OTP_R15B02.</p>
+          <p>
+	    Own Id: OTP-14491</p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in operator <c>bxor</c> causing erroneuos
+	    result when one operand is a big <em>negative</em>
+	    integer with the lowest <c>N*W</c> bits as zero and the
+	    other operand not larger than <c>N*W</c> bits. <c>N</c>
+	    is an integer of 1 or larger and <c>W</c> is 32 or 64
+	    depending on word size.</p>
+          <p>
+	    Own Id: OTP-14514</p>
+        </item>
+        <item>
+          <p>
+	    A timer internal bit-field used for storing scheduler id
+	    was too small. As a result, VM internal timer data
+	    structures could become inconsistent when using 1024
+	    schedulers on the system. Note that systems with less
+	    than 1024 schedulers are not effected by this bug.</p>
+          <p>
+	    This bug was introduced in ERTS version 7.0 (OTP 18.0).</p>
+          <p>
+	    Own Id: OTP-14548 Aux Id: OTP-11997, ERL-468 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in <c>binary_to_term</c> and
+	    <c>binary_to_atom</c> that could cause VM crash.
+	    Typically happens when the last character of an UTF8
+	    string is in the range 128 to 255, but truncated to only
+	    one byte. Bug exists in <c>binary_to_term</c> since ERTS
+	    version 5.10.2 (OTP_R16B01) and <c>binary_to_atom</c>
+	    since ERTS version 9.0 (OTP-20.0).</p>
+          <p>
+	    Own Id: OTP-14590 Aux Id: ERL-474 </p>
+        </item>
+      </list>
+    </section>
+</section>
+
 <section><title>Erts 7.3.1.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -10664,7 +10964,7 @@
 	    <c>update_cpu_info</c> will make the runtime system
 	    reread and update the internally stored CPU information.
 	    For more information see the documentation of <seealso
-	    marker="erlang#update_cpu_info">erlang:system_info(update_cpu_info)</seealso>.</p>
+	    marker="erlang#system_info_update_cpu_info">erlang:system_info(update_cpu_info)</seealso>.</p>
           <p>
 	    The CPU topology is now automatically detected on Windows
 	    systems with less than 33 logical processors. The runtime
diff --git a/erts/doc/src/run_erl.xml b/erts/doc/src/run_erl.xml
index a9b6a7e2c6..e4c1b943c4 100644
--- a/erts/doc/src/run_erl.xml
+++ b/erts/doc/src/run_erl.xml
@@ -181,6 +181,12 @@
       <item>
         <p>Controls the number of log files written before older
           files are reused. Defaults to 5, minimum is 2, maximum is 1000.</p>
+	<p>Note that, as a way to indicate the newest file, <c>run_erl</c> will
+	delete the oldest log file to maintain a "hole" in the file
+	sequences. For example, if log files #1, #2, #4 and #5 exists, that
+	means #2 is the latest and #4 is the oldest. You will therefore at most
+	get one less log file than the value set by
+	<c>RUN_ERL_LOG_GENERATIONS</c>.</p>
       </item>
       <tag><c>RUN_ERL_LOG_MAXSIZE</c></tag>
       <item>
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index fdaf253fe5..9c79bf3da0 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -634,6 +634,7 @@ GENERATE += $(TTF_DIR)/driver_tab.c
 PRELOAD_BEAM =		$(ERL_TOP)/erts/preloaded/ebin/otp_ring0.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/erts_code_purger.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/init.beam \
+			$(ERL_TOP)/erts/preloaded/ebin/prim_buffer.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/prim_eval.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/prim_inet.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/prim_file.beam \
@@ -785,6 +786,9 @@ $(OBJDIR)/%.o: drivers/$(ERLANG_OSTYPE)/%.c
 $(OBJDIR)/%.o: nifs/common/%.c
 	$(V_CC) $(CFLAGS) -DLIBSCTP=$(LIBSCTP) $(INCLUDES) -Inifs/common -Inifs/$(ERLANG_OSTYPE) -c $< -o $@
 
+$(OBJDIR)/%.o: nifs/$(ERLANG_OSTYPE)/%.c
+	$(V_CC) $(CFLAGS) $(INCLUDES) -Inifs/common -Inifs/$(ERLANG_OSTYPE) -I../etc/$(ERLANG_OSTYPE) -c $< -o $@
+
 # ----------------------------------------------------------------------
 # Specials
 #
@@ -873,17 +877,17 @@ RUN_OBJS += \
 LTTNG_OBJS = $(OBJDIR)/erlang_lttng.o
 NIF_OBJS = \
 	   $(OBJDIR)/erl_tracer_nif.o \
+	   $(OBJDIR)/prim_buffer_nif.o \
+	   $(OBJDIR)/prim_file_nif.o \
 	   $(OBJDIR)/zlib_nif.o
 
 ifeq ($(TARGET),win32)
 DRV_OBJS = \
 	$(OBJDIR)/registry_drv.o \
-	$(OBJDIR)/efile_drv.o \
 	$(OBJDIR)/inet_drv.o \
 	$(OBJDIR)/ram_file_drv.o \
 	$(OBJDIR)/ttsl_drv.o
 OS_OBJS = \
-	$(OBJDIR)/win_efile.o \
 	$(OBJDIR)/win_con.o \
 	$(OBJDIR)/dll_sys.o \
 	$(OBJDIR)/driver_tab.o \
@@ -892,22 +896,23 @@ OS_OBJS = \
 	$(OBJDIR)/sys_time.o \
 	$(OBJDIR)/sys_interrupt.o \
 	$(OBJDIR)/sys_env.o \
-	$(OBJDIR)/dosmap.o
+	$(OBJDIR)/dosmap.o \
+	$(OBJDIR)/win_prim_file.o
 
 else
 OS_OBJS = \
 	$(OBJDIR)/sys.o \
 	$(OBJDIR)/sys_drivers.o \
+	$(OBJDIR)/sys_env.o \
 	$(OBJDIR)/sys_uds.o \
 	$(OBJDIR)/driver_tab.o \
-	$(OBJDIR)/unix_efile.o \
+	$(OBJDIR)/elib_memmove.o \
 	$(OBJDIR)/gzio.o \
-	$(OBJDIR)/elib_memmove.o
+	$(OBJDIR)/unix_prim_file.o
 
 	OS_OBJS += $(OBJDIR)/sys_float.o \
                    $(OBJDIR)/sys_time.o
 DRV_OBJS = \
-	$(OBJDIR)/efile_drv.o \
 	$(OBJDIR)/inet_drv.o \
 	$(OBJDIR)/ram_file_drv.o \
 	$(OBJDIR)/ttsl_drv.o
@@ -940,7 +945,8 @@ endif
 OS_OBJS +=	$(OBJDIR)/erl_poll.o \
 		$(OBJDIR)/erl_check_io.o \
 		$(OBJDIR)/erl_mseg.o \
-		$(OBJDIR)/erl_mmap.o \
+		$(OBJDIR)/erl_mmap.o  \
+		$(OBJDIR)/erl_osenv.o \
 		$(OBJDIR)/erl_$(ERLANG_OSTYPE)_sys_ddll.o \
 		$(OBJDIR)/erl_mtrace_sys_wrap.o \
 		$(OBJDIR)/erl_sys_common_misc.o \
@@ -1135,6 +1141,7 @@ BEAM_SRC=$(wildcard beam/*.c)
 DRV_COMMON_SRC=$(wildcard drivers/common/*.c)
 DRV_OSTYPE_SRC=$(wildcard drivers/$(ERLANG_OSTYPE)/*.c)
 NIF_COMMON_SRC=$(wildcard nifs/common/*.c)
+NIF_OSTYPE_SRC=$(wildcard nifs/$(ERLANG_OSTYPE)/*.c)
 ALL_SYS_SRC=$(wildcard sys/$(ERLANG_OSTYPE)/*.c) $(wildcard sys/common/*.c)
 # We use $(shell ls) here instead of wildcard as $(wildcard ) resolved at
 # loadtime of the makefile and at that time these files are not generated yet.
@@ -1147,7 +1154,10 @@ ifeq ($(TARGET),win32)
 
 #DEP_CC=$(EMU_CC)
 DEP_CC=$(CC)
-DEP_FLAGS=-MM  $(subst -O2,,$(CFLAGS)) $(INCLUDES) -I../etc/win32 -Idrivers/common -Idrivers/$(ERLANG_OSTYPE)
+DEP_FLAGS=-MM  $(subst -O2,,$(CFLAGS)) $(INCLUDES) -I../etc/win32 \
+	-Idrivers/common -Idrivers/$(ERLANG_OSTYPE) \
+	-Inifs/common -Inifs/$(ERLANG_OSTYPE)
+
 # ifeq (@MIXED_CYGWIN_VC@,yes)
 # VC++ used for compiling. If __GNUC__ is defined we will include
 # other headers then when compiling which will result in faulty
@@ -1167,7 +1177,9 @@ MG_FLAG=-MG
 endif
 
 DEP_CC=$(CC)
-DEP_FLAGS=-MM $(MG_FLAG) $(CFLAGS) $(INCLUDES) -Inifs/common -Idrivers/common -Idrivers/$(ERLANG_OSTYPE)
+DEP_FLAGS=-MM $(MG_FLAG) $(CFLAGS) $(INCLUDES) \
+	-Idrivers/common -Idrivers/$(ERLANG_OSTYPE) \
+	-Inifs/common -Inifs/$(ERLANG_OSTYPE)
 SYS_SRC=$(ALL_SYS_SRC)
 endif
 
@@ -1198,6 +1210,8 @@ $(TTF_DIR)/depend.mk: $(TTF_DIR)/GENERATED $(PRELOAD_SRC)
 		| $(SED_DEPEND) >> $(TTF_DIR)/depend.mk
 	$(V_at)$(DEP_CC) $(DEP_FLAGS) $(NIF_COMMON_SRC) \
 		| $(SED_DEPEND) >> $(TTF_DIR)/depend.mk
+	$(V_at)$(DEP_CC) $(DEP_FLAGS) -I../etc/$(ERLANG_OSTYPE) $(NIF_OSTYPE_SRC) \
+		| $(SED_DEPEND) >> $(TTF_DIR)/depend.mk
 	$(V_at)$(DEP_CC) $(DEP_FLAGS) $(SYS_SRC) \
 		| $(SED_DEPEND) >> $(TTF_DIR)/depend.mk
 	$(V_at)$(DEP_CC) $(DEP_FLAGS) $(TARGET_SRC) \
diff --git a/erts/emulator/beam/atom.c b/erts/emulator/beam/atom.c
index bbe1cb3e11..e5b7616a0d 100644
--- a/erts/emulator/beam/atom.c
+++ b/erts/emulator/beam/atom.c
@@ -452,7 +452,7 @@ init_atom_table(void)
     /* Ordinary atoms */
     for (i = 0; erl_atom_names[i] != 0; i++) {
 	int ix;
-	a.len = strlen(erl_atom_names[i]);
+	a.len = sys_strlen(erl_atom_names[i]);
 	a.latin1_chars = a.len;
 	a.name = (byte*)erl_atom_names[i];
 	a.slot.index = i;
diff --git a/erts/emulator/beam/atom.h b/erts/emulator/beam/atom.h
index be998a46bd..385120a8d9 100644
--- a/erts/emulator/beam/atom.h
+++ b/erts/emulator/beam/atom.h
@@ -36,7 +36,7 @@
 /* Internal atom cache needs MAX_ATOM_TABLE_SIZE to be less than an
    unsigned 32 bit integer. See external.c(erts_encode_ext_dist_header_setup)
    for more details. */
-#define MAX_ATOM_TABLE_SIZE ((MAX_ATOM_INDEX + 1 < (UWORD_CONSTANT(1) << 32)) ? MAX_ATOM_INDEX + 1 : (UWORD_CONSTANT(1) << 32))
+#define MAX_ATOM_TABLE_SIZE ((MAX_ATOM_INDEX + 1 < (UWORD_CONSTANT(1) << 32)) ? MAX_ATOM_INDEX + 1 : ((UWORD_CONSTANT(1) << 31) - 1)) /* Here we use maximum signed interger value to avoid integer overflow */
 #else
 #define MAX_ATOM_TABLE_SIZE (MAX_ATOM_INDEX + 1)
 #endif
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index fc55b687d4..38b5f0c5e3 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -48,7 +48,7 @@ atom Empty=''
 #
 # Used in the Beam emulator loop. (Smaller literals usually means tighter code.)
 #
-atom fun infinity timeout normal call return
+atom infinity timeout normal call return
 atom throw error exit
 atom undefined
 
@@ -69,11 +69,9 @@ atom DOWN='DOWN'
 atom UP='UP'
 atom EXIT='EXIT'
 atom abort
-atom aborted
 atom abs_path
 atom absoluteURI
 atom ac
-atom accessor
 atom active
 atom active_tasks
 atom active_tasks_all
@@ -88,7 +86,6 @@ atom allocated_areas
 atom allocator
 atom allocator_sizes
 atom alloc_util_allocators
-atom allow_gc
 atom allow_passive_connect
 atom already_loaded
 atom amd64
@@ -108,6 +105,7 @@ atom asynchronous
 atom atom
 atom atom_used
 atom attributes
+atom auto_connect
 atom await_microstate_accounting_modifications
 atom await_port_send_result
 atom await_proc_exit
@@ -121,9 +119,7 @@ atom bag
 atom band
 atom big
 atom bif_return_trap
-atom bif_timer_server
 atom binary
-atom binary_bin_to_list_trap
 atom binary_copy_trap
 atom binary_find_trap
 atom binary_longest_prefix_trap
@@ -178,7 +174,6 @@ atom convert_time_unit
 atom connect
 atom connected
 atom connection_closed
-atom cons
 atom const
 atom context_switches
 atom control
@@ -198,9 +193,6 @@ atom debug_flags
 atom decimals
 atom default
 atom delay_trap
-atom dexit
-atom depth
-atom dgroup_leader
 atom dictionary
 atom dirty_bif_exception
 atom dirty_bif_result
@@ -221,7 +213,6 @@ atom dist_ctrl_put_data
 atom dist_data
 atom Div='/'
 atom div
-atom dlink
 atom dmonitor_node
 atom dmonitor_p
 atom DollarDollar='$$'
@@ -230,9 +221,7 @@ atom dollar_endonly
 atom dotall
 atom driver
 atom driver_options
-atom dsend
 atom dsend_continue_trap
-atom dunlink
 atom duplicate_bag
 atom duplicated
 atom dupnames
@@ -250,15 +239,14 @@ atom Eqeq='=='
 atom erl_tracer
 atom erlang
 atom erl_signal_server
-atom ERROR='ERROR'
 atom error_handler
 atom error_logger
 atom erts_code_purger
 atom erts_debug
+atom erts_dflags
 atom erts_internal
 atom ets
 atom ETS_TRANSFER='ETS-TRANSFER'
-atom event
 atom exact_reductions
 atom exception_from
 atom exception_trace
@@ -285,27 +273,20 @@ atom force
 atom format_cpu_topology
 atom free
 atom fullsweep_after
-atom fullsweep_if_old_binaries
-atom fun
-atom function
 atom functions
 atom function_clause
 atom garbage_collecting
 atom garbage_collection
 atom garbage_collection_info
-atom gc_end
 atom gc_major_end
 atom gc_major_start
 atom gc_max_heap_size
 atom gc_minor_end
 atom gc_minor_start
-atom gc_start
 atom Ge='>='
 atom generational
-atom get_data
 atom get_seq_token
 atom get_tcw
-atom getenv
 atom gather_gc_info_result
 atom gather_io_bytes
 atom gather_microstate_accounting_result
@@ -347,11 +328,11 @@ atom initial_call
 atom input
 atom internal
 atom internal_error
-atom internal_status
 atom instruction_counts
 atom invalid
 atom is_constant
 atom is_seq_trace
+atom iterator
 atom io
 atom keypos
 atom kill
@@ -392,14 +373,12 @@ atom match_spec_result
 atom max
 atom maximum
 atom max_heap_size
-atom max_tables max_processes
 atom mbuf_size
 atom md5
 atom memory
 atom memory_internal
 atom memory_types
 atom message
-atom message_binary
 atom message_queue_data
 atom message_queue_len
 atom messages
@@ -446,21 +425,18 @@ atom new_processes
 atom new_ports
 atom new_uniq
 atom newline
-atom next
 atom no
 atom nomatch
 atom none
 atom no_auto_capture
 atom noconnect
 atom noconnection
-atom nocookie
 atom node
 atom node_type
 atom nodedown
 atom nodedown_reason
 atom nodeup
 atom noeol
-atom nofile
 atom noproc
 atom normal
 atom nosuspend
@@ -482,7 +458,6 @@ atom notempty_atstart
 atom notify
 atom notsup
 atom nouse_stdio
-atom objects
 atom off_heap
 atom offset
 atom ok
@@ -552,7 +527,6 @@ atom re_run_trap
 atom read_concurrency
 atom ready_input
 atom ready_output
-atom ready_async
 atom reason
 atom receive
 atom recent_size
@@ -580,7 +554,8 @@ atom running_procs
 atom runtime
 atom safe
 atom save_calls
-atom scheduler
+atom sbct
+atom scheduler 
 atom scheduler_id
 atom scheduler_wall_time
 atom scheduler_wall_time_all
@@ -598,7 +573,6 @@ atom sequential_trace_token
 atom serial
 atom set
 atom set_cpu_topology
-atom set_data
 atom set_on_first_link
 atom set_on_first_spawn
 atom set_on_link
@@ -606,8 +580,6 @@ atom set_on_spawn
 atom set_seq_token
 atom set_tcw
 atom set_tcw_fake
-atom separate
-atom shared
 atom sighup
 atom sigterm
 atom sigusr1
@@ -623,7 +595,6 @@ atom sigtstp
 atom sigquit
 atom silent
 atom size
-atom sl_alloc
 atom spawn_executable
 atom spawn_driver
 atom spawned
@@ -631,7 +602,6 @@ atom ssl_tls
 atom stack_size
 atom start
 atom status
-atom static
 atom stderr_to_stdout
 atom stop
 atom stream
@@ -641,13 +611,11 @@ atom sunrm
 atom suspend
 atom suspended
 atom suspending
-atom sys_misc
 atom system
-atom system_error
+atom system_flag_scheduler_wall_time
 atom system_limit
 atom system_version
 atom system_architecture
-atom SYSTEM='SYSTEM'
 atom table
 atom term_to_binary_trap
 atom this
@@ -665,7 +633,7 @@ atom total_heap_size
 atom total_run_queue_lengths
 atom total_run_queue_lengths_all
 atom tpkt
-atom trace trace_ts traced
+atom trace traced
 atom trace_control_word
 atom trace_status
 atom tracer
@@ -674,7 +642,6 @@ atom trim
 atom trim_all
 atom try_clause
 atom true
-atom tuple
 atom type
 atom ucompile
 atom ucp
@@ -691,14 +658,11 @@ atom unblock_normal
 atom uniq
 atom unless_suspending
 atom unloaded
-atom unloading
 atom unloaded_only
 atom unload_cancelled
 atom value
-atom values
 atom version
 atom visible
-atom wait
 atom waiting
 atom wall_clock
 atom warning
diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
index fe1e15701b..0832b3f374 100644
--- a/erts/emulator/beam/beam_bp.c
+++ b/erts/emulator/beam/beam_bp.c
@@ -998,7 +998,9 @@ do_call_trace(Process* c_p, ErtsCodeInfo* info, Eterm* reg,
 
     fixup_cp_before_trace(c_p, &return_to_trace);
 
+    ERTS_UNREQ_PROC_MAIN_LOCK(c_p);
     flags = erts_call_trace(c_p, info, ms, reg, local, &tracer);
+    ERTS_REQ_PROC_MAIN_LOCK(c_p);
 
     /* restore cp after potential fixup */
     c_p->cp = cp_save;
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c
index 509aa2a84f..5eb68b817e 100644
--- a/erts/emulator/beam/beam_debug.c
+++ b/erts/emulator/beam/beam_debug.c
@@ -40,6 +40,7 @@
 #include "erl_binary.h"
 #include "erl_thr_progress.h"
 #include "erl_nfunc_sched.h"
+#include "beam_catches.h"
 
 #ifdef ARCH_64
 # define HEXF "%016bpX"
@@ -55,6 +56,7 @@ static int print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
 static void print_bif_name(fmtfn_t to, void* to_arg, BifFunction bif);
 static BeamInstr* f_to_addr(BeamInstr* base, int op, BeamInstr* ap);
 static BeamInstr* f_to_addr_packed(BeamInstr* base, int op, Sint32* ap);
+static void print_byte_string(fmtfn_t to, void *to_arg, byte* str, Uint bytes);
 
 BIF_RETTYPE
 erts_debug_same_2(BIF_ALIST_2)
@@ -226,11 +228,11 @@ erts_debug_instructions_0(BIF_ALIST_0)
     Eterm res = NIL;
 
     for (i = 0; i < num_instructions; i++) {
-	needed += 2*strlen(opc[i].name);
+	needed += 2*sys_strlen(opc[i].name);
     }
     hp = HAlloc(BIF_P, needed);
     for (i = num_instructions-1; i >= 0; i--) {
-	Eterm s = erts_bld_string_n(&hp, 0, opc[i].name, strlen(opc[i].name));
+	Eterm s = erts_bld_string_n(&hp, 0, opc[i].name, sys_strlen(opc[i].name));
 	res = erts_bld_cons(&hp, 0, s, res);
     }
     return res;
@@ -396,6 +398,7 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
     BeamInstr args[8];		/* Arguments for this instruction. */
     BeamInstr* ap;			/* Pointer to arguments. */
     BeamInstr* unpacked;		/* Unpacked arguments */
+    BeamInstr* first_arg;               /* First argument */
 
     start_prog = opc[op].pack;
 
@@ -428,7 +431,7 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
 	 * the packing program backwards and in reverse.
 	 */
 
-	prog = start_prog + strlen(start_prog);
+	prog = start_prog + sys_strlen(start_prog);
 	while (start_prog < prog) {
 	    prog--;
 	    switch (*prog) {
@@ -480,6 +483,8 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
 	ap = args;
     }
 
+    first_arg = ap;
+
     /*
      * Print the name and all operands of the instructions.
      */
@@ -570,24 +575,60 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
 		    }
 		    break;
 		}
+	    case op_i_make_fun_Wt:
+                if (*sign == 'W') {
+                    ErlFunEntry* fe = (ErlFunEntry *) *ap;
+                    ErtsCodeMFA* cmfa = find_function_from_pc(fe->address);
+		    erts_print(to, to_arg, "%T:%T/%bpu", cmfa->module,
+                               cmfa->function, cmfa->arity);
+                } else {
+                    erts_print(to, to_arg, "%d", *ap);
+                }
+                break;
+	    case op_i_bs_match_string_xfWW:
+                if (ap - first_arg < 3) {
+                    erts_print(to, to_arg, "%d", *ap);
+                } else {
+                    Uint bits = ap[-1];
+                    Uint bytes = (bits+7)/8;
+                    byte* str = (byte *) *ap;
+                    print_byte_string(to, to_arg, str, bytes);
+                }
+                break;
+	    case op_bs_put_string_WW:
+                if (ap - first_arg == 0) {
+                    erts_print(to, to_arg, "%d", *ap);
+                } else {
+                    Uint bytes = ap[-1];
+                    byte* str = (byte *) ap[0];
+                    print_byte_string(to, to_arg, str, bytes);
+                }
+                break;
 	    default:
 		erts_print(to, to_arg, "%d", *ap);
 	    }
 	    ap++;
 	    break;
 	case 'f':		/* Destination label */
-	    {
-                BeamInstr* target = f_to_addr(addr, op, ap);
-		ErtsCodeMFA* cmfa = find_function_from_pc(target);
-		if (!cmfa || erts_codemfa_to_code(cmfa) != target) {
-		    erts_print(to, to_arg, "f(" HEXF ")", target);
-		} else {
-		    erts_print(to, to_arg, "%T:%T/%bpu", cmfa->module,
-                               cmfa->function, cmfa->arity);
-		}
-		ap++;
-	    }
-	    break;
+            switch (op) {
+            case op_catch_yf:
+                erts_print(to, to_arg, "f(" HEXF ")", catch_pc((BeamInstr)*ap));
+                break;
+            default:
+                {
+                    BeamInstr* target = f_to_addr(addr, op, ap);
+                    ErtsCodeMFA* cmfa = find_function_from_pc(target);
+                    if (!cmfa || erts_codemfa_to_code(cmfa) != target) {
+                        erts_print(to, to_arg, "f(" HEXF ")", target);
+                    } else {
+                        erts_print(to, to_arg, "%T:%T/%bpu", cmfa->module,
+                                   cmfa->function, cmfa->arity);
+                    }
+                    ap++;
+                }
+                break;
+            }
+            break;
 	case 'p':		/* Pointer (to label) */
 	    {
                 BeamInstr* target = f_to_addr(addr, op, ap);
@@ -848,6 +889,14 @@ static BeamInstr* f_to_addr_packed(BeamInstr* base, int op, Sint32* ap)
     return base - 1 + opc[op].adjust + *ap;
 }
 
+static void print_byte_string(fmtfn_t to, void *to_arg, byte* str, Uint bytes)
+{
+    Uint i;
+
+    for (i = 0; i < bytes; i++) {
+        erts_print(to, to_arg, "%02X", str[i]);
+    }
+}
 
 /*
  * Dirty BIF testing.
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 60d0008d8f..fbd0e38735 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -400,12 +400,13 @@ static BeamInstr* apply_fun(Process* p, Eterm fun,
 			    Eterm args, Eterm* reg) NOINLINE;
 static Eterm new_fun(Process* p, Eterm* reg,
 		     ErlFunEntry* fe, int num_free) NOINLINE;
-static Eterm new_map(Process* p, Eterm* reg, Uint live, Uint n, BeamInstr* ptr) NOINLINE;
-static Eterm new_small_map_lit(Process* p, Eterm* reg, Eterm keys_literal,
+static Eterm erts_gc_new_map(Process* p, Eterm* reg, Uint live,
+                             Uint n, BeamInstr* ptr) NOINLINE;
+static Eterm erts_gc_new_small_map_lit(Process* p, Eterm* reg, Eterm keys_literal,
                                Uint live, BeamInstr* ptr) NOINLINE;
-static Eterm update_map_assoc(Process* p, Eterm* reg, Uint live,
+static Eterm erts_gc_update_map_assoc(Process* p, Eterm* reg, Uint live,
                               Uint n, BeamInstr* new_p) NOINLINE;
-static Eterm update_map_exact(Process* p, Eterm* reg, Uint live,
+static Eterm erts_gc_update_map_exact(Process* p, Eterm* reg, Uint live,
                               Uint n, Eterm* new_p) NOINLINE;
 static Eterm get_map_element(Eterm map, Eterm key);
 static Eterm get_map_element_hash(Eterm map, Eterm key, Uint32 hx);
@@ -748,7 +749,7 @@ void process_main(Eterm * x_reg_array, FloatDef* f_reg_array)
             dtrace_proc_str(c_p, process_buf);
 
             if (ERTS_PROC_IS_EXITING(c_p)) {
-                strcpy(fun_buf, "<exiting>");
+                sys_strcpy(fun_buf, "<exiting>");
             } else {
                 ErtsCodeMFA *cmfa = find_function_from_pc(c_p->i);
                 if (cmfa) {
@@ -1228,7 +1229,7 @@ void erts_dirty_process_main(ErtsSchedulerData *esdp)
             dtrace_proc_str(c_p, process_buf);
 
             if (ERTS_PROC_IS_EXITING(c_p)) {
-                strcpy(fun_buf, "<exiting>");
+                sys_strcpy(fun_buf, "<exiting>");
             } else {
                 ErtsCodeMFA *cmfa = find_function_from_pc(c_p->i);
                 if (cmfa) {
@@ -1453,6 +1454,7 @@ handle_error(Process* c_p, BeamInstr* pc, Eterm* reg, ErtsCodeMFA *bif_mfa)
 	reg[3] = c_p->ftrace;
         if ((new_pc = next_catch(c_p, reg))) {
 	    c_p->cp = 0;	/* To avoid keeping stale references. */
+            c_p->msg.saved_last = 0;  /* No longer safe to use this position */
 	    return new_pc;
 	}
 	if (c_p->catches > 0) erts_exit(ERTS_ERROR_EXIT, "Catch not found");
@@ -2755,7 +2757,7 @@ do {						\
 
 
 static Eterm
-new_map(Process* p, Eterm* reg, Uint live, Uint n, BeamInstr* ptr)
+erts_gc_new_map(Process* p, Eterm* reg, Uint live, Uint n, BeamInstr* ptr)
 {
     Uint i;
     Uint need = n + 1 /* hdr */ + 1 /*size*/ + 1 /* ptr */ + 1 /* arity */;
@@ -2812,7 +2814,8 @@ new_map(Process* p, Eterm* reg, Uint live, Uint n, BeamInstr* ptr)
 }
 
 static Eterm
-new_small_map_lit(Process* p, Eterm* reg, Eterm keys_literal, Uint live, BeamInstr* ptr)
+erts_gc_new_small_map_lit(Process* p, Eterm* reg, Eterm keys_literal,
+                          Uint live, BeamInstr* ptr)
 {
     Eterm* keys = tuple_val(keys_literal);
     Uint n = arityval(*keys);
@@ -2846,7 +2849,8 @@ new_small_map_lit(Process* p, Eterm* reg, Eterm keys_literal, Uint live, BeamIns
 }
 
 static Eterm
-update_map_assoc(Process* p, Eterm* reg, Uint live, Uint n, BeamInstr* new_p)
+erts_gc_update_map_assoc(Process* p, Eterm* reg, Uint live,
+                         Uint n, BeamInstr* new_p)
 {
     Uint num_old;
     Uint num_updates;
@@ -2892,7 +2896,7 @@ update_map_assoc(Process* p, Eterm* reg, Uint live, Uint n, BeamInstr* new_p)
      */
 
     if (num_old == 0) {
-	return new_map(p, reg, live, n, new_p);
+	return erts_gc_new_map(p, reg, live, n, new_p);
     }
 
     /*
@@ -3048,7 +3052,7 @@ update_map_assoc(Process* p, Eterm* reg, Uint live, Uint n, BeamInstr* new_p)
  */
 
 static Eterm
-update_map_exact(Process* p, Eterm* reg, Uint live, Uint n, Eterm* new_p)
+erts_gc_update_map_exact(Process* p, Eterm* reg, Uint live, Uint n, Eterm* new_p)
 {
     Uint i;
     Uint num_old;
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index 7331c331a6..50498cb6cf 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2017. 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.
@@ -40,6 +40,7 @@
 #include "erl_zlib.h"
 #include "erl_map.h"
 #include "erl_process_dict.h"
+#include "erl_unicode.h"
 
 #ifdef HIPE
 #include "hipe_bif0.h"
@@ -458,7 +459,7 @@ typedef struct LoaderState {
 
 #ifdef DEBUG
 # define GARBAGE 0xCC
-# define DEBUG_INIT_GENOP(Dst) memset(Dst, GARBAGE, sizeof(GenOp))
+# define DEBUG_INIT_GENOP(Dst) sys_memset(Dst, GARBAGE, sizeof(GenOp))
 #else
 # define DEBUG_INIT_GENOP(Dst)
 #endif
@@ -1421,7 +1422,7 @@ load_atom_table(LoaderState* stp, ErtsAtomEncoding enc)
 	Atom* ap;
 
 	ap = atom_tab(atom_val(stp->atom[1]));
-	memcpy(sbuf, ap->name, ap->len);
+	sys_memcpy(sbuf, ap->name, ap->len);
 	sbuf[ap->len] = '\0';
 	LoadError1(stp, "module name in object code is %s", sbuf);
     }
@@ -1806,7 +1807,7 @@ read_line_table(LoaderState* stp)
 
 	    GetInt(stp, 2, n);
 	    GetString(stp, fname, n);
-	    stp->fname[i] = erts_atom_put(fname, n, ERTS_ATOM_ENC_LATIN1, 1);
+	    stp->fname[i] = erts_atom_put(fname, n, ERTS_ATOM_ENC_UTF8, 1);
 	}
     }
 
@@ -2088,7 +2089,7 @@ load_code(LoaderState* stp)
 			    erts_alloc(ERTS_ALC_T_LOADER_TMP,
 				       (arity+last_op->a[arg].val)
 				       *sizeof(GenOpArg));
-			memcpy(last_op->a, last_op->def_args,
+			sys_memcpy(last_op->a, last_op->def_args,
 			       arity*sizeof(GenOpArg));
 			arity += last_op->a[arg].val;
 			break;
@@ -2384,8 +2385,18 @@ load_code(LoaderState* stp)
 		    code[ci++] = NIL;
 		    break;
 		case TAG_q:
-		    new_literal_patch(stp, ci);
-		    code[ci++] = tmp_op->a[arg].val;
+                    {
+                        BeamInstr val = tmp_op->a[arg].val;
+                        Eterm term = stp->literals[val].term;
+                        new_literal_patch(stp, ci);
+                        code[ci++] = val;
+                        switch (loader_tag(term)) {
+                        case LOADER_X_REG:
+                        case LOADER_Y_REG:
+                            LoadError1(stp, "the term '%T' would be confused "
+                                       "with a register", term);
+                        }
+                    }
 		    break;
 		default:
 		    LoadError1(stp, "bad tag %d for general source",
@@ -4904,7 +4915,7 @@ freeze_code(LoaderState* stp)
 	line_items[i] = codev + stp->ci - 1;
 
 	line_tab->fname_ptr = (Eterm*) &line_items[i + 1];
-	memcpy(line_tab->fname_ptr, stp->fname, stp->num_fnames*sizeof(Eterm));
+	sys_memcpy(line_tab->fname_ptr, stp->fname, stp->num_fnames*sizeof(Eterm));
 
 	line_tab->loc_size = stp->loc_size;
 	if (stp->loc_size == 2) {
@@ -5487,8 +5498,8 @@ transform_engine(LoaderState* st)
 	case TOP_store_rest_args:
 	    {
 		GENOP_ARITY(instr, instr->arity+num_rest_args);
-		memcpy(instr->a, instr->def_args, ap*sizeof(GenOpArg));
-		memcpy(instr->a+ap, rest_args, num_rest_args*sizeof(GenOpArg));
+		sys_memcpy(instr->a, instr->def_args, ap*sizeof(GenOpArg));
+		sys_memcpy(instr->a+ap, rest_args, num_rest_args*sizeof(GenOpArg));
 		ap += num_rest_args;
 	    }
 	    break;
@@ -6018,13 +6029,36 @@ erts_release_literal_area(ErtsLiteralArea* literal_area)
 	return;
 
     oh = literal_area->off_heap;
-	
+
     while (oh) {
-	Binary* bptr;
-	ASSERT(thing_subtag(oh->thing_word) == REFC_BINARY_SUBTAG);
-	bptr = ((ProcBin*)oh)->val;
-        erts_bin_release(bptr);
-	oh = oh->next;
+        switch (thing_subtag(oh->thing_word)) {
+        case REFC_BINARY_SUBTAG:
+            {
+                Binary* bptr = ((ProcBin*)oh)->val;
+                erts_bin_release(bptr);
+                break;
+            }
+        case FUN_SUBTAG:
+            {
+                ErlFunEntry* fe = ((ErlFunThing*)oh)->fe;
+                if (erts_refc_dectest(&fe->refc, 0) == 0) {
+                    erts_erase_fun_entry(fe);
+                }
+                break;
+            }
+        case REF_SUBTAG:
+            {
+                ErtsMagicBinary *bptr;
+                ASSERT(is_magic_ref_thing(oh));
+                bptr = ((ErtsMRefThing *) oh)->mb;
+                erts_bin_release((Binary *) bptr);
+                break;
+            }
+        default:
+            ASSERT(is_external_header(oh->thing_word));
+            erts_deref_node_entry(((ExternalThing*)oh)->node);
+        }
+        oh = oh->next;
     }
     erts_free(ERTS_ALC_T_LITERAL, literal_area);
 }
@@ -6221,8 +6255,7 @@ erts_build_mfa_item(FunctionInfo* fi, Eterm* hp, Eterm args, Eterm* mfa_p)
 	    file_term = buf_to_intlist(&hp, ".erl", 4, NIL);
 	    file_term = buf_to_intlist(&hp, (char*)ap->name, ap->len, file_term);
 	} else {
-	    Atom* ap = atom_tab(atom_val((fi->fname_ptr)[file-1]));
-	    file_term = buf_to_intlist(&hp, (char*)ap->name, ap->len, NIL);
+            file_term = erts_atom_to_string(&hp, (fi->fname_ptr)[file-1]);
 	}
 
 	tuple = TUPLE2(hp, am_line, make_small(line));
@@ -6414,7 +6447,7 @@ stub_copy_info(LoaderState* stp,
     Sint decoded_size;
     Uint size = stp->chunks[chunk].size;
     if (size != 0) {
-	memcpy(info, stp->chunks[chunk].start, size);
+	sys_memcpy(info, stp->chunks[chunk].start, size);
 	*ptr_word = info;
 	decoded_size = erts_decode_ext_size(info, size);
 	if (decoded_size < 0) {
@@ -6951,6 +6984,8 @@ int erts_commit_hipe_patch_load(Eterm hipe_magic_bin)
     hipe_stp->new_hipe_refs = NULL;
     hipe_stp->new_hipe_sdesc = NULL;
 
+    hipe_redirect_to_module(modp);
+
     return 1;
 }
 
@@ -6982,8 +7017,8 @@ void dbg_set_traced_mfa(const char* m, const char* f, Uint a)
 {
     unsigned i = dbg_trace_ix++;
     ASSERT(i < MFA_MAX);
-    dbg_trace_m[i] = am_atom_put(m, strlen(m));
-    dbg_trace_f[i] = am_atom_put(f, strlen(f));
+    dbg_trace_m[i] = am_atom_put(m, sys_strlen(m));
+    dbg_trace_f[i] = am_atom_put(f, sys_strlen(f));
     dbg_trace_a[i] = a;
 }
 
diff --git a/erts/emulator/beam/beam_ranges.c b/erts/emulator/beam/beam_ranges.c
index 01bda7f3c1..f0c9496341 100644
--- a/erts/emulator/beam/beam_ranges.c
+++ b/erts/emulator/beam/beam_ranges.c
@@ -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.
@@ -26,6 +26,7 @@
 #include "erl_vm.h"
 #include "global.h"
 #include "beam_load.h"
+#include "erl_unicode.h"
 
 typedef struct {
     BeamInstr* start;		/* Pointer to start of module. */
@@ -341,8 +342,7 @@ lookup_loc(FunctionInfo* fi, const BeamInstr* pc,
 		Atom* mod_atom = atom_tab(atom_val(fi->mfa->module));
 		fi->needed += 2*(mod_atom->len+4);
 	    } else {
-		Atom* ap = atom_tab(atom_val((fi->fname_ptr)[file-1]));
-		fi->needed += 2*ap->len;
+                fi->needed += 2*erts_atom_to_string_length((fi->fname_ptr)[file-1]);
 	    }
 	    return;
 	} else {
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 4b11884f38..652b95105f 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -59,6 +59,7 @@ Export *erts_convert_time_unit_trap = NULL;
 static Export *await_msacc_mod_trap = NULL;
 static erts_atomic32_t msacc;
 
+static Export *system_flag_scheduler_wall_time_trap;
 static Export *await_sched_wall_time_mod_trap;
 static erts_atomic32_t sched_wall_time;
 
@@ -227,17 +228,38 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
 		goto res_no_proc;
 	    }
 
-	    code = erts_dsig_prepare(&dsd, dep, BIF_P, ERTS_DSP_RLOCK, 0);
+	    code = erts_dsig_prepare(&dsd, dep, BIF_P,
+				     (ERTS_PROC_LOCK_MAIN | ERTS_PROC_LOCK_LINK),
+				     ERTS_DSP_RLOCK, 0, 1);
 	    switch (code) {
 	    case ERTS_DSIG_PREP_NOT_ALIVE:
-		/* Let the dlink trap handle it */
-	    case ERTS_DSIG_PREP_NOT_CONNECTED:
-		erts_proc_unlock(BIF_P, ERTS_PROC_LOCK_LINK);
-		BIF_TRAP1(dlink_trap, BIF_P, BIF_ARG_1);
-
+	    case ERTS_DSIG_PREP_NOT_CONNECTED: {
+		ErtsProcLocks locks = ERTS_PROC_LOCK_MAIN | ERTS_PROC_LOCK_LINK;
+		erts_aint32_t state;
+		erts_proc_lock(BIF_P, (ERTS_PROC_LOCKS_ALL & ~locks));
+		locks = ERTS_PROC_LOCKS_ALL;
+		erts_send_exit_signal(BIF_P, BIF_ARG_1, BIF_P, &locks,
+				      am_noconnection, NIL, NULL, 0);
+		erts_proc_unlock(BIF_P, locks & ERTS_PROC_LOCKS_ALL_MINOR);
+
+		/*
+		 * Copy-paste from old dist_exit_3, not sure if we really
+		 * need erts_handle_pending_exit when exit_2 does not.
+		 */
+		state = erts_atomic32_read_acqb(&BIF_P->state);
+		if (state & (ERTS_PSFLG_EXITING|ERTS_PSFLG_PENDING_EXIT)) {
+		    if (state & ERTS_PSFLG_PENDING_EXIT)
+			erts_handle_pending_exit(BIF_P, ERTS_PROC_LOCK_MAIN);
+		    ERTS_BIF_EXITED(BIF_P);
+		}
+		BIF_RET(am_true);
+	    }
+            case ERTS_DSIG_PREP_PENDING:
 	    case ERTS_DSIG_PREP_CONNECTED:
-		/* We are connected. Setup link and send link signal */
-
+                /*
+                 * We have (pending) connection.
+                 * Setup link and enqueue link signal.
+                 */
 		erts_de_links_lock(dep);
 
 		erts_add_link(&ERTS_P_LINKS(BIF_P), LINK_PID, BIF_ARG_1);
@@ -256,8 +278,7 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
 		    ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
 		BIF_RET(am_true);
 	    default:
-		ASSERT(! "Invalid dsig prepare result");
-		BIF_ERROR(BIF_P, EXC_INTERNAL_ERROR);
+		ERTS_ASSERT(! "Invalid dsig prepare result");
 	    }
 	}
     }
@@ -292,7 +313,8 @@ remote_demonitor(Process *c_p, DistEntry *dep, Eterm ref, Eterm to)
     ERTS_LC_ASSERT((ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_LINK)
 		       == erts_proc_lc_my_proc_locks(c_p));
 
-    code = erts_dsig_prepare(&dsd, dep, c_p, ERTS_DSP_RLOCK, 0);
+    code = erts_dsig_prepare(&dsd, dep, c_p, ERTS_PROC_LOCK_MAIN,
+			     ERTS_DSP_RLOCK, 0, 0);
     switch (code) {
     case ERTS_DSIG_PREP_NOT_ALIVE:
     case ERTS_DSIG_PREP_NOT_CONNECTED:
@@ -313,6 +335,7 @@ remote_demonitor(Process *c_p, DistEntry *dep, Eterm ref, Eterm to)
         res = am_true;
 	break;
 
+    case ERTS_DSIG_PREP_PENDING:
     case ERTS_DSIG_PREP_CONNECTED:
 
 	erts_de_links_lock(dep);
@@ -347,8 +370,7 @@ remote_demonitor(Process *c_p, DistEntry *dep, Eterm ref, Eterm to)
 	}
 	break;
     default:
-	ASSERT(! "Invalid dsig prepare result");
-        return am_internal_error;
+	ERTS_ASSERT(! "Invalid dsig prepare result");
     }
 
 
@@ -767,23 +789,20 @@ remote_monitor(Process *p, Eterm bifarg1, Eterm bifarg2,
     BIF_RETTYPE ret;
     int code;
 
+    ASSERT(dep);
     erts_proc_lock(p, ERTS_PROC_LOCK_LINK);
-    code = erts_dsig_prepare(&dsd, dep, p, ERTS_DSP_RLOCK, 0);
+    code = erts_dsig_prepare(&dsd, dep,
+			     p, (ERTS_PROC_LOCK_MAIN | ERTS_PROC_LOCK_LINK),
+			     ERTS_DSP_RLOCK, 0, 1);
     switch (code) {
     case ERTS_DSIG_PREP_NOT_ALIVE:
-	/* Let the dmonitor_p trap handle it */
     case ERTS_DSIG_PREP_NOT_CONNECTED:
 	erts_proc_unlock(p, ERTS_PROC_LOCK_LINK);
 	ERTS_BIF_PREP_TRAP2(ret, dmonitor_p_trap, p, bifarg1, bifarg2);
 	break;
+    case ERTS_DSIG_PREP_PENDING:
     case ERTS_DSIG_PREP_CONNECTED:
-	if (!(dep->flags & DFLAG_DIST_MONITOR)
-	    || (byname && !(dep->flags & DFLAG_DIST_MONITOR_NAME))) {
-	    erts_de_runlock(dep);
-	    erts_proc_unlock(p, ERTS_PROC_LOCK_LINK);
-	    ERTS_BIF_PREP_ERROR(ret, p, BADARG);
-	}
-	else {
+	{
 	    Eterm p_trgt, p_name, d_name, mon_ref;
 
 	    mon_ref = erts_make_ref(p);
@@ -818,9 +837,7 @@ remote_monitor(Process *p, Eterm bifarg1, Eterm bifarg2,
 	}
 	break;
     default:
-	ASSERT(! "Invalid dsig prepare result");
-	ERTS_BIF_PREP_ERROR(ret, p, EXC_INTERNAL_ERROR);
-	break;
+	ERTS_ASSERT(! "Invalid dsig prepare result");
     }
 
     BIF_RET(ret);
@@ -888,17 +905,17 @@ local_port:
 	if (!erts_is_alive && remote_node != am_Noname) {
             goto badarg; /* Remote monitor from (this) undistributed node */
 	}
-	dep = erts_sysname_to_connected_dist_entry(remote_node);
+	dep = erts_find_or_insert_dist_entry(remote_node);
 	if (dep == erts_this_dist_entry) {
             ret = local_name_monitor(BIF_P, BIF_ARG_1, name);
 	} else {
 	    ret = remote_monitor(BIF_P, BIF_ARG_1, BIF_ARG_2, dep, name, 1);
 	}
+	erts_deref_dist_entry(dep);
     } else {
 badarg:
 	ERTS_BIF_PREP_ERROR(ret, BIF_P, BADARG);
     }
-
     return ret;
 }
 
@@ -1158,21 +1175,14 @@ BIF_RETTYPE unlink_1(BIF_ALIST_1)
 	    BIF_RET(am_true);
 	}
 
-	code = erts_dsig_prepare(&dsd, dep, BIF_P, ERTS_DSP_NO_LOCK, 0);
+	code = erts_dsig_prepare(&dsd, dep, BIF_P, ERTS_PROC_LOCK_MAIN,
+				 ERTS_DSP_NO_LOCK, 0, 0);
 	switch (code) {
 	case ERTS_DSIG_PREP_NOT_ALIVE:
 	case ERTS_DSIG_PREP_NOT_CONNECTED:
-#if 1
 	    BIF_RET(am_true);
-#else
-	    /*
-	     * This is how we used to do it, but the link is obviously not
-	     * active, so I see no point in setting up a connection.
-	     * /Rickard
-	     */
-	    BIF_TRAP1(dunlink_trap, BIF_P, BIF_ARG_1);
-#endif
 
+	case ERTS_DSIG_PREP_PENDING:
 	case ERTS_DSIG_PREP_CONNECTED:
 	    erts_remove_dist_link(&dld, BIF_P->common.id, BIF_ARG_1, dep);
 	    code = erts_dsig_send_unlink(&dsd, BIF_P->common.id, BIF_ARG_1);
@@ -1545,22 +1555,24 @@ BIF_RETTYPE exit_2(BIF_ALIST_2)
 	 DistEntry *dep;
 
 	 dep = external_pid_dist_entry(BIF_ARG_1);
+	 ERTS_ASSERT(dep);
 	 if(dep == erts_this_dist_entry)
 	     BIF_RET(am_true);
 
-	 code = erts_dsig_prepare(&dsd, dep, BIF_P, ERTS_DSP_NO_LOCK, 0);
+	 code = erts_dsig_prepare(&dsd, dep, BIF_P, ERTS_PROC_LOCK_MAIN,
+				  ERTS_DSP_NO_LOCK, 0, 1);
 	 switch (code) {
 	 case ERTS_DSIG_PREP_NOT_ALIVE:
 	 case ERTS_DSIG_PREP_NOT_CONNECTED:
-	     BIF_TRAP2(dexit_trap, BIF_P, BIF_ARG_1, BIF_ARG_2);
+	     BIF_RET(am_true);
+	 case ERTS_DSIG_PREP_PENDING:
 	 case ERTS_DSIG_PREP_CONNECTED:
 	     code = erts_dsig_send_exit2(&dsd, BIF_P->common.id, BIF_ARG_1, BIF_ARG_2);
 	     if (code == ERTS_DSIG_SEND_YIELD)
 		 ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
 	     BIF_RET(am_true);
 	 default:
-	     ASSERT(! "Invalid dsig prepare result");
-	     BIF_ERROR(BIF_P, EXC_INTERNAL_ERROR);
+	     ERTS_ASSERT(! "Invalid dsig prepare result");
 	 }
      }
      else if (is_not_internal_pid(BIF_ARG_1)) {
@@ -1732,7 +1744,6 @@ BIF_RETTYPE process_flag_2(BIF_ALIST_2)
    else if (BIF_ARG_1 == am_scheduler) {
        ErtsRunQueue *old, *new, *curr;
        Sint sched;
-       erts_aint32_t state;
 
        if (!is_small(BIF_ARG_2))
 	   goto error;
@@ -1741,23 +1752,23 @@ BIF_RETTYPE process_flag_2(BIF_ALIST_2)
 	   goto error;
 
        if (sched == 0) {
+           old = erts_bind_runq_proc(BIF_P, 0);
 	   new = NULL;
-	   state = erts_atomic32_read_band_mb(&BIF_P->state,
-						  ~ERTS_PSFLG_BOUND);
        }
        else {
+           int bound = !0;
 	   new = erts_schedid2runq(sched);
-	   erts_atomic_set_nob(&BIF_P->run_queue, (erts_aint_t) new);
-	   state = erts_atomic32_read_bor_mb(&BIF_P->state,
-						 ERTS_PSFLG_BOUND);
+           old = erts_set_runq_proc(BIF_P, new, &bound);
+           if (!bound)
+               old = NULL;
        }
 
+       old_value = old ? make_small(old->ix+1) : make_small(0);
+
        curr = erts_proc_sched_data(BIF_P)->run_queue;
-       old = (ERTS_PSFLG_BOUND & state) ? curr : NULL;
 
        ASSERT(!old || old == curr);
 
-       old_value = old ? make_small(old->ix+1) : make_small(0);
        if (new && new != curr)
 	   ERTS_BIF_YIELD_RETURN_X(BIF_P, old_value, am_scheduler);
        else
@@ -1964,7 +1975,7 @@ ebif_bang_2(BIF_ALIST_2)
  * Send a message to Process, Port or Registered Process.
  * Returns non-negative reduction bump or negative result code.
  */
-#define SEND_TRAP		(-1)
+#define SEND_NOCONNECT		(-1)
 #define SEND_YIELD		(-2)
 #define SEND_YIELD_RETURN	(-3)
 #define SEND_BADARG		(-4)
@@ -1980,20 +1991,22 @@ static Sint remote_send(Process *p, DistEntry *dep,
 {
     Sint res;
     int code;
-
     ASSERT(is_atom(to) || is_external_pid(to));
 
     ctx->dep = dep;
-    code = erts_dsig_prepare(&ctx->dsd, dep, p, ERTS_DSP_NO_LOCK, !ctx->suspend);
+    code = erts_dsig_prepare(&ctx->dsd, dep, p, ERTS_PROC_LOCK_MAIN,
+			     ERTS_DSP_NO_LOCK,
+			     !ctx->suspend, ctx->connect);
     switch (code) {
     case ERTS_DSIG_PREP_NOT_ALIVE:
     case ERTS_DSIG_PREP_NOT_CONNECTED:
-	res = SEND_TRAP;
+	res = SEND_NOCONNECT;
 	break;
     case ERTS_DSIG_PREP_WOULD_SUSPEND:
 	ASSERT(!ctx->suspend);
 	res = SEND_YIELD;
 	break;
+    case ERTS_DSIG_PREP_PENDING:
     case ERTS_DSIG_PREP_CONNECTED: {
 
 	if (is_atom(to))
@@ -2170,6 +2183,7 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
 	}
 	return ret_val;
     } else if (is_tuple(to)) { /* Remote send */
+        int deref_dep = 0;
 	int ret;
 	tp = tuple_val(to);
 	if (*tp != make_arityval(2))
@@ -2177,11 +2191,10 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
 	if (is_not_atom(tp[1]) || is_not_atom(tp[2]))
 	    return SEND_BADARG;
 	
-	/* sysname_to_connected_dist_entry will return NULL if there
-	   is no dist_entry or the dist_entry has no port,
+	/* erts_find_dist_entry will return NULL if there is no dist_entry
 	   but remote_send() will handle that. */
 
-	dep = erts_sysname_to_connected_dist_entry(tp[2]);
+	dep = erts_find_dist_entry(tp[2]);
 
 	if (dep == erts_this_dist_entry) {
 	    Eterm id;
@@ -2205,13 +2218,20 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
 	    }
 	    return 0;
 	}
+        if (dep == NULL) {
+            dep = erts_find_or_insert_dist_entry(tp[2]);
+            ASSERT(dep != erts_this_dist_entry);
+            deref_dep = 1;
+        }
+	ctx->dsd.node = tp[2];
 
 	ret = remote_send(p, dep, tp[1], to, msg, ctx);
 	if (ret == SEND_YIELD_CONTINUE) {
-            if (dep)
-                erts_ref_dist_entry(dep);
-	    ctx->dep_to_deref = dep;
+            erts_ref_dist_entry(ctx->dep);
+            ctx->deref_dep = 1;
 	}
+        if (deref_dep)
+            erts_deref_dist_entry(dep);
 	return ret;
     } else {
 	if (IS_TRACED_FL(p, F_TRACE_SEND))
@@ -2223,20 +2243,15 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
     
  send_message: {
 	ErtsProcLocks rp_locks = 0;
-	Sint res;
 	if (p == rp)
 	    rp_locks |= ERTS_PROC_LOCK_MAIN;
 	/* send to local process */
-	res = erts_send_message(p, rp, &rp_locks, msg, 0);
-	if (erts_use_sender_punish)
-	    res *= 4;
-	else
-	    res = 0;
+	erts_send_message(p, rp, &rp_locks, msg, 0);
 	erts_proc_unlock(rp,
 			     p == rp
 			     ? (rp_locks & ~ERTS_PROC_LOCK_MAIN)
 			     : rp_locks);
-	return res;
+	return 0;
     }
 }
 
@@ -2251,7 +2266,6 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
     Eterm msg = BIF_ARG_2;
     Eterm opts = BIF_ARG_3;
 
-    int connect = !0;
     Eterm l = opts;
     Sint result;
 
@@ -2262,14 +2276,15 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
     UseTmpHeap(sizeof(ErtsSendContext)/sizeof(Eterm), BIF_P);
 
     ctx->suspend = !0;
-    ctx->dep_to_deref = NULL;
+    ctx->connect = !0;
+    ctx->deref_dep = 0;
     ctx->return_term = am_ok;
     ctx->dss.reds = (Sint) (ERTS_BIF_REDS_LEFT(p) * TERM_TO_BINARY_LOOP_FACTOR);
     ctx->dss.phase = ERTS_DSIG_SEND_PHASE_INIT;
 
     while (is_list(l)) {
 	if (CAR(list_val(l)) == am_noconnect) {
-	    connect = 0;
+	    ctx->connect = 0;
 	} else if (CAR(list_val(l)) == am_nosuspend) {
 	    ctx->suspend = 0;
 	} else {
@@ -2291,8 +2306,8 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
     result = do_send(p, to, msg, &ref, ctx);
     ERTS_MSACC_POP_STATE_M_X();
 
-    if (result > 0) {
-	ERTS_VBUMP_REDS(p, result);
+    if (result >= 0) {
+	ERTS_VBUMP_REDS(p, 4);
 	if (ERTS_IS_PROC_OUT_OF_REDS(p))
 	    goto yield_return;
 	ERTS_BIF_PREP_RET(retval, am_ok);
@@ -2300,15 +2315,9 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
     }
 
     switch (result) {
-    case 0:
-	/* May need to yield even though we do not bump reds here... */
-	if (ERTS_IS_PROC_OUT_OF_REDS(p))
-	    goto yield_return;
-	ERTS_BIF_PREP_RET(retval, am_ok);
-	break;
-    case SEND_TRAP:
-	if (connect) {
-	    ERTS_BIF_PREP_TRAP3(retval, dsend3_trap, p, to, msg, opts);
+    case SEND_NOCONNECT:
+	if (ctx->connect) {
+	    ERTS_BIF_PREP_RET(retval, am_ok);
 	} else {
 	    ERTS_BIF_PREP_RET(retval, am_noconnect);
 	}
@@ -2412,7 +2421,8 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg)
     ref = NIL;
 #endif
     ctx->suspend = !0;
-    ctx->dep_to_deref = NULL;
+    ctx->connect = !0;
+    ctx->deref_dep = 0;
     ctx->return_term = msg;
     ctx->dss.reds = (Sint) (ERTS_BIF_REDS_LEFT(p) * TERM_TO_BINARY_LOOP_FACTOR);
     ctx->dss.phase = ERTS_DSIG_SEND_PHASE_INIT;
@@ -2421,8 +2431,8 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg)
 
     ERTS_MSACC_POP_STATE_M_X();
 
-    if (result > 0) {
-	ERTS_VBUMP_REDS(p, result);
+    if (result >= 0) {
+	ERTS_VBUMP_REDS(p, 4);
 	if (ERTS_IS_PROC_OUT_OF_REDS(p))
 	    goto yield_return;
 	ERTS_BIF_PREP_RET(retval, msg);
@@ -2430,15 +2440,9 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg)
     }
 
     switch (result) {
-    case 0:
-	/* May need to yield even though we do not bump reds here... */
-	if (ERTS_IS_PROC_OUT_OF_REDS(p))
-	    goto yield_return;
+    case SEND_NOCONNECT:
 	ERTS_BIF_PREP_RET(retval, msg);
 	break;
-    case SEND_TRAP:
-	ERTS_BIF_PREP_TRAP2(retval, dsend2_trap, p, to, msg);
-	break;
     case SEND_YIELD:
 	ERTS_BIF_PREP_YIELD2(retval, bif_export[BIF_send_2], p, to, msg);
 	break;
@@ -3097,7 +3101,7 @@ BIF_RETTYPE list_to_integer_2(BIF_ALIST_2)
 static int do_float_to_charbuf(Process *p, Eterm efloat, Eterm list, 
 			char *fbuf, int sizeof_fbuf) {
 
-    const static int arity_two = make_arityval(2);
+    Eterm arity_two = make_arityval(2);
     int decimals = SYS_DEFAULT_FLOAT_DECIMALS;
     int compact = 0;
     enum fmt_type_ {
@@ -3461,7 +3465,7 @@ BIF_RETTYPE binary_to_float_1(BIF_ALIST_1)
     if (bit_offs)
       erts_copy_bits(bytes, bit_offs, 1, buf, 0, 1, size*8);
     else
-      memcpy(buf, bytes, size);
+      sys_memcpy(buf, bytes, size);
     
     buf[size] = '\0';
     
@@ -4195,10 +4199,10 @@ BIF_RETTYPE list_to_port_1(BIF_ALIST_1)
     buf[i] = '\0';		/* null terminal */
 
     cp = &buf[0];
-    if (strncmp("#Port<", cp, 6) != 0)
+    if (sys_strncmp("#Port<", cp, 6) != 0)
         goto bad;
 
-    cp += 6; /* strlen("#Port<") */
+    cp += 6; /* sys_strlen("#Port<") */
 
     if (sscanf(cp, "%u.%u>", (unsigned int*)&n, (unsigned int*)&p) < 2)
         goto bad;
@@ -4384,23 +4388,24 @@ BIF_RETTYPE group_leader_2(BIF_ALIST_2)
 	int code;
 	ErtsDSigData dsd;
 	dep = external_pid_dist_entry(BIF_ARG_2);
+	ERTS_ASSERT(dep);
 	if(dep == erts_this_dist_entry)
 	    BIF_ERROR(BIF_P, BADARG);
 
-	code = erts_dsig_prepare(&dsd, dep, BIF_P, ERTS_DSP_NO_LOCK, 0);
+	code = erts_dsig_prepare(&dsd, dep, BIF_P, ERTS_PROC_LOCK_MAIN,
+				 ERTS_DSP_NO_LOCK, 0, 1);
 	switch (code) {
 	case ERTS_DSIG_PREP_NOT_ALIVE:
-	    BIF_RET(am_true);
 	case ERTS_DSIG_PREP_NOT_CONNECTED:
-	    BIF_TRAP2(dgroup_leader_trap, BIF_P, BIF_ARG_1, BIF_ARG_2);
+	    BIF_RET(am_true);
+	case ERTS_DSIG_PREP_PENDING:
 	case ERTS_DSIG_PREP_CONNECTED:
 	    code = erts_dsig_send_group_leader(&dsd, BIF_ARG_1, BIF_ARG_2);
 	    if (code == ERTS_DSIG_SEND_YIELD)
 		ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
 	    BIF_RET(am_true);
 	default:
-	    ASSERT(! "Invalid dsig prepare result");
-	    BIF_ERROR(BIF_P, EXC_INTERNAL_ERROR);
+	    ERTS_ASSERT(! "Invalid dsig prepare result");
 	}
     }
     else if (is_internal_pid(BIF_ARG_2)) {
@@ -4472,7 +4477,7 @@ BIF_RETTYPE group_leader_2(BIF_ALIST_2)
 	BIF_ERROR(BIF_P, BADARG);
     }
 }
-    
+
 BIF_RETTYPE system_flag_2(BIF_ALIST_2)    
 {
     Sint n;
@@ -4690,17 +4695,9 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 
 	BIF_RET(am_true);
     } else if (BIF_ARG_1 == am_scheduler_wall_time) {
-	if (BIF_ARG_2 == am_true || BIF_ARG_2 == am_false) {
-	    erts_aint32_t new = BIF_ARG_2 == am_true ? 1 : 0;
-	    erts_aint32_t old = erts_atomic32_xchg_nob(&sched_wall_time,
-							   new);
-	    Eterm ref = erts_sched_wall_time_request(BIF_P, 1, new, 0, 0);
-	    ASSERT(is_value(ref));
-	    BIF_TRAP2(await_sched_wall_time_mod_trap,
-		      BIF_P,
-		      ref,
-		      old ? am_true : am_false);
-	}
+	if (BIF_ARG_2 == am_true || BIF_ARG_2 == am_false)
+            BIF_TRAP1(system_flag_scheduler_wall_time_trap,
+                      BIF_P, BIF_ARG_2);
     } else if (BIF_ARG_1 == am_dirty_cpu_schedulers_online) {
 	Sint old_no;
 	if (!is_small(BIF_ARG_2))
@@ -4807,11 +4804,24 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 	    "scheduled for removal in Erlang/OTP 18. For more\n"
 	    "information see the erlang:system_flag/2 documentation.\n");
 	return erts_bind_schedulers(BIF_P, BIF_ARG_2);
+    } else if (ERTS_IS_ATOM_STR("erts_alloc", BIF_ARG_1)) {
+        return erts_alloc_set_dyn_param(BIF_P, BIF_ARG_2);
     }
     error:
     BIF_ERROR(BIF_P, BADARG);
 }
 
+BIF_RETTYPE erts_internal_scheduler_wall_time_1(BIF_ALIST_1)
+{
+    erts_aint32_t new = BIF_ARG_1 == am_true ? 1 : 0;
+    erts_aint32_t old = erts_atomic32_xchg_nob(&sched_wall_time,
+                                               new);
+    Eterm ref = erts_sched_wall_time_request(BIF_P, 1, new, 0, 0);
+    ASSERT(is_value(ref));
+    BIF_TRAP2(await_sched_wall_time_mod_trap,
+              BIF_P, ref, old ? am_true : am_false);
+}
+
 /**********************************************************************/
 
 BIF_RETTYPE phash_2(BIF_ALIST_2)
@@ -5070,8 +5080,10 @@ void erts_init_bif(void)
     await_proc_exit_trap = erts_export_put(am_erlang,am_await_proc_exit,3);
     await_port_send_result_trap
 	= erts_export_put(am_erts_internal, am_await_port_send_result, 3);
+    system_flag_scheduler_wall_time_trap
+        = erts_export_put(am_erts_internal, am_system_flag_scheduler_wall_time, 1);
     await_sched_wall_time_mod_trap
-        = erts_export_put(am_erlang, am_await_sched_wall_time_modifications, 2);
+        = erts_export_put(am_erts_internal, am_await_sched_wall_time_modifications, 2);
     await_msacc_mod_trap
 	= erts_export_put(am_erts_internal, am_await_microstate_accounting_modifications, 3);
 
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index f7b4451890..be653ee2a0 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -153,14 +153,12 @@ bif erlang:whereis/1
 bif erlang:spawn_opt/1
 bif erlang:setnode/2
 bif erlang:setnode/3
-bif erlang:dist_exit/3
 bif erlang:dist_get_stat/1
 bif erlang:dist_ctrl_input_handler/2
 bif erlang:dist_ctrl_put_data/2
 bif erlang:dist_ctrl_get_data/1
 bif erlang:dist_ctrl_get_data_notification/1
 
-
 # Static native functions in erts_internal
 bif erts_internal:port_info/1
 bif erts_internal:port_info/2
@@ -187,6 +185,8 @@ bif erts_internal:system_check/1
 
 bif erts_internal:release_literal_area_switch/0
 
+bif erts_internal:scheduler_wall_time/1
+
 # inet_db support
 bif erlang:port_set_data/2
 bif erlang:port_get_data/1
@@ -376,9 +376,10 @@ bif ets:match_spec_run_r/3
 # Bifs in os module.
 #
 
-bif os:putenv/2
-bif os:getenv/0
-bif os:getenv/1
+bif os:get_env_var/1
+bif os:set_env_var/2
+bif os:unset_env_var/1
+bif os:list_env_vars/0
 bif os:getpid/0
 bif os:timestamp/0
 bif os:system_time/0
@@ -550,9 +551,6 @@ bif binary:last/1
 bif binary:at/2
 bif binary:part/2 binary_binary_part_2
 bif binary:part/3 binary_binary_part_3
-bif binary:bin_to_list/1
-bif binary:bin_to_list/2
-bif binary:bin_to_list/3
 bif binary:list_to_bin/1
 bif binary:copy/1
 bif binary:copy/2
@@ -619,7 +617,6 @@ bif erlang:float_to_binary/2
 bif erlang:binary_to_float/1
 
 bif io:printable_range/0
-bif os:unsetenv/1
 
 #
 # New in 17.0
@@ -629,7 +626,6 @@ bif re:inspect/2
 
 ubif erlang:is_map/1
 gcbif erlang:map_size/1
-bif maps:to_list/1
 bif maps:find/2
 bif maps:get/2
 bif maps:from_list/1
@@ -684,10 +680,18 @@ bif math:floor/1
 bif math:ceil/1
 bif math:fmod/2
 bif os:set_signal/2
-bif erts_internal:maps_to_list/2
 
 #
 # New in 20.1
 #
-
 bif erlang:iolist_to_iovec/1
+
+#
+# New in 21.0
+#
+
+bif erts_internal:get_dflags/0
+bif erts_internal:new_connection/1
+bif erts_internal:abort_connection/2
+bif erts_internal:map_next/3
+bif ets:whereis/1
diff --git a/erts/emulator/beam/big.c b/erts/emulator/beam/big.c
index 5eaf262cd8..c5cb268f09 100644
--- a/erts/emulator/beam/big.c
+++ b/erts/emulator/beam/big.c
@@ -2549,12 +2549,17 @@ int term_equals_2pow32(Eterm x)
     }
 }
 
+static ERTS_INLINE int c2int_is_valid_char(byte ch, int base) {
+    if (base <= 10)
+        return (ch >= '0' && ch < ('0' + base));
+    else
+        return (ch >= '0' && ch <= '9')
+            || (ch >= 'A' && ch < ('A' + base - 10))
+            || (ch >= 'a' && ch < ('a' + base - 10));
+}
+
 static ERTS_INLINE int c2int_is_invalid_char(byte ch, int base) {
-    return (ch < '0'
-            || (ch > ('0' + base - 1)
-                && !(base > 10
-                     && ((ch >= 'a' && ch < ('a' + base - 10))
-                         || (ch >= 'A' && ch < ('A' + base - 10))))));
+    return !c2int_is_valid_char(ch, base);
 }
 
 static ERTS_INLINE byte c2int_digit_from_base(byte ch) {
diff --git a/erts/emulator/beam/binary.c b/erts/emulator/beam/binary.c
index ca3e48e205..95d324d2c1 100644
--- a/erts/emulator/beam/binary.c
+++ b/erts/emulator/beam/binary.c
@@ -60,14 +60,36 @@ erts_init_binary(void)
 
 }
 
+static ERTS_INLINE
+Eterm build_proc_bin(ErlOffHeap* ohp, Eterm* hp, Binary* bptr)
+{
+    ProcBin* pb = (ProcBin *) hp;
+    pb->thing_word = HEADER_PROC_BIN;
+    pb->size = bptr->orig_size;
+    pb->next = ohp->first;
+    ohp->first = (struct erl_off_heap_header*)pb;
+    pb->val = bptr;
+    pb->bytes = (byte*) bptr->orig_bytes;
+    pb->flags = 0;
+    OH_OVERHEAD(ohp, pb->size / sizeof(Eterm));
+
+    return make_binary(pb);
+}
+
+/** @brief Initiate a ProcBin for a full Binary.
+ *  @param hp must point to PROC_BIN_SIZE available heap words.
+ */
+Eterm erts_build_proc_bin(ErlOffHeap* ohp, Eterm* hp, Binary* bptr)
+{
+    return build_proc_bin(ohp, hp, bptr);
+}
+
 /*
  * Create a brand new binary from scratch.
  */
-
 Eterm
 new_binary(Process *p, byte *buf, Uint len)
 {
-    ProcBin* pb;
     Binary* bptr;
 
     if (len <= ERL_ONHEAP_BIN_LIMIT) {
@@ -88,23 +110,7 @@ new_binary(Process *p, byte *buf, Uint len)
 	sys_memcpy(bptr->orig_bytes, buf, len);
     }
 
-    /*
-     * Now allocate the ProcBin on the heap.
-     */
-    pb = (ProcBin *) HAlloc(p, PROC_BIN_SIZE);
-    pb->thing_word = HEADER_PROC_BIN;
-    pb->size = len;
-    pb->next = MSO(p).first;
-    MSO(p).first = (struct erl_off_heap_header*)pb;
-    pb->val = bptr;
-    pb->bytes = (byte*) bptr->orig_bytes;
-    pb->flags = 0;
-
-    /*
-     * Miscellaneous updates. Return the tagged binary.
-     */
-    OH_OVERHEAD(&(MSO(p)), pb->size / sizeof(Eterm));
-    return make_binary(pb);
+    return build_proc_bin(&MSO(p), HAlloc(p, PROC_BIN_SIZE), bptr);
 }
 
 /* 
@@ -113,7 +119,6 @@ new_binary(Process *p, byte *buf, Uint len)
 
 Eterm erts_new_mso_binary(Process *p, byte *buf, Uint len)
 {
-    ProcBin* pb;
     Binary* bptr;
 
     /*
@@ -124,23 +129,7 @@ Eterm erts_new_mso_binary(Process *p, byte *buf, Uint len)
 	sys_memcpy(bptr->orig_bytes, buf, len);
     }
 
-    /*
-     * Now allocate the ProcBin on the heap.
-     */
-    pb = (ProcBin *) HAlloc(p, PROC_BIN_SIZE);
-    pb->thing_word = HEADER_PROC_BIN;
-    pb->size = len;
-    pb->next = MSO(p).first;
-    MSO(p).first = (struct erl_off_heap_header*)pb;
-    pb->val = bptr;
-    pb->bytes = (byte*) bptr->orig_bytes;
-    pb->flags = 0;
-
-    /*
-     * Miscellaneous updates. Return the tagged binary.
-     */
-    OH_OVERHEAD(&(MSO(p)), pb->size / sizeof(Eterm));
-    return make_binary(pb);
+    return build_proc_bin(&MSO(p), HAlloc(p, PROC_BIN_SIZE), bptr);
 }
 
 /*
@@ -964,7 +953,10 @@ HIPE_WRAPPER_BIF_DISABLE_GC(iolist_to_binary, 1)
 BIF_RETTYPE iolist_to_binary_1(BIF_ALIST_1)
 {
     if (is_binary(BIF_ARG_1)) {
-	BIF_RET(BIF_ARG_1);
+        if (binary_bitsize(BIF_ARG_1) == 0) {
+            BIF_RET(BIF_ARG_1);
+        }
+        BIF_ERROR(BIF_P, BADARG);
     }
     return erts_list_to_binary_bif(BIF_P, BIF_ARG_1, bif_export[BIF_iolist_to_binary_1]);
 }
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index a46063142e..3967f7f7fc 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -333,6 +333,12 @@ print_process_info(fmtfn_t to, void *to_arg, Process *p)
     erts_print(to, to_arg, "Heap unused: %bpu\n", (p->hend - p->htop));
     erts_print(to, to_arg, "OldHeap unused: %bpu\n",
 	       (OLD_HEAP(p) == NULL) ? 0 : (OLD_HEND(p) - OLD_HTOP(p)) );
+    erts_print(to, to_arg, "BinVHeap: %b64u\n", p->off_heap.overhead);
+    erts_print(to, to_arg, "OldBinVHeap: %b64u\n", BIN_OLD_VHEAP(p));
+    erts_print(to, to_arg, "BinVHeap unused: %b64u\n",
+               BIN_VHEAP_SZ(p) - p->off_heap.overhead);
+    erts_print(to, to_arg, "OldBinVHeap unused: %b64u\n",
+               BIN_OLD_VHEAP_SZ(p) - BIN_OLD_VHEAP(p));
     erts_print(to, to_arg, "Memory: %beu\n", erts_process_memory(p, !0));
 
     if (garbing) {
@@ -355,7 +361,7 @@ print_process_info(fmtfn_t to, void *to_arg, Process *p)
 static void
 print_garb_info(fmtfn_t to, void *to_arg, Process* p)
 {
-    /* ERTS_SMP: A scheduler is probably concurrently doing gc... */
+    /* A scheduler is probably concurrently doing gc... */
     if (!ERTS_IS_CRASH_DUMPING)
       return;
     erts_print(to, to_arg, "New heap start: %bpX\n", p->heap);
@@ -485,9 +491,7 @@ loaded(fmtfn_t to, void *to_arg)
 static void
 dump_attributes(fmtfn_t to, void *to_arg, byte* ptr, int size)
 {
-    while (size-- > 0) {
-	erts_print(to, to_arg, "%02X", *ptr++);
-    }
+    erts_print_base64(to, to_arg, ptr, size);
     erts_print(to, to_arg, "\n");
 }
 
@@ -502,7 +506,7 @@ do_break(void)
     /* check if we're in console mode and, if so,
        halt immediately if break is called */
     mode = erts_read_env("ERL_CONSOLE_MODE");
-    if (mode && strcmp(mode, "window") != 0)
+    if (mode && sys_strcmp(mode, "window") != 0)
 	erts_exit(0, "");
     erts_free_read_env(mode);
 #endif /* __WIN32__ */
@@ -774,16 +778,16 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
      * - write dump until alarm or file is written completely
      */
 	
-    if (erts_sys_getenv__("ERL_CRASH_DUMP_SECONDS", env, &envsz) != 0) {
-	env_erl_crash_dump_seconds_set = 0;
-	secs = -1;
+    if (erts_sys_explicit_8bit_getenv("ERL_CRASH_DUMP_SECONDS", env, &envsz) == 1) {
+        env_erl_crash_dump_seconds_set = 1;
+        secs = atoi(env);
     } else {
-	env_erl_crash_dump_seconds_set = 1;
-	secs = atoi(env);
+        env_erl_crash_dump_seconds_set = 0;
+        secs = -1;
     }
 
     if (secs == 0) {
-	return;
+        return;
     }
 
     /* erts_sys_prepare_crash_dump returns 1 if heart port is found, otherwise 0
@@ -799,7 +803,7 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
 
     crash_dump_limit = ERTS_SINT64_MAX;
     envsz = sizeof(env);
-    if (erts_sys_getenv__("ERL_CRASH_DUMP_BYTES", env, &envsz) == 0) {
+    if (erts_sys_explicit_8bit_getenv("ERL_CRASH_DUMP_BYTES", env, &envsz) == 1) {
         Sint64 limit;
         char* endptr;
         errno = 0;
@@ -812,7 +816,7 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
         }
     }
 
-    if (erts_sys_getenv__("ERL_CRASH_DUMP",&dumpnamebuf[0],&dumpnamebufsize) != 0)
+    if (erts_sys_explicit_8bit_getenv("ERL_CRASH_DUMP",&dumpnamebuf[0],&dumpnamebufsize) != 1)
 	dumpname = "erl_crash.dump";
     else
 	dumpname = &dumpnamebuf[0];
@@ -845,7 +849,7 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
     }
 
     time(&now);
-    erts_cbprintf(to, to_arg, "=erl_crash_dump:0.4\n%s", ctime(&now));
+    erts_cbprintf(to, to_arg, "=erl_crash_dump:0.5\n%s", ctime(&now));
 
     if (file != NULL)
        erts_cbprintf(to, to_arg, "The error occurred in file %s, line %d\n", file, line);
@@ -890,6 +894,21 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
             erts_print_scheduler_info(to, to_arg, ERTS_SCHEDULER_IX(i)),
             erts_cbprintf(to, to_arg, "** crashed **\n"));
     }
+    for (i = 0; i < erts_no_dirty_cpu_schedulers; i++) {
+        ERTS_SYS_TRY_CATCH(
+            erts_print_scheduler_info(to, to_arg, ERTS_DIRTY_CPU_SCHEDULER_IX(i)),
+            erts_cbprintf(to, to_arg, "** crashed **\n"));
+    }
+    erts_cbprintf(to, to_arg, "=dirty_cpu_run_queue\n");
+    erts_print_run_queue_info(to, to_arg, ERTS_DIRTY_CPU_RUNQ);
+
+    for (i = 0; i < erts_no_dirty_io_schedulers; i++) {
+        ERTS_SYS_TRY_CATCH(
+            erts_print_scheduler_info(to, to_arg, ERTS_DIRTY_IO_SCHEDULER_IX(i)),
+            erts_cbprintf(to, to_arg, "** crashed **\n"));
+    }
+    erts_cbprintf(to, to_arg, "=dirty_io_run_queue\n");
+    erts_print_run_queue_info(to, to_arg, ERTS_DIRTY_IO_RUNQ);
 #endif
 
 
@@ -956,3 +975,28 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
     erts_fprintf(stderr,"done\n");
 }
 
+void
+erts_print_base64(fmtfn_t to, void *to_arg, byte* src, Uint size)
+{
+    static const byte base64_chars[] =
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+    while (size >= 3) {
+        erts_putc(to, to_arg, base64_chars[src[0] >> 2]);
+        erts_putc(to, to_arg, base64_chars[((src[0] & 0x03) << 4) | (src[1] >> 4)]);
+        erts_putc(to, to_arg, base64_chars[((src[1] & 0x0f) << 2) | (src[2] >> 6)]);
+        erts_putc(to, to_arg, base64_chars[src[2] & 0x3f]);
+        size -= 3;
+        src += 3;
+    }
+    if (size == 1) {
+        erts_putc(to, to_arg, base64_chars[src[0] >> 2]);
+        erts_putc(to, to_arg, base64_chars[(src[0] & 0x03) << 4]);
+        erts_print(to, to_arg, "==");
+    } else if (size == 2) {
+        erts_putc(to, to_arg, base64_chars[src[0] >> 2]);
+        erts_putc(to, to_arg, base64_chars[((src[0] & 0x03) << 4) | (src[1] >> 4)]);
+        erts_putc(to, to_arg, base64_chars[(src[1] & 0x0f) << 2]);
+        erts_putc(to, to_arg, '=');
+    }
+}
diff --git a/erts/emulator/beam/bs_instrs.tab b/erts/emulator/beam/bs_instrs.tab
index 9f03b19731..94e0000c8b 100644
--- a/erts/emulator/beam/bs_instrs.tab
+++ b/erts/emulator/beam/bs_instrs.tab
@@ -919,9 +919,23 @@ i_bs_get_integer(Fail, Live, FlagsAndUnit, Ms, Sz, Dst) {
 }
 
 i_bs_get_utf8(Ctx, Fail, Dst) {
+    Eterm result;
     ErlBinMatchBuffer* mb = ms_matchbuffer($Ctx);
-    Eterm result = erts_bs_get_utf8(mb);
 
+    if (mb->size - mb->offset < 8) {
+        $FAIL($Fail);
+    }
+    if (BIT_OFFSET(mb->offset) != 0) {
+        result = erts_bs_get_utf8(mb);
+    } else {
+        byte b = mb->base[BYTE_OFFSET(mb->offset)];
+        if (b < 128) {
+            result = make_small(b);
+            mb->offset += 8;
+        } else {
+            result = erts_bs_get_utf8(mb);
+        }
+    }
     if (is_non_value(result)) {
         $FAIL($Fail);
     }
@@ -976,6 +990,9 @@ ctx_to_bin.execute() {
     Uint hole_size;
     Uint orig = mb->orig;
     ErlSubBin* sb = (ErlSubBin *) boxed_val(context);
+    /* Since we're going to overwrite the match state with the result, an
+     * ErlBinMatchState must be at least as large as an ErlSubBin. */
+    ERTS_CT_ASSERT(sizeof(ErlSubBin) <= sizeof(ErlBinMatchState));
     hole_size = 1 + header_arity(sb->thing_word) - ERL_SUB_BIN_SIZE;
     sb->thing_word = HEADER_SUB_BIN;
     sb->size = BYTE_OFFSET(size);
diff --git a/erts/emulator/beam/copy.c b/erts/emulator/beam/copy.c
index 10bf197405..7769a914db 100644
--- a/erts/emulator/beam/copy.c
+++ b/erts/emulator/beam/copy.c
@@ -611,7 +611,7 @@ Eterm copy_struct_x(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap, Uint
     Eterm* htop;
     Eterm* hbot;
     Eterm* hp;
-    Eterm* objp;
+    Eterm* ERTS_RESTRICT objp;
     Eterm* tp;
     Eterm  res;
     Eterm  elem;
@@ -1821,7 +1821,8 @@ all_clean:
  *
  * NOTE: Assumes that term is a tuple (ptr is an untagged tuple ptr).
  */
-Eterm copy_shallow(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
+Eterm copy_shallow(Eterm* ERTS_RESTRICT ptr, Uint sz, Eterm** hpp,
+                   ErlOffHeap* off_heap)
 {
     Eterm* tp = ptr;
     Eterm* hp = *hpp;
@@ -1985,7 +1986,7 @@ move_one_frag(Eterm** hpp, ErlHeapFragment* frag, ErlOffHeap* off_heap, int lite
 	if (is_header(val)) {
 	    struct erl_off_heap_header* hdr = (struct erl_off_heap_header*)hp;
 	    ASSERT(ptr + header_arity(val) < end);
-	    move_boxed(&ptr, val, &hp, &dummy_ref);
+	    ptr = move_boxed(ptr, val, &hp, &dummy_ref);
 	    switch (val & _HEADER_SUBTAG_MASK) {
 	    case REF_SUBTAG:
 		if (is_ordinary_ref_thing(hdr))
@@ -2002,7 +2003,7 @@ move_one_frag(Eterm** hpp, ErlHeapFragment* frag, ErlOffHeap* off_heap, int lite
 	}
 	else { /* must be a cons cell */
 	    ASSERT(ptr+1 < end);
-	    move_cons(&ptr, val, &hp, &dummy_ref);
+	    move_cons(ptr, val, &hp, &dummy_ref);
 	    ptr += 2;
 	}
     }
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index bc168fc58d..cd799e04b8 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -103,21 +103,12 @@ dist_msg_dbg(ErtsDistExternal *edep, char *what, byte *buf, int sz)
 
 
 
-#define PASS_THROUGH 'p'        /* This code should go */
-
 int erts_is_alive; /* System must be blocked on change */
 int erts_dist_buf_busy_limit;
 
 
 /* distribution trap functions */
-Export* dsend2_trap = NULL;
-Export* dsend3_trap = NULL;
-/*Export* dsend_nosuspend_trap = NULL;*/
-Export* dlink_trap = NULL;
-Export* dunlink_trap = NULL;
 Export* dmonitor_node_trap = NULL;
-Export* dgroup_leader_trap = NULL;
-Export* dexit_trap = NULL;
 Export* dmonitor_p_trap = NULL;
 
 /* local variables */
@@ -129,6 +120,7 @@ static void clear_dist_entry(DistEntry*);
 static int dsig_send_ctl(ErtsDSigData* dsdp, Eterm ctl, int force_busy);
 static void send_nodes_mon_msgs(Process *, Eterm, Eterm, Eterm, Eterm);
 static void init_nodes_monitors(void);
+static Sint abort_connection(DistEntry* dep, Uint32 conn_id);
 
 static erts_atomic_t no_caches;
 static erts_atomic_t no_nodes;
@@ -383,22 +375,24 @@ static void doit_node_link_net_exits(ErtsLink *lnk, void *vnecp)
 	if (!rp)
 	    goto done;
 	erts_proc_lock(rp, rp_locks);
-	rlnk = erts_remove_link(&ERTS_P_LINKS(rp), name);
-	if (rlnk != NULL) {
-	    ASSERT(is_atom(rlnk->pid) && (rlnk->type == LINK_NODE));
-	    erts_destroy_link(rlnk);
-	}
-	n = ERTS_LINK_REFC(lnk);
-	for (i = 0; i < n; ++i) {
-	    Eterm tup;
-	    Eterm *hp;
-	    ErtsMessage *msgp;
-
-	    msgp = erts_alloc_message_heap(rp, &rp_locks,
-					   3, &hp, &ohp);
-	    tup = TUPLE2(hp, am_nodedown, name);
-	    erts_queue_message(rp, rp_locks, msgp, tup, am_system);
-	}
+        if (!ERTS_PROC_IS_EXITING(rp)) {
+            rlnk = erts_remove_link(&ERTS_P_LINKS(rp), name);
+            if (rlnk != NULL) {
+                ASSERT(is_atom(rlnk->pid) && (rlnk->type == LINK_NODE));
+                erts_destroy_link(rlnk);
+            }
+            n = ERTS_LINK_REFC(lnk);
+            for (i = 0; i < n; ++i) {
+                Eterm tup;
+                Eterm *hp;
+                ErtsMessage *msgp;
+
+                msgp = erts_alloc_message_heap(rp, &rp_locks,
+                                               3, &hp, &ohp);
+                tup = TUPLE2(hp, am_nodedown, name);
+                erts_queue_message(rp, rp_locks, msgp, tup, am_system);
+            }
+        }
 	erts_proc_unlock(rp, rp_locks);
     }
  done:
@@ -484,41 +478,55 @@ int erts_do_net_exits(DistEntry *dep, Eterm reason)
 
     if (dep == erts_this_dist_entry) {  /* Net kernel has died (clean up!!) */
 	DistEntry *tdep;
-	int no_dist_ctrl = 0;
+	int no_dist_ctrl;
+        int no_pending;
 	Eterm nd_reason = (reason == am_no_network
 			   ? am_no_network
 			   : am_net_kernel_terminated);
+        int i = 0;
+        Eterm *dist_ctrl;
+        DistEntry** pending;
+
+        ERTS_UNDEF(dist_ctrl, NULL);
+        ERTS_UNDEF(pending, NULL);
+
 	erts_rwmtx_rlock(&erts_dist_table_rwmtx);
 
-	for (tdep = erts_hidden_dist_entries; tdep; tdep = tdep->next)
-	    no_dist_ctrl++;
-	for (tdep = erts_visible_dist_entries; tdep; tdep = tdep->next)
-	    no_dist_ctrl++;
+        no_dist_ctrl = (erts_no_of_hidden_dist_entries +
+                        erts_no_of_visible_dist_entries);
+        no_pending = erts_no_of_pending_dist_entries;
 
 	/* KILL all port controllers */
-	if (no_dist_ctrl == 0)
-	    erts_rwmtx_runlock(&erts_dist_table_rwmtx);
-	else {
-	    Eterm def_buf[128];
-	    int i = 0;
-	    Eterm *dist_ctrl;
-
-	    if (no_dist_ctrl <= sizeof(def_buf)/sizeof(def_buf[0]))
-		dist_ctrl = &def_buf[0];
-	    else
-		dist_ctrl = erts_alloc(ERTS_ALC_T_TMP,
-				       sizeof(Eterm)*no_dist_ctrl);
+	if (no_dist_ctrl) {
+            dist_ctrl = erts_alloc(ERTS_ALC_T_TMP,
+                                   sizeof(Eterm)*no_dist_ctrl);
 	    for (tdep = erts_hidden_dist_entries; tdep; tdep = tdep->next) {
 		ASSERT(is_internal_port(tdep->cid) || is_internal_pid(tdep->cid));
+                ASSERT(i < no_dist_ctrl);
 		dist_ctrl[i++] = tdep->cid;
 	    }
 	    for (tdep = erts_visible_dist_entries; tdep; tdep = tdep->next) {
 		ASSERT(is_internal_port(tdep->cid) || is_internal_pid(tdep->cid));
+                ASSERT(i < no_dist_ctrl);
 		dist_ctrl[i++] = tdep->cid;
 	    }
-	    erts_rwmtx_runlock(&erts_dist_table_rwmtx);
+            ASSERT(i == no_dist_ctrl);
+        }
+        if (no_pending) {
+            pending = erts_alloc(ERTS_ALC_T_TMP, sizeof(DistEntry*)*no_pending);
+            i = 0;
+            for (tdep = erts_pending_dist_entries; tdep; tdep = tdep->next) {
+                ASSERT(is_nil(tdep->cid));
+                ASSERT(i < no_pending);
+                pending[i++] = tdep;
+                erts_ref_dist_entry(tdep);
+            }
+            ASSERT(i == no_pending);
+        }
+        erts_rwmtx_runlock(&erts_dist_table_rwmtx);
 
-	    for (i = 0; i < no_dist_ctrl; i++) {
+        if (no_dist_ctrl) {
+            for (i = 0; i < no_dist_ctrl; i++) {
                 if (is_internal_pid(dist_ctrl[i]))
                     schedule_kill_dist_ctrl_proc(dist_ctrl[i]);
                 else {
@@ -532,11 +540,18 @@ int erts_do_net_exits(DistEntry *dep, Eterm reason)
                                        prt, dist_ctrl[i], nd_reason, NULL);
                     }
                 }
-	    }
+            }
+            erts_free(ERTS_ALC_T_TMP, dist_ctrl);
+        }
+
+        if (no_pending) {
+            for (i = 0; i < no_pending; i++) {
+                abort_connection(pending[i], pending[i]->connection_id);
+                erts_deref_dist_entry(pending[i]);
+            }
+            erts_free(ERTS_ALC_T_TMP, pending);
+        }
 
-	    if (dist_ctrl != &def_buf[0])
-		erts_free(ERTS_ALC_T_TMP, dist_ctrl);
-	}
 
 	/*
 	 * When last dist ctrl exits, node will be taken
@@ -573,13 +588,13 @@ int erts_do_net_exits(DistEntry *dep, Eterm reason)
                 erts_port_task_abort(&dep->dist_cmd);
         }
 
-	if (dep->status & ERTS_DE_SFLG_EXITING) {
+	if (dep->state == ERTS_DE_STATE_EXITING) {
 #ifdef DEBUG
 	    ASSERT(erts_atomic32_read_nob(&dep->qflgs) & ERTS_DE_QFLG_EXIT);
 #endif
 	}
 	else {
-	    dep->status |= ERTS_DE_SFLG_EXITING;
+	    dep->state = ERTS_DE_STATE_EXITING;
 	    erts_mtx_lock(&dep->qlock);
 	    ASSERT(!(erts_atomic32_read_nob(&dep->qflgs) & ERTS_DE_QFLG_EXIT));
 	    erts_atomic32_read_bor_relb(&dep->qflgs, ERTS_DE_QFLG_EXIT);
@@ -613,7 +628,6 @@ int erts_do_net_exits(DistEntry *dep, Eterm reason)
 			    reason == am_normal ? am_connection_closed : reason);
 
 	clear_dist_entry(dep);
-
     }
 
     dec_no_nodes();
@@ -627,6 +641,14 @@ trap_function(Eterm func, int arity)
     return erts_export_put(am_erlang, func, arity);
 }
 
+/*
+ * Sync with dist_util.erl:
+ *
+ * -record(erts_dflags,
+ *         {default, mandatory, addable, rejectable, strict_order}).
+ */
+static Eterm erts_dflags_record;
+
 void init_dist(void)
 {
     init_nodes_monitors();
@@ -638,18 +660,21 @@ void init_dist(void)
     erts_atomic_init_nob(&no_caches, 0);
 
     /* Lookup/Install all references to trap functions */
-    dsend2_trap = trap_function(am_dsend,2);
-    dsend3_trap = trap_function(am_dsend,3);
-    /*    dsend_nosuspend_trap = trap_function(am_dsend_nosuspend,2);*/
-    dlink_trap = trap_function(am_dlink,1);
-    dunlink_trap = trap_function(am_dunlink,1);
     dmonitor_node_trap = trap_function(am_dmonitor_node,3);
-    dgroup_leader_trap = trap_function(am_dgroup_leader,2);
-    dexit_trap = trap_function(am_dexit, 2);
     dmonitor_p_trap = trap_function(am_dmonitor_p, 2);
     dist_ctrl_put_data_trap = erts_export_put(am_erts_internal,
                                               am_dist_ctrl_put_data,
                                               2);
+    {
+        Eterm* hp = erts_alloc(ERTS_ALC_T_LITERAL, (1+6)*sizeof(Eterm));
+        erts_dflags_record = TUPLE6(hp, am_erts_dflags,
+                                    make_small(DFLAG_DIST_DEFAULT),
+                                    make_small(DFLAG_DIST_MANDATORY),
+                                    make_small(DFLAG_DIST_ADDABLE),
+                                    make_small(DFLAG_DIST_REJECTABLE),
+                                    make_small(DFLAG_DIST_STRICT_ORDER));
+        erts_set_literal_tag(&erts_dflags_record, hp, (1+6));
+    }
 }
 
 #define ErtsDistOutputBuf2Binary(OB) \
@@ -664,6 +689,7 @@ alloc_dist_obuf(Uint size)
     obuf = (ErtsDistOutputBuf *) &bin->orig_bytes[0];
 #ifdef DEBUG
     obuf->dbg_pattern = ERTS_DIST_OUTPUT_BUF_DBG_PATTERN;
+    obuf->alloc_endp = obuf->data + size;
     ASSERT(bin == ErtsDistOutputBuf2Binary(obuf));
 #endif
     return obuf;
@@ -684,31 +710,11 @@ size_obuf(ErtsDistOutputBuf *obuf)
     return bin->orig_size;
 }
 
-static void clear_dist_entry(DistEntry *dep)
+static ErtsDistOutputBuf* clear_de_out_queues(DistEntry* dep)
 {
-    Sint obufsize = 0;
-    ErtsAtomCache *cache;
-    ErtsProcList *suspendees;
     ErtsDistOutputBuf *obuf;
 
-    erts_de_rwlock(dep);
-    erts_atomic_set_nob(&dep->input_handler,
-                        (erts_aint_t) NIL);
-    cache = dep->cache;
-    dep->cache = NULL;
-
-#ifdef DEBUG
-    erts_de_links_lock(dep);
-    ASSERT(!dep->nlinks);
-    ASSERT(!dep->node_links);
-    ASSERT(!dep->monitors);
-    erts_de_links_unlock(dep);
-#endif
-
-    erts_mtx_lock(&dep->qlock);
-
-    erts_atomic64_set_nob(&dep->in, 0);
-    erts_atomic64_set_nob(&dep->out, 0);
+    ERTS_LC_ASSERT(erts_lc_mtx_is_locked(&dep->qlock));
 
     if (!dep->out_queue.last)
 	obuf = dep->finalized_out_queue.first;
@@ -728,17 +734,13 @@ static void clear_dist_entry(DistEntry *dep)
     dep->tmp_out_queue.last = NULL;
     dep->finalized_out_queue.first = NULL;
     dep->finalized_out_queue.last = NULL;
-    dep->status = 0;
-    suspendees = get_suspended_on_de(dep, ERTS_DE_QFLGS_ALL);
-
-    erts_mtx_unlock(&dep->qlock);
-    erts_atomic_set_nob(&dep->dist_cmd_scheduled, 0);
-    dep->send = NULL;
-    erts_de_rwunlock(dep);
 
-    erts_resume_processes(suspendees);
+    return obuf;
+}
 
-    delete_cache(cache);
+static void free_de_out_queues(DistEntry* dep, ErtsDistOutputBuf *obuf)
+{
+    Sint obufsize = 0;
 
     while (obuf) {
 	ErtsDistOutputBuf *fobuf;
@@ -750,13 +752,56 @@ static void clear_dist_entry(DistEntry *dep)
 
     if (obufsize) {
 	erts_mtx_lock(&dep->qlock);
-	ASSERT(erts_atomic_read_nob(&dep->qsize) >= obufsize);
+        ASSERT(erts_atomic_read_nob(&dep->qsize) >= obufsize);
         erts_atomic_add_nob(&dep->qsize,
                             (erts_aint_t) -obufsize);
 	erts_mtx_unlock(&dep->qlock);
     }
 }
 
+static void clear_dist_entry(DistEntry *dep)
+{
+    ErtsAtomCache *cache;
+    ErtsProcList *suspendees;
+    ErtsDistOutputBuf *obuf;
+
+    erts_de_rwlock(dep);
+    erts_atomic_set_nob(&dep->input_handler,
+                        (erts_aint_t) NIL);
+    cache = dep->cache;
+    dep->cache = NULL;
+
+#ifdef DEBUG
+    erts_de_links_lock(dep);
+    ASSERT(!dep->nlinks);
+    ASSERT(!dep->node_links);
+    ASSERT(!dep->monitors);
+    erts_de_links_unlock(dep);
+#endif
+
+    erts_mtx_lock(&dep->qlock);
+
+    erts_atomic64_set_nob(&dep->in, 0);
+    erts_atomic64_set_nob(&dep->out, 0);
+
+    obuf = clear_de_out_queues(dep);
+    dep->state = ERTS_DE_STATE_IDLE;
+    suspendees = get_suspended_on_de(dep, ERTS_DE_QFLGS_ALL);
+
+    erts_mtx_unlock(&dep->qlock);
+    erts_atomic_set_nob(&dep->dist_cmd_scheduled, 0);
+    dep->send = NULL;
+    erts_de_rwunlock(dep);
+
+    erts_resume_processes(suspendees);
+
+    delete_cache(cache);
+
+    free_de_out_queues(dep, obuf);
+    if (dep->transcode_ctx)
+        transcode_free_ctx(dep);
+}
+
 int erts_dsend_context_dtor(Binary* ctx_bin)
 {
     ErtsSendContext* ctx = ERTS_MAGIC_BIN_DATA(ctx_bin);
@@ -772,8 +817,8 @@ int erts_dsend_context_dtor(Binary* ctx_bin)
     if (ctx->dss.phase >= ERTS_DSIG_SEND_PHASE_ALLOC && ctx->dss.obuf) {
 	free_dist_obuf(ctx->dss.obuf);
     }
-    if (ctx->dep_to_deref)
-	erts_deref_dist_entry(ctx->dep_to_deref);
+    if (ctx->deref_dep)
+	erts_deref_dist_entry(ctx->dep);
 
     return 1;
 }
@@ -852,6 +897,13 @@ erts_dsig_send_m_exit(ErtsDSigData *dsdp, Eterm watcher, Eterm watched,
     DeclareTmpHeapNoproc(ctl_heap,6);
     int res;
 
+    if (~dsdp->dep->flags & (DFLAG_DIST_MONITOR | DFLAG_DIST_MONITOR_NAME)) {
+        /*
+         * Receiver does not support DOP_MONITOR_P_EXIT (see dsig_send_monitor)
+         */
+        return ERTS_DSIG_SEND_OK;
+    }
+
     UseTmpHeapNoproc(6);
 
     ctl = TUPLE5(&ctl_heap[0], make_small(DOP_MONITOR_P_EXIT),
@@ -879,6 +931,16 @@ erts_dsig_send_monitor(ErtsDSigData *dsdp, Eterm watcher, Eterm watched,
     DeclareTmpHeapNoproc(ctl_heap,5);
     int res;
 
+    if (~dsdp->dep->flags & (DFLAG_DIST_MONITOR | DFLAG_DIST_MONITOR_NAME)) {
+        /*
+         * Receiver does not support DOP_MONITOR_P.
+         * Just avoid sending it and by doing that reduce this monitor
+         * to only supervise the connection. This will work for simple c-nodes
+         * with a 1-to-1 relation between "Erlang process" and OS-process.
+         */
+        return ERTS_DSIG_SEND_OK;
+    }
+
     UseTmpHeapNoproc(5);
     ctl = TUPLE4(&ctl_heap[0],
 		 make_small(DOP_MONITOR_P),
@@ -901,6 +963,13 @@ erts_dsig_send_demonitor(ErtsDSigData *dsdp, Eterm watcher,
     DeclareTmpHeapNoproc(ctl_heap,5);
     int res;
 
+    if (~dsdp->dep->flags & (DFLAG_DIST_MONITOR | DFLAG_DIST_MONITOR_NAME)) {
+        /*
+         * Receiver does not support DOP_DEMONITOR_P (see dsig_send_monitor)
+         */
+        return ERTS_DSIG_SEND_OK;
+    }
+
     UseTmpHeapNoproc(5);
     ctl = TUPLE4(&ctl_heap[0],
 		 make_small(DOP_DEMONITOR_P),
@@ -1161,7 +1230,7 @@ erts_dsig_send_group_leader(ErtsDSigData *dsdp, Eterm leader, Eterm remote)
 #  define PURIFY_MSG(msg)                                                    \
     do {								     \
 	char buf__[1]; size_t bufsz__ = sizeof(buf__);			     \
-	if (erts_sys_getenv_raw("VALGRIND_LOG_XML", buf__, &bufsz__) >= 0) { \
+	if (erts_sys_explicit_8bit_getenv("VALGRIND_LOG_XML", buf__, &bufsz__) >= 0) { \
 	    VALGRIND_PRINTF_XML("<erlang_error_log>"			     \
 			    "%s, line %d: %s</erlang_error_log>\n",	     \
 			    __FILE__, __LINE__, msg);			     \
@@ -1324,7 +1393,7 @@ int erts_net_message(Port *prt,
 	    /* This is tricky (we MUST force a distributed send) */
 	    ErtsDSigData dsd;
 	    int code;
-	    code = erts_dsig_prepare(&dsd, dep, NULL, ERTS_DSP_NO_LOCK, 0);
+	    code = erts_dsig_prepare(&dsd, dep, NULL, 0, ERTS_DSP_NO_LOCK, 0, 0);
 	    if (code == ERTS_DSIG_PREP_CONNECTED) {
 		code = erts_dsig_send_exit(&dsd, to, from, am_noproc);
 		ASSERT(code == ERTS_DSIG_SEND_OK);
@@ -1416,7 +1485,7 @@ int erts_net_message(Port *prt,
 	if (!rp) {
 	    ErtsDSigData dsd;
 	    int code;
-	    code = erts_dsig_prepare(&dsd, dep, NULL, ERTS_DSP_NO_LOCK, 0);
+	    code = erts_dsig_prepare(&dsd, dep, NULL, 0, ERTS_DSP_NO_LOCK, 0, 0);
 	    if (code == ERTS_DSIG_PREP_CONNECTED) {
 		code = erts_dsig_send_m_exit(&dsd, watcher, watched, ref,
 					     am_noproc);
@@ -1879,33 +1948,32 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
 
 	    if (ctx->flags & DFLAG_DIST_HDR_ATOM_CACHE) {
 		ctx->acmp = erts_get_atom_cache_map(ctx->c_p);
-		ctx->pass_through_size = 0;
+		ctx->max_finalize_prepend = 0;
 	    }
 	    else {
 		ctx->acmp = NULL;
-		ctx->pass_through_size = 1;
+		ctx->max_finalize_prepend = 3;
 	    }
 
     #ifdef ERTS_DIST_MSG_DBG
-	    erts_fprintf(stderr, ">>%s CTL: %T\n", ctx->pass_through_size ? "P" : " ", ctx->ctl);
-        if (is_value(ctx->msg))
-            erts_fprintf(stderr, "    MSG: %T\n", ctx->msg);
+            erts_fprintf(stderr, ">> CTL: %T\n", ctx->ctl);
+            if (is_value(ctx->msg))
+                erts_fprintf(stderr, "    MSG: %T\n", ctx->msg);
     #endif
 
-	    ctx->data_size = ctx->pass_through_size;
+	    ctx->data_size = ctx->max_finalize_prepend;
 	    erts_reset_atom_cache_map(ctx->acmp);
 	    erts_encode_dist_ext_size(ctx->ctl, ctx->flags, ctx->acmp, &ctx->data_size);
 
-	    if (is_value(ctx->msg)) {
-		ctx->u.sc.wstack.wstart = NULL;
-		ctx->u.sc.flags = ctx->flags;
-		ctx->u.sc.level = 0;
-		ctx->phase = ERTS_DSIG_SEND_PHASE_MSG_SIZE;
-	    } else {
-		ctx->phase = ERTS_DSIG_SEND_PHASE_ALLOC;
-	    }
-	    break;
+	    if (is_non_value(ctx->msg)) {
+                ctx->phase = ERTS_DSIG_SEND_PHASE_ALLOC;
+                break;
+            }
+            ctx->u.sc.wstack.wstart = NULL;
+            ctx->u.sc.flags = ctx->flags;
+            ctx->u.sc.level = 0;
 
+            ctx->phase = ERTS_DSIG_SEND_PHASE_MSG_SIZE;
 	case ERTS_DSIG_SEND_PHASE_MSG_SIZE:
 	    if (erts_encode_dist_ext_size_int(ctx->msg, ctx, &ctx->data_size)) {
 		retval = ERTS_DSIG_SEND_CONTINUE;
@@ -1920,23 +1988,25 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
 	    ctx->data_size += ctx->dhdr_ext_size;
 
 	    ctx->obuf = alloc_dist_obuf(ctx->data_size);
-	    ctx->obuf->ext_endp = &ctx->obuf->data[0] + ctx->pass_through_size + ctx->dhdr_ext_size;
+	    ctx->obuf->ext_endp = &ctx->obuf->data[0] + ctx->max_finalize_prepend + ctx->dhdr_ext_size;
 
 	    /* Encode internal version of dist header */
 	    ctx->obuf->extp = erts_encode_ext_dist_header_setup(ctx->obuf->ext_endp, ctx->acmp);
 	    /* Encode control message */
 	    erts_encode_dist_ext(ctx->ctl, &ctx->obuf->ext_endp, ctx->flags, ctx->acmp, NULL, NULL);
-	    if (is_value(ctx->msg)) {
-		ctx->u.ec.flags = ctx->flags;
-		ctx->u.ec.level = 0;
-		ctx->u.ec.wstack.wstart = NULL;
-		ctx->phase = ERTS_DSIG_SEND_PHASE_MSG_ENCODE;
-	    } else {
-		ctx->phase = ERTS_DSIG_SEND_PHASE_FIN;
-	    }
-	    break;
-
-	case ERTS_DSIG_SEND_PHASE_MSG_ENCODE:
+	    if (is_non_value(ctx->msg)) {
+                ctx->obuf->msg_start = NULL;
+                ctx->phase = ERTS_DSIG_SEND_PHASE_FIN;
+                break;
+            }
+            ctx->u.ec.flags = ctx->flags;
+            ctx->u.ec.hopefull_flags = 0;
+            ctx->u.ec.level = 0;
+            ctx->u.ec.wstack.wstart = NULL;
+            ctx->obuf->msg_start = ctx->obuf->ext_endp;
+
+            ctx->phase = ERTS_DSIG_SEND_PHASE_MSG_ENCODE;
+        case ERTS_DSIG_SEND_PHASE_MSG_ENCODE:
 	    if (erts_encode_dist_ext(ctx->msg, &ctx->obuf->ext_endp, ctx->flags, ctx->acmp, &ctx->u.ec, &ctx->reds)) {
 		retval = ERTS_DSIG_SEND_CONTINUE;
 		goto done;
@@ -1949,11 +2019,12 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
 	    int resume = 0;
 
 	    ASSERT(ctx->obuf->extp < ctx->obuf->ext_endp);
-	    ASSERT(&ctx->obuf->data[0] <= ctx->obuf->extp - ctx->pass_through_size);
+	    ASSERT(&ctx->obuf->data[0] <= ctx->obuf->extp - ctx->max_finalize_prepend);
 	    ASSERT(ctx->obuf->ext_endp <= &ctx->obuf->data[0] + ctx->data_size);
 
 	    ctx->data_size = ctx->obuf->ext_endp - ctx->obuf->extp;
 
+            ctx->obuf->hopefull_flags = ctx->u.ec.hopefull_flags;
 	    /*
 	     * Signal encoded; now verify that the connection still exists,
 	     * and if so enqueue the signal and schedule it for send.
@@ -1961,9 +2032,9 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
 	    ctx->obuf->next = NULL;
 	    erts_de_rlock(dep);
 	    cid = dep->cid;
-	    if (cid != dsdp->cid
-		|| dep->connection_id != dsdp->connection_id
-		|| dep->status & ERTS_DE_SFLG_EXITING) {
+	    if (dep->state == ERTS_DE_STATE_EXITING
+                || dep->state == ERTS_DE_STATE_IDLE
+                || dep->connection_id != dsdp->connection_id) {
 		/* Not the same connection as when we started; drop message... */
 		erts_de_runlock(dep);
 		free_dist_obuf(ctx->obuf);
@@ -2037,8 +2108,13 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
 		}
 
 		erts_mtx_unlock(&dep->qlock);
-                if (is_internal_port(dep->cid))
-                    erts_schedule_dist_command(NULL, dep);
+		if (dep->state != ERTS_DE_STATE_PENDING) {
+                    if (is_internal_port(dep->cid))
+                        erts_schedule_dist_command(NULL, dep);
+                }
+                else {
+                    notify_proc = NIL;
+                }
 		erts_de_runlock(dep);
                 if (is_internal_pid(notify_proc))
                     notify_dist_data(ctx->c_p, notify_proc);
@@ -2203,7 +2279,6 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf)
 #endif
 
 #define ERTS_PORT_REDS_DIST_CMD_START 5
-#define ERTS_PORT_REDS_DIST_CMD_FINALIZE 3
 #define ERTS_PORT_REDS_DIST_CMD_EXIT 200
 #define ERTS_PORT_REDS_DIST_CMD_RESUMED 5
 #define ERTS_PORT_REDS_DIST_CMD_DATA(SZ) \
@@ -2212,10 +2287,10 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf)
    : ((((Sint) (SZ)) >> 10) & ((Sint) ERTS_PORT_REDS_MASK__)))
 
 int
-erts_dist_command(Port *prt, int reds_limit)
+erts_dist_command(Port *prt, int initial_reds)
 {
-    Sint reds = ERTS_PORT_REDS_DIST_CMD_START;
-    Uint32 status;
+    Sint reds = initial_reds - ERTS_PORT_REDS_DIST_CMD_START;
+    enum dist_entry_state state;
     Uint32 flags;
     Sint qsize, obufsize = 0;
     ErtsDistOutputQueue oq, foq;
@@ -2230,15 +2305,18 @@ erts_dist_command(Port *prt, int reds_limit)
 
     erts_de_rlock(dep);
     flags = dep->flags;
-    status = dep->status;
+    state = dep->state;
     send = dep->send;
     erts_de_runlock(dep);
 
-    if (status & ERTS_DE_SFLG_EXITING) {
+    if (state == ERTS_DE_STATE_EXITING) {
 	erts_deliver_port_exit(prt, prt->common.id, am_killed, 0, 1);
-	return reds + ERTS_PORT_REDS_DIST_CMD_EXIT;
+        reds -= ERTS_PORT_REDS_DIST_CMD_EXIT;
+	return initial_reds - reds;
     }
 
+    ASSERT(state != ERTS_DE_STATE_PENDING);
+
     ASSERT(send);
 
     /*
@@ -2263,7 +2341,7 @@ erts_dist_command(Port *prt, int reds_limit)
 
     sched_flags = erts_atomic32_read_nob(&prt->sched.flags);
 
-    if (reds > reds_limit)
+    if (reds < 0)
 	goto preempted;
 
     if (!(sched_flags & ERTS_PTS_FLG_BUSY_PORT) && foq.first) {
@@ -2278,13 +2356,13 @@ erts_dist_command(Port *prt, int reds_limit)
             erts_fprintf(stderr, ">> ");
             bw(foq.first->extp, size);
 #endif
-            reds += ERTS_PORT_REDS_DIST_CMD_DATA(size);
-            fob = foq.first;
-            obufsize += size_obuf(fob);
-            foq.first = foq.first->next;
-            free_dist_obuf(fob);
+	    reds -= ERTS_PORT_REDS_DIST_CMD_DATA(size);
+	    fob = foq.first;
+	    obufsize += size_obuf(fob);
+	    foq.first = foq.first->next;
+	    free_dist_obuf(fob);
 	    sched_flags = erts_atomic32_read_nob(&prt->sched.flags);
-	    preempt = reds > reds_limit || (sched_flags & ERTS_PTS_FLG_EXIT);
+	    preempt = reds < 0 || (sched_flags & ERTS_PTS_FLG_EXIT);
 	    if (sched_flags & ERTS_PTS_FLG_BUSY_PORT)
 		break;
 	} while (foq.first && !preempt);
@@ -2297,81 +2375,71 @@ erts_dist_command(Port *prt, int reds_limit)
     if (sched_flags & ERTS_PTS_FLG_BUSY_PORT) {
 	if (oq.first) {
 	    ErtsDistOutputBuf *ob;
-	    int preempt;
+            ErtsDistOutputBuf *last_finalized = NULL;
 	finalize_only:
-	    preempt = 0;
 	    ob = oq.first;
 	    ASSERT(ob);
 	    do {
-		ob->extp = erts_encode_ext_dist_header_finalize(ob->extp,
-								dep->cache,
-								flags);
-		if (!(flags & DFLAG_DIST_HDR_ATOM_CACHE))
-		    *--ob->extp = PASS_THROUGH; /* Old node; 'pass through'
-						   needed */
-		ASSERT(&ob->data[0] <= ob->extp && ob->extp < ob->ext_endp);
-		reds += ERTS_PORT_REDS_DIST_CMD_FINALIZE;
-		preempt = reds > reds_limit;
-		if (preempt)
-		    break;
-		ob = ob->next;
+		reds = erts_encode_ext_dist_header_finalize(ob, dep, flags, reds);
+                if (reds < 0)
+                    break;
+                last_finalized  = ob;
+                ob = ob->next;
 	    } while (ob);
-	    /*
-	     * At least one buffer was finalized; if we got preempted,
-	     * ob points to the last buffer that we finalized.
-	     */
-	    if (foq.last)
-		foq.last->next = oq.first;
-	    else
-		foq.first = oq.first;
-	    if (!preempt) {
-		/* All buffers finalized */
-		foq.last = oq.last;
-		oq.first = oq.last = NULL;
-	    }
-	    else {
-		/* Not all buffers finalized; split oq. */
-		foq.last = ob;
-		oq.first = ob->next;
-		if (oq.first)
-		    ob->next = NULL;
-		else
-		    oq.last = NULL;
-	    }
-	    if (preempt)
-		goto preempted;
+            if (last_finalized) {
+                /*
+                 * At least one buffer was finalized; if we got preempted,
+                 * ob points to the next buffer to continue finalize.
+                 */
+                if (foq.last)
+                    foq.last->next = oq.first;
+                else
+                    foq.first = oq.first;
+                foq.last = last_finalized;
+                if (!ob) {
+                    /* All buffers finalized */
+                    ASSERT(foq.last == oq.last);
+                    ASSERT(foq.last->next == NULL);
+                    oq.first = oq.last = NULL;
+                }
+                else {
+                    /* Not all buffers finalized; split oq. */
+                    ASSERT(foq.last->next == ob);
+                    foq.last->next = NULL;
+                    oq.first = ob;
+                }
+            }
+            if (reds <= 0)
+                goto preempted;
 	}
     }
     else {
         int de_busy;
 	int preempt = 0;
 	while (oq.first && !preempt) {
-            ErtsDistOutputBuf *fob;
-            Uint size;
-            oq.first->extp
-                = erts_encode_ext_dist_header_finalize(oq.first->extp,
-                                                       dep->cache,
-                                                       flags);
-            reds += ERTS_PORT_REDS_DIST_CMD_FINALIZE;
-            if (!(flags & DFLAG_DIST_HDR_ATOM_CACHE))
-                *--oq.first->extp = PASS_THROUGH; /* Old node; 'pass through'
-                                                     needed */
-            ASSERT(&oq.first->data[0] <= oq.first->extp
-                   && oq.first->extp < oq.first->ext_endp);
-            size = (*send)(prt, oq.first);
+	    ErtsDistOutputBuf *fob;
+	    Uint size;
+            reds = erts_encode_ext_dist_header_finalize(oq.first, dep, flags, reds);
+            if (reds < 0) {
+                preempt = 1;
+                break;
+            }
+	    ASSERT(&oq.first->data[0] <= oq.first->extp
+		   && oq.first->extp <= oq.first->ext_endp);
+	    size = (*send)(prt, oq.first);
             erts_atomic64_inc_nob(&dep->out);
-            esdp->io.out += (Uint64) size;
+	    esdp->io.out += (Uint64) size;
 #ifdef ERTS_RAW_DIST_MSG_DBG
             erts_fprintf(stderr, ">> ");
             bw(oq.first->extp, size);
 #endif
-            reds += ERTS_PORT_REDS_DIST_CMD_DATA(size);
-            fob = oq.first;
-            obufsize += size_obuf(fob);
-            oq.first = oq.first->next;
-            free_dist_obuf(fob);
+	    reds -= ERTS_PORT_REDS_DIST_CMD_DATA(size);
+	    fob = oq.first;
+	    obufsize += size_obuf(fob);
+	    oq.first = oq.first->next;
+	    free_dist_obuf(fob);
 	    sched_flags = erts_atomic32_read_nob(&prt->sched.flags);
-	    preempt = reds > reds_limit || (sched_flags & ERTS_PTS_FLG_EXIT);
+	    preempt = reds <= 0 || (sched_flags & ERTS_PTS_FLG_EXIT);
 	    if ((sched_flags & ERTS_PTS_FLG_BUSY_PORT) && oq.first && !preempt)
 		goto finalize_only;
 	}
@@ -2411,7 +2479,7 @@ erts_dist_command(Port *prt, int reds_limit)
 	    erts_mtx_unlock(&dep->qlock);
 
 	    resumed = erts_resume_processes(suspendees);
-	    reds += resumed*ERTS_PORT_REDS_DIST_CMD_RESUMED;
+	    reds -= resumed*ERTS_PORT_REDS_DIST_CMD_RESUMED;
 	}
 	else
 	    erts_mtx_unlock(&dep->qlock);
@@ -2434,8 +2502,7 @@ erts_dist_command(Port *prt, int reds_limit)
 	erts_mtx_unlock(&dep->qlock);
     }
 
-    ASSERT(foq.first || !foq.last);
-    ASSERT(!foq.first || foq.last);
+    ASSERT(!!foq.first == !!foq.last);
     ASSERT(!dep->finalized_out_queue.first);
     ASSERT(!dep->finalized_out_queue.last);
 
@@ -2445,10 +2512,10 @@ erts_dist_command(Port *prt, int reds_limit)
     }
 
      /* Avoid wrapping reduction counter... */
-    if (reds > INT_MAX/2)
-	reds = INT_MAX/2;
+    if (reds < INT_MIN/2)
+	reds = INT_MIN/2;
 
-    return reds;
+    return initial_reds - reds;
 
  preempted:
     /*
@@ -2456,8 +2523,7 @@ erts_dist_command(Port *prt, int reds_limit)
      * since last call to driver.
      */
 
-    ASSERT(oq.first || !oq.last);
-    ASSERT(!oq.first || oq.last);
+    ASSERT(!!oq.first == !!oq.last);
 
     if (sched_flags & ERTS_PTS_FLG_EXIT) {
 	/*
@@ -2481,12 +2547,6 @@ erts_dist_command(Port *prt, int reds_limit)
 
 	foq.first = NULL;
 	foq.last = NULL;
-
-#ifdef DEBUG
-	erts_mtx_lock(&dep->qlock);
-	ASSERT(erts_atomic_read_nob(&dep->qsize) == obufsize);
-	erts_mtx_unlock(&dep->qlock);
-#endif
     }
     else {
 	if (oq.first) {
@@ -2776,7 +2836,8 @@ BIF_RETTYPE
 dist_ctrl_get_data_1(BIF_ALIST_1)
 {
     DistEntry *dep = ERTS_PROC_GET_DIST_ENTRY(BIF_P);
-    int reds = 1;
+    const Sint initial_reds = ERTS_BIF_REDS_LEFT(BIF_P);
+    Sint reds = initial_reds;
     ErtsDistOutputBuf *obuf;
     Eterm *hp;
     ProcBin *pb;
@@ -2790,7 +2851,7 @@ dist_ctrl_get_data_1(BIF_ALIST_1)
 
     erts_de_rlock(dep);
 
-    if (dep->status & ERTS_DE_SFLG_EXITING)
+    if (dep->state == ERTS_DE_STATE_EXITING)
         goto return_none;
 
     ASSERT(dep->cid == BIF_P->common.id);
@@ -2807,6 +2868,7 @@ dist_ctrl_get_data_1(BIF_ALIST_1)
     {
         if (!dep->tmp_out_queue.first) {
             ASSERT(!dep->tmp_out_queue.last);
+            ASSERT(!dep->transcode_ctx);
             qsize = erts_atomic_read_acqb(&dep->qsize);
             if (qsize > 0) {
                 erts_mtx_lock(&dep->qlock);
@@ -2824,21 +2886,18 @@ dist_ctrl_get_data_1(BIF_ALIST_1)
             erts_de_runlock(dep);
             BIF_RET(am_none);
         }
-        else {
-            obuf = dep->tmp_out_queue.first;
-            dep->tmp_out_queue.first = obuf->next;
-            if (!obuf->next)
-                dep->tmp_out_queue.last = NULL;
+
+        obuf = dep->tmp_out_queue.first;
+        reds = erts_encode_ext_dist_header_finalize(obuf, dep, dep->flags, reds);
+        if (reds < 0) {
+            erts_de_runlock(dep);
+            ERTS_BIF_YIELD1(bif_export[BIF_dist_ctrl_get_data_1],
+                            BIF_P, BIF_ARG_1);
         }
 
-        obuf->extp = erts_encode_ext_dist_header_finalize(obuf->extp,
-                                                          dep->cache,
-                                                          dep->flags);
-        reds += ERTS_PORT_REDS_DIST_CMD_FINALIZE;
-        if (!(dep->flags & DFLAG_DIST_HDR_ATOM_CACHE))
-            *--obuf->extp = PASS_THROUGH; /* 'pass through' needed */
-        ASSERT(&obuf->data[0] <= obuf->extp
-               && obuf->extp < obuf->ext_endp);
+        dep->tmp_out_queue.first = obuf->next;
+        if (!obuf->next)
+            dep->tmp_out_queue.last = NULL;
     }
 
     erts_atomic64_inc_nob(&dep->out);
@@ -2866,11 +2925,11 @@ dist_ctrl_get_data_1(BIF_ALIST_1)
         erts_mtx_unlock(&dep->qlock);
         if (resume_procs) {
             int resumed = erts_resume_processes(resume_procs);
-            reds += resumed*ERTS_PORT_REDS_DIST_CMD_RESUMED;
+            reds -= resumed*ERTS_PORT_REDS_DIST_CMD_RESUMED;
         }
     }
 
-    BIF_RET2(make_binary(pb), reds);
+    BIF_RET2(make_binary(pb), (initial_reds - reds));
 }
 
 void
@@ -2892,24 +2951,31 @@ erts_dist_port_not_busy(Port *prt)
     erts_schedule_dist_command(prt, NULL);
 }
 
+static void kill_connection(DistEntry *dep)
+{
+    ERTS_LC_ASSERT(erts_lc_is_de_rwlocked(dep));
+    ASSERT(dep->state == ERTS_DE_STATE_CONNECTED);
+
+    dep->state = ERTS_DE_STATE_EXITING;
+    erts_mtx_lock(&dep->qlock);
+    ASSERT(!(erts_atomic32_read_nob(&dep->qflgs) & ERTS_DE_QFLG_EXIT));
+    erts_atomic32_read_bor_nob(&dep->qflgs, ERTS_DE_QFLG_EXIT);
+    erts_mtx_unlock(&dep->qlock);
+
+    if (is_internal_port(dep->cid))
+        erts_schedule_dist_command(NULL, dep);
+    else if (is_internal_pid(dep->cid))
+        schedule_kill_dist_ctrl_proc(dep->cid);
+}
+
 void
 erts_kill_dist_connection(DistEntry *dep, Uint32 connection_id)
 {
     erts_de_rwlock(dep);
     if (connection_id == dep->connection_id
-	&& !(dep->status & ERTS_DE_SFLG_EXITING)) {
-
-	dep->status |= ERTS_DE_SFLG_EXITING;
-
-	erts_mtx_lock(&dep->qlock);
-	ASSERT(!(erts_atomic32_read_nob(&dep->qflgs) & ERTS_DE_QFLG_EXIT));
-	erts_atomic32_read_bor_nob(&dep->qflgs, ERTS_DE_QFLG_EXIT);
-	erts_mtx_unlock(&dep->qlock);
+        && dep->state == ERTS_DE_STATE_CONNECTED) {
 
-        if (is_internal_port(dep->cid))
-            erts_schedule_dist_command(NULL, dep);
-        else if (is_internal_pid(dep->cid))
-            schedule_kill_dist_ctrl_proc(dep->cid);
+        kill_connection(dep);
     }
     erts_de_rwunlock(dep);
 }
@@ -3069,6 +3135,10 @@ int distribution_info(fmtfn_t to, void *arg)	/* Called by break handler */
       info_dist_entry(to, arg, dep, 0, 1);
     }
 
+    for (dep = erts_pending_dist_entries; dep; dep = dep->next) {
+        info_dist_entry(to, arg, dep, 0, 0);
+    }
+
     for (dep = erts_not_connected_dist_entries; dep; dep = dep->next) {
         if (dep != erts_this_dist_entry) {
             info_dist_entry(to, arg, dep, 0, 0);
@@ -3091,7 +3161,6 @@ int distribution_info(fmtfn_t to, void *arg)	/* Called by break handler */
 	    monitor_node  -- turn on/off node monitoring
 
             node controller only:
-            dist_exit/3       -- send exit signals from remote to local process
             dist_link/2       -- link a remote process to a local
             dist_unlink/2     -- unlink a remote from a local
 ****************************************************************************/
@@ -3101,15 +3170,6 @@ int distribution_info(fmtfn_t to, void *arg)	/* Called by break handler */
 /**********************************************************************
  ** Set the node name of current node fail if node already is set.
  ** setnode(name@host, Creation)
- ** loads functions pointer to trap_functions from module erlang.
- **    erlang:dsend/2
- **    erlang:dlink/1
- **    erlang:dunlink/1
- **    erlang:dmonitor_node/3
- **    erlang:dgroup_leader/2
- **    erlang:dexit/2
- **  -- are these needed ?
- **    dexit/1
  ***********************************************************************/
 
 BIF_RETTYPE setnode_2(BIF_ALIST_2)
@@ -3133,15 +3193,8 @@ BIF_RETTYPE setnode_2(BIF_ALIST_2)
 	goto error;
 
     /* Check that all trap functions are defined !! */
-    if (dsend2_trap->addressv[0] == NULL ||
-	dsend3_trap->addressv[0] == NULL ||
-	/*	dsend_nosuspend_trap->address == NULL ||*/
-	dlink_trap->addressv[0] == NULL ||
-	dunlink_trap->addressv[0] == NULL ||
-	dmonitor_node_trap->addressv[0] == NULL ||
-	dgroup_leader_trap->addressv[0] == NULL ||
-	dmonitor_p_trap->addressv[0] == NULL ||
-	dexit_trap->addressv[0] == NULL) {
+    if (dmonitor_node_trap->addressv[0] == NULL ||
+	dmonitor_p_trap->addressv[0] == NULL) {
 	goto error;
     }
 
@@ -3218,6 +3271,8 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
     ErtsProcLocks proc_unlock = 0;
     Process *proc;
     Port *pp = NULL;
+    Eterm notify_proc;
+    erts_aint32_t qflgs;
 
     /*
      * Check and pick out arguments
@@ -3245,21 +3300,25 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
     if (!is_atom(ic) || !is_atom(oc))
 	goto badarg;
 
-    /* DFLAG_EXTENDED_REFERENCES is compulsory from R9 and forward */
-    if (!(DFLAG_EXTENDED_REFERENCES & flags)) {
+    if (~flags & DFLAG_DIST_MANDATORY) {
 	erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
 	erts_dsprintf(dsbufp, "%T", BIF_P->common.id);
 	if (BIF_P->common.u.alive.reg)
 	    erts_dsprintf(dsbufp, " (%T)", BIF_P->common.u.alive.reg->name);
 	erts_dsprintf(dsbufp,
 		      " attempted to enable connection to node %T "
-		      "which is not able to handle extended references.\n",
+		      "which does not support all mandatory capabilities.\n",
 		      BIF_ARG_1);
 	erts_send_error_to_logger(BIF_P->group_leader, dsbufp);
 	goto badarg;
     }
 
     /*
+     * ToDo: Should we not pass connection_id as well
+     *       to make sure it's the right connection we commit.
+     */
+
+    /*
      * Arguments seem to be in order.
      */
 
@@ -3302,6 +3361,23 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
             goto badarg;
         }
 
+        if (dep->state == ERTS_DE_STATE_EXITING) {
+            /* Suspend on dist entry waiting for the exit to finish */
+            ErtsProcList *plp = erts_proclist_create(BIF_P);
+            plp->next = NULL;
+            erts_suspend(BIF_P, ERTS_PROC_LOCK_MAIN, NULL);
+            erts_mtx_lock(&dep->qlock);
+            erts_proclist_store_last(&dep->suspended, plp);
+            erts_mtx_unlock(&dep->qlock);
+            goto yield;
+        }
+        if (dep->state != ERTS_DE_STATE_PENDING) {
+            if (dep->state == ERTS_DE_STATE_IDLE)
+                erts_set_dist_entry_pending(dep);
+            else
+                goto badarg;
+        }
+
         if (is_not_nil(dep->cid))
             goto badarg;
 
@@ -3334,7 +3410,7 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
             goto done; /* Already set */
         }
 
-        if (dep->status & ERTS_DE_SFLG_EXITING) {
+        if (dep->state == ERTS_DE_STATE_EXITING) {
             /* Suspend on dist entry waiting for the exit to finish */
             ErtsProcList *plp = erts_proclist_create(BIF_P);
             plp->next = NULL;
@@ -3344,8 +3420,12 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
             erts_mtx_unlock(&dep->qlock);
             goto yield;
         }
-
-        ASSERT(!(dep->status & ERTS_DE_SFLG_EXITING));
+        if (dep->state != ERTS_DE_STATE_PENDING) {
+            if (dep->state == ERTS_DE_STATE_IDLE)
+                erts_set_dist_entry_pending(dep);
+            else
+                goto badarg;
+        }
 
         if (pp->dist_entry || is_not_nil(dep->cid))
             goto badarg;
@@ -3376,7 +3456,8 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
     dep->creation = 0;
 
 #ifdef DEBUG
-    ASSERT(erts_atomic_read_nob(&dep->qsize) == 0);
+    ASSERT(erts_atomic_read_nob(&dep->qsize) == 0 
+           || (dep->state == ERTS_DE_STATE_PENDING));
 #endif
 
     if (flags & DFLAG_DIST_HDR_ATOM_CACHE)
@@ -3384,7 +3465,26 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
 
     erts_set_dist_entry_connected(dep, BIF_ARG_2, flags);
 
+    notify_proc = NIL;
+    if (erts_atomic_read_nob(&dep->qsize)) {
+        if (is_internal_port(dep->cid)) {
+            erts_schedule_dist_command(NULL, dep);
+        }
+        else {
+            qflgs = erts_atomic32_read_nob(&dep->qflgs);
+            if (qflgs & ERTS_DE_QFLG_REQ_INFO) {
+                qflgs = erts_atomic32_read_band_mb(&dep->qflgs,
+                                                   ~ERTS_DE_QFLG_REQ_INFO);
+                if (qflgs & ERTS_DE_QFLG_REQ_INFO) {
+                    notify_proc = dep->cid;
+                    ASSERT(is_internal_pid(notify_proc));
+                }
+            }
+        }
+    }
     erts_de_rwunlock(dep);
+    if (is_internal_pid(notify_proc))
+        notify_dist_data(BIF_P, notify_proc);
 
     ERTS_BIF_PREP_RET(ret, erts_make_dhandle(BIF_P, dep));
 
@@ -3426,79 +3526,189 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
     goto done;
 }
 
+BIF_RETTYPE erts_internal_get_dflags_0(BIF_ALIST_0)
+{
+    return erts_dflags_record;
+}
 
-/**********************************************************************/
-/* dist_exit(Local, Term, Remote) -> Bool */
+BIF_RETTYPE erts_internal_new_connection_1(BIF_ALIST_1)
+{
+    DistEntry* dep;
+    Uint32 conn_id;
+    Eterm* hp;
+    Eterm dhandle;
+
+    if (is_not_atom(BIF_ARG_1)) {
+	BIF_ERROR(BIF_P, BADARG);
+    }
+    dep = erts_find_or_insert_dist_entry(BIF_ARG_1);
+
+    if (dep == erts_this_dist_entry) {
+        erts_deref_dist_entry(dep);
+        BIF_ERROR(BIF_P, BADARG);
+    }
+
+    erts_de_rwlock(dep);
+
+    switch (dep->state) {
+    case ERTS_DE_STATE_PENDING:
+    case ERTS_DE_STATE_CONNECTED:
+	conn_id = dep->connection_id;
+        break;
+    case ERTS_DE_STATE_IDLE:
+        erts_set_dist_entry_pending(dep);
+	conn_id = dep->connection_id;
+        break;
+    case ERTS_DE_STATE_EXITING:
+        conn_id = (dep->connection_id + 1) & ERTS_DIST_CON_ID_MASK;
+        break;
+    default:
+        erts_exit(ERTS_ABORT_EXIT, "Invalid dep->state (%d)\n", dep->state);
+    }
+    erts_de_rwunlock(dep);
+    hp = HAlloc(BIF_P, 3 + ERTS_MAGIC_REF_THING_SIZE);
+    dhandle = erts_build_dhandle(&hp, &BIF_P->off_heap, dep);
+    erts_deref_dist_entry(dep);
+    BIF_RET(TUPLE2(hp, make_small(conn_id), dhandle));
+}
 
-BIF_RETTYPE dist_exit_3(BIF_ALIST_3)
+static Sint abort_connection(DistEntry* dep, Uint32 conn_id)
 {
-    Eterm local;
-    Eterm remote;
-    DistEntry *rdep;
+    erts_de_rwlock(dep);
 
-    local = BIF_ARG_1;
-    remote = BIF_ARG_3;
+    if (dep->connection_id != conn_id)
+        ;
+    else if (dep->state == ERTS_DE_STATE_CONNECTED) {
+        kill_connection(dep);
+    }
+    else if (dep->state == ERTS_DE_STATE_PENDING) {
+        NetExitsContext nec = {dep};
+        ErtsLink *nlinks;
+        ErtsLink *node_links;
+        ErtsMonitor *monitors;
+        ErtsAtomCache *cache;
+        ErtsDistOutputBuf *obuf;
+        ErtsProcList *resume_procs;
+        Sint reds = 0;
+
+	ASSERT(is_nil(dep->cid));
 
-    /* Check that remote is a remote process */
-    if (is_not_external_pid(remote))
-	goto error;
+	erts_de_links_lock(dep);
+	monitors	= dep->monitors;
+	nlinks		= dep->nlinks;
+	node_links	= dep->node_links;
+	dep->monitors	= NULL;
+	dep->nlinks	= NULL;
+	dep->node_links	= NULL;
+	erts_de_links_unlock(dep);
 
-    rdep = external_dist_entry(remote);
-    
-    if(rdep == erts_this_dist_entry)
-	goto error;
+	cache = dep->cache;
+	dep->cache = NULL;
+	erts_mtx_lock(&dep->qlock);
+        obuf = dep->out_queue.first;
+        dep->out_queue.first = NULL;
+        dep->out_queue.last = NULL;
+        ASSERT(!dep->tmp_out_queue.first);
+        ASSERT(!dep->finalized_out_queue.first);
+        resume_procs = get_suspended_on_de(dep, ERTS_DE_QFLGS_ALL);
+	erts_mtx_unlock(&dep->qlock);
+	erts_atomic_set_nob(&dep->dist_cmd_scheduled, 0);
+	dep->send = NULL;
 
-    /* Check that local is local */
-    if (is_internal_pid(local)) {
-	Process *lp;
-	ErtsProcLocks lp_locks;
-	if (BIF_P->common.id == local) {
-	    lp_locks = ERTS_PROC_LOCKS_ALL;
-	    lp = BIF_P;
-	    erts_proc_lock(BIF_P, ERTS_PROC_LOCKS_ALL_MINOR);
-	}
-	else {
-	    lp_locks = ERTS_PROC_LOCKS_XSIG_SEND;
-	    lp = erts_pid2proc(BIF_P, ERTS_PROC_LOCK_MAIN,
-			       local, lp_locks);
-	    if (!lp) {
-		BIF_RET(am_true); /* ignore */
-	    }
-	}
-	
-	(void) erts_send_exit_signal(BIF_P,
-				     remote,
-				     lp,
-				     &lp_locks,
-				     BIF_ARG_2,
-				     NIL,
-				     NULL,
-				     0);
-	if (lp == BIF_P)
-	    lp_locks &= ~ERTS_PROC_LOCK_MAIN;
-	erts_proc_unlock(lp, lp_locks);
-	if (lp == BIF_P) {
-	    erts_aint32_t state = erts_atomic32_read_acqb(&BIF_P->state);
-	    /*
-	     * We may have exited current process and may have to take action.
-	     */
-	    if (state & (ERTS_PSFLG_EXITING|ERTS_PSFLG_PENDING_EXIT)) {
-		if (state & ERTS_PSFLG_PENDING_EXIT)
-		    erts_handle_pending_exit(BIF_P, ERTS_PROC_LOCK_MAIN);
-		ERTS_BIF_EXITED(BIF_P);
-	    }
-	}
+        erts_set_dist_entry_not_connected(dep);
+
+	erts_de_rwunlock(dep);
+
+	erts_sweep_monitors(monitors, &doit_monitor_net_exits, &nec);
+	erts_sweep_links(nlinks, &doit_link_net_exits, &nec);
+	erts_sweep_links(node_links, &doit_node_link_net_exits, &nec);
+
+        if (resume_procs) {
+            int resumed = erts_resume_processes(resume_procs);
+            reds += resumed*ERTS_PORT_REDS_DIST_CMD_RESUMED;
+        }
+
+	delete_cache(cache);
+	free_de_out_queues(dep, obuf);
+
+        /*
+         * We wait to make DistEntry idle and accept new connection attempts
+         * until all is cleared and deallocated. This to get some back pressure
+         * against repeated failing connection attempts saturating all CPUs
+         * with cleanup jobs.
+         */
+        erts_de_rwlock(dep);
+        ASSERT(dep->state == ERTS_DE_STATE_EXITING);
+        dep->state = ERTS_DE_STATE_IDLE;
+        erts_de_rwunlock(dep);
+        return reds;
     }
-    else if (is_external_pid(local)
-	     && external_dist_entry(local) == erts_this_dist_entry) {
-	BIF_RET(am_true); /* ignore */
+    erts_de_rwunlock(dep);
+    return 0;
+}
+
+BIF_RETTYPE erts_internal_abort_connection_2(BIF_ALIST_2)
+{
+    DistEntry* dep;
+    Eterm* tp;
+
+    if (is_not_atom(BIF_ARG_1) || is_not_tuple_arity(BIF_ARG_2, 2)) {
+	BIF_ERROR(BIF_P, BADARG);
+    }
+    tp = tuple_val(BIF_ARG_2);
+    dep = erts_dhandle_to_dist_entry(tp[2]);
+    if (is_not_small(tp[1]) || dep != erts_find_dist_entry(BIF_ARG_1)
+        || dep == erts_this_dist_entry) {
+        BIF_ERROR(BIF_P, BADARG);
+    }
+
+    if (dep) {
+        Sint reds = abort_connection(dep, unsigned_val(tp[1]));
+        BUMP_REDS(BIF_P, reds);
     }
-    else
-	goto error;
     BIF_RET(am_true);
+}
 
- error:
-    BIF_ERROR(BIF_P, BADARG);
+int erts_auto_connect(DistEntry* dep, Process *proc, ErtsProcLocks proc_locks)
+{
+    erts_de_rwlock(dep);
+    if (dep->state != ERTS_DE_STATE_IDLE) {
+        erts_de_rwunlock(dep);
+    }
+    else {
+        Process* net_kernel;
+        ErtsProcLocks nk_locks = ERTS_PROC_LOCK_MSGQ;
+        Eterm *hp;
+        ErlOffHeap *ohp;
+        ErtsMessage *mp;
+        Eterm msg, dhandle;
+        Uint32 conn_id;
+
+        erts_set_dist_entry_pending(dep);
+        conn_id = dep->connection_id;
+        erts_de_rwunlock(dep);
+
+        net_kernel = erts_whereis_process(proc, proc_locks,
+                                          am_net_kernel, nk_locks, 0);
+        if (!net_kernel) {
+            abort_connection(dep, conn_id);
+            return 0;
+        }
+
+        /*
+         * Send {auto_connect, Node, ConnId, DHandle} to net_kernel
+         */
+        mp = erts_alloc_message_heap(net_kernel, &nk_locks,
+                                     5 + ERTS_MAGIC_REF_THING_SIZE,
+                                     &hp, &ohp);
+        dhandle = erts_build_dhandle(&hp, ohp, dep);
+        msg = TUPLE4(hp, am_auto_connect, dep->sysname, make_small(conn_id),
+                     dhandle);
+        erts_queue_message(net_kernel, nk_locks, mp, msg, proc->common.id);
+        erts_proc_unlock(net_kernel, nk_locks);
+    }
+
+    return 1;
 }
 
 /**********************************************************************/
@@ -3574,9 +3784,11 @@ BIF_RETTYPE nodes_1(BIF_ALIST_1)
 
     ASSERT(erts_no_of_not_connected_dist_entries > 0);
     ASSERT(erts_no_of_hidden_dist_entries >= 0);
+    ASSERT(erts_no_of_pending_dist_entries >= 0);
     ASSERT(erts_no_of_visible_dist_entries >= 0);
     if(not_connected)
-      length += (erts_no_of_not_connected_dist_entries - 1);
+      length += ((erts_no_of_not_connected_dist_entries - 1)
+                 + erts_no_of_pending_dist_entries);
     if(hidden)
       length += erts_no_of_hidden_dist_entries;
     if(visible)
@@ -3596,13 +3808,18 @@ BIF_RETTYPE nodes_1(BIF_ALIST_1)
 #ifdef DEBUG
     endp = hp + length*2;
 #endif
-    if(not_connected)
+    if(not_connected) {
       for(dep = erts_not_connected_dist_entries; dep; dep = dep->next) {
           if (dep != erts_this_dist_entry) {
             result = CONS(hp, dep->sysname, result);
             hp += 2;
           }
+        }
+      for(dep = erts_pending_dist_entries; dep; dep = dep->next) {
+          result = CONS(hp, dep->sysname, result);
+          hp += 2;
       }
+    }
     if(hidden)
       for(dep = erts_hidden_dist_entries; dep; dep = dep->next) {
 	result = CONS(hp, dep->sysname, result);
@@ -3647,11 +3864,17 @@ monitor_node(Process* p, Eterm Node, Eterm Bool, Eterm Options)
     DistEntry *dep;
     ErtsLink *lnk;
     Eterm l;
+    int async_connect = 1;
 
     for (l = Options; l != NIL && is_list(l); l = CDR(list_val(l))) {
 	Eterm t = CAR(list_val(l));
-	/* allow_passive_connect the only available option right now */
-	if (t != am_allow_passive_connect) {
+	if (t == am_allow_passive_connect) {
+	    /*
+	     * Handle this horrible feature by falling back on old synchronous
+	     * auto-connect (if needed)
+	     */
+	    async_connect = 0;
+	} else {
 	    BIF_ERROR(p, BADARG);
 	}
     }
@@ -3665,50 +3888,91 @@ monitor_node(Process* p, Eterm Node, Eterm Bool, Eterm Options)
 	 && (Node != erts_this_node->sysname))) {
 	BIF_ERROR(p, BADARG);
     }
-    dep = erts_sysname_to_connected_dist_entry(Node);
-    if (!dep) {
-    do_trap:
-	BIF_TRAP3(dmonitor_node_trap, p, Node, Bool, Options);
-    }
-    if (dep == erts_this_dist_entry)
-	goto done;
-
-    erts_proc_lock(p, ERTS_PROC_LOCK_LINK);
-    erts_de_rlock(dep);
-    if (ERTS_DE_IS_NOT_CONNECTED(dep)) {
-	erts_proc_unlock(p, ERTS_PROC_LOCK_LINK);
-	erts_de_runlock(dep);
-	goto do_trap;
-    }
-    erts_de_links_lock(dep);
-    erts_de_runlock(dep);
 
     if (Bool == am_true) {
-	ASSERT(dep->cid != NIL);
-	lnk = erts_add_or_lookup_link(&(dep->node_links), LINK_NODE, 
-				      p->common.id);
-	++ERTS_LINK_REFC(lnk);
-	lnk = erts_add_or_lookup_link(&ERTS_P_LINKS(p), LINK_NODE, Node);
-	++ERTS_LINK_REFC(lnk);
-    }
-    else  {
-	lnk = erts_lookup_link(dep->node_links, p->common.id);
-	if (lnk != NULL) {
-	    if ((--ERTS_LINK_REFC(lnk)) == 0) {
-		erts_destroy_link(erts_remove_link(&(dep->node_links), 
-						   p->common.id));
-	    }
-	}
-	lnk = erts_lookup_link(ERTS_P_LINKS(p), Node);
-	if (lnk != NULL) {
-	    if ((--ERTS_LINK_REFC(lnk)) == 0) {
-		erts_destroy_link(erts_remove_link(&ERTS_P_LINKS(p),
-						   Node));
+        ErtsDSigData dsd;
+        dsd.node = Node;
+        dep = erts_find_or_insert_dist_entry(Node);
+        if (dep == erts_this_dist_entry)
+            goto done;
+
+        erts_proc_lock(p, ERTS_PROC_LOCK_LINK);
+
+        switch (erts_dsig_prepare(&dsd, dep, p,
+                                  (ERTS_PROC_LOCK_MAIN | ERTS_PROC_LOCK_LINK),
+                                  ERTS_DSP_RLOCK, 0, async_connect)) {
+        case ERTS_DSIG_PREP_NOT_ALIVE:
+	case ERTS_DSIG_PREP_NOT_CONNECTED:
+	    /* Trap to either send 'nodedown' or do passive connection attempt */
+	trap:
+            erts_proc_unlock(p, ERTS_PROC_LOCK_LINK);
+	    erts_deref_dist_entry(dep);
+            BIF_TRAP3(dmonitor_node_trap, p, Node, Bool, Options);
+	case ERTS_DSIG_PREP_PENDING:
+	    if (!async_connect) {
+		/*
+		 * Pending connection may fail, so we must trap
+		 * to ensure passive connection attempt
+		 */
+		erts_de_runlock(dep);
+		goto trap;
 	    }
-	}
+	    /*fall through*/
+        case ERTS_DSIG_PREP_CONNECTED:
+            erts_de_links_lock(dep);
+            erts_de_runlock(dep);
+            lnk = erts_add_or_lookup_link(&(dep->node_links), LINK_NODE,
+                                          p->common.id);
+            ++ERTS_LINK_REFC(lnk);
+            lnk = erts_add_or_lookup_link(&ERTS_P_LINKS(p), LINK_NODE, Node);
+            ++ERTS_LINK_REFC(lnk);
+            erts_de_links_unlock(dep);
+            break;
+        default:
+            ERTS_ASSERT(! "Invalid dsig prepare result");
+        }
+        erts_deref_dist_entry(dep);
+    }
+    else { /* Bool == false */
+        dep = erts_sysname_to_connected_dist_entry(Node);
+        if (!dep) {
+	    /*
+	     * Before OTP-21 this case triggered auto-connect
+	     * and a 'nodedown' message if that failed.
+	     * Now it's a simple no-op which feels more reasonable.
+	     */
+            BIF_RET(am_true);
+        }
+        if (dep == erts_this_dist_entry)
+            goto done;
+
+        erts_proc_lock(p, ERTS_PROC_LOCK_LINK);
+        erts_de_rlock(dep);
+        if (dep->state == ERTS_DE_STATE_IDLE) {
+            ASSERT(!dep->node_links);
+            erts_proc_unlock(p, ERTS_PROC_LOCK_LINK);
+            erts_de_runlock(dep);
+            goto done;
+        }
+        erts_de_links_lock(dep);
+        erts_de_runlock(dep);
+        lnk = erts_lookup_link(dep->node_links, p->common.id);
+        if (lnk != NULL) {
+            if ((--ERTS_LINK_REFC(lnk)) == 0) {
+                erts_destroy_link(erts_remove_link(&(dep->node_links),
+                                                   p->common.id));
+            }
+        }
+        lnk = erts_lookup_link(ERTS_P_LINKS(p), Node);
+        if (lnk != NULL) {
+            if ((--ERTS_LINK_REFC(lnk)) == 0) {
+                erts_destroy_link(erts_remove_link(&ERTS_P_LINKS(p),
+                                                   Node));
+            }
+        }
+        erts_de_links_unlock(dep);
     }
 
-    erts_de_links_unlock(dep);
     erts_proc_unlock(p, ERTS_PROC_LOCK_LINK);
 
  done:
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index d4765c50b8..b1b7ce9c78 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -40,11 +40,51 @@
 #define DFLAG_UNICODE_IO          0x1000
 #define DFLAG_DIST_HDR_ATOM_CACHE 0x2000
 #define DFLAG_SMALL_ATOM_TAGS     0x4000
-#define DFLAG_INTERNAL_TAGS       0x8000
+#define DFLAG_INTERNAL_TAGS       0x8000   /* used by ETS 'compressed' option */
 #define DFLAG_UTF8_ATOMS          0x10000
 #define DFLAG_MAP_TAG             0x20000
 #define DFLAG_BIG_CREATION        0x40000
 #define DFLAG_SEND_SENDER         0x80000
+#define DFLAG_NO_MAGIC            0x100000 /* internal for pending connection */
+
+/* Mandatory flags for distribution */
+#define DFLAG_DIST_MANDATORY (DFLAG_EXTENDED_REFERENCES         \
+                              | DFLAG_EXTENDED_PIDS_PORTS       \
+			      | DFLAG_UTF8_ATOMS                \
+			      | DFLAG_NEW_FUN_TAGS)
+
+/*
+ * Additional optimistic flags when encoding toward pending connection.
+ * If remote node (erl_interface) does not supporting these then we may need
+ * to transcode messages enqueued before connection setup was finished.
+ */
+#define DFLAG_DIST_HOPEFULLY (DFLAG_EXPORT_PTR_TAG              \
+                              | DFLAG_BIT_BINARIES              \
+                              | DFLAG_DIST_MONITOR              \
+                              | DFLAG_DIST_MONITOR_NAME)
+
+/* Our preferred set of flags. Used for connection setup handshake */
+#define DFLAG_DIST_DEFAULT (DFLAG_DIST_MANDATORY | DFLAG_DIST_HOPEFULLY \
+                            | DFLAG_FUN_TAGS                  \
+                            | DFLAG_NEW_FLOATS                \
+                            | DFLAG_UNICODE_IO                \
+                            | DFLAG_DIST_HDR_ATOM_CACHE       \
+                            | DFLAG_SMALL_ATOM_TAGS           \
+                            | DFLAG_UTF8_ATOMS                \
+                            | DFLAG_MAP_TAG                   \
+                            | DFLAG_BIG_CREATION              \
+                            | DFLAG_SEND_SENDER)
+
+/* Flags addable by local distr implementations */
+#define DFLAG_DIST_ADDABLE    DFLAG_DIST_DEFAULT
+
+/* Flags rejectable by local distr implementation */
+#define DFLAG_DIST_REJECTABLE (DFLAG_DIST_HDR_ATOM_CACHE         \
+                               | DFLAG_HIDDEN_ATOM_CACHE         \
+                               | DFLAG_ATOM_CACHE)
+
+/* Flags for all features needing strict order delivery */
+#define DFLAG_DIST_STRICT_ORDER DFLAG_DIST_HDR_ATOM_CACHE
 
 /* All flags that should be enabled when term_to_binary/1 is used. */
 #define TERM_TO_BINARY_DFLAGS (DFLAG_EXTENDED_REFERENCES	\
@@ -79,52 +119,34 @@
 #define DOP_SEND_SENDER_TT      23
 
 /* distribution trap functions */
-extern Export* dsend2_trap;
-extern Export* dsend3_trap;
-extern Export* dlink_trap;
-extern Export* dunlink_trap;
 extern Export* dmonitor_node_trap;
-extern Export* dgroup_leader_trap;
-extern Export* dexit_trap;
 extern Export* dmonitor_p_trap;
 
 typedef enum {
     ERTS_DSP_NO_LOCK,
-    ERTS_DSP_RLOCK,
-    ERTS_DSP_RWLOCK
+    ERTS_DSP_RLOCK
 } ErtsDSigPrepLock;
 
 
 typedef struct {
     Process *proc;
     DistEntry *dep;
+    Eterm node;   /* used if dep == NULL */
     Eterm cid;
     Eterm connection_id;
     int no_suspend;
 } ErtsDSigData;
 
-#define ERTS_DE_IS_NOT_CONNECTED(DEP) \
-  (ERTS_LC_ASSERT(erts_lc_rwmtx_is_rlocked(&(DEP)->rwmtx) \
-		      || erts_lc_rwmtx_is_rwlocked(&(DEP)->rwmtx)), \
-   (is_nil((DEP)->cid) || ((DEP)->status & ERTS_DE_SFLG_EXITING)))
-
-#define ERTS_DE_IS_CONNECTED(DEP) \
-  (!ERTS_DE_IS_NOT_CONNECTED((DEP)))
-
 #define ERTS_DE_BUSY_LIMIT (1024*1024)
 extern int erts_dist_buf_busy_limit;
 extern int erts_is_alive;
 
 /*
  * erts_dsig_prepare() prepares a send of a distributed signal.
- * One of the values defined below are returned. If the returned
- * value is another than ERTS_DSIG_PREP_CONNECTED, the
- * distributed signal cannot be sent before appropriate actions
- * have been taken. Appropriate actions would typically be setting
- * up the connection.
+ * One of the values defined below are returned.
  */
 
-/* Connected; signal can be sent. */
+/* Connected; signals can be enqueued and sent. */
 #define ERTS_DSIG_PREP_CONNECTED	0
 /* Not connected; connection needs to be set up. */
 #define ERTS_DSIG_PREP_NOT_CONNECTED	1
@@ -132,43 +154,80 @@ extern int erts_is_alive;
 #define ERTS_DSIG_PREP_WOULD_SUSPEND	2
 /* System not alive (distributed) */
 #define ERTS_DSIG_PREP_NOT_ALIVE	3
+/* Pending connection; signals can be enqueued */
+#define ERTS_DSIG_PREP_PENDING	        4
 
 ERTS_GLB_INLINE int erts_dsig_prepare(ErtsDSigData *,
-				      DistEntry *,
+				      DistEntry*,
 				      Process *,
+                                      ErtsProcLocks,
 				      ErtsDSigPrepLock,
+				      int,
 				      int);
 
 ERTS_GLB_INLINE
 void erts_schedule_dist_command(Port *, DistEntry *);
 
+int erts_auto_connect(DistEntry* dep, Process *proc, ErtsProcLocks proc_locks);
+
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
 ERTS_GLB_INLINE int 
 erts_dsig_prepare(ErtsDSigData *dsdp,
 		  DistEntry *dep,
 		  Process *proc,
+                  ErtsProcLocks proc_locks,
 		  ErtsDSigPrepLock dspl,
-		  int no_suspend)
+		  int no_suspend,
+		  int connect)
 {
-    int failure;
+    int res;
+
     if (!erts_is_alive)
 	return ERTS_DSIG_PREP_NOT_ALIVE;
-    if (!dep)
-	return ERTS_DSIG_PREP_NOT_CONNECTED;
-    if (dspl == ERTS_DSP_RWLOCK)
-	erts_de_rwlock(dep);
-    else
-	erts_de_rlock(dep);
-    if (ERTS_DE_IS_NOT_CONNECTED(dep)) {
-	failure = ERTS_DSIG_PREP_NOT_CONNECTED;
+    if (!dep) {
+        ASSERT(!connect);
+        return ERTS_DSIG_PREP_NOT_CONNECTED;
+    }
+
+#ifdef ERTS_ENABLE_LOCK_CHECK
+    if (connect) {
+        erts_proc_lc_might_unlock(proc, proc_locks);
+    }
+#endif
+
+retry:
+    erts_de_rlock(dep);
+
+    if (dep->state == ERTS_DE_STATE_CONNECTED) {
+	res = ERTS_DSIG_PREP_CONNECTED;
+    }
+    else if (dep->state == ERTS_DE_STATE_PENDING) {
+	res = ERTS_DSIG_PREP_PENDING;
+    }
+    else if (dep->state == ERTS_DE_STATE_EXITING) {
+	res = ERTS_DSIG_PREP_NOT_CONNECTED;
+	goto fail;
+    }
+    else if (connect) {
+        ASSERT(dep->state == ERTS_DE_STATE_IDLE);
+        erts_de_runlock(dep);
+        if (!erts_auto_connect(dep, proc, proc_locks)) {
+            return ERTS_DSIG_PREP_NOT_ALIVE;
+        }
+	goto retry;
+    }
+    else {
+        ASSERT(dep->state == ERTS_DE_STATE_IDLE);
+	res = ERTS_DSIG_PREP_NOT_CONNECTED;
 	goto fail;
     }
+
     if (no_suspend) {
-        if (erts_atomic32_read_acqb(&dep->qflgs) & ERTS_DE_QFLG_BUSY) {
-	    failure = ERTS_DSIG_PREP_WOULD_SUSPEND;
+	if (erts_atomic32_read_acqb(&dep->qflgs) & ERTS_DE_QFLG_BUSY) {
+	    res = ERTS_DSIG_PREP_WOULD_SUSPEND;
 	    goto fail;
-        }
+	}
     }
     dsdp->proc = proc;
     dsdp->dep = dep;
@@ -177,15 +236,11 @@ erts_dsig_prepare(ErtsDSigData *dsdp,
     dsdp->no_suspend = no_suspend;
     if (dspl == ERTS_DSP_NO_LOCK)
 	erts_de_runlock(dep);
-    return ERTS_DSIG_PREP_CONNECTED;
+    return res;
 
  fail:
-    if (dspl == ERTS_DSP_RWLOCK)
-	erts_de_rwunlock(dep);
-    else
-	erts_de_runlock(dep);
-    return failure;
-
+    erts_de_runlock(dep);
+    return res;
 }
 
 ERTS_GLB_INLINE
@@ -291,6 +346,7 @@ typedef struct TTBSizeContext_ {
 
 typedef struct TTBEncodeContext_ {
     Uint flags;
+    Uint hopefull_flags;
     int level;
     byte* ep;
     Eterm obj;
@@ -332,7 +388,7 @@ struct erts_dsig_send_context {
     Eterm ctl;
     Eterm msg;
     int force_busy;
-    Uint32 pass_through_size;
+    Uint32 max_finalize_prepend;
     Uint data_size, dhdr_ext_size;
     ErtsAtomCacheMap *acmp;
     ErtsDistOutputBuf *obuf;
@@ -346,11 +402,12 @@ struct erts_dsig_send_context {
 
 typedef struct {
     int suspend;
+    int connect;
 
     Eterm ctl_heap[6];
     ErtsDSigData dsd;
-    DistEntry* dep_to_deref;
     DistEntry *dep;
+    int deref_dep;
     struct erts_dsig_send_context dss;
 
     Eterm return_term;
diff --git a/erts/emulator/beam/erl_afit_alloc.c b/erts/emulator/beam/erl_afit_alloc.c
index 4ebe37ee1d..23efe3bba4 100644
--- a/erts/emulator/beam/erl_afit_alloc.c
+++ b/erts/emulator/beam/erl_afit_alloc.c
@@ -181,7 +181,7 @@ static struct {
 
 static void ERTS_INLINE atom_init(Eterm *atom, char *name)
 {
-    *atom = am_atom_put(name, strlen(name));
+    *atom = am_atom_put(name, sys_strlen(name));
 }
 #define AM_INIT(AM) atom_init(&am.AM, #AM)
 
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 88285d8be6..fa49096d2c 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -160,7 +160,7 @@ enum allctr_type {
     GOODFIT,
     BESTFIT,
     AFIT,
-    AOFIRSTFIT
+    FIRSTFIT
 };
 
 struct au_init {
@@ -500,8 +500,9 @@ set_default_test_alloc_opts(struct au_init *ip)
     SET_DEFAULT_ALLOC_OPTS(ip);
     ip->enable			= 0; /* Disabled by default */
     ip->thr_spec		= -1 * erts_no_schedulers;
-    ip->atype			= AOFIRSTFIT;
-    ip->init.aoff.flavor        = AOFF_BF;
+    ip->atype			= FIRSTFIT;
+    ip->init.aoff.crr_order     = FF_AOFF;
+    ip->init.aoff.blk_order     = FF_BF;
     ip->init.util.name_prefix	= "test_";
     ip->init.util.alloc_no	= ERTS_ALC_A_TEST;
     ip->init.util.mmbcs 	= 0; /* Main carrier size */
@@ -599,10 +600,10 @@ static ERTS_INLINE int
 strategy_support_carrier_migration(struct au_init *auip)
 {
     /*
-     * Currently only aoff, aoffcbf and aoffcaobf support carrier
+     * Currently only aoff* and ageff* support carrier
      * migration, i.e, type AOFIRSTFIT.
      */
-    return auip->atype == AOFIRSTFIT;
+    return auip->atype == FIRSTFIT;
 }
 
 static ERTS_INLINE void
@@ -617,8 +618,9 @@ adjust_carrier_migration_support(struct au_init *auip)
 	 */
 	if (!strategy_support_carrier_migration(auip)) {
 	    /* Default to aoffcbf */
-	    auip->atype = AOFIRSTFIT;
-	    auip->init.aoff.flavor = AOFF_BF;
+	    auip->atype = FIRSTFIT;
+	    auip->init.aoff.crr_order = FF_AOFF;
+	    auip->init.aoff.blk_order = FF_BF;
 	}
     }
 }
@@ -1132,7 +1134,7 @@ start_au_allocator(ErtsAlcType_t alctr_n,
 					   &init->init.af,
 					   &init->init.util);
 	    break;
-    	case AOFIRSTFIT:
+	case FIRSTFIT:
 	    as = erts_aoffalc_start((AOFFAllctr_t *) as0,
 					     &init->init.aoff,
 					     &init->init.util);
@@ -1217,31 +1219,41 @@ get_bool_value(char *param_end, char** argv, int* ip)
 {
     char *param = argv[*ip]+1;
     char *value = get_value(param_end, argv, ip);
-    if (strcmp(value, "true") == 0)
+    if (sys_strcmp(value, "true") == 0)
 	return 1;
-    else if (strcmp(value, "false") == 0)
+    else if (sys_strcmp(value, "false") == 0)
 	return 0;
     else
 	bad_value(param, param_end, value);
     return -1;
 }
 
+static Uint kb_to_bytes(Sint kb, Uint *bytes)
+{
+    const Uint max = ((~((Uint) 0))/1024) + 1;
+
+    if (kb < 0 || (Uint)kb > max)
+        return 0;
+    if ((Uint)kb == max)
+        *bytes = ~((Uint) 0);
+    else
+        *bytes = ((Uint) kb)*1024;
+    return 1;
+}
+
 static Uint
 get_kb_value(char *param_end, char** argv, int* ip)
 {
     Sint tmp;
-    Uint max = ((~((Uint) 0))/1024) + 1;
+    Uint bytes = 0;
     char *rest;
     char *param = argv[*ip]+1;
     char *value = get_value(param_end, argv, ip);
     errno = 0;
     tmp = (Sint) ErtsStrToSint(value, &rest, 10);
-    if (errno != 0 || rest == value || tmp < 0 || max < ((Uint) tmp))
+    if (errno != 0 || rest == value || !kb_to_bytes(tmp, &bytes))
 	bad_value(param, param_end, value);
-    if (max == (Uint) tmp)
-	return ~((Uint) 0);
-    else
-	return ((Uint) tmp)*1024;
+    return bytes;
 }
 
 static UWord
@@ -1328,49 +1340,79 @@ handle_au_arg(struct au_init *auip,
 
     switch (sub_param[0]) {
     case 'a':
-	if (has_prefix("acul", sub_param)) {
-	    if (!auip->carrier_migration_allowed) {
-		if (!u_switch)
-		    goto bad_switch;
-		else {
-		    /* ignore */
-		    (void) get_acul_value(auip, sub_param + 4, argv, ip);
-		    break;
-		}
-	    }
-	    auip->init.util.acul = get_acul_value(auip, sub_param + 4, argv, ip);
-	}
+        if (sub_param[1] == 'c') { /* Migration parameters "ac*" */
+            UWord value;
+            UWord* wp;
+            if (!auip->carrier_migration_allowed && !u_switch)
+                goto bad_switch;
+
+            if (has_prefix("acul", sub_param)) {
+                value = get_acul_value(auip, sub_param + 4, argv, ip);
+                wp = &auip->init.util.acul;
+            }
+            else if (has_prefix("acnl", sub_param)) {
+                value = get_amount_value(sub_param + 4, argv, ip);
+                wp = &auip->init.util.acnl;
+            }
+            else if (has_prefix("acfml", sub_param)) {
+                value = get_amount_value(sub_param + 5, argv, ip);
+                wp = &auip->init.util.acfml;
+            }
+            else
+                goto bad_switch;
+
+            if (auip->carrier_migration_allowed)
+                *wp = value;
+        }
 	else if(has_prefix("asbcst", sub_param)) {
 	    auip->init.util.asbcst = get_kb_value(sub_param + 6, argv, ip);
 	}
 	else if(has_prefix("as", sub_param)) {
 	    char *alg = get_value(sub_param + 2, argv, ip);
-	    if (strcmp("bf", alg) == 0) {
+	    if (sys_strcmp("bf", alg) == 0) {
 		auip->atype = BESTFIT;
 		auip->init.bf.ao = 0;
 	    }
-	    else if (strcmp("aobf", alg) == 0) {
+	    else if (sys_strcmp("aobf", alg) == 0) {
 		auip->atype = BESTFIT;
 		auip->init.bf.ao = 1;
 	    }
-	    else if (strcmp("gf", alg) == 0) {
+	    else if (sys_strcmp("gf", alg) == 0) {
 		auip->atype = GOODFIT;
 	    }
-	    else if (strcmp("af", alg) == 0) {
+	    else if (sys_strcmp("af", alg) == 0) {
 		auip->atype = AFIT;
 	    }
-	    else if (strcmp("aoff", alg) == 0) {
-		auip->atype = AOFIRSTFIT;
-		auip->init.aoff.flavor = AOFF_AOFF;
+	    else if (sys_strcmp("aoff", alg) == 0) {
+		auip->atype = FIRSTFIT;
+		auip->init.aoff.crr_order = FF_AOFF;
+		auip->init.aoff.blk_order = FF_AOFF;
 	    }
-	    else if (strcmp("aoffcbf", alg) == 0) {
-		auip->atype = AOFIRSTFIT;
-		auip->init.aoff.flavor = AOFF_BF;
+	    else if (sys_strcmp("aoffcbf", alg) == 0) {
+		auip->atype = FIRSTFIT;
+		auip->init.aoff.crr_order = FF_AOFF;
+		auip->init.aoff.blk_order = FF_BF;
 	    }
-	    else if (strcmp("aoffcaobf", alg) == 0) {
-		auip->atype = AOFIRSTFIT;
-		auip->init.aoff.flavor = AOFF_AOBF;
+	    else if (sys_strcmp("aoffcaobf", alg) == 0) {
+		auip->atype = FIRSTFIT;
+		auip->init.aoff.crr_order = FF_AOFF;
+		auip->init.aoff.blk_order = FF_AOBF;
 	    }
+            else if (sys_strcmp("ageffcaoff", alg) == 0) {
+                auip->atype = FIRSTFIT;
+		auip->init.aoff.crr_order = FF_AGEFF;
+		auip->init.aoff.blk_order = FF_AOFF;
+            }
+            else if (sys_strcmp("ageffcbf", alg) == 0) {
+                auip->atype = FIRSTFIT;
+		auip->init.aoff.crr_order = FF_AGEFF;
+		auip->init.aoff.blk_order = FF_BF;
+            }
+            else if (sys_strcmp("ageffcaobf", alg) == 0) {
+                auip->atype = FIRSTFIT;
+		auip->init.aoff.crr_order = FF_AGEFF;
+		auip->init.aoff.blk_order = FF_AOBF;
+            }
 	    else {
 		bad_value(param, sub_param + 1, alg);
 	    }
@@ -1646,7 +1688,7 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 		    }
 		    else if (has_prefix("e", param+2)) {
 			arg = get_value(param+3, argv, &i);
-			if (strcmp("true", arg) != 0)
+			if (sys_strcmp("true", arg) != 0)
 			    bad_value(param, param+3, arg);
 		    }
 		    else
@@ -1658,20 +1700,20 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 		    case 'a': {
 			int a;
 			arg = get_value(argv[i]+4, argv, &i);
-			if (strcmp("min", arg) == 0) {
+			if (sys_strcmp("min", arg) == 0) {
 			    for (a = 0; a < aui_sz; a++)
 				aui[a]->enable = 0;
 			}
-			else if (strcmp("max", arg) == 0) {
+			else if (sys_strcmp("max", arg) == 0) {
 			    for (a = 0; a < aui_sz; a++)
 				aui[a]->enable = 1;
 			}
-			else if (strcmp("config", arg) == 0) {
+			else if (sys_strcmp("config", arg) == 0) {
 			    init->erts_alloc_config = 1;
 			}
-			else if (strcmp("r9c", arg) == 0
-				 || strcmp("r10b", arg) == 0
-				 || strcmp("r11b", arg) == 0) {
+			else if (sys_strcmp("r9c", arg) == 0
+				 || sys_strcmp("r10b", arg) == 0
+				 || sys_strcmp("r11b", arg) == 0) {
 			    set_default_sl_alloc_opts(&init->sl_alloc);
 			    set_default_std_alloc_opts(&init->std_alloc);
 			    set_default_ll_alloc_opts(&init->ll_alloc);
@@ -1683,7 +1725,7 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 			    set_default_driver_alloc_opts(&init->fix_alloc);
 
 			    init->driver_alloc.enable = 0;
-			    if (strcmp("r9c", arg) == 0) {
+			    if (sys_strcmp("r9c", arg) == 0) {
 				init->sl_alloc.enable = 0;
 				init->std_alloc.enable = 0;
 				init->binary_alloc.enable = 0;
@@ -1710,18 +1752,18 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 		    switch (argv[i][3]) {
 		    case 's':
 			arg = get_value(argv[i]+4, argv, &i);
-			if (strcmp("true", arg) == 0)
+			if (sys_strcmp("true", arg) == 0)
 			    init->instr.stat = 1;
-			else if (strcmp("false", arg) == 0)
+			else if (sys_strcmp("false", arg) == 0)
 			    init->instr.stat = 0;
 			else
 			    bad_value(param, param+3, arg);
 			break;
 		    case 'm':
 			arg = get_value(argv[i]+4, argv, &i);
-			if (strcmp("true", arg) == 0)
+			if (sys_strcmp("true", arg) == 0)
 			    init->instr.map = 1;
-			else if (strcmp("false", arg) == 0)
+			else if (sys_strcmp("false", arg) == 0)
 			    init->instr.map = 0;
 			else
 			    bad_value(param, param+3, arg);
@@ -1736,9 +1778,9 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 		case 'l':
 		    if (has_prefix("pm", param+2)) {
 			arg = get_value(argv[i]+5, argv, &i);
-			if (strcmp("all", arg) == 0)
+			if (sys_strcmp("all", arg) == 0)
 			    lock_all_physical_memory = 1;
-			else if (strcmp("no", arg) == 0)
+			else if (sys_strcmp("no", arg) == 0)
 			    lock_all_physical_memory = 0;
 			else
 			    bad_value(param, param+4, arg);
@@ -1788,8 +1830,8 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 			/* || init->instr.stat
 			   || init->instr.map */) {
 			while (i < *argc) {
-			    if(strcmp(argv[i], "-sname") == 0
-			       || strcmp(argv[i], "-name") == 0) {
+			    if(sys_strcmp(argv[i], "-sname") == 0
+			       || sys_strcmp(argv[i], "-name") == 0) {
 				if (i + 1 <*argc) {
 				    init->instr.nodename = argv[i+1];
 				    break;
@@ -2650,7 +2692,7 @@ erts_allocated_areas(fmtfn_t *print_to_p, void *print_to_arg, void *proc)
 		Eterm atom;
 		if (hpp)
 		    atom = am_atom_put(values[i].name,
-				       (int) strlen(values[i].name));
+				       (int) sys_strlen(values[i].name));
 		else
 		    atom = am_true;
 
@@ -2841,7 +2883,7 @@ erts_allocator_options(void *proc)
     for (a = ERTS_ALC_A_MIN; a <= ERTS_ALC_A_MAX; a++) {
 	Eterm tmp = NIL;
 	atoms[length] = am_atom_put((char *) ERTS_ALC_A2AD(a),
-				    strlen(ERTS_ALC_A2AD(a)));
+				    sys_strlen(ERTS_ALC_A2AD(a)));
 	if (erts_allctrs_info[a].enabled) {
 	    if (erts_allctrs_info[a].alloc_util) {
 		Allctr_t *allctr;
@@ -2935,7 +2977,7 @@ erts_allocator_options(void *proc)
     for (a = ERTS_ALC_A_MIN; a <= ERTS_ALC_A_MAX; a++) {
 	if (erts_allctrs_info[a].enabled) {
 	    terms[length++] = am_atom_put((char *) ERTS_ALC_A2AD(a),
-					  strlen(ERTS_ALC_A2AD(a)));
+					  sys_strlen(ERTS_ALC_A2AD(a)));
 	}
     }
 
@@ -3392,6 +3434,65 @@ erts_request_alloc_info(struct process *c_p,
     return 1;
 }
 
+Eterm erts_alloc_set_dyn_param(Process* c_p, Eterm tuple)
+{
+    ErtsAllocatorThrSpec_t *tspec;
+    ErtsAlcType_t ai;
+    Allctr_t* allctr;
+    Eterm* tp;
+    Eterm res;
+
+    if (!is_tuple_arity(tuple, 3))
+        goto badarg;
+
+    tp = tuple_val(tuple);
+
+    /*
+     * Ex: {ets_alloc, sbct, 256000}
+     */
+    if (!is_atom(tp[1]) || !is_atom(tp[2]) || !is_integer(tp[3]))
+        goto badarg;
+
+    for (ai = ERTS_ALC_A_MIN; ai <= ERTS_ALC_A_MAX; ai++)
+        if (erts_is_atom_str(erts_alc_a2ad[ai], tp[1], 0))
+            break;
+
+    if (ai > ERTS_ALC_A_MAX)
+        goto badarg;
+
+    if (!erts_allctrs_info[ai].enabled ||
+        !erts_allctrs_info[ai].alloc_util) {
+        return am_notsup;
+    }
+
+    if (tp[2] == am_sbct) {
+        Uint sbct;
+        int i, ok;
+
+        if (!term_to_Uint(tp[3], &sbct))
+            goto badarg;
+
+        tspec = &erts_allctr_thr_spec[ai];
+        if (tspec->enabled) {
+            ok = 0;
+            for (i = 0; i < tspec->size; i++) {
+                allctr = tspec->allctr[i];
+                ok |= allctr->try_set_dyn_param(allctr, am_sbct, sbct);
+            }
+        }
+        else {
+            allctr = erts_allctrs_info[ai].extra;
+            ok = allctr->try_set_dyn_param(allctr, am_sbct, sbct);
+        }
+        return ok ? am_ok : am_notsup;
+    }
+    return am_notsup;
+
+badarg:
+    ERTS_BIF_PREP_ERROR(res, c_p, EXC_BADARG);
+    return res;
+}
+
 /* 
  * The allocator wrapper prelocking stuff below is about the locking order.
  * It only affects wrappers (erl_mtrace.c and erl_instrument.c) that keep locks
@@ -3528,7 +3629,7 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 					  &init.init.af,
 					  &init.init.util);
 		break;
-	    case AOFIRSTFIT:
+	    case FIRSTFIT:
 		allctr = erts_aoffalc_start((AOFFAllctr_t *)
 					  erts_alloc(ERTS_ALC_T_UNDEF,
 						     sizeof(AOFFAllctr_t)),
@@ -3622,7 +3723,9 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 
 	case 0xf15: erts_free(ERTS_ALC_T_TEST, (void*)a1); return 0;
 
-	case 0xf16: {
+        case 0xf16: return (UWord) erts_realloc(ERTS_ALC_T_TEST, (void*)a1, (Uint)a2);
+
+	case 0xf17: {
             Uint extra_hdr_sz = UNIT_CEILING((Uint)a1);
 	    ErtsAllocatorThrSpec_t* ts = &erts_allctr_thr_spec[ERTS_ALC_A_TEST];
 	    Uint offset = ts->allctr[0]->mbc_header_size;
@@ -3649,7 +3752,7 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 	    *(void**)a3 = orig_destroying_mbc;
 	    return offset;
 	}
-	case 0xf17: {
+	case 0xf18: {
 	    ErtsAllocatorThrSpec_t* ts = &erts_allctr_thr_spec[ERTS_ALC_A_TEST];
 	    return ts->allctr[0]->largest_mbc_size;
 	}
@@ -3858,7 +3961,7 @@ set_memory_fence(void *ptr, Uint sz, ErtsAlcType_t n)
 
     *(ui_ptr++) = sz;
     *(ui_ptr++) = pattern;
-    memcpy((void *) (((char *) ui_ptr)+sz), (void *) &pattern, sizeof(UWord));
+    sys_memcpy((void *) (((char *) ui_ptr)+sz), (void *) &pattern, sizeof(UWord));
 
 #ifdef HARD_DEBUG
     *mblkpp = hdbg_alloc((void *) ui_ptr, sz, n);
@@ -3898,7 +4001,7 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
 		     (UWord) ptr);
     }
 
-    memcpy((void *) &post_pattern, (void *) (((char *)ptr)+sz), sizeof(UWord));
+    sys_memcpy((void *) &post_pattern, (void *) (((char *)ptr)+sz), sizeof(UWord));
 
     if (post_pattern != MK_PATTERN(n)
 	|| pre_pattern != post_pattern) {
diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h
index 117f96a4ad..578a3717d9 100644
--- a/erts/emulator/beam/erl_alloc.h
+++ b/erts/emulator/beam/erl_alloc.h
@@ -126,8 +126,10 @@ typedef struct {
     void *extra;
 } ErtsAllocatorFunctions_t;
 
-extern ErtsAllocatorFunctions_t erts_allctrs[ERTS_ALC_A_MAX+1];
-extern ErtsAllocatorInfo_t erts_allctrs_info[ERTS_ALC_A_MAX+1];
+extern ErtsAllocatorFunctions_t
+    ERTS_WRITE_UNLIKELY(erts_allctrs[ERTS_ALC_A_MAX+1]);
+extern ErtsAllocatorInfo_t
+    ERTS_WRITE_UNLIKELY(erts_allctrs_info[ERTS_ALC_A_MAX+1]);
 
 typedef struct {
     int enabled;
@@ -144,7 +146,7 @@ typedef struct ErtsAllocatorWrapper_t_ {
     void (*unlock)(void);
     struct ErtsAllocatorWrapper_t_* next;
 }ErtsAllocatorWrapper_t;
-ErtsAllocatorWrapper_t *erts_allctr_wrappers;
+extern ErtsAllocatorWrapper_t *erts_allctr_wrappers;
 extern int erts_allctr_wrapper_prelocked;
 extern erts_tsd_key_t erts_allctr_prelock_tsd_key;
 void erts_allctr_wrapper_prelock_init(ErtsAllocatorWrapper_t* wrapper);
@@ -169,6 +171,8 @@ __decl_noreturn void erts_realloc_n_enomem(ErtsAlcType_t,void*,Uint)
 __decl_noreturn void erts_alc_fatal_error(int,int,ErtsAlcType_t,...)	
      __noreturn;
 
+Eterm erts_alloc_set_dyn_param(struct process*, Eterm);
+
 #undef ERTS_HAVE_IS_IN_LITERAL_RANGE
 #if defined(ARCH_32) || defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
 #  define ERTS_HAVE_IS_IN_LITERAL_RANGE
@@ -430,7 +434,7 @@ NAME##_free(TYPE *p)							\
 
 #ifdef DEBUG
 #define ERTS_PRE_ALLOC_SIZE(SZ) ((SZ) < 1000 ? (SZ)/10 + 10 : 100)
-#define ERTS_PRE_ALLOC_CLOBBER(P, T) memset((void *) (P), 0xfd, sizeof(T))
+#define ERTS_PRE_ALLOC_CLOBBER(P, T) sys_memset((void *) (P), 0xfd, sizeof(T))
 #else
 #define ERTS_PRE_ALLOC_SIZE(SZ) ((SZ) > 1 ? (SZ) : 1)
 #define ERTS_PRE_ALLOC_CLOBBER(P, T)
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index 2960272eab..8107f133aa 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -261,6 +261,7 @@ type	MINDIRECTION	FIXED_SIZE	SYSTEM		magic_indirection
 type	BINARY_FIND	SHORT_LIVED	PROCESSES	binary_find
 type  	OPEN_PORT_ENV 	TEMPORARY	SYSTEM		open_port_env
 type	CRASH_DUMP	STANDARD	SYSTEM		crash_dump
+type	DIST_TRANSCODE  SHORT_LIVED	SYSTEM		dist_transcode_context
 
 type	THR_Q_EL	STANDARD   	SYSTEM		thr_q_element
 type	THR_Q_EL_SL	FIXED_SIZE	SYSTEM		sl_thr_q_element
@@ -282,6 +283,8 @@ type	THR_PRGR_DATA	LONG_LIVED	SYSTEM		thr_prgr_data
 type	T_THR_PRGR_DATA	SHORT_LIVED	SYSTEM		temp_thr_prgr_data
 type	RELEASE_LAREA	SHORT_LIVED	SYSTEM		release_literal_area
 
+type	ENVIRONMENT	SYSTEM		SYSTEM		environment
+
 #
 # Types used for special emulators
 #
@@ -369,8 +372,6 @@ type	SYS_READ_BUF	TEMPORARY	SYSTEM		sys_read_buf
 type	FD_TAB		LONG_LIVED	SYSTEM		fd_tab
 type	FD_ENTRY_BUF	STANDARD	SYSTEM		fd_entry_buf
 type	CS_PROG_PATH	LONG_LIVED	SYSTEM		cs_prog_path
-type	ENVIRONMENT	TEMPORARY	SYSTEM		environment
-type	PUTENV_STR	SYSTEM		SYSTEM		putenv_string
 type	PRT_REP_EXIT	STANDARD	SYSTEM		port_report_exit
 type	SYS_BLOCKING	STANDARD	SYSTEM		sys_blocking
 
@@ -382,9 +383,7 @@ type	SYS_WRITE_BUF	TEMPORARY	SYSTEM		sys_write_buf
 
 type	DRV_DATA_BUF	SYSTEM		SYSTEM		drv_data_buf
 type	PRELOADED	LONG_LIVED	SYSTEM		preloaded
-type	PUTENV_STR	SYSTEM		SYSTEM		putenv_string
 type	WAITER_OBJ	LONG_LIVED	SYSTEM		waiter_object
-type	ENVIRONMENT	SYSTEM		SYSTEM		environment
 type	CON_VPRINTF_BUF	TEMPORARY	SYSTEM		con_vprintf_buf
 
 +endif
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index 4d4bddb93f..d178c2c2c2 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -362,8 +362,10 @@ do {										\
 
 #define ERTS_CRR_ALCTR_FLG_IN_POOL	(((erts_aint_t) 1) << 0)
 #define ERTS_CRR_ALCTR_FLG_BUSY		(((erts_aint_t) 1) << 1)
+#define ERTS_CRR_ALCTR_FLG_HOMECOMING	(((erts_aint_t) 1) << 2)
 #define ERTS_CRR_ALCTR_FLG_MASK (ERTS_CRR_ALCTR_FLG_IN_POOL | \
-                                 ERTS_CRR_ALCTR_FLG_BUSY)
+                                 ERTS_CRR_ALCTR_FLG_BUSY |    \
+                                 ERTS_CRR_ALCTR_FLG_HOMECOMING)
 
 #define SBC_HEADER_SIZE	   						\
     (UNIT_CEILING(offsetof(Carrier_t, cpool)                            \
@@ -563,7 +565,7 @@ do {									\
     DEBUG_CHECK_CARRIER_NO_SZ((AP));					\
 } while (0)
 
-#define STAT_MBC_CPOOL_INSERT(AP, CRR)					\
+#define STAT_MBC_ABANDON(AP, CRR)					\
 do {									\
     UWord csz__ = CARRIER_SZ((CRR));					\
     if (IS_MSEG_CARRIER((CRR)))						\
@@ -1153,89 +1155,23 @@ unlink_carrier(CarrierList_t *cl, Carrier_t *crr)
 	ASSERT(crr->next);
 	crr->next->prev = crr->prev;
     }
-}
-
-
 #ifdef DEBUG
-static int is_in_list(ErtsDoubleLink_t* sentinel, ErtsDoubleLink_t* node)
-{
-    ErtsDoubleLink_t* p;
-
-    ASSERT(node != sentinel);
-    for (p = sentinel->next; p != sentinel; p = p->next) {
-	if (p == node)
-	    return 1;
-    }
-    return 0;
-}
-#endif /* DEBUG */
-
-static ERTS_INLINE void
-link_edl_after(ErtsDoubleLink_t* after_me, ErtsDoubleLink_t* node)
-{
-    ErtsDoubleLink_t* before_me = after_me->next;
-    ASSERT(node != after_me && node != before_me);
-    node->next = before_me;
-    node->prev = after_me;
-    before_me->prev = node;
-    after_me->next = node;
-}
-
-static ERTS_INLINE void
-link_edl_before(ErtsDoubleLink_t* before_me, ErtsDoubleLink_t* node)
-{
-    ErtsDoubleLink_t* after_me = before_me->prev;
-    ASSERT(node != before_me && node != after_me);
-    node->next = before_me;
-    node->prev = after_me;
-    before_me->prev = node;
-    after_me->next = node;
-}
-
-static ERTS_INLINE void
-unlink_edl(ErtsDoubleLink_t* node)
-{
-    node->next->prev = node->prev;
-    node->prev->next = node->next;
-}
-
-static ERTS_INLINE void
-relink_edl_before(ErtsDoubleLink_t* before_me, ErtsDoubleLink_t* node)
-{
-    if (node != before_me && node != before_me->prev) {
-	unlink_edl(node);
-	link_edl_before(before_me, node);
-    }
+    crr->next = crr;
+    crr->prev = crr;
+#endif
 }
 
 static ERTS_INLINE int is_abandoned(Carrier_t *crr)
 {
-    return crr->cpool.abandoned.next != NULL;
-}
-
-static ERTS_INLINE void
-link_abandoned_carrier(ErtsDoubleLink_t* list, Carrier_t *crr)
-{
-    ASSERT(!is_abandoned(crr));
-
-    link_edl_after(list, &crr->cpool.abandoned);
-
-    ASSERT(crr->cpool.abandoned.next != &crr->cpool.abandoned);
-    ASSERT(crr->cpool.abandoned.prev != &crr->cpool.abandoned);
+    return crr->cpool.state != ERTS_MBC_IS_HOME;
 }
 
 static ERTS_INLINE void
 unlink_abandoned_carrier(Carrier_t *crr)
 {
-    ASSERT(is_in_list(&crr->cpool.orig_allctr->cpool.pooled_list,
-		      &crr->cpool.abandoned) ||
-	   is_in_list(&crr->cpool.orig_allctr->cpool.traitor_list,
-		      &crr->cpool.abandoned));
-
-    unlink_edl(&crr->cpool.abandoned);
-
-    crr->cpool.abandoned.next = NULL;
-    crr->cpool.abandoned.prev = NULL;
+    if (crr->cpool.state == ERTS_MBC_WAS_POOLED) {
+        aoff_remove_pooled_mbc(crr->cpool.orig_allctr, crr);
+    }
 }
 
 static ERTS_INLINE void
@@ -1243,24 +1179,19 @@ clear_busy_pool_carrier(Allctr_t *allctr, Carrier_t *crr)
 {
     if (crr) {
 	erts_aint_t max_size;
-	erts_aint_t new_val;
+	erts_aint_t iallctr;
 
 	max_size = (erts_aint_t) allctr->largest_fblk_in_mbc(allctr, crr);
 	erts_atomic_set_nob(&crr->cpool.max_size, max_size);
 
-	new_val = (((erts_aint_t) allctr)|ERTS_CRR_ALCTR_FLG_IN_POOL);
+        iallctr = erts_atomic_read_nob(&crr->allctr);
+        ERTS_ALC_CPOOL_ASSERT((iallctr & ~ERTS_CRR_ALCTR_FLG_HOMECOMING)
+                              == ((erts_aint_t)allctr |
+                                  ERTS_CRR_ALCTR_FLG_IN_POOL |
+                                  ERTS_CRR_ALCTR_FLG_BUSY));
 
-#ifdef ERTS_ALC_CPOOL_DEBUG
-	{
-	    erts_aint_t old_val = new_val|ERTS_CRR_ALCTR_FLG_BUSY;
-
-	    ERTS_ALC_CPOOL_ASSERT(old_val
-				  == erts_atomic_xchg_relb(&crr->allctr,
-							       new_val));
-	}
-#else
-	erts_atomic_set_relb(&crr->allctr, new_val);
-#endif
+	iallctr &= ~ERTS_CRR_ALCTR_FLG_BUSY;
+	erts_atomic_set_relb(&crr->allctr, iallctr);
     }
 }
 
@@ -1658,6 +1589,11 @@ dealloc_mbc(Allctr_t *allctr, Carrier_t *crr)
 }
 
 
+static void set_new_allctr_abandon_limit(Allctr_t*);
+static void abandon_carrier(Allctr_t*, Carrier_t*);
+static void poolify_my_carrier(Allctr_t*, Carrier_t*);
+static void enqueue_homecoming(Allctr_t*, Carrier_t*);
+
 static ERTS_INLINE Allctr_t*
 get_pref_allctr(void *extra)
 {
@@ -1724,9 +1660,23 @@ get_used_allctr(Allctr_t *pref_allctr, int pref_lock, void *p, UWord *sizep,
 		erts_aint_t act;
 
 		ERTS_ALC_CPOOL_ASSERT(!(iallctr & ERTS_CRR_ALCTR_FLG_BUSY));
-		act = erts_atomic_cmpxchg_ddrb(&crr->allctr,
-						   iallctr|ERTS_CRR_ALCTR_FLG_BUSY,
-						   iallctr);
+                if (iallctr & ERTS_CRR_ALCTR_FLG_HOMECOMING) {
+                    /*
+                     * This carrier has just been given back to us by writing
+                     * to crr->allctr with a write barrier (see abandon_carrier).
+                     *
+                     * We need a mathing read barrier to guarantee a correct view
+                     * of the carrier for deallocation work.
+                     */
+                    act = erts_atomic_cmpxchg_rb(&crr->allctr,
+                                                 iallctr|ERTS_CRR_ALCTR_FLG_BUSY,
+                                                 iallctr);
+                }
+                else {
+                    act = erts_atomic_cmpxchg_ddrb(&crr->allctr,
+                                                   iallctr|ERTS_CRR_ALCTR_FLG_BUSY,
+                                                   iallctr);
+                }
 		if (act == iallctr) {
 		    *busy_pcrr_pp = crr;
 		    break;
@@ -1742,13 +1692,6 @@ get_used_allctr(Allctr_t *pref_allctr, int pref_lock, void *p, UWord *sizep,
 		    erts_mtx_unlock(&pref_allctr->mutex);
 		}
 	    }
-
-	    ERTS_ALC_CPOOL_ASSERT(
-		(((iallctr & ~ERTS_CRR_ALCTR_FLG_MASK) == (erts_aint_t) pref_allctr)
-		 ? (((iallctr & ERTS_CRR_ALCTR_FLG_MASK) == ERTS_CRR_ALCTR_FLG_IN_POOL)
-		    || ((iallctr & ERTS_CRR_ALCTR_FLG_MASK) == 0))
-		 : 1));
-
 	    return used_allctr;
 	}
     }
@@ -2000,9 +1943,9 @@ handle_delayed_fix_dealloc(Allctr_t *allctr, void *ptr)
 	    /* Carrier migrated; need to redirect block to new owner... */
 	    int cinit = used_allctr->dd.ix - allctr->dd.ix;
 
-	    ERTS_ALC_CPOOL_ASSERT(!busy_pcrr_p);
+            ERTS_ALC_CPOOL_ASSERT(!busy_pcrr_p);
 
-	    DEC_CC(allctr->calls.this_free);
+            DEC_CC(allctr->calls.this_free);
 
 	    ((ErtsAllctrFixDDBlock_t *) ptr)->fix_type = type;
 	    if (ddq_enqueue(&used_allctr->dd.q, ptr, cinit))
@@ -2011,8 +1954,9 @@ handle_delayed_fix_dealloc(Allctr_t *allctr, void *ptr)
     }
 }
 
-static void
-schedule_dealloc_carrier(Allctr_t *allctr, Carrier_t *crr);
+static void schedule_dealloc_carrier(Allctr_t*, Carrier_t*);
+static void dealloc_my_carrier(Allctr_t*, Carrier_t*);
+
 
 static ERTS_INLINE int
 handle_delayed_dealloc(Allctr_t *allctr,
@@ -2074,39 +2018,61 @@ handle_delayed_dealloc(Allctr_t *allctr,
 	res = 1;
 
 	blk = UMEM2BLK(ptr);
-	if (IS_FREE_LAST_MBC_BLK(blk)) {
+	if (blk->bhdr == HOMECOMING_MBC_BLK_HDR) {
 	    /*
 	     * A multiblock carrier that previously has been migrated away
-	     * from us and now is back to be deallocated. For more info
-	     * see schedule_dealloc_carrier().
-	     *
-	     * Note that we cannot use FBLK_TO_MBC(blk) since it
-	     * data has been overwritten by the queue.
+             * from us, was sent back to us either because
+             * - it became empty and we need to deallocated it, or
+             * - it was inserted into the pool and we need to update our pooled_tree
 	     */
-	    Carrier_t *crr = FIRST_BLK_TO_MBC(allctr, blk);
-
-	     /* Restore word overwritten by the dd-queue as it will be read
-	      * if this carrier is pulled from dc_list by cpool_fetch()
-	      */
-	    ERTS_ALC_CPOOL_ASSERT(FBLK_TO_MBC(blk) != crr);
-	    ERTS_CT_ASSERT(sizeof(ErtsAllctrDDBlock_t) == sizeof(void*));
-#ifdef MBC_ABLK_OFFSET_BITS
-	    blk->u.carrier = crr;
-#else
-	    blk->carrier = crr;
-#endif
+	    Carrier_t *crr = ErtsContainerStruct(blk, Carrier_t,
+                                                 cpool.homecoming_dd.blk);
+            Block_t* first_blk = MBC_TO_FIRST_BLK(allctr, crr);
+            erts_aint_t iallctr;
 
 	    ERTS_ALC_CPOOL_ASSERT(ERTS_ALC_IS_CPOOL_ENABLED(allctr));
 	    ERTS_ALC_CPOOL_ASSERT(allctr == crr->cpool.orig_allctr);
-	    ERTS_ALC_CPOOL_ASSERT(((erts_aint_t) allctr)
-				  != (erts_atomic_read_nob(&crr->allctr)
-				      & ~ERTS_CRR_ALCTR_FLG_MASK));
-
-	    erts_atomic_set_nob(&crr->allctr, ((erts_aint_t) allctr));
 
-	    schedule_dealloc_carrier(allctr, crr);
+            iallctr = erts_atomic_read_nob(&crr->allctr);
+            ASSERT(iallctr & ERTS_CRR_ALCTR_FLG_HOMECOMING);
+            while (1) {
+                if ((iallctr & (~ERTS_CRR_ALCTR_FLG_MASK |
+                                ERTS_CRR_ALCTR_FLG_IN_POOL))
+                    == (erts_aint_t)allctr) {
+                    /*
+                     * Carrier is home (mine and not in pool)
+                     */
+                    ASSERT(!(iallctr & ERTS_CRR_ALCTR_FLG_BUSY));
+                    erts_atomic_set_nob(&crr->allctr, (erts_aint_t)allctr);
+                    if (IS_FREE_LAST_MBC_BLK(first_blk))
+                        dealloc_my_carrier(allctr, crr);
+                    else
+                        ASSERT(crr->cpool.state == ERTS_MBC_IS_HOME);
+                }
+                else {
+                    erts_aint_t exp = iallctr;
+                    erts_aint_t want = iallctr & ~ERTS_CRR_ALCTR_FLG_HOMECOMING;
+
+                    iallctr = erts_atomic_cmpxchg_nob(&crr->allctr,
+                                                          want,
+                                                          exp);
+                    if (iallctr != exp)
+                        continue; /* retry */
+
+                    ASSERT(crr->cpool.state != ERTS_MBC_IS_HOME);
+                    unlink_abandoned_carrier(crr);
+                    if (iallctr & ERTS_CRR_ALCTR_FLG_IN_POOL)
+                        poolify_my_carrier(allctr, crr);
+                    else
+                        crr->cpool.state = ERTS_MBC_WAS_TRAITOR;
+                }
+                break;
+            }
 	}
 	else {
+            ASSERT(IS_SBC_BLK(blk) || (ABLK_TO_MBC(blk) !=
+                                       ErtsContainerStruct(blk, Carrier_t,
+                                                           cpool.homecoming_dd.blk)));
 
 	    INC_CC(allctr->calls.this_free);
 
@@ -2148,20 +2114,26 @@ enqueue_dealloc_other_instance(ErtsAlcType_t type,
 	erts_alloc_notify_delayed_dealloc(allctr->ix);
 }
 
-
-static void
-set_new_allctr_abandon_limit(Allctr_t *allctr);
-static void
-abandon_carrier(Allctr_t *allctr, Carrier_t *crr);
-
+static ERTS_INLINE void
+update_pooled_tree(Allctr_t *allctr, Carrier_t *crr, Uint blk_sz)
+{
+    if (allctr == crr->cpool.orig_allctr && crr->cpool.state == ERTS_MBC_WAS_POOLED) {
+	/*
+	 * Update pooled_tree with a potentially new (larger) max_sz
+         */
+        AOFF_RBTree_t* crr_node = &crr->cpool.pooled;
+        if (blk_sz > crr_node->hdr.bhdr) {
+            crr_node->hdr.bhdr = blk_sz;
+            erts_aoff_larger_max_size(crr_node);
+        }
+    }
+}
 
 static ERTS_INLINE void
 check_abandon_carrier(Allctr_t *allctr, Block_t *fblk, Carrier_t **busy_pcrr_pp)
 {
     Carrier_t *crr;
-
-    if (busy_pcrr_pp && *busy_pcrr_pp)
-	return;
+    UWord ncrr_in_pool, largest_fblk;
 
     if (!ERTS_ALC_IS_CPOOL_ENABLED(allctr))
 	return;
@@ -2170,8 +2142,7 @@ check_abandon_carrier(Allctr_t *allctr, Block_t *fblk, Carrier_t **busy_pcrr_pp)
     if (--allctr->cpool.check_limit_count <= 0)
 	set_new_allctr_abandon_limit(allctr);
 
-    if (!erts_thr_progress_is_managed_thread())
-	return;
+    ASSERT(erts_thr_progress_is_managed_thread());
 
     if (allctr->cpool.disable_abandon)
 	return;
@@ -2179,6 +2150,9 @@ check_abandon_carrier(Allctr_t *allctr, Block_t *fblk, Carrier_t **busy_pcrr_pp)
     if (allctr->mbcs.blocks.curr.size > allctr->cpool.abandon_limit)
 	return;
 
+    ncrr_in_pool = erts_atomic_read_nob(&allctr->cpool.stat.no_carriers);
+    if (ncrr_in_pool >= allctr->cpool.in_pool_limit)
+        return;
 
     crr = FBLK_TO_MBC(fblk);
 
@@ -2189,9 +2163,14 @@ check_abandon_carrier(Allctr_t *allctr, Block_t *fblk, Carrier_t **busy_pcrr_pp)
 	return;
 
     if (crr->cpool.thr_prgr != ERTS_THR_PRGR_INVALID
-	&& !erts_thr_progress_has_reached(crr->cpool.thr_prgr))
-	return;
+        && !erts_thr_progress_has_reached(crr->cpool.thr_prgr))
+        return;
+
+    largest_fblk = allctr->largest_fblk_in_mbc(allctr, crr);
+    if (largest_fblk < allctr->cpool.fblk_min_limit)
+        return;
 
+    erts_atomic_set_nob(&crr->cpool.max_size, largest_fblk);
     abandon_carrier(allctr, crr);
 }
 
@@ -2237,6 +2216,7 @@ dealloc_block(Allctr_t *allctr, void *ptr, ErtsAlcFixList_t *fix, int dec_cc_on_
     else {
 	Carrier_t *busy_pcrr_p;
 	Allctr_t *used_allctr;
+
 	used_allctr = get_used_allctr(allctr, ERTS_ALC_TS_PREF_LOCK_NO, ptr,
 				      NULL, &busy_pcrr_p);
 	if (used_allctr == allctr) {
@@ -2253,10 +2233,10 @@ dealloc_block(Allctr_t *allctr, void *ptr, ErtsAlcFixList_t *fix, int dec_cc_on_
 	    /* Carrier migrated; need to redirect block to new owner... */
 	    int cinit = used_allctr->dd.ix - allctr->dd.ix;
 
-	    ERTS_ALC_CPOOL_ASSERT(!busy_pcrr_p);
+            ERTS_ALC_CPOOL_ASSERT(!busy_pcrr_p);
 
-	    if (dec_cc_on_redirect)
-		DEC_CC(allctr->calls.this_free);
+            if (dec_cc_on_redirect)
+                DEC_CC(allctr->calls.this_free);
 	    if (ddq_enqueue(&used_allctr->dd.q, ptr, cinit))
 		erts_alloc_notify_delayed_dealloc(used_allctr->ix);
 	}
@@ -2500,15 +2480,16 @@ mbc_free(Allctr_t *allctr, void *p, Carrier_t **busy_pcrr_pp)
     ASSERT(blk_sz % sizeof(Unit_t) == 0);
     ASSERT(IS_MBC_BLK(blk));
 
-    if (is_first_blk
-	&& is_last_blk
-	&& allctr->main_carrier != FIRST_BLK_TO_MBC(allctr, blk)) {
-	destroy_carrier(allctr, blk, busy_pcrr_pp);
+    if (is_first_blk && is_last_blk && crr != allctr->main_carrier) {
+        destroy_carrier(allctr, blk, busy_pcrr_pp);
     }
     else {
 	(*allctr->link_free_block)(allctr, blk);
 	HARD_CHECK_BLK_CARRIER(allctr, blk);
-	check_abandon_carrier(allctr, blk, busy_pcrr_pp);
+        if (busy_pcrr_pp && *busy_pcrr_pp)
+            update_pooled_tree(allctr, crr, blk_sz);
+        else
+            check_abandon_carrier(allctr, blk, busy_pcrr_pp);
     }
 }
 
@@ -2542,8 +2523,19 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs,
 	return NULL;
 #else /* !MBC_REALLOC_ALWAYS_MOVES */
 
-    if (busy_pcrr_pp && *busy_pcrr_pp)
-	goto realloc_move; /* Don't want to use carrier in pool */
+    if (busy_pcrr_pp && *busy_pcrr_pp) {
+        /*
+         * Don't want to use carrier in pool
+         */
+        new_p = mbc_alloc(allctr, size);
+        if (!new_p)
+            return NULL;
+        new_blk = UMEM2BLK(new_p);
+        ASSERT(!(IS_MBC_BLK(new_blk) && ABLK_TO_MBC(new_blk) == *busy_pcrr_pp));
+        sys_memcpy(new_p, p, MIN(size, old_blk_sz - ABLK_HDR_SZ));
+        mbc_free(allctr, p, busy_pcrr_pp);
+        return new_p;
+    }
 
     get_blk_sz = blk_sz = UMEMSZ2BLKSZ(allctr, size);
 
@@ -2776,7 +2768,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs,
 
     if (cand_blk_sz < get_blk_sz) {
 	/* We wont fit in cand_blk get a new one */
-    realloc_move:
+
 #endif /* !MBC_REALLOC_ALWAYS_MOVES */
 
 	new_p = mbc_alloc(allctr, size);
@@ -2880,8 +2872,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs,
 
 
 #define ERTS_ALC_MAX_DEALLOC_CARRIER		10
-#define ERTS_ALC_CPOOL_MAX_FETCH_INSPECT	20
-#define ERTS_ALC_CPOOL_MAX_TRAITOR_INSPECT	10
+#define ERTS_ALC_CPOOL_MAX_FETCH_INSPECT	100
 #define ERTS_ALC_CPOOL_CHECK_LIMIT_COUNT	100
 #define ERTS_ALC_CPOOL_MAX_FAILED_STAT_READS	3
 
@@ -3045,19 +3036,18 @@ cpool_insert(Allctr_t *allctr, Carrier_t *crr)
     ErtsAlcCPoolData_t *cpd1p, *cpd2p;
     erts_aint_t val;
     ErtsAlcCPoolData_t *sentinel = &carrier_pool[allctr->alloc_no].sentinel;
+    Allctr_t *orig_allctr = crr->cpool.orig_allctr;
 
     ERTS_ALC_CPOOL_ASSERT(allctr->alloc_no == ERTS_ALC_A_INVALID /* testcase */
 			  || erts_thr_progress_is_managed_thread());
-    ERTS_ALC_CPOOL_ASSERT(erts_atomic_read_nob(&crr->allctr)
-			  == (erts_aint_t) allctr);
 
-    erts_atomic_add_nob(&allctr->cpool.stat.blocks_size,
+    erts_atomic_add_nob(&orig_allctr->cpool.stat.blocks_size,
 			(erts_aint_t) crr->cpool.blocks_size);
-    erts_atomic_add_nob(&allctr->cpool.stat.no_blocks,
+    erts_atomic_add_nob(&orig_allctr->cpool.stat.no_blocks,
 			(erts_aint_t) crr->cpool.blocks);
-    erts_atomic_add_nob(&allctr->cpool.stat.carriers_size,
+    erts_atomic_add_nob(&orig_allctr->cpool.stat.carriers_size,
 			(erts_aint_t) CARRIER_SZ(crr));
-    erts_atomic_inc_nob(&allctr->cpool.stat.no_carriers);
+    erts_atomic_inc_nob(&orig_allctr->cpool.stat.no_carriers);
 
     /*
      * We search in 'next' direction and begin by passing
@@ -3118,8 +3108,6 @@ cpool_insert(Allctr_t *allctr, Carrier_t *crr)
 			 (erts_aint_t) &crr->cpool,
 			 (erts_aint_t) cpd1p);
 
-    erts_atomic_set_wb(&crr->allctr,
-			   ((erts_aint_t) allctr)|ERTS_CRR_ALCTR_FLG_IN_POOL);
     LTTNG3(carrier_pool_put, ERTS_ALC_A2AD(allctr->alloc_no), allctr->ix, CARRIER_SZ(crr));
 }
 
@@ -3221,130 +3209,126 @@ cpool_delete(Allctr_t *allctr, Allctr_t *prev_allctr, Carrier_t *crr)
 static Carrier_t *
 cpool_fetch(Allctr_t *allctr, UWord size)
 {
-    int i, i_stop, has_passed_sentinel;
+    enum { IGNORANT, HAS_SEEN_SENTINEL, THE_LAST_ONE } loop_state;
+    int i;
     Carrier_t *crr;
+    Carrier_t *reinsert_crr = NULL;
     ErtsAlcCPoolData_t *cpdp;
-    ErtsAlcCPoolData_t *cpool_entrance;
+    ErtsAlcCPoolData_t *cpool_entrance = NULL;
     ErtsAlcCPoolData_t *sentinel;
-    ErtsDoubleLink_t* dl;
-    ErtsDoubleLink_t* first_old_traitor;
 
     ERTS_ALC_CPOOL_ASSERT(allctr->alloc_no == ERTS_ALC_A_INVALID /* testcase */
 			  || erts_thr_progress_is_managed_thread());
 
     i = ERTS_ALC_CPOOL_MAX_FETCH_INSPECT;
-    first_old_traitor = allctr->cpool.traitor_list.next;
-    cpool_entrance = NULL;
 
     LTTNG3(carrier_pool_get, ERTS_ALC_A2AD(allctr->alloc_no), allctr->ix, (unsigned long)size);
     /*
-     * Search my own pooled_list,
+     * Search my own pooled_tree,
      * i.e my abandoned carriers that were in the pool last time I checked.
      */
+    do {
+        erts_aint_t exp, act;
+
+        crr = aoff_lookup_pooled_mbc(allctr, size);
+        if (!crr)
+            break;
+
+        ASSERT(crr->cpool.state == ERTS_MBC_WAS_POOLED);
+        ASSERT(crr->cpool.orig_allctr == allctr);
+
+        aoff_remove_pooled_mbc(allctr, crr);
+
+        exp = erts_atomic_read_nob(&crr->allctr);
+        if (exp & ERTS_CRR_ALCTR_FLG_IN_POOL) {
+            ASSERT((exp & ~ERTS_CRR_ALCTR_FLG_MASK) == (erts_aint_t)allctr);
+            if (erts_atomic_read_nob(&crr->cpool.max_size) < size) {
+                /*
+                 * This carrier has been fetched and inserted back again
+                 * by a foreign allocator. That's why it has a stale search size.
+                 */
+                ASSERT(exp & ERTS_CRR_ALCTR_FLG_HOMECOMING);
+                crr->cpool.pooled.hdr.bhdr = erts_atomic_read_nob(&crr->cpool.max_size);
+                aoff_add_pooled_mbc(allctr, crr);
+                INC_CC(allctr->cpool.stat.skip_size);
+                continue;
+            }
+            else if (exp & ERTS_CRR_ALCTR_FLG_BUSY) {
+                /*
+                 * This must be our own carrier as part of a realloc call.
+                 * Skip it to make things simpler.
+                 * Must wait to re-insert to not be found again by lookup.
+                 */
+                ASSERT(!reinsert_crr);
+                reinsert_crr = crr;
+                INC_CC(allctr->cpool.stat.skip_busy);
+                continue;
+            }
 
-    dl = allctr->cpool.pooled_list.next;
-    while(dl != &allctr->cpool.pooled_list) {
-	erts_aint_t exp, act;
-	crr = (Carrier_t *) (((char *) dl) - offsetof(Carrier_t, cpool.abandoned));
-
-	ASSERT(!is_in_list(&allctr->cpool.traitor_list, dl));
-	ASSERT(crr->cpool.orig_allctr == allctr);
-	dl = dl->next;
-	exp = erts_atomic_read_rb(&crr->allctr);
-	if ((exp & ERTS_CRR_ALCTR_FLG_MASK) == ERTS_CRR_ALCTR_FLG_IN_POOL
-	    && erts_atomic_read_nob(&crr->cpool.max_size) >= size) {
-	    /* Try to fetch it... */
-	    act = erts_atomic_cmpxchg_mb(&crr->allctr,
-					     (erts_aint_t) allctr,
-					     exp);
-	    if (act == exp) {
-		cpool_delete(allctr, ((Allctr_t *) (act & ~ERTS_CRR_ALCTR_FLG_MASK)), crr);
-		unlink_abandoned_carrier(crr);
-
-		/* Move sentinel to continue next search from here */
-		relink_edl_before(dl, &allctr->cpool.pooled_list);
-		return crr;
-	    }
-	    exp = act;
-	}
-	if (exp & ERTS_CRR_ALCTR_FLG_IN_POOL) {
-	    if (!cpool_entrance)
-		cpool_entrance = &crr->cpool;
-	}
-	else { /* Not in pool, move to traitor_list */
-	    unlink_abandoned_carrier(crr);
-	    link_abandoned_carrier(&allctr->cpool.traitor_list, crr);
-	}
-	if (--i <= 0) {
-	    /* Move sentinel to continue next search from here */
-	    relink_edl_before(dl, &allctr->cpool.pooled_list);
-	    return NULL;
-	}
-    }
+            /* Try to fetch it... */
+            act = erts_atomic_cmpxchg_mb(&crr->allctr,
+                                         exp & ~ERTS_CRR_ALCTR_FLG_IN_POOL,
+                                         exp);
+            if (act == exp) {
+                cpool_delete(allctr, allctr, crr);
+                crr->cpool.state = ERTS_MBC_IS_HOME;
+
+                if (reinsert_crr)
+                    aoff_add_pooled_mbc(allctr, reinsert_crr);
+                return crr;
+            }
+            exp = act;
+            INC_CC(allctr->cpool.stat.skip_race);
+        }
+        else
+            INC_CC(allctr->cpool.stat.skip_not_pooled);
 
-    /* Now search traitor_list.
-     * i.e carriers employed by other allocators last time I checked.
-     * They might have been abandoned since then.
-     */
+        /* Not in pool anymore */
+        ASSERT(!(exp & ERTS_CRR_ALCTR_FLG_BUSY));
+        crr->cpool.state = ERTS_MBC_WAS_TRAITOR;
 
-    i_stop = (i < ERTS_ALC_CPOOL_MAX_TRAITOR_INSPECT ?
-	      0 : i - ERTS_ALC_CPOOL_MAX_TRAITOR_INSPECT);
-    dl = first_old_traitor;
-    while(dl != &allctr->cpool.traitor_list) {
-	erts_aint_t exp, act;
-	crr = (Carrier_t *) (((char *) dl) - offsetof(Carrier_t, cpool.abandoned));
-	ASSERT(dl != &allctr->cpool.pooled_list);
-	ASSERT(crr->cpool.orig_allctr == allctr);
-	dl = dl->next;
-	exp = erts_atomic_read_rb(&crr->allctr);
-	if (exp & ERTS_CRR_ALCTR_FLG_IN_POOL) {
-	    if (!(exp & ERTS_CRR_ALCTR_FLG_BUSY)
-		&& erts_atomic_read_nob(&crr->cpool.max_size) >= size) {
-		/* Try to fetch it... */
-		act = erts_atomic_cmpxchg_mb(&crr->allctr,
-						 (erts_aint_t) allctr,
-						 exp);
-		if (act == exp) {
-		    cpool_delete(allctr, ((Allctr_t *) (act & ~ERTS_CRR_ALCTR_FLG_MASK)), crr);
-		    unlink_abandoned_carrier(crr);
+    }while (--i > 0);
 
-		    /* Move sentinel to continue next search from here */
-		    relink_edl_before(dl, &allctr->cpool.traitor_list);
-		    return crr;
-		}
-		exp = act;
-	    }
-	    if (exp & ERTS_CRR_ALCTR_FLG_IN_POOL) {
-		if (!cpool_entrance)
-		    cpool_entrance = &crr->cpool;
+    if (reinsert_crr)
+        aoff_add_pooled_mbc(allctr, reinsert_crr);
 
-		/* Move to pooled_list */
-		unlink_abandoned_carrier(crr);
-		link_abandoned_carrier(&allctr->cpool.pooled_list, crr);
-	    }
-	}
-	if (--i <= i_stop) {
-	    /* Move sentinel to continue next search from here */
-	    relink_edl_before(dl, &allctr->cpool.traitor_list);
-	    if (i > 0)
-		break;
-	    else
-		return NULL;
-	}
+    /*
+     * Try find a nice cpool_entrance
+     */
+    while (allctr->cpool.pooled_tree) {
+        erts_aint_t iallctr;
+
+        crr = ErtsContainerStruct(allctr->cpool.pooled_tree, Carrier_t, cpool.pooled);
+        iallctr = erts_atomic_read_nob(&crr->allctr);
+        if (iallctr & ERTS_CRR_ALCTR_FLG_IN_POOL) {
+            cpool_entrance = &crr->cpool;
+            break;
+        }
+        /* Not in pool anymore */
+        ASSERT(!(iallctr & ERTS_CRR_ALCTR_FLG_BUSY));
+        aoff_remove_pooled_mbc(allctr, crr);
+        crr->cpool.state = ERTS_MBC_WAS_TRAITOR;
+
+        if (--i <= 0) {
+            INC_CC(allctr->cpool.stat.fail_pooled);
+            return NULL;
+        }
     }
 
+
     /*
      * Finally search the shared pool and try employ foreign carriers
      */
-
     sentinel = &carrier_pool[allctr->alloc_no].sentinel;
     if (cpool_entrance) {
-	/* We saw a pooled carried above, use it as entrance into the pool
+        /*
+         * We saw a pooled carried above, use it as entrance into the pool
 	 */
 	cpdp = cpool_entrance;
     }
     else {
-	/* No pooled carried seen above. Start search at cpool sentinel,
+        /*
+         * No pooled carried seen above. Start search at cpool sentinel,
 	 * but begin by passing one element before trying to fetch.
 	 * This in order to avoid contention with threads inserting elements.
 	 */
@@ -3354,8 +3338,8 @@ cpool_fetch(Allctr_t *allctr, UWord size)
 	    goto check_dc_list;
     }
 
-    has_passed_sentinel = 0;
-    while (1) {
+    loop_state = IGNORANT;
+    do {
 	erts_aint_t exp;
 	cpdp = cpool_aint2cpd(cpool_read(&cpdp->prev));
 	if (cpdp == cpool_entrance) {
@@ -3364,38 +3348,52 @@ cpool_fetch(Allctr_t *allctr, UWord size)
 		if (cpdp == sentinel)
 		    break;
 	    }
-	    i = 0; /* Last one to inspect */
+            loop_state = THE_LAST_ONE;
 	}
 	else if (cpdp == sentinel) {
-	    if (has_passed_sentinel) {
+	    if (loop_state == HAS_SEEN_SENTINEL) {
 		/* We been here before. cpool_entrance must have been removed */
+                INC_CC(allctr->cpool.stat.entrance_removed);
 		break;
 	    }
 	    cpdp = cpool_aint2cpd(cpool_read(&cpdp->prev));
 	    if (cpdp == sentinel)
                 break;
-	    has_passed_sentinel = 1;
+            loop_state = HAS_SEEN_SENTINEL;
 	}
-	crr = (Carrier_t *)(((char *)cpdp) - offsetof(Carrier_t, cpool));
+	crr = ErtsContainerStruct(cpdp, Carrier_t, cpool);
 	exp = erts_atomic_read_rb(&crr->allctr);
-	if (((exp & (ERTS_CRR_ALCTR_FLG_MASK)) == ERTS_CRR_ALCTR_FLG_IN_POOL)
-	    && (erts_atomic_read_nob(&cpdp->max_size) >= size)) {
+
+        if (erts_atomic_read_nob(&cpdp->max_size) < size) {
+            INC_CC(allctr->cpool.stat.skip_size);
+        }
+        else if ((exp & (ERTS_CRR_ALCTR_FLG_IN_POOL | ERTS_CRR_ALCTR_FLG_BUSY))
+                  == ERTS_CRR_ALCTR_FLG_IN_POOL) {
 	    erts_aint_t act;
-	    /* Try to fetch it... */
-	    act = erts_atomic_cmpxchg_mb(&crr->allctr,
-					     (erts_aint_t) allctr,
-					     exp);
+            erts_aint_t want = (((erts_aint_t) allctr)
+                                | (exp & ERTS_CRR_ALCTR_FLG_HOMECOMING));
+            /* Try to fetch it... */
+	    act = erts_atomic_cmpxchg_mb(&crr->allctr, want, exp);
 	    if (act == exp) {
 		cpool_delete(allctr, ((Allctr_t *) (act & ~ERTS_CRR_ALCTR_FLG_MASK)), crr);
 		if (crr->cpool.orig_allctr == allctr) {
 		    unlink_abandoned_carrier(crr);
-		}
+                    crr->cpool.state = ERTS_MBC_IS_HOME;
+                }
 		return crr;
 	    }
 	}
-	if (--i <= 0)
+
+        if (exp & ERTS_CRR_ALCTR_FLG_BUSY)
+            INC_CC(allctr->cpool.stat.skip_busy);
+        else
+            INC_CC(allctr->cpool.stat.skip_race);
+
+	if (--i <= 0) {
+            INC_CC(allctr->cpool.stat.fail_shared);
 	    return NULL;
-    }
+        }
+    }while (loop_state != THE_LAST_ONE);
 
 check_dc_list:
     /* Last; check our own pending dealloc carrier list... */
@@ -3404,23 +3402,23 @@ check_dc_list:
 	if (erts_atomic_read_nob(&crr->cpool.max_size) >= size) {
 	    Block_t* blk;
 	    unlink_carrier(&allctr->cpool.dc_list, crr);
-#ifdef ERTS_ALC_CPOOL_DEBUG
-	    ERTS_ALC_CPOOL_ASSERT(erts_atomic_xchg_nob(&crr->allctr,
-							   ((erts_aint_t) allctr))
-				  == (((erts_aint_t) allctr) & ~ERTS_CRR_ALCTR_FLG_MASK));
-#else
-	    erts_atomic_set_nob(&crr->allctr, ((erts_aint_t) allctr));
-#endif
+	    ERTS_ALC_CPOOL_ASSERT(erts_atomic_read_nob(&crr->allctr)
+                                  == ((erts_aint_t) allctr));
 	    blk = MBC_TO_FIRST_BLK(allctr, crr);
 	    ASSERT(FBLK_TO_MBC(blk) == crr);
 	    allctr->link_free_block(allctr, blk);
 	    return crr;
 	}
 	crr = crr->prev;
-	if (--i <= 0)
+	if (--i <= 0) {
+            INC_CC(allctr->cpool.stat.fail_pend_dealloc);
 	    return NULL;
+        }
     }
 
+    if (i != ERTS_ALC_CPOOL_MAX_FETCH_INSPECT)
+        INC_CC(allctr->cpool.stat.fail);
+
     return NULL;
 }
 
@@ -3475,9 +3473,6 @@ static void
 schedule_dealloc_carrier(Allctr_t *allctr, Carrier_t *crr)
 {
     Allctr_t *orig_allctr;
-    Block_t *blk;
-    int check_pending_dealloc;
-    erts_aint_t max_size;
 
     ASSERT(IS_MB_CARRIER(crr));
 
@@ -3488,9 +3483,17 @@ schedule_dealloc_carrier(Allctr_t *allctr, Carrier_t *crr)
 
     orig_allctr = crr->cpool.orig_allctr;
 
-    if (allctr != orig_allctr) {
-	int cinit = orig_allctr->dd.ix - allctr->dd.ix;
-
+    if (allctr == orig_allctr) {
+        if (!(erts_atomic_read_nob(&crr->allctr) & ERTS_CRR_ALCTR_FLG_HOMECOMING)) {
+            dealloc_my_carrier(allctr, crr);
+        }
+        /*else
+         * Carrier was abandoned earlier by other thread and
+         * is still waiting for us in dd-queue.
+         * handle_delayed_dealloc() will handle it when crr is dequeued.
+         */
+    }
+    else {
 	/*
 	 * We send the carrier to its origin for deallocation.
 	 * This in order:
@@ -3499,29 +3502,39 @@ schedule_dealloc_carrier(Allctr_t *allctr, Carrier_t *crr)
 	 * - to ensure that we always only reuse empty carriers
 	 *   originating from our own thread specific mseg_alloc
 	 *   instance which is beneficial on NUMA systems.
-	 *
-	 * The receiver will recognize that this is a carrier to
-	 * deallocate (and not a block which is the common case)
-	 * since the block is an mbc block that is free and last
-	 * in the carrier.
 	 */
-	blk = MBC_TO_FIRST_BLK(allctr, crr);
-	ERTS_ALC_CPOOL_ASSERT(IS_FREE_LAST_MBC_BLK(blk));
-
-	ERTS_ALC_CPOOL_ASSERT(IS_MBC_FIRST_ABLK(allctr, blk));
-	ERTS_ALC_CPOOL_ASSERT(crr == FBLK_TO_MBC(blk));
-	ERTS_ALC_CPOOL_ASSERT(crr == FIRST_BLK_TO_MBC(allctr, blk));
-	ERTS_ALC_CPOOL_ASSERT(((erts_aint_t) allctr)
-			      == (erts_atomic_read_nob(&crr->allctr)
-				  & ~ERTS_CRR_ALCTR_FLG_MASK));
+        erts_aint_t iallctr;
+#ifdef ERTS_ALC_CPOOL_DEBUG
+	Block_t* first_blk = MBC_TO_FIRST_BLK(allctr, crr);
+	ERTS_ALC_CPOOL_ASSERT(IS_FREE_LAST_MBC_BLK(first_blk));
+
+	ERTS_ALC_CPOOL_ASSERT(IS_MBC_FIRST_ABLK(allctr, first_blk));
+	ERTS_ALC_CPOOL_ASSERT(crr == FBLK_TO_MBC(first_blk));
+	ERTS_ALC_CPOOL_ASSERT(crr == FIRST_BLK_TO_MBC(allctr, first_blk));
+	ERTS_ALC_CPOOL_ASSERT((erts_atomic_read_nob(&crr->allctr)
+                               & ~ERTS_CRR_ALCTR_FLG_HOMECOMING)
+                              == (erts_aint_t) allctr);
+#endif
 
-	if (ddq_enqueue(&orig_allctr->dd.q, BLK2UMEM(blk), cinit))
-	    erts_alloc_notify_delayed_dealloc(orig_allctr->ix);
-	return;
+        iallctr = (erts_aint_t)orig_allctr | ERTS_CRR_ALCTR_FLG_HOMECOMING;
+        if (!(erts_atomic_xchg_nob(&crr->allctr, iallctr)
+              & ERTS_CRR_ALCTR_FLG_HOMECOMING)) {
+            enqueue_homecoming(allctr, crr);
+        }
     }
+}
+
+static void dealloc_my_carrier(Allctr_t *allctr, Carrier_t *crr)
+{
+    Block_t *blk;
+    int check_pending_dealloc;
+    erts_aint_t max_size;
 
-    if (is_abandoned(crr))
-	unlink_abandoned_carrier(crr);
+    ERTS_ALC_CPOOL_ASSERT(allctr == crr->cpool.orig_allctr);
+    if (is_abandoned(crr)) {
+        unlink_abandoned_carrier(crr);
+        crr->cpool.state = ERTS_MBC_IS_HOME;
+    }
 
     if (crr->cpool.thr_prgr == ERTS_THR_PRGR_INVALID
 	|| erts_thr_progress_has_reached(crr->cpool.thr_prgr)) {
@@ -3553,6 +3566,7 @@ schedule_dealloc_carrier(Allctr_t *allctr, Carrier_t *crr)
 static ERTS_INLINE void
 cpool_init_carrier_data(Allctr_t *allctr, Carrier_t *crr)
 {
+    crr->cpool.homecoming_dd.blk.bhdr = HOMECOMING_MBC_BLK_HDR;
     erts_atomic_init_nob(&crr->cpool.next, ERTS_AINT_NULL);
     erts_atomic_init_nob(&crr->cpool.prev, ERTS_AINT_NULL);
     crr->cpool.orig_allctr = allctr;
@@ -3571,8 +3585,7 @@ cpool_init_carrier_data(Allctr_t *allctr, Carrier_t *crr)
 	    limit = (csz/100)*allctr->cpool.util_limit;
 	crr->cpool.abandon_limit = limit;
     }
-    crr->cpool.abandoned.next = NULL;
-    crr->cpool.abandoned.prev = NULL;
+    crr->cpool.state = ERTS_MBC_IS_HOME;
 }
 
 static void
@@ -3598,23 +3611,62 @@ set_new_allctr_abandon_limit(Allctr_t *allctr)
 static void
 abandon_carrier(Allctr_t *allctr, Carrier_t *crr)
 {
-    erts_aint_t max_size;
+    erts_aint_t iallctr;
 
-    STAT_MBC_CPOOL_INSERT(allctr, crr);
+    STAT_MBC_ABANDON(allctr, crr);
 
     unlink_carrier(&allctr->mbc_list, crr);
-    if (crr->cpool.orig_allctr == allctr) {
-	link_abandoned_carrier(&allctr->cpool.pooled_list, crr);
+    allctr->remove_mbc(allctr, crr);
+    set_new_allctr_abandon_limit(allctr);
+
+    cpool_insert(allctr, crr);
+
+
+    iallctr = erts_atomic_read_nob(&crr->allctr);
+    if (allctr == crr->cpool.orig_allctr) {
+        /* preserve HOMECOMING flag */
+        ASSERT((iallctr & ~ERTS_CRR_ALCTR_FLG_HOMECOMING) == (erts_aint_t)allctr);
+        erts_atomic_set_wb(&crr->allctr, iallctr | ERTS_CRR_ALCTR_FLG_IN_POOL);
+        poolify_my_carrier(allctr, crr);
     }
+    else {
+        ASSERT((iallctr & ~ERTS_CRR_ALCTR_FLG_HOMECOMING) == (erts_aint_t)allctr);
+        iallctr = ((erts_aint_t)crr->cpool.orig_allctr |
+                   ERTS_CRR_ALCTR_FLG_HOMECOMING |
+                   ERTS_CRR_ALCTR_FLG_IN_POOL);
+        if (!(erts_atomic_xchg_wb(&crr->allctr, iallctr)
+              & ERTS_CRR_ALCTR_FLG_HOMECOMING)) {
+
+            enqueue_homecoming(allctr, crr);
+        }
+    }
+}
 
-    allctr->remove_mbc(allctr, crr);
+static void
+enqueue_homecoming(Allctr_t* allctr, Carrier_t* crr)
+{
+    Allctr_t* orig_allctr = crr->cpool.orig_allctr;
+    const int cinit = orig_allctr->dd.ix - allctr->dd.ix;
+    Block_t* dd_blk = &crr->cpool.homecoming_dd.blk;
 
-    max_size = (erts_aint_t) allctr->largest_fblk_in_mbc(allctr, crr);
-    erts_atomic_set_nob(&crr->cpool.max_size, max_size);
+    /*
+     * The receiver will recognize this as a carrier
+     * (and not a block which is the common case)
+     * since the block header is HOMECOMING_MBC_BLK_HDR.
+     */
+    ASSERT(dd_blk->bhdr == HOMECOMING_MBC_BLK_HDR);
+    if (ddq_enqueue(&orig_allctr->dd.q, BLK2UMEM(dd_blk), cinit))
+        erts_alloc_notify_delayed_dealloc(orig_allctr->ix);
+}
 
-    cpool_insert(allctr, crr);
+static void
+poolify_my_carrier(Allctr_t *allctr, Carrier_t *crr)
+{
+    ERTS_ALC_CPOOL_ASSERT(allctr == crr->cpool.orig_allctr);
 
-    set_new_allctr_abandon_limit(allctr);
+    crr->cpool.pooled.hdr.bhdr = erts_atomic_read_nob(&crr->cpool.max_size);
+    aoff_add_pooled_mbc(allctr, crr);
+    crr->cpool.state = ERTS_MBC_WAS_POOLED;
 }
 
 static void
@@ -3771,6 +3823,7 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 	crr = cpool_fetch(allctr, blk_sz);
 	if (crr) {
 	    STAT_MBC_CPOOL_FETCH(allctr, crr);
+            INC_CC(allctr->cpool.stat.fetch);
 	    link_carrier(&allctr->mbc_list, crr);
 	    (*allctr->add_mbc)(allctr, crr);
 	    blk = (*allctr->get_free_block)(allctr, blk_sz, NULL, 0);
@@ -4128,13 +4181,18 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk, Carrier_t **busy_pcrr_pp)
 #endif
 
 	if (busy_pcrr_pp && *busy_pcrr_pp) {
+            erts_aint_t iallctr = erts_atomic_read_nob(&crr->allctr);
 	    ERTS_ALC_CPOOL_ASSERT(*busy_pcrr_pp == crr);
-	    *busy_pcrr_pp = NULL;
-	    ERTS_ALC_CPOOL_ASSERT(erts_atomic_read_nob(&crr->allctr)
-				  == (((erts_aint_t) allctr)
-				      | ERTS_CRR_ALCTR_FLG_IN_POOL
-				      | ERTS_CRR_ALCTR_FLG_BUSY));
-	    erts_atomic_set_nob(&crr->allctr, ((erts_aint_t) allctr));
+            ERTS_ALC_CPOOL_ASSERT((iallctr & ~ERTS_CRR_ALCTR_FLG_HOMECOMING)
+                                  == (((erts_aint_t) allctr)
+                                      | ERTS_CRR_ALCTR_FLG_IN_POOL
+                                      | ERTS_CRR_ALCTR_FLG_BUSY));
+            ERTS_ALC_CPOOL_ASSERT(allctr == crr->cpool.orig_allctr);
+
+            *busy_pcrr_pp = NULL;
+	    erts_atomic_set_nob(&crr->allctr,
+                                (iallctr & ~(ERTS_CRR_ALCTR_FLG_IN_POOL |
+                                             ERTS_CRR_ALCTR_FLG_BUSY)));
 	    cpool_delete(allctr, allctr, crr);
 	}
 	else
@@ -4184,7 +4242,6 @@ static struct {
     Eterm e;
     Eterm t;
     Eterm ramv;
-    Eterm sbct;
 #if HAVE_ERTS_MSEG
     Eterm asbcst;
     Eterm rsbcst;
@@ -4201,6 +4258,8 @@ static struct {
     Eterm smbcs;
     Eterm mbcgs;
     Eterm acul;
+    Eterm acnl;
+    Eterm acfml;
 
 #if HAVE_ERTS_MSEG
     Eterm mmc;
@@ -4212,6 +4271,17 @@ static struct {
 
     Eterm mbcs;
     Eterm mbcs_pool;
+    Eterm fetch;
+    Eterm fail_pooled;
+    Eterm fail_shared;
+    Eterm fail_pend_dealloc;
+    Eterm fail;
+    Eterm skip_size;
+    Eterm skip_busy;
+    Eterm skip_not_pooled;
+    Eterm skip_homecoming;
+    Eterm skip_race;
+    Eterm entrance_removed;
     Eterm sbcs;
 
     Eterm sys_alloc_carriers_size;
@@ -4245,7 +4315,7 @@ static Eterm fix_type_atoms[ERTS_ALC_NO_FIXED_SIZES];
 
 static ERTS_INLINE void atom_init(Eterm *atom, char *name)
 {
-    *atom = am_atom_put(name, strlen(name));
+    *atom = am_atom_put(name, sys_strlen(name));
 }
 #define AM_INIT(AM) atom_init(&am.AM, #AM)
 
@@ -4272,7 +4342,6 @@ init_atoms(Allctr_t *allctr)
 	AM_INIT(e);
 	AM_INIT(t);
 	AM_INIT(ramv);
-	AM_INIT(sbct);
 #if HAVE_ERTS_MSEG
 	AM_INIT(asbcst);
 	AM_INIT(rsbcst);
@@ -4289,6 +4358,8 @@ init_atoms(Allctr_t *allctr)
 	AM_INIT(smbcs);
 	AM_INIT(mbcgs);
 	AM_INIT(acul);
+        AM_INIT(acnl);
+        AM_INIT(acfml);
 
 #if HAVE_ERTS_MSEG
 	AM_INIT(mmc);
@@ -4300,6 +4371,17 @@ init_atoms(Allctr_t *allctr)
 
 	AM_INIT(mbcs);
 	AM_INIT(mbcs_pool);
+	AM_INIT(fetch);
+        AM_INIT(fail_pooled);
+        AM_INIT(fail_shared);
+        AM_INIT(fail_pend_dealloc);
+        AM_INIT(fail);
+        AM_INIT(skip_size);
+        AM_INIT(skip_busy);
+        AM_INIT(skip_not_pooled);
+        AM_INIT(skip_homecoming);
+        AM_INIT(skip_race);
+        AM_INIT(entrance_removed);
 	AM_INIT(sbcs);
 
 	AM_INIT(sys_alloc_carriers_size);
@@ -4334,7 +4416,7 @@ init_atoms(Allctr_t *allctr)
 	for (ix = 0; ix < ERTS_ALC_NO_FIXED_SIZES; ix++) {
 	    ErtsAlcType_t n = ERTS_ALC_N_MIN_A_FIXED_SIZE + ix;
 	    char *name = (char *) ERTS_ALC_N2TD(n);
-	    size_t len = strlen(name);
+	    size_t len = sys_strlen(name);
 	    fix_type_atoms[ix] = am_atom_put(name, len);
 	}
     }
@@ -4583,9 +4665,56 @@ info_cpool(Allctr_t *allctr,
 
     if (hpp || szp) {
 	res = NIL;
+
+      if (!sz_only) {
+        add_3tup(hpp, szp, &res, am.fail_pooled,
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_GIGA_VAL(allctr->cpool.stat.fail_pooled)),
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_VAL(allctr->cpool.stat.fail_pooled)));
+
+        add_3tup(hpp, szp, &res, am.fail_shared,
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_GIGA_VAL(allctr->cpool.stat.fail_shared)),
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_VAL(allctr->cpool.stat.fail_shared)));
+
+        add_3tup(hpp, szp, &res, am.fail_pend_dealloc,
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_GIGA_VAL(allctr->cpool.stat.fail_pend_dealloc)),
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_VAL(allctr->cpool.stat.fail_pend_dealloc)));
+
+        add_3tup(hpp, szp, &res, am.fail,
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_GIGA_VAL(allctr->cpool.stat.fail)),
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_VAL(allctr->cpool.stat.fail)));
+
+        add_3tup(hpp, szp, &res, am.fetch,
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_GIGA_VAL(allctr->cpool.stat.fetch)),
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_VAL(allctr->cpool.stat.fetch)));
+
+        add_3tup(hpp, szp, &res, am.skip_size,
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_GIGA_VAL(allctr->cpool.stat.skip_size)),
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_VAL(allctr->cpool.stat.skip_size)));
+
+        add_3tup(hpp, szp, &res, am.skip_busy,
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_GIGA_VAL(allctr->cpool.stat.skip_busy)),
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_VAL(allctr->cpool.stat.skip_busy)));
+
+        add_3tup(hpp, szp, &res, am.skip_not_pooled,
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_GIGA_VAL(allctr->cpool.stat.skip_not_pooled)),
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_VAL(allctr->cpool.stat.skip_not_pooled)));
+
+        add_3tup(hpp, szp, &res, am.skip_homecoming,
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_GIGA_VAL(allctr->cpool.stat.skip_homecoming)),
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_VAL(allctr->cpool.stat.skip_homecoming)));
+
+        add_3tup(hpp, szp, &res, am.skip_race,
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_GIGA_VAL(allctr->cpool.stat.skip_race)),
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_VAL(allctr->cpool.stat.skip_race)));
+
+        add_3tup(hpp, szp, &res, am.entrance_removed,
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_GIGA_VAL(allctr->cpool.stat.entrance_removed)),
+                 bld_unstable_uint(hpp, szp, ERTS_ALC_CC_VAL(allctr->cpool.stat.entrance_removed)));
+
 	add_2tup(hpp, szp, &res,
 		 am.carriers_size,
 		 bld_unstable_uint(hpp, szp, csz));
+      }
 	if (!sz_only)
 	    add_2tup(hpp, szp, &res,
 		     am.carriers,
@@ -4725,20 +4854,20 @@ make_name_atoms(Allctr_t *allctr)
     char realloc[] = "realloc";
     char free[] = "free";
     char buf[MAX_ATOM_CHARACTERS];
-    size_t prefix_len = strlen(allctr->name_prefix);
+    size_t prefix_len = sys_strlen(allctr->name_prefix);
 
     if (prefix_len > MAX_ATOM_CHARACTERS + sizeof(realloc) - 1)
 	erts_exit(ERTS_ERROR_EXIT,"Too long allocator name: %salloc\n",allctr->name_prefix);
 
-    memcpy((void *) buf, (void *) allctr->name_prefix, prefix_len);
+    sys_memcpy((void *) buf, (void *) allctr->name_prefix, prefix_len);
 
-    memcpy((void *) &buf[prefix_len], (void *) alloc, sizeof(alloc) - 1);
+    sys_memcpy((void *) &buf[prefix_len], (void *) alloc, sizeof(alloc) - 1);
     allctr->name.alloc = am_atom_put(buf, prefix_len + sizeof(alloc) - 1);
 
-    memcpy((void *) &buf[prefix_len], (void *) realloc, sizeof(realloc) - 1);
+    sys_memcpy((void *) &buf[prefix_len], (void *) realloc, sizeof(realloc) - 1);
     allctr->name.realloc = am_atom_put(buf, prefix_len + sizeof(realloc) - 1);
 
-    memcpy((void *) &buf[prefix_len], (void *) free, sizeof(free) - 1);
+    sys_memcpy((void *) &buf[prefix_len], (void *) free, sizeof(free) - 1);
     allctr->name.free = am_atom_put(buf, prefix_len + sizeof(free) - 1);
 
 }
@@ -4844,7 +4973,7 @@ info_options(Allctr_t *allctr,
 	     Uint *szp)
 {
     Eterm res = THE_NON_VALUE;
-    int acul;
+    UWord acul, acnl, acfml;
 
     if (!allctr) {
 	if (print_to_p)
@@ -4857,6 +4986,8 @@ info_options(Allctr_t *allctr,
     }
 
     acul = allctr->cpool.util_limit;
+    acnl = allctr->cpool.in_pool_limit;
+    acfml = allctr->cpool.fblk_min_limit;
 
     if (print_to_p) {
 	char topt[21]; /* Enough for any 64-bit integer */
@@ -4884,7 +5015,7 @@ info_options(Allctr_t *allctr,
 		   "option lmbcs: %beu\n"
 		   "option smbcs: %beu\n"
 		   "option mbcgs: %beu\n"
-		   "option acul: %d\n",
+		   "option acul: %bpu\n",
 		   topt,
 		   allctr->ramv ? "true" : "false",
 		   allctr->sbc_threshold,
@@ -4909,9 +5040,15 @@ info_options(Allctr_t *allctr,
 				  hpp, szp);
 
     if (hpp || szp) {
+        add_2tup(hpp, szp, &res,
+                 am.acfml,
+                 bld_uint(hpp, szp, acfml));
+        add_2tup(hpp, szp, &res,
+                 am.acnl,
+                 bld_uint(hpp, szp, acnl));
 	add_2tup(hpp, szp, &res,
 		 am.acul,
-		 bld_uint(hpp, szp, (UWord) acul));
+		 bld_uint(hpp, szp, acul));
 	add_2tup(hpp, szp, &res,
 		 am.mbcgs,
 		 bld_uint(hpp, szp, allctr->mbc_growth_stages));
@@ -4947,7 +5084,7 @@ info_options(Allctr_t *allctr,
 		 bld_uint(hpp, szp, allctr->mseg_opt.abs_shrink_th));
 #endif
 	add_2tup(hpp, szp, &res,
-		 am.sbct,
+		 am_sbct,
 		 bld_uint(hpp, szp, allctr->sbc_threshold));
 	add_2tup(hpp, szp, &res, am.ramv, allctr->ramv ? am_true : am_false);
 	add_2tup(hpp, szp, &res, am.t, (allctr->t ? am_true : am_false));
@@ -5481,12 +5618,13 @@ erts_alcu_free_thr_pref(ErtsAlcType_t type, void *extra, void *p)
 	pref_allctr = get_pref_allctr(extra);
 	used_allctr = get_used_allctr(pref_allctr, ERTS_ALC_TS_PREF_LOCK_IF_USED,
 				      p, NULL, &busy_pcrr_p);
-	if (pref_allctr != used_allctr)
+	if (pref_allctr != used_allctr) {
 	    enqueue_dealloc_other_instance(type,
-					   used_allctr,
-					   p,
-					   (used_allctr->dd.ix
-					    - pref_allctr->dd.ix));
+                                           used_allctr,
+                                           p,
+                                           (used_allctr->dd.ix
+                                            - pref_allctr->dd.ix));
+        }
 	else {
 	    ERTS_ALCU_DBG_CHK_THR_ACCESS(used_allctr);
 	    do_erts_alcu_free(type, used_allctr, p, &busy_pcrr_p);
@@ -5854,6 +5992,37 @@ erts_alcu_realloc_mv_thr_pref(ErtsAlcType_t type, void *extra,
 
 
 
+static Uint adjust_sbct(Allctr_t* allctr, Uint sbct)
+{
+#ifndef ARCH_64
+    if (sbct > 0) {
+	Uint max_mbc_block_sz = UNIT_CEILING(sbct - 1 + ABLK_HDR_SZ);
+	if (max_mbc_block_sz + UNIT_FLOOR(allctr->min_block_size - 1) > MBC_ABLK_SZ_MASK
+	    || max_mbc_block_sz < sbct) { /* wrap around */
+	    /*
+	     * By limiting sbc_threshold to (hard limit - min_block_size)
+	     * we avoid having to split off free "residue blocks"
+	     * smaller than min_block_size.
+	     */
+	    max_mbc_block_sz = MBC_ABLK_SZ_MASK - UNIT_FLOOR(allctr->min_block_size - 1);
+	    sbct = max_mbc_block_sz - ABLK_HDR_SZ + 1;
+	}
+    }
+#endif
+    return sbct;
+}
+
+int erts_alcu_try_set_dyn_param(Allctr_t* allctr, Eterm param, Uint value)
+{
+    const Uint MIN_DYN_SBCT = 4000;  /* a lame catastrophe prevention */
+
+    if (param == am_sbct && value >= MIN_DYN_SBCT) {
+        allctr->sbc_threshold = adjust_sbct(allctr, value);
+        return 1;
+    }
+    return 0;
+}
+
 /* ------------------------------------------------------------------------- */
 
 int
@@ -5941,10 +6110,7 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 	    allctr->min_block_size = sz;
     }
 
-    allctr->cpool.pooled_list.next  = &allctr->cpool.pooled_list;
-    allctr->cpool.pooled_list.prev  = &allctr->cpool.pooled_list;
-    allctr->cpool.traitor_list.next = &allctr->cpool.traitor_list;
-    allctr->cpool.traitor_list.prev = &allctr->cpool.traitor_list;
+    allctr->cpool.pooled_tree = NULL;
     allctr->cpool.dc_list.first = NULL;
     allctr->cpool.dc_list.last = NULL;
     allctr->cpool.abandon_limit = 0;
@@ -5954,24 +6120,18 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
     erts_atomic_init_nob(&allctr->cpool.stat.carriers_size, 0);
     erts_atomic_init_nob(&allctr->cpool.stat.no_carriers, 0);
     allctr->cpool.check_limit_count = ERTS_ALC_CPOOL_CHECK_LIMIT_COUNT;
-    allctr->cpool.util_limit = init->ts ? 0 : init->acul;
-
-    allctr->sbc_threshold		= init->sbct;
-#ifndef ARCH_64
-    if (allctr->sbc_threshold > 0) {
-	Uint max_mbc_block_sz = UNIT_CEILING(allctr->sbc_threshold - 1 + ABLK_HDR_SZ); 
-	if (max_mbc_block_sz + UNIT_FLOOR(allctr->min_block_size - 1) > MBC_ABLK_SZ_MASK
-	    || max_mbc_block_sz < allctr->sbc_threshold) { /* wrap around */
-	    /* 
-	     * By limiting sbc_threshold to (hard limit - min_block_size)
-	     * we avoid having to split off free "residue blocks"
-	     * smaller than min_block_size.
-	     */
-	    max_mbc_block_sz = MBC_ABLK_SZ_MASK - UNIT_FLOOR(allctr->min_block_size - 1);
-	    allctr->sbc_threshold = max_mbc_block_sz - ABLK_HDR_SZ + 1;
-	}
+    if (!init->ts && init->acul && init->acnl) {
+        allctr->cpool.util_limit = init->acul;
+        allctr->cpool.in_pool_limit = init->acnl;
+        allctr->cpool.fblk_min_limit = init->acfml;
     }
-#endif
+    else {
+        allctr->cpool.util_limit = 0;
+        allctr->cpool.in_pool_limit = 0;
+        allctr->cpool.fblk_min_limit = 0;
+    }
+
+    allctr->sbc_threshold = adjust_sbct(allctr, init->sbct);
 
 #if HAVE_ERTS_MSEG
     if (allctr->mseg_opt.abs_shrink_th > ~((UWord) 0) / 100)
@@ -6022,6 +6182,9 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
         allctr->sys_realloc = &erts_alcu_sys_realloc;
         allctr->sys_dealloc = &erts_alcu_sys_dealloc;
     }
+
+    allctr->try_set_dyn_param = &erts_alcu_try_set_dyn_param;
+
 #if HAVE_ERTS_MSEG
     if (init->mseg_alloc) {
         ASSERT(init->mseg_realloc && init->mseg_dealloc);
@@ -6036,6 +6199,7 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
         allctr->mseg_realloc = &erts_alcu_mseg_realloc;
         allctr->mseg_dealloc = &erts_alcu_mseg_dealloc;
     }
+
     /* If a custom carrier alloc function is specified, make sure it's used */
     if (init->mseg_alloc && !init->sys_alloc) {
         allctr->crr_set_flgs = CFLG_FORCE_MSEG;
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index faeb5ef368..9a6de2bb75 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -61,7 +61,9 @@ typedef struct {
     UWord lmbcs;
     UWord smbcs;
     UWord mbcgs;
-    int acul;
+    UWord acul;
+    UWord acnl;
+    UWord acfml;
 
     void *fix;
     size_t *fix_type_size;
@@ -116,6 +118,8 @@ typedef struct {
     1024*1024,		/* (bytes)  smbcs:  smallest mbc size            */\
     10,			/* (amount) mbcgs:  mbc growth stages            */\
     0,			/* (%)      acul:  abandon carrier utilization limit */\
+    1000,		/* (amount) acnl:  abandoned carriers number limit */\
+    0,			/* (bytes)  acfml: abandoned carrier fblk min limit */\
     /* --- Data not options -------------------------------------------- */\
     NULL,		/* (ptr)    fix                                  */\
     NULL		/* (ptr)    fix_type_size                        */\
@@ -149,6 +153,8 @@ typedef struct {
     128*1024,		/* (bytes)  smbcs:  smallest mbc size            */\
     10,			/* (amount) mbcgs:  mbc growth stages            */\
     0,			/* (%)      acul:  abandon carrier utilization limit */\
+    1000,		/* (amount) acnl:  abandoned carriers number limit */\
+    0,			/* (bytes)  acfml: abandoned carrier fblk min limit */\
     /* --- Data not options -------------------------------------------- */\
     NULL,		/* (ptr)    fix                                  */\
     NULL		/* (ptr)    fix_type_size                        */\
@@ -216,6 +222,8 @@ void  erts_alcu_literal_32_sys_dealloc(Allctr_t*, void *ptr, Uint size, int supe
 void erts_lcnt_update_allocator_locks(int enable);
 #endif
 
+int erts_alcu_try_set_dyn_param(Allctr_t*, Eterm param, Uint value);
+
 #endif /* !ERL_ALLOC_UTIL__ */
 
 #if defined(GET_ERL_ALLOC_UTIL_IMPL) && !defined(ERL_ALLOC_UTIL_IMPL__)
@@ -296,41 +304,7 @@ void erts_lcnt_update_allocator_locks(int enable);
 
 typedef union {char c[ERTS_ALLOC_ALIGN_BYTES]; long l; double d;} Unit_t;
 
-
-typedef struct ErtsDoubleLink_t_ {
-    struct ErtsDoubleLink_t_ *next;
-    struct ErtsDoubleLink_t_ *prev;
-}ErtsDoubleLink_t;
-
-typedef struct {
-    erts_atomic_t next;
-    erts_atomic_t prev;
-    Allctr_t *orig_allctr;      /* read-only while carrier is alive */
-    ErtsThrPrgrVal thr_prgr;
-    erts_atomic_t max_size;
-    UWord abandon_limit;
-    UWord blocks;
-    UWord blocks_size;
-    ErtsDoubleLink_t abandoned; /* node in pooled_list or traitor_list */
-} ErtsAlcCPoolData_t;
-
-
 typedef struct Carrier_t_ Carrier_t;
-struct Carrier_t_ {
-    UWord chdr;
-    Carrier_t *next;
-    Carrier_t *prev;
-    erts_atomic_t allctr;
-    ErtsAlcCPoolData_t cpool; /* Overwritten by block if sbc */
-};
-
-#define ERTS_ALC_CARRIER_TO_ALLCTR(C) \
-  ((Allctr_t *) (erts_atomic_read_nob(&(C)->allctr) & ~FLG_MASK))
-
-typedef struct {
-    Carrier_t *first;
-    Carrier_t *last;
-} CarrierList_t;
 
 typedef struct {
     UWord bhdr;
@@ -344,6 +318,22 @@ typedef struct {
 #endif
 } Block_t;
 
+typedef union ErtsAllctrDDBlock_t_ ErtsAllctrDDBlock_t;
+
+union ErtsAllctrDDBlock_t_ {
+    erts_atomic_t atmc_next;
+    ErtsAllctrDDBlock_t *ptr_next;
+};
+
+typedef struct {
+    Block_t blk;
+#if !MBC_ABLK_OFFSET_BITS
+    ErtsAllctrDDBlock_t umem_;
+#endif
+} ErtsFakeDDBlock_t;
+
+
+
 #define THIS_FREE_BLK_HDR_FLG 	(((UWord) 1) << 0)
 #define PREV_FREE_BLK_HDR_FLG 	(((UWord) 1) << 1)
 #define LAST_BLK_HDR_FLG 	(((UWord) 1) << 2)
@@ -352,14 +342,13 @@ typedef struct {
     (THIS_FREE_BLK_HDR_FLG | PREV_FREE_BLK_HDR_FLG | LAST_BLK_HDR_FLG)
 
 /*
- * FREE_LAST_MBC_BLK_HDR_FLGS is a special flag combo used for
- * distinguishing empty mbc's from allocated blocks in
- * handle_delayed_dealloc().
+ * HOMECOMING_MBC_BLK_HDR is a special block header combo used for
+ * distinguishing MBC's from allocated blocks in handle_delayed_dealloc().
  */
-#define FREE_LAST_MBC_BLK_HDR_FLGS (THIS_FREE_BLK_HDR_FLG | LAST_BLK_HDR_FLG)
+#define HOMECOMING_MBC_BLK_HDR (THIS_FREE_BLK_HDR_FLG | LAST_BLK_HDR_FLG)
 
 #define IS_FREE_LAST_MBC_BLK(B) \
-    (((B)->bhdr & FLG_MASK) == FREE_LAST_MBC_BLK_HDR_FLGS)
+    (((B)->bhdr & FLG_MASK) == (THIS_FREE_BLK_HDR_FLG | LAST_BLK_HDR_FLG))
 
 #define IS_SBC_BLK(B) (((B)->bhdr & FLG_MASK) == SBC_BLK_HDR_FLG)
 #define IS_MBC_BLK(B) (!IS_SBC_BLK((B)))
@@ -383,6 +372,57 @@ typedef struct {
 
 typedef UWord FreeBlkFtr_t; /* Footer of a free block */
 
+/* This AOFF stuff really belong in erl_ao_firstfit_alloc.h */
+typedef struct AOFF_RBTree_t_ AOFF_RBTree_t;
+struct AOFF_RBTree_t_ {
+    Block_t hdr;
+    AOFF_RBTree_t *parent;
+    AOFF_RBTree_t *left;
+    AOFF_RBTree_t *right;
+    Uint32 flags;
+    Uint32 max_sz;  /* of all blocks in this sub-tree */
+};
+
+void aoff_add_pooled_mbc(Allctr_t*, Carrier_t*);
+void aoff_remove_pooled_mbc(Allctr_t*, Carrier_t*);
+Carrier_t* aoff_lookup_pooled_mbc(Allctr_t*, Uint size);
+void erts_aoff_larger_max_size(AOFF_RBTree_t *node);
+
+typedef struct {
+    ErtsFakeDDBlock_t homecoming_dd;
+    erts_atomic_t next;
+    erts_atomic_t prev;
+    Allctr_t *orig_allctr;      /* read-only while carrier is alive */
+    ErtsThrPrgrVal thr_prgr;
+    erts_atomic_t max_size;
+    UWord abandon_limit;
+    UWord blocks;
+    UWord blocks_size;
+    enum {
+        ERTS_MBC_IS_HOME,
+        ERTS_MBC_WAS_POOLED,
+        ERTS_MBC_WAS_TRAITOR
+    } state;
+    AOFF_RBTree_t pooled;  /* node in pooled_tree */
+} ErtsAlcCPoolData_t;
+
+struct Carrier_t_ {
+    UWord chdr;
+    Carrier_t *next;
+    Carrier_t *prev;
+    erts_atomic_t allctr;
+    ErtsAlcCPoolData_t cpool; /* Overwritten by block if sbc */
+};
+
+#define ERTS_ALC_CARRIER_TO_ALLCTR(C) \
+  ((Allctr_t *) (erts_atomic_read_nob(&(C)->allctr) & ~FLG_MASK))
+
+typedef struct {
+    Carrier_t *first;
+    Carrier_t *last;
+} CarrierList_t;
+
+
 typedef Uint64 CallCounter_t;
 
 typedef struct {
@@ -419,13 +459,6 @@ typedef struct {
 #endif
 
 
-typedef union ErtsAllctrDDBlock_t_ ErtsAllctrDDBlock_t;
-
-union ErtsAllctrDDBlock_t_ {
-    erts_atomic_t atmc_next;
-    ErtsAllctrDDBlock_t *ptr_next;
-};
-
 typedef struct {
     ErtsAllctrDDBlock_t marker;
     erts_atomic_t last;
@@ -537,25 +570,37 @@ struct Allctr_t_ {
     UWord               crr_set_flgs;
     UWord               crr_clr_flgs;
 
-    /* Carriers */
+    /* Carriers *employed* by this allocator */
     CarrierList_t	mbc_list;
     CarrierList_t	sbc_list;
     struct {
-	/* pooled_list, traitor list and dc_list contain only
-           carriers _created_ by this allocator */
-	ErtsDoubleLink_t pooled_list;
-	ErtsDoubleLink_t traitor_list;
+	/* pooled_tree and dc_list contain only
+           carriers *created* by this allocator */
+	AOFF_RBTree_t*   pooled_tree;
 	CarrierList_t	 dc_list;
 
 	UWord		abandon_limit;
 	int		disable_abandon;
 	int		check_limit_count;
-	int		util_limit;
+	UWord		util_limit;       /* acul */
+        UWord           in_pool_limit;    /* acnl */
+        UWord           fblk_min_limit;   /* acmfl */
 	struct {
 	    erts_atomic_t	blocks_size;
 	    erts_atomic_t	no_blocks;
 	    erts_atomic_t	carriers_size;
 	    erts_atomic_t	no_carriers;
+            CallCounter_t       fail_pooled;
+            CallCounter_t       fail_shared;
+            CallCounter_t       fail_pend_dealloc;
+            CallCounter_t       fail;
+            CallCounter_t       fetch;
+	    CallCounter_t       skip_size;
+	    CallCounter_t       skip_busy;
+	    CallCounter_t       skip_not_pooled;
+	    CallCounter_t       skip_homecoming;
+	    CallCounter_t       skip_race;
+	    CallCounter_t       entrance_removed;
 	} stat;
     } cpool;
 
@@ -589,6 +634,8 @@ struct Allctr_t_ {
     void*               (*sys_realloc)(Allctr_t *allctr, void *ptr, Uint *size_p, Uint old_size, int superalign);
     void                (*sys_dealloc)(Allctr_t *allctr, void *ptr, Uint size, int superalign);
 
+    int                 (*try_set_dyn_param)(Allctr_t*, Eterm param, Uint value);
+
     void		(*init_atoms)		(void);
 
 #ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.c b/erts/emulator/beam/erl_ao_firstfit_alloc.c
index 05ba1f9891..0c5545401a 100644
--- a/erts/emulator/beam/erl_ao_firstfit_alloc.c
+++ b/erts/emulator/beam/erl_ao_firstfit_alloc.c
@@ -20,7 +20,7 @@
 
 
 /*
- * Description:	An "address order first fit" allocator
+ * Description:	A family of "first fit" allocator strategies
  *              based on a Red-Black (binary search) Tree. The search,
  *              insert, and delete operations are all O(log n) operations
  *              on a Red-Black Tree.
@@ -40,6 +40,10 @@
  *              sorting order. Blocks within the same carrier are sorted
  *              wrt size instead of address. The 'max_sz' field is maintained
  *              in order to dismiss entire carriers with too small blocks. 
+ * Age Order:
+ *      	Carriers are ordered by creation time instead of address.
+ *      	Oldest carrier with a large enough free block is chosen.
+ *      	No age order supported for blocks.
  *
  * Authors: 	Rickard Green/Sverker Eriksson
  */
@@ -53,10 +57,12 @@
 #include "erl_ao_firstfit_alloc.h"
 
 #ifdef DEBUG
+# define IS_DEBUG 1
 #if 0
 #define HARD_DEBUG
 #endif
 #else
+# define IS_DEBUG 0
 #undef HARD_DEBUG
 #endif
 
@@ -92,18 +98,6 @@
 #define RBT_ASSERT(x)
 #endif
 
-
-/* Types... */
-typedef struct AOFF_RBTree_t_ AOFF_RBTree_t;
-
-struct AOFF_RBTree_t_ {
-    Block_t hdr;
-    AOFF_RBTree_t *parent;
-    AOFF_RBTree_t *left;
-    AOFF_RBTree_t *right;
-    Uint32 flags;
-    Uint32 max_sz;  /* of all blocks in this sub-tree */
-};
 #define AOFF_BLK_SZ(B) MBC_FBLK_SZ(&(B)->hdr)
 
 /* BF block nodes keeps list of all with equal size
@@ -121,6 +115,7 @@ typedef struct AOFF_Carrier_t_ AOFF_Carrier_t;
 struct AOFF_Carrier_t_ {
     Carrier_t crr;
     AOFF_RBTree_t rbt_node;     /* My node in the carrier tree */
+    Sint64 birth_time;
     AOFF_RBTree_t* root;        /* Root of my block tree */
 };
 #define RBT_NODE_TO_MBC(PTR) ErtsContainerStruct((PTR), AOFF_Carrier_t, rbt_node)
@@ -136,12 +131,12 @@ struct AOFF_Carrier_t_ {
 */
 
 #ifdef HARD_DEBUG
-#  define HARD_CHECK_IS_MEMBER(ROOT,NODE) rbt_assert_is_member(ROOT,NODE)
-#  define HARD_CHECK_TREE(CRR,FLV,ROOT,SZ) check_tree(CRR, FLV, ROOT, SZ)
-static AOFF_RBTree_t * check_tree(Carrier_t* within_crr, enum AOFF_Flavor flavor, AOFF_RBTree_t* root, Uint);
+#  define HARD_CHECK_IS_MEMBER(ROOT,NODE) ASSERT(rbt_is_member(ROOT,NODE))
+#  define HARD_CHECK_TREE(CRR,ORDER,ROOT,SZ) check_tree(CRR, ORDER, ROOT, SZ)
+static AOFF_RBTree_t * check_tree(Carrier_t*, enum AOFFSortOrder, AOFF_RBTree_t*, Uint);
 #else
 #  define HARD_CHECK_IS_MEMBER(ROOT,NODE)
-#  define HARD_CHECK_TREE(CRR,FLV,ROOT,SZ)
+#  define HARD_CHECK_TREE(CRR,ORDER,ROOT,SZ)
 #endif
 
 
@@ -179,25 +174,63 @@ static ERTS_INLINE void lower_max_size(AOFF_RBTree_t *node,
     else ASSERT(new_max == old_max);
 }
 
-static ERTS_INLINE SWord cmp_blocks(enum AOFF_Flavor flavor,
+/*
+ * Set possibly new larger 'max_sz' of node and propagate change toward root
+ */
+void erts_aoff_larger_max_size(AOFF_RBTree_t *node)
+{
+    AOFF_RBTree_t* x = node;
+    const Uint new_sz = node->hdr.bhdr;
+
+    ASSERT(!x->left  || x->left->max_sz  <= x->max_sz);
+    ASSERT(!x->right || x->right->max_sz <= x->max_sz);
+
+    while (new_sz > x->max_sz) {
+        x->max_sz = new_sz;
+        x = x->parent;
+        if (!x)
+            break;
+    }
+}
+
+/* Compare nodes for both carrier and block trees */
+static ERTS_INLINE SWord cmp_blocks(enum AOFFSortOrder order,
 				    AOFF_RBTree_t* lhs, AOFF_RBTree_t* rhs)
 {
     ASSERT(lhs != rhs);
-    ASSERT(flavor == AOFF_AOFF || FBLK_TO_MBC(&lhs->hdr) == FBLK_TO_MBC(&rhs->hdr));
-    if (flavor != AOFF_AOFF) {
-	SWord diff = (SWord)AOFF_BLK_SZ(lhs) - (SWord)AOFF_BLK_SZ(rhs);
-	if (diff || flavor == AOFF_BF) return diff;
+    if (order == FF_AGEFF) {
+	AOFF_Carrier_t* lc = RBT_NODE_TO_MBC(lhs);
+	AOFF_Carrier_t* rc = RBT_NODE_TO_MBC(rhs);
+	Sint64 diff = lc->birth_time - rc->birth_time;
+ #ifdef ARCH_64
+        if (diff)
+            return diff;
+ #else
+        if (diff < 0)
+            return -1;
+        else if (diff > 0)
+            return 1;
+ #endif
+    }
+    else {
+	ASSERT(order == FF_AOFF || FBLK_TO_MBC(&lhs->hdr) == FBLK_TO_MBC(&rhs->hdr));
+	if (order != FF_AOFF) {
+	    SWord diff = (SWord)AOFF_BLK_SZ(lhs) - (SWord)AOFF_BLK_SZ(rhs);
+	    if (diff || order == FF_BF) return diff;
+	}
     }
     return (char*)lhs - (char*)rhs;
 }
 
-static ERTS_INLINE SWord cmp_cand_blk(enum AOFF_Flavor flavor,
+/* Compare candidate block. Only for block tree */
+static ERTS_INLINE SWord cmp_cand_blk(enum AOFFSortOrder order,
 				      Block_t* cand_blk, AOFF_RBTree_t* rhs)
 {
-    if (flavor != AOFF_AOFF) {
+    ASSERT(order != FF_AGEFF);
+    if (order != FF_AOFF) {
 	if (BLK_TO_MBC(cand_blk) == FBLK_TO_MBC(&rhs->hdr)) {
 	    SWord diff = (SWord)MBC_BLK_SZ(cand_blk) - (SWord)MBC_FBLK_SZ(&rhs->hdr);
-	    if (diff || flavor == AOFF_BF) return diff;
+	    if (diff || order == FF_BF) return diff;
 	}
     }
     return (char*)cand_blk - (char*)rhs;
@@ -218,11 +251,8 @@ static UWord aoff_largest_fblk_in_mbc(Allctr_t*, Carrier_t*);
 
 /* Generic tree functions used by both carrier and block trees. */
 static void rbt_delete(AOFF_RBTree_t** root, AOFF_RBTree_t* del);
-static void rbt_insert(enum AOFF_Flavor flavor, AOFF_RBTree_t** root, AOFF_RBTree_t* blk);
+static void rbt_insert(enum AOFFSortOrder, AOFF_RBTree_t** root, AOFF_RBTree_t* blk);
 static AOFF_RBTree_t* rbt_search(AOFF_RBTree_t* root, Uint size);
-#ifdef HARD_DEBUG
-static int rbt_assert_is_member(AOFF_RBTree_t* root, AOFF_RBTree_t* node);
-#endif
 
 static Eterm info_options(Allctr_t *, char *, fmtfn_t *, void *, Uint **, Uint *);
 static void init_atoms(void);
@@ -230,10 +260,17 @@ static void init_atoms(void);
 
 static int atoms_initialized = 0;
 
+#ifndef ERTS_HAVE_OS_MONOTONIC_TIME_SUPPORT
+static erts_atomic64_t birth_time_counter;
+#endif
+
 void
 erts_aoffalc_init(void)
 {
     atoms_initialized = 0;
+#ifndef ERTS_HAVE_OS_MONOTONIC_TIME_SUPPORT
+    erts_atomic64_init_nob(&birth_time_counter, 0);
+#endif
 }
 
 Allctr_t *
@@ -254,11 +291,12 @@ erts_aoffalc_start(AOFFAllctr_t *alc,
 
     sys_memcpy((void *) alc, (void *) &zero.allctr, sizeof(AOFFAllctr_t));
 
-    alc->flavor                         = aoffinit->flavor;
+    alc->blk_order                      = aoffinit->blk_order;
+    alc->crr_order                      = aoffinit->crr_order;
     allctr->mbc_header_size		= sizeof(AOFF_Carrier_t);
     allctr->min_mbc_size		= MIN_MBC_SZ;
     allctr->min_mbc_first_free_size	= MIN_MBC_FIRST_FREE_SZ;
-    allctr->min_block_size = (aoffinit->flavor == AOFF_BF ?
+    allctr->min_block_size = (aoffinit->blk_order == FF_BF ?
 			      sizeof(AOFF_RBTreeList_t):sizeof(AOFF_RBTree_t));
 
     allctr->vsn_str			= ERTS_ALC_AOFF_ALLOC_VSN_STR;
@@ -487,9 +525,9 @@ aoff_unlink_free_block(Allctr_t *allctr, Block_t *blk)
     AOFF_Carrier_t *crr = (AOFF_Carrier_t*) FBLK_TO_MBC(&del->hdr);
 
     ASSERT(crr->rbt_node.hdr.bhdr == crr->root->max_sz);
-    HARD_CHECK_TREE(&crr->crr, alc->flavor, crr->root, 0);
+    HARD_CHECK_TREE(&crr->crr, alc->blk_order, crr->root, 0);
 
-    if (alc->flavor == AOFF_BF) {
+    if (alc->blk_order == FF_BF) {
 	ASSERT(del->flags & IS_BF_FLG);
 	if (IS_LIST_ELEM(del)) {
 	    /* Remove from list */
@@ -510,14 +548,14 @@ aoff_unlink_free_block(Allctr_t *allctr, Block_t *blk)
 	    
 	    replace(&crr->root, (AOFF_RBTree_t*)del, LIST_NEXT(del));
 	    
-	    HARD_CHECK_TREE(&crr->crr, alc->flavor, crr->root, 0);
+	    HARD_CHECK_TREE(&crr->crr, alc->blk_order, crr->root, 0);
 	    return;
 	}
     }
 
     rbt_delete(&crr->root, (AOFF_RBTree_t*)del);
 
-    HARD_CHECK_TREE(&crr->crr, alc->flavor, crr->root, 0);
+    HARD_CHECK_TREE(&crr->crr, alc->blk_order, crr->root, 0);
 
     /* Update the carrier tree with a potentially new (lower) max_sz
      */    
@@ -715,32 +753,33 @@ aoff_link_free_block(Allctr_t *allctr, Block_t *block)
 
     ASSERT(allctr == ERTS_ALC_CARRIER_TO_ALLCTR(&blk_crr->crr));
     ASSERT(blk_crr->rbt_node.hdr.bhdr == (blk_crr->root ? blk_crr->root->max_sz : 0));
-    HARD_CHECK_TREE(&blk_crr->crr, alc->flavor, blk_crr->root, 0);
+    HARD_CHECK_TREE(&blk_crr->crr, alc->blk_order, blk_crr->root, 0);
 
-    rbt_insert(alc->flavor, &blk_crr->root, blk);
+    rbt_insert(alc->blk_order, &blk_crr->root, blk);
 
-    /* Update the carrier tree with a potentially new (larger) max_sz
-    */
+    /*
+     * Update carrier tree with a potentially new (larger) max_sz
+     */
     crr_node = &blk_crr->rbt_node;
     if (blk_sz > crr_node->hdr.bhdr) {
-	ASSERT(blk_sz == blk_crr->root->max_sz);
-	crr_node->hdr.bhdr = blk_sz;
-	while (blk_sz > crr_node->max_sz) {
-	    crr_node->max_sz = blk_sz;
-	    crr_node = crr_node->parent;
-	    if (!crr_node) break;
-	}
+        ASSERT(blk_sz == blk_crr->root->max_sz);
+        crr_node->hdr.bhdr = blk_sz;
+        while (blk_sz > crr_node->max_sz) {
+            crr_node->max_sz = blk_sz;
+            crr_node = crr_node->parent;
+            if (!crr_node) break;
+        }
     }
-    HARD_CHECK_TREE(&blk_crr->crr, alc->flavor, blk_crr->root, 0);
+    HARD_CHECK_TREE(NULL, alc->crr_order, alc->mbc_root, 0);
 }
 
 static void
-rbt_insert(enum AOFF_Flavor flavor, AOFF_RBTree_t** root, AOFF_RBTree_t* blk)
+rbt_insert(enum AOFFSortOrder order, AOFF_RBTree_t** root, AOFF_RBTree_t* blk)
 {
     Uint blk_sz = AOFF_BLK_SZ(blk);
 
 #ifdef DEBUG
-    blk->flags  = (flavor == AOFF_BF) ? IS_BF_FLG : 0; 
+    blk->flags  = (order == FF_BF) ? IS_BF_FLG : 0;
 #else
     blk->flags  = 0; 
 #endif
@@ -760,7 +799,7 @@ rbt_insert(enum AOFF_Flavor flavor, AOFF_RBTree_t** root, AOFF_RBTree_t* blk)
 	    if (x->max_sz < blk_sz) {
 		x->max_sz = blk_sz;
 	    }
-	    diff = cmp_blocks(flavor, blk, x);
+	    diff = cmp_blocks(order, blk, x);
 	    if (diff < 0) {
 		if (!x->left) {
 		    blk->parent = x;
@@ -778,7 +817,7 @@ rbt_insert(enum AOFF_Flavor flavor, AOFF_RBTree_t** root, AOFF_RBTree_t* blk)
 		x = x->right;
 	    }
 	    else {
-		ASSERT(flavor == AOFF_BF);
+		ASSERT(order == FF_BF);
 		ASSERT(blk->flags & IS_BF_FLG);			    
 		ASSERT(x->flags & IS_BF_FLG);			    
 		SET_LIST_ELEM(blk);
@@ -798,7 +837,7 @@ rbt_insert(enum AOFF_Flavor flavor, AOFF_RBTree_t** root, AOFF_RBTree_t* blk)
 	if (IS_RED(blk->parent))
 	    tree_insert_fixup(root, blk);
     }
-    if (flavor == AOFF_BF) {
+    if (order == FF_BF) {
 	SET_TREE_NODE(blk);
 	LIST_NEXT(blk) = NULL;
     }
@@ -826,6 +865,16 @@ rbt_search(AOFF_RBTree_t* root, Uint size)
     }
 }
 
+Carrier_t* aoff_lookup_pooled_mbc(Allctr_t* allctr, Uint size)
+{
+    AOFF_RBTree_t* node;
+
+    if (!allctr->cpool.pooled_tree)
+	return NULL;
+    node = rbt_search(allctr->cpool.pooled_tree, size);
+    return node ? ErtsContainerStruct(node, Carrier_t, cpool.pooled) : NULL;
+}
+
 static Block_t *
 aoff_get_free_block(Allctr_t *allctr, Uint size,
 		    Block_t *cand_blk, Uint cand_size)
@@ -850,7 +899,7 @@ aoff_get_free_block(Allctr_t *allctr, Uint size,
     /* Get block within carrier tree
      */
 #ifdef HARD_DEBUG
-    dbg_blk = HARD_CHECK_TREE(&crr->crr, alc->flavor, crr->root, size);
+    dbg_blk = HARD_CHECK_TREE(&crr->crr, alc->blk_order, crr->root, size);
 #endif
 
     blk = rbt_search(crr->root, size);
@@ -863,7 +912,7 @@ aoff_get_free_block(Allctr_t *allctr, Uint size,
     if (!blk)
 	return NULL;
 
-    if (cand_blk && cmp_cand_blk(alc->flavor, cand_blk, blk) < 0) {
+    if (cand_blk && cmp_cand_blk(alc->blk_order, cand_blk, blk) < 0) {
 	return NULL; /* cand_blk was better */
     }
 
@@ -872,23 +921,32 @@ aoff_get_free_block(Allctr_t *allctr, Uint size,
     return (Block_t *) blk;
 }
 
+static ERTS_INLINE Sint64 get_birth_time(void)
+{
+#ifdef ERTS_HAVE_OS_MONOTONIC_TIME_SUPPORT
+    return (Sint64) erts_os_monotonic_time();
+#else
+    return (Sint64) erts_atomic64_inc_read_nob(&birth_time_counter);
+#endif
+}
+
 static void aoff_creating_mbc(Allctr_t *allctr, Carrier_t *carrier)
 {
     AOFFAllctr_t *alc = (AOFFAllctr_t *) allctr;
     AOFF_Carrier_t *crr = (AOFF_Carrier_t*) carrier;
     AOFF_RBTree_t **root = &alc->mbc_root;
 
-    HARD_CHECK_TREE(NULL, 0, *root, 0);
+    HARD_CHECK_TREE(NULL, alc->crr_order, *root, 0);
 
-    /* Link carrier in address order tree
-     */
     crr->rbt_node.hdr.bhdr = 0;
-    rbt_insert(AOFF_AOFF, root, &crr->rbt_node);
+    if (alc->crr_order == FF_AGEFF || IS_DEBUG)
+	crr->birth_time = get_birth_time();
+    rbt_insert(alc->crr_order, root, &crr->rbt_node);
 
     /* aoff_link_free_block will add free block later */
     crr->root = NULL;
 
-    HARD_CHECK_TREE(NULL, 0, *root, 0);
+    HARD_CHECK_TREE(NULL, alc->crr_order, *root, 0);
 }
 
 #define IS_CRR_IN_TREE(CRR,ROOT) \
@@ -911,27 +969,38 @@ static void aoff_add_mbc(Allctr_t *allctr, Carrier_t *carrier)
     AOFF_RBTree_t **root = &alc->mbc_root;
 
     ASSERT(!IS_CRR_IN_TREE(crr, *root));
-    HARD_CHECK_TREE(NULL, 0, *root, 0);   
+    HARD_CHECK_TREE(NULL, alc->crr_order, *root, 0);   
+
+    rbt_insert(alc->crr_order, root, &crr->rbt_node);
+
+    HARD_CHECK_TREE(NULL, alc->crr_order, *root, 0);
+}
+
+void aoff_add_pooled_mbc(Allctr_t *allctr, Carrier_t *crr)
+{
+    AOFF_RBTree_t **root = &allctr->cpool.pooled_tree;
+
+    ASSERT(allctr == crr->cpool.orig_allctr);
+    HARD_CHECK_TREE(NULL, 0, *root, 0);
 
     /* Link carrier in address order tree
      */
-    rbt_insert(AOFF_AOFF, root, &crr->rbt_node);
+    rbt_insert(FF_AOFF, root, &crr->cpool.pooled);
 
     HARD_CHECK_TREE(NULL, 0, *root, 0);
 }
 
 static void aoff_remove_mbc(Allctr_t *allctr, Carrier_t *carrier)
 {
-    AOFFAllctr_t *alc = (AOFFAllctr_t *) allctr;
-    AOFF_Carrier_t *crr = (AOFF_Carrier_t*) carrier;
-    AOFF_RBTree_t **root = &alc->mbc_root;
+    AOFF_RBTree_t **root = &((AOFFAllctr_t*)allctr)->mbc_root;
+    AOFF_Carrier_t *crr = (AOFF_Carrier_t*)carrier;
 
     ASSERT(allctr == ERTS_ALC_CARRIER_TO_ALLCTR(carrier));
 
     if (!IS_CRR_IN_TREE(crr,*root))
-        return;
+	return;
 
-    HARD_CHECK_TREE(NULL, 0, *root, 0);
+    HARD_CHECK_TREE(NULL, alc->crr_order, *root, 0);
 
     rbt_delete(root, &crr->rbt_node);
     crr->rbt_node.parent = NULL;
@@ -939,9 +1008,27 @@ static void aoff_remove_mbc(Allctr_t *allctr, Carrier_t *carrier)
     crr->rbt_node.right = NULL;
     crr->rbt_node.max_sz = crr->rbt_node.hdr.bhdr;
 
-    HARD_CHECK_TREE(NULL, 0, *root, 0);
+    HARD_CHECK_TREE(NULL, alc->crr_order, *root, 0);
+}
+
+void aoff_remove_pooled_mbc(Allctr_t *allctr, Carrier_t *crr)
+{
+    ASSERT(allctr == crr->cpool.orig_allctr);
+
+    HARD_CHECK_TREE(NULL, 0, allctr->cpool.pooled_tree, 0);
+
+    rbt_delete(&allctr->cpool.pooled_tree, &crr->cpool.pooled);
+#ifdef DEBUG
+    crr->cpool.pooled.parent = NULL;
+    crr->cpool.pooled.left = NULL;
+    crr->cpool.pooled.right = NULL;
+    crr->cpool.pooled.max_sz = 0;
+#endif
+    HARD_CHECK_TREE(NULL, 0, allctr->cpool.pooled_tree, 0);
+
 }
 
+
 static UWord aoff_largest_fblk_in_mbc(Allctr_t* allctr, Carrier_t* carrier)
 {
     AOFF_Carrier_t *crr = (AOFF_Carrier_t*) carrier;
@@ -955,47 +1042,35 @@ static UWord aoff_largest_fblk_in_mbc(Allctr_t* allctr, Carrier_t* carrier)
  * info_options()
  */
 
+static const char* flavor_str[2][3] = {
+    {"ageffcaoff", "ageffcaobf", "ageffcbf"},
+    {      "aoff",  "aoffcaobf",  "aoffcbf"}
+};
+static Eterm flavor_atoms[2][3];
+
 static struct {
     Eterm as;
-    Eterm aoff;
-    Eterm aoffcaobf;
-    Eterm aoffcbf;
-#ifdef DEBUG
-    Eterm end_of_atoms;
-#endif
 } am;
 
-static void ERTS_INLINE atom_init(Eterm *atom, char *name)
+static void ERTS_INLINE atom_init(Eterm *atom, const char *name)
 {
-    *atom = am_atom_put(name, strlen(name));
+    *atom = am_atom_put(name, sys_strlen(name));
 }
 #define AM_INIT(AM) atom_init(&am.AM, #AM)
 
 static void
 init_atoms(void)
 {
-#ifdef DEBUG
-    Eterm *atom;
-#endif
+    int i, j;
 
     if (atoms_initialized)
 	return;
 
-#ifdef DEBUG
-    for (atom = (Eterm *) &am; atom <= &am.end_of_atoms; atom++) {
-	*atom = THE_NON_VALUE;
-    }
-#endif
     AM_INIT(as);
-    AM_INIT(aoff);
-    AM_INIT(aoffcaobf);
-    AM_INIT(aoffcbf);
 
-#ifdef DEBUG
-    for (atom = (Eterm *) &am; atom < &am.end_of_atoms; atom++) {
-	ASSERT(*atom != THE_NON_VALUE);
-    }
-#endif
+    for (i = 0; i < 2; i++)
+        for (j = 0; j < 3; j++)
+            atom_init(&flavor_atoms[i][j], flavor_str[i][j]);
 
     atoms_initialized = 1;
 }
@@ -1021,15 +1096,16 @@ info_options(Allctr_t *allctr,
 {
     AOFFAllctr_t* alc = (AOFFAllctr_t*) allctr;
     Eterm res = THE_NON_VALUE;
-    const char* flavor_str[3] = {"aoff", "aoffcaobf", "aoffcbf"};
-    Eterm flavor_atom[3] = {am.aoff, am.aoffcaobf, am.aoffcbf};
+
+    ASSERT(alc->crr_order >= 0 && alc->crr_order <= 1);
+    ASSERT(alc->blk_order >= 1 && alc->blk_order <= 3);
 
     if (print_to_p) {
 	erts_print(*print_to_p,
 		   print_to_arg,
 		   "%sas: %s\n",
 		   prefix,
-		   flavor_str[alc->flavor]);
+		   flavor_str[alc->crr_order][alc->blk_order-1]);
     }
 
     if (hpp || szp) {
@@ -1039,7 +1115,8 @@ info_options(Allctr_t *allctr,
 		     __FILE__, __LINE__);;
 
 	res = NIL;
-	add_2tup(hpp, szp, &res, am.as, flavor_atom[alc->flavor]);
+	add_2tup(hpp, szp, &res, am.as,
+                 flavor_atoms[alc->crr_order][alc->blk_order-1]);
     }
 
     return res;
@@ -1057,7 +1134,7 @@ UWord
 erts_aoffalc_test(UWord op, UWord a1, UWord a2)
 {
     switch (op) {
-    case 0x500: return (UWord) ((AOFFAllctr_t *) a1)->flavor == AOFF_AOBF;
+    case 0x500: return (UWord) ((AOFFAllctr_t *) a1)->blk_order == FF_AOBF;
     case 0x501: {
 	AOFF_RBTree_t *node = ((AOFFAllctr_t *) a1)->mbc_root; 
 	Uint size = (Uint) a2;
@@ -1072,7 +1149,7 @@ erts_aoffalc_test(UWord op, UWord a1, UWord a2)
     case 0x507:	return (UWord) IS_TREE_NODE((AOFF_RBTree_t *) a1);
     case 0x508: return (UWord) 0; /* IS_BF_ALGO */
     case 0x509: return (UWord) ((AOFF_RBTree_t *) a1)->max_sz;
-    case 0x50a: return (UWord) ((AOFFAllctr_t *) a1)->flavor == AOFF_BF;
+    case 0x50a: return (UWord) ((AOFFAllctr_t *) a1)->blk_order == FF_BF;
     case 0x50b:	return (UWord) LIST_PREV(a1);
     default:	ASSERT(0); return ~((UWord) 0);
     }
@@ -1085,12 +1162,13 @@ erts_aoffalc_test(UWord op, UWord a1, UWord a2)
 
 
 #ifdef HARD_DEBUG
-
-static int rbt_assert_is_member(AOFF_RBTree_t* root, AOFF_RBTree_t* node)
+static int rbt_is_member(AOFF_RBTree_t* root, AOFF_RBTree_t* node)
 {
     while (node != root) {
-	ASSERT(node->parent);
-	ASSERT(node->parent->left == node || node->parent->right == node);
+        if (!node->parent || (node->parent->left != node &&
+                              node->parent->right != node)) {
+            return 0;
+        }
 	node = node->parent;
     }    
     return 1;
@@ -1132,7 +1210,7 @@ static void print_tree(AOFF_RBTree_t*);
  */
 
 static AOFF_RBTree_t *
-check_tree(Carrier_t* within_crr, enum AOFF_Flavor flavor, AOFF_RBTree_t* root, Uint size)
+check_tree(Carrier_t* within_crr, enum AOFFSortOrder order, AOFF_RBTree_t* root, Uint size)
 {
     AOFF_RBTree_t *res = NULL;
     Sint blacks;
@@ -1144,7 +1222,8 @@ check_tree(Carrier_t* within_crr, enum AOFF_Flavor flavor, AOFF_RBTree_t* root,
 #ifdef PRINT_TREE
     print_tree(root);
 #endif
-    ASSERT(within_crr || flavor == AOFF_AOFF);
+    ASSERT((within_crr && order >= FF_AOFF) ||
+           (!within_crr && order <= FF_AOFF));
 
     if (!root)
 	return res;
@@ -1202,7 +1281,7 @@ check_tree(Carrier_t* within_crr, enum AOFF_Flavor flavor, AOFF_RBTree_t* root,
 	    ASSERT(((char*)x + AOFF_BLK_SZ(x)) <= ((char*)crr + CARRIER_SZ(crr)));
 
 	}
-	if (flavor == AOFF_BF) {
+	if (order == FF_BF) {
 	    AOFF_RBTree_t* y = x;
 	    AOFF_RBTree_t* nxt = LIST_NEXT(y);
 	    ASSERT(IS_TREE_NODE(x));
@@ -1225,13 +1304,13 @@ check_tree(Carrier_t* within_crr, enum AOFF_Flavor flavor, AOFF_RBTree_t* root,
 
 	if (x->left) {
 	    ASSERT(x->left->parent == x);
-	    ASSERT(cmp_blocks(flavor, x->left, x) < 0);
+	    ASSERT(cmp_blocks(order, x->left, x) < 0);
 	    ASSERT(x->left->max_sz <= x->max_sz);	    
 	}
 
 	if (x->right) {
 	    ASSERT(x->right->parent == x);
-	    ASSERT(cmp_blocks(flavor, x->right, x) > 0);
+	    ASSERT(cmp_blocks(order, x->right, x) > 0);
 	    ASSERT(x->right->max_sz <= x->max_sz);	    
 	}
 	ASSERT(x->max_sz >= AOFF_BLK_SZ(x));
@@ -1240,7 +1319,7 @@ check_tree(Carrier_t* within_crr, enum AOFF_Flavor flavor, AOFF_RBTree_t* root,
 	       || x->max_sz == (x->right ? x->right->max_sz : 0));
 
 	if (size && AOFF_BLK_SZ(x) >= size) {
-	    if (!res || cmp_blocks(flavor, x, res) < 0) {
+	    if (!res || cmp_blocks(order, x, res) < 0) {
 		res = x;
 	    }
 	}
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.h b/erts/emulator/beam/erl_ao_firstfit_alloc.h
index 7349c6ab19..9cf4fc81a8 100644
--- a/erts/emulator/beam/erl_ao_firstfit_alloc.h
+++ b/erts/emulator/beam/erl_ao_firstfit_alloc.h
@@ -28,14 +28,16 @@
 
 typedef struct AOFFAllctr_t_ AOFFAllctr_t;
 
-enum AOFF_Flavor {
-    AOFF_AOFF = 0,
-    AOFF_AOBF = 1,
-    AOFF_BF   = 2
+enum AOFFSortOrder {
+    FF_AGEFF = 0,
+    FF_AOFF  = 1,
+    FF_AOBF  = 2,
+    FF_BF    = 3
 };
 
 typedef struct {
-    enum AOFF_Flavor flavor;
+    enum AOFFSortOrder blk_order;
+    enum AOFFSortOrder crr_order;
 } AOFFAllctrInit_t;
 
 #define ERTS_DEFAULT_AOFF_ALLCTR_INIT {0/*dummy*/}
@@ -53,12 +55,12 @@ Allctr_t *erts_aoffalc_start(AOFFAllctr_t *, AOFFAllctrInit_t*, AllctrInit_t *);
 #define GET_ERL_ALLOC_UTIL_IMPL
 #include "erl_alloc_util.h"
 
-
 struct AOFFAllctr_t_ {
     Allctr_t		allctr; /* Has to be first! */
 
     struct AOFF_RBTree_t_* mbc_root;
-    enum AOFF_Flavor flavor;
+    enum AOFFSortOrder blk_order;
+    enum AOFFSortOrder crr_order;
 };
 
 UWord erts_aoffalc_test(UWord, UWord, UWord);
diff --git a/erts/emulator/beam/erl_bestfit_alloc.c b/erts/emulator/beam/erl_bestfit_alloc.c
index 6173c408e1..85fc4c3a85 100644
--- a/erts/emulator/beam/erl_bestfit_alloc.c
+++ b/erts/emulator/beam/erl_bestfit_alloc.c
@@ -875,7 +875,7 @@ static struct {
 
 static void ERTS_INLINE atom_init(Eterm *atom, char *name)
 {
-    *atom = am_atom_put(name, strlen(name));
+    *atom = am_atom_put(name, sys_strlen(name));
 }
 #define AM_INIT(AM) atom_init(&am.AM, #AM)
 
diff --git a/erts/emulator/beam/erl_bif_binary.c b/erts/emulator/beam/erl_bif_binary.c
index 4cafa499a9..469f6a1ea8 100644
--- a/erts/emulator/beam/erl_bif_binary.c
+++ b/erts/emulator/beam/erl_bif_binary.c
@@ -61,8 +61,6 @@ static Export binary_longest_prefix_trap_export;
 static BIF_RETTYPE binary_longest_prefix_trap(BIF_ALIST_3);
 static Export binary_longest_suffix_trap_export;
 static BIF_RETTYPE binary_longest_suffix_trap(BIF_ALIST_3);
-static Export binary_bin_to_list_trap_export;
-static BIF_RETTYPE binary_bin_to_list_trap(BIF_ALIST_3);
 static Export binary_copy_trap_export;
 static BIF_RETTYPE binary_copy_trap(BIF_ALIST_2);
 static Uint max_loop_limit;
@@ -86,10 +84,6 @@ void erts_init_bif_binary(void)
 			  am_erlang, am_binary_longest_suffix_trap, 3,
 			  &binary_longest_suffix_trap);
 
-    erts_init_trap_export(&binary_bin_to_list_trap_export,
-			  am_erlang, am_binary_bin_to_list_trap, 3,
-			  &binary_bin_to_list_trap);
-
     erts_init_trap_export(&binary_copy_trap_export,
 			  am_erlang, am_binary_copy_trap, 2,
 			  &binary_copy_trap);
@@ -371,7 +365,7 @@ static ACTrie *create_acdata(MyAllocator *my, Uint len,
     acn->d = 0;
     acn->final = 0;
     acn->h = NULL;
-    memset(acn->g, 0, sizeof(ACNode *) * ALPHABET_SIZE);
+    sys_memset(acn->g, 0, sizeof(ACNode *) * ALPHABET_SIZE);
 #ifdef HARDDEBUG
     act->idc = 0;
     acn->id = 0;
@@ -394,7 +388,7 @@ static BMData *create_bmdata(MyAllocator *my, byte *x, Uint len,
     init_my_allocator(my, datasize, data);
     bmd = my_alloc(my, sizeof(BMData));
     bmd->x = my_alloc(my,len);
-    memcpy(bmd->x,x,len);
+    sys_memcpy(bmd->x,x,len);
     bmd->len = len;
     bmd->goodshift = my_alloc(my,sizeof(Uint) * len);
     *the_bin = mb;
@@ -439,7 +433,7 @@ static void ac_add_one_pattern(MyAllocator *my, ACTrie *act, byte *x, Uint len)
 	    nn->d = i+1;
 	    nn->h = act->root;
 	    nn->final = 0;
-	    memset(nn->g, 0, sizeof(ACNode *) * ALPHABET_SIZE);
+	    sys_memset(nn->g, 0, sizeof(ACNode *) * ALPHABET_SIZE);
 	    acn->g[x[i]] = nn;
 	    ++i;
 	    acn = nn;
@@ -2270,7 +2264,7 @@ static BIF_RETTYPE do_longest_common(Process *p, Eterm list, int direction)
 	    if (cd[i].type == CL_TYPE_HEAP_NOALLOC) {
 		unsigned char *tmp = cd[i].buff;
 		cd[i].buff = erts_alloc(ERTS_ALC_T_BINARY_BUFFER, cd[i].bufflen);
-		memcpy(cd[i].buff,tmp,cd[i].bufflen);
+		sys_memcpy(cd[i].buff,tmp,cd[i].bufflen);
 		cd[i].type = CL_TYPE_HEAP;
 	    }
 	}
@@ -2440,191 +2434,6 @@ BIF_RETTYPE binary_at_2(BIF_ALIST_2)
     BIF_ERROR(BIF_P,BADARG);
 }
 
-#define BIN_TO_LIST_OK 0
-#define BIN_TO_LIST_TRAP 1
-/* No badarg, checked before call */
-
-#define BIN_TO_LIST_LOOP_FACTOR 10
-
-static int do_bin_to_list(Process *p, byte *bytes, Uint bit_offs,
-			  Uint start, Sint *lenp, Eterm *termp)
-{
-    Uint reds = get_reds(p, BIN_TO_LIST_LOOP_FACTOR); /* reds can never be 0 */
-    Uint len = *lenp;
-    Uint loops;
-    Eterm *hp;
-    Eterm term = *termp;
-    Uint n;
-
-    ASSERT(reds > 0);
-
-    loops = MIN(reds,len);
-
-    BUMP_REDS(p, loops / BIN_TO_LIST_LOOP_FACTOR);
-
-    hp = HAlloc(p,2*loops);
-    while (loops--) {
-	--len;
-	if (bit_offs) {
-	    n = ((((Uint) bytes[start+len]) << bit_offs) |
-		 (((Uint) bytes[start+len+1]) >> (8-bit_offs))) & 0xFF;
-	} else {
-	    n = bytes[start+len];
-	}
-
-	term = CONS(hp,make_small(n),term);
-	hp +=2;
-    }
-    *termp = term;
-    *lenp = len;
-    if (len) {
-	BUMP_ALL_REDS(p);
-	return BIN_TO_LIST_TRAP;
-    }
-    return BIN_TO_LIST_OK;
-}
-
-
-static BIF_RETTYPE do_trap_bin_to_list(Process *p, Eterm binary,
-				       Uint start, Sint len, Eterm sofar)
-{
-    Eterm *hp;
-    Eterm blob;
-
-    hp = HAlloc(p,3);
-    hp[0] = make_pos_bignum_header(2);
-    hp[1] = start;
-    hp[2] = (Uint) len;
-    blob = make_big(hp);
-    BIF_TRAP3(&binary_bin_to_list_trap_export, p, binary, blob, sofar);
-}
-
-static BIF_RETTYPE binary_bin_to_list_trap(BIF_ALIST_3)
-{
-    Eterm *ptr;
-    Uint start;
-    Sint len;
-    byte *bytes;
-    Uint bit_offs;
-    Uint bit_size;
-    Eterm res = BIF_ARG_3;
-
-    ptr  = big_val(BIF_ARG_2);
-    start = ptr[1];
-    len = (Sint) ptr[2];
-
-    ERTS_GET_BINARY_BYTES(BIF_ARG_1,bytes,bit_offs,bit_size);
-    if (do_bin_to_list(BIF_P, bytes, bit_offs, start, &len, &res) ==
-	BIN_TO_LIST_OK) {
-	BIF_RET(res);
-    }
-    return do_trap_bin_to_list(BIF_P,BIF_ARG_1,start,len,res);
-}
-
-static BIF_RETTYPE binary_bin_to_list_common(Process *p,
-					     Eterm bin,
-					     Eterm epos,
-					     Eterm elen)
-{
-    Uint pos;
-    Sint len;
-    size_t sz;
-    byte *bytes;
-    Uint bit_offs;
-    Uint bit_size;
-    Eterm res = NIL;
-
-    if (is_not_binary(bin)) {
-	goto badarg;
-    }
-    if (!term_to_Uint(epos, &pos)) {
-	goto badarg;
-    }
-    if (!term_to_Sint(elen, &len)) {
-	goto badarg;
-    }
-    if (len < 0) {
-	Uint lentmp = -(Uint)len;
-	/* overflow */
-	if ((Sint)lentmp < 0) {
-	    goto badarg;
-	}
-	len = lentmp;
-	if (len > pos) {
-	    goto badarg;
-	}
-	pos -= len;
-    }
-    /* overflow */
-    if ((pos + len) < pos || (len > 0 && (pos + len) == pos)) {
-	goto badarg;
-    }
-    sz = binary_size(bin);
-
-    if (pos+len > sz) {
-	goto badarg;
-    }
-    ERTS_GET_BINARY_BYTES(bin,bytes,bit_offs,bit_size);
-    if (bit_size != 0) {
-	goto badarg;
-    }
-    if(do_bin_to_list(p, bytes, bit_offs, pos, &len, &res) ==
-       BIN_TO_LIST_OK) {
-	BIF_RET(res);
-    }
-    return do_trap_bin_to_list(p,bin,pos,len,res);
-
- badarg:
-    BIF_ERROR(p,BADARG);
-}
-
-BIF_RETTYPE binary_bin_to_list_3(BIF_ALIST_3)
-{
-    return binary_bin_to_list_common(BIF_P,BIF_ARG_1,BIF_ARG_2,BIF_ARG_3);
-}
-
-BIF_RETTYPE binary_bin_to_list_2(BIF_ALIST_2)
-{
-    Eterm *tp;
-
-    if (is_not_tuple(BIF_ARG_2)) {
-	goto badarg;
-    }
-    tp = tuple_val(BIF_ARG_2);
-    if (arityval(*tp) != 2) {
-	goto badarg;
-    }
-    return binary_bin_to_list_common(BIF_P,BIF_ARG_1,tp[1],tp[2]);
- badarg:
-    BIF_ERROR(BIF_P,BADARG);
-}
-
-BIF_RETTYPE binary_bin_to_list_1(BIF_ALIST_1)
-{
-    Uint pos = 0;
-    Sint len;
-    byte *bytes;
-    Uint bit_offs;
-    Uint bit_size;
-    Eterm res = NIL;
-
-    if (is_not_binary(BIF_ARG_1)) {
-	goto badarg;
-    }
-    len = binary_size(BIF_ARG_1);
-    ERTS_GET_BINARY_BYTES(BIF_ARG_1,bytes,bit_offs,bit_size);
-    if (bit_size != 0) {
-	goto badarg;
-    }
-    if(do_bin_to_list(BIF_P, bytes, bit_offs, pos, &len, &res) ==
-       BIN_TO_LIST_OK) {
-	BIF_RET(res);
-    }
-    return do_trap_bin_to_list(BIF_P,BIF_ARG_1,pos,len,res);
- badarg:
-    BIF_ERROR(BIF_P,BADARG);
-}
-
 HIPE_WRAPPER_BIF_DISABLE_GC(binary_list_to_bin, 1)
 
 BIF_RETTYPE binary_list_to_bin_1(BIF_ALIST_1)
@@ -2747,7 +2556,7 @@ static BIF_RETTYPE do_binary_copy(Process *p, Eterm bin, Eterm en)
 						    0);
 	    if (!(cbs->temp_alloc)) { /* alignment not needed, need to copy */
 		byte *tmp = erts_alloc(ERTS_ALC_T_BINARY_BUFFER,size);
-		memcpy(tmp,cbs->source,size);
+		sys_memcpy(tmp,cbs->source,size);
 		cbs->source = tmp;
 		cbs->source_type = BC_TYPE_HEAP;
 	    } else {
@@ -2760,7 +2569,7 @@ static BIF_RETTYPE do_binary_copy(Process *p, Eterm bin, Eterm en)
 	pos = 0;
 	i = 0;
 	while (pos < reds) {
-	    memcpy(t+pos,cbs->source, size);
+	    sys_memcpy(t+pos,cbs->source, size);
 	    pos += size;
 	    ++i;
 	}
@@ -2785,7 +2594,7 @@ static BIF_RETTYPE do_binary_copy(Process *p, Eterm bin, Eterm en)
 	}
 	pos = 0;
 	while (pos < target_size) {
-	    memcpy(t+pos,source, size);
+	    sys_memcpy(t+pos,source, size);
 	    pos += size;
 	}
 	erts_free_aligned_binary_bytes(temp_alloc);
@@ -2815,7 +2624,7 @@ BIF_RETTYPE binary_copy_trap(BIF_ALIST_2)
     if ((n-1) * size >= reds) {
 	Uint i = 0;
 	while ((pos - opos) < reds) {
-	    memcpy(t+pos,cbs->source, size);
+	    sys_memcpy(t+pos,cbs->source, size);
 	    pos += size;
 	    ++i;
 	}
@@ -2825,28 +2634,21 @@ BIF_RETTYPE binary_copy_trap(BIF_ALIST_2)
 	BIF_TRAP2(&binary_copy_trap_export, BIF_P, BIF_ARG_1, BIF_ARG_2);
     } else {
 	Binary *save;
-	ProcBin* pb;
+        Eterm resbin;
 	Uint target_size = cbs->result->orig_size;
 	while (pos < target_size) {
-	    memcpy(t+pos,cbs->source, size);
+	    sys_memcpy(t+pos,cbs->source, size);
 	    pos += size;
 	}
-	save =  cbs->result;
+	save = cbs->result;
 	cbs->result = NULL;
 	cleanup_copy_bin_state(mb); /* now cbs is dead */
-	pb = (ProcBin *) HAlloc(BIF_P, PROC_BIN_SIZE);
-	pb->thing_word = HEADER_PROC_BIN;
-	pb->size = target_size;
-	pb->next = MSO(BIF_P).first;
-	MSO(BIF_P).first = (struct erl_off_heap_header*) pb;
-	pb->val = save;
-	pb->bytes = t;
-	pb->flags = 0;
-
-	OH_OVERHEAD(&(MSO(BIF_P)), target_size / sizeof(Eterm));
-	BUMP_REDS(BIF_P,(pos - opos) / BINARY_COPY_LOOP_FACTOR);
 
-	BIF_RET(make_binary(pb));
+        resbin = erts_build_proc_bin(&MSO(BIF_P),
+                                     HAlloc(BIF_P, PROC_BIN_SIZE),
+                                     save);
+        BUMP_REDS(BIF_P,(pos - opos) / BINARY_COPY_LOOP_FACTOR);
+	BIF_RET(resbin);
     }
 }
 
@@ -3227,7 +3029,7 @@ static void dump_bm_data(BMData *bm)
 static void dump_ac_node(ACNode *node, int indent, int ch) {
     int i;
     char *spaces = erts_alloc(ERTS_ALC_T_TMP, 10 * indent + 1);
-    memset(spaces,' ',10*indent);
+    sys_memset(spaces,' ',10*indent);
     spaces[10*indent] = '\0';
     erts_printf("%s-> %c\n",spaces,ch);
     erts_printf("%sId: %u\n",spaces,(unsigned) node->id);
diff --git a/erts/emulator/beam/erl_bif_chksum.c b/erts/emulator/beam/erl_bif_chksum.c
index 9417803e14..9095bcd380 100644
--- a/erts/emulator/beam/erl_bif_chksum.c
+++ b/erts/emulator/beam/erl_bif_chksum.c
@@ -516,7 +516,7 @@ md5_2(BIF_ALIST_2)
     /* No need to check context, this function cannot be called with unaligned
        or badly sized context as it's always trapped to. */
     bytes = binary_bytes(BIF_ARG_1);
-    memcpy(&context,bytes,sizeof(MD5_CTX));
+    sys_memcpy(&context,bytes,sizeof(MD5_CTX));
     rest = do_chksum(&md5_wrap,BIF_P,BIF_ARG_2,100,(void *) &context,&res,
 		     &err);
     if (err != 0) {
@@ -564,7 +564,7 @@ md5_update_2(BIF_ALIST_2)
 	erts_free_aligned_binary_bytes(temp_alloc);
 	BIF_ERROR(BIF_P, BADARG);
     }
-    memcpy(&context,bytes,sizeof(MD5_CTX));
+    sys_memcpy(&context,bytes,sizeof(MD5_CTX));
     erts_free_aligned_binary_bytes(temp_alloc);
     rest = do_chksum(&md5_wrap,BIF_P,BIF_ARG_2,100,(void *) &context,&res,
 		     &err);
@@ -599,7 +599,7 @@ md5_final_1(BIF_ALIST_1)
 	goto error;
     }
     bin = erts_new_heap_binary(BIF_P, (byte *)NULL, 16, &result);
-    memcpy(&ctx_copy, context, sizeof(MD5_CTX));
+    sys_memcpy(&ctx_copy, context, sizeof(MD5_CTX));
     erts_free_aligned_binary_bytes(temp_alloc);
     MD5Final(result, &ctx_copy);
     BIF_RET(bin);
diff --git a/erts/emulator/beam/erl_bif_ddll.c b/erts/emulator/beam/erl_bif_ddll.c
index f673ef3194..579e9b12f4 100644
--- a/erts/emulator/beam/erl_bif_ddll.c
+++ b/erts/emulator/beam/erl_bif_ddll.c
@@ -1412,7 +1412,7 @@ static Eterm copy_ref(Eterm ref, Eterm *hp)
     ErtsORefThing *ptr;
     ASSERT(is_internal_ordinary_ref(ref));
     ptr = ordinary_ref_thing_ptr(ref);
-    memcpy(hp, ptr, sizeof(ErtsORefThing));
+    sys_memcpy(hp, ptr, sizeof(ErtsORefThing));
     return (make_internal_ref(hp));
 }
 
@@ -1454,9 +1454,9 @@ static void set_driver_reloading(DE_Handle *dh, Process *proc, char *path, char
     dh->procs = p;
     dh->status = ERL_DE_RELOAD;
     dh->reload_full_path = erts_alloc(ERTS_ALC_T_DDLL_HANDLE, sys_strlen(path) + 1);
-    strcpy(dh->reload_full_path,path);
+    sys_strcpy(dh->reload_full_path,path);
     dh->reload_driver_name = erts_alloc(ERTS_ALC_T_DDLL_HANDLE, sys_strlen(name) + 1);
-    strcpy(dh->reload_driver_name,name);
+    sys_strcpy(dh->reload_driver_name,name);
     dh->reload_flags = flags;
 }
 
@@ -1501,7 +1501,7 @@ static int do_load_driver_entry(DE_Handle *dh, char *path, char *name)
 	goto error;
     }
 
-    if (strcmp(name, dp->driver_name) != 0) {
+    if (sys_strcmp(name, dp->driver_name) != 0) {
 	res = ERL_DE_LOAD_ERROR_BAD_NAME;
 	goto error;
     }
@@ -1799,7 +1799,7 @@ static char *pick_list_or_atom(Eterm name_term)
 	    goto error;
 	}
 	name = erts_alloc(ERTS_ALC_T_DDLL_TMP_BUF, ap->len + 1);
-	memcpy(name,ap->name,ap->len);
+	sys_memcpy(name,ap->name,ap->len);
 	name[ap->len] = '\0';
     } else {
 	if (erts_iolist_size(name_term, &name_len)) {
@@ -1870,7 +1870,7 @@ static erts_driver_t *lookup_driver(char *name)
 {
     erts_driver_t *drv;
     assert_drv_list_locked();
-    for (drv = driver_list; drv != NULL && strcmp(drv->name, name); drv = drv->next)
+    for (drv = driver_list; drv != NULL && sys_strcmp(drv->name, name); drv = drv->next)
 	;
     return drv;
 }
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 27bbf70c0b..6475f04c56 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -1754,7 +1754,7 @@ static int check_if_xml(void)
 {
     char buf[1];
     size_t bufsz = sizeof(buf);
-    return erts_sys_getenv_raw("VALGRIND_LOG_XML", buf, &bufsz) >= 0;
+    return erts_sys_explicit_8bit_getenv("VALGRIND_LOG_XML", buf, &bufsz) >= 0;
 }
 #else
 #define check_if_xml() 0
@@ -2378,12 +2378,12 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	BIF_RET(os_version_tuple);
     }
     else if (BIF_ARG_1 == am_version) {
-	int n = strlen(ERLANG_VERSION);
+	int n = sys_strlen(ERLANG_VERSION);
 	hp = HAlloc(BIF_P, ((sizeof ERLANG_VERSION)-1) * 2);
 	BIF_RET(buf_to_intlist(&hp, ERLANG_VERSION, n, NIL));
     }
     else if (BIF_ARG_1 == am_machine) {
-	int n = strlen(EMULATOR);
+	int n = sys_strlen(EMULATOR);
 	hp = HAlloc(BIF_P, n*2);
 	BIF_RET(buf_to_intlist(&hp, EMULATOR, n, NIL));
     }
@@ -2409,7 +2409,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	    res = erts_bld_cons(hpp, hszp,
 				erts_bld_tuple(hpp, hszp, 2,
 					       erts_atom_put((byte *)opc[i].name,
-							     strlen(opc[i].name),
+							     sys_strlen(opc[i].name),
 							     ERTS_ATOM_ENC_LATIN1,
 							     1),
 					       erts_bld_uint(hpp, hszp,
@@ -2805,21 +2805,21 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	Uint  sz;
 	Eterm res = NIL, tup, text;
 	Eterm *hp = HAlloc(BIF_P, 3*(2 + 3) + /* three 2-tuples and three cons */
-		2*(strlen(erts_build_flags_CONFIG_H) +
-		   strlen(erts_build_flags_CFLAGS) +
-		   strlen(erts_build_flags_LDFLAGS)));
+		2*(sys_strlen(erts_build_flags_CONFIG_H) +
+		   sys_strlen(erts_build_flags_CFLAGS) +
+		   sys_strlen(erts_build_flags_LDFLAGS)));
 
-	sz   = strlen(erts_build_flags_CONFIG_H);
+	sz   = sys_strlen(erts_build_flags_CONFIG_H);
 	text = buf_to_intlist(&hp, erts_build_flags_CONFIG_H, sz, NIL);
 	tup  = TUPLE2(hp, am_config_h, text); hp += 3;
 	res  = CONS(hp, tup, res); hp += 2;
 
-	sz   = strlen(erts_build_flags_CFLAGS);
+	sz   = sys_strlen(erts_build_flags_CFLAGS);
 	text = buf_to_intlist(&hp, erts_build_flags_CFLAGS, sz, NIL);
 	tup  = TUPLE2(hp, am_cflags, text); hp += 3;
 	res  = CONS(hp, tup, res); hp += 2;
 
-	sz   = strlen(erts_build_flags_LDFLAGS);
+	sz   = sys_strlen(erts_build_flags_LDFLAGS);
 	text = buf_to_intlist(&hp, erts_build_flags_LDFLAGS, sz, NIL);
 	tup  = TUPLE2(hp, am_ldflags, text); hp += 3;
 	res  = CONS(hp, tup, res); hp += 2;
@@ -3830,10 +3830,10 @@ BIF_RETTYPE erts_debug_get_internal_state_1(BIF_ALIST_1)
 		    BIF_RET(res);
 		}
 	    }
-	    else if (ERTS_IS_ATOM_STR("term_to_binary_no_funs", tp[1])) {
-		Uint dflags = (DFLAG_EXTENDED_REFERENCES |
-			       DFLAG_EXTENDED_PIDS_PORTS |
-			       DFLAG_BIT_BINARIES);
+	    else if (ERTS_IS_ATOM_STR("term_to_binary_tuple_fallbacks", tp[1])) {
+		Uint dflags = (TERM_TO_BINARY_DFLAGS
+                               & ~DFLAG_EXPORT_PTR_TAG
+                               & ~DFLAG_BIT_BINARIES);
 		BIF_RET(erts_term_to_binary(BIF_P, tp[2], 0, dflags));
 	    }
 	    else if (ERTS_IS_ATOM_STR("dist_ctrl", tp[1])) {
@@ -3883,7 +3883,7 @@ BIF_RETTYPE erts_debug_get_internal_state_1(BIF_ALIST_1)
 		while (ix >= atom_table_size()) {
 		    char tmp[20];
 		    erts_snprintf(tmp, sizeof(tmp), "am%x", atom_table_size());
-		    erts_atom_put((byte *) tmp, strlen(tmp), ERTS_ATOM_ENC_LATIN1, 1);
+		    erts_atom_put((byte *) tmp, sys_strlen(tmp), ERTS_ATOM_ENC_LATIN1, 1);
 		}
 		return make_atom(ix);
 	    }
@@ -4334,6 +4334,19 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
                 BIF_RET(res);
             }
         }
+        else if (ERTS_IS_ATOM_STR("binary", BIF_ARG_1)) {
+            Sint64 size;
+            if (term_to_Sint64(BIF_ARG_2, &size)) {
+                Binary* refbin = erts_bin_drv_alloc_fnf(size);
+                if (!refbin)
+                    BIF_RET(am_false);
+                sys_memset(refbin->orig_bytes, 0, size);
+                BIF_RET(erts_build_proc_bin(&MSO(BIF_P),
+                                            HAlloc(BIF_P, PROC_BIN_SIZE),
+                                            refbin));
+            }
+        }
+
     }
 
     BIF_ERROR(BIF_P, BADARG);
@@ -4436,7 +4449,7 @@ static Eterm lcnt_build_lock_stats_term(Eterm **hpp, Uint *szp, erts_lcnt_lock_s
 
     file = stats->file ? stats->file : "undefined";
 
-    af    = erts_atom_put((byte *)file, strlen(file), ERTS_ATOM_ENC_LATIN1, 1);
+    af    = erts_atom_put((byte *)file, sys_strlen(file), ERTS_ATOM_ENC_LATIN1, 1);
     uil   = erts_bld_uint( hpp, szp, stats->line);
     tloc  = erts_bld_tuple(hpp, szp, 2, af, uil);
 
@@ -4465,7 +4478,7 @@ static Eterm lcnt_build_lock_stats_term(Eterm **hpp, Uint *szp, erts_lcnt_lock_s
 static Eterm lcnt_pretty_print_lock_id(erts_lcnt_lock_info_t *info) {
     Eterm id = info->id;
 
-    if((info->flags & ERTS_LOCK_FLAGS_MASK_TYPE) == ERTS_LOCK_TYPE_PROCLOCK) {
+    if((info->flags & ERTS_LOCK_FLAGS_MASK_TYPE) == ERTS_LOCK_FLAGS_TYPE_PROCLOCK) {
         /* Use registered names as id's for process locks if available. Thread
          * progress is delayed since we may be running on a dirty scheduler. */
         ErtsThrPrgrDelayHandle delay_handle;
@@ -4482,7 +4495,7 @@ static Eterm lcnt_pretty_print_lock_id(erts_lcnt_lock_info_t *info) {
     } else if(info->flags & ERTS_LOCK_FLAGS_CATEGORY_ALLOCATOR) {
         if(is_small(id) && !sys_strcmp(info->name, "alcu_allocator")) {
             const char *name = (const char*)ERTS_ALC_A2AD(signed_val(id));
-            id = erts_atom_put((byte*)name, strlen(name), ERTS_ATOM_ENC_LATIN1, 1);
+            id = erts_atom_put((byte*)name, sys_strlen(name), ERTS_ATOM_ENC_LATIN1, 1);
         }
     }
 
@@ -4502,8 +4515,8 @@ static Eterm lcnt_build_lock_term(Eterm **hpp, Uint *szp, lcnt_sample_t *sample,
     
     lock_desc = erts_lock_flags_get_type_name(info->flags);
 
-    type  = erts_atom_put((byte*)lock_desc, strlen(lock_desc), ERTS_ATOM_ENC_LATIN1, 1);
-    name  = erts_atom_put((byte*)info->name, strlen(info->name), ERTS_ATOM_ENC_LATIN1, 1);
+    type  = erts_atom_put((byte*)lock_desc, sys_strlen(lock_desc), ERTS_ATOM_ENC_LATIN1, 1);
+    name  = erts_atom_put((byte*)info->name, sys_strlen(info->name), ERTS_ATOM_ENC_LATIN1, 1);
 
     /* Only attempt to resolve ids when actually emitting the term. This ought
      * to be safe since all immediates are the same size. */
@@ -4539,11 +4552,11 @@ static Eterm lcnt_build_result_term(Eterm **hpp, Uint *szp, erts_lcnt_time_t *du
     dtns = bld_unstable_uint64(hpp, szp, duration->ns);
     tdt  = erts_bld_tuple(hpp, szp, 2, dts, dtns);
 
-    adur = erts_atom_put((byte *)str_duration, strlen(str_duration), ERTS_ATOM_ENC_LATIN1, 1);
+    adur = erts_atom_put((byte *)str_duration, sys_strlen(str_duration), ERTS_ATOM_ENC_LATIN1, 1);
     tdur = erts_bld_tuple(hpp, szp, 2, adur, tdt);
    
     /* lock tuple */
-    aloc = erts_atom_put((byte *)str_locks, strlen(str_locks), ERTS_ATOM_ENC_LATIN1, 1);
+    aloc = erts_atom_put((byte *)str_locks, sys_strlen(str_locks), ERTS_ATOM_ENC_LATIN1, 1);
 
     for(i = 0; i < current_locks->size; i++) {
         lloc = lcnt_build_lock_term(hpp, szp, &current_locks->elements[i], lloc);
@@ -4597,7 +4610,7 @@ static Eterm lcnt_build_category_list(Eterm **hpp, Uint *szp, erts_lock_flags_t
     for(i = 0; lcnt_category_map[i].name != NULL; i++) {
         if(mask & lcnt_category_map[i].flag) {
             Eterm category = erts_atom_put((byte*)lcnt_category_map[i].name,
-                                           strlen(lcnt_category_map[i].name),
+                                           sys_strlen(lcnt_category_map[i].name),
                                            ERTS_ATOM_ENC_UTF8, 0);
 
             res = erts_bld_cons(hpp, szp, category, res);
@@ -4727,14 +4740,14 @@ BIF_RETTYPE erts_debug_lcnt_control_2(BIF_ALIST_2)
 
 static void os_info_init(void)
 {
-    Eterm type = erts_atom_put((byte *) os_type, strlen(os_type), ERTS_ATOM_ENC_LATIN1, 1);
+    Eterm type = erts_atom_put((byte *) os_type, sys_strlen(os_type), ERTS_ATOM_ENC_LATIN1, 1);
     Eterm flav;
     int major, minor, build;
     char* buf = erts_alloc(ERTS_ALC_T_TMP, 1024); /* More than enough */
     Eterm* hp;
 
     os_flavor(buf, 1024);
-    flav = erts_atom_put((byte *) buf, strlen(buf), ERTS_ATOM_ENC_LATIN1, 1);
+    flav = erts_atom_put((byte *) buf, sys_strlen(buf), ERTS_ATOM_ENC_LATIN1, 1);
     erts_free(ERTS_ALC_T_TMP, (void *) buf);
     hp = erts_alloc(ERTS_ALC_T_LITERAL, (3+4)*sizeof(Eterm));
     os_type_tuple = TUPLE2(hp, type, flav);
@@ -4758,7 +4771,7 @@ erts_bif_info_init(void)
     alloc_info_trap = erts_export_put(am_erlang, am_alloc_info, 1);
     alloc_sizes_trap = erts_export_put(am_erlang, am_alloc_sizes, 1);
     gather_sched_wall_time_res_trap
-	= erts_export_put(am_erlang, am_gather_sched_wall_time_result, 1);
+	= erts_export_put(am_erts_internal, am_gather_sched_wall_time_result, 1);
     gather_gc_info_res_trap
 	= erts_export_put(am_erlang, am_gather_gc_info_result, 1);
     gather_io_bytes_trap
diff --git a/erts/emulator/beam/erl_bif_os.c b/erts/emulator/beam/erl_bif_os.c
index 910325a2f4..ce2b27409b 100644
--- a/erts/emulator/beam/erl_bif_os.c
+++ b/erts/emulator/beam/erl_bif_os.c
@@ -36,8 +36,7 @@
 #include "big.h"
 #include "dist.h"
 #include "erl_version.h"
-
-static int check_env_name(char *name);
+#include "erl_osenv.h"
 
 /*
  * Return the pid for the Erlang process in the host OS.
@@ -67,148 +66,78 @@ BIF_RETTYPE os_getpid_0(BIF_ALIST_0)
      BIF_RET(buf_to_intlist(&hp, pid_string, n, NIL));
 }
 
-BIF_RETTYPE os_getenv_0(BIF_ALIST_0)
+static void os_getenv_foreach(Process *process, Eterm *result, Eterm key, Eterm value)
 {
-    GETENV_STATE state;
-    char *cp;
-    Eterm* hp;
-    Eterm ret;
-    Eterm str;
+    Eterm kvp_term, *hp;
 
-    init_getenv_state(&state);
+    hp = HAlloc(process, 5);
+    kvp_term = TUPLE2(hp, key, value);
+    hp += 3;
 
-    ret = NIL;
-    while ((cp = getenv_string(&state)) != NULL) {
-	str = erts_convert_native_to_filename(BIF_P,(byte *)cp);
-	hp = HAlloc(BIF_P, 2);
-	ret = CONS(hp, str, ret);
-    }
+    (*result) = CONS(hp, kvp_term, (*result));
+}
 
-    fini_getenv_state(&state);
+BIF_RETTYPE os_list_env_vars_0(BIF_ALIST_0)
+{
+    const erts_osenv_t *global_env;
+    Eterm result = NIL;
+
+    global_env = erts_sys_rlock_global_osenv();
+    erts_osenv_foreach_term(global_env, BIF_P, &result, (void*)&os_getenv_foreach);
+    erts_sys_runlock_global_osenv();
 
-    return ret;
+    return result;
 }
 
-#define STATIC_BUF_SIZE 1024
-BIF_RETTYPE os_getenv_1(BIF_ALIST_1)
+BIF_RETTYPE os_get_env_var_1(BIF_ALIST_1)
 {
-    Process* p = BIF_P;
-    Eterm str;
-    Sint len;
-    int res;
-    char *key_str, *val;
-    char buf[STATIC_BUF_SIZE];
-    size_t val_size = sizeof(buf);
-
-    key_str = erts_convert_filename_to_native(BIF_ARG_1,buf,STATIC_BUF_SIZE,
-					      ERTS_ALC_T_TMP,1,0,&len);
-
-    if (!check_env_name(key_str)) {
-        if (key_str && key_str != &buf[0])
-            erts_free(ERTS_ALC_T_TMP, key_str);
-        BIF_ERROR(p, BADARG);
-    }
+    const erts_osenv_t *global_env;
+    Eterm out_term;
+    int error;
 
-    if (key_str != &buf[0])
-	val = &buf[0];
-    else {
-	/* len includes zero byte */
-	val_size -= len;
-	val = &buf[len];
-    }
-    res = erts_sys_getenv(key_str, val, &val_size);
-
-    if (res < 0) {
-    no_var:
-	str = am_false;
-    } else {
-	if (res > 0) {
-	    val = erts_alloc(ERTS_ALC_T_TMP, val_size);
-	    while (1) {
-		res = erts_sys_getenv(key_str, val, &val_size);
-		if (res == 0)
-		    break;
-		else if (res < 0)
-		    goto no_var;
-		else
-		    val = erts_realloc(ERTS_ALC_T_TMP, val, val_size);
-	    }
-	}
-	str = erts_convert_native_to_filename(p,(byte *)val);
-    }
-    if (key_str != &buf[0])
-	erts_free(ERTS_ALC_T_TMP, key_str);
-    if (val < &buf[0] || &buf[sizeof(buf)-1] < val)
-	erts_free(ERTS_ALC_T_TMP, val);
-    BIF_RET(str);
+    global_env = erts_sys_rlock_global_osenv();
+    error = erts_osenv_get_term(global_env, BIF_P, BIF_ARG_1, &out_term);
+    erts_sys_runlock_global_osenv();
+
+    if (error == 0) {
+        return am_false;
+    } else if (error < 0) {
+        BIF_ERROR(BIF_P, BADARG);
+    } 
+
+    return out_term;
 }
 
-BIF_RETTYPE os_putenv_2(BIF_ALIST_2)
+BIF_RETTYPE os_set_env_var_2(BIF_ALIST_2)
 {
-    char def_buf_key[STATIC_BUF_SIZE];
-    char def_buf_value[STATIC_BUF_SIZE];
-    char *key_buf = NULL, *value_buf = NULL;
-
-    key_buf = erts_convert_filename_to_native(BIF_ARG_1,def_buf_key,
-					      STATIC_BUF_SIZE,
-					      ERTS_ALC_T_TMP,0,0,NULL);
-    if (!check_env_name(key_buf))
-        goto badarg;
-
-    value_buf = erts_convert_filename_to_native(BIF_ARG_2,def_buf_value,
-						STATIC_BUF_SIZE,
-						ERTS_ALC_T_TMP,1,0,
-						NULL);
-    if (!value_buf)
-        goto badarg;
-
-    if (erts_sys_putenv(key_buf, value_buf)) {
-	if (key_buf != def_buf_key) {
-	    erts_free(ERTS_ALC_T_TMP, key_buf);
-	}
-	if (value_buf != def_buf_value) {
-	    erts_free(ERTS_ALC_T_TMP, value_buf);
-	}
-	BIF_ERROR(BIF_P, BADARG);
-    }
-    if (key_buf != def_buf_key) {
-	erts_free(ERTS_ALC_T_TMP, key_buf);
-    }
-    if (value_buf != def_buf_value) {
-	erts_free(ERTS_ALC_T_TMP, value_buf);
+    erts_osenv_t *global_env;
+    int error;
+
+    global_env = erts_sys_rwlock_global_osenv();
+    error = erts_osenv_put_term(global_env, BIF_ARG_1, BIF_ARG_2);
+    erts_sys_rwunlock_global_osenv();
+
+    if (error < 0) {
+        BIF_ERROR(BIF_P, BADARG);
     }
-    BIF_RET(am_true);
 
-badarg:
-    if (key_buf && key_buf != def_buf_key)
-	erts_free(ERTS_ALC_T_TMP, key_buf);
-    if (value_buf && value_buf != def_buf_value)
-	erts_free(ERTS_ALC_T_TMP, value_buf);
-    BIF_ERROR(BIF_P, BADARG);
+    BIF_RET(am_true);
 }
 
-BIF_RETTYPE os_unsetenv_1(BIF_ALIST_1)
+BIF_RETTYPE os_unset_env_var_1(BIF_ALIST_1)
 {
-    char *key_buf;
-    char buf[STATIC_BUF_SIZE];
+    erts_osenv_t *global_env;
+    int error;
 
-    key_buf = erts_convert_filename_to_native(BIF_ARG_1,buf,STATIC_BUF_SIZE,
-					      ERTS_ALC_T_TMP,0,0,NULL);
-    if (!check_env_name(key_buf))
-        goto badarg;
+    global_env = erts_sys_rwlock_global_osenv();
+    error = erts_osenv_unset_term(global_env, BIF_ARG_1);
+    erts_sys_rwunlock_global_osenv();
 
-    if (erts_sys_unsetenv(key_buf))
-        goto badarg;
-
-    if (key_buf != buf) {
-	erts_free(ERTS_ALC_T_TMP, key_buf);
+    if (error < 0) {
+        BIF_ERROR(BIF_P, BADARG);
     }
-    BIF_RET(am_true);
 
-badarg:
-    if (key_buf && key_buf != buf)
-        erts_free(ERTS_ALC_T_TMP, key_buf);
-    BIF_ERROR(BIF_P, BADARG);    
+    BIF_RET(am_true);
 }
 
 BIF_RETTYPE os_set_signal_2(BIF_ALIST_2) {
@@ -224,27 +153,3 @@ BIF_RETTYPE os_set_signal_2(BIF_ALIST_2) {
 error:
     BIF_ERROR(BIF_P, BADARG);
 }
-
-static int
-check_env_name(char *raw_name)
-{
-    byte *c = (byte *) raw_name;
-    int encoding;
-
-    if (!c)
-        return 0;
-    
-    encoding = erts_get_native_filename_encoding();
-
-    if (erts_raw_env_char_is_7bit_ascii_char('\0', c, encoding))
-        return 0; /* Do not allow empty name... */
-
-    /* Verify no '=' characters in variable name... */
-    do {
-        if (erts_raw_env_char_is_7bit_ascii_char('=', c, encoding))
-            return 0;
-        c = erts_raw_env_next_char(c, encoding);
-    } while (!erts_raw_env_char_is_7bit_ascii_char('\0', c, encoding));
-
-    return 1; /* Seems ok... */
-}
diff --git a/erts/emulator/beam/erl_bif_port.c b/erts/emulator/beam/erl_bif_port.c
index c4a4dd5863..1feb892b93 100644
--- a/erts/emulator/beam/erl_bif_port.c
+++ b/erts/emulator/beam/erl_bif_port.c
@@ -45,7 +45,7 @@
 #include "dtrace-wrapper.h"
 
 static Port *open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump);
-static char* convert_environment(Eterm env);
+static int merge_global_environment(erts_osenv_t *env, Eterm key_value_pairs);
 static char **convert_args(Eterm);
 static void free_args(char **);
 
@@ -71,7 +71,7 @@ BIF_RETTYPE erts_internal_open_port_2(BIF_ALIST_2)
                 BIF_ERROR(BIF_P, EXC_INTERNAL_ERROR);
 	} else if (err_type == -2) {
 	    str = erl_errno_id(err_num);
-            res = erts_atom_put((byte *) str, strlen(str), ERTS_ATOM_ENC_LATIN1, 1);
+            res = erts_atom_put((byte *) str, sys_strlen(str), ERTS_ATOM_ENC_LATIN1, 1);
 	} else {
 	    res = am_einval;
 	}
@@ -639,6 +639,27 @@ BIF_RETTYPE port_get_data_1(BIF_ALIST_1)
     BIF_RET(res);
 }
 
+Eterm erts_port_data_read(Port* prt)
+{
+    Eterm res;
+    erts_aint_t data;
+
+    data = erts_atomic_read_ddrb(&prt->data);
+    if (data == (erts_aint_t)NULL)
+        return am_undefined;  /* Port terminated by racing thread */
+
+    if ((data & 0x3) != 0) {
+	res = (Eterm) (UWord) data;
+	ASSERT(is_immed(res));
+    }
+    else {
+	ErtsPortDataHeap *pdhp = (ErtsPortDataHeap *) data;
+	res = pdhp->data;
+    }
+    return res;
+}
+
+
 /* 
  * Open a port. Most of the work is not done here but rather in
  * the file io.c.
@@ -651,6 +672,7 @@ BIF_RETTYPE port_get_data_1(BIF_ALIST_1)
 static Port *
 open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump)
 {
+    int merged_environment = 0;
     Sint i;
     Eterm option;
     Uint arity;
@@ -672,12 +694,13 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump)
     opts.read_write = 0;
     opts.hide_window = 0;
     opts.wd = NULL;
-    opts.envir = NULL;
     opts.exit_status = 0;
     opts.overlapped_io = 0; 
     opts.spawn_type = ERTS_SPAWN_ANY; 
     opts.argv = NULL;
     opts.parallelism = erts_port_parallelism;
+    erts_osenv_init(&opts.envir);
+
     linebuf = 0;
 
     *err_nump = 0;
@@ -718,11 +741,16 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump)
 			goto badarg;
 		    }
 		} else if (option == am_env) {
-                    if (opts.envir) /* ignore previous env option... */
-                        erts_free(ERTS_ALC_T_OPEN_PORT_ENV, opts.envir);
-                    opts.envir = convert_environment(*tp);
-                    if (!opts.envir)
-			goto badarg;
+		    if (merged_environment) {
+		        /* Ignore previous env option */
+		        erts_osenv_clear(&opts.envir);
+		    }
+
+		    merged_environment = 1;
+
+		    if (merge_global_environment(&opts.envir, *tp)) {
+		        goto badarg;
+		    }
 		} else if (option == am_args) {
 		    char **av;
 		    char **oav = opts.argv;
@@ -807,6 +835,12 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump)
     if((linebuf && opts.packet_bytes) || 
        (opts.redir_stderr && !opts.use_stdio)) {
 	goto badarg;
+}
+
+    /* If we lacked an env option, fill in the global environment without
+     * changes. */
+    if (!merged_environment) {
+        merge_global_environment(&opts.envir, NIL);
     }
 
     /*
@@ -956,8 +990,7 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump)
 	erts_atomic32_read_bor_relb(&port->state, sflgs);
  
  do_return:
-    if (opts.envir)
-        erts_free(ERTS_ALC_T_OPEN_PORT_ENV, opts.envir);
+    erts_osenv_clear(&opts.envir);
     if (name_buf)
 	erts_free(ERTS_ALC_T_TMP, (void *) name_buf);
     if (opts.argv) {
@@ -977,6 +1010,45 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump)
     goto do_return;
 }
 
+/* Merges the the global environment and the given {Key, Value} list into env,
+ * unsetting all keys whose value is either 'false' or NIL. The behavior on
+ * NIL is undocumented and perhaps surprising, but the previous implementation
+ * worked in this manner. */
+static int merge_global_environment(erts_osenv_t *env, Eterm key_value_pairs) {
+    const erts_osenv_t *global_env = erts_sys_rlock_global_osenv();
+    erts_osenv_merge(env, global_env, 0);
+    erts_sys_runlock_global_osenv();
+
+    while (is_list(key_value_pairs)) {
+        Eterm *cell, *tuple;
+
+        cell = list_val(key_value_pairs);
+
+        if(!is_tuple_arity(CAR(cell), 2)) {
+            return -1;
+        }
+
+        tuple = tuple_val(CAR(cell));
+        key_value_pairs = CDR(cell);
+
+        if(is_nil(tuple[2]) || tuple[2] == am_false) {
+            if(erts_osenv_unset_term(env, tuple[1]) < 0) {
+                return -1;
+            }
+        } else {
+            if(erts_osenv_put_term(env, tuple[1], tuple[2]) < 0) {
+                return -1;
+            }
+        }
+    }
+
+    if(!is_nil(key_value_pairs)) {
+        return -1;
+    }
+
+    return 0;
+}
+
 /* Arguments can be given i unicode and as raw binaries, convert filename is used to convert */
 static char **convert_args(Eterm l)
 {
@@ -1024,130 +1096,6 @@ static void free_args(char **av)
     erts_free(ERTS_ALC_T_TMP, av);
 }
 
-#ifdef DEBUG
-#define ERTS_CONV_ENV_BUF_EXTRA 2
-#else
-#define ERTS_CONV_ENV_BUF_EXTRA 1024
-#endif
-
-static char* convert_environment(Eterm env)
-{
-    /*
-     * Returns environment buffer in memory allocated
-     * as ERTS_ALC_T_OPEN_PORT_ENV. Caller *needs*
-     * to deallocate...
-     */
-
-    Sint size, alloc_size;
-    byte* bytes;
-    int encoding = erts_get_native_filename_encoding();
-
-    alloc_size = ERTS_CONV_ENV_BUF_EXTRA;
-    bytes = erts_alloc(ERTS_ALC_T_OPEN_PORT_ENV,
-                       alloc_size);
-    size = 0;
-
-    /* ERTS_CONV_ENV_BUF_EXTRA >= for end delimiter... */
-    ERTS_CT_ASSERT(ERTS_CONV_ENV_BUF_EXTRA >= 2);
-
-    while (is_list(env)) {
-        Sint var_sz, val_sz, need;
-        byte *str, *limit;
-	Eterm tmp, *tp, *consp;
-
-        consp = list_val(env);
-	tmp = CAR(consp);
-	if (is_not_tuple_arity(tmp, 2))
-	    goto error;
-
-	tp = tuple_val(tmp);
-
-        /* Check encoding of env variable... */
-        if (is_not_list(tp[1]))
-            goto error;
-        var_sz = erts_native_filename_need(tp[1], encoding);
-        if (var_sz <= 0)
-            goto error;
-        /* Check encoding of value... */
-        if (tp[2] == am_false || is_nil(tp[2]))
-            val_sz = 0;
-        else if (is_not_list(tp[2]))
-            goto error;
-        else {
-            val_sz = erts_native_filename_need(tp[2], encoding);
-            if (val_sz < 0)
-                goto error;
-        }
-
-        /* Ensure enough memory... */
-        need = size;
-        need += var_sz + val_sz;
-        /* '=' and '\0' */
-        need += 2 * erts_raw_env_7bit_ascii_char_need(encoding);
-        if (need > alloc_size) {
-            alloc_size = (need - alloc_size) + alloc_size;
-            alloc_size += ERTS_CONV_ENV_BUF_EXTRA;
-            bytes = erts_realloc(ERTS_ALC_T_OPEN_PORT_ENV,
-                                 bytes, alloc_size);
-        }
-
-        /* Write environment variable name... */
-        str = bytes + size;
-        erts_native_filename_put(tp[1], encoding, str);
-        /* empty variable name is not allowed... */
-        if (erts_raw_env_char_is_7bit_ascii_char('\0', str, encoding))
-            goto error;
-
-        /*
-         * Drop null characters at the end and verify that we do
-         * not have any '=' characters in the name...
-         */
-        limit = str + var_sz;
-        while (str < limit) {
-            if (erts_raw_env_char_is_7bit_ascii_char('\0', str, encoding))
-                break;
-            if (erts_raw_env_char_is_7bit_ascii_char('=', str, encoding))
-                goto error;
-            str = erts_raw_env_next_char(str, encoding);
-        }
-
-        /* Write the equals sign... */
-        str = erts_raw_env_7bit_ascii_char_put('=', str, encoding);
-
-        /* Write the value... */
-        if (val_sz > 0) {
-            limit = str + val_sz;
-            erts_native_filename_put(tp[2], encoding, str);
-            while (str < limit) {
-                if (erts_raw_env_char_is_7bit_ascii_char('\0', str, encoding))
-                    break;
-                str = erts_raw_env_next_char(str, encoding);
-            }
-        }
-
-        /* Delimit... */
-        str = erts_raw_env_7bit_ascii_char_put('\0', str, encoding);
-
-        size = str - bytes;
-        ASSERT(size <= alloc_size);
-
-        env = CDR(consp);
-    }
-
-    /* End delimit... */
-    (void) erts_raw_env_7bit_ascii_char_put('\0', &bytes[size], encoding);
-
-    if (is_nil(env))
-        return (char *) bytes;
-
-error:
-
-    if (bytes)
-        erts_free(ERTS_ALC_T_OPEN_PORT_ENV, bytes);
-
-    return (char *) NULL; /* error... */
-}
-
 /* ------------ decode_packet() and friends: */
 
 struct packet_callback_args
@@ -1197,7 +1145,7 @@ http_bld_string(struct packet_callback_args* pca, Uint **hpp, Uint *szp,
 		ErlHeapBin* bin = (ErlHeapBin*) *hpp;
 		bin->thing_word = header_heap_bin(len);
 		bin->size = len;
-		memcpy(bin->data, str, len);
+		sys_memcpy(bin->data, str, len);
 		*hpp += size;
 	    }
 	}
@@ -1375,9 +1323,9 @@ int ssl_tls_erl(void* arg, unsigned type, unsigned major, unsigned minor,
     Eterm bin = new_binary(pca->p, NULL, plen+len);
     byte* bin_ptr = binary_bytes(bin);
 
-    memcpy(bin_ptr+plen, buf, len);
+    sys_memcpy(bin_ptr+plen, buf, len);
     if (plen) {
-        memcpy(bin_ptr, prefix, plen);
+        sys_memcpy(bin_ptr, prefix, plen);
     }
 
     /* {ssl_tls,NIL,ContentType,{Major,Minor},Bin} */
diff --git a/erts/emulator/beam/erl_bif_re.c b/erts/emulator/beam/erl_bif_re.c
index bc819505e7..4d769c2d46 100644
--- a/erts/emulator/beam/erl_bif_re.c
+++ b/erts/emulator/beam/erl_bif_re.c
@@ -514,7 +514,7 @@ re_version_0(BIF_ALIST_0)
     Eterm ret;
     size_t version_size = 0;
     byte *version = (byte *) erts_pcre_version();
-    version_size = strlen((const char *) version);
+    version_size = sys_strlen((const char *) version);
     ret = new_binary(BIF_P, version, version_size);
     BIF_RET(ret);
 }
@@ -998,7 +998,7 @@ build_capture(Eterm capture_spec[CAPSPEC_SIZE], const pcre *code)
 	    has_dupnames = ((options & PCRE_DUPNAMES) != 0);
 
 	    for(i=0;i<top;++i) {
-		if (last == NULL || !has_dupnames || strcmp((char *) last+2,(char *) nametable+2)) {
+		if (last == NULL || !has_dupnames || sys_strcmp((char *) last+2,(char *) nametable+2)) {
 		    ASSERT(ri->num_spec >= 0);
 		    ++(ri->num_spec);
 		    if(ri->num_spec > sallocated) {
@@ -1048,7 +1048,7 @@ build_capture(Eterm capture_spec[CAPSPEC_SIZE], const pcre *code)
 						    (tmpbsiz = ap->len + 1));
 			    }
 			}
-			memcpy(tmpb,ap->name,ap->len);
+			sys_memcpy(tmpb,ap->name,ap->len);
 			tmpb[ap->len] = '\0';
 		    } else {
 			ErlDrvSizeT slen;
@@ -1210,7 +1210,7 @@ re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
 	    erts_pcre_fullinfo(result, NULL, PCRE_INFO_CAPTURECOUNT, &capture_count);
 	    ovsize = 3*(capture_count+1);
 	    restart.code = erts_alloc(ERTS_ALC_T_RE_SUBJECT, code_size);
-	    memcpy(restart.code, result, code_size);
+	    sys_memcpy(restart.code, result, code_size);
 	    erts_pcre_free(result);
 	    erts_free(ERTS_ALC_T_RE_TMP_BUF, expr);
 	    /*unicode = (pflags & PARSE_FLAG_UNICODE) ? 1 : 0;*/
@@ -1252,7 +1252,7 @@ re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
 	    BIF_ERROR(p, BADARG);
 	}
 	restart.code = erts_alloc(ERTS_ALC_T_RE_SUBJECT, code_size);
-	memcpy(restart.code, code_tmp, code_size);
+	sys_memcpy(restart.code, code_tmp, code_size);
 	erts_free_aligned_binary_bytes(temp_alloc);
 
     }
@@ -1364,7 +1364,7 @@ handle_iolist:
 	RestartContext *restartp = ERTS_MAGIC_BIN_DATA(mbp);
 	Eterm magic_ref;
 	Eterm *hp;
-	memcpy(restartp,&restart,sizeof(RestartContext));
+	sys_memcpy(restartp,&restart,sizeof(RestartContext));
 	BUMP_ALL_REDS(p);
 	hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE);
 	magic_ref = erts_mk_magic_ref(&hp, &MSO(p), mbp);
@@ -1517,7 +1517,7 @@ re_inspect_2(BIF_ALIST_2)
     last = NULL;
     name = nametable;
     for(i=0;i<top;++i) {
-	if (last == NULL || !has_dupnames || strcmp((char *) last+2,
+	if (last == NULL || !has_dupnames || sys_strcmp((char *) last+2,
 						    (char *) name+2)) {
 	    ++num_names;
 	}
@@ -1531,9 +1531,9 @@ re_inspect_2(BIF_ALIST_2)
     name = nametable;
     j = 0;
     for(i=0;i<top;++i) {
-	if (last == NULL || !has_dupnames || strcmp((char *) last+2,
+	if (last == NULL || !has_dupnames || sys_strcmp((char *) last+2,
 						    (char *) name+2)) {
-	    tmp_vec[j++] = new_binary(BIF_P, (byte *) name+2, strlen((char *) name+2));
+	    tmp_vec[j++] = new_binary(BIF_P, (byte *) name+2, sys_strlen((char *) name+2));
 	}
 	last = name;
 	name += entrysize;
diff --git a/erts/emulator/beam/erl_bif_unique.h b/erts/emulator/beam/erl_bif_unique.h
index 9aa631fde9..6af9d4ac8c 100644
--- a/erts/emulator/beam/erl_bif_unique.h
+++ b/erts/emulator/beam/erl_bif_unique.h
@@ -307,7 +307,7 @@ erts_iref_storage_clean(ErtsIRefStorage *iref)
     if (iref->is_magic && erts_refc_dectest(&iref->u.mb->intern.refc, 0) == 0)
 	erts_ref_bin_free(iref->u.mb);
 #ifdef DEBUG
-    memset((void *) iref, 0xf, sizeof(ErtsIRefStorage));
+    sys_memset((void *) iref, 0xf, sizeof(ErtsIRefStorage));
 #endif
 }
 
@@ -342,7 +342,7 @@ erts_iref_storage_make_ref(ErtsIRefStorage *iref,
 
 #ifdef DEBUG
     if (clean_storage)
-	memset((void *) iref, 0xf, sizeof(ErtsIRefStorage));
+	sys_memset((void *) iref, 0xf, sizeof(ErtsIRefStorage));
 #endif
 
     return make_internal_ref(hp);
diff --git a/erts/emulator/beam/erl_binary.h b/erts/emulator/beam/erl_binary.h
index 05007e864e..46653a8580 100644
--- a/erts/emulator/beam/erl_binary.h
+++ b/erts/emulator/beam/erl_binary.h
@@ -363,8 +363,6 @@ erts_free_aligned_binary_bytes(byte* buf)
 #  define CHICKEN_PAD (sizeof(void*) - 1)
 #endif
 
-/* Caller must initialize 'refc'
-*/
 ERTS_GLB_INLINE Binary *
 erts_bin_drv_alloc_fnf(Uint size)
 {
@@ -383,8 +381,6 @@ erts_bin_drv_alloc_fnf(Uint size)
     return res;
 }
 
-/* Caller must initialize 'refc'
-*/
 ERTS_GLB_INLINE Binary *
 erts_bin_drv_alloc(Uint size)
 {
@@ -401,9 +397,6 @@ erts_bin_drv_alloc(Uint size)
     return res;
 }
 
-
-/* Caller must initialize 'refc'
-*/
 ERTS_GLB_INLINE Binary *
 erts_bin_nrml_alloc(Uint size)
 {
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index 3ba0886464..a76d769283 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -1753,6 +1753,28 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
     BIF_RET(ret);
 }
 
+/*
+** Retrieves the tid() of a named ets table.
+*/
+BIF_RETTYPE ets_whereis_1(BIF_ALIST_1)
+{
+    DbTable* tb;
+    Eterm res;
+
+    if (is_not_atom(BIF_ARG_1)) {
+        BIF_ERROR(BIF_P, BADARG);
+    }
+
+    if ((tb = db_get_table(BIF_P, BIF_ARG_1, DB_INFO, LCK_READ)) == NULL) {
+        BIF_RET(am_undefined);
+    }
+
+    res = make_tid(BIF_P, tb);
+    db_unlock(tb, LCK_READ);
+
+    BIF_RET(res);
+}
+
 /* 
 ** The lookup BIF 
 */
@@ -3126,7 +3148,8 @@ BIF_RETTYPE ets_info_1(BIF_ALIST_1)
     static Eterm fields[] = {am_protection, am_keypos, am_type, am_named_table,
                              am_node, am_size, am_name, am_heir, am_owner, am_memory, am_compressed,
                              am_write_concurrency,
-                             am_read_concurrency};
+                             am_read_concurrency,
+                             am_id};
     Eterm results[sizeof(fields)/sizeof(Eterm)];
     DbTable* tb;
     Eterm res;
@@ -4016,7 +4039,10 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 	ret = is_table_named(tb) ? am_true : am_false;
     } else if (What == am_compressed) {
 	ret = tb->common.compress ? am_true : am_false;
+    } else if (What == am_id) {
+        ret = make_tid(p, tb);
     }
+
     /*
      * For debugging purposes
      */
@@ -4235,7 +4261,7 @@ erts_ets_colliding_names(Process* p, Eterm name, Uint cnt)
             while (index >= atom_table_size()) {
                 char tmp[20];
                 erts_snprintf(tmp, sizeof(tmp), "am%x", atom_table_size());
-                erts_atom_put((byte *) tmp, strlen(tmp), ERTS_ATOM_ENC_LATIN1, 1);
+                erts_atom_put((byte *) tmp, sys_strlen(tmp), ERTS_ATOM_ENC_LATIN1, 1);
             }
             list = CONS(hp, make_atom(index), list);
             hp += 2;
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index e017b9552b..956662aefa 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -91,7 +91,7 @@ do {									\
 	(On).siz *= 2;							\
 	(On).data							\
 	    = (((On).def == (On).data)					\
-	       ? memcpy(erts_alloc(ERTS_ALC_T_DB_MC_STK,		\
+	       ? sys_memcpy(erts_alloc(ERTS_ALC_T_DB_MC_STK,		\
 				   (On).siz*sizeof(*((On).data))),	\
 			(On).def,					\
 			DMC_DEFAULT_SIZE*sizeof(*((On).data)))		\
@@ -1518,7 +1518,7 @@ restart:
 	 context.current_match < num_progs; 
 	 ++context.current_match) { /* This loop is long, 
 				       too long */
-	memset(heap.vars, 0, heap.size * sizeof(*heap.vars));
+	sys_memset(heap.vars, 0, heap.size * sizeof(*heap.vars));
 	t = context.matchexpr[context.current_match];
 	context.stack_used = 0;
 	structure_checked = 0;
@@ -2140,7 +2140,7 @@ restart:
 	case matchEqFloat:
 	    if (!is_float(*ep))
 		FAIL();
-	    if (memcmp(float_val(*ep) + 1, pc, sizeof(double)))
+	    if (sys_memcmp(float_val(*ep) + 1, pc, sizeof(double)))
 		FAIL();
 	    pc += TermWords(2);
 	    ++ep;
@@ -2742,8 +2742,8 @@ Eterm db_format_dmc_err_info(Process *p, DMCErrInfo *ei)
 	if (vnum >= 0)
 	    erts_snprintf(buff,sizeof(buff)+20,tmp->error_string, vnum);
 	else
-	    strcpy(buff,tmp->error_string);
-	sl = strlen(buff);
+	    sys_strcpy(buff,tmp->error_string);
+	sl = sys_strlen(buff);
 	shp = HAlloc(p, sl * 2 + 5);
 	sev = (tmp->severity == dmcWarning) ? 
 	    am_atom_put("warning",7) :
@@ -5044,7 +5044,7 @@ static int match_compact(ErlHeapFragment *expr, DMCErrInfo *err_info)
 	    ASSERT(j < x);
 	    erts_snprintf(buff+1, sizeof(buff) - 1, "%u", (unsigned) j);
 	    /* Yes, writing directly into terms, they ARE off heap */
-	    *p = erts_atom_put((byte *) buff, strlen(buff),
+	    *p = erts_atom_put((byte *) buff, sys_strlen(buff),
 			       ERTS_ATOM_ENC_LATIN1, 1);
 	}
 	++p;
@@ -5505,7 +5505,7 @@ void db_match_dis(Binary *bp)
 	    ++t;
 	    {
 		double num;
-		memcpy(&num,t,sizeof(double));
+		sys_memcpy(&num,t,sizeof(double));
 		t += TermWords(2);
 		erts_printf("EqFloat\t%f\n", num);
 	    }
diff --git a/erts/emulator/beam/erl_drv_thread.c b/erts/emulator/beam/erl_drv_thread.c
index 71d4534ef9..4cf42fce57 100644
--- a/erts/emulator/beam/erl_drv_thread.c
+++ b/erts/emulator/beam/erl_drv_thread.c
@@ -439,7 +439,7 @@ erl_drv_tsd_key_create(char *name, ErlDrvTSDKey *key)
 	name_copy = no_name;
     else {
 	name_copy = erts_alloc_fnf(ERTS_ALC_T_DRV_TSD,
-				   sizeof(char)*(strlen(name) + 1));
+				   sizeof(char)*(sys_strlen(name) + 1));
 	if (!name_copy) {
 	    *key = -1;
 	    return ENOMEM;
@@ -750,7 +750,7 @@ erl_drv_steal_main_thread(char *name,
 			   + (name ? sys_strlen(name) + 1 : 0)));
     if (!dtid)
 	return ENOMEM;
-    memset(dtid,0,sizeof(ErlDrvTid_));
+    sys_memset(dtid,0,sizeof(ErlDrvTid_));
     dtid->tid = (void * ) -1;
     dtid->drv_thr = 1;
     dtid->func = func;
@@ -763,8 +763,8 @@ erl_drv_steal_main_thread(char *name,
     *tid = NULL;
     /* Ignore options and name... */
     
-    memcpy(buff,&func,sizeof(void* (*)(void*)));
-    memcpy(buff + sizeof(void* (*)(void*)),&arg,sizeof(void *));
+    sys_memcpy(buff,&func,sizeof(void* (*)(void*)));
+    sys_memcpy(buff + sizeof(void* (*)(void*)),&arg,sizeof(void *));
     write(erts_darwin_main_thread_pipe[1],buff,buff_sz);
     return 0;
 }
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index 97a1ca915f..1c64644efc 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -116,6 +116,7 @@ typedef struct {
 static Uint setup_rootset(Process*, Eterm*, int, Rootset*);
 static void cleanup_rootset(Rootset *rootset);
 static Eterm *full_sweep_heaps(Process *p,
+                               ErlHeapFragment *live_hf_end,
 			       int hibernate,
 			       Eterm *n_heap, Eterm* n_htop,
 			       char *oh, Uint oh_size,
@@ -142,7 +143,7 @@ static Eterm* sweep_literal_area(Eterm* n_hp, Eterm* n_htop,
 static Eterm* sweep_literals_to_old_heap(Eterm* heap_ptr, Eterm* heap_end, Eterm* htop,
 					 char* src, Uint src_size);
 static Eterm* collect_live_heap_frags(Process* p, ErlHeapFragment *live_hf_end,
-				      Eterm* heap, Eterm* htop, Eterm* objv, int nobj);
+				      Eterm* htop);
 static int adjust_after_fullsweep(Process *p, int need, Eterm *objv, int nobj);
 static void shrink_new_heap(Process *p, Uint new_sz, Eterm *objv, int nobj);
 static void grow_new_heap(Process *p, Uint new_sz, Eterm* objv, int nobj);
@@ -917,6 +918,7 @@ garbage_collect_hibernate(Process* p, int check_long_gc)
     htop = heap;
 
     htop = full_sweep_heaps(p,
+                            ERTS_INVALID_HFRAG_PTR,
 			    1,
 			    heap,
 			    htop,
@@ -1161,7 +1163,7 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
 
 	roots++;
 
-        while (g_sz--) {
+        for ( ; g_sz--; g_ptr++) {
             Eterm gval = *g_ptr;
 
             switch (primary_tag(gval)) {
@@ -1170,26 +1172,21 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
 		val = *ptr;
                 if (IS_MOVED_BOXED(val)) {
 		    ASSERT(is_boxed(val));
-                    *g_ptr++ = val;
+                    *g_ptr = val;
 		} else if (ErtsInArea(ptr, area, area_size)) {
-                    move_boxed(&ptr,val,&old_htop,g_ptr++);
-		} else {
-		    g_ptr++;
+                    move_boxed(ptr,val,&old_htop,g_ptr);
 		}
 		break;
 	    case TAG_PRIMARY_LIST:
                 ptr = list_val(gval);
                 val = *ptr;
                 if (IS_MOVED_CONS(val)) { /* Moved */
-                    *g_ptr++ = ptr[1];
+                    *g_ptr = ptr[1];
 		} else if (ErtsInArea(ptr, area, area_size)) {
-                    move_cons(&ptr,val,&old_htop,g_ptr++);
-                } else {
-		    g_ptr++;
-		}
+                    move_cons(ptr,val,&old_htop,g_ptr);
+                }
 		break;
 	    default:
-                g_ptr++;
 		break;
 	    }
 	}
@@ -1210,8 +1207,8 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
     p->old_htop = old_htop;
 
     /*
-     * Prepare to sweep binaries. Since all MSOs on the new heap
-     * must be come before MSOs on the old heap, find the end of
+     * Prepare to sweep off-heap objects. Since all MSOs on the new
+     * heap must be come before MSOs on the old heap, find the end of
      * current MSO list and use that as a starting point.
      */
 
@@ -1223,25 +1220,50 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
     }
 
     /*
-     * Sweep through all binaries in the temporary literal area.
+     * Sweep through all off-heap objects in the temporary literal area.
      */
 
     while (oh) {
 	if (IS_MOVED_BOXED(oh->thing_word)) {
-	    Binary* bptr;
 	    struct erl_off_heap_header* ptr;
 
-	    ptr = (struct erl_off_heap_header*) boxed_val(oh->thing_word);
-	    ASSERT(thing_subtag(ptr->thing_word) == REFC_BINARY_SUBTAG);
-	    bptr = ((ProcBin*)ptr)->val;
-
-	    /*
-	     * This binary has been copied to the heap.
+            /*
+	     * This off-heap object has been copied to the heap.
 	     * We must increment its reference count and
 	     * link it into the MSO list for the process.
 	     */
 
-	    erts_refc_inc(&bptr->intern.refc, 1);
+	    ptr = (struct erl_off_heap_header*) boxed_val(oh->thing_word);
+            switch (thing_subtag(ptr->thing_word)) {
+            case REFC_BINARY_SUBTAG:
+                {
+                    Binary* bptr = ((ProcBin*)ptr)->val;
+                    erts_refc_inc(&bptr->intern.refc, 1);
+                    break;
+                }
+            case FUN_SUBTAG:
+                {
+                    ErlFunEntry* fe = ((ErlFunThing*)ptr)->fe;
+                    erts_refc_inc(&fe->refc, 1);
+                    break;
+                }
+            case REF_SUBTAG:
+                {
+                    ErtsMagicBinary *bptr;
+                    ASSERT(is_magic_ref_thing(ptr));
+                    bptr = ((ErtsMRefThing *) ptr)->mb;
+                    erts_refc_inc(&bptr->intern.refc, 1);
+                    break;
+                }
+            default:
+                {
+                    ExternalThing *etp;
+                    ASSERT(is_external_header(ptr->thing_word));
+                    etp = (ExternalThing *) ptr;
+                    erts_refc_inc(&etp->node->refc, 1);
+                    break;
+                }
+            }
 	    *prev = ptr;
 	    prev = &ptr->next;
 	}
@@ -1454,25 +1476,29 @@ do_minor(Process *p, ErlHeapFragment *live_hf_end,
     n_htop = n_heap = (Eterm*) ERTS_HEAP_ALLOC(ERTS_ALC_T_HEAP,
 					       sizeof(Eterm)*new_sz);
 
+    n = setup_rootset(p, objv, nobj, &rootset);
+    roots = rootset.roots;
+
+    /*
+     * All allocations done. Start defile heap with move markers.
+     * A crash dump due to allocation failure above will see a healthy heap.
+     */
+
     if (live_hf_end != ERTS_INVALID_HFRAG_PTR) {
 	/*
 	 * Move heap frags that we know are completely live
 	 * directly into the new young heap generation.
 	 */
-	n_htop = collect_live_heap_frags(p, live_hf_end, n_heap, n_htop,
-					 objv, nobj);
+	n_htop = collect_live_heap_frags(p, live_hf_end, n_htop);
     }
 
-    n = setup_rootset(p, objv, nobj, &rootset);
-    roots = rootset.roots;
-
     GENSWEEP_NSTACK(p, old_htop, n_htop);
     while (n--) {
         Eterm* g_ptr = roots->v;
         Uint g_sz = roots->sz;
 
 	roots++;
-        while (g_sz--) {
+        for ( ; g_sz--; g_ptr++) {
             gval = *g_ptr;
 
             switch (primary_tag(gval)) {
@@ -1482,14 +1508,12 @@ do_minor(Process *p, ErlHeapFragment *live_hf_end,
                 val = *ptr;
                 if (IS_MOVED_BOXED(val)) {
 		    ASSERT(is_boxed(val));
-                    *g_ptr++ = val;
+                    *g_ptr = val;
                 } else if (ErtsInArea(ptr, mature, mature_size)) {
-                    move_boxed(&ptr,val,&old_htop,g_ptr++);
+                    move_boxed(ptr,val,&old_htop,g_ptr);
                 } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
-                    move_boxed(&ptr,val,&n_htop,g_ptr++);
-                } else {
-		    g_ptr++;
-		}
+                    move_boxed(ptr,val,&n_htop,g_ptr);
+                }
                 break;
 	    }
 
@@ -1497,19 +1521,15 @@ do_minor(Process *p, ErlHeapFragment *live_hf_end,
                 ptr = list_val(gval);
                 val = *ptr;
                 if (IS_MOVED_CONS(val)) { /* Moved */
-                    *g_ptr++ = ptr[1];
+                    *g_ptr = ptr[1];
                 } else if (ErtsInArea(ptr, mature, mature_size)) {
-                    move_cons(&ptr,val,&old_htop,g_ptr++);
+                    move_cons(ptr,val,&old_htop,g_ptr);
                 } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
-                    move_cons(&ptr,val,&n_htop,g_ptr++);
-                } else {
-		    g_ptr++;
-		}
+                    move_cons(ptr,val,&n_htop,g_ptr);
+                }
 		break;
 	    }
-
 	    default:
-                g_ptr++;
 		break;
             }
         }
@@ -1543,9 +1563,9 @@ do_minor(Process *p, ErlHeapFragment *live_hf_end,
 		    ASSERT(is_boxed(val));
 		    *n_hp++ = val;
 		} else if (ErtsInArea(ptr, mature, mature_size)) {
-		    move_boxed(&ptr,val,&old_htop,n_hp++);
+		    move_boxed(ptr,val,&old_htop,n_hp++);
 		} else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
-		    move_boxed(&ptr,val,&n_htop,n_hp++);
+		    move_boxed(ptr,val,&n_htop,n_hp++);
 		} else {
 		    n_hp++;
 		}
@@ -1557,9 +1577,9 @@ do_minor(Process *p, ErlHeapFragment *live_hf_end,
 		if (IS_MOVED_CONS(val)) {
 		    *n_hp++ = ptr[1];
 		} else if (ErtsInArea(ptr, mature, mature_size)) {
-		    move_cons(&ptr,val,&old_htop,n_hp++);
+		    move_cons(ptr,val,&old_htop,n_hp++);
 		} else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
-		    move_cons(&ptr,val,&n_htop,n_hp++);
+		    move_cons(ptr,val,&n_htop,n_hp++);
 		} else {
 		    n_hp++;
 		}
@@ -1579,10 +1599,10 @@ do_minor(Process *p, ErlHeapFragment *live_hf_end,
 			    *origptr = val;
 			    mb->base = binary_bytes(val);
 			} else if (ErtsInArea(ptr, mature, mature_size)) {
-			    move_boxed(&ptr,val,&old_htop,origptr);
+			    move_boxed(ptr,val,&old_htop,origptr);
 			    mb->base = binary_bytes(mb->orig);
 			} else if (ErtsInYoungGen(*origptr, ptr, oh, oh_size)) {
-			    move_boxed(&ptr,val,&n_htop,origptr);
+			    move_boxed(ptr,val,&n_htop,origptr);
 			    mb->base = binary_bytes(mb->orig);
 			}
 		    }
@@ -1708,16 +1728,8 @@ major_collection(Process* p, ErlHeapFragment *live_hf_end,
     n_htop = n_heap = (Eterm *) ERTS_HEAP_ALLOC(ERTS_ALC_T_HEAP,
 						sizeof(Eterm)*new_sz);
 
-    if (live_hf_end != ERTS_INVALID_HFRAG_PTR) {
-	/*
-	 * Move heap frags that we know are completely live
-	 * directly into the heap.
-	 */
-	n_htop = collect_live_heap_frags(p, live_hf_end, n_heap, n_htop,
-					 objv, nobj);
-    }
-
-    n_htop = full_sweep_heaps(p, 0, n_heap, n_htop, oh, oh_size, objv, nobj);
+    n_htop = full_sweep_heaps(p, live_hf_end, 0, n_heap, n_htop, oh, oh_size,
+                              objv, nobj);
 
     /* Move the stack to the end of the heap */
     stk_sz = HEAP_END(p) - p->stop;
@@ -1764,6 +1776,7 @@ major_collection(Process* p, ErlHeapFragment *live_hf_end,
 
 static Eterm *
 full_sweep_heaps(Process *p,
+                 ErlHeapFragment *live_hf_end,
 		 int hibernate,
 		 Eterm *n_heap, Eterm* n_htop,
 		 char *oh, Uint oh_size,
@@ -1780,6 +1793,19 @@ full_sweep_heaps(Process *p,
 
     n = setup_rootset(p, objv, nobj, &rootset);
 
+    /*
+     * All allocations done. Start defile heap with move markers.
+     * A crash dump due to allocation failure above will see a healthy heap.
+     */
+
+    if (live_hf_end != ERTS_INVALID_HFRAG_PTR) {
+        /*
+         * Move heap frags that we know are completely live
+         * directly into the heap.
+         */
+        n_htop = collect_live_heap_frags(p, live_hf_end, n_htop);
+    }
+
 #ifdef HIPE
     if (hibernate)
 	hipe_empty_nstack(p);
@@ -1793,7 +1819,7 @@ full_sweep_heaps(Process *p,
 	Eterm g_sz = roots->sz;
 
 	roots++;
-	while (g_sz--) {
+	for ( ; g_sz--; g_ptr++) {
 	    Eterm* ptr;
 	    Eterm val;
 	    Eterm gval = *g_ptr;
@@ -1805,32 +1831,26 @@ full_sweep_heaps(Process *p,
 		val = *ptr;
 		if (IS_MOVED_BOXED(val)) {
 		    ASSERT(is_boxed(val));
-		    *g_ptr++ = val;
+		    *g_ptr = val;
 		} else if (!erts_is_literal(gval, ptr)) {
-		    move_boxed(&ptr,val,&n_htop,g_ptr++);
-		} else {
-		    g_ptr++;
+		    move_boxed(ptr,val,&n_htop,g_ptr);
 		}
-		continue;
+                break;
 	    }
 
 	    case TAG_PRIMARY_LIST: {
 		ptr = list_val(gval);
 		val = *ptr;
 		if (IS_MOVED_CONS(val)) {
-		    *g_ptr++ = ptr[1];
+		    *g_ptr = ptr[1];
 		} else if (!erts_is_literal(gval, ptr)) {
-		    move_cons(&ptr,val,&n_htop,g_ptr++);
-		} else {
-		    g_ptr++;
+		    move_cons(ptr,val,&n_htop,g_ptr);
 		}
-		continue;
+                break;
 	    }
 
-	    default: {
-		g_ptr++;
-		continue;
-	    }
+            default:
+                break;
 	    }
 	}
     }
@@ -2109,7 +2129,7 @@ sweep(Eterm *n_hp, Eterm *n_htop,
 		ASSERT(is_boxed(val));
 		*n_hp++ = val;
 	    } else if (ERTS_IS_IN_SWEEP_AREA(gval, ptr)) {
-		move_boxed(&ptr,val,&n_htop,n_hp++);
+		move_boxed(ptr,val,&n_htop,n_hp++);
 	    } else {
 		n_hp++;
 	    }
@@ -2121,7 +2141,7 @@ sweep(Eterm *n_hp, Eterm *n_htop,
 	    if (IS_MOVED_CONS(val)) {
 		*n_hp++ = ptr[1];
 	    } else if (ERTS_IS_IN_SWEEP_AREA(gval, ptr)) {
-		move_cons(&ptr,val,&n_htop,n_hp++);
+		move_cons(ptr,val,&n_htop,n_hp++);
 	    } else {
 		n_hp++;
 	    }
@@ -2142,7 +2162,7 @@ sweep(Eterm *n_hp, Eterm *n_htop,
 			*origptr = val;
 			mb->base = binary_bytes(*origptr);
 		    } else if (ERTS_IS_IN_SWEEP_AREA(*origptr, ptr)) {
-			move_boxed(&ptr,val,&n_htop,origptr);
+			move_boxed(ptr,val,&n_htop,origptr);
 			mb->base = binary_bytes(*origptr);
 		    }
 		}
@@ -2205,7 +2225,7 @@ sweep_literals_to_old_heap(Eterm* heap_ptr, Eterm* heap_end, Eterm* htop,
 		ASSERT(is_boxed(val));
 		*heap_ptr++ = val;
 	    } else if (ErtsInArea(ptr, src, src_size)) {
-		move_boxed(&ptr,val,&htop,heap_ptr++);
+		move_boxed(ptr,val,&htop,heap_ptr++);
 	    } else {
 		heap_ptr++;
 	    }
@@ -2217,7 +2237,7 @@ sweep_literals_to_old_heap(Eterm* heap_ptr, Eterm* heap_end, Eterm* htop,
 	    if (IS_MOVED_CONS(val)) {
 		*heap_ptr++ = ptr[1];
 	    } else if (ErtsInArea(ptr, src, src_size)) {
-		move_cons(&ptr,val,&htop,heap_ptr++);
+		move_cons(ptr,val,&htop,heap_ptr++);
 	    } else {
 		heap_ptr++;
 	    }
@@ -2238,7 +2258,7 @@ sweep_literals_to_old_heap(Eterm* heap_ptr, Eterm* heap_end, Eterm* htop,
 			*origptr = val;
 			mb->base = binary_bytes(*origptr);
 		    } else if (ErtsInArea(ptr, src, src_size)) {
-			move_boxed(&ptr,val,&htop,origptr);
+			move_boxed(ptr,val,&htop,origptr);
 			mb->base = binary_bytes(*origptr);
 		    }
 		}
@@ -2271,11 +2291,11 @@ move_one_area(Eterm* n_htop, char* src, Uint src_size)
 	ASSERT(val != ERTS_HOLE_MARKER);
 	if (is_header(val)) {
 	    ASSERT(ptr + header_arity(val) < end);
-	    move_boxed(&ptr, val, &n_htop, &dummy_ref);
+	    ptr = move_boxed(ptr, val, &n_htop, &dummy_ref);
 	}
 	else { /* must be a cons cell */
 	    ASSERT(ptr+1 < end);
-	    move_cons(&ptr, val, &n_htop, &dummy_ref);
+	    move_cons(ptr, val, &n_htop, &dummy_ref);
 	    ptr += 2;
 	}
     }
@@ -2288,9 +2308,7 @@ move_one_area(Eterm* n_htop, char* src, Uint src_size)
  */
 
 static Eterm*
-collect_live_heap_frags(Process* p, ErlHeapFragment *live_hf_end,
-			Eterm* n_hstart, Eterm* n_htop,
-			Eterm* objv, int nobj)
+collect_live_heap_frags(Process* p, ErlHeapFragment *live_hf_end, Eterm* n_htop)
 {
     ErlHeapFragment* qb;
     char* frag_begin;
@@ -3256,8 +3274,7 @@ reply_gc_info(void *vgcirp)
 	gcireq_free(vgcirp);
 }
 
-void erts_sub_binary_to_heap_binary(Eterm **pp, Eterm **hpp, Eterm *orig) {
-    Eterm *ptr = *pp;
+Eterm* erts_sub_binary_to_heap_binary(Eterm *ptr, Eterm **hpp, Eterm *orig) {
     Eterm *htop = *hpp;
     Eterm gval;
     ErlSubBin *sb = (ErlSubBin *)ptr;
@@ -3285,7 +3302,7 @@ void erts_sub_binary_to_heap_binary(Eterm **pp, Eterm **hpp, Eterm *orig) {
     htop += heap_bin_size(sb->size);
 
     *hpp = htop;
-    *pp  = ptr;
+    return ptr;
 }
 
 
diff --git a/erts/emulator/beam/erl_gc.h b/erts/emulator/beam/erl_gc.h
index 6a529b8443..dec0ab1143 100644
--- a/erts/emulator/beam/erl_gc.h
+++ b/erts/emulator/beam/erl_gc.h
@@ -33,14 +33,15 @@
 
 #define IS_MOVED_BOXED(x)	(!is_header((x)))
 #define IS_MOVED_CONS(x)	(is_non_value((x)))
-void erts_sub_binary_to_heap_binary(Eterm **pp, Eterm **hpp, Eterm *orig);
+Eterm* erts_sub_binary_to_heap_binary(Eterm *ptr, Eterm **hpp, Eterm *orig);
 
-ERTS_GLB_INLINE void move_cons(Eterm **pp, Eterm car, Eterm **hpp, Eterm *orig);
+ERTS_GLB_INLINE void move_cons(Eterm *ERTS_RESTRICT ptr, Eterm car, Eterm **hpp,
+                               Eterm *orig);
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
-ERTS_GLB_INLINE void move_cons(Eterm **pp, Eterm car, Eterm **hpp, Eterm *orig)
+ERTS_GLB_INLINE void move_cons(Eterm *ERTS_RESTRICT ptr, Eterm car, Eterm **hpp,
+                               Eterm *orig)
 {
-    Eterm *ptr  = *pp;
-    Eterm *htop = *hpp;
+    Eterm *ERTS_RESTRICT htop = *hpp;
     Eterm gval;
 
     htop[0] = car;               /* copy car */
@@ -53,14 +54,15 @@ ERTS_GLB_INLINE void move_cons(Eterm **pp, Eterm car, Eterm **hpp, Eterm *orig)
 }
 #endif
 
-ERTS_GLB_INLINE void move_boxed(Eterm **pp, Eterm hdr, Eterm **hpp, Eterm *orig);
+ERTS_GLB_INLINE Eterm* move_boxed(Eterm *ERTS_RESTRICT ptr, Eterm hdr, Eterm **hpp,
+                                  Eterm *orig);
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
-ERTS_GLB_INLINE void move_boxed(Eterm **pp, Eterm hdr, Eterm **hpp, Eterm *orig)
+ERTS_GLB_INLINE Eterm* move_boxed(Eterm *ERTS_RESTRICT ptr, Eterm hdr, Eterm **hpp,
+                                  Eterm *orig)
 {
     Eterm gval;
     Sint nelts;
-    Eterm *ptr = *pp;
-    Eterm *htop = *hpp;
+    Eterm *ERTS_RESTRICT htop = *hpp;
 
     ASSERT(is_header(hdr));
     nelts = header_arity(hdr);
@@ -71,8 +73,7 @@ ERTS_GLB_INLINE void move_boxed(Eterm **pp, Eterm hdr, Eterm **hpp, Eterm *orig)
             /* convert sub-binary to heap-binary if applicable */
             if (sb->bitsize == 0 && sb->bitoffs == 0 &&
                 sb->is_writable == 0 && sb->size <= sizeof(Eterm) * 3) {
-                erts_sub_binary_to_heap_binary(pp, hpp, orig);
-                return;
+                return erts_sub_binary_to_heap_binary(ptr, hpp, orig);
             }
         }
         nelts++;
@@ -90,7 +91,7 @@ ERTS_GLB_INLINE void move_boxed(Eterm **pp, Eterm hdr, Eterm **hpp, Eterm *orig)
     while (nelts--) *htop++ = *ptr++;
 
     *hpp = htop;
-    *pp  = ptr;
+    return ptr;
 }
 #endif
 
diff --git a/erts/emulator/beam/erl_goodfit_alloc.c b/erts/emulator/beam/erl_goodfit_alloc.c
index 50aa41b4d2..e3ba67f0af 100644
--- a/erts/emulator/beam/erl_goodfit_alloc.c
+++ b/erts/emulator/beam/erl_goodfit_alloc.c
@@ -170,6 +170,7 @@ static void		unlink_free_block	(Allctr_t *, Block_t *);
 static void		update_last_aux_mbc	(Allctr_t *, Carrier_t *);
 static Eterm		info_options		(Allctr_t *, char *, fmtfn_t *,
 						 void *, Uint **, Uint *);
+static int        gfalc_try_set_dyn_param(Allctr_t*, Eterm param, Uint value);
 static void		init_atoms		(void);
 
 #ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
@@ -250,6 +251,8 @@ erts_gfalc_start(GFAllctr_t *gfallctr,
     if (!erts_alcu_start(allctr, init))
 	return NULL;
 
+    allctr->try_set_dyn_param = gfalc_try_set_dyn_param;
+
     if (allctr->min_block_size != MIN_BLK_SZ)
 	return NULL;
 
@@ -505,7 +508,7 @@ static struct {
 
 static void ERTS_INLINE atom_init(Eterm *atom, char *name)
 {
-    *atom = am_atom_put(name, strlen(name));
+    *atom = am_atom_put(name, sys_strlen(name));
 }
 #define AM_INIT(AM) atom_init(&am.AM, #AM)
 
@@ -584,6 +587,15 @@ info_options(Allctr_t *allctr,
     return res;
 }
 
+static int gfalc_try_set_dyn_param(Allctr_t* allctr, Eterm param, Uint value)
+{
+    if (param == am_sbct) {
+        /* Cannot change 'sbct' without rearranging buckets */
+        return 0;
+    }
+    return erts_alcu_try_set_dyn_param(allctr, param, value);
+}
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
  * NOTE:  erts_gfalc_test() is only supposed to be used for testing.         *
  *                                                                           *
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 6cef9bd0e3..8430a5559b 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -50,7 +50,7 @@
 #define ERTS_WANT_TIMER_WHEEL_API
 #include "erl_time.h"
 #include "erl_check_io.h"
-
+#include "erl_osenv.h"
 #ifdef HIPE
 #include "hipe_mode_switch.h"	/* for hipe_mode_switch_init() */
 #include "hipe_signal.h"	/* for hipe_signal_init() */
@@ -155,9 +155,6 @@ erts_atomic32_t erts_writing_erl_crash_dump;
 erts_tsd_key_t erts_is_crash_dumping_key;
 int erts_initialized = 0;
 
-
-int erts_use_sender_punish;
-
 /*
  * Configurable parameters.
  */
@@ -241,7 +238,7 @@ progname(char *fullname)
 {
     int i;
     
-    i = strlen(fullname);
+    i = sys_strlen(fullname);
     while (i >= 0) {
 	if ((fullname[i] != '/') && (fullname[i] != '\\')) 
 	    i--;
@@ -758,8 +755,6 @@ early_init(int *argc, char **argv) /*
 
     erts_initialized = 0;
 
-    erts_use_sender_punish = 1;
-
     erts_pre_early_init_cpu_topology(&max_reader_groups,
 				     &ncpu,
 				     &ncpuonln,
@@ -803,8 +798,9 @@ early_init(int *argc, char **argv) /*
 
     envbufsz = sizeof(envbuf);
 
-    /* erts_sys_getenv(_raw)() not initialized yet; need erts_sys_getenv__() */
-    if (erts_sys_getenv__("ERL_THREAD_POOL_SIZE", envbuf, &envbufsz) == 0)
+    /* erts_osenv hasn't been initialized yet, so we need to fall back to
+     * erts_sys_explicit_host_getenv() */
+    if (erts_sys_explicit_host_getenv("ERL_THREAD_POOL_SIZE", envbuf, &envbufsz) == 1)
 	erts_async_max_threads = atoi(envbuf);
     else
 	erts_async_max_threads = ERTS_DEFAULT_NO_ASYNC_THREADS;
@@ -814,7 +810,7 @@ early_init(int *argc, char **argv) /*
     if (argc && argv) {
 	int i = 1;
 	while (i < *argc) {
-	    if (strcmp(argv[i], "--") == 0) { /* end of emulator options */
+	    if (sys_strcmp(argv[i], "--") == 0) { /* end of emulator options */
 		i++;
 		break;
 	    }
@@ -896,7 +892,7 @@ early_init(int *argc, char **argv) /*
 		    else if (argv[i][2] == 'D') {
 			char *arg;
 			char *type = argv[i]+3;
-			if (strncmp(type, "Pcpu", 4) == 0) {
+			if (sys_strncmp(type, "Pcpu", 4) == 0) {
 			    int ptot, ponln;
 			    arg = get_arg(argv[i]+7, argv[i+1], &i);
 			    switch (sscanf(arg, "%d:%d", &ptot, &ponln)) {
@@ -933,7 +929,7 @@ early_init(int *argc, char **argv) /*
 			    VERBOSE(DEBUG_SYSTEM,
 				    ("using %d:%d dirty CPU scheduler percentages\n",
 				     dirty_cpu_scheds_pctg, dirty_cpu_scheds_onln_pctg));
-			} else if (strncmp(type, "cpu", 3) == 0) {
+			} else if (sys_strncmp(type, "cpu", 3) == 0) {
 			    int tot, onln;
 			    arg = get_arg(argv[i]+6, argv[i+1], &i);
 			    switch (sscanf(arg, "%d:%d", &tot, &onln)) {
@@ -984,7 +980,7 @@ early_init(int *argc, char **argv) /*
 			    }
 			    VERBOSE(DEBUG_SYSTEM,
 				    ("using %d:%d dirty CPU scheduler(s)\n", tot, onln));
-			} else if (strncmp(type, "io", 2) == 0) {
+			} else if (sys_strncmp(type, "io", 2) == 0) {
 			    arg = get_arg(argv[i]+5, argv[i+1], &i);
 			    dirty_io_scheds = atoi(arg);
 			    if (dirty_io_scheds < 0 ||
@@ -1210,20 +1206,20 @@ erl_start(int argc, char **argv)
 			 &time_warp_mode);
 
     envbufsz = sizeof(envbuf);
-    if (erts_sys_getenv_raw(ERL_MAX_ETS_TABLES_ENV, envbuf, &envbufsz) == 0)
+    if (erts_sys_explicit_8bit_getenv(ERL_MAX_ETS_TABLES_ENV, envbuf, &envbufsz) == 1)
 	user_requested_db_max_tabs = atoi(envbuf);
     else
 	user_requested_db_max_tabs = 0;
 
     envbufsz = sizeof(envbuf);
-    if (erts_sys_getenv_raw("ERL_FULLSWEEP_AFTER", envbuf, &envbufsz) == 0) {
+    if (erts_sys_explicit_8bit_getenv("ERL_FULLSWEEP_AFTER", envbuf, &envbufsz) == 1) {
 	Uint16 max_gen_gcs = atoi(envbuf);
 	erts_atomic32_set_nob(&erts_max_gen_gcs,
 				  (erts_aint32_t) max_gen_gcs);
     }
 
     envbufsz = sizeof(envbuf);
-    if (erts_sys_getenv_raw("ERL_MAX_PORTS", envbuf, &envbufsz) == 0) {
+    if (erts_sys_explicit_8bit_getenv("ERL_MAX_PORTS", envbuf, &envbufsz) == 1) {
 	port_tab_sz = atoi(envbuf);
 	port_tab_sz_ignore_files = 1;
     }
@@ -1246,7 +1242,7 @@ erl_start(int argc, char **argv)
 	if (argv[i][0] != '-') {
 	    erts_usage();
 	}
-	if (strcmp(argv[i], "--") == 0) { /* end of emulator options */
+	if (sys_strcmp(argv[i], "--") == 0) { /* end of emulator options */
 	    i++;
 	    break;
 	}
@@ -1274,12 +1270,12 @@ erl_start(int argc, char **argv)
                     ("using display items %d\n",display_items));
 	    break;
 	case 'p':
-	    if (!strncmp(argv[i],"-pc",3)) {
+	    if (!sys_strncmp(argv[i],"-pc",3)) {
 		int printable_chars = ERL_PRINTABLE_CHARACTERS_LATIN1;
 		arg = get_arg(argv[i]+3, argv[i+1], &i);
-		if (!strcmp(arg,"unicode")) {
+		if (!sys_strcmp(arg,"unicode")) {
 		    printable_chars = ERL_PRINTABLE_CHARACTERS_UNICODE;
-		} else if (strcmp(arg,"latin1")) {
+		} else if (sys_strcmp(arg,"latin1")) {
 		    erts_fprintf(stderr, "bad range of printable "
 				 "characters: %s\n", arg);
 		    erts_usage();
@@ -1291,7 +1287,7 @@ erl_start(int argc, char **argv)
 		erts_usage();
 	    }
 	case 'f':
-	    if (!strncmp(argv[i],"-fn",3)) {
+	    if (!sys_strncmp(argv[i],"-fn",3)) {
 		int warning_type =  ERL_FILENAME_WARNING_WARNING;
 		arg = get_arg(argv[i]+3, argv[i+1], &i);
 		switch (*arg) {
@@ -1474,9 +1470,9 @@ erl_start(int argc, char **argv)
 		}
             } else if (has_prefix("maxk", sub_param)) {
 		arg = get_arg(sub_param+4, argv[i+1], &i);
-		if (strcmp(arg,"true") == 0) {
+		if (sys_strcmp(arg,"true") == 0) {
                     H_MAX_FLAGS |= MAX_HEAP_SIZE_KILL;
-                } else if (strcmp(arg,"false") == 0) {
+                } else if (sys_strcmp(arg,"false") == 0) {
                     H_MAX_FLAGS &= ~MAX_HEAP_SIZE_KILL;
                 } else {
 		    erts_fprintf(stderr, "bad max heap kill %s\n", arg);
@@ -1485,9 +1481,9 @@ erl_start(int argc, char **argv)
 		VERBOSE(DEBUG_SYSTEM, ("using max heap kill %d\n", H_MAX_FLAGS));
             } else if (has_prefix("maxel", sub_param)) {
 		arg = get_arg(sub_param+5, argv[i+1], &i);
-		if (strcmp(arg,"true") == 0) {
+		if (sys_strcmp(arg,"true") == 0) {
                     H_MAX_FLAGS |= MAX_HEAP_SIZE_LOG;
-                } else if (strcmp(arg,"false") == 0) {
+                } else if (sys_strcmp(arg,"false") == 0) {
                     H_MAX_FLAGS &= ~MAX_HEAP_SIZE_LOG;
                 } else {
 		    erts_fprintf(stderr, "bad max heap error logger %s\n", arg);
@@ -1605,7 +1601,7 @@ erl_start(int argc, char **argv)
 
 	case 'P': /* set maximum number of processes */
 	    arg = get_arg(argv[i]+2, argv[i+1], &i);
-	    if (strcmp(arg, "legacy") == 0)
+	    if (sys_strcmp(arg, "legacy") == 0)
 		legacy_proc_tab = 1;
 	    else {
 		errno = 0;
@@ -1621,7 +1617,7 @@ erl_start(int argc, char **argv)
 
 	case 'Q': /* set maximum number of ports */
 	    arg = get_arg(argv[i]+2, argv[i+1], &i);
-	    if (strcmp(arg, "legacy") == 0)
+	    if (sys_strcmp(arg, "legacy") == 0)
 		legacy_port_tab = 1;
 	    else {
 		errno = 0;
@@ -1639,11 +1635,11 @@ erl_start(int argc, char **argv)
 	case 'S' : /* Was handled in early_init() just read past it */
 	    if (argv[i][2] == 'D') {
 		char* type = argv[i]+3;
-		if (strcmp(type, "Pcpu") == 0)
+		if (sys_strcmp(type, "Pcpu") == 0)
 		    (void) get_arg(argv[i]+7, argv[i+1], &i);
-		if (strcmp(type, "cpu") == 0)
+		if (sys_strcmp(type, "cpu") == 0)
 		    (void) get_arg(argv[i]+6, argv[i+1], &i);
-		else if (strcmp(type, "io") == 0)
+		else if (sys_strcmp(type, "io") == 0)
 		    (void) get_arg(argv[i]+5, argv[i+1], &i);
 	    } else if (argv[i][2] == 'P')
 		(void) get_arg(argv[i]+3, argv[i+1], &i);
@@ -1750,6 +1746,7 @@ erl_start(int argc, char **argv)
 	    }
             else if (has_prefix("ecio", sub_param)) {
                 /* ignore argument, eager check io no longer used */
+                arg = get_arg(sub_param+4, argv[i+1], &i);
             }
 	    else if (has_prefix("pp", sub_param)) {
 		arg = get_arg(sub_param+2, argv[i+1], &i);
@@ -1764,8 +1761,6 @@ erl_start(int argc, char **argv)
 		    erts_usage();
 		}
 	    }
-	    else if (sys_strcmp("nsp", sub_param) == 0)
-		erts_use_sender_punish = 0;
 	    else if (has_prefix("tbt", sub_param)) {
 		arg = get_arg(sub_param+3, argv[i+1], &i);
 		res = erts_init_scheduler_bind_type_string(arg);
diff --git a/erts/emulator/beam/erl_instrument.c b/erts/emulator/beam/erl_instrument.c
index 634509f880..2f70e7996e 100644
--- a/erts/emulator/beam/erl_instrument.c
+++ b/erts/emulator/beam/erl_instrument.c
@@ -103,7 +103,7 @@ static struct {
 
 static void ERTS_INLINE atom_init(Eterm *atom, const char *name)
 {
-    *atom = am_atom_put((char *) name, strlen(name));
+    *atom = am_atom_put((char *) name, sys_strlen(name));
 }
 #define AM_INIT(AM) atom_init(&am.AM, #AM)
 
diff --git a/erts/emulator/beam/erl_io_queue.c b/erts/emulator/beam/erl_io_queue.c
index 40d69ea6b0..d779d1031a 100644
--- a/erts/emulator/beam/erl_io_queue.c
+++ b/erts/emulator/beam/erl_io_queue.c
@@ -801,12 +801,11 @@ static Eterm iol2v_make_sub_bin(iol2v_state_t *state, Eterm bin_term,
     ERTS_GET_REAL_BIN(bin_term, orig_pb_term,
         byte_offset, bit_offset, bit_size);
 
-    (void)bit_offset;
-    (void)bit_size;
+    ASSERT(bit_size == 0);
 
     sb->thing_word = HEADER_SUB_BIN;
+    sb->bitoffs = bit_offset;
     sb->bitsize = 0;
-    sb->bitoffs = 0;
     sb->orig = orig_pb_term;
     sb->is_writable = 0;
 
@@ -817,24 +816,15 @@ static Eterm iol2v_make_sub_bin(iol2v_state_t *state, Eterm bin_term,
 }
 
 static Eterm iol2v_promote_acc(iol2v_state_t *state) {
-    ProcBin *pb;
-
-    state->acc = erts_bin_realloc(state->acc, state->acc_size);
-
-    pb = (ProcBin*)HAlloc(state->process, PROC_BIN_SIZE);
-    pb->thing_word = HEADER_PROC_BIN;
-    pb->size = state->acc_size;
-    pb->val = state->acc;
-    pb->bytes = (byte*)(state->acc)->orig_bytes;
-    pb->flags = 0;
-    pb->next = MSO(state->process).first;
-    OH_OVERHEAD(&(MSO(state->process)), pb->size / sizeof(Eterm));
-    MSO(state->process).first = (struct erl_off_heap_header*)pb;
+    Eterm bin;
 
+    bin = erts_build_proc_bin(&MSO(state->process),
+                              HAlloc(state->process, PROC_BIN_SIZE),
+                              erts_bin_realloc(state->acc, state->acc_size));
     state->acc_size = 0;
     state->acc = NULL;
 
-    return make_binary(pb);
+    return bin;
 }
 
 /* Destructively enqueues a term to the result list, saving us the hassle of
@@ -984,7 +974,7 @@ static int iol2v_append_binary(iol2v_state_t *state, Eterm bin_term) {
     parent_header = binary_val(parent_binary);
     binary_size = binary_size(bin_term);
 
-    if (bit_offset != 0 || bit_size != 0) {
+    if (bit_size != 0) {
         return 0;
     } else if (binary_size == 0) {
         state->bytereds_spent += 1;
@@ -1026,8 +1016,16 @@ static int iol2v_append_binary(iol2v_state_t *state, Eterm bin_term) {
          * then just copy it into the accumulator. */
         iol2v_expand_acc(state, binary_size);
 
-        sys_memcpy(&(state->acc)->orig_bytes[state->acc_size],
-            binary_data, binary_size);
+        if (ERTS_LIKELY(bit_offset == 0)) {
+            sys_memcpy(&(state->acc)->orig_bytes[state->acc_size],
+                binary_data, binary_size);
+        } else {
+            ASSERT(binary_size <= ERTS_UWORD_MAX / 8);
+
+            erts_copy_bits(binary_data, bit_offset, 1,
+                (byte*)&(state->acc)->orig_bytes[state->acc_size], 0, 1,
+                binary_size * 8);
+        }
 
         state->acc_size += binary_size;
     } else {
@@ -1038,8 +1036,16 @@ static int iol2v_append_binary(iol2v_state_t *state, Eterm bin_term) {
 
         iol2v_expand_acc(state, spill);
 
-        sys_memcpy(&(state->acc)->orig_bytes[state->acc_size],
-            binary_data, spill);
+        if (ERTS_LIKELY(bit_offset == 0)) {
+            sys_memcpy(&(state->acc)->orig_bytes[state->acc_size],
+                binary_data, spill);
+        } else {
+            ASSERT(binary_size <= ERTS_UWORD_MAX / 8);
+
+            erts_copy_bits(binary_data, bit_offset, 1,
+                (byte*)&(state->acc)->orig_bytes[state->acc_size], 0, 1,
+                spill * 8);
+        }
 
         state->acc_size += spill;
 
@@ -1188,7 +1194,10 @@ BIF_RETTYPE iolist_to_iovec_1(BIF_ALIST_1) {
     if (is_nil(BIF_ARG_1)) {
         BIF_RET(NIL);
     } else if (is_binary(BIF_ARG_1)) {
-        if (binary_size(BIF_ARG_1) != 0) {
+        if (binary_bitsize(BIF_ARG_1) != 0) {
+            ASSERT(!(BIF_P->flags & F_DISABLE_GC));
+            BIF_ERROR(BIF_P, BADARG);
+        } else if (binary_size(BIF_ARG_1) != 0) {
             Eterm *hp = HAlloc(BIF_P, 2);
 
             BIF_RET(CONS(hp, BIF_ARG_1, NIL));
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c
index 4cdef0200f..773b138d92 100644
--- a/erts/emulator/beam/erl_lock_check.c
+++ b/erts/emulator/beam/erl_lock_check.c
@@ -86,6 +86,10 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"hipe_mfait_lock",			NULL			},
 #endif
     {	"nodes_monitors",			NULL			},
+    {	"meta_name_tab",	         	"address"		},
+    {	"db_tab",				"address"		},
+    {	"db_tab_fix",				"address"		},
+    {	"db_hash_slot",				"address"		},
     {	"resource_monitors",			"address"	        },
     {   "driver_list",                          NULL                    },
     {	"proc_link",				"pid"			},
@@ -95,12 +99,8 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"dist_entry_links",			"address"		},
     {   "code_write_permission",                NULL                    },
     {	"purge_state",		      		NULL			},
-    {	"meta_name_tab",	         	"address"		},
-    {	"db_tab",				"address"		},
     {	"proc_status",				"pid"			},
     {	"proc_trace",				"pid"			},
-    {	"db_tab_fix",				"address"		},
-    {	"db_hash_slot",				"address"		},
     {	"node_table",				NULL			},
     {	"dist_table",				NULL			},
     {	"sys_tracers",				NULL			},
@@ -109,7 +109,6 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"fun_tab",				NULL			},
     {	"environ",				NULL			},
     {	"release_literal_areas",		NULL			},
-    {	"efile_drv",				"address"		},
     {	"drv_ev_state_grow",			NULL,   		},
     {	"drv_ev_state",				"address"		},
     {	"safe_hash",				"address"		},
@@ -170,9 +169,6 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {   "save_ops_lock",                        NULL                    },
 #endif
 #endif
-#ifdef	USE_VM_PROBES
-    {   "efile_drv dtrace mutex",               NULL                    },
-#endif
     {	"mtrace_buf",				NULL			},
     {	"os_monotonic_time",			NULL			},
     {	"erts_alloc_hard_debug",		NULL			},
@@ -263,7 +259,7 @@ static ERTS_INLINE void lc_free(void *p)
 {
     erts_lc_free_block_t *fb = (erts_lc_free_block_t *) p;
 #ifdef DEBUG
-    memset((void *) p, 0xdf, sizeof(erts_lc_free_block_t));
+    sys_memset((void *) p, 0xdf, sizeof(erts_lc_free_block_t));
 #endif
     lc_lock();
     fb->next = free_blocks;
@@ -293,12 +289,12 @@ static void *lc_core_alloc(void)
     }
     for (i = 1; i < ERTS_LC_FB_CHUNK_SIZE - 1; i++) {
 #ifdef DEBUG
-	memset((void *) &fbs[i], 0xdf, sizeof(erts_lc_free_block_t));
+	sys_memset((void *) &fbs[i], 0xdf, sizeof(erts_lc_free_block_t));
 #endif
 	fbs[i].next = &fbs[i+1];
     }
 #ifdef DEBUG
-    memset((void *) &fbs[ERTS_LC_FB_CHUNK_SIZE-1],
+    sys_memset((void *) &fbs[ERTS_LC_FB_CHUNK_SIZE-1],
 	   0xdf, sizeof(erts_lc_free_block_t));
 #endif
     lc_lock();
@@ -699,7 +695,7 @@ erts_lc_get_lock_order_id(char *name)
 	erts_fprintf(stderr, "Missing lock name\n");
     else {
 	for (i = 0; i < ERTS_LOCK_ORDER_SIZE; i++)
-	    if (strcmp(erts_lock_order[i].name, name) == 0)
+	    if (sys_strcmp(erts_lock_order[i].name, name) == 0)
 		return i;
 	erts_fprintf(stderr,
 		     "Lock name '%s' missing in lock order "
@@ -1326,12 +1322,12 @@ erts_lc_init(void)
     static erts_lc_free_block_t fbs[ERTS_LC_FB_CHUNK_SIZE];
     for (i = 0; i < ERTS_LC_FB_CHUNK_SIZE - 1; i++) {
 #ifdef DEBUG
-	memset((void *) &fbs[i], 0xdf, sizeof(erts_lc_free_block_t));
+	sys_memset((void *) &fbs[i], 0xdf, sizeof(erts_lc_free_block_t));
 #endif
 	fbs[i].next = &fbs[i+1];
     }
 #ifdef DEBUG
-    memset((void *) &fbs[ERTS_LC_FB_CHUNK_SIZE-1],
+    sys_memset((void *) &fbs[ERTS_LC_FB_CHUNK_SIZE-1],
 	   0xdf, sizeof(erts_lc_free_block_t));
 #endif
     fbs[ERTS_LC_FB_CHUNK_SIZE-1].next = NULL;
diff --git a/erts/emulator/beam/erl_map.c b/erts/emulator/beam/erl_map.c
index f0c54e05f7..8047a9567f 100644
--- a/erts/emulator/beam/erl_map.c
+++ b/erts/emulator/beam/erl_map.c
@@ -91,7 +91,6 @@ static BIF_RETTYPE hashmap_merge(Process *p, Eterm nodeA, Eterm nodeB, int swap_
 static Export hashmap_merge_trap_export;
 static BIF_RETTYPE maps_merge_trap_1(BIF_ALIST_1);
 static Uint hashmap_subtree_size(Eterm node);
-static Eterm hashmap_to_list(Process *p, Eterm map, Sint n);
 static Eterm hashmap_keys(Process *p, Eterm map);
 static Eterm hashmap_values(Process *p, Eterm map);
 static Eterm hashmap_delete(Process *p, Uint32 hx, Eterm key, Eterm node, Eterm *value);
@@ -139,80 +138,6 @@ BIF_RETTYPE map_size_1(BIF_ALIST_1) {
     BIF_ERROR(BIF_P, BADMAP);
 }
 
-/* maps:to_list/1 */
-
-BIF_RETTYPE maps_to_list_1(BIF_ALIST_1) {
-    if (is_flatmap(BIF_ARG_1)) {
-	Uint n;
-	Eterm* hp;
-	Eterm *ks,*vs, res, tup;
-	flatmap_t *mp = (flatmap_t*)flatmap_val(BIF_ARG_1);
-
-	ks  = flatmap_get_keys(mp);
-	vs  = flatmap_get_values(mp);
-	n   = flatmap_get_size(mp);
-	hp  = HAlloc(BIF_P, (2 + 3) * n);
-	res = NIL;
-
-	while(n--) {
-	    tup = TUPLE2(hp, ks[n], vs[n]); hp += 3;
-	    res = CONS(hp, tup, res); hp += 2;
-	}
-
-	BIF_RET(res);
-    } else if (is_hashmap(BIF_ARG_1)) {
-	return hashmap_to_list(BIF_P, BIF_ARG_1, -1);
-    }
-
-    BIF_P->fvalue = BIF_ARG_1;
-    BIF_ERROR(BIF_P, BADMAP);
-}
-
-/* erts_internal:maps_to_list/2
- *
- * This function should be removed once iterators are in place.
- * Never document it.
- * Never encourage its usage.
- *
- * A negative value in ARG 2 means the entire map.
- */
-
-BIF_RETTYPE erts_internal_maps_to_list_2(BIF_ALIST_2) {
-    Sint m;
-    if (term_to_Sint(BIF_ARG_2, &m)) {
-        if (is_flatmap(BIF_ARG_1)) {
-            Uint n;
-            Eterm* hp;
-            Eterm *ks,*vs, res, tup;
-            flatmap_t *mp = (flatmap_t*)flatmap_val(BIF_ARG_1);
-
-            ks  = flatmap_get_keys(mp);
-            vs  = flatmap_get_values(mp);
-            n   = flatmap_get_size(mp);
-
-            if (m >= 0) {
-                n = m < n ? m : n;
-            }
-
-            hp  = HAlloc(BIF_P, (2 + 3) * n);
-            res = NIL;
-
-            while(n--) {
-                tup = TUPLE2(hp, ks[n], vs[n]); hp += 3;
-                res = CONS(hp, tup, res); hp += 2;
-            }
-
-            BIF_RET(res);
-        } else if (is_hashmap(BIF_ARG_1)) {
-            return hashmap_to_list(BIF_P, BIF_ARG_1, m);
-        }
-        BIF_P->fvalue = BIF_ARG_1;
-        BIF_ERROR(BIF_P, BADMAP);
-    }
-    BIF_ERROR(BIF_P, BADARG);
-}
-
-
 /* maps:find/2
  * return value if key *matches* a key in the map
  */
@@ -1962,45 +1887,31 @@ BIF_RETTYPE maps_values_1(BIF_ALIST_1) {
     BIF_ERROR(BIF_P, BADMAP);
 }
 
-static Eterm hashmap_to_list(Process *p, Eterm node, Sint m) {
-    DECLARE_WSTACK(stack);
-    Eterm *hp, *kv;
-    Eterm tup, res = NIL;
-    Uint n = hashmap_size(node);
-
-    if (m >= 0) {
-        n = m < n ? m : n;
-    }
-
-    hp  = HAlloc(p, n * (2 + 3));
-    hashmap_iterator_init(&stack, node, 0);
-    while (n--) {
-        kv  = hashmap_iterator_next(&stack);
-        ASSERT(kv != NULL);
-	tup = TUPLE2(hp, CAR(kv), CDR(kv));
-	hp += 3;
-	res = CONS(hp, tup, res);
-	hp += 2;
-    }
-    DESTROY_WSTACK(stack);
-    return res;
-}
-
-void hashmap_iterator_init(ErtsWStack* s, Eterm node, int reverse) {
-    Eterm hdr = *hashmap_val(node);
+static ERTS_INLINE
+Uint hashmap_node_size(Eterm hdr, Eterm **nodep)
+{
     Uint sz;
 
     switch(hdr & _HEADER_MAP_SUBTAG_MASK) {
     case HAMT_SUBTAG_HEAD_ARRAY:
 	sz = 16;
+        if (nodep) ++*nodep;
 	break;
     case HAMT_SUBTAG_HEAD_BITMAP:
+        if (nodep) ++*nodep;
     case HAMT_SUBTAG_NODE_BITMAP:
         sz = hashmap_bitcount(MAP_HEADER_VAL(hdr));
+        ASSERT(sz < 17);
 	break;
     default:
 	erts_exit(ERTS_ABORT_EXIT, "bad header");
     }
+    return sz;
+}
+
+void hashmap_iterator_init(ErtsWStack* s, Eterm node, int reverse) {
+    Eterm hdr = *hashmap_val(node);
+    Uint sz = hashmap_node_size(hdr, NULL);
 
     WSTACK_PUSH3((*s), (UWord)THE_NON_VALUE,  /* end marker */
 		 (UWord)(!reverse ? 0 : sz+1),
@@ -2024,20 +1935,7 @@ Eterm* hashmap_iterator_next(ErtsWStack* s) {
 	    ptr = boxed_val(node);
 	    hdr = *ptr;
 	    ASSERT(is_header(hdr));
-	    switch(hdr & _HEADER_MAP_SUBTAG_MASK) {
-	    case HAMT_SUBTAG_HEAD_ARRAY:
-		ptr++;
-		sz = 16;
-		break;
-	    case HAMT_SUBTAG_HEAD_BITMAP:
-		ptr++;
-	    case HAMT_SUBTAG_NODE_BITMAP:
-		sz = hashmap_bitcount(MAP_HEADER_VAL(hdr));
-		ASSERT(sz < 17);
-		break;
-	    default:
-		erts_exit(ERTS_ABORT_EXIT, "bad header");
-	    }
+            sz = hashmap_node_size(hdr, &ptr);
 
 	    idx++;
 
@@ -2074,20 +1972,7 @@ Eterm* hashmap_iterator_prev(ErtsWStack* s) {
 	    ptr = boxed_val(node);
 	    hdr = *ptr;
 	    ASSERT(is_header(hdr));
-	    switch(hdr & _HEADER_MAP_SUBTAG_MASK) {
-	    case HAMT_SUBTAG_HEAD_ARRAY:
-		ptr++;
-		sz = 16;
-		break;
-	    case HAMT_SUBTAG_HEAD_BITMAP:
-		ptr++;
-	    case HAMT_SUBTAG_NODE_BITMAP:
-		sz = hashmap_bitcount(MAP_HEADER_VAL(hdr));
-		ASSERT(sz < 17);
-		break;
-	    default:
-		erts_exit(ERTS_ERROR_EXIT, "bad header");
-	    }
+            sz = hashmap_node_size(hdr, &ptr);
 
             if (idx > sz)
 		idx = sz;
@@ -3061,6 +2946,363 @@ static Eterm hashmap_bld_tuple_uint(Uint **hpp, Uint *szp, Uint n, Uint nums[])
 }
 
 
+/**
+ * In hashmap the Path is a bit pattern that describes
+ * which slot we should traverse in each hashmap node.
+ * Since each hashmap node can only be up to 16 elements
+ * large we use 4 bits per level in the path.
+ *
+ * So a Path with value 0x110 will first get the 0:th
+ * slot in the head node, and then the 1:st slot in the
+ * resulting node and then finally the 1:st slot in the
+ * node beneath. If that slot is not a leaf, then the path
+ * continues down the 0:th slot until it finds a leaf.
+ *
+ * Once the leaf has been found, the return value is created
+ * by traversing the tree using the the stack that was built
+ * when searching for the first leaf to return.
+ *
+ * The index can become a bignum, which complicates the code
+ * a bit. However it should be very rare that this happens
+ * even on a 32bit system as you would need a tree of depth
+ * 7 or more.
+ *
+ * If the number of elements remaining in the map is greater
+ * than how many we want to return, we build a new Path, using
+ * the stack, that points to the next leaf.
+ *
+ * The third argument to this function controls how the data
+ * is returned.
+ *
+ * iterator: The key-value associations are to be used by
+ *           maps:iterator. The return has this format:
+ *             {K1,V1,{K2,V2,none | [Path | Map]}}
+ *           this makes the maps:next function very simple
+ *           and performant.
+ *
+ * list(): The key-value associations are to be used by
+ *         maps:to_list. The return has this format:
+ *             [Path, Map | [{K1,V1},{K2,V2} | BIF_ARG_3]]
+ *                 or if no more associations remain
+ *             [{K1,V1},{K2,V2} | BIF_ARG_3]
+ */
+
+#define PATH_ELEM_SIZE 4
+#define PATH_ELEM_MASK 0xf
+#define PATH_ELEM(PATH) ((PATH) & PATH_ELEM_MASK)
+#define PATH_ELEMS_PER_DIGIT (sizeof(ErtsDigit) * 8 / PATH_ELEM_SIZE)
+
+BIF_RETTYPE erts_internal_map_next_3(BIF_ALIST_3) {
+
+    Eterm path, map;
+    enum { iterator, list } type;
+
+    path = BIF_ARG_1;
+    map  = BIF_ARG_2;
+
+    if (!is_map(map))
+        BIF_ERROR(BIF_P, BADARG);
+
+    if (BIF_ARG_3 == am_iterator) {
+        type = iterator;
+    } else if (is_nil(BIF_ARG_3) || is_list(BIF_ARG_3)) {
+        type = list;
+    } else {
+        BIF_ERROR(BIF_P, BADARG);
+    }
+
+    if (is_flatmap(map)) {
+        Uint n;
+	Eterm *ks,*vs, res, *hp;
+	flatmap_t *mp = (flatmap_t*)flatmap_val(map);
+
+	ks  = flatmap_get_keys(mp);
+	vs  = flatmap_get_values(mp);
+	n   = flatmap_get_size(mp);
+
+        if (!is_small(BIF_ARG_1) || n < unsigned_val(BIF_ARG_1))
+            BIF_ERROR(BIF_P, BADARG);
+
+        if (type == iterator) {
+            hp  = HAlloc(BIF_P, 4 * n);
+            res = am_none;
+
+            while(n--) {
+                res = TUPLE3(hp, ks[n], vs[n], res); hp += 4;
+            }
+        } else {
+            hp  = HAlloc(BIF_P, (2 + 3) * n);
+            res = BIF_ARG_3;
+
+            while(n--) {
+                Eterm tup = TUPLE2(hp, ks[n], vs[n]); hp += 3;
+                res = CONS(hp, tup, res); hp += 2;
+            }
+        }
+
+	BIF_RET(res);
+    } else {
+        Uint curr_path;
+        Uint path_length = 0;
+        Uint *path_rest = NULL;
+        int i, elems, orig_elems;
+        Eterm node = map, res, *path_ptr = NULL, *hp;
+
+        /* A stack WSTACK is used when traversing the hashmap.
+         * It contains: node, idx, sz, ptr
+         *
+         * `node` is not really needed, but it is very nice to
+         * have when debugging.
+         *
+         * `idx` always points to the next un-explored entry in
+         * a node. If there are no more un-explored entries,
+         * `idx` is equal to `sz`.
+         *
+         * `sz` is the number of elements in the node.
+         *
+         * `ptr` is a pointer to where the elements of the node begins.
+         */
+        DECLARE_WSTACK(stack);
+
+        ASSERT(is_hashmap(node));
+
+/* How many elements we return in one call depends on the number of reductions
+ * that the process has left to run. In debug we return fewer elements to test
+ * the Path implementation better.
+ *
+ * Also, when the path is 0 (i.e. for the first call) we limit the number of
+ * elements to MAP_SMALL_MAP_LIMIT in order to not use a huge amount of heap
+ * when only the first X associations in the hashmap was needed.
+ */
+#if defined(DEBUG)
+#define FCALLS_ELEMS(BIF_P) ((BIF_P->fcalls / 4) & 0xF)
+#else
+#define FCALLS_ELEMS(BIF_P) (BIF_P->fcalls / 4)
+#endif
+
+        if (MAX(FCALLS_ELEMS(BIF_P), 1) < hashmap_size(map))
+            elems = MAX(FCALLS_ELEMS(BIF_P), 1);
+        else
+            elems = hashmap_size(map);
+
+#undef FCALLS_ELEMS
+
+        if (is_small(path)) {
+            curr_path = unsigned_val(path);
+
+            if (curr_path == 0 && elems > MAP_SMALL_MAP_LIMIT) {
+                elems = MAP_SMALL_MAP_LIMIT;
+            }
+        } else if (is_big(path)) {
+            Eterm *big = big_val(path);
+            if (bignum_header_is_neg(*big))
+                BIF_ERROR(BIF_P, BADARG);
+            path_length = BIG_ARITY(big) - 1;
+            curr_path = BIG_DIGIT(big,  0);
+            path_rest = BIG_V(big) + 1;
+        } else {
+            BIF_ERROR(BIF_P, BADARG);
+        }
+
+        if (type == iterator) {
+            /* iterator uses the format {K, V, {K, V, {K, V, [Path | Map]}}},
+             * so each element is 4 words large */
+            hp = HAlloc(BIF_P, 4 * elems);
+            res = am_none;
+        } else {
+            /* list used the format [Path, Map, {K,V}, {K,V} | BIF_ARG_3],
+             * so each element is 2+3 words large */
+            hp = HAlloc(BIF_P, (2 + 3) * elems);
+            res = BIF_ARG_3;
+        }
+
+        orig_elems = elems;
+
+        /* First we look for the leaf to start at using the
+           path given. While doing so, we push each map node
+           and the index onto the stack to use later. */
+        for (i = 1; ; i++) {
+            Eterm *ptr = hashmap_val(node),
+                hdr = *ptr++;
+            Uint sz;
+
+            sz = hashmap_node_size(hdr, &ptr);
+
+            if (PATH_ELEM(curr_path) >= sz)
+                goto badarg;
+
+            WSTACK_PUSH4(stack, node, PATH_ELEM(curr_path)+1, sz, (UWord)ptr);
+
+            /* We have found a leaf, return it and the next X elements */
+            if (is_list(ptr[PATH_ELEM(curr_path)])) {
+                Eterm *lst = list_val(ptr[PATH_ELEM(curr_path)]);
+                if (type == iterator) {
+                    res = TUPLE3(hp, CAR(lst), CDR(lst), res); hp += 4;
+                    /* Note where we should patch the Iterator is needed */
+                    path_ptr = hp-1;
+                } else {
+                    Eterm tup = TUPLE2(hp, CAR(lst), CDR(lst)); hp += 3;
+                    res = CONS(hp, tup, res); hp += 2;
+                }
+                elems--;
+                break;
+            }
+
+            node = ptr[PATH_ELEM(curr_path)];
+
+            curr_path >>= PATH_ELEM_SIZE;
+
+            if (i == PATH_ELEMS_PER_DIGIT) {
+                /* Switch to next bignum word if available,
+                   otherwise just follow 0 path */
+                i = 0;
+                if (path_length) {
+                    curr_path = *path_rest;
+                    path_length--;
+                    path_rest++;
+                } else {
+                    curr_path = 0;
+                }
+            }
+        }
+
+        /* We traverse the hashmap and return at most `elems` elements */
+        while(1) {
+            Eterm *ptr = (Eterm*)WSTACK_POP(stack);
+            Uint sz = (Uint)WSTACK_POP(stack);
+            Uint idx = (Uint)WSTACK_POP(stack);
+            Eterm node = (Eterm)WSTACK_POP(stack);
+
+            while (idx < sz && elems != 0 && is_list(ptr[idx])) {
+                Eterm *lst = list_val(ptr[idx]);
+                if (type == iterator) {
+                    res = TUPLE3(hp, CAR(lst), CDR(lst), res); hp += 4;
+                } else {
+                    Eterm tup = TUPLE2(hp, CAR(lst), CDR(lst)); hp += 3;
+                    res = CONS(hp, tup, res); hp += 2;
+                }
+                elems--;
+                idx++;
+            }
+
+            if (elems == 0) {
+                if (idx < sz) {
+                    /* There are more elements in this node to explore */
+                    WSTACK_PUSH4(stack, node, idx+1, sz, (UWord)ptr);
+                } else {
+                    /* pop stack to find the next value */
+                    while (!WSTACK_ISEMPTY(stack)) {
+                        Eterm *ptr = (Eterm*)WSTACK_POP(stack);
+                        Uint sz = (Uint)WSTACK_POP(stack);
+                        Uint idx = (Uint)WSTACK_POP(stack);
+                        Eterm node = (Eterm)WSTACK_POP(stack);
+                        if (idx < sz) {
+                            WSTACK_PUSH4(stack, node, idx+1, sz, (UWord)ptr);
+                            break;
+                        }
+                    }
+                }
+                break;
+            } else {
+                if (idx < sz) {
+                    Eterm hdr;
+                    /* Push next idx in current node */
+                    WSTACK_PUSH4(stack, node, idx+1, sz, (UWord)ptr);
+
+                    /* Push first idx in child node */
+                    node = ptr[idx];
+                    ptr = hashmap_val(ptr[idx]);
+                    hdr = *ptr++;
+                    sz = hashmap_node_size(hdr, &ptr);
+                    WSTACK_PUSH4(stack, node, 0, sz, (UWord)ptr);
+                }
+            }
+
+            /* There are no more element in the hashmap */
+            if (WSTACK_ISEMPTY(stack)) {
+                break;
+            }
+
+        }
+
+        if (!WSTACK_ISEMPTY(stack)) {
+            Uint depth = WSTACK_COUNT(stack) / 4 + 1;
+            /* +1 because we already have the first element in curr_path */
+            Eterm *path_digits = NULL;
+            Uint curr_path = 0;
+
+            /* If the path cannot fit in a small, we allocate a bignum */
+            if (depth >= PATH_ELEMS_PER_DIGIT) {
+                /* We need multiple ErtsDigit's to represent the path */
+                int big_size = BIG_NEED_FOR_BITS(depth * PATH_ELEM_SIZE);
+                hp = HAlloc(BIF_P, big_size);
+                hp[0] = make_pos_bignum_header(big_size - BIG_NEED_SIZE(0));
+                path_digits = hp + big_size - 1;
+            }
+
+
+            /* Pop the stack to create the complete path to the next leaf */
+            while(!WSTACK_ISEMPTY(stack)) {
+                Uint idx;
+
+                (void)WSTACK_POP(stack);
+                (void)WSTACK_POP(stack);
+                idx = (Uint)WSTACK_POP(stack)-1;
+                /* idx - 1 because idx in the stack is pointing to
+                   the next element to fetch. */
+                (void)WSTACK_POP(stack);
+
+                depth--;
+                if (depth % PATH_ELEMS_PER_DIGIT == 0) {
+                    /* Switch to next bignum element */
+                    path_digits[0] = curr_path;
+                    path_digits--;
+                    curr_path = 0;
+                }
+
+                curr_path <<= PATH_ELEM_SIZE;
+                curr_path |= idx;
+            }
+
+            if (path_digits) {
+                path_digits[0] = curr_path;
+                path = make_big(hp);
+            } else {
+                /* The Uint could be too large for a small */
+                path = erts_make_integer(curr_path, BIF_P);
+            }
+
+            if (type == iterator) {
+                hp = HAlloc(BIF_P, 2);
+                *path_ptr = CONS(hp, path, map); hp += 2;
+            } else {
+                hp = HAlloc(BIF_P, 4);
+                res = CONS(hp, map, res); hp += 2;
+                res = CONS(hp, path, res); hp += 2;
+            }
+        } else {
+            if (type == iterator) {
+                HRelease(BIF_P, hp + 4 * elems, hp);
+            } else {
+                HRelease(BIF_P, hp + (2+3) * elems, hp);
+            }
+        }
+        BIF_P->fcalls -= 4 * (orig_elems - elems);
+        DESTROY_WSTACK(stack);
+        BIF_RET(res);
+
+    badarg:
+        if (type == iterator) {
+            HRelease(BIF_P, hp + 4 * elems, hp);
+        } else {
+            HRelease(BIF_P, hp + (2+3) * elems, hp);
+        }
+        BIF_P->fcalls -= 4 * (orig_elems - elems);
+        DESTROY_WSTACK(stack);
+        BIF_ERROR(BIF_P, BADARG);
+    }
+}
+
 /* implementation of builtin emulations */
 
 #if !ERTS_AT_LEAST_GCC_VSN__(3, 4, 0)
diff --git a/erts/emulator/beam/erl_map.h b/erts/emulator/beam/erl_map.h
index c3ccf80b85..718d400e22 100644
--- a/erts/emulator/beam/erl_map.h
+++ b/erts/emulator/beam/erl_map.h
@@ -64,7 +64,6 @@ typedef struct flatmap_s {
 #define hashmap_shift_hash(Heap,Hx,Lvl,Key) \
     (((++(Lvl)) & 7) ? (Hx) >> 4 : hashmap_make_hash(CONS(Heap, make_small((Lvl)>>3), Key)))
 
-
 /* erl_term.h stuff */
 #define flatmap_get_values(x)        (((Eterm *)(x)) + sizeof(flatmap_t)/sizeof(Eterm))
 #define flatmap_get_keys(x)          (((Eterm *)tuple_val(((flatmap_t *)(x))->keys)) + 1)
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index abf194cf94..6f7c71ef98 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -616,7 +616,7 @@ erts_try_alloc_message_on_heap(Process *pp,
     }
     else {
     in_message_fragment:
-	if (!((*psp) & ERTS_PSFLG_ON_HEAP_MSGQ)) {
+	if ((*psp) & ERTS_PSFLG_OFF_HEAP_MSGQ) {
 	    mp = erts_alloc_message(sz, hpp);
 	    *ohpp = sz == 0 ? NULL : &mp->hfrag.off_heap;
 	}
@@ -1079,8 +1079,6 @@ erts_change_message_queue_management(Process *c_p, Eterm new_state)
 	case am_on_heap:
 	    c_p->flags |= F_ON_HEAP_MSGQ;
 	    c_p->flags &= ~F_OFF_HEAP_MSGQ;
-	    erts_atomic32_read_bor_nob(&c_p->state,
-					   ERTS_PSFLG_ON_HEAP_MSGQ);
 	    /*
 	     * We are not allowed to clear ERTS_PSFLG_OFF_HEAP_MSGQ
 	     * if a off heap change is ongoing. It will be adjusted
@@ -1106,8 +1104,6 @@ erts_change_message_queue_management(Process *c_p, Eterm new_state)
 	    break;
 	case am_off_heap:
 	    c_p->flags &= ~F_ON_HEAP_MSGQ;
-	    erts_atomic32_read_band_nob(&c_p->state,
-					    ~ERTS_PSFLG_ON_HEAP_MSGQ);
 	    goto change_to_off_heap;
 	default:
 	    res = THE_NON_VALUE; /* badarg */
diff --git a/erts/emulator/beam/erl_message.h b/erts/emulator/beam/erl_message.h
index 9c8cf84e43..a14f4f51d8 100644
--- a/erts/emulator/beam/erl_message.h
+++ b/erts/emulator/beam/erl_message.h
@@ -167,10 +167,9 @@ typedef struct {
     Sint len;            /* queue length */
 
     /*
-     * The following two fields are used by the recv_mark/1 and
+     * The following field is used by the recv_mark/1 and
      * recv_set/1 instructions.
      */
-    BeamInstr* mark;		/* address to rec_loop/2 instruction */
     ErtsMessage** saved_last;	/* saved last pointer */
 } ErlMessageQueue;
 
@@ -236,12 +235,17 @@ typedef struct erl_trace_message_queue__ {
      (p)->msg.len--; \
      if (__mp == NULL) \
          (p)->msg.last = (p)->msg.save; \
-     (p)->msg.mark = 0; \
 } while(0)
 
-/* Reset message save point (after receive match) */
-#define JOIN_MESSAGE(p) \
-     (p)->msg.save = &(p)->msg.first
+/*
+ * Reset message save point (after receive match).
+ * Also invalidate the saved position since it may no
+ * longer be safe to use.
+ */
+#define JOIN_MESSAGE(p) do {                    \
+    (p)->msg.save = &(p)->msg.first;            \
+    (p)->msg.saved_last = 0;                    \
+} while(0)
 
 /* Save current message */
 #define SAVE_MESSAGE(p) \
diff --git a/erts/emulator/beam/erl_msacc.c b/erts/emulator/beam/erl_msacc.c
index d659842b7e..d13d6080e1 100644
--- a/erts/emulator/beam/erl_msacc.c
+++ b/erts/emulator/beam/erl_msacc.c
@@ -81,7 +81,7 @@ void erts_msacc_init(void) {
                                         sizeof(Eterm)*ERTS_MSACC_STATE_COUNT);
     for (i = 0; i < ERTS_MSACC_STATE_COUNT; i++) {
         erts_msacc_state_atoms[i] = am_atom_put(erts_msacc_states[i],
-                                                strlen(erts_msacc_states[i]));
+                                                sys_strlen(erts_msacc_states[i]));
     }
 }
 
@@ -191,7 +191,7 @@ Eterm erts_msacc_gather_stats(ErtsMsAcc *msacc, ErtsHeapFactory *factory) {
     map->keys = key;
     hp[0] = state_map;
     hp[1] = msacc->id;
-    hp[2] = am_atom_put(msacc->type,strlen(msacc->type));
+    hp[2] = am_atom_put(msacc->type,sys_strlen(msacc->type));
 
     return make_flatmap(map);
 }
diff --git a/erts/emulator/beam/erl_msacc.h b/erts/emulator/beam/erl_msacc.h
index 2588dec903..895b1ae319 100644
--- a/erts/emulator/beam/erl_msacc.h
+++ b/erts/emulator/beam/erl_msacc.h
@@ -159,12 +159,12 @@ struct erl_msacc_t_ {
 
 #ifdef ERTS_ENABLE_MSACC
 
-extern erts_tsd_key_t erts_msacc_key;
+extern erts_tsd_key_t ERTS_WRITE_UNLIKELY(erts_msacc_key);
 
 #ifdef ERTS_MSACC_ALWAYS_ON
 #define erts_msacc_enabled 1
 #else
-extern int erts_msacc_enabled;
+extern int ERTS_WRITE_UNLIKELY(erts_msacc_enabled);
 #endif
 
 #define ERTS_MSACC_TSD_GET() erts_tsd_get(erts_msacc_key)
diff --git a/erts/emulator/beam/erl_mtrace.c b/erts/emulator/beam/erl_mtrace.c
index f2a660f085..2807b443a1 100644
--- a/erts/emulator/beam/erl_mtrace.c
+++ b/erts/emulator/beam/erl_mtrace.c
@@ -314,7 +314,7 @@ disable_trace(int error, char *reason, int eno)
 	erts_fprintf(stderr, "%s: %s\n", mt_dis, reason);
     else {
 	eno_str = erl_errno_id(eno);
-	if (strcmp(eno_str, "unknown") == 0)
+	if (sys_strcmp(eno_str, "unknown") == 0)
 	    erts_fprintf(stderr, "%s: %s: %d\n", mt_dis, reason, eno);
 	else
 	    erts_fprintf(stderr, "%s: %s: %s\n", mt_dis, reason, eno_str);
@@ -401,9 +401,9 @@ write_trace_header(char *nodename, char *pid, char *hostname)
     PUT_UI32(tracep, ERTS_MT_MAJOR_VSN);
     PUT_UI32(tracep, ERTS_MT_MINOR_VSN);
 
-    n_len = strlen(nodename);
-    h_len = strlen(hostname);
-    p_len = strlen(pid);
+    n_len = sys_strlen(nodename);
+    h_len = sys_strlen(hostname);
+    p_len = sys_strlen(pid);
     hdr_prolog_len = (2*UI32_SZ
 		      + 3*UI16_SZ
 		      + 3*UI32_SZ
@@ -436,15 +436,15 @@ write_trace_header(char *nodename, char *pid, char *hostname)
     PUT_UI32(tracep, start_time.usec);
 
     PUT_UI8(tracep, (byte) n_len);
-    memcpy((void *) tracep, (void *) nodename, n_len);
+    sys_memcpy((void *) tracep, (void *) nodename, n_len);
     tracep += n_len;
 
     PUT_UI8(tracep, (byte) h_len);
-    memcpy((void *) tracep, (void *) hostname, h_len);
+    sys_memcpy((void *) tracep, (void *) hostname, h_len);
     tracep += h_len;
 
     PUT_UI8(tracep, (byte) p_len);
-    memcpy((void *) tracep, (void *) pid, p_len);
+    sys_memcpy((void *) tracep, (void *) pid, p_len);
     tracep += p_len;
 
     ASSERT(startp + hdr_prolog_len == tracep);
@@ -472,7 +472,7 @@ write_trace_header(char *nodename, char *pid, char *hostname)
 
 	str = ERTS_ALC_A2AD(i);
 	ASSERT(str);
-	str_len = strlen(str);
+	str_len = sys_strlen(str);
 	if (str_len >= (1 << 8)) {
 	    disable_trace(1, "Excessively large allocator string", 0);
 	    return 0;
@@ -493,7 +493,7 @@ write_trace_header(char *nodename, char *pid, char *hostname)
 	PUT_UI16(tracep, aflags);
 	PUT_UI16(tracep, (Uint16) i);
 	PUT_UI8( tracep, (byte) str_len);
-	memcpy((void *) tracep, (void *) str, str_len);
+	sys_memcpy((void *) tracep, (void *) str, str_len);
 	tracep += str_len;
 	if (erts_allctrs_info[i].alloc_util) {
 	    PUT_UI8(tracep, 2);
@@ -519,7 +519,7 @@ write_trace_header(char *nodename, char *pid, char *hostname)
 	str = ERTS_ALC_N2TD(i);
 	ASSERT(str);
 
-	str_len = strlen(str);
+	str_len = sys_strlen(str);
 	if (str_len >= (1 << 8)) {
 	    disable_trace(1, "Excessively large type string", 0);
 	    return 0;
@@ -543,7 +543,7 @@ write_trace_header(char *nodename, char *pid, char *hostname)
 	PUT_UI16(tracep, nflags);
 	PUT_UI16(tracep, (Uint16) i);
 	PUT_UI8(tracep, (byte) str_len);
-	memcpy((void *) tracep, (void *) str, str_len);
+	sys_memcpy((void *) tracep, (void *) str, str_len);
 	tracep += str_len;
 	PUT_UI16(tracep, no);
 	ASSERT(startp + entry_sz == tracep);
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index f7f12efe28..c60cc7fecf 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -237,9 +237,11 @@ static void cache_env(ErlNifEnv* env);
 static void full_flush_env(ErlNifEnv *env);
 static void flush_env(ErlNifEnv* env);
 
-/* Temporary object header, auto-deallocated when NIF returns
- * or when independent environment is cleared.
- */
+/* Temporary object header, auto-deallocated when NIF returns or when
+ * independent environment is cleared.
+ *
+ * The payload can be accessed with &tmp_obj_ptr[1] but keep in mind that its
+ * first element must not require greater alignment than `next`. */
 struct enif_tmp_obj_t {
     struct enif_tmp_obj_t* next;
     void (*dtor)(struct enif_tmp_obj_t*);
@@ -256,6 +258,46 @@ static ERTS_INLINE void free_tmp_objs(ErlNifEnv* env)
     }
 }
 
+/* Whether the given environment is bound to a process and will be cleaned up
+ * when the NIF returns. It's safe to use temp_alloc for objects in
+ * env->tmp_obj_list when this is true. */
+static ERTS_INLINE int is_proc_bound(ErlNifEnv *env)
+{
+    return env->mod_nif != NULL;
+}
+
+/* Allocates and attaches an object to the given environment, running its
+ * destructor when the environment is cleared. To avoid temporary variables the
+ * address of the allocated object is returned instead of the enif_tmp_obj_t.
+ *
+ * The destructor *must* call `erts_free(tmp_obj->allocator, tmp_obj)` to free
+ * the object. If the destructor needs to refer to the allocated object its
+ * address will be &tmp_obj[1]. */
+static ERTS_INLINE void *alloc_tmp_obj(ErlNifEnv *env, size_t size,
+                                       void (*dtor)(struct enif_tmp_obj_t*)) {
+    struct enif_tmp_obj_t *tmp_obj;
+    ErtsAlcType_t allocator;
+
+    allocator = is_proc_bound(env) ? ERTS_ALC_T_TMP : ERTS_ALC_T_NIF;
+
+    tmp_obj = erts_alloc(allocator, sizeof(struct enif_tmp_obj_t) + MAX(1, size));
+
+    tmp_obj->next = env->tmp_obj_list;
+    tmp_obj->allocator = allocator;
+    tmp_obj->dtor = dtor;
+
+    env->tmp_obj_list = tmp_obj;
+
+    return (void*)&tmp_obj[1];
+}
+
+/* Generic destructor for objects allocated through alloc_tmp_obj that don't
+ * care about their payload. */
+static void tmp_alloc_dtor(struct enif_tmp_obj_t *tmp_obj)
+{
+    erts_free(tmp_obj->allocator, tmp_obj);
+}
+
 void erts_post_nif(ErlNifEnv* env)
 {
     erts_unblock_fpe(env->fpe_was_unmasked);
@@ -446,6 +488,7 @@ static void cache_env(ErlNifEnv* env)
 	env->hp_end = env->heap_frag->mem + env->heap_frag->alloc_size;
     }
 }
+
 void* enif_priv_data(ErlNifEnv* env)
 {
     return env->mod_nif->priv_data;
@@ -486,7 +529,7 @@ setup_nif_env(struct enif_msg_environment_t* msg_env,
     msg_env->env.tmp_obj_list = NULL;
     msg_env->env.proc = &msg_env->phony_proc;
     msg_env->env.exception_thrown = 0;
-    memset(&msg_env->phony_proc, 0, sizeof(Process));
+    sys_memset(&msg_env->phony_proc, 0, sizeof(Process));
     HEAP_START(&msg_env->phony_proc) = phony_heap;
     HEAP_TOP(&msg_env->phony_proc) = phony_heap;
     HEAP_LIMIT(&msg_env->phony_proc) = phony_heap;
@@ -544,6 +587,9 @@ void enif_clear_env(ErlNifEnv* env)
     ASSERT(p == menv->env.proc);
     ASSERT(p->common.id == ERTS_INVALID_PID);
     ASSERT(MBUF(p) == menv->env.heap_frag);
+
+    free_tmp_objs(env);
+
     if (MBUF(p) != NULL) {
 	erts_cleanup_offheap(&MSO(p));
 	clear_offheap(&MSO(p));
@@ -555,12 +601,11 @@ void enif_clear_env(ErlNifEnv* env)
     menv->env.hp = menv->env.hp_end = HEAP_TOP(p);
     
     ASSERT(!is_offheap(&MSO(p)));
-    free_tmp_objs(env);
 }
 
 #ifdef DEBUG
 static int enif_send_delay = 0;
-#define ERTS_FORCE_ENIF_SEND_DELAY() (enif_send_delay++ % 2 == 0)
+#define ERTS_FORCE_ENIF_SEND_DELAY() (enif_send_delay++ % 32 == 0)
 #else
 #ifdef ERTS_PROC_LOCK_OWN_IMPL
 #define ERTS_FORCE_ENIF_SEND_DELAY() 0
@@ -1017,11 +1062,6 @@ int enif_is_number(ErlNifEnv* env, ERL_NIF_TERM term)
     return is_number(term);
 }
 
-static ERTS_INLINE int is_proc_bound(ErlNifEnv* env)
-{
-    return env->mod_nif != NULL;
-}
-
 static void aligned_binary_dtor(struct enif_tmp_obj_t* obj)
 {
     erts_free_aligned_binary_bytes_extra((byte*)obj, obj->allocator);
@@ -1056,22 +1096,14 @@ int enif_inspect_binary(ErlNifEnv* env, Eterm bin_term, ErlNifBinary* bin)
 	u.tmp->dtor = &aligned_binary_dtor;
 	env->tmp_obj_list = u.tmp;
     }
-    bin->bin_term = bin_term;
     bin->size = binary_size(bin_term);
     bin->ref_bin = NULL;
     ADD_READONLY_CHECK(env, bin->data, bin->size);
     return 1;
 }
 
-static void tmp_alloc_dtor(struct enif_tmp_obj_t* obj)
-{
-    erts_free(obj->allocator,  obj);
-}
-
 int enif_inspect_iolist_as_binary(ErlNifEnv* env, Eterm term, ErlNifBinary* bin)
 {
-    struct enif_tmp_obj_t* tobj;
-    ErtsAlcType_t allocator;
     ErlDrvSizeT sz;
     if (is_binary(term)) {
 	return enif_inspect_binary(env,term,bin);
@@ -1079,7 +1111,6 @@ int enif_inspect_iolist_as_binary(ErlNifEnv* env, Eterm term, ErlNifBinary* bin)
     if (is_nil(term)) {
 	bin->data = (unsigned char*) &bin->data; /* dummy non-NULL */
 	bin->size = 0;
-	bin->bin_term = THE_NON_VALUE;
 	bin->ref_bin = NULL;
 	return 1;
     }
@@ -1087,16 +1118,8 @@ int enif_inspect_iolist_as_binary(ErlNifEnv* env, Eterm term, ErlNifBinary* bin)
 	return 0;
     }
 
-    allocator = is_proc_bound(env) ? ERTS_ALC_T_TMP : ERTS_ALC_T_NIF;
-    tobj = erts_alloc(allocator, sz + sizeof(struct enif_tmp_obj_t));
-    tobj->allocator = allocator;
-    tobj->next = env->tmp_obj_list;
-    tobj->dtor = &tmp_alloc_dtor;
-    env->tmp_obj_list = tobj;
-
-    bin->data = (unsigned char*) &tobj[1]; 
+    bin->data = alloc_tmp_obj(env, sz, &tmp_alloc_dtor);
     bin->size = sz;
-    bin->bin_term = THE_NON_VALUE;
     bin->ref_bin = NULL;
     erts_iolist_to_buf(term, (char*) bin->data, sz);
     ADD_READONLY_CHECK(env, bin->data, bin->size); 
@@ -1114,7 +1137,6 @@ int enif_alloc_binary(size_t size, ErlNifBinary* bin)
 
     bin->size = size;
     bin->data = (unsigned char*) refbin->orig_bytes;
-    bin->bin_term = THE_NON_VALUE;
     bin->ref_bin = refbin;
     return 1;
 }
@@ -1148,12 +1170,10 @@ void enif_release_binary(ErlNifBinary* bin)
 {
     if (bin->ref_bin != NULL) {
 	Binary* refbin = bin->ref_bin;
-	ASSERT(bin->bin_term == THE_NON_VALUE);
         erts_bin_release(refbin);
     }
 #ifdef DEBUG
     bin->data = NULL;
-    bin->bin_term = THE_NON_VALUE;
     bin->ref_bin = NULL;
 #endif
 }
@@ -1201,11 +1221,12 @@ size_t enif_binary_to_term(ErlNifEnv *dst_env,
     Sint size;
     ErtsHeapFactory factory;
     byte *bp = (byte*) data;
+    Uint32 flags = 0;
 
-    ERTS_CT_ASSERT(ERL_NIF_BIN2TERM_SAFE == ERTS_DIST_EXT_BTT_SAFE);
-
-    if (opts & ~ERL_NIF_BIN2TERM_SAFE) {
-        return 0;
+    switch ((Uint32)opts) {
+    case 0: break;
+    case ERL_NIF_BIN2TERM_SAFE: flags = ERTS_DIST_EXT_BTT_SAFE; break;
+    default: return 0;
     }
     if ((size = erts_decode_ext_size(bp, data_sz)) < 0)
         return 0;
@@ -1217,7 +1238,7 @@ size_t enif_binary_to_term(ErlNifEnv *dst_env,
         erts_factory_dummy_init(&factory);
     }
 
-    *term = erts_decode_ext(&factory, &bp, (Uint32)opts);
+    *term = erts_decode_ext(&factory, &bp, flags);
 
     if (is_non_value(*term)) {
         return 0;
@@ -1309,39 +1330,51 @@ int enif_get_string(ErlNifEnv *env, ERL_NIF_TERM list, char* buf, unsigned len,
 
 Eterm enif_make_binary(ErlNifEnv* env, ErlNifBinary* bin)
 {
-    if (bin->bin_term != THE_NON_VALUE) {
-	return bin->bin_term;
-    }
-    else if (bin->ref_bin != NULL) {
-	Binary* bptr = bin->ref_bin;
-	ProcBin* pb;
-	Eterm bin_term;
-	
-	/* !! Copy-paste from new_binary() !! */
-	pb = (ProcBin *) alloc_heap(env, PROC_BIN_SIZE);
-	pb->thing_word = HEADER_PROC_BIN;
-	pb->size = bptr->orig_size;
-	pb->next = MSO(env->proc).first;
-	MSO(env->proc).first = (struct erl_off_heap_header*) pb;
-	pb->val = bptr;
-	pb->bytes = (byte*) bptr->orig_bytes;
-	pb->flags = 0;
-	
-	OH_OVERHEAD(&(MSO(env->proc)), pb->size / sizeof(Eterm));
-	bin_term = make_binary(pb);	
-	if (erts_refc_read(&bptr->intern.refc, 1) == 1) {
-	    /* Total ownership transfer */
-	    bin->ref_bin = NULL;
-	    bin->bin_term = bin_term;
-	}
-	return bin_term;
-    }
-    else {
-	flush_env(env);
-	bin->bin_term = new_binary(env->proc, bin->data, bin->size);
-	cache_env(env);
-	return bin->bin_term;
+    Eterm bin_term;
+
+    if (bin->ref_bin != NULL) {
+        Binary* binary = bin->ref_bin;
+
+        /* If the binary is smaller than the heap binary limit we'll return a
+         * heap binary to reduce the number of small refc binaries in the
+         * system. We can't simply release the refc binary right away however;
+         * the documentation states that the binary should be considered
+         * read-only from this point on, which implies that it should still be
+         * readable.
+         *
+         * We could keep it alive until we return by adding it to the temporary
+         * object list, but that requires an off-heap allocation which is
+         * potentially quite slow, so we create a dummy ProcBin instead and
+         * rely on the next minor GC to get rid of it. */
+        if (bin->size <= ERL_ONHEAP_BIN_LIMIT) {
+            ErlHeapBin* hb;
+
+            hb = (ErlHeapBin*)alloc_heap(env, heap_bin_size(bin->size));
+            hb->thing_word = header_heap_bin(bin->size);
+            hb->size = bin->size;
+
+            sys_memcpy(hb->data, bin->data, bin->size);
+
+            erts_build_proc_bin(&MSO(env->proc),
+                                alloc_heap(env, PROC_BIN_SIZE),
+                                binary);
+
+            bin_term = make_binary(hb);
+        } else {
+            bin_term = erts_build_proc_bin(&MSO(env->proc),
+                                           alloc_heap(env, PROC_BIN_SIZE),
+                                           binary);
+        }
+
+        /* Our (possibly shared) ownership has been transferred to the term. */
+        bin->ref_bin = NULL;
+    } else {
+        flush_env(env);
+        bin_term = new_binary(env->proc, bin->data, bin->size);
+        cache_env(env);
     }
+
+    return bin_term;
 }
 
 Eterm enif_make_sub_binary(ErlNifEnv* env, ERL_NIF_TERM bin_term,
@@ -3291,8 +3324,8 @@ typedef struct {
     Eterm sublist_start;
     Eterm sublist_end;
 
-    UWord offheap_size;
-    UWord onheap_size;
+    UWord referenced_size;
+    UWord copied_size;
 
     UWord iovec_len;
 } iovec_slice_t;
@@ -3302,16 +3335,16 @@ static int examine_iovec_term(Eterm list, UWord max_length, iovec_slice_t *resul
 
     result->sublist_start = list;
     result->sublist_length = 0;
-    result->offheap_size = 0;
-    result->onheap_size = 0;
+    result->referenced_size = 0;
+    result->copied_size = 0;
     result->iovec_len = 0;
 
     lookahead = result->sublist_start;
 
     while (is_list(lookahead)) {
-        Eterm *binary_header, binary;
+        UWord byte_size;
+        Eterm binary;
         Eterm *cell;
-        UWord size;
 
         cell = list_val(lookahead);
         binary = CAR(cell);
@@ -3320,39 +3353,42 @@ static int examine_iovec_term(Eterm list, UWord max_length, iovec_slice_t *resul
             return 0;
         }
 
-        size = binary_size(binary);
-        binary_header = binary_val(binary);
+        byte_size = binary_size(binary);
+
+        if (byte_size > 0) {
+            int bit_offset, bit_size;
+            Eterm parent_binary;
+            UWord byte_offset;
+
+            int requires_copying;
 
-        /* If we're a sub-binary we'll need to check our underlying binary to
-         * determine whether we're on-heap or not. */
-        if(thing_subtag(*binary_header) == SUB_BINARY_SUBTAG) {
-            ErlSubBin *sb = (ErlSubBin*)binary_header;
+            ERTS_GET_REAL_BIN(binary, parent_binary, byte_offset,
+                bit_offset, bit_size);
 
-            /* Reject bitstrings */
-            if((sb->bitoffs + sb->bitsize) > 0) {
+            (void)byte_offset;
+
+            if (bit_size != 0) {
                 return 0;
             }
 
-            ASSERT(size <= binary_size(sb->orig));
-            binary_header = binary_val(sb->orig);
-        }
-
-        if(thing_subtag(*binary_header) == HEAP_BINARY_SUBTAG) {
-            ASSERT(size <= ERL_ONHEAP_BIN_LIMIT);
+            /* If we're unaligned or an on-heap binary we'll need to copy
+             * ourselves over to a temporary buffer. */
+            requires_copying = (bit_offset != 0) ||
+                thing_subtag(*binary_val(parent_binary)) == HEAP_BINARY_SUBTAG;
 
-            result->iovec_len += 1;
-            result->onheap_size += size;
-        } else {
-            ASSERT(thing_subtag(*binary_header) == REFC_BINARY_SUBTAG);
+            if (requires_copying) {
+                result->copied_size += byte_size;
+            } else {
+                result->referenced_size += byte_size;
+            }
 
-            result->iovec_len += 1 + size / MAX_SYSIOVEC_IOVLEN;
-            result->offheap_size += size;
+            result->iovec_len += 1 + byte_size / MAX_SYSIOVEC_IOVLEN;
         }
 
         result->sublist_length += 1;
         lookahead = CDR(cell);
 
-        if(result->sublist_length >= max_length) {
+        if (result->sublist_length >= max_length) {
             break;
         }
     }
@@ -3366,7 +3402,9 @@ static int examine_iovec_term(Eterm list, UWord max_length, iovec_slice_t *resul
     return 1;
 }
 
-static void inspect_raw_binary_data(Eterm binary, ErlNifBinary *result) {
+static void marshal_iovec_binary(Eterm binary, ErlNifBinary *copy_buffer,
+        UWord *copy_offset, ErlNifBinary *result) {
+
     Eterm *parent_header;
     Eterm parent_binary;
 
@@ -3377,14 +3415,19 @@ static void inspect_raw_binary_data(Eterm binary, ErlNifBinary *result) {
 
     ERTS_GET_REAL_BIN(binary, parent_binary, byte_offset, bit_offset, bit_size);
 
+    ASSERT(bit_size == 0);
+
     parent_header = binary_val(parent_binary);
 
     result->size = binary_size(binary);
-    result->bin_term = binary;
 
     if (thing_subtag(*parent_header) == REFC_BINARY_SUBTAG) {
         ProcBin *pb = (ProcBin*)parent_header;
 
+        if (pb->flags & (PB_IS_WRITABLE | PB_ACTIVE_WRITER)) {
+            erts_emasculate_writable_binary(pb);
+        }
+
         ASSERT(pb->val != NULL);
         ASSERT(byte_offset < pb->size);
         ASSERT(&pb->bytes[byte_offset] >= (byte*)(pb->val)->orig_bytes);
@@ -3399,24 +3442,48 @@ static void inspect_raw_binary_data(Eterm binary, ErlNifBinary *result) {
         result->data = &((unsigned char*)&hb->data)[byte_offset];
         result->ref_bin = NULL;
     }
+
+    /* If this isn't an *aligned* refc binary, copy its contents to the buffer
+     * and reference that instead. */
+
+    if (result->ref_bin == NULL || bit_offset != 0) {
+        ASSERT(copy_buffer->ref_bin != NULL && copy_buffer->data != NULL);
+        ASSERT(result->size <= (copy_buffer->size - *copy_offset));
+
+        if (bit_offset == 0) {
+            sys_memcpy(&copy_buffer->data[*copy_offset],
+                result->data, result->size);
+        } else {
+            erts_copy_bits(result->data, bit_offset, 1,
+                (byte*)&copy_buffer->data[*copy_offset], 0, 1,
+                result->size * 8);
+        }
+
+        result->data = &copy_buffer->data[*copy_offset];
+        result->ref_bin = copy_buffer->ref_bin;
+
+        *copy_offset += result->size;
+    }
 }
 
 static int fill_iovec_with_slice(ErlNifEnv *env,
                                  iovec_slice_t *slice,
                                  ErlNifIOVec *iovec) {
-    UWord onheap_offset, iovec_idx;
-    ErlNifBinary onheap_data;
+    ErlNifBinary copy_buffer = {0};
+    UWord copy_offset, iovec_idx;
     Eterm sublist_iterator;
 
-    /* Set up a common refc binary for all on-heap binaries. */
-    if (slice->onheap_size > 0) {
-        if (!enif_alloc_binary(slice->onheap_size, &onheap_data)) {
+    /* Set up a common refc binary for all on-heap and unaligned binaries. */
+    if (slice->copied_size > 0) {
+        if (!enif_alloc_binary(slice->copied_size, &copy_buffer)) {
             return 0;
         }
+
+        ASSERT(copy_buffer.ref_bin != NULL);
     }
 
     sublist_iterator = slice->sublist_start;
-    onheap_offset = 0;
+    copy_offset = 0;
     iovec_idx = 0;
 
     while (sublist_iterator != slice->sublist_end) {
@@ -3424,27 +3491,13 @@ static int fill_iovec_with_slice(ErlNifEnv *env,
         Eterm *cell;
 
         cell = list_val(sublist_iterator);
-        inspect_raw_binary_data(CAR(cell), &raw_data);
-
-        /* If this isn't a refc binary, copy its contents to the onheap buffer
-         * and reference that instead. */
-        if (raw_data.ref_bin == NULL) {
-            ASSERT(onheap_offset < onheap_data.size);
-            ASSERT(slice->onheap_size > 0);
-
-            sys_memcpy(&onheap_data.data[onheap_offset],
-                       raw_data.data, raw_data.size);
-
-            raw_data.data = &onheap_data.data[onheap_offset];
-            raw_data.ref_bin = onheap_data.ref_bin;
-        }
-
-        ASSERT(raw_data.ref_bin != NULL);
+        marshal_iovec_binary(CAR(cell), &copy_buffer, &copy_offset, &raw_data);
 
         while (raw_data.size > 0) {
             UWord chunk_len = MIN(raw_data.size, MAX_SYSIOVEC_IOVLEN);
 
             ASSERT(iovec_idx < iovec->iovcnt);
+            ASSERT(raw_data.ref_bin != NULL);
 
             iovec->iov[iovec_idx].iov_base = raw_data.data;
             iovec->iov[iovec_idx].iov_len = chunk_len;
@@ -3469,16 +3522,18 @@ static int fill_iovec_with_slice(ErlNifEnv *env,
             erts_refc_inc(&refc_binary->intern.refc, 1);
         }
 
-        if (slice->onheap_size > 0) {
+        if (slice->copied_size > 0) {
             /* Transfer ownership to the iovec; we've taken references to it in
              * the above loop. */
-            enif_release_binary(&onheap_data);
+            enif_release_binary(&copy_buffer);
         }
     } else {
-        if (slice->onheap_size > 0) {
-            /* Attach the binary to our environment and let the GC take care of
-             * it after returning. */
-            enif_make_binary(env, &onheap_data);
+        if (slice->copied_size > 0) {
+            /* Attach the binary to our environment and let the next minor GC
+             * get rid of it. This is slightly faster than using the tmp object
+             * list since it avoids off-heap allocations. */
+            erts_build_proc_bin(&MSO(env->proc),
+                alloc_heap(env, PROC_BIN_SIZE), copy_buffer.ref_bin);
         }
     }
 
@@ -3504,19 +3559,14 @@ static int create_iovec_from_slice(ErlNifEnv *env,
         alloc_size = binv_offset;
         alloc_size += slice->iovec_len * sizeof(Binary*);
 
-        /* If we have an environment we'll attach the allocated data to it. The
-         * GC will take care of releasing it later on. */
+        /* When the user passes an environment, we attach the iovec to it so
+         * the user won't have to bother managing it (similar to
+         * enif_inspect_binary). It'll disappear once the environment is
+         * cleaned up. */
         if (env != NULL) {
-            ErlNifBinary gc_bin;
-
-            if (!enif_alloc_binary(alloc_size, &gc_bin)) {
-                return 0;
-            }
-
-            alloc_base = (char*)gc_bin.data;
-            enif_make_binary(env, &gc_bin);
+            alloc_base = alloc_tmp_obj(env, alloc_size, &tmp_alloc_dtor);
         } else {
-            alloc_base = enif_alloc(alloc_size);
+            alloc_base = erts_alloc(ERTS_ALC_T_NIF, alloc_size);
         }
 
         iovec = (ErlNifIOVec*)alloc_base;
@@ -3525,12 +3575,12 @@ static int create_iovec_from_slice(ErlNifEnv *env,
         iovec->flags = 0;
     }
 
-    iovec->size = slice->offheap_size + slice->onheap_size;
+    iovec->size = slice->referenced_size + slice->copied_size;
     iovec->iovcnt = slice->iovec_len;
 
     if(!fill_iovec_with_slice(env, slice, iovec)) {
         if (env == NULL && !(iovec->flags & ERL_NIF_IOVEC_FLAGS_PREALLOC)) {
-            enif_free(iovec);
+            erts_free(ERTS_ALC_T_NIF, iovec);
         }
 
         return 0;
@@ -3597,6 +3647,55 @@ int enif_ioq_deq(ErlNifIOQueue *q, size_t elems, size_t *size)
     return 1;
 }
 
+int enif_ioq_peek_head(ErlNifEnv *env, ErlNifIOQueue *q, size_t *size, ERL_NIF_TERM *bin_term) {
+    SysIOVec *iov_entry;
+    Binary *ref_bin;
+
+    if (q->size == 0) {
+        return 0;
+    }
+
+    ASSERT(q->b_head != q->b_tail && q->v_head != q->v_tail);
+
+    ref_bin = &q->b_head[0]->nif;
+    iov_entry = &q->v_head[0];
+
+    if (size != NULL) {
+        *size = iov_entry->iov_len;
+    }
+
+    if (iov_entry->iov_len > ERL_ONHEAP_BIN_LIMIT) {
+        ProcBin *pb = (ProcBin*)alloc_heap(env, PROC_BIN_SIZE);
+
+        pb->thing_word = HEADER_PROC_BIN;
+        pb->next = MSO(env->proc).first;
+        pb->val = ref_bin;
+        pb->flags = 0;
+
+        ASSERT((byte*)iov_entry->iov_base >= (byte*)ref_bin->orig_bytes);
+        ASSERT(iov_entry->iov_len <= ref_bin->orig_size);
+
+        pb->bytes = (byte*)iov_entry->iov_base;
+        pb->size = iov_entry->iov_len;
+
+        MSO(env->proc).first = (struct erl_off_heap_header*) pb;
+        OH_OVERHEAD(&(MSO(env->proc)), pb->size / sizeof(Eterm));
+
+        erts_refc_inc(&ref_bin->intern.refc, 2);
+        *bin_term = make_binary(pb);
+    } else {
+        ErlHeapBin* hb = (ErlHeapBin*)alloc_heap(env, heap_bin_size(iov_entry->iov_len));
+
+        hb->thing_word = header_heap_bin(iov_entry->iov_len);
+        hb->size = iov_entry->iov_len;
+
+        sys_memcpy(hb->data, iov_entry->iov_base, iov_entry->iov_len);
+        *bin_term = make_binary(hb);
+    }
+
+    return 1;
+}
+
 SysIOVec *enif_ioq_peek(ErlNifIOQueue *q, int *iovlen)
 {
     return erts_ioq_peekq(q, iovlen);
@@ -4171,34 +4270,31 @@ static unsigned calc_checksum(unsigned char* ptr, unsigned size);
 
 struct readonly_check_t
 {
-    struct enif_tmp_obj_t hdr;
     unsigned char* ptr;
     unsigned size;
     unsigned checksum;
 };
 static void add_readonly_check(ErlNifEnv* env, unsigned char* ptr, unsigned sz)
 {
-    ErtsAlcType_t allocator = is_proc_bound(env) ? ERTS_ALC_T_TMP : ERTS_ALC_T_NIF;
-    struct readonly_check_t* obj = erts_alloc(allocator, 
-					      sizeof(struct readonly_check_t));
-    obj->hdr.allocator = allocator;
-    obj->hdr.next = env->tmp_obj_list;
-    env->tmp_obj_list = &obj->hdr;
-    obj->hdr.dtor = &readonly_check_dtor;
+    struct readonly_check_t* obj;
+
+    obj = alloc_tmp_obj(env, sizeof(struct readonly_check_t),
+        &readonly_check_dtor);
+
     obj->ptr = ptr;
     obj->size = sz;
-    obj->checksum = calc_checksum(ptr, sz);    
+    obj->checksum = calc_checksum(ptr, sz);
 }
-static void readonly_check_dtor(struct enif_tmp_obj_t* o)
+static void readonly_check_dtor(struct enif_tmp_obj_t* tmp_obj)
 {
-    struct readonly_check_t* obj = (struct readonly_check_t*) o;
-    unsigned chksum = calc_checksum(obj->ptr, obj->size);
-    if (chksum != obj->checksum) { 
+    struct readonly_check_t* ro_check = (struct readonly_check_t*)&tmp_obj[1];
+    unsigned chksum = calc_checksum(ro_check->ptr, ro_check->size);
+    if (chksum != ro_check->checksum) { 
 	fprintf(stderr, "\r\nReadonly data written by NIF, checksums differ"
-		" %x != %x\r\nABORTING\r\n", chksum, obj->checksum);
+		" %x != %x\r\nABORTING\r\n", chksum, ro_check->checksum);
 	abort();
     }
-    erts_free(obj->hdr.allocator,  obj);
+    erts_free(tmp_obj->allocator, tmp_obj);
 }
 static unsigned calc_checksum(unsigned char* ptr, unsigned size)
 {
@@ -4273,7 +4369,7 @@ static void get_string_maybe(ErlNifEnv *env, const ERL_NIF_TERM term,
         str_bin.size > bufsiz) {
         *ptr = NULL;
     } else {
-        memcpy(buf, (char *) str_bin.data, str_bin.size);
+        sys_memcpy(buf, (char *) str_bin.data, str_bin.size);
         buf[str_bin.size] = '\0';
         *ptr = buf;
     }
@@ -4290,7 +4386,7 @@ ERL_NIF_TERM erl_nif_user_trace_s1(ErlNifEnv* env, int argc,
 	    message_bin.size > MESSAGE_BUFSIZ) {
 	    return am_badarg;
 	}
-	memcpy(messagebuf, (char *) message_bin.data, message_bin.size);
+	sys_memcpy(messagebuf, (char *) message_bin.data, message_bin.size);
         messagebuf[message_bin.size] = '\0';
 	DTRACE1(user_trace_s1, messagebuf);
 	return am_true;
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h
index d195721054..a99b4db705 100644
--- a/erts/emulator/beam/erl_nif.h
+++ b/erts/emulator/beam/erl_nif.h
@@ -50,10 +50,12 @@
 ** 2.9: 18.2 enif_getenv
 ** 2.10: Time API
 ** 2.11: 19.0 enif_snprintf 
-** 2.12: 20.0 add enif_queue
+** 2.12: 20.0 add enif_select, enif_open_resource_type_x
+** 2.13: 20.1 add enif_ioq
+** 2.14: 21.0 add enif_ioq_peek_head
 */
 #define ERL_NIF_MAJOR_VERSION 2
-#define ERL_NIF_MINOR_VERSION 12
+#define ERL_NIF_MINOR_VERSION 14
 
 /*
  * The emulator will refuse to load a nif-lib with a major version
@@ -135,8 +137,9 @@ typedef struct
     unsigned char* data;
 
     /* Internals (avert your eyes) */
-    ERL_NIF_TERM bin_term;
     void* ref_bin;
+    /* for future additions to be ABI compatible (same struct size) */
+    void* __spare__[2];
 }ErlNifBinary;
 
 #if (defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_))
diff --git a/erts/emulator/beam/erl_nif_api_funcs.h b/erts/emulator/beam/erl_nif_api_funcs.h
index 9e573307d8..3750fd9b68 100644
--- a/erts/emulator/beam/erl_nif_api_funcs.h
+++ b/erts/emulator/beam/erl_nif_api_funcs.h
@@ -198,6 +198,7 @@ ERL_NIF_API_FUNC_DECL(SysIOVec*,enif_ioq_peek,(ErlNifIOQueue *q, int *iovlen));
 ERL_NIF_API_FUNC_DECL(int,enif_inspect_iovec,(ErlNifEnv *env, size_t max_length, ERL_NIF_TERM iovec_term, ERL_NIF_TERM *tail, ErlNifIOVec **iovec));
 ERL_NIF_API_FUNC_DECL(void,enif_free_iovec,(ErlNifIOVec *iov));
 
+ERL_NIF_API_FUNC_DECL(int,enif_ioq_peek_head,(ErlNifEnv *env, ErlNifIOQueue *q, size_t *size, ERL_NIF_TERM *head));
 
 /*
 ** ADD NEW ENTRIES HERE (before this comment) !!!
@@ -373,6 +374,7 @@ ERL_NIF_API_FUNC_DECL(void,enif_free_iovec,(ErlNifIOVec *iov));
 #  define enif_ioq_peek ERL_NIF_API_FUNC_MACRO(enif_ioq_peek)
 #  define enif_inspect_iovec ERL_NIF_API_FUNC_MACRO(enif_inspect_iovec)
 #  define enif_free_iovec ERL_NIF_API_FUNC_MACRO(enif_free_iovec)
+#  define enif_ioq_peek_head ERL_NIF_API_FUNC_MACRO(enif_ioq_peek_head)
 
 /*
 ** ADD NEW ENTRIES HERE (before this comment)
diff --git a/erts/emulator/beam/erl_node_tables.c b/erts/emulator/beam/erl_node_tables.c
index 0f3dfa797c..e8901a652f 100644
--- a/erts/emulator/beam/erl_node_tables.c
+++ b/erts/emulator/beam/erl_node_tables.c
@@ -39,9 +39,11 @@ erts_rwmtx_t erts_node_table_rwmtx;
 
 DistEntry *erts_hidden_dist_entries;
 DistEntry *erts_visible_dist_entries;
+DistEntry *erts_pending_dist_entries;
 DistEntry *erts_not_connected_dist_entries; /* including erts_this_dist_entry */
 Sint erts_no_of_hidden_dist_entries;
 Sint erts_no_of_visible_dist_entries;
+Sint erts_no_of_pending_dist_entries;
 Sint erts_no_of_not_connected_dist_entries; /* including erts_this_dist_entry */
 
 DistEntry *erts_this_dist_entry;
@@ -101,7 +103,9 @@ void
 erts_ref_dist_entry(DistEntry *dep)
 {
     ASSERT(dep);
-    de_refc_inc(dep, 1);
+    if (de_refc_inc_read(dep, 1) == 1) {
+        de_refc_inc(dep, 2);  /* Pending delete */
+    }
 }
 
 void
@@ -139,9 +143,7 @@ dist_table_cmp(void *dep1, void *dep2)
 static void*
 dist_table_alloc(void *dep_tmpl)
 {
-#ifdef DEBUG
     erts_aint_t refc;
-#endif
     Eterm sysname;
     Binary *bin;
     DistEntry *dep;
@@ -158,13 +160,8 @@ dist_table_alloc(void *dep_tmpl)
 
     dist_entries++;
 
-#ifdef DEBUG
-    refc =
-#else
-    (void)
-#endif
-        de_refc_dec_read(dep, -1);
-    ASSERT(refc == -1);
+    refc = de_refc_dec_read(dep, -1);
+    ASSERT(refc == -1); (void)refc;
 
     dep->prev				= NULL;
     erts_rwmtx_init_opt(&dep->rwmtx, &rwmtx_opt, "dist_entry", sysname,
@@ -173,7 +170,7 @@ dist_table_alloc(void *dep_tmpl)
     dep->cid				= NIL;
     erts_atomic_init_nob(&dep->input_handler, (erts_aint_t) NIL);
     dep->connection_id			= 0;
-    dep->status				= 0;
+    dep->state				= ERTS_DE_STATE_IDLE;
     dep->flags				= 0;
     dep->version			= 0;
 
@@ -202,6 +199,7 @@ dist_table_alloc(void *dep_tmpl)
     erts_port_task_handle_init(&dep->dist_cmd);
     dep->send				= NULL;
     dep->cache				= NULL;
+    dep->transcode_ctx                  = NULL;
 
     /* Link in */
 
@@ -224,6 +222,8 @@ dist_table_free(void *vdep)
 {
     DistEntry *dep = (DistEntry *) vdep;
 
+    ASSERT(de_refc_read(dep, -1) == -1);
+    ASSERT(dep->state == ERTS_DE_STATE_IDLE);
     ASSERT(is_nil(dep->cid));
     ASSERT(dep->nlinks == NULL);
     ASSERT(dep->node_links == NULL);
@@ -384,56 +384,92 @@ erts_dhandle_to_dist_entry(Eterm dhandle)
 }
 
 Eterm
-erts_make_dhandle(Process *c_p, DistEntry *dep)
+erts_build_dhandle(Eterm **hpp, ErlOffHeap* ohp, DistEntry *dep)
 {
-    Binary *bin;
-    Eterm *hp;
-
-    bin = ErtsDistEntry2Bin(dep);
+    Binary *bin = ErtsDistEntry2Bin(dep);
     ASSERT(bin);
     ASSERT(ERTS_MAGIC_BIN_DESTRUCTOR(bin) == erts_dist_entry_destructor);
-    hp = HAlloc(c_p, ERTS_MAGIC_REF_THING_SIZE);
-    return erts_mk_magic_ref(&hp, &c_p->off_heap, bin);
+    return erts_mk_magic_ref(hpp, ohp, bin);
+}
+
+Eterm
+erts_make_dhandle(Process *c_p, DistEntry *dep)
+{
+    Eterm *hp = HAlloc(c_p, ERTS_MAGIC_REF_THING_SIZE);
+    return erts_build_dhandle(&hp, &c_p->off_heap, dep);
 }
 
-static void try_delete_dist_entry(void *vbin);
+static void start_timer_delete_dist_entry(void *vdep);
+static void prepare_try_delete_dist_entry(void *vdep);
+static void try_delete_dist_entry(DistEntry*);
+
+static void schedule_delete_dist_entry(DistEntry* dep)
+{
+    /*
+     * Here we need thread progress to wait for other threads, that may have
+     * done lookup without refc++, to do either refc++ or drop their refs.
+     *
+     * Note that timeouts do not guarantee thread progress.
+     */
+    erts_schedule_thr_prgr_later_op(start_timer_delete_dist_entry,
+                                    dep, &dep->later_op);
+}
 
 static void
-prepare_try_delete_dist_entry(void *vbin)
+start_timer_delete_dist_entry(void *vdep)
 {
-    Binary *bin = (Binary *) vbin;
-    DistEntry *dep = ErtsBin2DistEntry(bin);
-    Uint size;
+    if (node_tab_delete_delay == 0) {
+        prepare_try_delete_dist_entry(vdep);
+    }
+    else {
+        ASSERT(node_tab_delete_delay > 0);
+        erts_start_timer_callback(node_tab_delete_delay,
+                                  prepare_try_delete_dist_entry,
+                                  vdep);
+    }
+}
+
+static void
+prepare_try_delete_dist_entry(void *vdep)
+{
+    DistEntry *dep = vdep;
     erts_aint_t refc;
 
+    /*
+     * Time has passed since we decremented refc to zero and DistEntry may
+     * have been revived. Do a fast check without table lock first.
+     */
     refc = de_refc_read(dep, 0);
-    if (refc > 0)
-        return;
-
-    size = ERTS_MAGIC_BIN_SIZE(sizeof(DistEntry));
-    erts_schedule_thr_prgr_later_cleanup_op(try_delete_dist_entry,
-                                            vbin, &dep->later_op, size);
+    if (refc == 0) {
+        try_delete_dist_entry(dep);
+    }
+    else {
+        /*
+         * Someone has done lookup and done refc++ for us.
+         */
+        refc = de_refc_dec_read(dep, 0);
+        if (refc == 0)
+            schedule_delete_dist_entry(dep);
+    }
 }
 
-static void try_delete_dist_entry(void *vbin)
+static void try_delete_dist_entry(DistEntry* dep)
 {
-    Binary *bin = (Binary *) vbin;
-    DistEntry *dep = ErtsBin2DistEntry(bin);
     erts_aint_t refc;
 
     erts_rwmtx_rwlock(&erts_dist_table_rwmtx);
     /*
      * Another thread might have looked up this dist entry after
      * we decided to delete it (refc became zero). If so, the other
-     * thread incremented refc twice. Once for the new reference
-     * and once for this thread.
+     * thread incremented refc one extra step for this thread.
      *
-     * If refc reach -1, no one has used the entry since we
-     * set up the timer. Delete the entry.
+     * If refc reach -1, no one has done lookup and no one can do lookup
+     * as we have table lock. Delete the entry.
      *
-     * If refc reach 0, the entry is currently not in use
-     * but has been used since we set up the timer. Set up a
-     * new timer.
+     * If refc reach 0, someone raced us and either
+     *  (1) did lookup with own refc++ and already released it again
+     *  (2) did lookup without own refc++
+     * Schedule new delete operation.
      *
      * If refc > 0, the entry is in use. Keep the entry.
      */
@@ -443,12 +479,7 @@ static void try_delete_dist_entry(void *vbin)
     erts_rwmtx_rwunlock(&erts_dist_table_rwmtx);
 
     if (refc == 0) {
-        if (node_tab_delete_delay == 0)
-            prepare_try_delete_dist_entry(vbin);
-        else if (node_tab_delete_delay > 0)
-            erts_start_timer_callback(node_tab_delete_delay,
-                                      prepare_try_delete_dist_entry,
-                                      vbin);
+        schedule_delete_dist_entry(dep);
     }
 }
 
@@ -462,12 +493,7 @@ int erts_dist_entry_destructor(Binary *bin)
     if (refc == -1)
         return 1; /* Allow deallocation of structure... */
 
-    if (node_tab_delete_delay == 0)
-        prepare_try_delete_dist_entry((void *) bin);
-    else if (node_tab_delete_delay > 0)
-        erts_start_timer_callback(node_tab_delete_delay,
-                                  prepare_try_delete_dist_entry,
-                                  (void *) bin);
+    schedule_delete_dist_entry(dep);
 
     return 0;
 }
@@ -498,12 +524,17 @@ erts_dist_table_size(void)
 	i++;
     ASSERT(i == erts_no_of_hidden_dist_entries);
     i = 0;
+    for(dep = erts_pending_dist_entries; dep; dep = dep->next)
+        i++;
+    ASSERT(i == erts_no_of_pending_dist_entries);
+    i = 0;
     for(dep = erts_not_connected_dist_entries; dep; dep = dep->next)
 	i++;
     ASSERT(i == erts_no_of_not_connected_dist_entries);
 
     ASSERT(dist_entries == (erts_no_of_visible_dist_entries
 			    + erts_no_of_hidden_dist_entries
+                            + erts_no_of_pending_dist_entries
 			    + erts_no_of_not_connected_dist_entries));
 #endif
 
@@ -518,43 +549,46 @@ erts_dist_table_size(void)
 void
 erts_set_dist_entry_not_connected(DistEntry *dep)
 {
+    DistEntry** head;
+
     ERTS_LC_ASSERT(erts_lc_is_de_rwlocked(dep));
     erts_rwmtx_rwlock(&erts_dist_table_rwmtx);
 
     ASSERT(dep != erts_this_dist_entry);
-    ASSERT(is_internal_port(dep->cid) || is_internal_pid(dep->cid));
-
-    if(dep->flags & DFLAG_PUBLISHED) {
-	if(dep->prev) {
-	    ASSERT(is_in_de_list(dep, erts_visible_dist_entries));
-	    dep->prev->next = dep->next;
-	}
-	else {
-	    ASSERT(erts_visible_dist_entries == dep);
-	    erts_visible_dist_entries = dep->next;
-	}
 
-	ASSERT(erts_no_of_visible_dist_entries > 0);
-	erts_no_of_visible_dist_entries--;
+    if (dep->state == ERTS_DE_STATE_PENDING) {
+        ASSERT(is_nil(dep->cid));
+        ASSERT(erts_no_of_pending_dist_entries > 0);
+        erts_no_of_pending_dist_entries--;
+        head = &erts_pending_dist_entries;
     }
     else {
-	if(dep->prev) {
-	    ASSERT(is_in_de_list(dep, erts_hidden_dist_entries));
-	    dep->prev->next = dep->next;
-	}
-	else {
-	    ASSERT(erts_hidden_dist_entries == dep);
-	    erts_hidden_dist_entries = dep->next;
-	}
-
-	ASSERT(erts_no_of_hidden_dist_entries > 0);
-	erts_no_of_hidden_dist_entries--;
+        ASSERT(dep->state != ERTS_DE_STATE_IDLE);
+        ASSERT(is_internal_port(dep->cid) || is_internal_pid(dep->cid));
+        if (dep->flags & DFLAG_PUBLISHED) {
+            ASSERT(erts_no_of_visible_dist_entries > 0);
+            erts_no_of_visible_dist_entries--;
+            head = &erts_visible_dist_entries;
+        }
+        else {
+            ASSERT(erts_no_of_hidden_dist_entries > 0);
+            erts_no_of_hidden_dist_entries--;
+            head = &erts_hidden_dist_entries;
+        }
     }
 
+    if(dep->prev) {
+        ASSERT(is_in_de_list(dep, *head));
+        dep->prev->next = dep->next;
+    }
+    else {
+        ASSERT(*head == dep);
+        *head = dep->next;
+    }
     if(dep->next)
 	dep->next->prev = dep->prev;
 
-    dep->status &= ~ERTS_DE_SFLG_CONNECTED;
+    dep->state = ERTS_DE_STATE_EXITING;
     dep->flags = 0;
     dep->prev = NULL;
     dep->cid = NIL;
@@ -570,46 +604,86 @@ erts_set_dist_entry_not_connected(DistEntry *dep)
 }
 
 void
+erts_set_dist_entry_pending(DistEntry *dep)
+{
+    ERTS_LC_ASSERT(erts_lc_is_de_rwlocked(dep));
+    erts_rwmtx_rwlock(&erts_dist_table_rwmtx);
+
+    ASSERT(dep != erts_this_dist_entry);
+    ASSERT(dep->state == ERTS_DE_STATE_IDLE);
+    ASSERT(is_nil(dep->cid));
+
+    if(dep->prev) {
+        ASSERT(is_in_de_list(dep, erts_not_connected_dist_entries));
+        dep->prev->next = dep->next;
+    }
+    else {
+        ASSERT(dep == erts_not_connected_dist_entries);
+        erts_not_connected_dist_entries = dep->next;
+    }
+
+    if(dep->next)
+	dep->next->prev = dep->prev;
+
+    erts_no_of_not_connected_dist_entries--;
+
+    dep->state = ERTS_DE_STATE_PENDING;
+    dep->flags = (DFLAG_DIST_MANDATORY | DFLAG_DIST_HOPEFULLY | DFLAG_NO_MAGIC);
+    dep->connection_id = (dep->connection_id + 1) & ERTS_DIST_CON_ID_MASK;
+
+    dep->prev = NULL;
+    dep->next = erts_pending_dist_entries;
+    if(erts_pending_dist_entries) {
+	ASSERT(erts_pending_dist_entries->prev == NULL);
+	erts_pending_dist_entries->prev = dep;
+    }
+    erts_pending_dist_entries = dep;
+    erts_no_of_pending_dist_entries++;
+    erts_rwmtx_rwunlock(&erts_dist_table_rwmtx);
+}
+
+void
 erts_set_dist_entry_connected(DistEntry *dep, Eterm cid, Uint flags)
 {
+    erts_aint32_t set_qflgs;
+
     ERTS_LC_ASSERT(erts_lc_is_de_rwlocked(dep));
     erts_rwmtx_rwlock(&erts_dist_table_rwmtx);
 
     ASSERT(dep != erts_this_dist_entry);
     ASSERT(is_nil(dep->cid));
+    ASSERT(dep->state == ERTS_DE_STATE_PENDING);
     ASSERT(is_internal_port(cid) || is_internal_pid(cid));
 
     if(dep->prev) {
-	ASSERT(is_in_de_list(dep, erts_not_connected_dist_entries));
+	ASSERT(is_in_de_list(dep, erts_pending_dist_entries));
 	dep->prev->next = dep->next;
     }
     else {
-	ASSERT(erts_not_connected_dist_entries == dep);
-	erts_not_connected_dist_entries = dep->next;
+	ASSERT(erts_pending_dist_entries == dep);
+	erts_pending_dist_entries = dep->next;
     }
 
     if(dep->next)
 	dep->next->prev = dep->prev;
 
-    ASSERT(erts_no_of_not_connected_dist_entries > 0);
-    erts_no_of_not_connected_dist_entries--;
+    ASSERT(erts_no_of_pending_dist_entries > 0);
+    erts_no_of_pending_dist_entries--;
 
-    dep->status |= ERTS_DE_SFLG_CONNECTED;
-    dep->flags = flags;
+    dep->state = ERTS_DE_STATE_CONNECTED;
+    dep->flags = flags & ~DFLAG_NO_MAGIC;
     dep->cid = cid;
     erts_atomic_set_nob(&dep->input_handler,
                             (erts_aint_t) cid);
 
-    dep->connection_id++;
-    dep->connection_id &= ERTS_DIST_EXT_CON_ID_MASK;
     dep->prev = NULL;
 
     erts_atomic64_set_nob(&dep->in, 0);
     erts_atomic64_set_nob(&dep->out, 0);
-    erts_atomic32_set_nob(&dep->qflgs,
-                          (is_internal_port(cid)
-                           ? ERTS_DE_QFLG_PORT_CTRL
-                           : ERTS_DE_QFLG_PROC_CTRL));
+    set_qflgs = (is_internal_port(cid) ?
+                 ERTS_DE_QFLG_PORT_CTRL : ERTS_DE_QFLG_PROC_CTRL);
+    erts_atomic32_read_bor_nob(&dep->qflgs, set_qflgs);
+
     if(flags & DFLAG_PUBLISHED) {
 	dep->next = erts_visible_dist_entries;
 	if(erts_visible_dist_entries) {
@@ -929,9 +1003,11 @@ void erts_init_node_tables(int dd_sec)
 
     erts_hidden_dist_entries				= NULL;
     erts_visible_dist_entries				= NULL;
+    erts_pending_dist_entries			        = NULL;
     erts_not_connected_dist_entries			= NULL;
     erts_no_of_hidden_dist_entries			= 0;
     erts_no_of_visible_dist_entries			= 0;
+    erts_no_of_pending_dist_entries			= 0;
     erts_no_of_not_connected_dist_entries		= 0;
 
     node_tmpl.sysname = am_Noname;
@@ -1057,6 +1133,7 @@ typedef struct {
 typedef struct dist_referrer_ {
     struct dist_referrer_ *next;
     int heap_ref;
+    int ets_ref;
     int node_ref;
     int ctrl_ref;
     int system_ref;
@@ -1175,10 +1252,11 @@ insert_dist_referrer(ReferredDist *referred_dist,
 	else {
 	    Uint *hp = &drp->id_heap[0];
 	    ASSERT(is_tuple(id));
-	    drp->id = copy_struct(id, size_object(id), &hp, NULL);
+            drp->id = copy_struct(id, size_object(id), &hp, NULL);
 	}
 	drp->creation = creation;
 	drp->heap_ref = 0;
+        drp->ets_ref = 0;
 	drp->node_ref = 0;
 	drp->ctrl_ref = 0;
 	drp->system_ref = 0;
@@ -1188,6 +1266,7 @@ insert_dist_referrer(ReferredDist *referred_dist,
     case NODE_REF:	drp->node_ref++;	break;
     case CTRL_REF:	drp->ctrl_ref++;	break;
     case HEAP_REF:	drp->heap_ref++;	break;
+    case ETS_REF:	drp->ets_ref++;	        break;
     case SYSTEM_REF:	drp->system_ref++;	break;
     default:		ASSERT(0);
     }
@@ -1300,6 +1379,11 @@ insert_offheap2(ErlOffHeap *oh, void *arg)
     (((Bin)->intern.flags & BIN_FLAG_MAGIC)                             \
      && ERTS_MAGIC_BIN_DESTRUCTOR((Bin)) == erts_dist_entry_destructor)
 
+#define IsSendCtxBinary(Bin)                                            \
+    (((Bin)->intern.flags & BIN_FLAG_MAGIC)                             \
+     && ERTS_MAGIC_BIN_DESTRUCTOR((Bin)) == erts_dsend_context_dtor)
+
+
 static void
 insert_offheap(ErlOffHeap *oh, int type, Eterm id)
 {
@@ -1336,7 +1420,12 @@ insert_offheap(ErlOffHeap *oh, int type, Eterm id)
 		    inserted_bins = nib;
 		    UnUseTmpHeapNoproc(BIG_UINT_HEAP_SIZE);
 		}
-	    }		
+	    }
+            else if (IsSendCtxBinary(u.mref->mb)) {
+                ErtsSendContext* ctx = ERTS_MAGIC_BIN_DATA(u.mref->mb);
+                if (ctx->deref_dep)
+                    insert_dist_entry(ctx->dep, type, id, 0);
+            }
 	    break;
 	case REFC_BINARY_SUBTAG:
 	case FUN_SUBTAG:
@@ -1463,9 +1552,9 @@ insert_delayed_delete_node(void *state,
 }
 
 static void
-insert_thr_prgr_delete_dist_entry(void *arg, ErtsThrPrgrVal thr_prgr, void *vbin)
+insert_thr_prgr_delete_dist_entry(void *arg, ErtsThrPrgrVal thr_prgr, void *vdep)
 {
-    DistEntry *dep = ErtsBin2DistEntry(vbin);
+    DistEntry *dep = vdep;
     Eterm heap[3];
     insert_dist_entry(dep,
 		      SYSTEM_REF,
@@ -1476,9 +1565,9 @@ insert_thr_prgr_delete_dist_entry(void *arg, ErtsThrPrgrVal thr_prgr, void *vbin
 static void
 insert_delayed_delete_dist_entry(void *state,
 				 ErtsMonotonicTime timeout_pos,
-				 void *vbin)
+				 void *vdep)
 {
-    DistEntry *dep = ErtsBin2DistEntry(vbin);
+    DistEntry *dep = vdep;
     Eterm heap[3];
     insert_dist_entry(dep,
 		      SYSTEM_REF,
@@ -1520,7 +1609,7 @@ setup_reference_table(void)
     erts_debug_callback_timer_foreach(prepare_try_delete_dist_entry,
 				      insert_delayed_delete_dist_entry,
 				      NULL);
-    erts_debug_later_op_foreach(try_delete_dist_entry,
+    erts_debug_later_op_foreach(start_timer_delete_dist_entry,
                                 insert_thr_prgr_delete_dist_entry,
                                 NULL);
 
@@ -1686,6 +1775,15 @@ setup_reference_table(void)
 	    insert_monitors(dep->monitors, dep->sysname);
     }
 
+    for(dep = erts_pending_dist_entries; dep; dep = dep->next) {
+        if(dep->nlinks)
+            insert_links2(dep->nlinks, dep->sysname);
+        if(dep->node_links)
+            insert_links(dep->node_links, dep->sysname);
+        if(dep->monitors)
+            insert_monitors(dep->monitors, dep->sysname);
+    }
+
     /* Not connected dist entries should not have any links,
        but inspect them anyway */
     for(dep = erts_not_connected_dist_entries; dep; dep = dep->next) {
@@ -1855,6 +1953,10 @@ reference_table_term(Uint **hpp, ErlOffHeap *ohp, Uint *szp)
 		tup = MK_2TUP(AM_heap, MK_UINT(drp->heap_ref));
 		drl = MK_CONS(tup, drl);
 	    }
+            if(drp->ets_ref) {
+                tup = MK_2TUP(AM_ets, MK_UINT(drp->ets_ref));
+                drl = MK_CONS(tup, drl);
+            }
 	    if(drp->system_ref) {
 		tup = MK_2TUP(AM_system, MK_UINT(drp->system_ref));
 		drl = MK_CONS(tup, drl);
@@ -1871,12 +1973,17 @@ reference_table_term(Uint **hpp, ErlOffHeap *ohp, Uint *szp)
 	    else if (is_tuple(drp->id)) {
 		Eterm *t;
 		ASSERT(drp->system_ref && !drp->node_ref
-		       && !drp->ctrl_ref && !drp->heap_ref);
+		       && !drp->ctrl_ref && !drp->heap_ref && !drp->ets_ref);
 		t = tuple_val(drp->id);
 		ASSERT(2 == arityval(t[0]));
 		tup = MK_2TUP(t[1], t[2]);
 	    }
-	    else {
+	    else if (drp->ets_ref) {
+                ASSERT(!drp->heap_ref && !drp->node_ref &&
+                       !drp->ctrl_ref && !drp->system_ref);
+                tup = MK_2TUP(AM_ets, drp->id);
+            }
+            else {
 		ASSERT(!drp->ctrl_ref && drp->node_ref);
 		ASSERT(is_atom(drp->id));
 		tup = MK_2TUP(drp->id, MK_UINT(drp->creation));
diff --git a/erts/emulator/beam/erl_node_tables.h b/erts/emulator/beam/erl_node_tables.h
index ee8277b5ea..58279017c8 100644
--- a/erts/emulator/beam/erl_node_tables.h
+++ b/erts/emulator/beam/erl_node_tables.h
@@ -57,11 +57,12 @@
  
 #define ERST_INTERNAL_CHANNEL_NO 0
 
-#define ERTS_DE_SFLG_CONNECTED			(((Uint32) 1) <<  0)
-#define ERTS_DE_SFLG_EXITING			(((Uint32) 1) <<  1)
-
-#define ERTS_DE_SFLGS_ALL			(ERTS_DE_SFLG_CONNECTED \
-						 | ERTS_DE_SFLG_EXITING)
+enum dist_entry_state {
+    ERTS_DE_STATE_IDLE,
+    ERTS_DE_STATE_PENDING,
+    ERTS_DE_STATE_CONNECTED,
+    ERTS_DE_STATE_EXITING
+};
 
 #define ERTS_DE_QFLG_BUSY			(((erts_aint32_t) 1) <<  0)
 #define ERTS_DE_QFLG_EXIT			(((erts_aint32_t) 1) <<  1)
@@ -85,10 +86,13 @@ typedef struct ErtsDistOutputBuf_ ErtsDistOutputBuf;
 struct ErtsDistOutputBuf_ {
 #ifdef DEBUG
     Uint dbg_pattern;
+    byte *alloc_endp;
 #endif
     ErtsDistOutputBuf *next;
+    Uint hopefull_flags;
     byte *extp;
     byte *ext_endp;
+    byte *msg_start;
     byte data[1];
 };
 
@@ -109,8 +113,6 @@ struct ErtsProcList_;
  *   unlock mutexes with higher numbers before mutexes with higher numbers.
  */
 
-struct erl_link;
-
 typedef struct dist_entry_ {
     HashBucket hash_bucket;     /* Hash bucket */
     struct dist_entry_ *next;	/* Next entry in dist_table (not sorted) */
@@ -123,7 +125,7 @@ typedef struct dist_entry_ {
     Eterm cid;			/* connection handler (pid or port),
                                    NIL == free */
     Uint32 connection_id;	/* Connection id incremented on connect */
-    Uint32 status;		/* Slot status, like exiting reserved etc */
+    enum dist_entry_state state;
     Uint32 flags;		/* Distribution flags, like hidden, 
 				   atom cache etc. */
     unsigned long version;	/* Protocol version */
@@ -159,6 +161,8 @@ typedef struct dist_entry_ {
     struct cache* cache;	/* The atom cache */
 
     ErtsThrPrgrLaterOp later_op;
+
+    struct transcode_context* transcode_ctx;
 } DistEntry;
 
 typedef struct erl_node_ {
@@ -177,9 +181,11 @@ extern erts_rwmtx_t erts_node_table_rwmtx;
 
 extern DistEntry *erts_hidden_dist_entries;
 extern DistEntry *erts_visible_dist_entries;
+extern DistEntry *erts_pending_dist_entries;
 extern DistEntry *erts_not_connected_dist_entries;
 extern Sint erts_no_of_hidden_dist_entries;
 extern Sint erts_no_of_visible_dist_entries;
+extern Sint erts_no_of_pending_dist_entries;
 extern Sint erts_no_of_not_connected_dist_entries;
 
 extern DistEntry *erts_this_dist_entry;
@@ -195,6 +201,7 @@ void erts_schedule_delete_dist_entry(DistEntry *);
 Uint erts_dist_table_size(void);
 void erts_dist_table_info(fmtfn_t, void *);
 void erts_set_dist_entry_not_connected(DistEntry *);
+void erts_set_dist_entry_pending(DistEntry *);
 void erts_set_dist_entry_connected(DistEntry *, Eterm, Uint);
 ErlNode *erts_find_or_insert_node(Eterm, Uint32);
 void erts_schedule_delete_node(ErlNode *);
@@ -210,6 +217,7 @@ int erts_lc_is_de_rlocked(DistEntry *);
 #endif
 int erts_dist_entry_destructor(Binary *bin);
 DistEntry *erts_dhandle_to_dist_entry(Eterm dhandle);
+Eterm erts_build_dhandle(Eterm **hpp, ErlOffHeap*, DistEntry*);
 Eterm erts_make_dhandle(Process *c_p, DistEntry *dep);
 void erts_ref_dist_entry(DistEntry *dep);
 void erts_deref_dist_entry(DistEntry *dep);
diff --git a/erts/emulator/beam/erl_port.h b/erts/emulator/beam/erl_port.h
index 9117eb1f72..0d148ee048 100644
--- a/erts/emulator/beam/erl_port.h
+++ b/erts/emulator/beam/erl_port.h
@@ -180,6 +180,7 @@ void erts_init_port_data(Port *);
 void erts_cleanup_port_data(Port *);
 Uint erts_port_data_size(Port *);
 ErlOffHeap *erts_port_data_offheap(Port *);
+Eterm erts_port_data_read(Port* prt);
 
 #define ERTS_PORT_GET_CONNECTED(PRT) \
     ((Eterm) erts_atomic_read_nob(&(PRT)->connected))
@@ -195,26 +196,52 @@ struct erl_drv_port_data_lock {
     Port *prt;
 };
 
+ERTS_GLB_INLINE void erts_init_runq_port(Port *prt, ErtsRunQueue *runq);
+ERTS_GLB_INLINE void erts_set_runq_port(Port *prt, ErtsRunQueue *runq);
+ERTS_GLB_INLINE ErtsRunQueue *erts_get_runq_port(Port *prt);
 ERTS_GLB_INLINE ErtsRunQueue *erts_port_runq(Port *prt);
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
+ERTS_GLB_INLINE void
+erts_init_runq_port(Port *prt, ErtsRunQueue *runq)
+{
+    if (!runq)
+        ERTS_INTERNAL_ERROR("Missing run-queue");
+    erts_atomic_init_nob(&prt->run_queue, (erts_aint_t) runq);
+}
+
+ERTS_GLB_INLINE void
+erts_set_runq_port(Port *prt, ErtsRunQueue *runq)
+{
+    if (!runq)
+        ERTS_INTERNAL_ERROR("Missing run-queue");
+    erts_atomic_set_nob(&prt->run_queue, (erts_aint_t) runq);
+}
+
+ERTS_GLB_INLINE ErtsRunQueue *
+erts_get_runq_port(Port *prt)
+{
+    ErtsRunQueue *runq;
+    runq = (ErtsRunQueue *) erts_atomic_read_nob(&prt->run_queue);
+    if (!runq)
+        ERTS_INTERNAL_ERROR("Missing run-queue");
+    return runq;
+}
+
+
 ERTS_GLB_INLINE ErtsRunQueue *
 erts_port_runq(Port *prt)
 {
     ErtsRunQueue *rq1, *rq2;
-    rq1 = (ErtsRunQueue *) erts_atomic_read_nob(&prt->run_queue);
-    if (!rq1)
-	return NULL;
+    rq1 = erts_get_runq_port(prt);
     while (1) {
 	erts_runq_lock(rq1);
-	rq2 = (ErtsRunQueue *) erts_atomic_read_nob(&prt->run_queue);
+	rq2 = erts_get_runq_port(prt);
 	if (rq1 == rq2)
 	    return rq1;
 	erts_runq_unlock(rq1);
 	rq1 = rq2;
-	if (!rq1)
-	    return NULL;
     }
 }
 
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index a588477320..4a3671df0c 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -84,11 +84,10 @@ static void chk_task_queues(Port *pp, ErtsPortTask *execq, int processing_busy_q
 #define LTTNG_DRIVER(TRACEPOINT, PP) do {} while(0)
 #endif
 
-#define ERTS_LC_VERIFY_RQ(RQ, PP)					\
-    do {								\
+#define ERTS_LC_VERIFY_RQ(RQ, PP)				\
+    do {							\
 	ERTS_LC_ASSERT(erts_lc_runq_is_locked(runq));		\
-	ERTS_LC_ASSERT((RQ) == ((ErtsRunQueue *)			\
-				    erts_atomic_read_nob(&(PP)->run_queue))); \
+	ERTS_LC_ASSERT((RQ) == erts_get_runq_port((PP)));       \
     } while (0)
 
 #define ERTS_PT_STATE_SCHEDULED		0
@@ -1520,19 +1519,15 @@ erts_port_task_schedule(Eterm id,
     /* Enqueue port on run-queue */
 
     runq = erts_port_runq(pp);
-    if (!runq)
-	ERTS_INTERNAL_ERROR("Missing run-queue");
 
     xrunq = erts_check_emigration_need(runq, ERTS_PORT_PRIO_LEVEL);
     ERTS_LC_ASSERT(runq != xrunq);
     ERTS_LC_VERIFY_RQ(runq, pp);
     if (xrunq) {
 	/* Emigrate port ... */
-	erts_atomic_set_nob(&pp->run_queue, (erts_aint_t) xrunq);
+        erts_set_runq_port(pp, xrunq);
 	erts_runq_unlock(runq);
 	runq = erts_port_runq(pp);
-	if (!runq)
-	    ERTS_INTERNAL_ERROR("Missing run-queue");
     }
 
     enqueue_port(runq, pp);
@@ -1593,8 +1588,6 @@ erts_port_task_free_port(Port *pp)
     ASSERT(!(erts_atomic32_read_nob(&pp->state) & ERTS_PORT_SFLGS_DEAD));
 
     runq = erts_port_runq(pp);
-    if (!runq)
-	ERTS_INTERNAL_ERROR("Missing run-queue");
     erts_port_task_sched_lock(&pp->sched);
     flags = erts_atomic32_read_bor_relb(&pp->sched.flags,
 					    ERTS_PTS_FLG_EXIT);
@@ -1805,7 +1798,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
     erts_unblock_fpe(fpe_was_unmasked);
     ERTS_MSACC_POP_STATE_M();
 
-    ASSERT(runq == (ErtsRunQueue *) erts_atomic_read_nob(&pp->run_queue));
+    ASSERT(runq == erts_get_runq_port(pp));
 
     active = finalize_exec(pp, &execq, processing_busy_q);
 
@@ -1831,11 +1824,10 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 	}
 	else {
 	    /* Emigrate port... */
-	    erts_atomic_set_nob(&pp->run_queue, (erts_aint_t) xrunq);
+            erts_set_runq_port(pp, xrunq);
 	    erts_runq_unlock(runq);
 
 	    xrunq = erts_port_runq(pp);
-	    ASSERT(xrunq);
 	    enqueue_port(xrunq, pp);
 	    erts_runq_unlock(xrunq);
 	    erts_notify_inc_runq(xrunq);
@@ -2069,7 +2061,7 @@ void
 erts_enqueue_port(ErtsRunQueue *rq, Port *pp)
 {
     ERTS_LC_ASSERT(erts_lc_runq_is_locked(rq));
-    ASSERT(rq == (ErtsRunQueue *) erts_atomic_read_nob(&pp->run_queue));
+    ASSERT(rq == erts_get_runq_port(pp));
     ASSERT(erts_atomic32_read_nob(&pp->sched.flags) & ERTS_PTS_FLG_IN_RUNQ);
     enqueue_port(rq, pp);
 }
@@ -2080,8 +2072,7 @@ erts_dequeue_port(ErtsRunQueue *rq)
     Port *pp;
     ERTS_LC_ASSERT(erts_lc_runq_is_locked(rq));
     pp = pop_port(rq);
-    ASSERT(!pp
-	   || rq == (ErtsRunQueue *) erts_atomic_read_nob(&pp->run_queue));
+    ASSERT(!pp || rq == erts_get_runq_port(pp));
     ASSERT(!pp || (erts_atomic32_read_nob(&pp->sched.flags)
 		   & ERTS_PTS_FLG_IN_RUNQ));
     return pp;
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 0433b4ea17..d069f62b39 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -137,36 +137,6 @@ runq_got_work_to_execute(ErtsRunQueue *rq)
     return runq_got_work_to_execute_flags(ERTS_RUNQ_FLGS_GET_NOB(rq));
 }
 
-#undef RUNQ_READ_RQ
-#undef RUNQ_SET_RQ
-#define RUNQ_READ_RQ(X) ((ErtsRunQueue *) erts_atomic_read_nob((X)))
-#define RUNQ_SET_RQ(X, RQ) erts_atomic_set_nob((X), (erts_aint_t) (RQ))
-
-#ifdef DEBUG
-#  if defined(ARCH_64)
-#    define ERTS_DBG_SET_INVALID_RUNQP(RQP, N) \
-    (RUNQ_SET_RQ((RQP), (0xdeadbeefdead0003LL | ((N) << 4)))
-#  define ERTS_DBG_VERIFY_VALID_RUNQP(RQP) \
-do { \
-    ASSERT((RQP) != NULL); \
-    ASSERT(((((Uint) (RQP)) & ((Uint) 0x3))) == ((Uint) 0)); \
-    ASSERT((((Uint) (RQP)) & ~((Uint) 0xffff)) != ((Uint) 0xdeadbeefdead0000LL));\
-} while (0)
-#  else
-#    define ERTS_DBG_SET_INVALID_RUNQP(RQP, N) \
-    (RUNQ_SET_RQ((RQP), (0xdead0003 | ((N) << 4))))
-#  define ERTS_DBG_VERIFY_VALID_RUNQP(RQP) \
-do { \
-    ASSERT((RQP) != NULL); \
-    ASSERT(((((UWord) (RQP)) & ((UWord) 1))) == ((UWord) 0)); \
-    ASSERT((((UWord) (RQP)) & ~((UWord) 0xffff)) != ((UWord) 0xdead0000)); \
-} while (0)
-#  endif
-#else
-#  define ERTS_DBG_SET_INVALID_RUNQP(RQP, N)
-#  define ERTS_DBG_VERIFY_VALID_RUNQP(RQP)
-#endif
-
 const Process erts_invalid_process = {{ERTS_INVALID_PID}};
 
 extern BeamInstr beam_apply[];
@@ -1538,6 +1508,20 @@ erts_proclist_destroy(ErtsProcList *plp)
     proclist_destroy(plp);
 }
 
+void
+erts_proclist_dump(fmtfn_t to, void *to_arg, ErtsProcList *plp)
+{
+    ErtsProcList *first = plp;
+
+    while (plp) {
+        erts_print(to, to_arg, "%T", plp->pid);
+        plp = plp->next;
+        if (plp == first)
+            break;
+    }
+    erts_print(to, to_arg, "\n");
+}
+
 void *
 erts_psd_set_init(Process *p, int ix, void *data)
 {
@@ -3926,21 +3910,16 @@ immigrate(ErtsRunQueue *c_rq, ErtsMigrationPath *mp)
 		Port *prt;
 		prt = erts_dequeue_port(rq);
 		if (prt)
-		    RUNQ_SET_RQ(&prt->run_queue, c_rq);
+                    erts_set_runq_port(prt, c_rq);
 		erts_runq_unlock(rq);
 		if (prt) {
-		    /* port might terminate while we have no lock... */
 		    rq = erts_port_runq(prt);
-		    if (rq) {
-			if (rq != c_rq)
-			    erts_exit(ERTS_ABORT_EXIT,
-				     "%s:%d:%s(): Internal error",
-				     __FILE__, __LINE__, __func__);
-			erts_enqueue_port(c_rq, prt);
-			if (!iflag)
-			    return; /* done */
-			erts_runq_unlock(c_rq);
-		    }
+                    if (rq != c_rq)
+                        ERTS_INTERNAL_ERROR("Unexpected run-queue");
+                    erts_enqueue_port(c_rq, prt);
+                    if (!iflag)
+                        return; /* done */
+                    erts_runq_unlock(c_rq);
 		}
 	    }
 	    else {
@@ -3954,12 +3933,11 @@ immigrate(ErtsRunQueue *c_rq, ErtsMigrationPath *mp)
 		while (proc) {
 		    erts_aint32_t state;
 		    state = erts_atomic32_read_acqb(&proc->state);
-		    if (!(ERTS_PSFLG_BOUND & state)
-			&& (prio == (int) ERTS_PSFLGS_GET_PRQ_PRIO(state))) {
+		    if (prio == (int) ERTS_PSFLGS_GET_PRQ_PRIO(state)
+                        && erts_try_change_runq_proc(proc, c_rq)) {
 			ErtsRunQueueInfo *rqi = &rq->procs.prio_info[prio];
 			unqueue_process(rq, rpq, rqi, prio, prev_proc, proc);
 			erts_runq_unlock(rq);
-			RUNQ_SET_RQ(&proc->run_queue, c_rq);
 			rq_locked = 0;
 
 			erts_runq_lock(c_rq);
@@ -4140,21 +4118,13 @@ evacuate_run_queue(ErtsRunQueue *rq,
 	while (prt) {
 	    ErtsRunQueue *prt_rq;
 	    prt = erts_dequeue_port(rq);
-	    RUNQ_SET_RQ(&prt->run_queue, to_rq);
+            erts_set_runq_port(prt, to_rq);
 	    erts_runq_unlock(rq);
-	    /*
-	     * The port might terminate while
-	     * we have no lock on it...
-	     */
 	    prt_rq = erts_port_runq(prt);
-	    if (prt_rq) {
-		if (prt_rq != to_rq)
-		    erts_exit(ERTS_ABORT_EXIT,
-			     "%s:%d:%s() internal error\n",
-			     __FILE__, __LINE__, __func__);
-		erts_enqueue_port(to_rq, prt);
-		erts_runq_unlock(to_rq);
-	    }
+            if (prt_rq != to_rq)
+                ERTS_INTERNAL_ERROR("Unexpected run-queue");
+            erts_enqueue_port(to_rq, prt);
+            erts_runq_unlock(to_rq);
 	    erts_runq_lock(rq);
 	    prt = rq->ports.start;
 	}
@@ -4165,8 +4135,6 @@ evacuate_run_queue(ErtsRunQueue *rq,
     for (prio_q = 0; prio_q < ERTS_NO_PROC_PRIO_QUEUES; prio_q++) {
 	erts_aint32_t state;
 	Process *proc;
-	int notify = 0;
-	to_rq = NULL;
 
         if (!mp->prio[prio_q].runq)
             return;
@@ -4177,14 +4145,13 @@ evacuate_run_queue(ErtsRunQueue *rq,
 	while (proc) {
 	    Process *real_proc;
 	    int prio;
-	    erts_aint32_t max_qbit, qbit, real_state;
+	    erts_aint32_t max_qbit, qbit;
 
 	    prio = ERTS_PSFLGS_GET_PRQ_PRIO(state);
 	    qbit = ((erts_aint32_t) 1) << prio;
 
 	    if (!(state & ERTS_PSFLG_PROXY)) {
 		real_proc = proc;
-		real_state = state;
 	    }
 	    else {
 		real_proc = erts_proc_lookup_raw(proc->common.id);
@@ -4192,7 +4159,6 @@ evacuate_run_queue(ErtsRunQueue *rq,
 		    free_proxy_proc(proc);
 		    goto handle_next_proc;
 		}
-		real_state =  erts_atomic32_read_acqb(&real_proc->state);
 	    }
 
 	    max_qbit = (state >> ERTS_PSFLGS_IN_PRQ_MASK_OFFSET);
@@ -4227,7 +4193,13 @@ evacuate_run_queue(ErtsRunQueue *rq,
 		goto handle_next_proc;
 	    }
 
-	    if (ERTS_PSFLG_BOUND & real_state) {
+            prio = (int) ERTS_PSFLGS_GET_PRQ_PRIO(state);
+            to_rq = mp->prio[prio].runq;
+
+            if (!to_rq)
+                goto handle_next_proc;
+
+	    if (!erts_try_change_runq_proc(proc, to_rq)) {
 		/* Bound processes get stuck here... */
 		proc->next = NULL;
 		if (sbpp->last)
@@ -4237,16 +4209,13 @@ evacuate_run_queue(ErtsRunQueue *rq,
 		sbpp->last = proc;
 	    }
 	    else {
-		int prio = (int) ERTS_PSFLGS_GET_PRQ_PRIO(state);
 		erts_runq_unlock(rq);
 
-                to_rq = mp->prio[prio].runq;
-		RUNQ_SET_RQ(&proc->run_queue, to_rq);
-
 		erts_runq_lock(to_rq);
 		enqueue_process(to_rq, prio, proc);
 		erts_runq_unlock(to_rq);
-		notify = 1;
+
+                smp_notify_inc_runq(to_rq);
 
 		erts_runq_lock(rq);
 	    }
@@ -4254,8 +4223,7 @@ evacuate_run_queue(ErtsRunQueue *rq,
 	handle_next_proc:
 	    proc = dequeue_process(rq, prio_q, &state);
 	}
-	if (notify)
-	    smp_notify_inc_runq(to_rq);
+
     }
 }
 
@@ -4309,14 +4277,13 @@ try_steal_task_from_victim(ErtsRunQueue *rq, int *rq_lockedp, ErtsRunQueue *vrq,
 	proc = rpq->first;
 
 	while (proc) {
-	    erts_aint32_t state = erts_atomic32_read_acqb(&proc->state);
-	    if (!(ERTS_PSFLG_BOUND & state)) {
+	    if (erts_try_change_runq_proc(proc, rq)) {
+                erts_aint32_t state = erts_atomic32_read_acqb(&proc->state);
 		/* Steal process */
 		int prio = (int) ERTS_PSFLGS_GET_PRQ_PRIO(state);
 		ErtsRunQueueInfo *rqi = &vrq->procs.prio_info[prio];
 		unqueue_process(vrq, rpq, rqi, prio, prev_proc, proc);
 		erts_runq_unlock(vrq);
-		RUNQ_SET_RQ(&proc->run_queue, rq);
 
 		erts_runq_lock(rq);
 		*rq_lockedp = 1;
@@ -4341,26 +4308,14 @@ no_procs:
     if (vrq->ports.start) {
 	ErtsRunQueue *prt_rq;
 	Port *prt = erts_dequeue_port(vrq);
-	RUNQ_SET_RQ(&prt->run_queue, rq);
+	erts_set_runq_port(prt, rq);
 	erts_runq_unlock(vrq);
-
-	/*
-	 * The port might terminate while
-	 * we have no lock on it...
-	 */
-
 	prt_rq = erts_port_runq(prt);
-	if (!prt_rq)
-	    return 0;
-	else {
-	    if (prt_rq != rq)
-		erts_exit(ERTS_ABORT_EXIT,
-			 "%s:%d:%s() internal error\n",
-			 __FILE__, __LINE__, __func__);
-	    *rq_lockedp = 1;
-	    erts_enqueue_port(rq, prt);
-	    return !0;
-	}
+        if (prt_rq != rq)
+            ERTS_INTERNAL_ERROR("Unexpected run-queue");
+        *rq_lockedp = 1;
+        erts_enqueue_port(rq, prt);
+        return !0;
     }
 
     erts_runq_unlock(vrq);
@@ -6116,7 +6071,8 @@ make_proxy_proc(Process *prev_proxy, Process *proc, erts_aint32_t prio)
 {
     erts_aint32_t state;
     Process *proxy;
-    ErtsRunQueue *rq = RUNQ_READ_RQ(&proc->run_queue);
+    int bound;
+    ErtsRunQueue *rq = erts_get_runq_proc(proc, &bound);
 
     state = (ERTS_PSFLG_PROXY
 	     | ERTS_PSFLG_IN_RUNQ
@@ -6129,7 +6085,7 @@ make_proxy_proc(Process *prev_proxy, Process *proc, erts_aint32_t prio)
 	proxy = prev_proxy;
 	ASSERT(erts_atomic32_read_nob(&proxy->state) & ERTS_PSFLG_PROXY);
 	erts_atomic32_set_nob(&proxy->state, state);
-	RUNQ_SET_RQ(&proc->run_queue, rq);
+        (void) erts_set_runq_proc(proc, rq, &bound);
     }
     else {
 	proxy = erts_alloc(ERTS_ALC_T_PROC, sizeof(Process));
@@ -6142,8 +6098,7 @@ make_proxy_proc(Process *prev_proxy, Process *proc, erts_aint32_t prio)
 	}
 #endif
 	erts_atomic32_init_nob(&proxy->state, state);
-	erts_atomic_init_nob(&proxy->run_queue,
-				 erts_atomic_read_nob(&proc->run_queue));
+        erts_init_runq_proc(proc, rq, bound);
     }
 
     proxy->common.id = proc->common.id;
@@ -6334,18 +6289,21 @@ select_enqueue_run_queue(int enqueue, int enq_prio, Process *p, erts_aint32_t st
 
     default: {
 	ErtsRunQueue* runq;
+        int bound;
 
 	ASSERT(enqueue == ERTS_ENQUEUE_NORMAL_QUEUE
 	       || enqueue == -ERTS_ENQUEUE_NORMAL_QUEUE);
 
-	runq = erts_get_runq_proc(p);
+	runq = erts_get_runq_proc(p, &bound);
 
-	if (!(ERTS_PSFLG_BOUND & state)) {
+	if (!bound) {
 	    ErtsRunQueue *new_runq = erts_check_emigration_need(runq, enq_prio);
-	    if (new_runq) {
-		RUNQ_SET_RQ(&p->run_queue, new_runq);
-		runq = new_runq;
-	    }
+            if (new_runq) {
+                if (erts_try_change_runq_proc(p, new_runq))
+                    runq = new_runq;
+                else
+                    runq = erts_get_runq_proc(p, NULL);
+            }
 	}
 
 	ASSERT(runq);
@@ -10824,7 +10782,7 @@ request_system_task(Process *c_p, Eterm requester, Eterm target,
 	    goto badarg;
 	req_type = tp[1];
 	req_id = tp[2];
-	req_id_sz = is_immed(req_id) ? req_id : size_object(req_id);
+	req_id_sz = is_immed(req_id) ? 0 : size_object(req_id);
 	tot_sz = req_id_sz;
 	for (i = 0; i < ERTS_MAX_PROC_SYS_TASK_ARGS; i++) {
 	    int tix = 3 + i;
@@ -11462,6 +11420,7 @@ typedef struct {
     Process *proc;
     erts_aint32_t state;
     ErtsRunQueue *run_queue;
+    int bound;
 } ErtsEarlyProcInit;
 
 static void early_init_process_struct(void *varg, Eterm data)
@@ -11472,10 +11431,9 @@ static void early_init_process_struct(void *varg, Eterm data)
     proc->common.id = make_internal_pid(data);
     erts_atomic32_init_nob(&proc->dirty_state, 0);
     proc->dirty_sys_tasks = NULL;
+    erts_init_runq_proc(proc, arg->run_queue, arg->bound);
     erts_atomic32_init_relb(&proc->state, arg->state);
 
-    RUNQ_SET_RQ(&proc->run_queue, arg->run_queue);
-
     erts_proc_lock_init(proc); /* All locks locked */
 
 }
@@ -11484,7 +11442,7 @@ static void early_init_process_struct(void *varg, Eterm data)
 ** Allocate process and find out where to place next process.
 */
 static Process*
-alloc_process(ErtsRunQueue *rq, erts_aint32_t state)
+alloc_process(ErtsRunQueue *rq, int bound, erts_aint32_t state)
 {
     ErtsEarlyProcInit init_arg;
     Process *p;
@@ -11493,9 +11451,12 @@ alloc_process(ErtsRunQueue *rq, erts_aint32_t state)
     if (!p)
 	return NULL;
 
+    ASSERT(rq);
+
     init_arg.proc = (Process *) p;
-    init_arg.run_queue = rq;
     init_arg.state = state;
+    init_arg.run_queue = rq;
+    init_arg.bound = bound;
 
     ERTS_CT_ASSERT(offsetof(Process,common) == 0);
 
@@ -11529,6 +11490,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 		   Eterm args,	/* Arguments for function (must be well-formed list). */
 		   ErlSpawnOpts* so) /* Options for spawn. */
 {
+    int bound = 0;
     Uint flags = 0;
     ErtsRunQueue *rq = NULL;
     Process *p;
@@ -11565,7 +11527,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 	    ASSERT(0 <= ix && ix < erts_no_run_queues);
 	    rq = ERTS_RUNQ_IX(ix);
 	    /* Unsupported feature... */
-	    state |= ERTS_PSFLG_BOUND;
+            bound = !0;
 	}
 	prio = (erts_aint32_t) so->priority;
     }
@@ -11578,17 +11540,16 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 	flags |= F_OFF_HEAP_MSGQ;
     }
     else if (so->flags & SPO_ON_HEAP_MSGQ) {
-	state |= ERTS_PSFLG_ON_HEAP_MSGQ;
 	flags |= F_ON_HEAP_MSGQ;
     }
 
     ASSERT((flags & F_ON_HEAP_MSGQ) || (flags & F_OFF_HEAP_MSGQ));
 
     if (!rq)
-	rq = erts_get_runq_proc(parent);
+	rq = erts_get_runq_proc(parent, NULL);
 
-    p = alloc_process(rq, state); /* All proc locks are locked by this thread
-				     on success */
+    p = alloc_process(rq, bound, state); /* All proc locks are locked by this thread
+                                            on success */
     if (!p) {
 	erts_send_error_to_logger_str(parent->group_leader,
 				      "Too many processes\n");
@@ -11596,11 +11557,6 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 	goto error;
     }
 
-    ASSERT((erts_atomic32_read_nob(&p->state)
-	    & ERTS_PSFLG_ON_HEAP_MSGQ)
-	   || (erts_atomic32_read_nob(&p->state)
-	       & ERTS_PSFLG_OFF_HEAP_MSGQ));
-
 #ifdef SHCOPY_SPAWN
     arg_size = copy_shared_calculate(args, &info);
 #else
@@ -11974,7 +11930,7 @@ void erts_init_empty_process(Process *p)
     p->pending_exit.bp = NULL;
     erts_proc_lock_init(p);
     erts_proc_unlock(p, ERTS_PROC_LOCKS_ALL);
-    RUNQ_SET_RQ(&p->run_queue, ERTS_RUNQ_IX(0));
+    erts_init_runq_proc(p, ERTS_RUNQ_IX(0), 0);
 
 #if !defined(NO_FPE_SIGNALS) || defined(HIPE)
     p->fp_exception = 0;
@@ -12296,7 +12252,7 @@ save_pending_exiter(Process *p, ErtsProcList *plp)
 
     ERTS_LC_ASSERT(ERTS_PROC_LOCK_STATUS & erts_proc_lc_my_proc_locks(p));
 
-    rq = RUNQ_READ_RQ(&p->run_queue);
+    rq = erts_get_runq_proc(p, NULL);
     ASSERT(rq && !ERTS_RUNQ_IX_IS_DIRTY(rq->ix));
 
     if (!plp)
@@ -12657,9 +12613,11 @@ static void doit_exit_monitor(ErtsMonitor *mon, void *vpcontext)
 		erts_de_links_unlock(dep);
 		if (rmon) {
 		    ErtsDSigData dsd;
-		    int code = erts_dsig_prepare(&dsd, dep, NULL,
-						 ERTS_DSP_NO_LOCK, 0);
-		    if (code == ERTS_DSIG_PREP_CONNECTED) {
+		    int code = erts_dsig_prepare(&dsd, dep, NULL, 0,
+						 ERTS_DSP_NO_LOCK, 0, 0);
+		    if (code == ERTS_DSIG_PREP_CONNECTED ||
+                        code == ERTS_DSIG_PREP_PENDING) {
+
 			code = erts_dsig_send_demonitor(&dsd,
 							rmon->u.pid,
 							mon->name,
@@ -12703,9 +12661,11 @@ static void doit_exit_monitor(ErtsMonitor *mon, void *vpcontext)
 		    erts_de_links_unlock(dep);
 		    if (rmon) {
 			ErtsDSigData dsd;
-			int code = erts_dsig_prepare(&dsd, dep, NULL,
-						     ERTS_DSP_NO_LOCK, 0);
-			if (code == ERTS_DSIG_PREP_CONNECTED) {
+			int code = erts_dsig_prepare(&dsd, dep, NULL, 0,
+						     ERTS_DSP_NO_LOCK, 0, 0);
+			if (code == ERTS_DSIG_PREP_CONNECTED ||
+                            code == ERTS_DSIG_PREP_PENDING) {
+
 			    code = erts_dsig_send_demonitor(&dsd,
 							    rmon->u.pid,
 							    mon->u.pid,
@@ -12762,8 +12722,8 @@ static void doit_exit_monitor(ErtsMonitor *mon, void *vpcontext)
 		erts_de_links_unlock(dep);
 		if (rmon) {
 		    ErtsDSigData dsd;
-		    int code = erts_dsig_prepare(&dsd, dep, NULL,
-						 ERTS_DSP_NO_LOCK, 0);
+		    int code = erts_dsig_prepare(&dsd, dep, NULL, 0,
+						 ERTS_DSP_NO_LOCK, 0, 0);
 		    if (code == ERTS_DSIG_PREP_CONNECTED) {
 			code = erts_dsig_send_m_exit(&dsd,
 						     mon->u.pid,
@@ -12885,14 +12845,18 @@ static void doit_exit_link(ErtsLink *lnk, void *vpcontext)
 		int code;
 		ErtsDistLinkData dld;
 		erts_remove_dist_link(&dld, p->common.id, item, dep);
-		erts_proc_lock(p, ERTS_PROC_LOCK_MAIN);
-		code = erts_dsig_prepare(&dsd, dep, p, ERTS_DSP_NO_LOCK, 0);
-		if (code == ERTS_DSIG_PREP_CONNECTED) {
-		    code = erts_dsig_send_exit_tt(&dsd, p->common.id, item,
-						  reason, SEQ_TRACE_TOKEN(p));
-		    ASSERT(code == ERTS_DSIG_SEND_OK);
-		}
-		erts_proc_unlock(p, ERTS_PROC_LOCK_MAIN);
+                if (dld.d_lnk) {
+                    erts_proc_lock(p, ERTS_PROC_LOCK_MAIN);
+                    code = erts_dsig_prepare(&dsd, dep, p, 0, ERTS_DSP_NO_LOCK, 0, 0);
+                    if (code == ERTS_DSIG_PREP_CONNECTED ||
+                        code == ERTS_DSIG_PREP_PENDING) {
+
+                        code = erts_dsig_send_exit_tt(&dsd, p->common.id, item,
+                                                      reason, SEQ_TRACE_TOKEN(p));
+                        ASSERT(code == ERTS_DSIG_SEND_OK);
+                    }
+                    erts_proc_unlock(p, ERTS_PROC_LOCK_MAIN);
+                }
 		erts_destroy_dist_link(&dld);
 	    }
 	}
@@ -13388,16 +13352,33 @@ stack_element_dump(fmtfn_t to, void *to_arg, Eterm* sp, int yreg)
     return yreg;
 }
 
+static void print_current_process_info(fmtfn_t, void *to_arg, ErtsSchedulerData*);
+
 /*
  * Print scheduler information
  */
 void
-erts_print_scheduler_info(fmtfn_t to, void *to_arg, ErtsSchedulerData *esdp) {
+erts_print_scheduler_info(fmtfn_t to, void *to_arg, ErtsSchedulerData *esdp)
+{
     int i;
     erts_aint32_t flg;
-    Process *p;
 
-    erts_print(to, to_arg, "=scheduler:%u\n", esdp->no);
+    switch (esdp->type) {
+    case ERTS_SCHED_NORMAL:
+        erts_print(to, to_arg, "=scheduler:%u\n", esdp->no);
+        break;
+    case ERTS_SCHED_DIRTY_CPU:
+        erts_print(to, to_arg, "=dirty_cpu_scheduler:%u\n",
+                   (esdp->dirty_no + erts_no_schedulers));
+        break;
+    case ERTS_SCHED_DIRTY_IO:
+        erts_print(to, to_arg, "=dirty_io_scheduler:%u\n",
+                   (esdp->dirty_no + erts_no_schedulers + erts_no_dirty_cpu_schedulers));
+        break;
+    default:
+        erts_print(to, to_arg, "=unknown_scheduler_type:%u\n", esdp->type);
+        break;
+    }
 
     flg = erts_atomic32_read_dirty(&esdp->ssi->flags);
     erts_print(to, to_arg, "Scheduler Sleep Info Flags: ");
@@ -13443,10 +13424,24 @@ erts_print_scheduler_info(fmtfn_t to, void *to_arg, ErtsSchedulerData *esdp) {
     }
     erts_print(to, to_arg, "\n");
 
-    erts_print(to, to_arg, "Current Port: ");
-    if (esdp->current_port)
-        erts_print(to, to_arg, "%T", esdp->current_port->common.id);
-    erts_print(to, to_arg, "\n");
+    if (esdp->type == ERTS_SCHED_NORMAL) {
+        erts_print(to, to_arg, "Current Port: ");
+        if (esdp->current_port)
+            erts_print(to, to_arg, "%T", esdp->current_port->common.id);
+        erts_print(to, to_arg, "\n");
+
+        erts_print_run_queue_info(to, to_arg, esdp->run_queue);
+    }
+
+    /* This *MUST* to be the last information in scheduler block */
+    print_current_process_info(to, to_arg, esdp);
+}
+
+void erts_print_run_queue_info(fmtfn_t to, void *to_arg,
+                               ErtsRunQueue *run_queue)
+{
+    erts_aint32_t flg;
+    int i;
 
     for (i = 0; i < ERTS_NO_PROC_PRIO_LEVELS; i++) {
         erts_print(to, to_arg, "Run Queue ");
@@ -13468,12 +13463,12 @@ erts_print_scheduler_info(fmtfn_t to, void *to_arg, ErtsSchedulerData *esdp) {
             break;
         }
         erts_print(to, to_arg, "Length: %d\n",
-                   erts_atomic32_read_dirty(&esdp->run_queue->procs.prio_info[i].len));
+                   erts_atomic32_read_dirty(&run_queue->procs.prio_info[i].len));
     }
     erts_print(to, to_arg, "Run Queue Port Length: %d\n",
-               erts_atomic32_read_dirty(&esdp->run_queue->ports.info.len));
+               erts_atomic32_read_dirty(&run_queue->ports.info.len));
 
-    flg = erts_atomic32_read_dirty(&esdp->run_queue->flags);
+    flg = erts_atomic32_read_dirty(&run_queue->flags);
     erts_print(to, to_arg, "Run Queue Flags: ");
     for (i = 0; i < ERTS_RUNQ_FLG_MAX && flg; i++) {
         erts_aint32_t chk = (1 << i);
@@ -13540,9 +13535,15 @@ erts_print_scheduler_info(fmtfn_t to, void *to_arg, ErtsSchedulerData *esdp) {
         }
     }
     erts_print(to, to_arg, "\n");
+}
+
+
+static void print_current_process_info(fmtfn_t to, void *to_arg,
+                                       ErtsSchedulerData* esdp)
+{
+    Process *p = esdp->current_process;
+    erts_aint32_t flg;
 
-    /* This *MUST* to be the last information in scheduler block */
-    p = esdp->current_process;
     erts_print(to, to_arg, "Current Process: ");
     if (esdp->current_process && !(ERTS_TRACE_FLAGS(p) & F_SENSITIVE)) {
 	flg = erts_atomic32_read_dirty(&p->state);
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index 16b3526208..ebf990c837 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -105,13 +105,13 @@ struct saved_calls {
 };
 
 extern Export exp_send, exp_receive, exp_timeout;
-extern int erts_sched_compact_load;
-extern int erts_sched_balance_util;
-extern Uint erts_no_schedulers;
-extern Uint erts_no_total_schedulers;
-extern Uint erts_no_dirty_cpu_schedulers;
-extern Uint erts_no_dirty_io_schedulers;
-extern Uint erts_no_run_queues;
+extern int ERTS_WRITE_UNLIKELY(erts_sched_compact_load);
+extern int ERTS_WRITE_UNLIKELY(erts_sched_balance_util);
+extern Uint ERTS_WRITE_UNLIKELY(erts_no_schedulers);
+extern Uint ERTS_WRITE_UNLIKELY(erts_no_total_schedulers);
+extern Uint ERTS_WRITE_UNLIKELY(erts_no_dirty_cpu_schedulers);
+extern Uint ERTS_WRITE_UNLIKELY(erts_no_dirty_io_schedulers);
+extern Uint ERTS_WRITE_UNLIKELY(erts_no_run_queues);
 extern int erts_sched_thread_suggested_stack_size;
 extern int erts_dcpu_sched_thread_suggested_stack_size;
 extern int erts_dio_sched_thread_suggested_stack_size;
@@ -244,6 +244,9 @@ extern int erts_dio_sched_thread_suggested_stack_size;
 					       (erts_aint32_t) (MSK),	\
 					       (erts_aint32_t) (FLGS)))
 
+#define ERTS_RUNQ_POINTER_MASK  (~((erts_aint_t) 3))
+#define ERTS_RUNQ_BOUND_FLAG    ((erts_aint_t) 1)
+
 typedef enum {
     ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED,
     ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED,
@@ -522,7 +525,7 @@ typedef union {
     char align[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(ErtsRunQueue))];
 } ErtsAlignedRunQueue;
 
-extern ErtsAlignedRunQueue *erts_aligned_run_queues;
+extern ErtsAlignedRunQueue * ERTS_WRITE_UNLIKELY(erts_aligned_run_queues);
 
 #define ERTS_PROC_REDUCTIONS_EXECUTED(SD, RQ, PRIO, REDS, AREDS)\
 do {								\
@@ -675,9 +678,9 @@ typedef union {
     char align[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(ErtsSchedulerData))];
 } ErtsAlignedSchedulerData;
 
-extern ErtsAlignedSchedulerData *erts_aligned_scheduler_data;
-extern ErtsAlignedSchedulerData *erts_aligned_dirty_cpu_scheduler_data;
-extern ErtsAlignedSchedulerData *erts_aligned_dirty_io_scheduler_data;
+extern ErtsAlignedSchedulerData * ERTS_WRITE_UNLIKELY(erts_aligned_scheduler_data);
+extern ErtsAlignedSchedulerData * ERTS_WRITE_UNLIKELY(erts_aligned_dirty_cpu_scheduler_data);
+extern ErtsAlignedSchedulerData * ERTS_WRITE_UNLIKELY(erts_aligned_dirty_io_scheduler_data);
 
 
 #if defined(ERTS_ENABLE_LOCK_CHECK)
@@ -1167,14 +1170,14 @@ void erts_check_for_holes(Process* p);
 #define ERTS_PSFLG_RUNNING		ERTS_PSFLG_BIT(9)
 #define ERTS_PSFLG_SUSPENDED		ERTS_PSFLG_BIT(10)
 #define ERTS_PSFLG_GC			ERTS_PSFLG_BIT(11)
-#define ERTS_PSFLG_BOUND		ERTS_PSFLG_BIT(12)
+/* #define ERTS_PSFLG_		        ERTS_PSFLG_BIT(12) */
 #define ERTS_PSFLG_TRAP_EXIT		ERTS_PSFLG_BIT(13)
 #define ERTS_PSFLG_ACTIVE_SYS		ERTS_PSFLG_BIT(14)
 #define ERTS_PSFLG_RUNNING_SYS		ERTS_PSFLG_BIT(15)
 #define ERTS_PSFLG_PROXY		ERTS_PSFLG_BIT(16)
 #define ERTS_PSFLG_DELAYED_SYS		ERTS_PSFLG_BIT(17)
 #define ERTS_PSFLG_OFF_HEAP_MSGQ	ERTS_PSFLG_BIT(18)
-#define ERTS_PSFLG_ON_HEAP_MSGQ		ERTS_PSFLG_BIT(19)
+/* #define ERTS_PSFLG_			ERTS_PSFLG_BIT(19) */
 #define ERTS_PSFLG_DIRTY_CPU_PROC	ERTS_PSFLG_BIT(20)
 #define ERTS_PSFLG_DIRTY_IO_PROC	ERTS_PSFLG_BIT(21)
 #define ERTS_PSFLG_DIRTY_ACTIVE_SYS	ERTS_PSFLG_BIT(22)
@@ -1269,7 +1272,7 @@ void erts_check_for_holes(Process* p);
 #define SPO_OFF_HEAP_MSGQ 16
 #define SPO_ON_HEAP_MSGQ 32
 
-extern int erts_default_spo_flags;
+extern int ERTS_WRITE_UNLIKELY(erts_default_spo_flags);
 
 /*
  * The following struct contains options for a process to be spawned.
@@ -1325,10 +1328,10 @@ extern erts_rwmtx_t erts_cpu_bind_rwmtx;
 ** erts_system_monitor must be != NIL, to allow testing on just
 ** the erts_system_monitor_* variables.
 */
-extern Eterm erts_system_monitor;
-extern Uint erts_system_monitor_long_gc;
-extern Uint erts_system_monitor_long_schedule;
-extern Uint erts_system_monitor_large_heap;
+extern Eterm ERTS_WRITE_UNLIKELY(erts_system_monitor);
+extern Uint ERTS_WRITE_UNLIKELY(erts_system_monitor_long_gc);
+extern Uint ERTS_WRITE_UNLIKELY(erts_system_monitor_long_schedule);
+extern Uint ERTS_WRITE_UNLIKELY(erts_system_monitor_large_heap);
 struct erts_system_monitor_flags_t {
 	 unsigned int busy_port : 1;
     unsigned int busy_dist_port : 1;
@@ -1545,6 +1548,7 @@ Uint64 erts_step_proc_interval(void);
 ErtsProcList *erts_proclist_create(Process *);
 ErtsProcList *erts_proclist_copy(ErtsProcList *);
 void erts_proclist_destroy(ErtsProcList *);
+void erts_proclist_dump(fmtfn_t to, void *to_arg, ErtsProcList*);
 
 ERTS_GLB_INLINE int erts_proclist_same(ErtsProcList *, Process *);
 ERTS_GLB_INLINE void erts_proclist_store_first(ErtsProcList **, ErtsProcList *);
@@ -1791,6 +1795,7 @@ void erts_stack_dump(fmtfn_t to, void *to_arg, Process *);
 void erts_limited_stack_trace(fmtfn_t to, void *to_arg, Process *);
 void erts_program_counter_info(fmtfn_t to, void *to_arg, Process *);
 void erts_print_scheduler_info(fmtfn_t to, void *to_arg, ErtsSchedulerData *esdp);
+void erts_print_run_queue_info(fmtfn_t, void *to_arg, ErtsRunQueue*);
 void erts_dump_extended_process_state(fmtfn_t to, void *to_arg, erts_aint32_t psflg);
 void erts_dump_process_state(fmtfn_t to, void *to_arg, erts_aint32_t psflg);
 
@@ -2166,7 +2171,12 @@ ERTS_GLB_INLINE int erts_is_scheduler_bound(ErtsSchedulerData *esdp);
 ERTS_GLB_INLINE Process *erts_get_current_process(void);
 ERTS_GLB_INLINE Eterm erts_get_current_pid(void);
 ERTS_GLB_INLINE Uint erts_get_scheduler_id(void);
-ERTS_GLB_INLINE ErtsRunQueue *erts_get_runq_proc(Process *p);
+ERTS_GLB_INLINE void erts_init_runq_proc(Process *p, ErtsRunQueue *rq, int bnd);
+ERTS_GLB_INLINE ErtsRunQueue *erts_set_runq_proc(Process *p, ErtsRunQueue *rq, int *boundp);
+ERTS_GLB_INLINE int erts_try_change_runq_proc(Process *p, ErtsRunQueue *rq);
+ERTS_GLB_INLINE ErtsRunQueue *erts_bind_runq_proc(Process *p, int bind);
+ERTS_GLB_INLINE int erts_proc_runq_is_bound(Process *p);
+ERTS_GLB_INLINE ErtsRunQueue *erts_get_runq_proc(Process *p, int *boundp);
 ERTS_GLB_INLINE ErtsRunQueue *erts_get_runq_current(ErtsSchedulerData *esdp);
 ERTS_GLB_INLINE void erts_runq_lock(ErtsRunQueue *rq);
 ERTS_GLB_INLINE int erts_runq_trylock(ErtsRunQueue *rq);
@@ -2246,11 +2256,144 @@ Uint erts_get_scheduler_id(void)
 	return esdp ? esdp->no : (Uint) 0;
 }
 
+/**
+ * Init run-queue of process.
+ *
+ * @param p[in,out]     Process
+ * @param rq[in]        Run-queue that process will be assigned to
+ * @param bnd[in,out]   If non-zero binds process to run-queue.
+ */
+
+ERTS_GLB_INLINE void
+erts_init_runq_proc(Process *p, ErtsRunQueue *rq, int bnd)
+{
+    erts_aint_t rqint = (erts_aint_t) rq;
+    if (bnd)
+        rqint |= ERTS_RUNQ_BOUND_FLAG;
+    erts_atomic_init_nob(&p->run_queue, rqint);
+}
+
+/**
+ * Forcibly set run-queue of process.
+ *
+ * @param p[in,out]     Process
+ * @param rq[in]        Run-queue that process will be assigned to
+ * @param bndp[in,out]  Pointer to integer. On input non-zero
+ *                      value causes the process to be bound to
+ *                      the run-queue. On output, indicating
+ *                      wether process previously was bound or
+ *                      not.
+ * @return              Previous run-queue.
+ */
+
+ERTS_GLB_INLINE ErtsRunQueue *
+erts_set_runq_proc(Process *p, ErtsRunQueue *rq, int *bndp)
+{
+    erts_aint_t rqint = (erts_aint_t) rq;
+    ASSERT(bndp);
+    ASSERT(rq);
+    if (*bndp)
+        rqint |= ERTS_RUNQ_BOUND_FLAG;
+    rqint = erts_atomic_xchg_nob(&p->run_queue, rqint);
+    *bndp = (int) (rqint & ERTS_RUNQ_BOUND_FLAG);
+    return (ErtsRunQueue *) (rqint & ERTS_RUNQ_POINTER_MASK);
+}
+
+/**
+ * Try to change run-queue assignment of a process.
+ *
+ * @param p[in,out]     Process
+ * @param rq[int]       Run-queue that process will be assigned to
+ * @return              Non-zero if the run-queue assignment was
+ *                      successfully changed.
+ */
+
+ERTS_GLB_INLINE int
+erts_try_change_runq_proc(Process *p, ErtsRunQueue *rq)
+{
+    erts_aint_t old_rqint, new_rqint;
+
+    new_rqint = (erts_aint_t) rq;
+    old_rqint = (erts_aint_t) erts_atomic_read_nob(&p->run_queue);
+    while (1) {
+        erts_aint_t act_rqint;
+
+        if (old_rqint & ERTS_RUNQ_BOUND_FLAG)
+            return 0;
+
+        act_rqint = erts_atomic_cmpxchg_nob(&p->run_queue,
+                                            new_rqint,
+                                            old_rqint);
+        if (act_rqint == old_rqint)
+            return !0;
+    }
+}
+
+/**
+ *
+ * Bind or unbind process to/from currently used run-queue.
+ *
+ * @param p             Process
+ * @param bind          Bind if non-zero; otherwise unbind
+ * @return              Pointer to previously bound run-queue,
+ *                      or NULL if previously unbound
+ */
+
+ERTS_GLB_INLINE ErtsRunQueue *
+erts_bind_runq_proc(Process *p, int bind)
+{
+    erts_aint_t rqint;
+    if (bind)
+        rqint = erts_atomic_read_bor_nob(&p->run_queue,
+                                         ERTS_RUNQ_BOUND_FLAG);
+    else
+        rqint = erts_atomic_read_band_nob(&p->run_queue,
+                                          ~ERTS_RUNQ_BOUND_FLAG);
+    if (rqint & ERTS_RUNQ_BOUND_FLAG)
+        return (ErtsRunQueue *) (rqint & ERTS_RUNQ_POINTER_MASK);
+    else
+        return NULL;
+}
+
+/**
+ * Determine wether a process is bound to a run-queue or not.
+ *
+ * @return              Returns a non-zero value if bound,
+ *                      and zero of not bound.
+ */
+
+ERTS_GLB_INLINE int
+erts_proc_runq_is_bound(Process *p)
+{
+    erts_aint_t rqint = erts_atomic_read_nob(&p->run_queue);
+    return (int) (rqint & ERTS_RUNQ_BOUND_FLAG);
+}
+
+/**
+ * Set run-queue of process.
+ *
+ * @param p[in,out]     Process
+ * @param bndp[out]     Pointer to integer. If non-NULL pointer,
+ *                      the integer will be set to a non-zero
+ *                      value if the process is bound to the
+ *                      run-queue.
+ * @return              Pointer to the normal run-queue that
+ *                      the process currently is assigend to.
+ *                      A process is always assigned to a
+ *                      normal run-queue.
+ */
+
 ERTS_GLB_INLINE ErtsRunQueue *
-erts_get_runq_proc(Process *p)
+erts_get_runq_proc(Process *p, int *bndp)
 {
-    ASSERT(ERTS_AINT_NULL != erts_atomic_read_nob(&p->run_queue));
-    return (ErtsRunQueue *) erts_atomic_read_nob(&p->run_queue);
+    erts_aint_t rqint = erts_atomic_read_nob(&p->run_queue);
+    ErtsRunQueue *rq;
+    if (bndp)
+        *bndp = (int) (rqint & ERTS_RUNQ_BOUND_FLAG);
+    rqint &= ERTS_RUNQ_POINTER_MASK;
+    rq = (ErtsRunQueue *) rqint;
+    ASSERT(rq);
+    return rq;
 }
 
 ERTS_GLB_INLINE ErtsRunQueue *
diff --git a/erts/emulator/beam/erl_process_dict.c b/erts/emulator/beam/erl_process_dict.c
index 3c80f0e0f6..aee88841ae 100644
--- a/erts/emulator/beam/erl_process_dict.c
+++ b/erts/emulator/beam/erl_process_dict.c
@@ -79,6 +79,8 @@
 /* Array access macro */ 
 #define ARRAY_GET(PDict, Index) (ASSERT((Index) < (PDict)->arraySize), \
 				 (PDict)->data[Index])
+#define ARRAY_GET_PTR(PDict, Index) (ASSERT((Index) < (PDict)->arraySize), \
+				     &(PDict)->data[Index])
 #define ARRAY_PUT(PDict, Index, Val) (ASSERT((Index) < (PDict)->arraySize), \
                                       (PDict)->data[Index] = (Val))
 
@@ -92,7 +94,7 @@ static void pd_hash_erase_all(Process *p);
 static Eterm pd_hash_get_with_hval(Process *p, Eterm bucket, Eterm id);
 static Eterm pd_hash_get_keys(Process *p, Eterm value);
 static Eterm pd_hash_get_all_keys(Process *p, ProcDict *pd);
-static Eterm pd_hash_get_all(Process *p, ProcDict *pd);
+static Eterm pd_hash_get_all(Process *p, ProcDict *pd, int keep_dict);
 static Eterm pd_hash_put(Process *p, Eterm id, Eterm value);
 
 static void shrink(Process *p, Eterm* ret); 
@@ -281,7 +283,7 @@ BIF_RETTYPE get_0(BIF_ALIST_0)
 {
     Eterm ret;
     PD_CHECK(BIF_P->dictionary);
-    ret = pd_hash_get_all(BIF_P, BIF_P->dictionary);
+    ret = pd_hash_get_all(BIF_P, BIF_P->dictionary, 1);
     PD_CHECK(BIF_P->dictionary);
     BIF_RET(ret);
 }
@@ -329,7 +331,7 @@ BIF_RETTYPE erase_0(BIF_ALIST_0)
 {
     Eterm ret;
     PD_CHECK(BIF_P->dictionary);
-    ret = pd_hash_get_all(BIF_P, BIF_P->dictionary);
+    ret = pd_hash_get_all(BIF_P, BIF_P->dictionary, 0);
     pd_hash_erase_all(BIF_P);
     PD_CHECK(BIF_P->dictionary);
     BIF_RET(ret);
@@ -541,29 +543,46 @@ static Eterm pd_hash_get_keys(Process *p, Eterm value)
 	
 
 static Eterm
-pd_hash_get_all(Process *p, ProcDict *pd)
+pd_hash_get_all(Process *p, ProcDict *pd, int keep_dict)
 {
     Eterm* hp;
+    Eterm* tp;
     Eterm res = NIL;
     Eterm tmp, tmp2;
     unsigned int i;
     unsigned int num;
+    Uint need;
 
     if (pd == NULL) {
 	return res;
     }
     num = HASH_RANGE(pd);
-    hp = HAlloc(p, pd->numElements * 2);
-    
+
+    /*
+     * If this is not erase/0, then must copy all key-value tuples
+     * as they may be mutated by put/2.
+     */
+    need = pd->numElements * (keep_dict ? 2+3 : 2);
+    hp = HAlloc(p, need);
+
     for (i = 0; i < num; ++i) {
 	tmp = ARRAY_GET(pd, i);
 	if (is_boxed(tmp)) {
-	    ASSERT(is_tuple(tmp));
+            if (keep_dict) {
+                tp = tuple_val(tmp);
+                tmp = TUPLE2(hp, tp[1], tp[2]);
+                hp += 3;
+            }
 	    res = CONS(hp, tmp, res);
 	    hp += 2;
 	} else if (is_list(tmp)) {
 	    while (tmp != NIL) {
 		tmp2 = TCAR(tmp);
+                if (keep_dict) {
+                    tp = tuple_val(tmp2);
+                    tmp2 = TUPLE2(hp, tp[1], tp[2]);
+                    hp += 3;
+                }
 		res = CONS(hp, tmp2, res);
 		hp += 2;
 		tmp = TCDR(tmp);
@@ -577,11 +596,14 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
 { 
     unsigned int hval;
     Eterm *hp;
+    Eterm *tp;
+    Eterm *bucket;
     Eterm tpl;
     Eterm old;
+    Eterm old_val = am_undefined;
     Eterm tmp;
     int needed;
-    int i = 0;
+    int new_key = 1;
 #ifdef DEBUG
     Eterm *hp_limit;
 #endif
@@ -595,7 +617,8 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
         p->dictionary->numElements = 0;
     }	
     hval = pd_hash_value(p->dictionary, id);
-    old = ARRAY_GET(p->dictionary, hval);
+    bucket = ARRAY_GET_PTR(p->dictionary, hval);
+    old = *bucket;
 
     /*
      * Calculate the number of heap words needed and garbage
@@ -603,32 +626,49 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
      */
     needed = 3;			/* {Key,Value} tuple */
     if (is_boxed(old)) {
-	/*
-	 * We don't want to compare keys twice, so we'll always
-	 * reserve the space for two CONS cells.
-	 */
-	needed += 2+2;
+        ASSERT(is_tuple(old));
+        tp = tuple_val(old);
+        if (EQ(tp[1], id)) {
+            old_val = tp[2];
+            if (is_immed(value)) {
+                tp[2] = value;     /* DESTRUCTIVE HEAP ASSIGNMENT */
+                return old_val;
+            }
+            new_key = 0;
+        }
+        else {
+            needed += 2+2;
+        }
     } else if (is_list(old)) {
-	i = 0;
-	for (tmp = old; tmp != NIL && !EQ(tuple_val(TCAR(tmp))[1], id); tmp = TCDR(tmp)) {
-	    ++i;
-	}
-	if (is_nil(tmp)) {
-	    i = -1;
-	    needed += 2;
-	} else {
-	    needed += 2*(i+1);
+        Eterm* prev_cdr = bucket;
+
+        needed += 2;
+	for (tmp = old; tmp != NIL; prev_cdr = &TCDR(tmp), tmp = *prev_cdr) {
+            tp = tuple_val(TCAR(tmp));
+            if (EQ(tp[1], id)) {
+                old_val = tp[2];
+                if (is_immed(value)) {
+                    tp[2] = value;     /* DESTRUCTIVE HEAP ASSIGNMENT */
+                    return old_val;
+                }
+                new_key = 0;
+                /* Unlink old {Key,Value} from list */
+                *prev_cdr = TCDR(tmp);  /* maybe DESTRUCTIVE HEAP ASSIGNMENT */
+                break;
+            }
 	}
     }
     if (HeapWordsLeft(p) < needed) {
 	Eterm root[3];
 	root[0] = id;
 	root[1] = value;
-	root[2] = old;
+        root[2] = old_val;
 	erts_garbage_collect(p, needed, root, 3);
 	id = root[0];
 	value = root[1];
-	old = root[2];
+        old_val = root[2];
+        ASSERT(bucket == ARRAY_GET_PTR(p->dictionary, hval));
+        old = *bucket;
     }
 #ifdef DEBUG
     hp_limit = p->htop + needed;
@@ -644,66 +684,29 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
      * Update the dictionary.
      */
     if (is_nil(old)) {
-	ARRAY_PUT(p->dictionary, hval, tpl);
-	++(p->dictionary->numElements);
+	*bucket = tpl;
     } else if (is_boxed(old)) {
 	ASSERT(is_tuple(old));
-	if (EQ(tuple_val(old)[1],id)) {
-	    ARRAY_PUT(p->dictionary, hval, tpl);
-	    return tuple_val(old)[2];
+	if (!new_key) {
+            ASSERT(EQ(tuple_val(old)[1],id));
+	    *bucket = tpl;
+	    return old_val;
 	} else {
 	    hp = HeapOnlyAlloc(p, 4);
 	    tmp = CONS(hp, old, NIL);
 	    hp += 2;
-	    ++(p->dictionary->numElements);
-	    ARRAY_PUT(p->dictionary, hval, CONS(hp, tpl, tmp));
+	    *bucket = CONS(hp, tpl, tmp);
 	    hp += 2;
 	    ASSERT(hp <= hp_limit);
 	}
     } else if (is_list(old)) {
-	if (i == -1) {
-	    /*
-	     * New key. Simply prepend the tuple to the beginning of the list.
-	     */
-	    hp = HeapOnlyAlloc(p, 2);
-	    ARRAY_PUT(p->dictionary, hval, CONS(hp, tpl, old));
-	    hp += 2;
-	    ASSERT(hp <= hp_limit);
-	    ++(p->dictionary->numElements);
-	} else {
-	    /*
-	     * i = Number of CDRs to skip to reach the changed element in the list.
-	     *
-	     * Replace old value in list. To avoid pointers from the old generation
-	     * to the new, we must rebuild the list from the beginning up to and
-	     * including the changed element.
-	     */
-	    Eterm nlist;
-	    int j;
-
-	    hp = HeapOnlyAlloc(p, (i+1)*2);
-	    
-	    /* Find the list element to change. */
-	    for (j = 0, nlist = old; j < i; j++, nlist = TCDR(nlist)) {
-		;
-	    }
-	    ASSERT(EQ(tuple_val(TCAR(nlist))[1], id));
-	    nlist = TCDR(nlist); /* Unchanged part of list. */
-
-	    /* Rebuild list before the updated element. */
-	    for (tmp = old; i-- > 0; tmp = TCDR(tmp)) {
-		nlist = CONS(hp, TCAR(tmp), nlist);
-		hp += 2;
-	    }
-	    ASSERT(EQ(tuple_val(TCAR(tmp))[1], id));
-
-	    /* Put the updated element first in the new list. */
-	    nlist = CONS(hp, tpl, nlist);
-	    hp += 2;
-	    ASSERT(hp <= hp_limit);
-	    ARRAY_PUT(p->dictionary, hval, nlist);
-	    return tuple_val(TCAR(tmp))[2];
-	}
+        /*
+	 * Simply prepend the tuple to the beginning of the list.
+	 */
+	hp = HeapOnlyAlloc(p, 2);
+        *bucket = CONS(hp, tpl, *bucket);
+	hp += 2;
+	ASSERT(hp <= hp_limit);
     } else {
 #ifdef DEBUG
 	erts_fprintf(stderr,
@@ -714,10 +717,13 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
 
 	erts_exit(ERTS_ERROR_EXIT, "Damaged process dictionary found during put/2.");
     }
+
+    p->dictionary->numElements += new_key;
+
     if (HASH_RANGE(p->dictionary) <= p->dictionary->numElements) {
 	grow(p);
     }
-    return am_undefined;
+    return old_val;
 }
 
 /*
diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c
index 0b7f361622..05e7bcdea2 100644
--- a/erts/emulator/beam/erl_process_dump.c
+++ b/erts/emulator/beam/erl_process_dump.c
@@ -51,6 +51,8 @@ static void stack_trace_dump(fmtfn_t to, void *to_arg, Eterm* sp);
 static void print_function_from_pc(fmtfn_t to, void *to_arg, BeamInstr* x);
 static void heap_dump(fmtfn_t to, void *to_arg, Eterm x);
 static void dump_binaries(fmtfn_t to, void *to_arg, Binary* root);
+void erts_print_base64(fmtfn_t to, void *to_arg,
+                       byte* src, Uint size);
 static void dump_externally(fmtfn_t to, void *to_arg, Eterm term);
 static void mark_literal(Eterm* ptr);
 static void init_literal_areas(void);
@@ -76,8 +78,17 @@ erts_deep_process_dump(fmtfn_t to, void *to_arg)
 	Process *p = erts_pix2proc(i);
 	if (p && p->i != ENULL) {
 	    erts_aint32_t state = erts_atomic32_read_acqb(&p->state);
-	    if (!(state & (ERTS_PSFLG_EXITING|ERTS_PSFLG_GC)))
-		dump_process_info(to, to_arg, p);
+	    if (state & ERTS_PSFLG_EXITING)
+                continue;
+            if (state & ERTS_PSFLG_GC) {
+                ErtsSchedulerData *sdp = erts_get_scheduler_data();
+                if (!sdp || p != sdp->current_process)
+                    continue;
+
+                /* We want to dump the garbing process that caused the dump */
+            }
+
+            dump_process_info(to, to_arg, p);
        }
     }
 
@@ -133,9 +144,12 @@ dump_process_info(fmtfn_t to, void *to_arg, Process *p)
     ErtsMessage* mp;
     int yreg = -1;
 
+    if (ERTS_TRACE_FLAGS(p) & F_SENSITIVE)
+        return;
+
     ERTS_MSGQ_MV_INQ2PRIVQ(p);
 
-    if ((ERTS_TRACE_FLAGS(p) & F_SENSITIVE) == 0 && p->msg.first) {
+    if (p->msg.first) {
 	erts_print(to, to_arg, "=proc_messages:%T\n", p->common.id);
 	for (mp = p->msg.first; mp != NULL; mp = mp->next) {
 	    Eterm mesg = ERL_MESSAGE_TERM(mp);
@@ -150,38 +164,34 @@ dump_process_info(fmtfn_t to, void *to_arg, Process *p)
 	}
     }
 
-    if ((ERTS_TRACE_FLAGS(p) & F_SENSITIVE) == 0) {
-	if (p->dictionary) {
-	    erts_print(to, to_arg, "=proc_dictionary:%T\n", p->common.id);
-	    erts_deep_dictionary_dump(to, to_arg,
-				      p->dictionary, dump_element_nl);
-	}
+    if (p->dictionary) {
+        erts_print(to, to_arg, "=proc_dictionary:%T\n", p->common.id);
+        erts_deep_dictionary_dump(to, to_arg,
+                                  p->dictionary, dump_element_nl);
     }
 
-    if ((ERTS_TRACE_FLAGS(p) & F_SENSITIVE) == 0) {
-	erts_print(to, to_arg, "=proc_stack:%T\n", p->common.id);
-	for (sp = p->stop; sp < STACK_START(p); sp++) {
-	    yreg = stack_element_dump(to, to_arg, sp, yreg);
-	}
+    erts_print(to, to_arg, "=proc_stack:%T\n", p->common.id);
+    for (sp = p->stop; sp < STACK_START(p); sp++) {
+        yreg = stack_element_dump(to, to_arg, sp, yreg);
+    }
 
-	erts_print(to, to_arg, "=proc_heap:%T\n", p->common.id);
-	for (sp = p->stop; sp < STACK_START(p); sp++) {
-	    Eterm term = *sp;
-	    
-	    if (!is_catch(term) && !is_CP(term)) {
-		heap_dump(to, to_arg, term);
-	    }
-	}
-	for (mp = p->msg.first; mp != NULL; mp = mp->next) {
-	    Eterm mesg = ERL_MESSAGE_TERM(mp);
-	    if (is_value(mesg))
-		heap_dump(to, to_arg, mesg);
-	    mesg = ERL_MESSAGE_TOKEN(mp);
-	    heap_dump(to, to_arg, mesg);
-	}
-	if (p->dictionary) {
-	    erts_deep_dictionary_dump(to, to_arg, p->dictionary, heap_dump);
-	}
+    erts_print(to, to_arg, "=proc_heap:%T\n", p->common.id);
+    for (sp = p->stop; sp < STACK_START(p); sp++) {
+        Eterm term = *sp;
+
+        if (!is_catch(term) && !is_CP(term)) {
+            heap_dump(to, to_arg, term);
+        }
+    }
+    for (mp = p->msg.first; mp != NULL; mp = mp->next) {
+        Eterm mesg = ERL_MESSAGE_TERM(mp);
+        if (is_value(mesg))
+            heap_dump(to, to_arg, mesg);
+        mesg = ERL_MESSAGE_TOKEN(mp);
+        heap_dump(to, to_arg, mesg);
+    }
+    if (p->dictionary) {
+        erts_deep_dictionary_dump(to, to_arg, p->dictionary, heap_dump);
     }
 }
 
@@ -193,6 +203,7 @@ dump_dist_ext(fmtfn_t to, void *to_arg, ErtsDistExternal *edep)
     else {
 	byte *e;
 	size_t sz;
+
 	if (!(edep->flags & ERTS_DIST_EXT_ATOM_TRANS_TAB))
 	    erts_print(to, to_arg, "D0:");
 	else {
@@ -210,12 +221,18 @@ dump_dist_ext(fmtfn_t to, void *to_arg, ErtsDistExternal *edep)
 	else {
 	    ASSERT(*e == VERSION_MAGIC);
 	}
-
 	erts_print(to, to_arg, "E%X:", sz);
-	if (edep->flags & ERTS_DIST_EXT_DFLAG_HDR)
-	    erts_print(to, to_arg, "%02X", VERSION_MAGIC);
-	while (e < edep->ext_endp)
-	    erts_print(to, to_arg, "%02X", *e++);
+        if (edep->flags & ERTS_DIST_EXT_DFLAG_HDR) {
+            byte sbuf[3];
+            int i = 0;
+
+            sbuf[i++] = VERSION_MAGIC;
+            while (i < sizeof(sbuf) && e < edep->ext_endp) {
+                sbuf[i++] = *e++;
+            }
+            erts_print_base64(to, to_arg, sbuf, i);
+        }
+        erts_print_base64(to, to_arg, e, edep->ext_endp - e);
     }
 }
 
@@ -444,16 +461,13 @@ heap_dump(fmtfn_t to, void *to_arg, Eterm x)
 		} else if (is_binary_header(hdr)) {
 		    Uint tag = thing_subtag(hdr);
 		    Uint size = binary_size(x);
-		    Uint i;
 
 		    if (tag == HEAP_BINARY_SUBTAG) {
 			byte* p;
 
 			erts_print(to, to_arg, "Yh%X:", size);
 			p = binary_bytes(x);
-			for (i = 0; i < size; i++) {
-			    erts_print(to, to_arg, "%02X", p[i]);
-			}
+                        erts_print_base64(to, to_arg, p, size);
 		    } else if (tag == REFC_BINARY_SUBTAG) {
 			ProcBin* pb = (ProcBin *) binary_val(x);
 			Binary* val = pb->val;
@@ -596,16 +610,13 @@ static void
 dump_binaries(fmtfn_t to, void *to_arg, Binary* current)
 {
     while (current) {
-	long i;
-	long size = current->orig_size;
+	SWord size = current->orig_size;
 	byte* bytes = (byte*) current->orig_bytes;
 
 	erts_print(to, to_arg, "=binary:" PTR_FMT "\n", current);
 	erts_print(to, to_arg, "%X:", size);
-	for (i = 0; i < size; i++) {
-	    erts_print(to, to_arg, "%02X", bytes[i]);
-	}
-	erts_putc(to, to_arg, '\n');
+        erts_print_base64(to, to_arg, bytes, size);
+        erts_putc(to, to_arg, '\n');
 	current = (Binary *) current->intern.flags;
     }
 }
@@ -644,9 +655,7 @@ dump_externally(fmtfn_t to, void *to_arg, Eterm term)
     s = p = sbuf;
     erts_encode_ext(term, &p);
     erts_print(to, to_arg, "E%X:", p-s);
-    while (s < p) {
-	erts_print(to, to_arg, "%02X", *s++);
-    }
+    erts_print_base64(to, to_arg, sbuf, p-s);
 }
 
 /*
@@ -802,16 +811,13 @@ dump_module_literals(fmtfn_t to, void *to_arg, ErtsLiteralArea* lit_area)
             } else if (is_binary_header(w)) {
                 Uint tag = thing_subtag(w);
                 Uint size = binary_size(term);
-                Uint i;
 
                 if (tag == HEAP_BINARY_SUBTAG) {
                     byte* p;
 
                     erts_print(to, to_arg, "Yh%X:", size);
                     p = binary_bytes(term);
-                    for (i = 0; i < size; i++) {
-                        erts_print(to, to_arg, "%02X", p[i]);
-                    }
+                    erts_print_base64(to, to_arg, p, size);
                 } else if (tag == REFC_BINARY_SUBTAG) {
                     ProcBin* pb = (ProcBin *) binary_val(term);
                     Binary* val = pb->val;
@@ -1003,8 +1009,6 @@ erts_dump_extended_process_state(fmtfn_t to, void *to_arg, erts_aint32_t psflg)
                 erts_print(to, to_arg, "SUSPENDED"); break;
             case ERTS_PSFLG_GC:
                 erts_print(to, to_arg, "GC"); break;
-            case ERTS_PSFLG_BOUND:
-                erts_print(to, to_arg, "BOUND"); break;
             case ERTS_PSFLG_TRAP_EXIT:
                 erts_print(to, to_arg, "TRAP_EXIT"); break;
             case ERTS_PSFLG_ACTIVE_SYS:
@@ -1017,8 +1021,6 @@ erts_dump_extended_process_state(fmtfn_t to, void *to_arg, erts_aint32_t psflg)
                 erts_print(to, to_arg, "DELAYED_SYS"); break;
             case ERTS_PSFLG_OFF_HEAP_MSGQ:
                 erts_print(to, to_arg, "OFF_HEAP_MSGQ"); break;
-            case ERTS_PSFLG_ON_HEAP_MSGQ:
-                erts_print(to, to_arg, "ON_HEAP_MSGQ"); break;
             case ERTS_PSFLG_DIRTY_CPU_PROC:
                 erts_print(to, to_arg, "DIRTY_CPU_PROC"); break;
             case ERTS_PSFLG_DIRTY_IO_PROC:
diff --git a/erts/emulator/beam/erl_term.h b/erts/emulator/beam/erl_term.h
index 5ec6b6b44b..3dd1c2555c 100644
--- a/erts/emulator/beam/erl_term.h
+++ b/erts/emulator/beam/erl_term.h
@@ -55,9 +55,6 @@ struct erl_node_; /* Declared in erl_node_tables.h */
 #if defined(ARCH_64)
 #  define TAG_PTR_MASK__	0x7
 #  if !defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
-#    ifdef HIPE
-#      error Hipe on 64-bit needs a real mmap as it does not support the literal tag
-#    endif
 #    define TAG_LITERAL_PTR	0x4
 #  else
 #    undef TAG_LITERAL_PTR
@@ -316,7 +313,8 @@ _ET_DECLARE_CHECKED(Uint,header_arity,Eterm)
 #define MAX_ARITYVAL            ((((Uint)1) << 24) - 1)
 #define ERTS_MAX_TUPLE_SIZE     MAX_ARITYVAL
 
-#define make_arityval(sz)	_make_header((sz),_TAG_HEADER_ARITYVAL)
+#define make_arityval(sz)	(ASSERT((sz) <= MAX_ARITYVAL), \
+                                 _make_header((sz),_TAG_HEADER_ARITYVAL))
 #define is_arity_value(x)	(((x) & _TAG_HEADER_MASK) == _TAG_HEADER_ARITYVAL)
 #define is_sane_arity_value(x)	((((x) & _TAG_HEADER_MASK) == _TAG_HEADER_ARITYVAL) && \
 				 (((x) >> _HEADER_ARITY_OFFS) <= MAX_ARITYVAL))
diff --git a/erts/emulator/beam/erl_thr_progress.h b/erts/emulator/beam/erl_thr_progress.h
index fa936b5707..8c029bcf99 100644
--- a/erts/emulator/beam/erl_thr_progress.h
+++ b/erts/emulator/beam/erl_thr_progress.h
@@ -28,7 +28,7 @@
  * Author: 	Rickard Green
  */
 
-#if !defined(ERL_THR_PROGRESS_H__TSD_TYPE__)
+#ifndef ERL_THR_PROGRESS_H__TSD_TYPE__
 #define ERL_THR_PROGRESS_H__TSD_TYPE__
 
 #include "sys.h"
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index 4b996d8fc2..018894f685 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -2533,7 +2533,7 @@ load_tracer_nif(const ErtsTracer tracer)
 
     for(i = 0; i < num_of_funcs; i++) {
         for (j = 0; j < NIF_TRACER_TYPES; j++) {
-            if (strcmp(tracers[j].name, funcs[i].name) == 0 && tracers[j].arity == funcs[i].arity) {
+            if (sys_strcmp(tracers[j].name, funcs[i].name) == 0 && tracers[j].arity == funcs[i].arity) {
                 tracers[j].cb = &(funcs[i]);
                 break;
             }
@@ -2783,24 +2783,28 @@ is_tracer_enabled(Process* c_p, ErtsProcLocks c_p_locks,
         ASSERT(0);
     }
 
-    /* Only remove tracer on self() and ports */
+    /* Only remove tracer on (self() or ports) AND we are on a normal scheduler */
     if (is_internal_port(t_p->id) || (c_p && c_p->common.id == t_p->id)) {
+        ErtsSchedulerData *esdp = erts_get_scheduler_data();
         ErtsProcLocks c_p_xlocks = 0;
-        if (is_internal_pid(t_p->id)) {
-            ERTS_LC_ASSERT(erts_proc_lc_my_proc_locks(c_p) & ERTS_PROC_LOCK_MAIN);
-            if (c_p_locks != ERTS_PROC_LOCKS_ALL) {
-                c_p_xlocks = ~c_p_locks & ERTS_PROC_LOCKS_ALL;
-                if (erts_proc_trylock(c_p, c_p_xlocks) == EBUSY) {
-                    erts_proc_unlock(c_p, c_p_locks & ~ERTS_PROC_LOCK_MAIN);
-                    erts_proc_lock(c_p, ERTS_PROC_LOCKS_ALL_MINOR);
+        if (esdp && !ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+            if (is_internal_pid(t_p->id)) {
+                ERTS_LC_ASSERT(erts_proc_lc_my_proc_locks(c_p) & ERTS_PROC_LOCK_MAIN);
+                if (c_p_locks != ERTS_PROC_LOCKS_ALL) {
+                    c_p_xlocks = ~c_p_locks & ERTS_PROC_LOCKS_ALL;
+                    if (erts_proc_trylock(c_p, c_p_xlocks) == EBUSY) {
+                        erts_proc_unlock(c_p, c_p_locks & ~ERTS_PROC_LOCK_MAIN);
+                        erts_proc_lock(c_p, ERTS_PROC_LOCKS_ALL_MINOR);
+                    }
                 }
             }
-        }
-        erts_tracer_replace(t_p, erts_tracer_nil);
-        t_p->trace_flags &= ~TRACEE_FLAGS;
 
-        if (c_p_xlocks)
-            erts_proc_unlock(c_p, c_p_xlocks);
+            erts_tracer_replace(t_p, erts_tracer_nil);
+            t_p->trace_flags &= ~TRACEE_FLAGS;
+
+            if (c_p_xlocks)
+                erts_proc_unlock(c_p, c_p_xlocks);
+        }
     }
 
     return 0;
@@ -3015,7 +3019,7 @@ static void *tracer_alloc_fun(void* tmpl)
     ErtsTracerNif *obj = erts_alloc(ERTS_ALC_T_TRACER_NIF,
                                     sizeof(ErtsTracerNif) +
                                     sizeof(ErtsThrPrgrLaterOp));
-    memcpy(obj, tmpl, sizeof(*obj));
+    sys_memcpy(obj, tmpl, sizeof(*obj));
     return obj;
 }
 
diff --git a/erts/emulator/beam/erl_unicode.c b/erts/emulator/beam/erl_unicode.c
index b7a5c45fea..8673e029e6 100644
--- a/erts/emulator/beam/erl_unicode.c
+++ b/erts/emulator/beam/erl_unicode.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2017. All Rights Reserved.
+ * Copyright Ericsson AB 2008-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.
@@ -144,7 +144,7 @@ static Eterm make_magic_bin_for_restart(Process *p, RestartContext *rc)
 					   cleanup_restart_context_bin);
     RestartContext *restartp = ERTS_MAGIC_BIN_DATA(mbp);
     Eterm *hp;
-    memcpy(restartp,rc,sizeof(RestartContext));
+    sys_memcpy(restartp,rc,sizeof(RestartContext));
     hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE);
     return erts_mk_magic_ref(&hp, &MSO(p), mbp);
 }
@@ -254,12 +254,12 @@ static Uint copy_utf8_bin(byte *target, byte *source, Uint size,
 	ASSERT(need > 0);
 	ASSERT(from_source > 0);
 	if (size < from_source) {
-	    memcpy(leftover + (*num_leftovers), source, size);
+	    sys_memcpy(leftover + (*num_leftovers), source, size);
 	    *num_leftovers += size;
 	    return 0;
 	}
 	/* leftover has room for four bytes (see bif) */
-	memcpy(leftover + (*num_leftovers),source,from_source);
+	sys_memcpy(leftover + (*num_leftovers),source,from_source);
 	c = copy_utf8_bin(target, leftover, need, NULL, NULL, &tmp_err_pos, characters);
 	if (tmp_err_pos != 0) {
 	    *err_pos = source;
@@ -291,7 +291,7 @@ static Uint copy_utf8_bin(byte *target, byte *source, Uint size,
 	    size -= 2; copied += 2;
 	} else if (((*source) & ((byte) 0xF0)) == 0xE0) {
 	    if (leftover && size < 3) {
-		memcpy(leftover, source, (int) size);
+		sys_memcpy(leftover, source, (int) size);
 		*num_leftovers = (int) size;
 		break;
 	    }
@@ -313,7 +313,7 @@ static Uint copy_utf8_bin(byte *target, byte *source, Uint size,
 	    size -= 3; copied += 3;
 	} else if (((*source) & ((byte) 0xF8)) == 0xF0) {
 	    if (leftover && size < 4) {
-		memcpy(leftover, source, (int) size);
+		sys_memcpy(leftover, source, (int) size);
 		*num_leftovers = (int) size;
 		break;
 	    }
@@ -1158,14 +1158,15 @@ static ERTS_INLINE int
 analyze_utf8(byte *source, Uint size, byte **err_pos, Uint *num_chars, int *left,
 	     Sint *num_latin1_chars, Uint max_chars)
 {
+    int res = ERTS_UTF8_OK;
     Uint latin1_count;
     int is_latin1;
+    Uint nchars = 0;
     *err_pos = source;
     if (num_latin1_chars) {
 	is_latin1 = 1;
 	latin1_count = 0;
     }
-    *num_chars = 0;
     while (size) {
 	if (((*source) & ((byte) 0x80)) == 0) {
 	    source++;
@@ -1174,11 +1175,13 @@ analyze_utf8(byte *source, Uint size, byte **err_pos, Uint *num_chars, int *left
 		latin1_count++;
 	} else if (((*source) & ((byte) 0xE0)) == 0xC0) {
 	    if (size < 2) {
-		return ERTS_UTF8_INCOMPLETE;
+		res = ERTS_UTF8_INCOMPLETE;
+                break;
 	    }
 	    if (((source[1] & ((byte) 0xC0)) != 0x80) ||
 		((*source) < 0xC2) /* overlong */) {
-		return ERTS_UTF8_ERROR;
+		res = ERTS_UTF8_ERROR;
+                break;
 	    }
 	    if (num_latin1_chars) {
 		latin1_count++;
@@ -1189,16 +1192,19 @@ analyze_utf8(byte *source, Uint size, byte **err_pos, Uint *num_chars, int *left
 	    size -= 2;
 	} else if (((*source) & ((byte) 0xF0)) == 0xE0) {
 	    if (size < 3) {
-		return ERTS_UTF8_INCOMPLETE;
+		res = ERTS_UTF8_INCOMPLETE;
+                break;
 	    }
 	    if (((source[1] & ((byte) 0xC0)) != 0x80) ||
 		((source[2] & ((byte) 0xC0)) != 0x80) ||
 		(((*source) == 0xE0) && (source[1] < 0xA0)) /* overlong */ ) {
-		return ERTS_UTF8_ERROR;
+		res = ERTS_UTF8_ERROR;
+                break;
 	    }
 	    if ((((*source) & ((byte) 0xF)) == 0xD) && 
 		((source[1] & 0x20) != 0)) {
-		return ERTS_UTF8_ERROR;
+		res = ERTS_UTF8_ERROR;
+                break;
 	    }
 	    source += 3;
 	    size -= 3;
@@ -1206,37 +1212,47 @@ analyze_utf8(byte *source, Uint size, byte **err_pos, Uint *num_chars, int *left
 		is_latin1 = 0;
 	} else if (((*source) & ((byte) 0xF8)) == 0xF0) {
 	    if (size < 4) {
-		return ERTS_UTF8_INCOMPLETE;
+		res = ERTS_UTF8_INCOMPLETE;
+                break;
 	    }
 	    if (((source[1] & ((byte) 0xC0)) != 0x80) ||
 		((source[2] & ((byte) 0xC0)) != 0x80) ||
 		((source[3] & ((byte) 0xC0)) != 0x80) ||
 		(((*source) == 0xF0) && (source[1] < 0x90)) /* overlong */) {
-		return ERTS_UTF8_ERROR;
+		res = ERTS_UTF8_ERROR;
+                break;
 	    }
 	    if ((((*source) & ((byte)0x7)) > 0x4U) ||
 		((((*source) & ((byte)0x7)) == 0x4U) && 
 		 ((source[1] & ((byte)0x3F)) > 0xFU))) {
-		return ERTS_UTF8_ERROR;
+		res = ERTS_UTF8_ERROR;
+                break;
 	    }
 	    source += 4;
 	    size -= 4; 
 	    if (num_latin1_chars)
 		is_latin1 = 0;
 	} else {
-	    return ERTS_UTF8_ERROR;
+	    res = ERTS_UTF8_ERROR;
+            break;
 	}
-	++(*num_chars);
+	++nchars;
 	*err_pos = source;
-	if (max_chars && size > 0 && *num_chars == max_chars)
-	    return ERTS_UTF8_OK_MAX_CHARS;
+	if (max_chars && size > 0 && nchars == max_chars) {
+	    res = ERTS_UTF8_OK_MAX_CHARS;
+            break;
+        }
 	if (left && --(*left) <= 0 && size) {
-	    return ERTS_UTF8_ANALYZE_MORE;
+	    res = ERTS_UTF8_ANALYZE_MORE;
+            break;
 	}
     }
+
+    *num_chars = nchars;
     if (num_latin1_chars)
 	*num_latin1_chars = is_latin1 ? latin1_count : -1;
-    return ERTS_UTF8_OK;
+
+    return res;
 }
 
 int erts_analyze_utf8(byte *source, Uint size, 
@@ -1252,29 +1268,18 @@ int erts_analyze_utf8_x(byte *source, Uint size,
     return analyze_utf8(source, size, err_pos, num_chars, left, num_latin1_chars, max_chars);
 }
 
-/*
- * No errors should be able to occur - no overlongs, no malformed, no nothing
- */
-static Eterm do_utf8_to_list(Process *p, Uint num, byte *bytes, Uint sz, 
-			     Uint left,
-			     Uint *num_built, Uint *num_eaten, Eterm tail)
+static ERTS_INLINE Eterm
+make_list_from_utf8_buf(Eterm **hpp, Uint num,
+                        byte *bytes, Uint sz, 
+                        Uint *num_built, Uint *num_eaten,
+                        Eterm tail)
 {
     Eterm *hp;
     Eterm ret;
+    Uint left = num;
     byte *source, *ssource;
     Uint unipoint;
-
-    ASSERT(num > 0);
-    if (left < num) {
-	if (left > 0)
-	    num = left;
-	else
-	    num = 1;
-    }
-    
-    *num_built = num; /* Always */
-
-    hp = HAlloc(p,num * 2);
+    hp = *hpp;
     ret = tail;
     source = bytes + sz;
     ssource = source;
@@ -1302,20 +1307,97 @@ static Eterm do_utf8_to_list(Process *p, Uint num, byte *bytes, Uint sz,
 	}
 	ret = CONS(hp,make_small(unipoint),ret);
 	hp += 2;
-	if (--num <= 0) {
+	if (--left <= 0) {
 	    break;
 	}
     }
+    *hpp = hp;
+    *num_built = num; /* Always */
     *num_eaten = (ssource - source);
     return ret;
 }
 
+/*
+ * No errors should be able to occur - no overlongs, no malformed, no nothing
+ */
+static Eterm do_utf8_to_list(Process *p, Uint num, byte *bytes, Uint sz, 
+			     Uint left,
+			     Uint *num_built, Uint *num_eaten, Eterm tail)
+{
+    Eterm *hp;
+
+    ASSERT(num > 0);
+    if (left < num) {
+	if (left > 0)
+	    num = left;
+	else
+	    num = 1;
+    }
+    
+    hp = HAlloc(p,num * 2);
+
+    return make_list_from_utf8_buf(&hp, num, bytes, sz,
+                                   num_built, num_eaten,
+                                   tail);
+}
 Eterm erts_utf8_to_list(Process *p, Uint num, byte *bytes, Uint sz, Uint left,
 			Uint *num_built, Uint *num_eaten, Eterm tail)
 {
     return do_utf8_to_list(p, num, bytes, sz, left, num_built, num_eaten, tail);
 }
 
+Uint erts_atom_to_string_length(Eterm atom)
+{
+    Atom *ap;
+
+    ASSERT(is_atom(atom));
+    ap = atom_tab(atom_val(atom));
+
+    if (ap->latin1_chars >= 0)
+        return (Uint) ap->len;
+    else {
+        byte* err_pos;
+        Uint num_chars;
+#ifdef DEBUG
+        int ares =
+#endif
+            erts_analyze_utf8(ap->name, ap->len, &err_pos, &num_chars, NULL);
+        ASSERT(ares == ERTS_UTF8_OK);
+
+        return num_chars;
+    }
+}
+
+Eterm erts_atom_to_string(Eterm **hpp, Eterm atom)
+{
+    Atom *ap;
+
+    ASSERT(is_atom(atom));
+    ap = atom_tab(atom_val(atom));
+    if (ap->latin1_chars >= 0)
+        return buf_to_intlist(hpp, (char*)ap->name, ap->len, NIL);
+    else {
+        Eterm res;
+        byte* err_pos;
+        Uint num_chars, num_built, num_eaten;
+#ifdef DEBUG
+        Eterm *hp_start = *hpp;
+        int ares =
+#endif
+            erts_analyze_utf8(ap->name, ap->len, &err_pos, &num_chars, NULL);
+        ASSERT(ares == ERTS_UTF8_OK);
+
+        res = make_list_from_utf8_buf(hpp, num_chars, ap->name, ap->len,
+                                      &num_built, &num_eaten, NIL);
+
+        ASSERT(num_built == num_chars);
+        ASSERT(num_eaten == ap->len);
+        ASSERT(*hpp - hp_start == 2*num_chars);
+
+        return res;
+    }
+}
+
 static int is_candidate(Uint cp)
 {
     int index,pos;
@@ -2026,7 +2108,7 @@ char *erts_convert_filename_to_encoding(Eterm name, char *statbuf, size_t statbu
 	    } else {
 		name_buf = statbuf;
 	    }
-	    memcpy(name_buf,bytes,size);
+	    sys_memcpy(name_buf,bytes,size);
 	    name_buf[size]=0;
 	} else {
             name_buf = erts_convert_filename_to_wchar(bytes, size,
@@ -2083,18 +2165,9 @@ char* erts_convert_filename_to_wchar(byte* bytes, Uint size,
     return name_buf;
 }
 
-
-static int filename_len_16bit(byte *str) 
-{
-    byte *p = str;
-    while(*p != '\0' || p[1] != '\0') {
-	p += 2;
-    }
-    return (p - str);
-}
-Eterm erts_convert_native_to_filename(Process *p, byte *bytes)
+Eterm erts_convert_native_to_filename(Process *p, size_t size, byte *bytes)
 {
-    Uint size,num_chars;
+    Uint num_chars;
     Eterm *hp;
     byte *err_pos;
     Uint num_built; /* characters */
@@ -2108,7 +2181,6 @@ Eterm erts_convert_native_to_filename(Process *p, byte *bytes)
     case ERL_FILENAME_UTF8_MAC:
 	mac = 1;
     case ERL_FILENAME_UTF8:
-	size = strlen((char *) bytes);
 	if (size == 0)
 	    return NIL;
 	if (erts_analyze_utf8(bytes,size,&err_pos,&num_chars,NULL) != ERTS_UTF8_OK) {
@@ -2123,7 +2195,6 @@ Eterm erts_convert_native_to_filename(Process *p, byte *bytes)
 	} 
 	return ret;
     case ERL_FILENAME_WIN_WCHAR:
-	size=filename_len_16bit(bytes);
 	if ((size % 2) != 0) { /* Panic fixup to avoid crashing the emulator */
 	    size--;
 	    hp = HAlloc(p, size+2);
@@ -2146,7 +2217,6 @@ Eterm erts_convert_native_to_filename(Process *p, byte *bytes)
 	goto noconvert;
     }
  noconvert:
-    size = strlen((char *) bytes);
     hp = HAlloc(p, 2 * size);
     return erts_bin_bytes_to_list(NIL, hp, bytes, size, 0);
 }
@@ -2158,7 +2228,6 @@ Sint erts_native_filename_need(Eterm ioterm, int encoding)
     Eterm obj;
     DECLARE_ESTACK(stack);
     Sint need = 0;
-    int seen_null = 0;
 
     if (is_atom(ioterm)) {
 	Atom* ap;
@@ -2203,9 +2272,7 @@ Sint erts_native_filename_need(Eterm ioterm, int encoding)
             byte *name = ap->name;
             int len = ap->len;
             for (i = 0; i < len; i++) {
-                if (name[i] == 0)
-                    seen_null = 1;
-                else if (seen_null) {
+                if (name[i] == 0) {
                     need = -1;
                     break;
                 }
@@ -2245,9 +2312,7 @@ L_Again:   /* Restart with sublist, old listend was pushed on stack */
                          * Do not allow null in
                          * the middle of filenames
                          */
-                        if (x == 0)
-                            seen_null = 1;
-                        else if (seen_null) {
+                        if (x == 0) {
                             DESTROY_ESTACK(stack);
                             return ((Sint) -1);
                         }
@@ -2580,7 +2645,6 @@ BIF_RETTYPE prim_file_internal_name2native_1(BIF_ALIST_1)
 	BIF_ERROR(BIF_P,BADARG);
     }
     if (is_binary(BIF_ARG_1)) {
-        int seen_null = 0;
 	byte *temp_alloc = NULL;
 	byte *bytes;
 	byte *err_pos;
@@ -2597,8 +2661,6 @@ BIF_RETTYPE prim_file_internal_name2native_1(BIF_ALIST_1)
             for (i = 0; i < size; i++) {
                 /* Don't allow null in the middle of filenames... */
                 if (bytes[i] == 0)
-                    seen_null = 1;
-                else if (seen_null)
                     goto bin_name_error;
                 bin_p[i] = bytes[i];
             }
@@ -2617,8 +2679,6 @@ BIF_RETTYPE prim_file_internal_name2native_1(BIF_ALIST_1)
 	    while (size--) {
                 /* Don't allow null in the middle of filenames... */
                 if (*bytes == 0)
-                    seen_null = 1;
-                else if (seen_null)
                     goto bin_name_error;
 		*bin_p++ = *bytes++;
 		*bin_p++ = 0;
diff --git a/erts/emulator/beam/erl_unicode.h b/erts/emulator/beam/erl_unicode.h
index e01eaa787e..31369fc8f9 100644
--- a/erts/emulator/beam/erl_unicode.h
+++ b/erts/emulator/beam/erl_unicode.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2008-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2008-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,4 +21,7 @@
 #ifndef _ERL_UNICODE_H
 #define _ERL_UNICODE_H
 
+Uint erts_atom_to_string_length(Eterm atom);
+Eterm erts_atom_to_string(Eterm **hpp, Eterm atom);
+
 #endif /* _ERL_UNICODE_H */
diff --git a/erts/emulator/beam/erl_utils.h b/erts/emulator/beam/erl_utils.h
index 44d8c85867..e4087e0ac8 100644
--- a/erts/emulator/beam/erl_utils.h
+++ b/erts/emulator/beam/erl_utils.h
@@ -91,7 +91,7 @@ Eterm erts_bld_tuple(Uint **hpp, Uint *szp, Uint arity, ...);
 #define erts_bld_tuple5(H,S,E1,E2,E3,E4,E5) erts_bld_tuple(H,S,5,E1,E2,E3,E4,E5)
 Eterm erts_bld_tuplev(Uint **hpp, Uint *szp, Uint arity, Eterm terms[]);
 Eterm erts_bld_string_n(Uint **hpp, Uint *szp, const char *str, Sint len);
-#define erts_bld_string(hpp,szp,str) erts_bld_string_n(hpp,szp,str,strlen(str))
+#define erts_bld_string(hpp,szp,str) erts_bld_string_n(hpp,szp,str,sys_strlen(str))
 Eterm erts_bld_list(Uint **hpp, Uint *szp, Sint length, Eterm terms[]);
 Eterm erts_bld_2tup_list(Uint **hpp, Uint *szp,
 			 Sint length, Eterm terms1[], Uint terms2[]);
diff --git a/erts/emulator/beam/erl_vm.h b/erts/emulator/beam/erl_vm.h
index 76980b5871..f8391fb665 100644
--- a/erts/emulator/beam/erl_vm.h
+++ b/erts/emulator/beam/erl_vm.h
@@ -69,7 +69,7 @@
 #  ifdef CHECK_FOR_HOLES
 #    define INIT_HEAP_MEM(p,sz) erts_set_hole_marker(HEAP_TOP(p), (sz))
 #  else
-#    define INIT_HEAP_MEM(p,sz) memset(HEAP_TOP(p),0x01,(sz)*sizeof(Eterm*))
+#    define INIT_HEAP_MEM(p,sz) sys_memset(HEAP_TOP(p),0x01,(sz)*sizeof(Eterm*))
 #  endif
 #else
 #  define INIT_HEAP_MEM(p,sz) ((void)0)
diff --git a/erts/emulator/beam/erlang_dtrace.d b/erts/emulator/beam/erlang_dtrace.d
index 237889e0f5..d0b10e0306 100644
--- a/erts/emulator/beam/erlang_dtrace.d
+++ b/erts/emulator/beam/erlang_dtrace.d
@@ -634,72 +634,6 @@ provider erlang {
      */
     probe aio_pool__get(char *, int);
 
-    /* Probes for efile_drv.c */
-
-    /**
-     * Entry into the efile_drv.c file I/O driver
-     *
-     * For a list of command numbers used by this driver, see the section
-     * "Guide to efile_drv.c probe arguments" in ../../../HOWTO/DTRACE.md.
-     * That section also contains explanation of the various integer and
-     * string arguments that may be present when any particular probe fires.
-     *
-     * NOTE: Not all Linux platforms (using SystemTap) can support
-     *       arguments beyond arg9.
-     *
-     *
-     * TODO: Adding the port string, args[10], is a pain.  Making that
-     *       port string available to all the other efile_drv.c probes
-     *       will be more pain.  Is the pain worth it?  If yes, then
-     *       add them everywhere else and grit our teeth.  If no, then
-     *       rip it out.
-     *
-     * @param thread-id number of the scheduler Pthread                   arg0
-     * @param tag number: {thread-id, tag} uniquely names a driver operation
-     * @param user-tag string                                             arg2
-     * @param command number                                              arg3
-     * @param string argument 1                                           arg4
-     * @param string argument 2                                           arg5
-     * @param integer argument 1                                          arg6
-     * @param integer argument 2                                          arg7
-     * @param integer argument 3                                          arg8
-     * @param integer argument 4                                          arg9
-     * @param port the port ID of the busy port                       args[10]
-     */
-    probe efile_drv__entry(int, int, char *, int, char *, char *,
-                           int64_t, int64_t, int64_t, int64_t, char *);
-
-    /**
-     * Entry into the driver's internal work function.  Computation here
-     * is performed by a async worker pool Pthread.
-     *
-     * @param thread-id number
-     * @param tag number
-     * @param command number
-     */
-    probe efile_drv__int_entry(int, int, int);
-
-    /**
-     * Return from the driver's internal work function.
-     *
-     * @param thread-id number
-     * @param tag number
-     * @param command number
-     */
-    probe efile_drv__int_return(int, int, int);
-
-    /**
-     * Return from the efile_drv.c file I/O driver
-     *
-     * @param thread-id number                                            arg0
-     * @param tag number                                                  arg1
-     * @param user-tag string                                             arg2
-     * @param command number                                              arg3
-     * @param Success? 1 is success, 0 is failure                         arg4
-     * @param If failure, the errno of the error.                         arg5
-     */
-    probe efile_drv__return(int, int, char *, int, int, int);
-
 
 /*
  * The set of probes called by the erlang tracer nif backend. In order
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index 970158933f..fb42969a8f 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -122,8 +122,9 @@ static int encode_size_struct_int(struct TTBSizeContext_*, ErtsAtomCacheMap *acm
 
 static Export binary_to_term_trap_export;
 static BIF_RETTYPE binary_to_term_trap_1(BIF_ALIST_1);
-static BIF_RETTYPE binary_to_term_int(Process* p, Uint32 flags, Eterm bin, Binary* context_b,
-				      Export *bif, Eterm arg0, Eterm arg1);
+static Sint transcode_dist_obuf(ErtsDistOutputBuf*, DistEntry*, Uint32 dflags, Sint reds);
+
+
 
 void erts_init_external(void) {
     erts_init_trap_export(&term_to_binary_trap_export,
@@ -222,23 +223,10 @@ erts_destroy_atom_cache_map(ErtsAtomCacheMap *acmp)
 static ERTS_INLINE void
 insert_acache_map(ErtsAtomCacheMap *acmp, Eterm atom, Uint32 dflags)
 {
-    /*
-     * If the receiver do not understand utf8 atoms
-     * and this atom cannot be represented in latin1,
-     * we are not allowed to cache it.
-     *
-     * In this case all atoms are assumed to have
-     * latin1 encoding in the cache. By refusing it
-     * in the cache we will instead encode it using
-     * ATOM_UTF8_EXT/SMALL_ATOM_UTF8_EXT which the
-     * receiver do not recognize and tear down the
-     * connection.
-     */
-    if (acmp && acmp->sz < ERTS_MAX_INTERNAL_ATOM_CACHE_ENTRIES
-	&& ((dflags & DFLAG_UTF8_ATOMS)
-	    || atom_tab(atom_val(atom))->latin1_chars >= 0)) {
+    if (acmp && acmp->sz < ERTS_MAX_INTERNAL_ATOM_CACHE_ENTRIES) {
 	int ix;
 	ASSERT(acmp->hdr_sz < 0);
+        ASSERT(dflags & DFLAG_UTF8_ATOMS);
 	ix = atom2cix(atom);
 	if (acmp->cache[ix].iix < 0) {
 	    acmp->cache[ix].iix = acmp->sz;
@@ -258,9 +246,7 @@ get_iix_acache_map(ErtsAtomCacheMap *acmp, Eterm atom, Uint32 dflags)
 	ASSERT(is_atom(atom));
 	ix = atom2cix(atom);
 	if (acmp->cache[ix].iix < 0) {
-	    ASSERT(acmp->sz == ERTS_MAX_INTERNAL_ATOM_CACHE_ENTRIES
-		   || (!(dflags & DFLAG_UTF8_ATOMS)
-		       && atom_tab(atom_val(atom))->latin1_chars < 0));
+	    ASSERT(acmp->sz == ERTS_MAX_INTERNAL_ATOM_CACHE_ENTRIES);
 	    return -1;
 	}
 	else {
@@ -274,7 +260,6 @@ void
 erts_finalize_atom_cache_map(ErtsAtomCacheMap *acmp, Uint32 dflags)
 {
     if (acmp) {
-	int utf8_atoms = (int) (dflags & DFLAG_UTF8_ATOMS);
 	int long_atoms = 0; /* !0 if one or more atoms are longer than 255. */
 	int i;
 	int sz;
@@ -285,6 +270,7 @@ erts_finalize_atom_cache_map(ErtsAtomCacheMap *acmp, Uint32 dflags)
 	    + 1 /* number of internal cache entries */
 	    ;
 	int min_sz;
+        ASSERT(dflags & DFLAG_UTF8_ATOMS);
 	ASSERT(acmp->hdr_sz < 0);
 	/* Make sure cache update instructions fit */
 	min_sz = fix_sz+(2+4)*acmp->sz;
@@ -296,7 +282,7 @@ erts_finalize_atom_cache_map(ErtsAtomCacheMap *acmp, Uint32 dflags)
 	    atom = acmp->cache[acmp->cix[i]].atom;
 	    ASSERT(is_atom(atom));
 	    a = atom_tab(atom_val(atom));
-	    len = (int) (utf8_atoms ? a->len : a->latin1_chars);
+	    len = (int) a->len;
 	    ASSERT(len >= 0);
 	    if (!long_atoms && len > 255)
 		long_atoms = 1;
@@ -366,18 +352,77 @@ byte *erts_encode_ext_dist_header_setup(byte *ctl_ext, ErtsAtomCacheMap *acmp)
     }
 }
 
-byte *erts_encode_ext_dist_header_finalize(byte *ext, ErtsAtomCache *cache, Uint32 dflags)
+
+#define PASS_THROUGH 'p'
+
+Sint erts_encode_ext_dist_header_finalize(ErtsDistOutputBuf* ob,
+                                          DistEntry* dep,
+                                          Uint32 dflags,
+                                          Sint reds)
 {
     byte *ip;
     byte instr_buf[(2+4)*ERTS_ATOM_CACHE_SIZE];
     int ci, sz;
     byte dist_hdr_flags;
     int long_atoms;
-    int utf8_atoms = (int) (dflags & DFLAG_UTF8_ATOMS);
-    register byte *ep = ext;
-    ASSERT(ep[0] == VERSION_MAGIC);
-    if (ep[1] != DIST_HEADER)
-	return ext;
+    register byte *ep = ob->extp;
+    ASSERT(dflags & DFLAG_UTF8_ATOMS);
+
+    /*
+     * The buffer can have different layouts at this point depending on
+     * what was known when encoded:
+     *
+     * Pending connection: CtrlTerm [, MsgTerm]
+     * With atom cache   : VERSION_MAGIC, DIST_HEADER, ..., CtrlTerm [, MsgTerm]
+     * No atom cache     : VERSION_MAGIC, CtrlTerm [, VERSION_MAGIC, MsgTerm]
+     */
+
+    if (ep[0] != VERSION_MAGIC || dep->transcode_ctx) {
+        /*
+         * Was encoded without atom cache toward pending connection.
+         */
+        ASSERT(ep[0] == SMALL_TUPLE_EXT || ep[0] == LARGE_TUPLE_EXT);
+
+        if (~dflags & (DFLAG_DIST_MONITOR | DFLAG_DIST_MONITOR_NAME)
+            && ep[0] == SMALL_TUPLE_EXT
+            && ep[1] == 4
+            && ep[2] == SMALL_INTEGER_EXT
+            && (ep[3] == DOP_MONITOR_P ||
+                ep[3] == DOP_MONITOR_P_EXIT ||
+                ep[3] == DOP_DEMONITOR_P)) {
+            /*
+             * Receiver does not support process monitoring.
+             * Suppress monitor control msg (see erts_dsig_send_monitor)
+             * by converting it to an empty (tick) packet.
+             */
+            ob->ext_endp = ob->extp;
+            return reds;
+        }
+        if (~dflags & (DFLAG_BIT_BINARIES | DFLAG_EXPORT_PTR_TAG
+                       | DFLAG_DIST_HDR_ATOM_CACHE)) {
+            reds = transcode_dist_obuf(ob, dep, dflags, reds);
+            if (reds < 0)
+                return reds;
+            ep = ob->extp;
+        }
+        if (dflags & DFLAG_DIST_HDR_ATOM_CACHE) {
+            /*
+             * Encoding was done without atom caching but receiver expects
+             * a dist header, so we prepend an empty one.
+             */
+            *--ep = 0; /* NumberOfAtomCacheRefs */
+            *--ep = DIST_HEADER;
+            *--ep = VERSION_MAGIC;
+        }
+        goto done;
+    }
+    else if (ep[1] != DIST_HEADER) {
+        ASSERT(ep[1] == SMALL_TUPLE_EXT || ep[1] == LARGE_TUPLE_EXT);
+        ASSERT(!(dflags & DFLAG_DIST_HDR_ATOM_CACHE));
+        /* Node without atom cache, 'pass through' needed */
+        *--ep = PASS_THROUGH;
+        goto done;
+    }
 
     dist_hdr_flags = ep[2];
     long_atoms = ERTS_DIST_HDR_LONG_ATOMS_FLG & ((int) dist_hdr_flags);
@@ -405,6 +450,7 @@ byte *erts_encode_ext_dist_header_finalize(byte *ext, ErtsAtomCache *cache, Uint
 			 / sizeof(Uint32))+1];
 	register Uint32 flgs;
 	int iix, flgs_bytes, flgs_buf_ix, used_half_bytes;
+        ErtsAtomCache* cache = dep->cache;
 #ifdef DEBUG
 	int tot_used_half_bytes;
 #endif
@@ -447,17 +493,9 @@ byte *erts_encode_ext_dist_header_finalize(byte *ext, ErtsAtomCache *cache, Uint
 		Atom *a;
 		cache->out_arr[cix] = atom;
 		a = atom_tab(atom_val(atom));
-		if (utf8_atoms) {
-		    sz = a->len;
-		    ep -= sz;
-		    sys_memcpy((void *) ep, (void *) a->name, sz);
-		}
-		else {
-		    ASSERT(0 <= a->latin1_chars && a->latin1_chars <= MAX_ATOM_CHARACTERS);
-		    ep -= a->latin1_chars;
-		    sz = erts_utf8_to_latin1(ep, a->name, a->len);
-		    ASSERT(a->latin1_chars == sz);
-		}
+                sz = a->len;
+                ep -= sz;
+                sys_memcpy((void *) ep, (void *) a->name, sz);
 		if (long_atoms) {
 		    ep -= 2;
 		    put_int16(sz, ep);
@@ -504,12 +542,16 @@ byte *erts_encode_ext_dist_header_finalize(byte *ext, ErtsAtomCache *cache, Uint
 		break;
 	    }
 	}
+        reds -= 3; /*was ERTS_PORT_REDS_DIST_CMD_FINALIZE*/
     }
     --ep;
     put_int8(ci, ep);
     *--ep = DIST_HEADER;
     *--ep = VERSION_MAGIC;
-    return ep;
+done:
+    ob->extp = ep;
+    ASSERT(&ob->data[0] <= ob->extp && ob->extp < ob->ext_endp);
+    return reds < 0 ? 0 : reds;
 }
 
 int erts_encode_dist_ext_size(Eterm term, Uint32 flags, ErtsAtomCacheMap *acmp,
@@ -520,7 +562,7 @@ int erts_encode_dist_ext_size(Eterm term, Uint32 flags, ErtsAtomCacheMap *acmp,
 	return -1;
     } else {
 #ifndef ERTS_DEBUG_USE_DIST_SEP
-	if (!(flags & DFLAG_DIST_HDR_ATOM_CACHE))
+	if (!(flags & (DFLAG_DIST_HDR_ATOM_CACHE | DFLAG_NO_MAGIC)))
 #endif
 	    sz++ /* VERSION_MAGIC */;
 
@@ -536,7 +578,7 @@ int erts_encode_dist_ext_size_int(Eterm term, struct erts_dsig_send_context* ctx
 	return -1;
     } else {
 #ifndef ERTS_DEBUG_USE_DIST_SEP
-	if (!(ctx->flags & DFLAG_DIST_HDR_ATOM_CACHE))
+	if (!(ctx->flags & (DFLAG_DIST_HDR_ATOM_CACHE | DFLAG_NO_MAGIC)))
 #endif
 	    sz++ /* VERSION_MAGIC */;
 
@@ -568,7 +610,7 @@ int erts_encode_dist_ext(Eterm term, byte **ext, Uint32 flags, ErtsAtomCacheMap
 {
     if (!ctx || !ctx->wstack.wstart) {
     #ifndef ERTS_DEBUG_USE_DIST_SEP
-	if (!(flags & DFLAG_DIST_HDR_ATOM_CACHE))
+	if (!(flags & (DFLAG_DIST_HDR_ATOM_CACHE | DFLAG_NO_MAGIC)))
     #endif
 	    *(*ext)++ = VERSION_MAGIC;
     }
@@ -643,7 +685,7 @@ erts_prepare_dist_ext(ErtsDistExternal *edep,
 #endif
 
     register byte *ep = ext;
-    int utf8_atoms = (int) (dep->flags & DFLAG_UTF8_ATOMS);
+    ASSERT(dep->flags & DFLAG_UTF8_ATOMS);
 
     edep->heap_size = -1;
     edep->ext_endp = ext+size;
@@ -669,17 +711,16 @@ erts_prepare_dist_ext(ErtsDistExternal *edep,
 
     erts_de_rlock(dep);
 
-    if ((dep->status & (ERTS_DE_SFLG_EXITING|ERTS_DE_SFLG_CONNECTED))
-        != ERTS_DE_SFLG_CONNECTED) {
+    if (dep->state != ERTS_DE_STATE_CONNECTED &&
+	dep->state != ERTS_DE_STATE_PENDING) {
         erts_de_runlock(dep);
         return ERTS_PREP_DIST_EXT_CLOSED;
     }
-
     if (dep->flags & DFLAG_DIST_HDR_ATOM_CACHE)
         edep->flags |= ERTS_DIST_EXT_DFLAG_HDR;
 
     *connection_id = dep->connection_id;
-    edep->flags |= (dep->connection_id & ERTS_DIST_EXT_CON_ID_MASK);
+    edep->connection_id = dep->connection_id;
 
     if (ep[1] != DIST_HEADER) {
 	if (edep->flags & ERTS_DIST_EXT_DFLAG_HDR)
@@ -806,9 +847,7 @@ erts_prepare_dist_ext(ErtsDistExternal *edep,
 		    CHKSIZE(len);
 		    atom = erts_atom_put((byte *) ep,
 					 len,
-					 (utf8_atoms
-					  ? ERTS_ATOM_ENC_UTF8
-					  : ERTS_ATOM_ENC_LATIN1),
+                                         ERTS_ATOM_ENC_UTF8,
 					 0);
 		    if (is_non_value(atom))
 			ERTS_EXT_HDR_FAIL;
@@ -895,7 +934,7 @@ bad_dist_ext(ErtsDistExternal *edep)
 		erts_dsprintf(dsbufp, ", %d=%T", i, edep->attab.atom[i]);
 	}
 	erts_send_warning_to_logger_nogl(dsbufp);
-	erts_kill_dist_connection(dep, ERTS_DIST_EXT_CON_ID(edep));
+	erts_kill_dist_connection(dep, edep->connection_id);
     }
 }
 
@@ -1220,7 +1259,8 @@ typedef struct B2TContext_t {
     ErtsBinary2TermState b2ts;
     Uint32 flags;
     SWord reds;
-    Eterm trap_bin;
+    Uint used_bytes; /* In: boolean, Out: bytes */
+    Eterm trap_bin;  /* THE_NON_VALUE if not exported */
     Export *bif;
     Eterm arg[2];
     enum B2TState state;
@@ -1314,6 +1354,11 @@ binary2term_prepare(ErtsBinary2TermState *state, byte *data, Sint data_size,
 
 	    ctx->u.uc.dbytes = state->extp;
 	    ctx->u.uc.dleft = dest_len;
+            if (ctx->used_bytes) {
+                ASSERT(ctx->used_bytes == 1);
+                 /* to be subtracted by stream.avail_in when done */
+                ctx->used_bytes = data_size;
+            }
 	    ctx->state = B2TUncompressChunk;
             *ctxp = ctx;
         }
@@ -1416,13 +1461,15 @@ static int b2t_context_destructor(Binary *context_bin)
     return 1;
 }
 
+static BIF_RETTYPE binary_to_term_int(Process*, Eterm bin, B2TContext*);
+
+
 static BIF_RETTYPE binary_to_term_trap_1(BIF_ALIST_1)
 {
     Binary *context_bin = erts_magic_ref2bin(BIF_ARG_1);
     ASSERT(ERTS_MAGIC_BIN_DESTRUCTOR(context_bin) == b2t_context_destructor);
 
-    return binary_to_term_int(BIF_P, 0, THE_NON_VALUE, context_bin, NULL,
-			      THE_NON_VALUE, THE_NON_VALUE);
+    return binary_to_term_int(BIF_P, THE_NON_VALUE, ERTS_MAGIC_BIN_DATA(context_bin));
 }
 
 
@@ -1448,6 +1495,8 @@ static B2TContext* b2t_export_context(Process* p, B2TContext* src)
                                                  b2t_context_destructor);
     B2TContext* ctx = ERTS_MAGIC_BIN_DATA(context_b);
     Eterm* hp;
+
+    ASSERT(is_non_value(src->trap_bin));
     sys_memcpy(ctx, src, sizeof(B2TContext));
     if (ctx->state >= B2TDecode && ctx->u.dc.next == &src->u.dc.res) {
         ctx->u.dc.next = &ctx->u.dc.res;
@@ -1457,8 +1506,7 @@ static B2TContext* b2t_export_context(Process* p, B2TContext* src)
     return ctx;
 }
 
-static BIF_RETTYPE binary_to_term_int(Process* p, Uint32 flags, Eterm bin, Binary* context_b,
-				      Export *bif_init, Eterm arg0, Eterm arg1)
+static BIF_RETTYPE binary_to_term_int(Process* p, Eterm bin, B2TContext *ctx)
 {
     BIF_RETTYPE ret_val;
 #ifdef EXTREME_B2T_TRAPPING
@@ -1466,25 +1514,17 @@ static BIF_RETTYPE binary_to_term_int(Process* p, Uint32 flags, Eterm bin, Binar
 #else
     SWord initial_reds = (Uint)(ERTS_BIF_REDS_LEFT(p) * B2T_BYTES_PER_REDUCTION);
 #endif
-    B2TContext c_buff;
-    B2TContext *ctx;
     int is_first_call;
 
-    if (context_b == NULL) {
+    if (is_value(bin)) {
 	/* Setup enough to get started */
         is_first_call = 1;
-        ctx = &c_buff;
 	ctx->state = B2TPrepare;
         ctx->aligned_alloc = NULL;
-        ctx->flags = flags;
-	ctx->bif = bif_init;
-	ctx->arg[0] = arg0;
-	ctx->arg[1] = arg1;
-        IF_DEBUG(ctx->trap_bin = THE_NON_VALUE;)
     } else {
-        is_first_call = 0;
-	ctx = ERTS_MAGIC_BIN_DATA(context_b);
+        ASSERT(is_value(ctx->trap_bin));
         ASSERT(ctx->state != B2TPrepare);
+        is_first_call = 0;
     }
     ctx->reds = initial_reds;
 
@@ -1528,6 +1568,10 @@ static BIF_RETTYPE binary_to_term_int(Process* p, Uint32 flags, Eterm bin, Binar
                      && zret == Z_STREAM_END
                      && ctx->u.uc.dleft == 0) {
                 ctx->reds -= chunk;
+                if (ctx->used_bytes) {
+                    ASSERT(ctx->used_bytes > 5 + ctx->u.uc.stream.avail_in);
+                    ctx->used_bytes -= ctx->u.uc.stream.avail_in;
+                }
                 ctx->state = B2TSizeInit;
             }
             else {
@@ -1546,11 +1590,11 @@ static BIF_RETTYPE binary_to_term_int(Process* p, Uint32 flags, Eterm bin, Binar
             break;
 
         case B2TDecodeInit:
-            if (ctx == &c_buff && ctx->b2ts.extsize > ctx->reds) {
+            if (is_non_value(ctx->trap_bin) && ctx->b2ts.extsize > ctx->reds) {
                 /* dec_term will maybe trap, allocate space for magic bin
                    before result term to make it easy to trim with HRelease.
                  */
-                ctx = b2t_export_context(p, &c_buff);
+                ctx = b2t_export_context(p, ctx);
             }
             ctx->u.dc.ep = ctx->b2ts.extp;
             ctx->u.dc.res = (Eterm) (UWord) NULL;
@@ -1593,6 +1637,25 @@ static BIF_RETTYPE binary_to_term_int(Process* p, Uint32 flags, Eterm bin, Binar
 	    return ret_val;
 
         case B2TDone:
+            if (ctx->used_bytes) {
+                Eterm *hp;
+                Eterm used;
+                if (!ctx->b2ts.exttmp) {
+                    ASSERT(ctx->used_bytes == 1);
+                    ctx->used_bytes = (ctx->u.dc.ep - ctx->b2ts.extp
+                                       +1); /* VERSION_MAGIC */
+                }
+                if (IS_USMALL(0, ctx->used_bytes)) {
+                    hp = erts_produce_heap(&ctx->u.dc.factory, 3, 0);
+                    used = make_small(ctx->used_bytes);
+                }
+                else {
+                    hp = erts_produce_heap(&ctx->u.dc.factory, 3+BIG_UINT_HEAP_SIZE, 0);
+                    used = uint_to_big(ctx->used_bytes, hp);
+                    hp += BIG_UINT_HEAP_SIZE;
+                }
+                ctx->u.dc.res = TUPLE2(hp, ctx->u.dc.res, used);
+            }
             b2t_destroy_context(ctx);
 
             if (ctx->u.dc.factory.hp > ctx->u.dc.factory.hp_end) {
@@ -1613,11 +1676,10 @@ static BIF_RETTYPE binary_to_term_int(Process* p, Uint32 flags, Eterm bin, Binar
         }
     }while (ctx->reds > 0 || ctx->state >= B2TDone);
 
-    if (ctx == &c_buff) {
-        ASSERT(ctx->trap_bin == THE_NON_VALUE);
-        ctx = b2t_export_context(p, &c_buff);
+    if (is_non_value(ctx->trap_bin)) {
+        ctx = b2t_export_context(p, ctx);
+        ASSERT(is_value(ctx->trap_bin));
     }
-    ASSERT(ctx->trap_bin != THE_NON_VALUE);
 
     if (is_first_call) {
         erts_set_gc_state(p, 0);
@@ -1634,23 +1696,35 @@ HIPE_WRAPPER_BIF_DISABLE_GC(binary_to_term, 1)
 
 BIF_RETTYPE binary_to_term_1(BIF_ALIST_1)
 {
-    return binary_to_term_int(BIF_P, 0, BIF_ARG_1, NULL, bif_export[BIF_binary_to_term_1],
-			      BIF_ARG_1, THE_NON_VALUE);
+    B2TContext ctx;
+
+    ctx.flags = 0;
+    ctx.used_bytes = 0;
+    ctx.trap_bin = THE_NON_VALUE;
+    ctx.bif = bif_export[BIF_binary_to_term_1];
+    ctx.arg[0] = BIF_ARG_1;
+    ctx.arg[1] = THE_NON_VALUE;
+    return binary_to_term_int(BIF_P, BIF_ARG_1, &ctx);
 }
 
 HIPE_WRAPPER_BIF_DISABLE_GC(binary_to_term, 2)
 
 BIF_RETTYPE binary_to_term_2(BIF_ALIST_2)
 {
+    B2TContext ctx;
     Eterm opts;
     Eterm opt;
-    Uint32 flags = 0;
 
+    ctx.flags = 0;
+    ctx.used_bytes = 0;
     opts = BIF_ARG_2;
     while (is_list(opts)) {
         opt = CAR(list_val(opts));
         if (opt == am_safe) {
-            flags |= ERTS_DIST_EXT_BTT_SAFE;
+            ctx.flags |= ERTS_DIST_EXT_BTT_SAFE;
+        }
+        else if (opt == am_used) {
+            ctx.used_bytes = 1;
         }
 	else {
             goto error;
@@ -1661,8 +1735,11 @@ BIF_RETTYPE binary_to_term_2(BIF_ALIST_2)
     if (is_not_nil(opts))
         goto error;
 
-    return binary_to_term_int(BIF_P, flags, BIF_ARG_1, NULL, bif_export[BIF_binary_to_term_2],
-			      BIF_ARG_1, BIF_ARG_2);
+    ctx.trap_bin = THE_NON_VALUE;
+    ctx.bif = bif_export[BIF_binary_to_term_2];
+    ctx.arg[0] = BIF_ARG_1;
+    ctx.arg[1] = BIF_ARG_2;
+    return binary_to_term_int(BIF_P, BIF_ARG_1, &ctx);
 
 error:
     BIF_ERROR(BIF_P, BADARG);
@@ -1876,7 +1953,7 @@ static Eterm erts_term_to_binary_int(Process* p, Eterm Term, int level, Uint fla
 	    context_b = erts_create_magic_binary(sizeof(TTBContext),    \
                                                  ttb_context_destructor);   \
 	    context =  ERTS_MAGIC_BIN_DATA(context_b);			\
-	    memcpy(context,&c_buff,sizeof(TTBContext));			\
+	    sys_memcpy(context,&c_buff,sizeof(TTBContext));			\
 	}								\
     } while (0)
 
@@ -1955,23 +2032,14 @@ static Eterm erts_term_to_binary_int(Process* p, Eterm Term, int level, Uint fla
 		level = context->s.ec.level;
 		BUMP_REDS(p, (initial_reds - reds) / TERM_TO_BINARY_LOOP_FACTOR);
 		if (level == 0 || real_size < 6) { /* We are done */
-		    ProcBin* pb;
 		return_normal:
 		    context->s.ec.result_bin = NULL;
 		    context->alive = 0;
-		    pb = (ProcBin *) HAlloc(p, PROC_BIN_SIZE);
-		    pb->thing_word = HEADER_PROC_BIN;
-		    pb->size = real_size;
-		    pb->next = MSO(p).first;
-		    MSO(p).first = (struct erl_off_heap_header*)pb;
-		    pb->val = result_bin;
-		    pb->bytes = (byte*) result_bin->orig_bytes;
-		    pb->flags = 0;
-		    OH_OVERHEAD(&(MSO(p)), pb->size / sizeof(Eterm));
 		    if (context_b && erts_refc_read(&context_b->intern.refc,0) == 0) {
 			erts_bin_free(context_b);
 		    }
-		    return make_binary(pb);
+		    return erts_build_proc_bin(&MSO(p), HAlloc(p, PROC_BIN_SIZE),
+                                               result_bin);
 		}
 		/* Continue with compression... */
 		/* To make absolutely sure that zlib does not barf on a reallocated context, 
@@ -2028,16 +2096,7 @@ static Eterm erts_term_to_binary_int(Process* p, Eterm Term, int level, Uint fla
 			result_bin = erts_bin_realloc(context->s.cc.destination_bin,
 						      context->s.cc.dest_len+6);
 			context->s.cc.destination_bin = NULL;
-			pb = (ProcBin *) HAlloc(p, PROC_BIN_SIZE);
-			pb->thing_word = HEADER_PROC_BIN;
-			pb->size = context->s.cc.dest_len+6;
-			pb->next = MSO(p).first;
-			MSO(p).first = (struct erl_off_heap_header*)pb;
-			pb->val = result_bin;
 			ASSERT(erts_refc_read(&result_bin->intern.refc, 1));
-			pb->bytes = (byte*) result_bin->orig_bytes;
-			pb->flags = 0;
-			OH_OVERHEAD(&(MSO(p)), pb->size / sizeof(Eterm));
 			erts_bin_free(context->s.cc.result_bin);
 			context->s.cc.result_bin = NULL;
 			context->alive = 0;
@@ -2045,7 +2104,9 @@ static Eterm erts_term_to_binary_int(Process* p, Eterm Term, int level, Uint fla
 			if (context_b && erts_refc_read(&context_b->intern.refc,0) == 0) {
 			    erts_bin_free(context_b);
 			}
-			return make_binary(pb);
+			return erts_build_proc_bin(&MSO(p),
+						   HAlloc(p, PROC_BIN_SIZE),
+                                                   result_bin);
 		    }
 		default: /* Compression error, revert to uncompressed binary (still in 
 			    context) */
@@ -2099,7 +2160,7 @@ enc_atom(ErtsAtomCacheMap *acmp, Eterm atom, byte *ep, Uint32 dflags)
 {
     int iix;
     int len;
-    int utf8_atoms = (int) (dflags & DFLAG_UTF8_ATOMS);
+    const int utf8_atoms = (int) (dflags & DFLAG_UTF8_ATOMS);
 
     ASSERT(is_atom(atom));
 
@@ -2494,8 +2555,6 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 	    break;
 	}
 
-    L_jump_start:
-
 	if (ctx && --r <= 0) {
 	    *reds = 0;
 	    ctx->obj = obj;
@@ -2503,6 +2562,8 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 	    WSTACK_SAVE(s, &ctx->wstack);
 	    return -1;
 	}
+
+    L_jump_start:
 	switch(tag_val_def(obj)) {
 	case NIL_DEF:
 	    *ep++ = NIL_EXT;
@@ -2812,6 +2873,8 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 		    ep[j] = 0;	/* Zero unused bits at end of binary */
 		    data_dst = ep;
 		    ep += j + 1;
+                    if (ctx)
+                        ctx->hopefull_flags |= DFLAG_BIT_BINARIES;
 		} else {
 		    /*
 		     * Bit-level binary, but the receiver doesn't support it.
@@ -2847,6 +2910,8 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 		    ep = enc_atom(acmp, exp->info.mfa.function, ep, dflags);
 		    ep = enc_term(acmp, make_small(exp->info.mfa.arity),
                                   ep, dflags, off_heap);
+                    if (ctx)
+                        ctx->hopefull_flags |= DFLAG_EXPORT_PTR_TAG;
 		} else {
 		    /* Tag, arity */
 		    *ep++ = SMALL_TUPLE_EXT;
@@ -2867,62 +2932,27 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 		ErlFunThing* funp = (ErlFunThing *) fun_val(obj);
 		int ei;
 
-		if ((dflags & DFLAG_NEW_FUN_TAGS) != 0) {
-		    *ep++ = NEW_FUN_EXT;
-		    WSTACK_PUSH2(s, ENC_PATCH_FUN_SIZE,
-				 (UWord) ep); /* Position for patching in size */
-		    ep += 4;
-		    *ep = funp->arity;
-		    ep += 1;
-		    sys_memcpy(ep, funp->fe->uniq, 16);
-		    ep += 16;
-		    put_int32(funp->fe->index, ep);
-		    ep += 4;
-		    put_int32(funp->num_free, ep);
-		    ep += 4;
-		    ep = enc_atom(acmp, funp->fe->module, ep, dflags);
-		    ep = enc_term(acmp, make_small(funp->fe->old_index), ep, dflags, off_heap);
-		    ep = enc_term(acmp, make_small(funp->fe->old_uniq), ep, dflags, off_heap);
-		    ep = enc_pid(acmp, funp->creator, ep, dflags);
-		} else {
-		    /*
-		     * Communicating with an obsolete erl_interface or
-		     * jinterface node. Convert the fun to a tuple to
-		     * avoid crasching.
-		     */
-		
-		    /* Tag, arity */
-		    *ep++ = SMALL_TUPLE_EXT;
-		    put_int8(5, ep);
-		    ep += 1;
-		
-		    /* 'fun' */
-		    ep = enc_atom(acmp, am_fun, ep, dflags);
-		
-		    /* Module name */
-		    ep = enc_atom(acmp, funp->fe->module, ep, dflags);
-		
-		    /* Index, Uniq */
-		    *ep++ = INTEGER_EXT;
-		    put_int32(funp->fe->old_index, ep);
-		    ep += 4;
-		    *ep++ = INTEGER_EXT;
-		    put_int32(funp->fe->old_uniq, ep);
-		    ep += 4;
-		
-		    /* Environment sub-tuple arity */
-		    ASSERT(funp->num_free < MAX_ARG);
-		    *ep++ = SMALL_TUPLE_EXT;
-		    put_int8(funp->num_free, ep);
-		    ep += 1;
-		}
-		for (ei = funp->num_free-1; ei > 0; ei--) {
+		ASSERT(dflags & DFLAG_NEW_FUN_TAGS);
+                *ep++ = NEW_FUN_EXT;
+                WSTACK_PUSH2(s, ENC_PATCH_FUN_SIZE,
+                             (UWord) ep); /* Position for patching in size */
+                ep += 4;
+                *ep = funp->arity;
+                ep += 1;
+                sys_memcpy(ep, funp->fe->uniq, 16);
+                ep += 16;
+                put_int32(funp->fe->index, ep);
+                ep += 4;
+                put_int32(funp->num_free, ep);
+                ep += 4;
+                ep = enc_atom(acmp, funp->fe->module, ep, dflags);
+                ep = enc_term(acmp, make_small(funp->fe->old_index), ep, dflags, off_heap);
+                ep = enc_term(acmp, make_small(funp->fe->old_uniq), ep, dflags, off_heap);
+                ep = enc_pid(acmp, funp->creator, ep, dflags);
+
+		for (ei = funp->num_free-1; ei >= 0; ei--) {
 		    WSTACK_PUSH2(s, ENC_TERM, (UWord) funp->env[ei]);
 		}
-		if (funp->num_free != 0) {
-		    obj = funp->env[0];
-		    goto L_jump_start;
-		}
 	    }
 	    break;
 	}
@@ -3260,6 +3290,7 @@ dec_term_atom_common:
             n--;
 	    if (ctx) {
                 if (reds < n) {
+                    ASSERT(reds > 0);
 		    ctx->state = B2TDecodeList;
 		    ctx->u.dc.remaining_n = n - reds;
 		    n = reds;
@@ -3541,18 +3572,9 @@ dec_term_atom_common:
 		    *objp = make_binary(hb);
 		} else {
 		    Binary* dbin = erts_bin_nrml_alloc(n);
-		    ProcBin* pb;
-		    pb = (ProcBin *) hp;
+
+		    *objp = erts_build_proc_bin(factory->off_heap, hp, dbin);
 		    hp += PROC_BIN_SIZE;
-		    pb->thing_word = HEADER_PROC_BIN;
-		    pb->size = n;
-		    pb->next = factory->off_heap->first;
-		    factory->off_heap->first = (struct erl_off_heap_header*)pb;
-		    OH_OVERHEAD(factory->off_heap, pb->size / sizeof(Eterm));
-		    pb->val = dbin;
-		    pb->bytes = (byte*) dbin->orig_bytes;
-		    pb->flags = 0;
-		    *objp = make_binary(pb);
                     if (ctx) {
                         int n_limit = reds * B2T_MEMCPY_FACTOR;
                         if (n > n_limit) {
@@ -3592,18 +3614,9 @@ dec_term_atom_common:
                     ep += n;
 		} else {
 		    Binary* dbin = erts_bin_nrml_alloc(n);
-		    ProcBin* pb;
+		    Uint n_copy = n;
 
-		    pb = (ProcBin *) hp;
-		    pb->thing_word = HEADER_PROC_BIN;
-		    pb->size = n;
-		    pb->next = factory->off_heap->first;
-		    factory->off_heap->first = (struct erl_off_heap_header*)pb;
-		    OH_OVERHEAD(factory->off_heap, pb->size / sizeof(Eterm));
-		    pb->val = dbin;
-		    pb->bytes = (byte*) dbin->orig_bytes;
-		    pb->flags = 0;
-		    bin = make_binary(pb);
+		    bin = erts_build_proc_bin(factory->off_heap, hp, dbin);
 		    hp += PROC_BIN_SIZE;
                     if (ctx) {
                         int n_limit = reds * B2T_MEMCPY_FACTOR;
@@ -3611,15 +3624,15 @@ dec_term_atom_common:
                             ctx->state = B2TDecodeBinary;
                             ctx->u.dc.remaining_n = n - n_limit;
                             ctx->u.dc.remaining_bytes = dbin->orig_bytes + n_limit;
-                            n = n_limit;
+                            n_copy = n_limit;
                             reds = 0;
                         }
-                        else
+                        else {
                             reds -= n / B2T_MEMCPY_FACTOR;
+			}
                     }
-                    sys_memcpy(dbin->orig_bytes, ep, n);
-                    ep += n;
-                    n = pb->size;
+                    sys_memcpy(dbin->orig_bytes, ep, n_copy);
+                    ep += n_copy;
                 }
 
 		if (bitsize == 8 || n == 0) {
@@ -4000,6 +4013,7 @@ dec_term_atom_common:
     if (ctx) {
         ctx->state = B2TDone;
 	ctx->reds = reds;
+        ctx->u.dc.ep = ep;
     }
 
     return ep;
@@ -4269,24 +4283,12 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 	    {
 		ErlFunThing* funp = (ErlFunThing *) fun_val(obj);
 		
-		if ((dflags & DFLAG_NEW_FUN_TAGS) != 0) {
-		    result += 20+1+1+4;	/* New ID + Tag */
-		    result += 4; /* Length field (number of free variables */
-		    result += encode_size_struct2(acmp, funp->creator, dflags);
-		    result += encode_size_struct2(acmp, funp->fe->module, dflags);
-		    result += 2 * (1+4);	/* Index, Uniq */
-		} else {
-		    /*
-		     * Size when fun is mapped to a tuple.
-		     */
-		    result += 1 + 1; /* Tuple tag, arity */
-		    result += 1 + 1 + 2 +
-			atom_tab(atom_val(am_fun))->len; /* 'fun' */
-		    result += 1 + 1 + 2 +
-			atom_tab(atom_val(funp->fe->module))->len; /* Module name */
-		    result += 2 * (1 + 4); /* Index + Uniq */
-		    result += 1 + (funp->num_free < 0x100 ? 1 : 4);
-		}
+                ASSERT(dflags & DFLAG_NEW_FUN_TAGS);
+                result += 20+1+1+4;	/* New ID + Tag */
+                result += 4; /* Length field (number of free variables */
+                result += encode_size_struct2(acmp, funp->creator, dflags);
+                result += encode_size_struct2(acmp, funp->fe->module, dflags);
+                result += 2 * (1+4);	/* Index, Uniq */
 		if (funp->num_free > 1) {
 		    WSTACK_PUSH2(s, (UWord) (funp->env + 1),
 				    (UWord) TERM_ARRAY_OP(funp->num_free-1));
@@ -4374,7 +4376,7 @@ decoded_size(byte *ep, byte* endp, int internal_tags, B2TContext* ctx)
         }
     }
     else
-        reds = 0; /* not used but compiler warns anyway */
+        ERTS_UNDEF(reds, 0);
 
     heap_size = 0;
     terms = 1;
@@ -4684,3 +4686,182 @@ error:
 #undef SKIP2
 #undef CHKSIZE
 }
+
+
+struct transcode_context {
+    enum {
+        TRANSCODE_DEC_MSG_SIZE,
+        TRANSCODE_DEC_MSG,
+        TRANSCODE_ENC_CTL,
+        TRANSCODE_ENC_MSG
+    }state;
+    Eterm ctl_term;
+    Eterm* ctl_heap;
+    ErtsHeapFactory ctl_factory;
+    Eterm* msg_heap;
+    B2TContext b2t;
+    TTBEncodeContext ttb;
+#ifdef DEBUG
+    ErtsDistOutputBuf* dbg_ob;
+#endif
+};
+
+void transcode_free_ctx(DistEntry* dep)
+{
+    struct transcode_context* ctx = dep->transcode_ctx;
+
+    erts_factory_close(&ctx->ctl_factory);
+    erts_free(ERTS_ALC_T_DIST_TRANSCODE, ctx->ctl_heap);
+
+    if (ctx->msg_heap) {
+        erts_factory_close(&ctx->b2t.u.dc.factory);
+        erts_free(ERTS_ALC_T_DIST_TRANSCODE, ctx->msg_heap);
+    }
+    erts_free(ERTS_ALC_T_DIST_TRANSCODE, ctx);
+    dep->transcode_ctx = NULL;
+}
+
+Sint transcode_dist_obuf(ErtsDistOutputBuf* ob,
+                         DistEntry* dep,
+                         Uint32 dflags,
+                         Sint reds)
+{
+    Sint hsz;
+    byte* decp;
+    const int have_msg = !!ob->msg_start;
+    int i;
+    struct transcode_context* ctx = dep->transcode_ctx;
+
+    if (!ctx) { /* first call for 'ob' */
+	ASSERT(!(ob->hopefull_flags & ~(Uint)(DFLAG_BIT_BINARIES |
+					      DFLAG_EXPORT_PTR_TAG)));
+        if (~dflags & ob->hopefull_flags) {
+            /*
+             * Receiver does not support bitstrings and/or export funs
+             * and output buffer contains such message tags (hopefull_flags).
+             * Must transcode control and message terms to use tuple fallbacks.
+             */
+            ctx = erts_alloc(ERTS_ALC_T_DIST_TRANSCODE, sizeof(struct transcode_context));
+            dep->transcode_ctx = ctx;
+        #ifdef DEBUG
+            ctx->dbg_ob = ob;
+        #endif
+
+            hsz = decoded_size(ob->extp, ob->ext_endp, 0, NULL);
+            ctx->ctl_heap = erts_alloc(ERTS_ALC_T_DIST_TRANSCODE, hsz*sizeof(Eterm));
+            erts_factory_tmp_init(&ctx->ctl_factory, ctx->ctl_heap, hsz, ERTS_ALC_T_DIST_TRANSCODE);
+            ctx->msg_heap = NULL;
+
+            decp = dec_term(NULL, &ctx->ctl_factory, ob->extp, &ctx->ctl_term, NULL);
+            if (have_msg) {
+                ASSERT(decp == ob->msg_start); (void)decp;
+                ctx->b2t.u.sc.ep = NULL;
+                ctx->b2t.state = B2TSize;
+                ctx->b2t.aligned_alloc = NULL;
+                ctx->b2t.b2ts.exttmp = 0;
+                ctx->state = TRANSCODE_DEC_MSG_SIZE;
+            }
+            else {
+                ASSERT(decp == ob->ext_endp);
+                ctx->state = TRANSCODE_ENC_CTL;
+            }
+        }
+        else if (!(dflags & DFLAG_DIST_HDR_ATOM_CACHE)) {
+            /*
+             * No need for full transcoding, but primitive receiver (erl_/jinterface)
+             * expects VERSION_MAGIC before both control and message terms.
+             */
+            if (ob->msg_start) {
+                Sint ctl_bytes = ob->msg_start - ob->extp;
+                ASSERT(ob->extp < ob->msg_start && ob->msg_start < ob->ext_endp);
+                /* Move control term back 1 byte to make room */
+                sys_memmove(ob->extp-1, ob->extp, ctl_bytes);
+                *--(ob->msg_start) = VERSION_MAGIC;
+                --(ob->extp);
+                reds -= ctl_bytes / (B2T_BYTES_PER_REDUCTION * B2T_MEMCPY_FACTOR);
+            }
+            *--(ob->extp) = VERSION_MAGIC;
+            goto done;
+        }
+        else
+            goto done;
+    }
+    else {  /* continue after yield */
+        ASSERT(ctx->dbg_ob == ob);
+    }
+    ctx->b2t.reds = reds * B2T_BYTES_PER_REDUCTION;
+
+    switch (ctx->state) {
+    case TRANSCODE_DEC_MSG_SIZE:
+        hsz = decoded_size(ob->msg_start, ob->ext_endp, 0, &ctx->b2t);
+        if (ctx->b2t.state == B2TSize) {
+            return -1;
+        }
+        ASSERT(ctx->b2t.state == B2TDecodeInit);
+        ctx->msg_heap = erts_alloc(ERTS_ALC_T_DIST_TRANSCODE, hsz*sizeof(Eterm));
+        ctx->b2t.u.dc.ep = ob->msg_start;
+        ctx->b2t.u.dc.res = (Eterm) NULL;
+        ctx->b2t.u.dc.next = &ctx->b2t.u.dc.res;
+        erts_factory_tmp_init(&ctx->b2t.u.dc.factory,
+                              ctx->msg_heap, hsz, ERTS_ALC_T_DIST_TRANSCODE);
+        ctx->b2t.u.dc.flat_maps.wstart = NULL;
+        ctx->b2t.u.dc.hamt_array.pstart = NULL;
+        ctx->b2t.state = B2TDecode;
+
+        ctx->state = TRANSCODE_DEC_MSG;
+    case TRANSCODE_DEC_MSG:
+        if (ctx->b2t.reds <= 0)
+            ctx->b2t.reds = 1;
+        decp = dec_term(NULL, NULL, NULL, NULL, &ctx->b2t);
+        if (ctx->b2t.state < B2TDone) {
+            return -1;
+        }
+        ASSERT(ctx->b2t.state == B2TDone);
+        ASSERT(decp && decp <= ob->ext_endp);
+        reds = ctx->b2t.reds / B2T_BYTES_PER_REDUCTION;
+        b2t_destroy_context(&ctx->b2t);
+
+        ctx->state = TRANSCODE_ENC_CTL;
+    case TRANSCODE_ENC_CTL:
+        if (!(dflags & DFLAG_DIST_HDR_ATOM_CACHE)) {
+            ASSERT(!(dflags & DFLAG_NO_MAGIC));
+            ob->extp -= 2; /* VERSION_MAGIC x 2 */
+        }
+        ob->ext_endp = ob->extp;
+        i = erts_encode_dist_ext(ctx->ctl_term, &ob->ext_endp, dflags,
+                                 NULL, NULL, NULL);
+        ASSERT(i == 0); (void)i;
+        ASSERT(ob->ext_endp <= ob->alloc_endp);
+
+        if (!have_msg) {
+            break;
+        }
+        ob->msg_start = ob->ext_endp;
+        ctx->ttb.wstack.wstart = NULL;
+        ctx->ttb.flags = dflags;
+        ctx->ttb.hopefull_flags = 0;
+        ctx->ttb.level = 0;
+
+        ctx->state = TRANSCODE_ENC_MSG;
+    case TRANSCODE_ENC_MSG:
+        reds *= TERM_TO_BINARY_LOOP_FACTOR;
+        if (erts_encode_dist_ext(ctx->b2t.u.dc.res, &ob->ext_endp, dflags, NULL,
+                                 &ctx->ttb, &reds)) {
+            return -1;
+        }
+        reds /= TERM_TO_BINARY_LOOP_FACTOR;
+
+        ASSERT(ob->ext_endp <= ob->alloc_endp);
+        ASSERT(!ctx->ttb.hopefull_flags);
+    }
+    transcode_free_ctx(dep);
+
+done:
+    if (!(dflags & DFLAG_DIST_HDR_ATOM_CACHE))
+        *--(ob->extp) = PASS_THROUGH;
+
+    if (reds < 0)
+        reds = 0;
+
+    return reds;
+}
diff --git a/erts/emulator/beam/external.h b/erts/emulator/beam/external.h
index 3c61d013da..f9f8abcc27 100644
--- a/erts/emulator/beam/external.h
+++ b/erts/emulator/beam/external.h
@@ -109,35 +109,26 @@ typedef struct {
 } ErtsAtomTranslationTable;
 
 /*
- * These flags are tagged onto the high bits of a connection ID and stored in
- * the ErtsDistExternal structure's flags field.  They are used to indicate
- * various bits of state necessary to decode binaries in a variety of
- * scenarios. The mask ERTS_DIST_EXT_CON_ID_MASK is used later to separate the
- * connection ID from the flags. Be careful to ensure that the mask does not
- * overlap any of the bits used for flags, or ERTS will leak flags bits into
- * connection IDs and leak connection ID bits into the flags.
+ * These flags are stored in the ErtsDistExternal structure's flags field.
+ * They are used to indicate various bits of state necessary to decode binaries
+ * in a variety of scenarios.
  */
-#define ERTS_DIST_EXT_DFLAG_HDR      ((Uint32) 0x80000000)
-#define ERTS_DIST_EXT_ATOM_TRANS_TAB ((Uint32) 0x40000000)
-#define ERTS_DIST_EXT_BTT_SAFE       ((Uint32) 0x20000000)
-#define ERTS_DIST_EXT_CON_ID_MASK    ((Uint32) 0x1fffffff)
+#define ERTS_DIST_EXT_DFLAG_HDR      ((Uint32) 0x1)
+#define ERTS_DIST_EXT_ATOM_TRANS_TAB ((Uint32) 0x2)
+#define ERTS_DIST_EXT_BTT_SAFE       ((Uint32) 0x4)
+
+#define ERTS_DIST_CON_ID_MASK ((Uint32) 0x00ffffff) /* also in net_kernel.erl */
 
-#define ERTS_DIST_EXT_CON_ID(DIST_EXTP) \
-  ((DIST_EXTP)->flags & ERTS_DIST_EXT_CON_ID_MASK)
 typedef struct {
     DistEntry *dep;
     byte *extp;
     byte *ext_endp;
     Sint heap_size;
+    Uint32 connection_id;
     Uint32 flags;
     ErtsAtomTranslationTable attab;
 } ErtsDistExternal;
 
-typedef struct {
-    int have_header;
-    int cache_entries;
-} ErtsDistHeaderPeek;
-
 #define ERTS_DIST_EXT_SIZE(EDEP) \
   (sizeof(ErtsDistExternal) \
    - (((EDEP)->flags & ERTS_DIST_EXT_ATOM_TRANS_TAB) \
@@ -163,7 +154,7 @@ void erts_finalize_atom_cache_map(ErtsAtomCacheMap *, Uint32);
 
 Uint erts_encode_ext_dist_header_size(ErtsAtomCacheMap *);
 byte *erts_encode_ext_dist_header_setup(byte *, ErtsAtomCacheMap *);
-byte *erts_encode_ext_dist_header_finalize(byte *, ErtsAtomCache *, Uint32);
+Sint erts_encode_ext_dist_header_finalize(ErtsDistOutputBuf*, DistEntry *, Uint32 dflags, Sint reds);
 struct erts_dsig_send_context;
 int erts_encode_dist_ext_size(Eterm, Uint32, ErtsAtomCacheMap*, Uint* szp);
 int erts_encode_dist_ext_size_int(Eterm term, struct erts_dsig_send_context* ctx, Uint* szp);
@@ -177,9 +168,6 @@ Uint erts_encode_ext_size_ets(Eterm);
 void erts_encode_ext(Eterm, byte **);
 byte* erts_encode_ext_ets(Eterm, byte *, struct erl_off_heap_header** ext_off_heap);
 
-#ifdef ERTS_WANT_EXTERNAL_TAGS
-ERTS_GLB_INLINE void erts_peek_dist_header(ErtsDistHeaderPeek *, byte *, Uint);
-#endif
 ERTS_GLB_INLINE void erts_free_dist_ext_copy(ErtsDistExternal *);
 ERTS_GLB_INLINE void *erts_dist_ext_trailer(ErtsDistExternal *);
 ErtsDistExternal *erts_make_dist_ext_copy(ErtsDistExternal *, Uint);
@@ -207,23 +195,9 @@ void erts_binary2term_abort(ErtsBinary2TermState *);
 Eterm erts_binary2term_create(ErtsBinary2TermState *, ErtsHeapFactory*);
 int erts_debug_max_atom_out_cache_index(void);
 int erts_debug_atom_to_out_cache_index(Eterm);
-
+void transcode_free_ctx(DistEntry* dep);
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
-#ifdef ERTS_WANT_EXTERNAL_TAGS
-ERTS_GLB_INLINE void
-erts_peek_dist_header(ErtsDistHeaderPeek *dhpp, byte *ext, Uint sz)
-{
-    if (ext[0] == VERSION_MAGIC
-	|| ext[1] != DIST_HEADER
-	|| sz < (1+1+1))
-	dhpp->have_header = 0;
-    else {
-	dhpp->have_header = 1;
-	dhpp->cache_entries = (int) get_int8(&ext[2]);
-    }
-}
-#endif
 
 ERTS_GLB_INLINE void
 erts_free_dist_ext_copy(ErtsDistExternal *edep)
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 3dd3a60939..0f23027752 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -368,7 +368,7 @@ do {\
 	UWord _wsz = ESTACK_COUNT(s);\
 	(dst)->start = erts_alloc((s).alloc_type,\
 				  DEF_ESTACK_SIZE * sizeof(Eterm));\
-	memcpy((dst)->start, (s).start,_wsz*sizeof(Eterm));\
+	sys_memcpy((dst)->start, (s).start,_wsz*sizeof(Eterm));\
 	(dst)->sp = (dst)->start + _wsz;\
 	(dst)->end = (dst)->start + DEF_ESTACK_SIZE;\
         (dst)->edefault = NULL;\
@@ -536,7 +536,7 @@ do {\
 	UWord _wsz = WSTACK_COUNT(s);\
 	(dst)->wstart = erts_alloc(s.alloc_type,\
 				  DEF_WSTACK_SIZE * sizeof(UWord));\
-	memcpy((dst)->wstart, s.wstart,_wsz*sizeof(UWord));\
+	sys_memcpy((dst)->wstart, s.wstart,_wsz*sizeof(UWord));\
 	(dst)->wsp = (dst)->wstart + _wsz;\
 	(dst)->wend = (dst)->wstart + DEF_WSTACK_SIZE;\
         (dst)->wdefault = NULL;\
@@ -861,6 +861,7 @@ Eterm erts_new_heap_binary(Process *p, byte *buf, int len, byte** datap);
 Eterm erts_new_mso_binary(Process*, byte*, Uint);
 Eterm new_binary(Process*, byte*, Uint);
 Eterm erts_realloc_binary(Eterm bin, size_t size);
+Eterm erts_build_proc_bin(ErlOffHeap*, Eterm*, Binary*);
 
 /* erl_bif_info.c */
 
@@ -947,8 +948,8 @@ void erts_update_ranges(BeamInstr* code, Uint size);
 void erts_remove_from_ranges(BeamInstr* code);
 UWord erts_ranges_sz(void);
 void erts_lookup_function_info(FunctionInfo* fi, BeamInstr* pc, int full_info);
-ErtsLiteralArea** erts_dump_lit_areas;
-Uint erts_dump_num_lit_areas;
+extern ErtsLiteralArea** erts_dump_lit_areas;
+extern Uint erts_dump_num_lit_areas;
 
 /* break.c */
 void init_break_handler(void);
@@ -958,6 +959,7 @@ void process_info(fmtfn_t, void *);
 void print_process_info(fmtfn_t, void *, Process*);
 void info(fmtfn_t, void *);
 void loaded(fmtfn_t, void *);
+void erts_print_base64(fmtfn_t to, void *to_arg, byte* src, Uint size);
 
 /* sighandler sys.c */
 int erts_set_signal(Eterm signal, Eterm type);
@@ -1064,7 +1066,7 @@ Eterm copy_struct_x(Eterm, Uint, Eterm**, ErlOffHeap*, Uint*, erts_literal_area_
 #define copy_struct_litopt(Obj,Sz,HPP,OH,LitArea) \
     copy_struct_x(Obj,Sz,HPP,OH,NULL,LitArea)
 
-Eterm copy_shallow(Eterm*, Uint, Eterm**, ErlOffHeap*);
+Eterm copy_shallow(Eterm* ERTS_RESTRICT, Uint, Eterm**, ErlOffHeap*);
 
 void erts_move_multi_frags(Eterm** hpp, ErlOffHeap*, ErlHeapFragment* first,
 			   Eterm* refs, unsigned nrefs, int literals);
@@ -1121,7 +1123,6 @@ extern int erts_no_line_info;
 extern Eterm erts_error_logger_warnings;
 extern int erts_initialized;
 extern int erts_compat_rel;
-extern int erts_use_sender_punish;
 void erl_start(int, char**);
 void erts_usage(void);
 Eterm erts_preloaded(Process* p);
@@ -1263,7 +1264,7 @@ char* erts_convert_filename_to_wchar(byte* bytes, Uint size,
                                      char *statbuf, size_t statbuf_size,
                                      ErtsAlcType_t alloc_type, Sint* used,
                                      Uint extra_wchars);
-Eterm erts_convert_native_to_filename(Process *p, byte *bytes);
+Eterm erts_convert_native_to_filename(Process *p, size_t size, byte *bytes);
 Eterm erts_utf8_to_list(Process *p, Uint num, byte *bytes, Uint sz, Uint left,
 			Uint *num_built, Uint *num_eaten, Eterm tail);
 int erts_utf8_to_latin1(byte* dest, const byte* source, int slen);
diff --git a/erts/emulator/beam/index.c b/erts/emulator/beam/index.c
index 93d1111904..be1771b037 100644
--- a/erts/emulator/beam/index.c
+++ b/erts/emulator/beam/index.c
@@ -58,7 +58,7 @@ IndexTable*
 erts_index_init(ErtsAlcType_t type, IndexTable* t, char* name,
 		int size, int limit, HashFunctions fun)
 {
-    Uint base_size = ((limit+INDEX_PAGE_SIZE-1)/INDEX_PAGE_SIZE)*sizeof(IndexSlot*);
+    Uint base_size = (((Uint)limit+INDEX_PAGE_SIZE-1)/INDEX_PAGE_SIZE)*sizeof(IndexSlot*);
     hash_init(type, &t->htable, name, 3*size/4, fun);
 
     t->size = 0;
diff --git a/erts/emulator/beam/instrs.tab b/erts/emulator/beam/instrs.tab
index c17d1a8f69..6a531fcc09 100644
--- a/erts/emulator/beam/instrs.tab
+++ b/erts/emulator/beam/instrs.tab
@@ -322,6 +322,16 @@ get_list(Src, Hd, Tl) {
     $Tl = tl;
 }
 
+get_hd(Src, Hd) {
+    Eterm* tmp_ptr = list_val($Src);
+    $Hd = CAR(tmp_ptr);
+}
+
+get_tl(Src, Tl) {
+    Eterm* tmp_ptr = list_val($Src);
+    $Tl = CDR(tmp_ptr);
+}
+
 i_get(Src, Dst) {
     $Dst = erts_pd_hash_get(c_p, $Src);
 }
@@ -542,6 +552,13 @@ put_list(Hd, Tl, Dst) {
     HTOP += 2;
 }
 
+update_list(Hd, Dst) {
+    HTOP[0] = $Hd;
+    HTOP[1] = $Dst;
+    $Dst = make_list(HTOP);
+    HTOP += 2;
+}
+
 i_put_tuple := i_put_tuple.make.fill;
 
 i_put_tuple.make(Dst) {
@@ -924,3 +941,33 @@ i_raise() {
     //| -no_next
 }
 
+build_stacktrace() {
+    SWAPOUT;
+    x(0) = build_stacktrace(c_p, x(0));
+    SWAPIN;
+}
+
+raw_raise() {
+    Eterm class = x(0);
+    Eterm value = x(1);
+    Eterm stacktrace = x(2);
+
+    if (class == am_error) {
+        c_p->freason = EXC_ERROR & ~EXF_SAVETRACE;
+        c_p->fvalue = value;
+        c_p->ftrace = stacktrace;
+        goto find_func_info;
+    } else if (class == am_exit) {
+        c_p->freason = EXC_EXIT & ~EXF_SAVETRACE;
+        c_p->fvalue = value;
+        c_p->ftrace = stacktrace;
+        goto find_func_info;
+    } else if (class == am_throw) {
+        c_p->freason = EXC_THROWN & ~EXF_SAVETRACE;
+        c_p->fvalue = value;
+        c_p->ftrace = stacktrace;
+        goto find_func_info;
+    } else {
+        x(0) = am_badarg;
+    }
+}
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 85013af3ad..e4a5f2b6b6 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -298,7 +298,6 @@ static Port *create_port(char *name,
     erts_aint32_t state = ERTS_PORT_SFLG_CONNECTED;
     erts_aint32_t x_pts_flgs = 0;
 
-    ErtsRunQueue *runq;
     if (!driver_lock) {
 	/* Align size for mutex following port struct */
 	port_size = size = ERTS_ALC_DATA_ALIGN_SIZE(sizeof(Port));
@@ -347,11 +346,16 @@ static Port *create_port(char *name,
 	p += sizeof(erts_mtx_t);
 	state |= ERTS_PORT_SFLG_PORT_SPECIFIC_LOCK;
     }
-    if (erts_get_scheduler_data())
-        runq = erts_get_runq_current(NULL);
-    else
-        runq = ERTS_RUNQ_IX(0);
-    erts_atomic_set_nob(&prt->run_queue, (erts_aint_t) runq);
+
+    {
+        ErtsRunQueue *runq;
+        ErtsSchedulerData *esdp = erts_get_scheduler_data();
+        if (esdp)
+            runq = erts_get_runq_current(esdp);
+        else
+            runq = ERTS_RUNQ_IX(0);
+        erts_init_runq_port(prt, runq);
+    }
 
     prt->xports = NULL;
     
@@ -584,7 +588,7 @@ erts_open_driver(erts_driver_t* driver,	/* Pointer to driver. */
 	     */
 	    
 	    for (d = driver_list; d; d = d->next) {
-		if (strcmp(d->name, name) == 0 && 
+		if (sys_strcmp(d->name, name) == 0 && 
 		    erts_ddll_driver_ok(d->handle)) {
 		    driver = d;
 		    break;
@@ -634,7 +638,7 @@ erts_open_driver(erts_driver_t* driver,	/* Pointer to driver. */
 	trace_port_open(port,
 			pid,
 			erts_atom_put((byte *) port->name,
-				      strlen(port->name),
+				      sys_strlen(port->name),
 				      ERTS_ATOM_ENC_LATIN1,
 				      1));
     }
@@ -2925,7 +2929,7 @@ erl_drv_init_ack(ErlDrvPort ix, ErlDrvData res) {
             break;
         case -2: {
             char *str = erl_errno_id(errno);
-            resp = erts_atom_put((byte *) str, strlen(str),
+            resp = erts_atom_put((byte *) str, sys_strlen(str),
                                  ERTS_ATOM_ENC_LATIN1, 1);
             break;
         }
@@ -3384,24 +3388,11 @@ static void deliver_read_message(Port* prt, erts_aint32_t state, Eterm to,
     if ((state & ERTS_PORT_SFLG_BINARY_IO) == 0) {
 	listp = buf_to_intlist(&hp, buf, len, listp);
     } else if (buf != NULL) {
-	ProcBin* pb;
-	Binary* bptr;
-
-	bptr = erts_bin_nrml_alloc(len);
+	Binary* bptr = erts_bin_nrml_alloc(len);
 	sys_memcpy(bptr->orig_bytes, buf, len);
 
-	pb = (ProcBin *) hp;
-	pb->thing_word = HEADER_PROC_BIN;
-	pb->size = len;
-	pb->next = ohp->first;
-	ohp->first = (struct erl_off_heap_header*)pb;
-	pb->val = bptr;
-	pb->bytes = (byte*) bptr->orig_bytes;
-	pb->flags = 0;
+        listp = erts_build_proc_bin(ohp, hp, bptr);
 	hp += PROC_BIN_SIZE;
-
-	OH_OVERHEAD(ohp, pb->size / sizeof(Eterm));
-	listp = make_binary(pb);
     }
 
     /* Prepend the header */
@@ -3829,11 +3820,12 @@ static void sweep_one_link(ErtsLink *lnk, void *vpsc)
 	    ErtsDistLinkData dld;
 	    ErtsDSigData dsd;
 	    int code;
-	    code = erts_dsig_prepare(&dsd, dep, NULL, ERTS_DSP_NO_LOCK, 0);
+	    code = erts_dsig_prepare(&dsd, dep, NULL, 0, ERTS_DSP_NO_LOCK, 0, 0);
 	    switch (code) {
 	    case ERTS_DSIG_PREP_NOT_ALIVE:
 	    case ERTS_DSIG_PREP_NOT_CONNECTED:
 		break;
+	    case ERTS_DSIG_PREP_PENDING:
 	    case ERTS_DSIG_PREP_CONNECTED:
 		erts_remove_dist_link(&dld, port_id, lnk->pid, dep);
 		erts_destroy_dist_link(&dld);
@@ -4203,17 +4195,9 @@ write_port_control_result(int control_flags,
 	else {
 	    dbin = (ErlDrvBinary *) resp_bufp;
 	    if (dbin->orig_size > ERL_ONHEAP_BIN_LIMIT) {
-		ProcBin* pb = (ProcBin *) *hpp;
+                res = erts_build_proc_bin(ohp, *hpp, ErlDrvBinary2Binary(dbin));
 		*hpp += PROC_BIN_SIZE;
-		pb->thing_word = HEADER_PROC_BIN;
-		pb->size = dbin->orig_size;
-		pb->next = ohp->first;
-		ohp->first = (struct erl_off_heap_header *) pb;
-		pb->val = ErlDrvBinary2Binary(dbin);
-		pb->bytes = (byte*) dbin->orig_bytes;
-		pb->flags = 0;
-		OH_OVERHEAD(ohp, dbin->orig_size / sizeof(Eterm));
-		return make_binary(pb);
+                return res;
 	    }
 	    resp_bufp = dbin->orig_bytes;
 	    resp_size = dbin->orig_size;
@@ -5095,6 +5079,93 @@ static void prt_one_lnk(ErtsLink *lnk, void *vprtd)
     erts_print(prtd->to, prtd->arg, "%T", lnk->pid);
 }
 
+static void dump_port_state(fmtfn_t to, void *arg, erts_aint32_t state)
+{
+    erts_aint32_t rest;
+    int unknown = 0;
+    char delim = ' ';
+
+    erts_print(to, arg, "State:");
+
+    rest = state;
+    while (rest) {
+        erts_aint32_t chk = (rest ^ (rest-1)) & rest;  /* lowest set bit */
+        char* s;
+
+        rest &= ~chk;
+        switch (chk) {
+        case ERTS_PORT_SFLG_CONNECTED:          s = "CONNECTED"; break;
+        case ERTS_PORT_SFLG_EXITING:            s = "EXITING"; break;
+        case ERTS_PORT_SFLG_DISTRIBUTION:       s = "DISTR"; break;
+        case ERTS_PORT_SFLG_BINARY_IO:          s = "BINARY_IO"; break;
+        case ERTS_PORT_SFLG_SOFT_EOF:           s = "SOFT_EOF"; break;
+        case ERTS_PORT_SFLG_CLOSING:            s = "CLOSING"; break;
+        case ERTS_PORT_SFLG_SEND_CLOSED:        s = "SEND_CLOSED"; break;
+        case ERTS_PORT_SFLG_LINEBUF_IO:         s = "LINEBUF_IO"; break;
+        case ERTS_PORT_SFLG_FREE:               s = "FREE"; break;
+        case ERTS_PORT_SFLG_INITIALIZING:       s = "INITIALIZING"; break;
+        case ERTS_PORT_SFLG_PORT_SPECIFIC_LOCK: s = "PORT_LOCK"; break;
+        case ERTS_PORT_SFLG_INVALID:            s = "INVALID"; break;
+        case ERTS_PORT_SFLG_HALT:               s = "HALT"; break;
+#ifdef DEBUG
+        case ERTS_PORT_SFLG_PORT_DEBUG:         s = "DEBUG"; break;
+#endif
+        default:
+            unknown = 1;
+            continue;
+        }
+        erts_print(to, arg, "%c%s", delim, s);
+        delim = '|';
+    }
+    if (unknown || !state)
+        erts_print(to, arg, "%c0x%x\n", delim, state);
+    else
+        erts_print(to, arg, "\n");
+}
+
+static void dump_port_task_flags(fmtfn_t to, void *arg, Port* p)
+{
+    erts_aint32_t flags = erts_atomic32_read_nob(&p->sched.flags);
+    erts_aint32_t unknown = 0;
+    char delim = ' ';
+
+    if (!flags)
+	return;
+
+    erts_print(to, arg, "Task Flags:");
+
+    while (flags) {
+        erts_aint32_t chk = (flags ^ (flags-1)) & flags;  /* lowest set bit */
+        char* s;
+
+        flags &= ~chk;
+        switch (chk) {
+	case ERTS_PTS_FLG_IN_RUNQ:               s = "IN_RUNQ"; break;
+	case ERTS_PTS_FLG_EXEC:                  s = "EXEC"; break;
+	case ERTS_PTS_FLG_HAVE_TASKS:            s = "HAVE_TASKS"; break;
+	case ERTS_PTS_FLG_EXIT:                  s = "EXIT"; break;
+	case ERTS_PTS_FLG_BUSY_PORT:             s = "BUSY_PORT"; break;
+	case ERTS_PTS_FLG_BUSY_PORT_Q:           s = "BUSY_Q"; break;
+	case ERTS_PTS_FLG_CHK_UNSET_BUSY_PORT_Q: s = "CHK_UNSET_BUSY_Q"; break;
+	case ERTS_PTS_FLG_HAVE_BUSY_TASKS:       s = "BUSY_TASKS"; break;
+	case ERTS_PTS_FLG_HAVE_NS_TASKS:         s = "NS_TASKS"; break;
+	case ERTS_PTS_FLG_PARALLELISM:           s = "PARALLELISM"; break;
+	case ERTS_PTS_FLG_FORCE_SCHED:           s = "FORCE_SCHED"; break;
+	case ERTS_PTS_FLG_EXITING:               s = "EXITING"; break;
+	case ERTS_PTS_FLG_EXEC_IMM:              s = "EXEC_IMM"; break;
+        default:
+            unknown |= chk;
+            continue;
+        }
+        erts_print(to, arg, "%c%s", delim, s);
+        delim = '|';
+    }
+    if (unknown)
+        erts_print(to, arg, "%cUNKNOWN(0x%x)\n", delim, unknown);
+    else
+        erts_print(to, arg, "\n");
+}
+
 void
 print_port_info(Port *p, fmtfn_t to, void *arg)
 {
@@ -5104,6 +5175,8 @@ print_port_info(Port *p, fmtfn_t to, void *arg)
 	return;
 
     erts_print(to, arg, "=port:%T\n", p->common.id);
+    dump_port_state(to, arg, state);
+    dump_port_task_flags(to, arg, p);
     erts_print(to, arg, "Slot: %d\n", internal_port_index(p->common.id));
     if (state & ERTS_PORT_SFLG_CONNECTED) {
 	erts_print(to, arg, "Connected: %T", ERTS_PORT_GET_CONNECTED(p));
@@ -5126,6 +5199,10 @@ print_port_info(Port *p, fmtfn_t to, void *arg)
 	erts_doforall_monitors(ERTS_P_MONITORS(p), &prt_one_monitor, &prtd);
 	erts_print(to, arg, "\n");
     }
+    if (p->suspended) {
+	erts_print(to, arg, "Suspended: ");
+	erts_proclist_dump(to, arg, p->suspended);
+    }
 
     if (p->common.u.alive.reg != NULL)
 	erts_print(to, arg, "Registered as: %T\n", p->common.u.alive.reg->name);
@@ -5143,6 +5220,14 @@ print_port_info(Port *p, fmtfn_t to, void *arg)
     } else {
 	erts_print(to, arg, "Port controls linked-in driver: %s\n",p->name);
     }
+    erts_print(to, arg, "Input: %beu\n", p->bytes_in);
+    erts_print(to, arg, "Output: %beu\n", p->bytes_out);
+    erts_print(to, arg, "Queue: %beu\n", erts_ioq_size(&p->ioq));
+    {
+        Eterm port_data = erts_port_data_read(p);
+        if (port_data != am_undefined)
+            erts_print(to, arg, "Port Data: %T\n", port_data);
+    }
 }
 
 void
@@ -5977,21 +6062,12 @@ driver_deliver_term(Port *prt, Eterm to, ErlDrvTermData* data, int len)
 		mess = make_binary(hbp);
 	    }
 	    else {
-		ProcBin* pbp;
+		Eterm* hp;
 		Binary* bp = erts_bin_nrml_alloc(size);
 		ASSERT(bufp);
 		sys_memcpy((void *) bp->orig_bytes, (void *) bufp, size);
-		pbp = (ProcBin *) erts_produce_heap(&factory,
-						    PROC_BIN_SIZE, HEAP_EXTRA);
-		pbp->thing_word = HEADER_PROC_BIN;
-		pbp->size = size;
-		pbp->next = factory.off_heap->first;
-		factory.off_heap->first = (struct erl_off_heap_header*)pbp;
-		pbp->val = bp;
-		pbp->bytes = (byte*) bp->orig_bytes;
-		pbp->flags = 0;
-		OH_OVERHEAD(factory.off_heap, pbp->size / sizeof(Eterm));
-		mess = make_binary(pbp);
+                hp = erts_produce_heap(&factory, PROC_BIN_SIZE, HEAP_EXTRA);
+                mess = erts_build_proc_bin(factory.off_heap, hp, bp);
 	    }
 	    ptr += 2;
 	    break;
@@ -7248,7 +7324,7 @@ int driver_failure_atom(ErlDrvPort ix, char* string)
 {
     return driver_failure_term(ix,
 			       erts_atom_put((byte *) string,
-					     strlen(string),
+					     sys_strlen(string),
 					     ERTS_ATOM_ENC_LATIN1,
 					     1),
 			       0);
@@ -7714,13 +7790,27 @@ int null_func(void)
 int
 erl_drv_putenv(const char *key, char *value)
 {
-    return erts_sys_putenv_raw((char*)key, value);
+    switch (erts_sys_explicit_8bit_putenv((char*)key, value)) {
+    case -1: /* Insufficient buffer space */
+        return 1;
+    case 1: /* Success */
+        return 0;
+    default: /* Not found */
+        return -1;
+    }
 }
 
 int
 erl_drv_getenv(const char *key, char *value, size_t *value_size)
 {
-    return erts_sys_getenv_raw((char*)key, value, value_size);
+    switch (erts_sys_explicit_8bit_getenv((char*)key, value, value_size)) {
+    case -1: /* Insufficient buffer space */
+        return 1;
+    case 1: /* Success */
+        return 0;
+    default: /* Not found */
+        return -1;
+    }
 }
 
 /* get heart_port
diff --git a/erts/emulator/beam/lttng-wrapper.h b/erts/emulator/beam/lttng-wrapper.h
index 0bc75c1552..e7f2971bf7 100644
--- a/erts/emulator/beam/lttng-wrapper.h
+++ b/erts/emulator/beam/lttng-wrapper.h
@@ -61,13 +61,13 @@
 #define lttng_proc_to_mfa_str(p, Name)                              \
     do {                                                            \
         if (ERTS_PROC_IS_EXITING((p))) {                            \
-            strcpy(Name, "<exiting>");                              \
+            sys_strcpy(Name, "<exiting>");                              \
         } else {                                                    \
             BeamInstr *_fptr = find_function_from_pc((p)->i);       \
             if (_fptr) {                                            \
                 lttng_mfa_to_str(_fptr[0],_fptr[1],_fptr[2], Name); \
             } else {                                                \
-                strcpy(Name, "<unknown>");                          \
+                sys_strcpy(Name, "<unknown>");                          \
             }                                                       \
         }                                                           \
     } while(0)
diff --git a/erts/emulator/beam/macros.tab b/erts/emulator/beam/macros.tab
index e0b5f56b53..494fe8961e 100644
--- a/erts/emulator/beam/macros.tab
+++ b/erts/emulator/beam/macros.tab
@@ -20,13 +20,12 @@
 //
 
 //
-// Use if there is a garbage collection before storing to a
-// general destination (either X or Y register).
+// Define a regular expression that will match instructions that
+// perform GC.  That will allow beam_makeops to check for instructions
+// that don't use $REFRESH_GEN_DEST() when they should.
 //
 
-REFRESH_GEN_DEST() {
-    dst_ptr = REG_TARGET_PTR(dst);
-}
+GC_REGEXP=erts_garbage_collect|erts_gc|GcBifFunction;
 
 // $Offset is relative to the start of the instruction (not to the
 // location of the failure label reference). Since combined
diff --git a/erts/emulator/beam/map_instrs.tab b/erts/emulator/beam/map_instrs.tab
index bbb2f49b66..c594a87298 100644
--- a/erts/emulator/beam/map_instrs.tab
+++ b/erts/emulator/beam/map_instrs.tab
@@ -31,7 +31,7 @@ new_map(Dst, Live, N) {
     Eterm res;
 
     HEAVY_SWAPOUT;
-    res = new_map(c_p, reg, $Live, $N, $NEXT_INSTRUCTION);
+    res = erts_gc_new_map(c_p, reg, $Live, $N, $NEXT_INSTRUCTION);
     HEAVY_SWAPIN;
     $REFRESH_GEN_DEST();
     $Dst = res;
@@ -44,7 +44,7 @@ i_new_small_map_lit(Dst, Live, Keys) {
     Eterm keys = $Keys;
 
     HEAVY_SWAPOUT;
-    res = new_small_map_lit(c_p, reg, keys, $Live, $NEXT_INSTRUCTION);
+    res = erts_gc_new_small_map_lit(c_p, reg, keys, $Live, $NEXT_INSTRUCTION);
     HEAVY_SWAPIN;
     $REFRESH_GEN_DEST();
     $Dst = res;
@@ -133,7 +133,7 @@ update_map_assoc(Src, Dst, Live, N) {
 
     reg[live] = $Src;
     HEAVY_SWAPOUT;
-    res = update_map_assoc(c_p, reg, live, $N, $NEXT_INSTRUCTION);
+    res = erts_gc_update_map_assoc(c_p, reg, live, $N, $NEXT_INSTRUCTION);
     HEAVY_SWAPIN;
     ASSERT(is_value(res));
     $REFRESH_GEN_DEST();
@@ -147,7 +147,7 @@ update_map_exact(Fail, Src, Dst, Live, N) {
 
     reg[live] = $Src;
     HEAVY_SWAPOUT;
-    res = update_map_exact(c_p, reg, live, $N, $NEXT_INSTRUCTION);
+    res = erts_gc_update_map_exact(c_p, reg, live, $N, $NEXT_INSTRUCTION);
     HEAVY_SWAPIN;
     if (is_value(res)) {
         $REFRESH_GEN_DEST();
diff --git a/erts/emulator/beam/msg_instrs.tab b/erts/emulator/beam/msg_instrs.tab
index 8055a8616f..d6d4d2fb49 100644
--- a/erts/emulator/beam/msg_instrs.tab
+++ b/erts/emulator/beam/msg_instrs.tab
@@ -43,27 +43,23 @@
 //  *
 //  */
 
-recv_mark(Dest) {
+i_recv_mark() {
     /*
-     * Save the current position in message buffer and the
-     * the label for the loop_rec/2 instruction for the
-     * the receive statement.
+     * Save the current position in message buffer.
      */
-    $SET_REL_I(c_p->msg.mark, $Dest);
     c_p->msg.saved_last = c_p->msg.last;
 }
 
 i_recv_set() {
     /*
-     * If the mark is valid (points to the loop_rec/2
-     * instruction that follows), we know that the saved
-     * position points to the first message that could
-     * possibly be matched out.
+     * If c_p->msg.saved_last is non-zero, it points to the first
+     * message that could possibly be matched out.
      *
-     * If the mark is invalid, we do nothing, meaning that
-     * we will look through all messages in the message queue.
+     * If c_p->msg.saved_last is zero, it means that it was invalidated
+     * because another receive was executed before this i_recv_set()
+     * instruction was reached.
      */
-    if (c_p->msg.mark == (BeamInstr *) ($NEXT_INSTRUCTION)) {
+    if (c_p->msg.saved_last) {
         c_p->msg.save = c_p->msg.saved_last;
     }
     SET_I($NEXT_INSTRUCTION);
@@ -131,6 +127,7 @@ i_loop_rec(Dest) {
             ASSERT(HTOP == c_p->htop && E == c_p->stop);
             /* TODO: Add DTrace probe for this bad message situation? */
             UNLINK_MESSAGE(c_p, msgp);
+            c_p->msg.saved_last = 0; /* Better safe than sorry. */
             msgp->next = NULL;
             erts_cleanup_messages(msgp);
             goto loop_rec__;
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index 7a2c39b3a8..77e375f2c0 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -182,6 +182,9 @@ get_list r x y
 get_list r y r
 get_list r x r
 
+get_hd xy xy
+get_tl xy xy
+
 # Old-style catch.
 catch y f
 catch_end y
@@ -503,6 +506,10 @@ i_put_tuple xy I
 #
 put_list Const=c n Dst => move Const x | put_list x n Dst
 
+put_list Src Dst=x Dst => update_list Src Dst
+
+update_list xyc x
+
 put_list x n x
 put_list y n x
 put_list x x x
@@ -511,8 +518,6 @@ put_list y x x
 put_list y y x
 put_list x y x
 
-put_list y x x
-
 # put_list SrcReg Constant Dst
 
 put_list x c x
@@ -527,8 +532,6 @@ put_list c y x
 
 # The following put_list instructions using x(0) are frequently used.
 
-put_list y r r
-put_list x r r
 put_list r n r
 put_list r n x
 put_list r x x
@@ -539,6 +542,7 @@ put_list x x r
 put_list s s d
 %hot
 
+
 #
 # Some more only used by the emulator
 #
@@ -1567,8 +1571,20 @@ on_load
 #
 # R14A.
 #
-recv_mark f
+# Modified in OTP 21 because it turns out that we don't need the
+# label after all.
+#
+
+recv_mark f => i_recv_mark
+i_recv_mark
 
 recv_set Fail | label Lbl | loop_rec Lf Reg => \
    i_recv_set | label Lbl | loop_rec Lf Reg
 i_recv_set
+
+#
+# OTP 21.
+#
+
+build_stacktrace
+raw_raise
diff --git a/erts/emulator/beam/packet_parser.c b/erts/emulator/beam/packet_parser.c
index f14910bc72..de1d481105 100644
--- a/erts/emulator/beam/packet_parser.c
+++ b/erts/emulator/beam/packet_parser.c
@@ -200,7 +200,7 @@ static int http_init(void)
     for (i = 0; i < HTTP_HDR_HASH_SIZE; i++)
         http_hdr_hash[i] = NULL;
     for (i = 0; http_hdr_strings[i] != NULL; i++) {
-        ASSERT(strlen(http_hdr_strings[i]) <= HTTP_MAX_NAME_LEN);
+        ASSERT(sys_strlen(http_hdr_strings[i]) <= HTTP_MAX_NAME_LEN);
         http_hdr_table[i].index = i;
         http_hash_insert(http_hdr_strings[i], 
                          &http_hdr_table[i], 
@@ -516,7 +516,7 @@ static http_atom_t* http_hash_lookup(const char* name, int len,
 
     while (ap != NULL) {
         if ((ap->h == h) && (ap->len == len) && 
-            (strncmp(ap->name, name, len) == 0))
+            (sys_strncmp(ap->name, name, len) == 0))
             return ap;
         ap = ap->next;
     }
@@ -656,7 +656,7 @@ int packet_parse_http(const char* buf, int len, int* statep,
     if (*statep == 0) {
         /* start-line = Request-Line | Status-Line */
 
-        if (n >= 5 && (strncmp(buf, "HTTP/", 5) == 0)) {
+        if (n >= 5 && (sys_strncmp(buf, "HTTP/", 5) == 0)) {
             int major  = 0;
             int minor  = 0;
             int status = 0;
@@ -750,7 +750,7 @@ int packet_parse_http(const char* buf, int len, int* statep,
             }
             if (n < 8)
                 return -1;
-            if (strncmp(ptr, "HTTP/", 5) != 0)
+            if (sys_strncmp(ptr, "HTTP/", 5) != 0)
                 return -1;
             ptr += 5;
             n   -= 5;
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index bf7d310568..13ae80e4a5 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -636,6 +636,8 @@ typedef struct preload {
  */
 typedef Eterm ErtsTracer;
 
+#include "erl_osenv.h"
+
 /*
  * This structure contains options to all built in drivers.
  * None of the drivers use all of the fields.
@@ -651,8 +653,7 @@ typedef struct _SysDriverOpts {
     int hide_window;		/* Hide this windows (Windows). */
     int exit_status;		/* Report exit status of subprocess. */
     int overlapped_io;          /* Only has effect on windows NT et al */
-    char *envir;		/* Environment of the port process, */
-				/* in Windows format. */
+    erts_osenv_t envir;		/* Environment of the port process */
     char **argv;                /* Argument vector in Unix'ish format. */
     char *wd;			/* Working directory. */
     unsigned spawn_type;        /* Bitfield of ERTS_SPAWN_DRIVER | 
@@ -782,9 +783,6 @@ void set_break_quit(void (*)(void), void (*)(void));
 
 void os_flavor(char*, unsigned);
 void os_version(int*, int*, int*);
-void init_getenv_state(GETENV_STATE *);
-char * getenv_string(GETENV_STATE *);
-void fini_getenv_state(GETENV_STATE *);
 
 #define HAVE_ERTS_CHECK_IO_DEBUG
 typedef struct {
@@ -805,20 +803,21 @@ int sys_double_to_chars_ext(double, char*, size_t, size_t);
 int sys_double_to_chars_fast(double, char*, int, int, int);
 void sys_get_pid(char *, size_t);
 
-/* erts_sys_putenv() returns, 0 on success and a value != 0 on failure. */
-int erts_sys_putenv(char *key, char *value);
-/* Simple variant used from drivers, raw eightbit interface */
-int erts_sys_putenv_raw(char *key, char *value);
-/* erts_sys_getenv() returns 0 on success (length of value string in
-   *size), a value > 0 if value buffer is too small (*size is set to needed
-   size), and a value < 0 on failure. */
-int erts_sys_getenv(char *key, char *value, size_t *size);
-/* Simple variant used from drivers, raw eightbit interface */
-int erts_sys_getenv_raw(char *key, char *value, size_t *size);
-/* erts_sys_getenv__() is only allowed to be used in early init phase */
-int erts_sys_getenv__(char *key, char *value, size_t *size);
-/* erst_sys_unsetenv() returns 0 on success and a value != 0 on failure. */
-int erts_sys_unsetenv(char *key);
+/* erl_drv_get/putenv have been implicitly 8-bit for so long that we can't
+ * change them without breaking things on Windows. Their return values are
+ * identical to erts_osenv_get/putenv */
+int erts_sys_explicit_8bit_getenv(char *key, char *value, size_t *size);
+int erts_sys_explicit_8bit_putenv(char *key, char *value);
+
+/* This is identical to erts_sys_explicit_8bit_getenv but falls down to the
+ * host OS implementation instead of erts_osenv. */
+int erts_sys_explicit_host_getenv(char *key, char *value, size_t *size);
+
+const erts_osenv_t *erts_sys_rlock_global_osenv(void);
+void erts_sys_runlock_global_osenv(void);
+
+erts_osenv_t *erts_sys_rwlock_global_osenv(void);
+void erts_sys_rwunlock_global_osenv(void);
 
 /* Easier to use, but not as efficient, environment functions */
 char *erts_read_env(char *key);
@@ -997,16 +996,36 @@ erts_refc_read(erts_refc_t *refcp, erts_aint_t min_val)
 
 #endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
-#define sys_memcpy(s1,s2,n)  memcpy(s1,s2,n)
-#define sys_memmove(s1,s2,n) memmove(s1,s2,n)
-#define sys_memcmp(s1,s2,n)  memcmp(s1,s2,n)
-#define sys_memset(s,c,n)    memset(s,c,n)
-#define sys_memzero(s, n)    memset(s,'\0',n)
-#define sys_strcmp(s1,s2)    strcmp(s1,s2)
-#define sys_strncmp(s1,s2,n) strncmp(s1,s2,n)
-#define sys_strcpy(s1,s2)    strcpy(s1,s2)
-#define sys_strncpy(s1,s2,n) strncpy(s1,s2,n)
-#define sys_strlen(s)        strlen(s)
+/* Thin wrappers around memcpy and friends, which should always be used in
+ * place of plain memcpy, memset, etc.
+ *
+ * Passing NULL to any of these functions is undefined behavior even though it
+ * may seemingly work when the length (if any) is zero; a compiler can take
+ * this as a hint that the passed operand may *never* be NULL and then optimize
+ * based on that information.
+ *
+ * (The weird casts in the assertions silence an "always evaluates to true"
+ * warning when an operand is the address of an lvalue) */
+#define sys_memcpy(s1,s2,n) \
+    (ASSERT((void*)(s1) != NULL && (void*)(s2) != NULL), memcpy(s1,s2,n))
+#define sys_memmove(s1,s2,n) \
+    (ASSERT((void*)(s1) != NULL && (void*)(s2) != NULL), memmove(s1,s2,n))
+#define sys_memcmp(s1,s2,n) \
+    (ASSERT((void*)(s1) != NULL && (void*)(s2) != NULL), memcmp(s1,s2,n))
+#define sys_memset(s,c,n) \
+    (ASSERT((void*)(s) != NULL), memset(s,c,n))
+#define sys_memzero(s, n) \
+    (ASSERT((void*)(s) != NULL), memset(s,'\0',n))
+#define sys_strcmp(s1,s2) \
+    (ASSERT((void*)(s1) != NULL && (void*)(s2) != NULL), strcmp(s1,s2))
+#define sys_strncmp(s1,s2,n) \
+    (ASSERT((void*)(s1) != NULL && (void*)(s2) != NULL), strncmp(s1,s2,n))
+#define sys_strcpy(s1,s2) \
+    (ASSERT((void*)(s1) != NULL && (void*)(s2) != NULL), strcpy(s1,s2))
+#define sys_strncpy(s1,s2,n) \
+    (ASSERT((void*)(s1) != NULL && (void*)(s2) != NULL), strncpy(s1,s2,n))
+#define sys_strlen(s) \
+    (ASSERT((void*)(s) != NULL), strlen(s))
 
 /* define function symbols (needed in sys_drv_api) */
 #define sys_fp_alloc     sys_alloc
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index 993585be10..4bf60619ba 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -3152,6 +3152,9 @@ tailrecur_ne:
 		    int cmp;
 		    byte* a_ptr;
 		    byte* b_ptr;
+		    if (eq_only && a_size != b_size) {
+		        RETURN_NEQ(a_size - b_size);
+		    }
 		    ERTS_GET_BINARY_BYTES(a, a_ptr, a_bitoffs, a_bitsize);
 		    ERTS_GET_BINARY_BYTES(b, b_ptr, b_bitoffs, b_bitsize);
 		    if ((a_bitsize | b_bitsize | a_bitoffs | b_bitoffs) == 0) {
@@ -4360,15 +4363,20 @@ erts_read_env(char *key)
     char *value = erts_alloc(ERTS_ALC_T_TMP, value_len);
     int res;
     while (1) {
-	res = erts_sys_getenv_raw(key, value, &value_len);
-	if (res <= 0)
-	    break;
-	value = erts_realloc(ERTS_ALC_T_TMP, value, value_len);
+        res = erts_sys_explicit_8bit_getenv(key, value, &value_len);
+
+        if (res >= 0) {
+            break;
+        }
+
+        value = erts_realloc(ERTS_ALC_T_TMP, value, value_len);
     }
-    if (res != 0) {
-	erts_free(ERTS_ALC_T_TMP, value);
-	return NULL;
+
+    if (res != 1) {
+        erts_free(ERTS_ALC_T_TMP, value);
+        return NULL;
     }
+
     return value;
 }
 
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
deleted file mode 100644
index 4e1d2f0d7f..0000000000
--- a/erts/emulator/drivers/common/efile_drv.c
+++ /dev/null
@@ -1,4295 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * 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.
- * 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%
- */
-/*
- * Purpose: Provides file and directory operations.
- *
- * This file is generic, and does the work of decoding the commands
- * and encoding the responses.  System-specific functions are found in
- * the unix_efile.c and win_efile.c files.
- */
-
-/* Operations */
-
-#define FILE_OPEN		 1 /* Essential for startup */
-#define FILE_READ		 2
-#define FILE_LSEEK		 3
-#define FILE_WRITE		 4
-#define FILE_FSTAT		 5 /* Essential for startup */
-#define FILE_PWD                 6 /* Essential for startup */
-#define FILE_READDIR             7 /* Essential for startup */
-#define FILE_CHDIR               8
-#define FILE_FSYNC               9
-#define FILE_MKDIR              10
-#define FILE_DELETE             11
-#define FILE_RENAME             12
-#define FILE_RMDIR              13
-#define FILE_TRUNCATE           14
-#define FILE_READ_FILE          15 /* Essential for startup */
-#define FILE_WRITE_INFO		16
-#define FILE_LSTAT            	19
-#define FILE_READLINK        	20
-#define FILE_LINK             	21
-#define FILE_SYMLINK          	22
-#define FILE_CLOSE		23
-#define FILE_PWRITEV		24
-#define FILE_PREADV		25
-#define FILE_SETOPT		26
-#define FILE_IPREAD             27
-#define FILE_ALTNAME            28
-#define FILE_READ_LINE          29
-#define FILE_FDATASYNC          30
-#define FILE_FADVISE            31
-#define FILE_SENDFILE           32
-#define FILE_FALLOCATE          33
-#define FILE_CLOSE_ON_PORT_EXIT 34
-/* Return codes */
-
-#define FILE_RESP_OK         0
-#define FILE_RESP_ERROR      1
-#define FILE_RESP_DATA       2
-#define FILE_RESP_NUMBER     3
-#define FILE_RESP_INFO       4
-#define FILE_RESP_NUMERR     5
-#define FILE_RESP_LDATA      6
-#define FILE_RESP_N2DATA     7
-#define FILE_RESP_EOF        8
-#define FILE_RESP_FNAME      9
-#define FILE_RESP_ALL_DATA  10
-#define FILE_RESP_LFNAME    11
-
-/* Options */
-
-#define FILE_OPT_DELAYED_WRITE 0
-#define FILE_OPT_READ_AHEAD    1
-
-/* IPREAD variants */
-
-#define IPREAD_S32BU_P32BU 0
-
-/* Limits */
-
-#define FILE_SEGMENT_READ  (256*1024)
-#define FILE_SEGMENT_WRITE (256*1024)
-
-/* Internal */
-
-/* Set to 1 to test having read_ahead implicitly for read_line */ 
-#define ALWAYS_READ_LINE_AHEAD 0
-
-
-/* Must not be possible to get from malloc()! */
-#define FILE_FD_INVALID ((Sint)(-1))
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <ctype.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-/* Need (NON)BLOCKING macros for sendfile */
-#ifndef WANT_NONBLOCKING
-#define WANT_NONBLOCKING
-#endif
-
-#include "sys.h"
-
-#include "erl_driver.h"
-#include "erl_efile.h"
-#include "erl_threads.h"
-#include "gzio.h"
-#include "dtrace-wrapper.h" 
-
-
-static ErlDrvSysInfo sys_info;
-
-/* For explanation of this var, see comment for same var in erl_async.c */
-static unsigned gcc_optimizer_hack = 0;
-
-#ifdef  USE_VM_PROBES
-
-#define DTRACE_EFILE_BUFSIZ 128
-
-#define DTRACE_INVOKE_SETUP(op) \
-    do { DTRACE3(efile_drv_int_entry, d->sched_i1, d->sched_i2, op); } while (0)
-#define DTRACE_INVOKE_SETUP_BY_NAME(op) \
-    struct t_data *d = (struct t_data *) data ; \
-    DTRACE_INVOKE_SETUP(op)
-#define DTRACE_INVOKE_RETURN(op) \
-    do { DTRACE3(efile_drv_int_return, d->sched_i1, d->sched_i2, \
-                 op); } while (0) ; gcc_optimizer_hack++ ;
-
-/* Assign human-friendlier id numbers to scheduler & I/O worker threads */
-int             dt_driver_idnum = 0;
-int             dt_driver_io_worker_base = 5000;
-erts_mtx_t      dt_driver_mutex;
-pthread_key_t   dt_driver_key;
-
-typedef struct {
-    int         thread_num;
-    Uint64      tag;
-} dt_private;
-
-dt_private *get_dt_private(int);
-#else  /* USE_VM_PROBES */
-#define DTRACE_INVOKE_SETUP(op)            do {} while (0)
-#define DTRACE_INVOKE_SETUP_BY_NAME(op)    do {} while (0)
-#define DTRACE_INVOKE_RETURN(op)           do {} while (0)
-#endif  /* USE_VM_PROBES */
-
-/* #define TRACE 1 */
-#ifdef TRACE
-#    define TRACE_C(c) do { putchar(c); fflush(stdout); } while (0)
-#    define TRACE_S(s) do { fputs((s), stdout); fflush(stdout); } while (0)
-#    define TRACE_F(args) do { printf args ;fflush(stdout); } while (0)
-#else
-#    define TRACE_C(c) ((void)(0))
-#    define TRACE_S(s) ((void)(0))
-#    define TRACE_F(args) ((void)(0))
-#endif
-
-
-#define THRDS_AVAILABLE (sys_info.async_threads > 0)
-#ifdef HARDDEBUG /* HARDDEBUG in io.c is expected too */
-#define TRACE_DRIVER fprintf(stderr, "Efile: ")
-#else
-#define TRACE_DRIVER
-#endif
-#define MUTEX_INIT(m, p) do { IF_THRDS { TRACE_DRIVER; (m = driver_pdl_create(p)); } } while (0)
-#define MUTEX_LOCK(m)    do { IF_THRDS { TRACE_DRIVER; driver_pdl_lock(m);   } } while (0)
-#define MUTEX_UNLOCK(m)  do { IF_THRDS { TRACE_DRIVER; driver_pdl_unlock(m); } } while (0)
-#define IF_THRDS if (THRDS_AVAILABLE)
-
-
-#define SENDFILE_FLGS_USE_THREADS (1 << 0)
-/**
- * On DARWIN sendfile can deadlock with close if called in
- * different threads. So until Apple fixes so that sendfile
- * is not buggy we disable usage of the async pool for
- * DARWIN. The testcase t_sendfile_crashduring reproduces
- * this error when using +A 10 and enabling SENDFILE_FLGS_USE_THREADS.
- */
-#if defined(__APPLE__) && defined(__MACH__)
-#define USE_THRDS_FOR_SENDFILE(DATA) 0
-#else
-#define USE_THRDS_FOR_SENDFILE(DATA) (DATA->flags & SENDFILE_FLGS_USE_THREADS)
-#endif /* defined(__APPLE__) && defined(__MACH__) */
-
-
-
-#if 0
-/* Experimental, for forcing all file operations to use the same thread. */
-   static unsigned file_fixed_key = 1;
-#  define KEY(desc) (&file_fixed_key)
-#else
-#  define KEY(desc) (&(desc)->key)
-#endif
-
-#ifndef MAX
-#  define MAX(x, y) (((x) > (y)) ? (x) : (y))
-#endif
-
-#ifdef FILENAMES_16BIT
-#ifdef USE_VM_PROBES
-#error 16bit characters in filenames and dtrace in combination is not supported.
-#endif
-#  define FILENAME_BYTELEN(Str) filename_len_16bit(Str)
-#  define FILENAME_COPY(To,From) filename_cpy_16bit((To),(From)) 
-#  define FILENAME_CHARSIZE 2
-
-   static int filename_len_16bit(char *str) 
-   {
-       char *p = str;
-       while(*p != '\0' || p[1] != '\0') {
-	   p += 2;
-       }
-       return (p - str);
-   }
-
-   static void filename_cpy_16bit(char *to, char *from) 
-   {
-       while(*from != '\0' || from[1] != '\0') {
-	   *to++ = *from++;
-	   *to++ = *from++;
-       }
-       *to++ = *from++;
-       *to++ = *from++;
-   }
-
-#else
-#  define FILENAME_BYTELEN(Str) strlen(Str)
-#  define FILENAME_COPY(To,From) strcpy(To,From) 
-#  define FILENAME_CHARSIZE 1
-#endif
-
-#if     (MAXPATHLEN+1)*FILENAME_CHARSIZE+1 > BUFSIZ
-#  define    RESBUFSIZE  ((MAXPATHLEN+1)*FILENAME_CHARSIZE+1)
-#else
-#  define    RESBUFSIZE  BUFSIZ
-#endif
-
-#define READDIR_CHUNKS (5)
-
-
-
-#if ALWAYS_READ_LINE_AHEAD
-#define DEFAULT_LINEBUF_SIZE 2048
-#else
-#define DEFAULT_LINEBUF_SIZE 512 /* Small, it's usually discarded anyway */ 
-#endif
-
-typedef unsigned char uchar;
-
-static ErlDrvData file_start(ErlDrvPort port, char* command);
-static int file_init(void);
-static void file_stop(ErlDrvData);
-static void file_output(ErlDrvData, char* buf, ErlDrvSizeT len);
-static ErlDrvSSizeT file_control(ErlDrvData, unsigned int command,
-				 char* buf, ErlDrvSizeT len,
-				 char **rbuf, ErlDrvSizeT rlen);
-static void file_timeout(ErlDrvData);
-static void file_outputv(ErlDrvData, ErlIOVec*);
-static void file_async_ready(ErlDrvData, ErlDrvThreadData);
-static void file_flush(ErlDrvData);
-
-#ifdef HAVE_SENDFILE
-static void file_ready_output(ErlDrvData data, ErlDrvEvent event);
-static void file_stop_select(ErlDrvEvent event, void* _);
-#endif /* HAVE_SENDFILE */
-
-
-enum e_timer {timer_idle, timer_again, timer_write};
-#ifdef HAVE_SENDFILE
-enum e_sendfile {sending, not_sending};
-#define SENDFILE_USE_THREADS (1 << 0)
-#endif /* HAVE_SENDFILE */
-
-struct t_data;
-
-typedef struct {
-    SWord           fd;
-    ErlDrvPort      port;
-    unsigned int    key;      /* Async queue key */
-    unsigned        flags;    /* Original flags from FILE_OPEN. */
-    void          (*invoke)(void *);
-    struct t_data  *d;
-    void          (*free)(void *);
-    struct t_data  *cq_head;  /* Queue of incoming commands */
-    struct t_data  *cq_tail;  /* -""- */
-    enum e_timer    timer_state;
-#ifdef HAVE_SENDFILE
-    enum e_sendfile sendfile_state;
-#endif /* HAVE_SENDFILE */
-    size_t          read_bufsize;
-    ErlDrvBinary   *read_binp;
-    size_t          read_offset;
-    size_t          read_size;
-    size_t          write_bufsize;
-    unsigned long   write_delay;
-    int             write_error;
-    Efile_error     write_errInfo;
-    ErlDrvPDL       q_mtx;    /* Mutex for the driver queue, known by the emulator. Also used for
-				 mutual exclusion when accessing field(s) below. */
-    size_t          write_buffered;
-#ifdef USE_VM_PROBES
-    int             idnum;      /* Unique ID # for this driver thread/desc */
-    char            port_str[DTRACE_TERM_BUF_SIZE];
-#endif
-} file_descriptor;
-
-
-static int reply_error(file_descriptor*, Efile_error* errInfo);
-
-struct erl_drv_entry efile_driver_entry = {
-    file_init,
-    file_start,
-    file_stop,
-    file_output,
-    NULL,
-#ifdef HAVE_SENDFILE
-    file_ready_output,
-#else
-    NULL,
-#endif /* HAVE_SENDFILE */
-    "efile",
-    NULL,
-    NULL,
-    file_control,
-    file_timeout,
-    file_outputv,
-    file_async_ready,
-    file_flush,
-    NULL,
-    NULL,
-    ERL_DRV_EXTENDED_MARKER,
-    ERL_DRV_EXTENDED_MAJOR_VERSION,
-    ERL_DRV_EXTENDED_MINOR_VERSION,
-    ERL_DRV_FLAG_USE_PORT_LOCKING,
-    NULL,
-    NULL,
-#ifdef HAVE_SENDFILE
-    file_stop_select
-#else
-    NULL
-#endif /* HAVE_SENDFILE */
-};
-
-
-
-static int thread_short_circuit;
-
-#define DRIVER_ASYNC(level, desc, f_invoke, data, f_free) \
-if (thread_short_circuit >= (level)) { \
-    (*(f_invoke))(data); \
-    file_async_ready((ErlDrvData)(desc), (data)); \
-} else { \
-    driver_async((desc)->port, KEY(desc), (f_invoke), (data), (f_free)); \
-}
-
-
-
-struct t_pbuf_spec {
-    Sint64 offset;
-    size_t size;
-};
-
-struct t_pwritev {
-    ErlDrvPort         port;
-    ErlDrvPDL          q_mtx;
-    size_t             size;
-    unsigned           cnt;
-    unsigned           n;
-    struct t_pbuf_spec specs[1];
-};
-
-struct t_preadv {
-    ErlIOVec eiov;
-    unsigned n;
-    unsigned cnt;
-    size_t   size;
-    Sint64   offsets[1];
-};
-
-#define READDIR_BUFSIZE (8*1024)*READDIR_CHUNKS
-#if READDIR_BUFSIZE < (1 + (2 + MAXPATHLEN)*FILENAME_CHARSIZE*READDIR_CHUNKS)
-#  undef READDIR_BUFSIZE
-#  define READDIR_BUFSIZE (1 + (2 + MAXPATHLEN)*FILENAME_CHARSIZE*READDIR_CHUNKS)
-#endif
-
-struct t_readdir_buf {
-     struct t_readdir_buf *next;
-     size_t n;
-     char buf[READDIR_BUFSIZE];
-};
-
-struct t_data
-{
-    struct t_data *next;
-    int            command;
-    int            level;
-    void         (*invoke)(void *);
-    void         (*free)(void *);
-    void           *data_to_free; /* used by FILE_CLOSE_ON_PORT_EXIT only */
-    int            again;
-    int            reply;
-#ifdef  USE_VM_PROBES
-    int               sched_i1;
-    Uint64            sched_i2;
-    char              sched_utag[DTRACE_EFILE_BUFSIZ+1];
-#endif
-    int            result_ok;
-    Efile_error    errInfo;
-    int            flags;
-    SWord          fd;
-    int            is_fd_unused;
-    /**/
-    Efile_info        info;
-    EFILE_DIR_HANDLE  dir_handle; /* Handle to open directory. */
-    ErlDrvBinary     *bin;
-    int               drive;
-    size_t            n;
-    /*off_t             offset;*/
-    /*size_t            bytesRead; Bytes read from the file. */
-    /**/
-    union {
-	struct {
-	    Sint64 offset;
-	    int    origin;
-	    Sint64 location;
-	} lseek;
-	struct {
-	    ErlDrvPort    port;
-	    ErlDrvPDL     q_mtx;
-	    size_t        size;
-	    size_t        reply_size;
-	} writev;
-	struct t_pwritev pwritev;
-	struct t_preadv  preadv;
-	struct {
-	    ErlDrvBinary *binp;
-	    size_t        bin_offset;
-	    size_t        bin_size;
-	    size_t        size;
-	} read;
-	struct {
-	    ErlDrvBinary *binp; /* in - out */
-	    size_t        read_offset; /* in - out */
-	    size_t        read_size; /* in - out */
-	    size_t        nl_pos; /* out */
-	    short         nl_skip; /* out, 0 or 1 */
-#if !ALWAYS_READ_LINE_AHEAD
-	    short         read_ahead; /* in, bool */
-#endif
-	} read_line;
-	struct {
-	    ErlDrvBinary *binp;
-	    int           size;
-	    int           offset;
-	} read_file;
-	struct {
-	    struct t_readdir_buf *first_buf;
-	    struct t_readdir_buf *last_buf;
-	} read_dir;
-	struct {
-	    Sint64 offset;
-	    Sint64 length;
-	    int advise;
-	} fadvise;
-#ifdef HAVE_SENDFILE
-	struct {
-	    ErlDrvPort port;
-	    ErlDrvPDL q_mtx;
-	    int out_fd;
-	    off_t offset;
-	    Uint64 nbytes;
-	    Uint64 written;
-	} sendfile;
-#endif /* HAVE_SENDFILE */
-	struct {
-	    Sint64 offset;
-	    Sint64 length;
-	} fallocate;
-    } c;
-    char b[1];
-};
-
-#define EF_ALLOC(S)		driver_alloc((S))
-#define EF_REALLOC(P, S)	driver_realloc((P), (S))
-#define EF_SAFE_ALLOC(S)	ef_safe_alloc((S))
-#define EF_SAFE_REALLOC(P, S)	ef_safe_realloc((P), (S))
-#define EF_FREE(P)		do { if((P)) driver_free((P)); } while(0)
-
-static void *ef_safe_alloc(Uint s)
-{
-    void *p = EF_ALLOC(s);
-    if (!p) erts_exit(ERTS_ERROR_EXIT, "efile drv: Can't allocate %lu bytes of memory\n", (unsigned long)s);
-    return p;
-}
-
-/*********************************************************************
- * ErlIOVec manipulation functions.
- */
-
-/* char EV_CHAR_P(ErlIOVec *ev, int p, int q) */
-#define EV_CHAR_P(ev, p, q)			\
-    (((char *)(ev)->iov[q].iov_base) + (p))
-
-/* int EV_GET_CHAR(ErlIOVec *ev, char *p, int *pp, int *qp) */
-#define EV_GET_CHAR(ev, p, pp, qp) efile_ev_get_char(ev, p ,pp, qp)
-static int
-efile_ev_get_char(ErlIOVec *ev, char *p, size_t *pp, size_t *qp) {
-    if (*pp + 1 <= ev->iov[*qp].iov_len) {
-	*p = *EV_CHAR_P(ev, *pp, *qp);
-	if (*pp + 1 < ev->iov[*qp].iov_len)
-	    *pp += 1;
-	else {
-	    *qp += 1;
-	    *pp = 0;
-	}
-	return !0;
-    }
-    return 0;
-}
-
-/* Uint32 EV_UINT32(ErlIOVec *ev, int p, int q)*/
-#define EV_UINT32(ev, p, q)						\
-    ((Uint32) ((unsigned char *)(ev)->iov[q].iov_base)[p])
-
-/* int EV_GET_UINT32(ErlIOVec *ev, Uint32 *p, int *pp, int *qp) */
-#define EV_GET_UINT32(ev, p, pp, qp) efile_ev_get_uint32(ev, p, pp, qp)
-static int
-efile_ev_get_uint32(ErlIOVec *ev, Uint32 *p, size_t *pp, size_t *qp) {
-    if (*pp + 4 <= ev->iov[*qp].iov_len) {
-	*p = (EV_UINT32(ev, *pp,   *qp) << 24)
-	    | (EV_UINT32(ev, *pp + 1, *qp) << 16)
-	    | (EV_UINT32(ev, *pp + 2, *qp) << 8)
-	    | (EV_UINT32(ev, *pp + 3, *qp));
-	if (*pp + 4 < ev->iov[*qp].iov_len)
-	    *pp += 4;
-	else {
-	    *qp += 1;
-	    *pp = 0;
-	}
-	return !0;
-    }
-    return 0;
-}
-
-/* Uint64 EV_UINT64(ErlIOVec *ev, int p, int q)*/
-#define EV_UINT64(ev, p, q)						\
-    ((Uint64) ((unsigned char *)(ev)->iov[q].iov_base)[p])
-
-/* int EV_GET_UINT64(ErlIOVec *ev, Uint64 *p, int *pp, int *qp) */
-#define EV_GET_UINT64(ev, p, pp, qp) efile_ev_get_uint64(ev, p, pp, qp)
-static int
-efile_ev_get_uint64(ErlIOVec *ev, Uint64 *p, size_t *pp, size_t *qp) {
-    if (*pp + 8 <= ev->iov[*qp].iov_len) {
-	*p = (EV_UINT64(ev, *pp, *qp) << 56)
-	    | (EV_UINT64(ev, *pp + 1, *qp) << 48)
-	    | (EV_UINT64(ev, *pp + 2, *qp) << 40)
-	    | (EV_UINT64(ev, *pp + 3, *qp) << 32)
-	    | (EV_UINT64(ev, *pp + 4, *qp) << 24)
-	    | (EV_UINT64(ev, *pp + 5, *qp) << 16)
-	    | (EV_UINT64(ev, *pp + 6, *qp) << 8)
-	    | (EV_UINT64(ev, *pp + 7, *qp));
-	if (*pp + 8 < ev->iov[*qp].iov_len)
-	    *pp += 8;
-	else {
-	    *qp += 1;
-	    *pp = 0;
-	}
-	return !0;
-    }
-    return 0;
-}
-
-/* int EV_GET_SINT64(ErlIOVec *ev, Uint64 *p, int *pp, int *qp) */
-#define EV_GET_SINT64(ev, p, pp, qp) efile_ev_get_sint64(ev, p, pp, qp)
-static int
-efile_ev_get_sint64(ErlIOVec *ev, Sint64 *p, size_t *pp, size_t *qp) {
-    Uint64 *tmp = (Uint64*)p;
-    return EV_GET_UINT64(ev, tmp, pp, qp);
-}
-
-#if 0
-
-static void ev_clear(ErlIOVec *ev) {
-    ASSERT(ev);
-    ev->size = 0;
-    ev->vsize = 0;
-    ev->iov = NULL;
-    ev->binv = NULL;
-}
-
-/* Assumes that ->iov and ->binv were allocated with sys_alloc().
- */
-static void ev_free(ErlIOVec *ev) {
-    if (! ev) {
-	return;
-    }
-    if (ev->vsize > 0) {
-	int i;
-	ASSERT(ev->iov);
-	ASSERT(ev->binv);
-	for (i = 0; i < ev->vsize; i++) {
-	    if (ev->binv[i]) {
-		driver_free_binary(ev->binv[i]);
-	    }
-	}
-	EF_FREE(ev->iov);
-	EF_FREE(ev->binv);
-    }
-}
-
-/* Copy the contents from source to dest.
- * Data in binaries is not copied, just the pointers; 
- * and refc is incremented.
- */
-static ErlIOVec *ev_copy(ErlIOVec *dest, ErlIOVec *source) {
-    int *ip;
-    ASSERT(dest);
-    ASSERT(source);
-    if (source->vsize == 0) {
-	/* Empty source */
-	ev_clear(dest);
-	return dest;
-    }
-    /* Allocate ->iov and ->binv */
-    dest->iov = EF_ALLOC(sizeof(*dest->iov) * source->vsize);
-    if (! dest->iov) {
-	return NULL;
-    }
-    dest->binv = EF_ALLOC(sizeof(*dest->binv) * source->vsize);
-    if (! dest->binv) {
-	EF_FREE(dest->iov);
-	return NULL;
-    }
-    dest->size = source->size;
-    /* Copy one vector element at the time. 
-     * Use *ip as an alias for dest->vsize to improve readabiliy.
-     * Keep dest consistent in every iteration by using 
-     * dest->vsize==*ip as loop variable.
-     */
-    for (ip = &dest->vsize, *ip = 0;  *ip < source->vsize;  (*ip)++) {
-	if (source->iov[*ip].iov_len == 0) {
-	    /* Empty vector element */
-	    dest->iov[*ip].iov_len = 0;
-	    dest->iov[*ip].iov_base = NULL;
-	    dest->binv[*ip] = NULL;
-	} else {
-	    /* Non empty vector element */
-	    if (source->binv[*ip]) {
-		/* Contents in binary - copy pointers and increment refc */
-		dest->iov[*ip] = source->iov[*ip];
-		dest->binv[*ip] = source->binv[*ip];
-		driver_binary_inc_refc(source->binv[*ip]);
-	    } else {
-		/* Contents not in binary - allocate new binary and copy data */
-		if (! (dest->binv[*ip] = 
-		       driver_alloc_binary(source->iov[*ip].iov_len))) {
-		    goto failed;
-		}
-		sys_memcpy(dest->binv[*ip]->orig_bytes,
-			   source->iov[*ip].iov_base,
-			   source->iov[*ip].iov_len);
-		dest->iov[*ip].iov_base = dest->binv[*ip]->orig_bytes;
-		dest->iov[*ip].iov_len = source->iov[*ip].iov_len;
-	    }
-	}
-    }
-    return dest;
- failed:
-    ev_free(dest);
-    return NULL;
-}
-
-#endif
-
-
-
-/*********************************************************************
- * Command queue functions
- */
-
-static void cq_enq(file_descriptor *desc, struct t_data *d) {
-    ASSERT(d);
-    if (desc->cq_head) {
-	ASSERT(desc->cq_tail);
-	ASSERT(!desc->cq_tail->next);
-	desc->cq_tail = desc->cq_tail->next = d;
-    } else {
-	ASSERT(desc->cq_tail == NULL);
-	desc->cq_head = desc->cq_tail = d;
-    }
-    d->next = NULL;
-}
-
-static struct t_data *cq_deq(file_descriptor *desc) {
-    struct t_data *d = desc->cq_head;
-    ASSERT(d || (!d && !desc->cq_tail));
-    if (d) {
-	ASSERT(!d->next || (d->next && desc->cq_tail != d));
-	if ((desc->cq_head = d->next) == NULL) {
-	    ASSERT(desc->cq_tail == d);
-	    desc->cq_tail = NULL;
-	}
-    }	
-    return d;
-}
-
-
-/*********************************************************************
- * Driver entry point -> init
- */
-static int 
-file_init(void)
-{
-    char buf[21]; /* enough to hold any 64-bit integer */
-    size_t bufsz = sizeof(buf);
-    thread_short_circuit = (erl_drv_getenv("ERL_EFILE_THREAD_SHORT_CIRCUIT",
-					   buf,
-					   &bufsz) == 0
-			    ? atoi(buf)
-			    : 0);
-    driver_system_info(&sys_info, sizeof(ErlDrvSysInfo));
-
-    /* run initiation of efile_driver if needed */
-    efile_init();
-
-#ifdef  USE_VM_PROBES
-    erts_mtx_init(&dt_driver_mutex, "efile_drv dtrace mutex", NIL,
-        ERTS_LOCK_FLAGS_PROPERTY_STATIC | ERTS_LOCK_FLAGS_CATEGORY_IO);
-    pthread_key_create(&dt_driver_key, NULL);
-#endif  /* USE_VM_PROBES */
-
-    return 0;
-}
-
-
-/*********************************************************************
- * Driver entry point -> start
- */
-static ErlDrvData 
-file_start(ErlDrvPort port, char* command) 
-
-{
-    file_descriptor* desc;
-
-    if ((desc = (file_descriptor*) EF_ALLOC(sizeof(file_descriptor)))
-	== NULL) {
-	errno = ENOMEM;
-	return ERL_DRV_ERROR_ERRNO;
-    }
-    desc->fd = FILE_FD_INVALID;
-    desc->port = port;
-    desc->key = driver_async_port_key(port);
-    desc->flags = 0;
-    desc->invoke = NULL;
-    desc->d = NULL;
-    desc->free = NULL;
-    desc->cq_head = NULL;
-    desc->cq_tail = NULL;
-    desc->timer_state = timer_idle;
-#ifdef HAVE_SENDFILE
-    desc->sendfile_state = not_sending;
-#endif
-    desc->read_bufsize = 0;
-    desc->read_binp = NULL;
-    desc->read_offset = 0;
-    desc->read_size = 0;
-    desc->write_delay = 0L;
-    desc->write_bufsize = 0;
-    desc->write_error = 0;
-    MUTEX_INIT(desc->q_mtx, port); /* Refc is one, referenced by emulator now */
-    desc->write_buffered = 0;
-#ifdef  USE_VM_PROBES
-    dtrace_drvport_str(port, desc->port_str);
-    get_dt_private(0);           /* throw away return value */
-#endif  /* USE_VM_PROBES */
-    return (ErlDrvData) desc;
-}
-
-static void do_close(int flags, SWord fd) {
-    if (flags & EFILE_COMPRESSED) {
-	erts_gzclose((ErtsGzFile)(fd));
-    } else {
-	efile_closefile((int) fd);
-    }
-}
-
-static void invoke_close(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    DTRACE_INVOKE_SETUP(FILE_CLOSE);
-    d->again = 0;
-    do_close(d->flags, d->fd);
-    DTRACE_INVOKE_RETURN(FILE_CLOSE);
-}
-
-static void free_data(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-
-    switch (d->command) {
-    case FILE_OPEN:
-        if (d->is_fd_unused && d->fd != FILE_FD_INVALID) {
-            /* This is OK to do in scheduler thread because there can be no async op
-               ongoing for this fd here, as we exited during async open.
-               Ideally, this close should happen in an async thread too, but that would
-               require a substantial rewrite, as we are here because of a dead port and
-               cannot schedule async jobs for that port any more... */
-            do_close(d->flags, d->fd);
-        }
-        break;
-    case FILE_CLOSE_ON_PORT_EXIT:
-        EF_FREE(d->data_to_free);
-        break;
-    }
-
-    EF_FREE(data);
-}
-
-
-/*
- * Sends back an error reply to Erlang.
- */
-
-static void reply_posix_error(file_descriptor *desc, int posix_errno) {
-    char response[256];		/* Response buffer. */
-    char* s;
-    char* t;
-    
-    /*
-     * Contents of buffer sent back:
-     *
-     * +-----------------------------------------+
-     * | FILE_RESP_ERROR | Posix error id string |
-     * +-----------------------------------------+
-     */
-
-    TRACE_C('E');
-
-    response[0] = FILE_RESP_ERROR;
-    for (s = erl_errno_id(posix_errno), t = response+1; *s; s++, t++)
-	*t = tolower(*s);
-    driver_output2(desc->port, response, t-response, NULL, 0);
-}
-
-static void reply_Uint_posix_error(file_descriptor *desc, Uint num, 
-				   int posix_errno) {
-    char response[256];		/* Response buffer. */
-    char* s;
-    char* t;
-    
-    /*
-     * Contents of buffer sent back:
-     *
-     * +----------------------------------------------------------------------+
-     * | FILE_RESP_NUMERR | 64-bit number (big-endian) | Posix error id string |
-     * +----------------------------------------------------------------------+
-     */
-
-    TRACE_C('N');
-
-    response[0] = FILE_RESP_NUMERR;
-#if SIZEOF_VOID_P == 4
-    put_int32(0, response+1);
-#else
-    put_int32(num>>32, response+1);
-#endif
-    put_int32((Uint32)num, response+1+4);
-    for (s = erl_errno_id(posix_errno), t = response+1+4+4; *s; s++, t++)
-	*t = tolower(*s);
-    driver_output2(desc->port, response, t-response, NULL, 0);
-}
-
-#ifdef HAVE_SENDFILE
-static void reply_string_error(file_descriptor *desc, char* str) {
-    char response[256];		/* Response buffer. */
-    char* s;
-    char* t;
-
-    response[0] = FILE_RESP_ERROR;
-    for (s = str, t = response+1; *s; s++, t++)
-	*t = tolower(*s);
-    driver_output2(desc->port, response, t-response, NULL, 0);
-}
-#endif
-
-static int reply_error(file_descriptor *desc, 
-		       Efile_error *errInfo) /* The error codes. */
-{
-    reply_posix_error(desc, errInfo->posix_errno);
-    return 0;
-}
-
-static int reply_Uint_error(file_descriptor *desc, Uint num, 
-			    Efile_error *errInfo) /* The error codes. */
-{
-    reply_Uint_posix_error(desc, num, errInfo->posix_errno);
-    return 0;
-}
-
-static int reply_ok(file_descriptor *desc) {
-    char c = FILE_RESP_OK;
-
-    driver_output2(desc->port, &c, 1, NULL, 0);
-    return 0;
-}
-
-static int reply(file_descriptor *desc, int ok, Efile_error *errInfo) {
-    if (!ok) {
-	reply_error(desc, errInfo);
-    } else {
-	TRACE_C('K');
-	reply_ok(desc);
-    }
-    return 0;
-}
-
-static int reply_Uint(file_descriptor *desc, Uint result) {
-    char tmp[1+4+4];
-
-    /*
-     * Contents of buffer sent back:
-     *
-     * +-----------------------------------------------+
-     * | FILE_RESP_NUMBER | 64-bit number (big-endian) |
-     * +-----------------------------------------------+
-     */
-
-    TRACE_C('R');
-
-    tmp[0] = FILE_RESP_NUMBER;
-#if SIZEOF_VOID_P == 4
-    put_int32(0, tmp+1);
-#else
-    put_int32(result>>32, tmp+1);
-#endif
-    put_int32((Uint32)result, tmp+1+4);
-    driver_output2(desc->port, tmp, sizeof(tmp), NULL, 0);
-    return 0;
-}
-
-static int reply_Sint64(file_descriptor *desc, Sint64 result) {
-    char tmp[1+4+4];
-
-    /*
-     * Contents of buffer sent back:
-     *
-     * +-----------------------------------------------+
-     * | FILE_RESP_NUMBER | 64-bit number (big-endian) |
-     * +-----------------------------------------------+
-     */
-
-    TRACE_C('R');
-
-    tmp[0] = FILE_RESP_NUMBER;
-    put_int64(result, tmp+1);
-    driver_output2(desc->port, tmp, sizeof(tmp), NULL, 0);
-    return 0;
-}
-
-#if 0
-static void reply_again(file_descriptor *desc) {
-    char tmp[1];
-    tmp[0] = FILE_RESP_AGAIN;
-    driver_output2(desc->port, tmp, sizeof(tmp), NULL, 0);
-}
-#endif
-
-static void reply_ev(file_descriptor *desc, char response, ErlIOVec *ev) {
-    char tmp[1];
-    /* Data arriving at the Erlang process:
-     * [Response, Binary0, Binary1, .... | BinaryN-1]
-     */
-    tmp[0] = response;
-    driver_outputv(desc->port, tmp, sizeof(tmp), ev, 0);
-}
-
-static void reply_data(file_descriptor *desc, 
-		       ErlDrvBinary *binp, size_t offset, size_t len) {
-    char header[1+4+4];
-    /* Data arriving at the Erlang process:
-     * [?FILE_RESP_DATA, 64-bit length (big-endian) | Data]
-     */
-    header[0] = FILE_RESP_DATA;
-#if SIZEOF_SIZE_T == 4
-    put_int32(0, header+1);
-#else
-    put_int32(len>>32, header+1);
-#endif
-    put_int32((Uint32)len, header+1+4);
-    driver_output_binary(desc->port, header, sizeof(header),
-			 binp, offset, len);
-}
-
-static void reply_buf(file_descriptor *desc, char *buf, size_t len) {
-    char header[1+4+4];
-    /* Data arriving at the Erlang process:
-     * [?FILE_RESP_DATA, 64-bit length (big-endian) | Data]
-     */
-    header[0] = FILE_RESP_DATA;
-#if SIZEOF_SIZE_T == 4
-    put_int32(0, header+1);
-#else
-    put_int32(len>>32, header+1);
-#endif
-    put_int32((Uint32)len, header+1+4);
-    driver_output2(desc->port, header, sizeof(header), buf, len);
-}
-
-static int reply_eof(file_descriptor *desc) {
-    char c = FILE_RESP_EOF;
-
-    driver_output2(desc->port, &c, 1, NULL, 0);
-    return 0;
-}
- 
-static void invoke_name(void *data, int (*f)(Efile_error *, char *))
-{
-    struct t_data *d = (struct t_data *) data;
-    char *name = (char *) d->b;
-
-    d->again = 0;
-    d->result_ok = (*f)(&d->errInfo, name);
-}
-
-static void invoke_mkdir(void *data)
-{
-    DTRACE_INVOKE_SETUP_BY_NAME(FILE_MKDIR);
-    invoke_name(data, efile_mkdir);
-    DTRACE_INVOKE_RETURN(FILE_MKDIR);
-}
-
-static void invoke_rmdir(void *data)
-{
-    DTRACE_INVOKE_SETUP_BY_NAME(FILE_RMDIR);
-    invoke_name(data, efile_rmdir);
-    DTRACE_INVOKE_RETURN(FILE_RMDIR);
-}
-
-static void invoke_delete_file(void *data)
-{
-    DTRACE_INVOKE_SETUP_BY_NAME(FILE_DELETE);
-    invoke_name(data, efile_delete_file);
-    DTRACE_INVOKE_RETURN(FILE_DELETE);
-}
-
-static void invoke_chdir(void *data)
-{
-    DTRACE_INVOKE_SETUP_BY_NAME(FILE_CHDIR);
-    invoke_name(data, efile_chdir);
-    DTRACE_INVOKE_RETURN(FILE_CHDIR);
-}
-
-static void invoke_fdatasync(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    int fd = (int) d->fd;
-    DTRACE_INVOKE_SETUP(FILE_FDATASYNC);
-
-    d->again = 0;
-    d->result_ok = efile_fdatasync(&d->errInfo, fd);
-    DTRACE_INVOKE_RETURN(FILE_FDATASYNC);
-}
-
-static void invoke_fsync(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    int fd = (int) d->fd;
-    DTRACE_INVOKE_SETUP(FILE_FSYNC);
-
-    d->again = 0;
-    d->result_ok = efile_fsync(&d->errInfo, fd);
-    DTRACE_INVOKE_RETURN(FILE_FSYNC);
-}
-
-static void invoke_truncate(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    int fd = (int) d->fd;
-    DTRACE_INVOKE_SETUP(FILE_TRUNCATE);
-
-    d->again = 0;
-    d->result_ok = efile_truncate_file(&d->errInfo, &fd, d->flags);
-    DTRACE_INVOKE_RETURN(FILE_TRUNCATE);
-}
-
-static void invoke_read(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    int status, segment;
-    size_t size, read_size;
-    DTRACE_INVOKE_SETUP(FILE_READ);
-
-    segment = d->again && d->c.read.bin_size >= 2*FILE_SEGMENT_READ;
-    if (segment) {
-	size = FILE_SEGMENT_READ;
-    } else {
-	size = d->c.read.bin_size;
-    }
-    read_size = size;
-    if (d->flags & EFILE_COMPRESSED) {
-	read_size = erts_gzread((ErtsGzFile)d->fd,
-				d->c.read.binp->orig_bytes + d->c.read.bin_offset,
-				size);
-	status = (read_size != (size_t) -1);
-	if (!status) {
-	    d->errInfo.posix_errno = EIO;
-	}
-    } else {
-	status = efile_read(&d->errInfo, d->flags, (int) d->fd,
-			    d->c.read.binp->orig_bytes + d->c.read.bin_offset,
-			    size,
-			    &read_size);
-    }
-    if ( (d->result_ok = status)) {
-	ASSERT(read_size <= size);
-	d->c.read.bin_offset += read_size;
-	if (read_size < size || !segment) {
-	    d->c.read.bin_size = 0;
-	    d->again = 0;
-	} else {
-	    d->c.read.bin_size -= read_size;
-	}
-    } else {
-	d->again = 0;
-    }
-    DTRACE_INVOKE_RETURN(FILE_READ);
-}
-
-static void free_read(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-
-    driver_free_binary(d->c.read.binp);
-    EF_FREE(d);
-}
-
-static void invoke_read_line(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    int status;
-    size_t read_size = 0;
-    int local_loop = (d->again == 0);
-    DTRACE_INVOKE_SETUP(FILE_READ_LINE);
-
-    do {
-	size_t size = (d->c.read_line.binp)->orig_size - 
-	    d->c.read_line.read_offset - d->c.read_line.read_size;
-	if (size == 0) {
-	    /* Need more place */
-	    ErlDrvSizeT need = (d->c.read_line.read_size >= DEFAULT_LINEBUF_SIZE) ?
-		d->c.read_line.read_size + DEFAULT_LINEBUF_SIZE : DEFAULT_LINEBUF_SIZE;
-	    ErlDrvBinary   *newbin;
-#if !ALWAYS_READ_LINE_AHEAD
-	    /* Use read_ahead size if need does not exceed it */
-	    if (need < (d->c.read_line.binp)->orig_size && 
-		d->c.read_line.read_ahead)
-	      need = (d->c.read_line.binp)->orig_size;
-#endif
-	    newbin = driver_alloc_binary(need);
-	    if (newbin == NULL) {
-		d->result_ok = 0;
-		d->errInfo.posix_errno = ENOMEM;
-		d->again = 0;
-		break;
-	    }
-	    memcpy(newbin->orig_bytes, (d->c.read_line.binp)->orig_bytes + d->c.read_line.read_offset,  
-		   d->c.read_line.read_size);
-	    driver_free_binary(d->c.read_line.binp);
-	    d->c.read_line.binp = newbin;
-	    d->c.read_line.read_offset = 0;
-	    size = need - d->c.read_line.read_size;
-	}
-	if (d->flags & EFILE_COMPRESSED) {
-	    read_size = erts_gzread((ErtsGzFile)d->fd,
-				    d->c.read_line.binp->orig_bytes + 
-				    d->c.read_line.read_offset + d->c.read_line.read_size,
-				    size);
-	    status = (read_size != (size_t) -1);
-	    if (!status) {
-		d->errInfo.posix_errno = EIO;
-	    }
-	} else {
-	    status = efile_read(&d->errInfo, d->flags, (int) d->fd,
-				d->c.read_line.binp->orig_bytes + 
-				d->c.read_line.read_offset + d->c.read_line.read_size,
-				size,
-				&read_size);
-	}
-	if ( (d->result_ok = status)) {
-	    void *nl_ptr = memchr((d->c.read_line.binp)->orig_bytes + 
-				  d->c.read_line.read_offset + d->c.read_line.read_size,'\n',read_size);
-	    ASSERT(read_size <= size);
-	    d->c.read_line.read_size += read_size;
-	    if (nl_ptr != NULL) {
-		/* If found, we're done */
-		d->c.read_line.nl_pos = ((char *) nl_ptr) - 
-		    ((char *) ((d->c.read_line.binp)->orig_bytes)) + 1;
-		if (d->c.read_line.nl_pos > 1 &&
-		    *(((char *) nl_ptr) - 1) == '\r') {
-		    --d->c.read_line.nl_pos;
-		    *(((char *) nl_ptr) - 1) = '\n';
-		    d->c.read_line.nl_skip = 1;
-		} else {
-		    d->c.read_line.nl_skip = 0;
-		}
-		d->again = 0;
-#if !ALWAYS_READ_LINE_AHEAD
-		if (!(d->c.read_line.read_ahead)) {
-		    /* Ouch! Undo buffering... */
-		    size_t too_much = d->c.read_line.read_size - d->c.read_line.nl_skip - 
-			(d->c.read_line.nl_pos - d->c.read_line.read_offset);
-		    d->c.read_line.read_size -= too_much;
-		    ASSERT(d->c.read_line.read_size >= 0);
-		    if (d->flags & EFILE_COMPRESSED) {
-			Sint64 location = erts_gzseek((ErtsGzFile)d->fd,
-						      -((Sint64) too_much), EFILE_SEEK_CUR);
-			if (location == -1) {
-			    d->result_ok = 0;
-			    d->errInfo.posix_errno = errno;
-			}
-		    } else {
-			Sint64 location;
-			d->result_ok = efile_seek(&d->errInfo, (int) d->fd, 
-						-((Sint64) too_much), EFILE_SEEK_CUR,
-						&location);
-		    }
-		}
-#endif
-		break;
-	    } else if (read_size == 0) {
-		d->c.read_line.nl_pos = 
-		    d->c.read_line.read_offset + d->c.read_line.read_size;
-		d->c.read_line.nl_skip = 0;
-		d->again = 0;
-		break;
-	    }
-	} else {
-	    d->again = 0;
-	    break;
-	}
-    } while (local_loop);
-    DTRACE_INVOKE_RETURN(FILE_READ_LINE);
-}
-
-static void free_read_line(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-
-    driver_free_binary(d->c.read_line.binp);
-    EF_FREE(d);
-}
-
-void read_file_zero_size(struct t_data* d);
-#define ZERO_FILE_CHUNK (64 * 1024)
-
-/* [ERL-327] Some special files like /proc/... have reported size 0 */
-void read_file_zero_size(struct t_data* d) {
-    size_t total_read_size = 0;
-    size_t allocated_size = ZERO_FILE_CHUNK; /* allocd in invoke_read_file */
-    for (;;) {
-        size_t read_result;
-
-        /* Read until we hit EOF (read less than FILE_SEGMENT_READ) */
-        d->result_ok = efile_read(&d->errInfo,
-                                  EFILE_MODE_READ,
-                                  (int) d->fd,
-                                  (d->c.read_file.binp->orig_bytes +
-                                   total_read_size),
-                                  ZERO_FILE_CHUNK,
-                                  &read_result);
-        if (!d->result_ok) {
-            break;
-        }
-
-        total_read_size += read_result;
-        d->c.read_file.offset += read_result;
-        if (read_result < ZERO_FILE_CHUNK) {
-            break;
-        }
-
-        /* Grow before the next read call */
-        allocated_size = total_read_size + ZERO_FILE_CHUNK;
-        d->c.read_file.binp = driver_realloc_binary(d->c.read_file.binp,
-                                                    allocated_size);
-    }
-
-    /* Finalize the memory usage. Hopefully it was read fully on the first
-     * go, so the binary allocation overhead becomes:
-     * alloc ZERO_FILE_CHUNK (64kb) -> realloc real_size */
-    if (allocated_size != total_read_size) {
-        d->c.read_file.binp = driver_realloc_binary(d->c.read_file.binp,
-                                                    total_read_size);
-    }
-    d->again = 0;
-}
-
-static void invoke_read_file(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    size_t read_size;
-    int chop;
-    DTRACE_INVOKE_SETUP(FILE_READ_FILE);
-    
-    if (! d->c.read_file.binp) { /* First invocation only */
-	int fd;
-	Sint64 size;
-	
-	if (! (d->result_ok = 
-	       efile_openfile(&d->errInfo, d->b, 
-			      EFILE_MODE_READ, &fd, &size))) {
-	    goto done;
-	}
-	d->fd = fd;
-	d->c.read_file.size = (int) size;
-
-        /* For zero sized files allocate a reasonable chunk to attempt reading
-         * anyway. Note: This will eat ZERO_FILE_CHUNK bytes for any 0 file
-         * and free them immediately after (if the file was empty). */
-        ERTS_ASSERT(size >= 0);
-        d->c.read_file.binp = driver_alloc_binary(size != 0 ? (size_t)size
-                                                            : ZERO_FILE_CHUNK);
-
-	if (size < 0 || size != d->c.read_file.size || !d->c.read_file.binp) {
-	    d->result_ok = 0;
-	    d->errInfo.posix_errno = ENOMEM;
-	    goto close;
-	}
-	d->c.read_file.offset = 0;
-    }
-    /* Invariant: d->c.read_file.size >= d->c.read_file.offset */
-    
-    if (d->c.read_file.size == 0) {
-        read_file_zero_size(d);
-        goto close;
-    }
-
-    read_size = (size_t) (d->c.read_file.size - d->c.read_file.offset);
-    if (! read_size) goto close;
-    chop = d->again && read_size >= FILE_SEGMENT_READ*2;
-    if (chop) read_size = FILE_SEGMENT_READ;
-    d->result_ok = 
-	efile_read(&d->errInfo, 
-		   EFILE_MODE_READ, 
-		   (int) d->fd, 
-		   d->c.read_file.binp->orig_bytes + d->c.read_file.offset,
-		   read_size, 
-		   &read_size);
-    if (d->result_ok) {
-	d->c.read_file.offset += read_size;
-	if (chop) goto chop_done; /* again */
-    }
- close:
-    efile_closefile((int) d->fd);
- done:
-    d->again = 0;
- chop_done:
-    DTRACE_INVOKE_RETURN(FILE_READ_FILE);
-}
-
-static void free_read_file(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-
-    if (d->c.read_file.binp) driver_free_binary(d->c.read_file.binp);
-    EF_FREE(d);
-}
-
-
-
-static void invoke_preadv(void *data)
-{
-    struct t_data   *d = (struct t_data *) data;
-    struct t_preadv *c = &d->c.preadv;
-    ErlIOVec        *ev = &c->eiov;
-    size_t           bytes_read_so_far = 0;
-    unsigned char   *p = (unsigned char *)ev->iov[0].iov_base + 4+4+8*c->cnt;
-    DTRACE_INVOKE_SETUP(FILE_PREADV);
-
-    while (c->cnt < c->n) {
-	size_t read_size = ev->iov[1 + c->cnt].iov_len - c->size;
-	size_t bytes_read = 0;
-	int chop = d->again 
-	    && bytes_read_so_far + read_size >= 2*FILE_SEGMENT_READ;
-	if (chop) {
-	    ASSERT(bytes_read_so_far < FILE_SEGMENT_READ);
-	    read_size = FILE_SEGMENT_READ + FILE_SEGMENT_READ/2
-		- bytes_read_so_far;
-	}
-	if ( (d->result_ok 
-	      = efile_pread(&d->errInfo, 
-			    (int) d->fd,
-			    c->offsets[c->cnt] + c->size,
-			    ((char *)ev->iov[1 + c->cnt].iov_base) + c->size,
-			    read_size,
-			    &bytes_read))) {
-	    bytes_read_so_far += bytes_read;
-	    if (chop && bytes_read == read_size) {
-		c->size += bytes_read;
-		goto done;
-	    }
-	    ASSERT(bytes_read <= read_size);
-	    ev->iov[1 + c->cnt].iov_len = bytes_read + c->size;
-	    ev->size += bytes_read + c->size;
-	    put_int64(bytes_read + c->size, p); p += 8;
-	    c->size = 0;
-	    c->cnt++;
-	    if (d->again 
-		&& bytes_read_so_far >= FILE_SEGMENT_READ
-		&& c->cnt < c->n) {
-		goto done;
-	    }
-	} else {
-	    /* In case of a read error, ev->size will not be correct,
-	     * which does not matter since no read data is returned
-	     * to Erlang.
-	     */
-	    break;
-	}
-    }					
-    d->again = 0;
- done:
-    DTRACE_INVOKE_RETURN(FILE_PREADV);
-}
-
-static void free_preadv(void *data) {
-    struct t_data *d = data;
-    int            i;
-    ErlIOVec      *ev = &d->c.preadv.eiov;
-    
-    for(i = 0; i < ev->vsize; i++) {
-	driver_free_binary(ev->binv[i]);
-    }
-    EF_FREE(d);
-}
-
-static void invoke_ipread(void *data)
-{
-    struct t_data   *d = data;
-    struct t_preadv *c = &d->c.preadv;
-    ErlIOVec        *ev = &c->eiov;
-    size_t bytes_read = 0;
-    char buf[2*sizeof(Uint32)];
-    Uint32 offset, size;
-    DTRACE_INVOKE_SETUP(FILE_IPREAD);
-    
-    /* Read indirection header */
-    if (! efile_pread(&d->errInfo, (int) d->fd, c->offsets[0], 
-		      buf, sizeof(buf), &bytes_read)) {
-	goto error;
-    }
-    if (bytes_read != sizeof(buf)) goto done; /* eof */
-    size = get_int32(buf);
-    offset = get_int32(buf+4);
-    if (size > c->size) goto done; /* eof */
-    c->n = 1;
-    c->cnt = 0;
-    c->size = 0;
-    c->offsets[0] = offset;
-    if (! (ev->binv[0] = driver_alloc_binary(3*8))) {
-	d->errInfo.posix_errno = ENOMEM;
-	goto error;
-    }
-    ev->vsize = 1;
-    ev->iov[0].iov_len = 3*8;
-    ev->iov[0].iov_base = ev->binv[0]->orig_bytes;
-    ev->size = ev->iov[0].iov_len;
-    put_int64(offset, ev->iov[0].iov_base);
-    put_int64(size, ((char *)ev->iov[0].iov_base) + 2*8);
-    if (size == 0) {
-	put_int64(size, ((char *)ev->iov[0].iov_base) + 8);
-	goto done;
-    }
-    if (! (ev->binv[1] = driver_alloc_binary(size))) {
-	d->errInfo.posix_errno = ENOMEM;
-	goto error;
-    }
-    ev->vsize = 2;
-    ev->iov[1].iov_len = size;
-    ev->iov[1].iov_base = ev->binv[1]->orig_bytes;
-    /* Read data block */
-    d->invoke = invoke_preadv;
-    invoke_preadv(data);
-    DTRACE_INVOKE_RETURN(FILE_IPREAD);
-    return;
- error:
-    d->result_ok = 0;
-    d->again = 0;
-    DTRACE_INVOKE_RETURN(FILE_IPREAD);
-    return;
- done:
-    d->result_ok = !0;
-    d->again = 0;
-    DTRACE_INVOKE_RETURN(FILE_IPREAD);
-}
-
-/* invoke_writev and invoke_pwritev are the only thread functions that
- * access non-thread data i.e the port queue and a mutex in the port
- * structure that is used to lock the port queue.
- *
- * The port will normally not be terminated until the port queue is
- * empty, but if the port is killed, i.e., exit(Port, kill) is called,
- * it will terminate regardless of the port queue state. When the
- * port is invalid driver_peekq() returns NULL and set the size to -1,
- * and driver_sizeq() returns -1.
- */
-
-static void invoke_writev(void *data) {
-    struct t_data *d = (struct t_data *) data;
-    SysIOVec      *iov0;
-    SysIOVec      *iov;
-    int            iovlen;
-    int            iovcnt;
-    size_t         size;
-    size_t         p;
-    int            segment;
-    DTRACE_INVOKE_SETUP(FILE_WRITE);
-
-    segment = d->again && d->c.writev.size >= 2*FILE_SEGMENT_WRITE;
-    if (segment) {
-	size = FILE_SEGMENT_WRITE;
-    } else {
-	size = d->c.writev.size;
-    }
-
-    /* Copy the io vector to avoid locking the port que while writing,
-     * also, both we and efile_writev might/will change the SysIOVec
-     * when segmenting or due to partial write and we do not want to
-     * tamper with the actual queue that we get from driver_peekq
-     */
-    MUTEX_LOCK(d->c.writev.q_mtx); /* Lock before accessing the port queue */
-    iov0 = driver_peekq(d->c.writev.port, &iovlen);
-
-    /* Calculate iovcnt */
-    for (p = 0, iovcnt = 0;
-	 p < size && iovcnt < iovlen;
-	 p += iov0[iovcnt++].iov_len)
-	;
-    iov = EF_SAFE_ALLOC(sizeof(SysIOVec)*iovcnt);
-    memcpy(iov,iov0,iovcnt*sizeof(SysIOVec));
-    MUTEX_UNLOCK(d->c.writev.q_mtx);
-    /* Let go of lock until we deque from original vector */
-
-    if (iovlen > 0) {
-	ASSERT(iov[iovcnt-1].iov_len > p - size);
-	iov[iovcnt-1].iov_len -= p - size;
-	if (d->flags & EFILE_COMPRESSED) {
-	    int i, status = 1;
-	    for (i = 0; i < iovcnt; i++) {
-		if (iov[i].iov_base && iov[i].iov_len > 0) {
-		    /* Just in case, I do not know what gzwrite does
-		     * with errno.
-		     */
-		    errno = EINVAL; 
-		    status = erts_gzwrite((ErtsGzFile)d->fd,
-					  iov[i].iov_base,
-					  iov[i].iov_len) == iov[i].iov_len;
-		    if (! status) {
-			d->errInfo.posix_errno =
-			    d->errInfo.os_errno = errno; /* XXX Correct? */
-			break;
-		    }
-		}
-	    }
-	    d->result_ok = status;
-	} else {
-	    d->result_ok = efile_writev(&d->errInfo, 
-					d->flags, (int) d->fd,
-					iov, iovcnt);
-	}
-    } else if (iovlen == 0) {
-	d->result_ok = 1;
-    }
-    else { /* Port has terminated */
-	d->result_ok = 0;
-	d->errInfo.posix_errno = d->errInfo.os_errno = EINVAL;
-    }
-    EF_FREE(iov);
-
-    if (! d->result_ok) {
-	d->again = 0;
-	MUTEX_LOCK(d->c.writev.q_mtx);
-	driver_deq(d->c.writev.port, d->c.writev.size);
-	MUTEX_UNLOCK(d->c.writev.q_mtx);
-    } else {
-	if (! segment) {
-	    d->again = 0;
-	}
-	d->c.writev.size -= size;
-	TRACE_F(("w%lu", (unsigned long)size));
-	MUTEX_LOCK(d->c.writev.q_mtx);
-	driver_deq(d->c.writev.port, size);
-	MUTEX_UNLOCK(d->c.writev.q_mtx);
-    }
-
-
-    DTRACE_INVOKE_RETURN(FILE_WRITE);
-}
-
-static void invoke_pwd(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    DTRACE_INVOKE_SETUP(FILE_PWD);
-
-    d->again = 0;
-    d->result_ok = efile_getdcwd(&d->errInfo,d->drive, d->b+1,
-				 RESBUFSIZE-1);
-    DTRACE_INVOKE_RETURN(FILE_PWD);
-}
-
-static void invoke_readlink(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    char resbuf[RESBUFSIZE];	/* Result buffer. */
-    DTRACE_INVOKE_SETUP(FILE_READLINK);
-
-    d->again = 0;
-    d->result_ok = efile_readlink(&d->errInfo, d->b, resbuf+1,
-				  RESBUFSIZE-1);
-    if (d->result_ok != 0)
-	FILENAME_COPY((char *) d->b + 1, resbuf+1);
-    DTRACE_INVOKE_RETURN(FILE_READLINK);
-}
-
-static void invoke_altname(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    char resbuf[RESBUFSIZE];	/* Result buffer. */
-    DTRACE_INVOKE_SETUP(FILE_ALTNAME);
-
-    d->again = 0;
-    d->result_ok = efile_altname(&d->errInfo, d->b, resbuf+1,
-				  RESBUFSIZE-1);
-    if (d->result_ok != 0)
-	FILENAME_COPY((char *) d->b + 1, resbuf+1);
-    DTRACE_INVOKE_RETURN(FILE_ALTNAME);
-}
-
-static void invoke_pwritev(void *data) {
-    struct t_data* const d = (struct t_data *) data;
-    struct t_pwritev * const c = &d->c.pwritev;
-    SysIOVec         *iov0;
-    SysIOVec         *iov;
-    int               iovlen;
-    int               iovcnt;
-    size_t            p;
-    int               segment;
-    size_t            size, write_size, written;
-    DTRACE_INVOKE_SETUP(FILE_PWRITEV);
-
-    segment = d->again && c->size >= 2*FILE_SEGMENT_WRITE;
-    if (segment) {
-	size = FILE_SEGMENT_WRITE;
-    } else {
-	size = c->size;
-    }
-    d->result_ok = !0;
-    p = 0;
-    /* Lock the queue just for a while, we don't want it locked during write */
-    MUTEX_LOCK(c->q_mtx);
-    iov0 = driver_peekq(c->port, &iovlen);
-    iov = EF_SAFE_ALLOC(sizeof(SysIOVec)*iovlen);
-    memcpy(iov,iov0,sizeof(SysIOVec)*iovlen);
-    MUTEX_UNLOCK(c->q_mtx);
-
-    if (iovlen < 0)
-	goto error; /* Port terminated */
-    for (iovcnt = 0, written = 0;
-	 c->cnt < c->n && iovcnt < iovlen && written < size;
-	 c->cnt++) {
-	int chop;
-	write_size = c->specs[c->cnt].size;
-	if (iov[iovcnt].iov_len - p < write_size) {
-	    goto error;
-	}
-	chop = segment && written + write_size >= 2*FILE_SEGMENT_WRITE;
-	if (chop) {
-	    ASSERT(written < FILE_SEGMENT_WRITE);
-	    write_size = FILE_SEGMENT_WRITE + FILE_SEGMENT_WRITE/2 
-		- written;
-	}
-	d->result_ok = efile_pwrite(&d->errInfo, (int) d->fd,
-				    (char *)(iov[iovcnt].iov_base) + p,
-				    write_size,
-				    c->specs[c->cnt].offset);
-	if (! d->result_ok) {
-	    d->again = 0;
-	    goto deq_error;
-	}
-	written += write_size; 
-	c->size -= write_size;
-	if (chop) { 
-	    c->specs[c->cnt].offset += write_size;
-	    c->specs[c->cnt].size -= write_size;
-	    /* Schedule out (d->again != 0) */
-	    break;
-	}
-	/* Move forward in buffer */
-	p += write_size;
-	ASSERT(iov[iovcnt].iov_len >= p);
-	if (iov[iovcnt].iov_len == p) {
-	    /* Move to next iov[], we trust that it is not a 
-	     * zero length vector, and thereby depend on that
-	     * such are not queued.
-	     */
-	    iovcnt++; p = 0;
-	}
-    }
-    if (! segment) {
-	if (c->cnt != c->n) {
-	    /* Mismatch between number of 
-	     * pos/size specs vs number of queued buffers .
-	     */
-	error:
-	    d->errInfo.posix_errno = EINVAL;
-	    d->result_ok = 0;
-	    d->again = 0;
-	deq_error:
-	    MUTEX_LOCK(c->q_mtx);
-	    driver_deq(c->port, c->size);
-	    MUTEX_UNLOCK(c->q_mtx);
-
-	    goto done;
-	} else {
-	    ASSERT(written == size);
-	    d->again = 0;
-	}
-    } else {
-      ASSERT(written >= FILE_SEGMENT_WRITE);
-    }
-      
-    MUTEX_LOCK(c->q_mtx);
-    driver_deq(c->port, written);
-    MUTEX_UNLOCK(c->q_mtx);
- done:
-    EF_FREE(iov); /* Free our copy of the vector, nothing to restore */
-    
-    DTRACE_INVOKE_RETURN(FILE_PWRITEV);
-}
-
-static void invoke_flstat(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-
-    DTRACE3(efile_drv_int_entry, d->sched_i1, d->sched_i2,
-            d->command == FILE_LSTAT ? FILE_LSTAT : FILE_FSTAT);
-    d->again = 0;
-    d->result_ok = efile_fileinfo(&d->errInfo, &d->info,
-				  d->b, d->command == FILE_LSTAT);
-    DTRACE3(efile_drv_int_entry, d->sched_i1, d->sched_i2,
-            d->command == FILE_LSTAT ? FILE_LSTAT : FILE_FSTAT);
-    gcc_optimizer_hack++;
-}
-
-static void invoke_link(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    char *name = d->b;
-    char *new_name;
-    DTRACE_INVOKE_SETUP(FILE_LINK);
-
-    d->again = 0;
-    new_name = name+FILENAME_BYTELEN(name)+FILENAME_CHARSIZE;
-    d->result_ok = efile_link(&d->errInfo, name, new_name);
-    DTRACE_INVOKE_RETURN(FILE_LINK);
-}
-
-static void invoke_symlink(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    char *name = d->b;
-    char *new_name;
-    DTRACE_INVOKE_SETUP(FILE_SYMLINK);
-
-    d->again = 0;
-    new_name = name+FILENAME_BYTELEN(name)+FILENAME_CHARSIZE;
-    d->result_ok = efile_symlink(&d->errInfo, name, new_name);
-    DTRACE_INVOKE_RETURN(FILE_SYMLINK);
-}
-
-static void invoke_rename(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    char *name = d->b;
-    char *new_name;
-    DTRACE_INVOKE_SETUP(FILE_RENAME);
-
-    d->again = 0;
-    new_name = name+FILENAME_BYTELEN(name)+FILENAME_CHARSIZE;
-    d->result_ok = efile_rename(&d->errInfo, name, new_name);
-    DTRACE_INVOKE_RETURN(FILE_RENAME);
-}
-
-static void invoke_write_info(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    DTRACE_INVOKE_SETUP(FILE_WRITE_INFO);
-
-    d->again = 0;
-    d->result_ok = efile_write_info(&d->errInfo, &d->info, d->b);
-    DTRACE_INVOKE_RETURN(FILE_WRITE_INFO);
-}
-
-static void invoke_lseek(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    int status;
-    DTRACE_INVOKE_SETUP(FILE_LSEEK);
-
-    d->again = 0;
-    if (d->flags & EFILE_COMPRESSED) {
-	int offset = (int) d->c.lseek.offset;
-	
-	if (offset != d->c.lseek.offset) {
-	    d->errInfo.posix_errno = EINVAL;
-	    status = 0;
-	} else {
-	    d->c.lseek.location = erts_gzseek((ErtsGzFile)d->fd,
-					      offset, d->c.lseek.origin);
-	    if (d->c.lseek.location == -1) {
-		d->errInfo.posix_errno = errno;
-		status = 0;
-	    } else {
-		status = 1;
-	    }
-	}
-    } else {
-	status = efile_seek(&d->errInfo, (int) d->fd, 
-			    d->c.lseek.offset, d->c.lseek.origin,
-			    &d->c.lseek.location);
-    }
-    d->result_ok = status;
-    DTRACE_INVOKE_RETURN(FILE_LSEEK);
-}
-
-static void invoke_readdir(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    char *p = NULL;
-    size_t file_bs;
-    size_t n = 0, total = 0;
-    struct t_readdir_buf *b = NULL;
-    int res = 0;
-    DTRACE_INVOKE_SETUP(FILE_READDIR);
-
-    d->again = 0;
-    d->errInfo.posix_errno = 0;
-
-    do {
-	total   = READDIR_BUFSIZE;
-	n       = 1;
-	b       = EF_SAFE_ALLOC(sizeof(struct t_readdir_buf));
-	b->next = NULL;
-	
-	if (d->c.read_dir.last_buf) {
-	    d->c.read_dir.last_buf->next = b;
-	} else {
-	    d->c.read_dir.first_buf = b;
-	}
-	d->c.read_dir.last_buf = b;
-
-	p       = &b->buf[0];
-	p[0]    = FILE_RESP_LFNAME;
-	file_bs = READDIR_BUFSIZE - n;
-
-	do {
-	    res = efile_readdir(&d->errInfo, d->b, &d->dir_handle, p + n + 2, &file_bs);
-
-	    if (res) {
-		put_int16((Uint16)file_bs, p + n);
-		n += 2 + file_bs;
-		file_bs = READDIR_BUFSIZE - n;
-	    }
-	} while( res && ((total - n - 2) >= MAXPATHLEN*FILENAME_CHARSIZE));
-
-	b->n = n;
-    } while(res);
-
-    d->result_ok = (d->errInfo.posix_errno == 0);
-    DTRACE_INVOKE_RETURN(FILE_READDIR);
-}
-
-static void invoke_open(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    int status = 1;		/* Status of open call. */
-    DTRACE_INVOKE_SETUP(FILE_OPEN);
-
-    d->again = 0;
-    if ((d->flags & EFILE_COMPRESSED) == 0) {
-	int fd;
-	status = efile_openfile(&d->errInfo, d->b, d->flags, &fd, NULL);
-	d->fd = fd;
-    } else {
-	char* mode = NULL;
-
-	if (((d->flags & (EFILE_MODE_READ_WRITE)) == EFILE_MODE_READ_WRITE) ||
-	    (d->flags & EFILE_MODE_APPEND)) {
-	    status = 0;
-	    d->errInfo.posix_errno = EINVAL;
-	} else {
-	    status = efile_may_openfile(&d->errInfo, d->b);
-	    if (status || (d->errInfo.posix_errno != EISDIR)) {
-		mode = (d->flags & EFILE_MODE_READ) ? "rb" : "wb";
-		d->fd = (SWord) erts_gzopen(d->b, mode);
-		if ((ErtsGzFile)d->fd) {
-		    status = 1;
-		} else {
-		    if (errno == 0) {
-			errno = ENOMEM;
-		    }
-		    d->errInfo.posix_errno = errno;
-		    status = 0;
-		}
-	    }
-	}
-    }
-
-    d->result_ok = status;
-    if (!status) {
-        d->fd = FILE_FD_INVALID;
-    }
-    DTRACE_INVOKE_RETURN(FILE_OPEN);
-}
-
-static void invoke_fadvise(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    int fd = (int) d->fd;
-    off_t offset = (off_t) d->c.fadvise.offset;
-    off_t length = (off_t) d->c.fadvise.length;
-    int advise = (int) d->c.fadvise.advise;
-    DTRACE_INVOKE_SETUP(FILE_FADVISE);
-
-    d->again = 0;
-    d->result_ok = efile_fadvise(&d->errInfo, fd, offset, length, advise);
-    DTRACE_INVOKE_RETURN(FILE_FADVISE);
-}
-
-#ifdef HAVE_SENDFILE
-static void invoke_sendfile(void *data)
-{
-    struct t_data *d = (struct t_data *)data;
-    int fd = d->fd;
-    int out_fd = (int)d->c.sendfile.out_fd;
-    Uint64 nbytes = d->c.sendfile.nbytes;
-    int result = 0;
-    d->again = 0;
-
-    result = efile_sendfile(&d->errInfo, fd, out_fd, &d->c.sendfile.offset, &nbytes, NULL);
-
-    d->c.sendfile.written += nbytes;
-
-    if (result == 1 || (result == 0 && USE_THRDS_FOR_SENDFILE(d))) {
-      d->result_ok = 0;
-    } else if (result == 0 && (d->errInfo.posix_errno == EAGAIN
-				 || d->errInfo.posix_errno == EINTR)) {
-      if ((d->c.sendfile.nbytes - nbytes) != 0) {
-	d->result_ok = 1;
-	if (d->c.sendfile.nbytes != 0)
-	  d->c.sendfile.nbytes -= nbytes;
-      } else if (nbytes == 0 && d->c.sendfile.nbytes == 0) {
-	d->result_ok = 1;
-      } else
-	d->result_ok = 0;
-    } else {
-	d->result_ok = -1;
-    }
-}
-
-static void free_sendfile(void *data) {
-    struct t_data *d = (struct t_data *)data;
-    if (USE_THRDS_FOR_SENDFILE(d)) {
-	SET_NONBLOCKING(d->c.sendfile.out_fd);
-    } else {
-	MUTEX_LOCK(d->c.sendfile.q_mtx);
-	driver_deq(d->c.sendfile.port,1);
-	MUTEX_UNLOCK(d->c.sendfile.q_mtx);
-	driver_select(d->c.sendfile.port, (ErlDrvEvent)(long)d->c.sendfile.out_fd,
-                      ERL_DRV_USE_NO_CALLBACK|ERL_DRV_WRITE, 0);
-    }
-    EF_FREE(data);
-}
-
-static void file_ready_output(ErlDrvData data, ErlDrvEvent event)
-{
-    file_descriptor* fd = (file_descriptor*) data;
-
-    switch (fd->d->command) {
-    case FILE_SENDFILE:
-	driver_select(fd->d->c.sendfile.port, event,
-		      (int)ERL_DRV_WRITE,(int) 0);
-	invoke_sendfile((void *)fd->d);
-	file_async_ready(data, (ErlDrvThreadData)fd->d);
-	break;
-    default:
-	break;
-    }
-}
-
-static void file_stop_select(ErlDrvEvent event, void* _)
-{
-
-}
-
-static int flush_sendfile(file_descriptor *desc,void *_) {
-    if (desc->sendfile_state == sending) {
-	desc->d->result_ok = -1;
-	desc->d->errInfo.posix_errno = ECONNABORTED;
-	file_async_ready((ErlDrvData)desc,(ErlDrvThreadData)desc->d);
-    }
-    return 1;
-}
-#endif /* HAVE_SENDFILE */
-
-
-static void invoke_fallocate(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    int fd = (int) d->fd;
-    Sint64 offset = d->c.fallocate.offset;
-    Sint64 length = d->c.fallocate.length;
-
-    d->again = 0;
-    d->result_ok = efile_fallocate(&d->errInfo, fd, offset, length);
-}
-
-static void free_readdir(void *data)
-{
-    struct t_data *d = (struct t_data *) data;
-    struct t_readdir_buf *b1 = d->c.read_dir.first_buf;
-
-    while (b1) {
-	struct t_readdir_buf *b2 = b1;
-	b1 = b1->next;
-	EF_FREE(b2);
-    }
-    EF_FREE(d);
-}
-
-
-
-static void try_free_read_bin(file_descriptor *desc) {
-    if ((desc->read_size == 0)
-	&& (desc->read_offset >= desc->read_binp->orig_size)) {
-	ASSERT(desc->read_offset == desc->read_binp->orig_size);
-	driver_free_binary(desc->read_binp);
-	desc->read_binp = NULL;
-	desc->read_offset = 0;
-	desc->read_size = 0;
-    }
-}
-
-
-
-static int try_again(file_descriptor *desc, struct t_data *d) {
-    if (! d->again)
-	return 0;
-    if (desc->timer_state != timer_idle) {
-	driver_cancel_timer(desc->port);
-    }
-    desc->timer_state = timer_again;
-    desc->invoke = d->invoke;
-    desc->d = d;
-    desc->free = d->free;
-    driver_set_timer(desc->port, 0L);
-    return !0;
-}
-
-
-
-static void cq_execute(file_descriptor *desc) {
-    struct t_data *d;
-    register void *void_ptr; /* Soft cast variable */
-    if (desc->timer_state == timer_again)
-	return;
-#ifdef HAVE_SENDFILE
-    if (desc->sendfile_state == sending)
-	return;
-#endif
-    if (! (d = cq_deq(desc)))
-	return;
-    TRACE_F(("x%i", (int) d->command));
-    d->again = sys_info.async_threads == 0;
-    DRIVER_ASYNC(d->level, desc, d->invoke, void_ptr=d, d->free);
-}
-
-static struct t_data *async_write(file_descriptor *desc, int *errp,
-		       int reply, Uint32 reply_size
-#ifdef USE_VM_PROBES
-		       ,Sint64 *dt_i1, Sint64 *dt_i2, Sint64 *dt_i3
-#endif
-) {
-    struct t_data *d;
-    if (! (d = EF_ALLOC(sizeof(struct t_data) - 1))) {
-	if (errp) *errp = ENOMEM;
-	return NULL;
-    }
-    TRACE_F(("w%lu", (unsigned long)desc->write_buffered));
-    d->command = FILE_WRITE;
-    d->fd = desc->fd;
-    d->flags = desc->flags;
-    d->c.writev.port = desc->port;
-    d->c.writev.q_mtx = desc->q_mtx;
-    d->c.writev.size = desc->write_buffered;
-#ifdef USE_VM_PROBES
-    if (dt_i1 != NULL) {
-        *dt_i1 = d->fd;
-        *dt_i2 = d->flags;
-        *dt_i3 = d->c.writev.size;
-    }
-#endif
-    d->reply = reply;
-    d->c.writev.reply_size = reply_size;
-    d->invoke = invoke_writev;
-    d->free = free_data;
-    d->level = 1;
-    cq_enq(desc, d);
-    desc->write_buffered = 0;
-    return d;
-}
-
-static int flush_write(file_descriptor *desc, int *errp
-#ifdef USE_VM_PROBES
-                       , dt_private *dt_priv, char *dt_utag
-#endif
-) {
-    int    result = 0;
-#ifdef USE_VM_PROBES
-    Sint64 dt_i1 = 0, dt_i2 = 0, dt_i3 = 0;
-#endif
-    struct t_data *d = NULL;
-
-    MUTEX_LOCK(desc->q_mtx);
-    if (desc->write_buffered > 0) {
-	if ((d = async_write(desc, errp, 0, 0
-#ifdef USE_VM_PROBES
-			     ,&dt_i1, &dt_i2, &dt_i3
-#endif
-			     )) == NULL) {
-            result = -1;
-        }
-    }
-    MUTEX_UNLOCK(desc->q_mtx);
-#ifdef USE_VM_PROBES
-    if (d != NULL) {
-        d->sched_i1 = dt_priv->thread_num;
-        d->sched_i2 = dt_priv->tag;
-        d->sched_utag[0] = '\0';
-        if (dt_utag != NULL) {
-            if (dt_utag[0] == '\0') {
-                dt_utag = NULL;
-            } else {
-                strncpy(d->sched_utag, dt_utag, sizeof(d->sched_utag) - 1);
-                d->sched_utag[sizeof(d->sched_utag) - 1] = '\0';
-            }
-        }
-        DTRACE11(efile_drv_entry, dt_priv->thread_num, dt_priv->tag++,
-                 dt_utag, FILE_WRITE,
-                 NULL, NULL, dt_i1, dt_i2, dt_i3, 0, desc->port_str);
-    }
-#endif /* USE_VM_PROBES */
-    return result;
-}
-
-static int check_write_error(file_descriptor *desc, int *errp) {
-    if (desc->write_error) {
-	if (errp) *errp = desc->write_errInfo.posix_errno;
-	desc->write_error = 0;
-	return -1;
-    }
-    return 0;
-}
-
-static int flush_write_check_error(file_descriptor *desc, int *errp
-#ifdef USE_VM_PROBES
-                                   , dt_private *dt_priv, char *dt_utag
-#endif
-				   ) {
-    int r;
-    if ( (r = flush_write(desc, errp
-#ifdef USE_VM_PROBES
-			  , dt_priv, dt_utag
-#endif
-			  )) != 0) {
-	check_write_error(desc, NULL);
-	return r;
-    } else {
-	return check_write_error(desc, errp);
-    }
-}
-
-static struct t_data *async_lseek(file_descriptor *desc, int *errp, int reply,
-				  Sint64 offset, int origin
-#ifdef USE_VM_PROBES
-				  , Sint64 *dt_i1, Sint64 *dt_i2, Sint64 *dt_i3
-#endif
-				  ) {
-    struct t_data *d;
-    if (! (d = EF_ALLOC(sizeof(struct t_data)))) {
-	*errp = ENOMEM;
-	return NULL;
-    }
-    d->flags = desc->flags;
-    d->fd = desc->fd;
-    d->command = FILE_LSEEK;
-    d->reply = reply;
-    d->c.lseek.offset = offset;
-    d->c.lseek.origin = origin;
-#ifdef USE_VM_PROBES
-    if (dt_i1 != NULL) {
-        *dt_i1 = d->fd;
-        *dt_i2 = d->c.lseek.offset;
-        *dt_i3 = d->c.lseek.origin;
-    }
-#endif
-    d->invoke = invoke_lseek;
-    d->free = free_data;
-    d->level = 1;
-    cq_enq(desc, d);
-    return d;
-}
-
-static void flush_read(file_descriptor *desc) {
-    desc->read_offset = 0;
-    desc->read_size = 0;
-    if (desc->read_binp) {
-	driver_free_binary(desc->read_binp);
-	desc->read_binp = NULL;
-    }
-}
-
-static int lseek_flush_read(file_descriptor *desc, int *errp
-#ifdef USE_VM_PROBES
-			    ,dt_private *dt_priv, char *dt_utag
-#endif
-			    ) {
-    int r = 0;
-    size_t read_size = desc->read_size;
-#ifdef USE_VM_PROBES
-    Sint64 dt_i1 = 0, dt_i2 = 0, dt_i3 = 0;
-#endif
-    struct t_data *d;
-
-    flush_read(desc);
-    if (read_size != 0) {
-	if ((d = async_lseek(desc, errp, 0,
-                             -((ssize_t)read_size), EFILE_SEEK_CUR
-#ifdef USE_VM_PROBES
-			     , &dt_i1, &dt_i2, &dt_i3
-#endif
-			     )) == NULL) {
-            r = -1;
-        } else {
-#ifdef USE_VM_PROBES
-            d->sched_i1 = dt_priv->thread_num;
-            d->sched_i2 = dt_priv->tag;
-            d->sched_utag[0] = '\0';
-            if (dt_utag != NULL) {
-                if (dt_utag[0] == '\0') {
-                    dt_utag = NULL;
-                } else {
-                    strncpy(d->sched_utag, dt_utag, sizeof(d->sched_utag) - 1);
-                    d->sched_utag[sizeof(d->sched_utag) - 1] = '\0';
-                }
-            }
-            DTRACE11(efile_drv_entry, dt_priv->thread_num, dt_priv->tag++,
-                     dt_utag, FILE_LSEEK,
-                     NULL, NULL, dt_i1, dt_i2, dt_i3, 0, desc->port_str);
-#endif /* USE_VM_PROBES */
-        }
-    }
-    return r;
-}
-
-
-/*********************************************************************
- * Driver entry point -> stop
- * The close has to be scheduled on async thread, so that currently active
- * async operation does not suddenly have the ground disappearing under their feet...
- */
-static void 
-file_stop(ErlDrvData e)
-{
-    file_descriptor* desc = (file_descriptor*)e;
-
-    TRACE_C('p');
-
-    IF_THRDS {
-	flush_read(desc);
-	if (desc->fd != FILE_FD_INVALID) {
-	    struct t_data *d = EF_SAFE_ALLOC(sizeof(struct t_data));
-	    d->command = FILE_CLOSE_ON_PORT_EXIT;
-	    d->reply = !0;
-	    d->fd = desc->fd;
-	    d->flags = desc->flags;
-	    d->invoke = invoke_close;
-	    d->free = free_data;
-	    d->level = 2;
-	    d->data_to_free = (void *) desc;
-	    cq_enq(desc, d);
-	    desc->fd = FILE_FD_INVALID;
-	    desc->flags = 0;
-	    cq_execute(desc);
-	} else {
-	    EF_FREE(desc);
-	}
-    } else {
-	if (desc->fd != FILE_FD_INVALID) {
-	    do_close(desc->flags, desc->fd);
-	    desc->fd = FILE_FD_INVALID;
-	    desc->flags = 0;
-	}
-	if (desc->read_binp) {
-	    driver_free_binary(desc->read_binp);
-	}
-	EF_FREE(desc);
-    }
-}
-
-/*********************************************************************
- * Driver entry point -> ready_async
- */
-static void 
-file_async_ready(ErlDrvData e, ErlDrvThreadData data)
-{
-    file_descriptor *desc = (file_descriptor*)e;
-    struct t_data *d = (struct t_data *) data;
-    char header[5];		/* result code + count */
-    char resbuf[RESBUFSIZE];	/* Result buffer. */
-#ifdef  USE_VM_PROBES
-    int sched_i1 = d->sched_i1, sched_i2 = d->sched_i2, command = d->command,
-        result_ok = d->result_ok,
-        posix_errno = d->result_ok ? 0 : d->errInfo.posix_errno;
-    DTRACE_CHARBUF(sched_utag, DTRACE_EFILE_BUFSIZ+1);
-
-    sched_utag[0] = '\0';
-    if (DTRACE_ENABLED(efile_drv_return)) {
-        strncpy(sched_utag, d->sched_utag, DTRACE_EFILE_BUFSIZ);
-        sched_utag[DTRACE_EFILE_BUFSIZ] = '\0';
-    }
-#endif  /* USE_VM_PROBES */
-
-    TRACE_C('r');
-
-    if (try_again(desc, d)) {
-        /* DTRACE TODO: what kind of probe makes sense here? */
-	return;
-    }
-
-    switch (d->command)
-    {
-    case FILE_READ:
-	if (!d->result_ok) {
-	    reply_error(desc, &d->errInfo);
-	} else {
-	    size_t available_bytes = 
-		d->c.read.bin_offset + d->c.read.bin_size - desc->read_offset;
-	    if (available_bytes < d->c.read.size) {
-		d->c.read.size = available_bytes;
-	    }
-	    TRACE_C('D');
-	    reply_data(desc, d->c.read.binp, 
-		       desc->read_offset, d->c.read.size);
-	    desc->read_offset += d->c.read.size;
-	    desc->read_size = 
-		d->c.read.bin_offset + d->c.read.bin_size - desc->read_offset;
-	    try_free_read_bin(desc);
-	}
-	free_read(data);
-	break;
-      case FILE_READ_LINE:
-	  /* The read_line structure differs from the read structure.
-	     The data->read_offset and d->c.read_line.read_offset are copies, as are
-	     data->read_size and d->c.read_line.read_size
-             The read_line function does not kniow in advance how large the binary has to be,
-	     why new allocation (but not reallocation of the old binary, for obvious reasons) 
-	     may happen in the worker thread. */
-	if (!d->result_ok) {
-	    reply_error(desc, &d->errInfo);
-	} else {
-	    size_t len = d->c.read_line.nl_pos - d->c.read_line.read_offset;
-	    TRACE_C('L');
-	    reply_data(desc, d->c.read_line.binp, 
-		       d->c.read_line.read_offset, len);
-	    desc->read_offset = d->c.read_line.read_offset + d->c.read_line.nl_skip + len;
-	    desc->read_size = 
-		d->c.read_line.read_size - d->c.read_line.nl_skip - len;
-	    if (desc->read_binp != d->c.read_line.binp) { /* New binary allocated */
-		driver_free_binary(desc->read_binp);
-		desc->read_binp =  d->c.read_line.binp;
-		driver_binary_inc_refc(desc->read_binp);
-	    }
-#if !ALWAYS_READ_LINE_AHEAD
-	    ASSERT(desc->read_bufsize > 0 || desc->read_size == 0);
-	    if (desc->read_bufsize == 0) {
-		desc->read_offset = desc->read_binp->orig_size; /* triggers cleanup */
-	    }
-#endif
-	    try_free_read_bin(desc);
-	}
-	free_read_line(data);
-	break;
-      case FILE_READ_FILE:
-	if (!d->result_ok)
-	    reply_error(desc, &d->errInfo);
-	else {
-	    header[0] = FILE_RESP_ALL_DATA;
-	    TRACE_C('R');
-	    driver_output_binary(desc->port, header, 1,
-				 d->c.read_file.binp,
-				 0, d->c.read_file.offset);
-	}
-	free_read_file(data);
-	break;
-      case FILE_WRITE:
-	  if (d->reply) {
-	      if (! d->result_ok) {
-		  reply_error(desc, &d->errInfo);
-	      } else {
-		  reply_Uint(desc, d->c.writev.reply_size);
-	      }
-	  } else {
-	      if (! d->result_ok) {
-		  desc->write_error = !0;
-		  desc->write_errInfo = d->errInfo;
-	      }
-	  }
-	  free_data(data);
-	  break;
-      case FILE_LSEEK:
-	  if (d->reply) {
-	      if (d->result_ok)
-		  reply_Sint64(desc, d->c.lseek.location);
-	      else
-		  reply_error(desc, &d->errInfo);
-	  }
-	  free_data(data);
-	  break;
-      case FILE_MKDIR:
-      case FILE_RMDIR:
-      case FILE_CHDIR:
-      case FILE_DELETE:
-      case FILE_FDATASYNC:
-      case FILE_FSYNC:
-      case FILE_TRUNCATE:
-      case FILE_LINK:
-      case FILE_SYMLINK:
-      case FILE_RENAME:
-      case FILE_WRITE_INFO:
-      case FILE_FADVISE:
-      case FILE_FALLOCATE:
-	reply(desc, d->result_ok, &d->errInfo);
-	free_data(data);
-	break;
-      case FILE_ALTNAME:
-      case FILE_PWD:
-      case FILE_READLINK:
-        {
-	    int length;
-	    char *resbuf = d->b;
-
-	    if (!d->result_ok)
-		reply_error(desc, &d->errInfo);
-	    else {
-		resbuf[0] = FILE_RESP_FNAME;
-		length = 1+FILENAME_BYTELEN((char*) resbuf+1);
-		TRACE_C('R');
-		driver_output2(desc->port, resbuf, 1, resbuf+1, length-1);
-	    }
-	    free_data(data);
-	    break;
-	}
-      case FILE_OPEN:
-	if (!d->result_ok) {
-	    reply_error(desc, &d->errInfo);
-	} else {
-	    ASSERT(d->is_fd_unused);
-	    desc->fd = d->fd;
-	    desc->flags = d->flags;
-	    d->is_fd_unused = 0;
-	    reply_Uint(desc, d->fd);
-	}
-	free_data(data);
-	break;
-      case FILE_FSTAT:
-      case FILE_LSTAT:
-        {
-	    if (d->result_ok) {
-		resbuf[0] = FILE_RESP_INFO;
-
-		put_int32(d->info.size_high,         &resbuf[1 + ( 0 * 4)]);
-		put_int32(d->info.size_low,          &resbuf[1 + ( 1 * 4)]);
-		put_int32(d->info.type,              &resbuf[1 + ( 2 * 4)]);
-
-		/* Note 64 bit indexing in resbuf here */
-		put_int64(d->info.accessTime,        &resbuf[1 + ( 3 * 4)]);
-		put_int64(d->info.modifyTime,        &resbuf[1 + ( 5 * 4)]);
-		put_int64(d->info.cTime,             &resbuf[1 + ( 7 * 4)]);
-
-		put_int32(d->info.mode,              &resbuf[1 + ( 9 * 4)]);
-		put_int32(d->info.links,             &resbuf[1 + (10 * 4)]);
-		put_int32(d->info.major_device,      &resbuf[1 + (11 * 4)]);
-		put_int32(d->info.minor_device,      &resbuf[1 + (12 * 4)]);
-		put_int32(d->info.inode,             &resbuf[1 + (13 * 4)]);
-		put_int32(d->info.uid,               &resbuf[1 + (14 * 4)]);
-		put_int32(d->info.gid,               &resbuf[1 + (15 * 4)]);
-		put_int32(d->info.access,            &resbuf[1 + (16 * 4)]);
-
-#define RESULT_SIZE (1 + (17 * 4))
-		TRACE_C('R');
-		driver_output2(desc->port, resbuf, RESULT_SIZE, NULL, 0);
-#undef RESULT_SIZE
-	    } else
-		reply_error(desc, &d->errInfo);
-	}
-	free_data(data);
-	break;
-      case FILE_READDIR:
-	if (!d->result_ok) {
-	    reply_error(desc, &d->errInfo);
-	} else {
-	    struct t_readdir_buf *b1 = d->c.read_dir.first_buf;
-	    char   op = FILE_RESP_LFNAME;
-
-	    TRACE_C('R');
-	    ASSERT(b1);
-
-	    while (b1) {
-		struct t_readdir_buf *b2 = b1;
-		char *p = &b1->buf[0];
-		driver_output2(desc->port, p, 1, p + 1, b1->n - 1);
-		b1 = b1->next;
-		EF_FREE(b2);
-	    }
-	    driver_output2(desc->port, &op, 1, NULL, 0);
-    
-	    d->c.read_dir.first_buf = NULL;
-	    d->c.read_dir.last_buf = NULL;
-	}
-	free_readdir(data);
-	break;
-      case FILE_CLOSE:
-	  if (d->reply) {
-	      TRACE_C('K');
-	      reply_ok(desc);
-#ifdef USE_VM_PROBES
-              result_ok = 1;
-#endif
-	  }
-	  free_data(data);
-	  break;
-      case FILE_PWRITEV:
-	  if (!d->result_ok) {
-	      reply_Uint_error(desc, d->c.pwritev.cnt, &d->errInfo);
-	  } else {
-	      reply_Uint(desc, d->c.pwritev.n);
-	  }
-	  free_data(data);
-	  break;
-      case FILE_PREADV:
-	  if (!d->result_ok) {
-	      reply_error(desc, &d->errInfo);
-	  } else {
-	      reply_ev(desc, FILE_RESP_LDATA, &d->c.preadv.eiov);
-	  }
-	  free_preadv(data);
-	  break;
-      case FILE_IPREAD:
-	  if (!d->result_ok) {
-	      reply_error(desc, &d->errInfo);
-	  } else if (!d->c.preadv.eiov.vsize) {
-	      reply_eof(desc);
-	  } else {
-	      reply_ev(desc, FILE_RESP_N2DATA, &d->c.preadv.eiov);
-	  }
-	  free_preadv(data);
-	  break;
-#ifdef HAVE_SENDFILE
-      case FILE_SENDFILE:
-	  if (d->result_ok == -1) {
-	      if (d->errInfo.posix_errno == ECONNRESET ||
-		  d->errInfo.posix_errno == ENOTCONN ||
-		  d->errInfo.posix_errno == EPIPE)
-		  reply_string_error(desc,"closed");
-	      else
-		  reply_error(desc, &d->errInfo);
-	      desc->sendfile_state = not_sending;
-	      free_sendfile(data);
-	  } else if (d->result_ok == 0) {
-	      reply_Sint64(desc, d->c.sendfile.written);
-	      desc->sendfile_state = not_sending;
-	      free_sendfile(data);
-	  } else if (d->result_ok == 1) { /* If we are using select to send the rest of the data */
-	      desc->sendfile_state = sending;
-	      desc->d = d;
-	      driver_select(desc->port, (ErlDrvEvent)(long)d->c.sendfile.out_fd,
-			    ERL_DRV_USE|ERL_DRV_WRITE, 1);
-	  }
-	  break;
-#endif
-      case FILE_CLOSE_ON_PORT_EXIT:
-	  /* See file_stop. However this is never invoked after the port is killed. */
-	  free_data(data);
-	  desc = NULL;
-	  /* This is it for this port, so just send dtrace and return, avoid doing anything to the freed data */
-	  DTRACE6(efile_drv_return, sched_i1, sched_i2, sched_utag,
-		  command, result_ok, posix_errno);
-	  return;
-      default:
-	abort();
-    }
-    DTRACE6(efile_drv_return, sched_i1, sched_i2, sched_utag,
-            command, result_ok, posix_errno);
-    if (desc->write_buffered != 0 && desc->timer_state == timer_idle ) {
-	desc->timer_state = timer_write;
-	driver_set_timer(desc->port, desc->write_delay);
-    }
-    cq_execute(desc);
-
-}
-
-
-/*********************************************************************
- * Driver entry point -> output
- */
-static void 
-file_output(ErlDrvData e, char* buf, ErlDrvSizeT count)
-{
-    file_descriptor* desc = (file_descriptor*)e;
-    Efile_error errInfo;	/* The error codes for the last operation. */
-    Sint fd;			/* The file descriptor for this port, if any,
-				 * -1 if none.
-				 */
-    char* name;			/* Points to the filename in buf. */
-    int command;
-    struct t_data *d = NULL;
-#ifdef  USE_VM_PROBES
-    char *dt_utag = NULL;
-    char *dt_s1 = NULL, *dt_s2 = NULL;
-    Sint64 dt_i1 = 0;
-    Sint64 dt_i2 = 0;
-    Sint64 dt_i3 = 0;
-    Sint64 dt_i4 = 0;
-    dt_private *dt_priv = get_dt_private(0);
-#endif  /* USE_VM_PROBES */
-
-    TRACE_C('o');
-
-    fd  = desc->fd;
-    name = buf+1;
-    command = *(uchar*)buf++;
-
-    switch(command) {
-
-    case FILE_MKDIR:
-    {
-	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE);
-	
-	FILENAME_COPY(d->b, name);
-#ifdef USE_VM_PROBES
-	dt_s1 = d->b;
-	dt_utag = name + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE;
-#endif
-	d->command = command;
-	d->invoke = invoke_mkdir;
-	d->free = free_data;
-	d->level = 2;
-	goto done;
-    }
-    case FILE_RMDIR:
-    {
-	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE);
-	
-	FILENAME_COPY(d->b, name);
-#ifdef USE_VM_PROBES
-	dt_s1 = d->b;
-	dt_utag = name + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE;
-#endif
-	d->command = command;
-	d->invoke = invoke_rmdir;
-	d->free = free_data;
-	d->level = 2;
-	goto done;
-    }
-    case FILE_DELETE:
-    {
-	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE);
-	
-	FILENAME_COPY(d->b, name);
-#ifdef USE_VM_PROBES
-	dt_s1 = d->b;
-	dt_utag = name + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE;
-#endif
-	d->command = command;
-	d->invoke = invoke_delete_file;
-	d->free = free_data;
-	d->level = 2;
-	goto done;
-    }
-    case FILE_RENAME:
-	{
-	    char* new_name;
-	    int namelen = FILENAME_BYTELEN(name)+FILENAME_CHARSIZE;
-	    new_name = name+namelen;
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1
-			      + namelen
-			      + FILENAME_BYTELEN(new_name) + FILENAME_CHARSIZE);
-	
-	    FILENAME_COPY(d->b, name);
-	    FILENAME_COPY(d->b + namelen, new_name);
-#ifdef USE_VM_PROBES
-	    dt_s1 = d->b;
-	    dt_s2 = d->b + namelen;
-	    dt_utag = buf + namelen + FILENAME_BYTELEN(new_name) + FILENAME_CHARSIZE;
-#endif
-	    d->flags = desc->flags;
-	    d->fd = fd;
-	    d->command = command;
-	    d->invoke = invoke_rename;
-	    d->free = free_data;
-	    d->level = 2;
-	    goto done;
-	}
-    case FILE_CHDIR:
-    {
-	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE);
-	
-	FILENAME_COPY(d->b, name);
-#ifdef USE_VM_PROBES
-	dt_s1 = d->b;
-	dt_utag = name + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE;
-#endif
-	d->command = command;
-	d->invoke = invoke_chdir;
-	d->free = free_data;
-	d->level = 2;
-	goto done;
-    }
-    case FILE_PWD:
-        {
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + RESBUFSIZE + 1);
-	
-	    d->drive = *(uchar*)buf;
-#ifdef USE_VM_PROBES
-	    dt_utag = buf + 1;
-#endif
-	    d->command = command;
-	    d->invoke = invoke_pwd;
-	    d->free = free_data;
-	    d->level = 2;
-	    goto done;
-	}
-
-    case FILE_READDIR: 
-	if (sys_info.async_threads > 0)
-	{
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + 
-			      FILENAME_CHARSIZE);
-	
-	    FILENAME_COPY(d->b, name);
-#ifdef USE_VM_PROBES
-	    dt_s1 = d->b;
-	    dt_utag = name + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE;
-#endif
-	    d->dir_handle = NULL;
-	    d->command = command;
-	    d->invoke = invoke_readdir;
-	    d->free = free_readdir;
-	    d->level = 2;
-	    d->c.read_dir.first_buf = NULL;
-	    d->c.read_dir.last_buf = NULL;
-	    goto done;
-	}
-	else   
-	{
-	    size_t resbufsize;
-	    size_t n = 0, total = 0;
-	    int res = 0;
-	    char resbuf[READDIR_BUFSIZE];
-
-	    EFILE_DIR_HANDLE dir_handle; /* Handle to open directory. */
-
-	    total               = READDIR_BUFSIZE;
-	    errInfo.posix_errno = 0;
-	    dir_handle          = NULL;
-	    resbuf[0]           = FILE_RESP_LFNAME;
-
-#ifdef USE_VM_PROBES
-	    dt_s1 = name;
-	    dt_utag = name + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE;
-#endif
-	    /* Fill the buffer with multiple directory listings before sending it to the
-	     * receiving process. READDIR_CHUNKS is minimum number of files sent to the
-	     * receiver.
-	     * Format for each driver_output2:
-	     * ------------------------------------
-	     * | Type   | Len     | Filename  | ...
-	     * | 1 byte | 2 bytes | Len bytes | ...
-	     * ------------------------------------
-	     */
-
-	    do {
-		n = 1;
-		resbufsize = READDIR_BUFSIZE - n;
-
-		do {
-		    res = efile_readdir(&errInfo, name, &dir_handle, resbuf + n + 2, &resbufsize);
-
-		    if (res) {
-			put_int16((Uint16)resbufsize, resbuf + n);
-			n += 2 + resbufsize;
-			resbufsize = READDIR_BUFSIZE - n;
-		    }
-		} while( res && ((total - n - 2) >= MAXPATHLEN*FILENAME_CHARSIZE));
-
-		if (n > 1) {
-		    driver_output2(desc->port, resbuf, 1, resbuf + 1, n - 1);
-		}
-	    } while(res);
-
-	    if (errInfo.posix_errno != 0) {
-		reply_error(desc, &errInfo);
-		return;
-	    }
-#ifdef USE_VM_PROBES
-	    if (dt_utag != NULL && dt_utag[0] == '\0') {
-                dt_utag = NULL;
-            } 
-
-	    DTRACE11(efile_drv_entry, dt_priv->thread_num, dt_priv->tag,
-		     dt_utag, command, name, dt_s2,
-		     dt_i1, dt_i2, dt_i3, dt_i4, desc->port_str);
-	    DTRACE6(efile_drv_return, dt_priv->thread_num, dt_priv->tag++, 
-		    dt_utag, command, 1, 0);
-#endif
-	    TRACE_C('R');
-	    driver_output2(desc->port, resbuf, 1, NULL, 0);
-	    return;
-	}
-    case FILE_OPEN:
-	{
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(buf+4) + 
-			      FILENAME_CHARSIZE);
-	
-	    d->flags = get_int32((uchar*)buf);
-	    name = buf+4;
-	    FILENAME_COPY(d->b, name);
-#ifdef USE_VM_PROBES
-	    dt_i1 = d->flags;
-	    dt_s1 = d->b;
-	    dt_utag = name + FILENAME_BYTELEN(d->b) + FILENAME_CHARSIZE;
-#endif
-	    d->command = command;
-	    d->invoke = invoke_open;
-	    d->free = free_data;
-	    d->level = 2;
-	    d->is_fd_unused = 1;
-	    goto done;
-	}
-
-    case FILE_FDATASYNC:
-	{
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data));
-	    
-	    d->fd = fd;
-#ifdef USE_VM_PROBES
-	    dt_utag = name;
-	    dt_i1 = fd;
-#endif
-	    d->command = command;
-	    d->invoke = invoke_fdatasync;
-	    d->free = free_data;
-	    d->level = 2;
-	    goto done;
-	}
-
-    case FILE_FSYNC:
-	{
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data));
-	    
-	    d->fd = fd;
-#ifdef USE_VM_PROBES
-	    dt_utag = name;
-	    dt_i1 = fd;
-#endif
-	    d->command = command;
-	    d->invoke = invoke_fsync;
-	    d->free = free_data;
-	    d->level = 2;
-	    goto done;
-	}
-
-
-    case FILE_FSTAT: 
-    case FILE_LSTAT:
-	{
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + 
-			      FILENAME_CHARSIZE);
-	    
-	    FILENAME_COPY(d->b, name);
-	    d->fd = fd;
-#ifdef USE_VM_PROBES
-	    dt_utag = name + FILENAME_BYTELEN(d->b) + FILENAME_CHARSIZE;
-	    if (command == FILE_LSTAT) {
-		dt_s1 = d->b;
-	    } else {
-		dt_i1 = fd;
-	    }
-#endif
-	    d->command = command;
-	    d->invoke = invoke_flstat;
-	    d->free = free_data;
-	    d->level = 2;
-	    goto done;
-	}
-	
-    case FILE_TRUNCATE:
-        {
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data));
-	    
-	    d->flags = desc->flags;
-	    d->fd = fd;
-#ifdef USE_VM_PROBES
-	    dt_utag = name;
-	    dt_i1 = fd;
-	    dt_i2 = d->flags;
-#endif
-	    d->command = command;
-	    d->invoke = invoke_truncate;
-	    d->free = free_data;
-	    d->level = 2;
-	    goto done;
-	}
-
-    case FILE_WRITE_INFO:
-	{
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1
-			      + FILENAME_BYTELEN(buf + 9*4) + FILENAME_CHARSIZE);
-	    
-	    d->info.mode       = get_int32(buf + 0 * 4);
-	    d->info.uid        = get_int32(buf + 1 * 4);
-	    d->info.gid        = get_int32(buf + 2 * 4);
-	    d->info.accessTime = get_int64(buf + 3 * 4);
-	    d->info.modifyTime = get_int64(buf + 5 * 4);
-	    d->info.cTime      = get_int64(buf + 7 * 4);
-
-	    FILENAME_COPY(d->b, buf + 9*4);
-#ifdef USE_VM_PROBES
-	    dt_i1              = d->info.mode;
-	    dt_i2              = d->info.uid;
-	    dt_i3              = d->info.gid;
-	    dt_s1 = d->b;
-	    dt_utag = buf + 9 * 4 + FILENAME_BYTELEN(d->b) + FILENAME_CHARSIZE;
-#endif
-	    d->command = command;
-	    d->invoke = invoke_write_info;
-	    d->free = free_data;
-	    d->level = 2;
-	    goto done;
-	}
-
-    case FILE_READLINK:
-	{
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + 
-			      MAX(RESBUFSIZE, (FILENAME_BYTELEN(name) +  
-					       FILENAME_CHARSIZE))  + 1);
-	    FILENAME_COPY(d->b, name);
-#ifdef USE_VM_PROBES
-	    dt_s1 = d->b;
-	    dt_utag = name + FILENAME_BYTELEN(d->b) + FILENAME_CHARSIZE;
-#endif
-	    d->command = command;
-	    d->invoke = invoke_readlink;
-	    d->free = free_data;
-	    d->level = 2;
-	    goto done;
-	}
-
-    case FILE_ALTNAME:
-	{
-	     d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + 
-			       MAX(RESBUFSIZE, (FILENAME_BYTELEN(name) +  
-						FILENAME_CHARSIZE))  + 1);
-	    FILENAME_COPY(d->b, name);
-#ifdef USE_VM_PROBES
-	    dt_s1 = d->b;
-	    dt_utag = name + FILENAME_BYTELEN(d->b) + FILENAME_CHARSIZE;
-#endif
-	    d->command = command;
-	    d->invoke = invoke_altname;
-	    d->free = free_data;
-	    d->level = 2;
-	    goto done;
-	}
-
-
-    case FILE_LINK:
-	{
-	    char* new_name;
-	    int namelen = FILENAME_BYTELEN(name) + FILENAME_CHARSIZE;
-
-	    new_name = name+namelen;
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1
-			      + namelen
-			      + FILENAME_BYTELEN(new_name) + FILENAME_CHARSIZE);
-	
-	    FILENAME_COPY(d->b, name);
-	    FILENAME_COPY(d->b + namelen, new_name);
-#ifdef USE_VM_PROBES
-	    dt_s1 = d->b;
-	    dt_s2 = d->b + namelen;
-	    dt_utag = buf + namelen + FILENAME_BYTELEN(dt_s2) + FILENAME_CHARSIZE;
-#endif
-	    d->flags = desc->flags;
-	    d->fd = fd;
-	    d->command = command;
-	    d->invoke = invoke_link;
-	    d->free = free_data;
-	    d->level = 2;
-	    goto done;
-	}
-
-    case FILE_SYMLINK:
-	{
-	    char* new_name;
-	    int namelen = FILENAME_BYTELEN(name) + FILENAME_CHARSIZE;
-
-	    new_name = name+namelen;
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1
-			      + namelen
-			      + FILENAME_BYTELEN(new_name) + FILENAME_CHARSIZE);
-	
-	    FILENAME_COPY(d->b, name);
-	    FILENAME_COPY(d->b + namelen, new_name);
-#ifdef USE_VM_PROBES
-	    dt_s1 = d->b;
-	    dt_s2 = d->b + namelen;
-	    dt_utag = buf + namelen + FILENAME_BYTELEN(dt_s2) + FILENAME_CHARSIZE;
-#endif
-	    d->flags = desc->flags;
-	    d->fd = fd;
-	    d->command = command;
-	    d->invoke = invoke_symlink;
-	    d->free = free_data;
-	    d->level = 2;
-	    goto done;
-	}
-
-    case FILE_FADVISE:
-    {
-        d = EF_SAFE_ALLOC(sizeof(struct t_data));
-
-        d->fd = fd;
-        d->command = command;
-        d->invoke = invoke_fadvise;
-        d->free = free_data;
-        d->level = 2;
-        d->c.fadvise.offset = get_int64((uchar*) buf);
-        d->c.fadvise.length = get_int64(((uchar*) buf) + sizeof(Sint64));
-        d->c.fadvise.advise = get_int32(((uchar*) buf) + 2 * sizeof(Sint64));
-#ifdef USE_VM_PROBES
-        dt_i1 = d->fd;
-        dt_i2 = d->c.fadvise.offset;
-        dt_i3 = d->c.fadvise.length;
-        dt_i4 = d->c.fadvise.advise;
-        dt_utag = buf + 3 * sizeof(Sint64);
-#endif
-        goto done;
-    }
-
-    case FILE_FALLOCATE:
-    {
-        d = EF_SAFE_ALLOC(sizeof(struct t_data));
-
-        d->fd = fd;
-        d->command = command;
-        d->invoke = invoke_fallocate;
-        d->free = free_data;
-        d->level = 2;
-        d->c.fallocate.offset = get_int64((uchar*) buf);
-        d->c.fallocate.length = get_int64(((uchar*) buf) + sizeof(Sint64));
-        goto done;
-    }
-
-    }
-
-    /*
-     * Ignore anything else -- let the caller hang.
-     */
-     
-    return;
-
- done:
-    if (d) {
-#ifdef USE_VM_PROBES
-	d->sched_i1 = dt_priv->thread_num;
-	d->sched_i2 = dt_priv->tag;
-	d->sched_utag[0] = '\0';
-	if (dt_utag != NULL) {
-	    if (dt_utag[0] == '\0') {
-		dt_utag = NULL;
-	    } else {
-		strncpy(d->sched_utag, dt_utag, sizeof(d->sched_utag) - 1);
-		d->sched_utag[sizeof(d->sched_utag) - 1] = '\0';
-	    }
-	}
-	DTRACE11(efile_drv_entry, dt_priv->thread_num, dt_priv->tag++,
-		 dt_utag, command, dt_s1, dt_s2,
-		 dt_i1, dt_i2, dt_i3, dt_i4, desc->port_str);
-#endif
-	cq_enq(desc, d);
-    }
-}
-
-/*********************************************************************
- * Driver entry point -> flush
- */
-static void 
-file_flush(ErlDrvData e) {
-    file_descriptor *desc = (file_descriptor *)e;
-#ifdef DEBUG
-    int r;
-#endif
-#ifdef  USE_VM_PROBES
-    dt_private *dt_priv = get_dt_private(dt_driver_io_worker_base);
-#endif
-
-    TRACE_C('f');
-
-#ifdef HAVE_SENDFILE
-    flush_sendfile(desc, NULL);
-#endif
-
-#ifdef DEBUG
-    r = 
-#endif
-         flush_write(desc, NULL
-#ifdef USE_VM_PROBES
-		     , dt_priv, (desc->d == NULL) ? NULL : desc->d->sched_utag
-#endif
-		     );
-    /* Only possible reason for bad return value is ENOMEM, and 
-     * there is nobody to tell...
-     */
-#ifdef DEBUG
-    ASSERT(r == 0); 
-#endif
-    cq_execute(desc);
-}
-
-
-
-/*********************************************************************
- * Driver entry point -> control
- * Only debug functionality...
- */
-static ErlDrvSSizeT
-file_control(ErlDrvData e, unsigned int command, 
-	     char* buf, ErlDrvSizeT len, char **rbuf, ErlDrvSizeT rlen) {
-    file_descriptor *desc = (file_descriptor *)e;
-    switch (command) {
-    case 'K' :
-	if (rlen < 4) {
-	    *rbuf = EF_ALLOC(4);
-	}
-	(*rbuf)[0] = ((desc->key) >> 24) & 0xFF;
-	(*rbuf)[1] = ((desc->key) >> 16) & 0xFF;
-	(*rbuf)[2] = ((desc->key) >> 8) & 0xFF;
-	(*rbuf)[3] = (desc->key) & 0xFF;
-	return 4;
-    default:
-	return 0;
-    }
-}
-
-/*********************************************************************
- * Driver entry point -> timeout
- */
-static void 
-file_timeout(ErlDrvData e) {
-    file_descriptor *desc = (file_descriptor *)e;
-    enum e_timer timer_state = desc->timer_state;
-#ifdef  USE_VM_PROBES
-    dt_private *dt_priv = get_dt_private(dt_driver_io_worker_base);
-#endif
-
-    TRACE_C('t');
-
-    desc->timer_state = timer_idle;
-    switch (timer_state) {
-    case timer_idle:
-	ASSERT(0);
-	break;
-    case timer_again:
-	ASSERT(desc->invoke);
-	ASSERT(desc->free);
-	driver_async(desc->port, KEY(desc), desc->invoke, desc->d, desc->free);
-	break;
-    case timer_write: {
-#ifdef DEBUG
-	int r = 
-#endif
-	         flush_write(desc, NULL
-#ifdef USE_VM_PROBES
-			     , dt_priv, (desc->d == NULL) ? NULL : desc->d->sched_utag
-#endif
-			     );
-	/* Only possible reason for bad return value is ENOMEM, and 
-	 * there is nobody to tell...
-	 */
-	ASSERT(r == 0); 
-	cq_execute(desc);
-    } break;
-    } /* case */
-}
-
-
-
-/*********************************************************************
- * Driver entry point -> outputv
- */
-static void 
-file_outputv(ErlDrvData e, ErlIOVec *ev) {
-    file_descriptor* desc = (file_descriptor*)e;
-    char command;
-    size_t p, q;
-    int err;
-    struct t_data *d = NULL;
-#ifdef USE_VM_PROBES
-    Sint64 dt_i1 = 0, dt_i2 = 0, dt_i3 = 0;
-    Sint64 dt_i4 = 0;
-    char *dt_utag = NULL;
-    char *dt_s1 = NULL;
-    dt_private *dt_priv = get_dt_private(dt_driver_io_worker_base);
-#endif
-
-    TRACE_C('v');
-
-    p = 0; q = 1;
-    if (! EV_GET_CHAR(ev, &command, &p, &q)) {
-	/* Empty command */
-	reply_posix_error(desc, EINVAL);
-	goto done;
-    }
-    /* 'command' contains the decoded command number,
-     * 'p' and 'q' point out the next byte in the command:
-     * ((char *)ev->iov[q].iov_base) + p;
-     */
-    
-    TRACE_F(("%i", (int) command));
-
-    switch (command) {
-
-    case FILE_CLOSE: {
-#ifdef USE_VM_PROBES
-	dt_utag = EV_CHAR_P(ev, p, q);
-#endif
-	flush_read(desc);
-	if (flush_write_check_error(desc, &err
-#ifdef USE_VM_PROBES
-				    , dt_priv, dt_utag
-#endif
-				    ) < 0) {
-	    reply_posix_error(desc, err);
-	    goto done;
-	}
-	if (desc->fd != FILE_FD_INVALID) {
-	    if (! (d = EF_ALLOC(sizeof(struct t_data)))) {
-		reply_posix_error(desc, ENOMEM);
-	    } else {
-		d->command = command;
-		d->reply = !0;
-		d->fd = desc->fd;
-		d->flags = desc->flags;
-#ifdef USE_VM_PROBES
-		dt_i1 = d->fd;
-		dt_i2 = d->flags;
-#endif
-		d->invoke = invoke_close;
-		d->free = free_data;
-		d->level = 2;
-		cq_enq(desc, d);
-		desc->fd = FILE_FD_INVALID;
-		desc->flags = 0;
-	    }
-	} else {
-	    reply_posix_error(desc, EBADF);
-	}
-    } goto done;
-
-    case FILE_READ: {
-	Uint32 sizeH, sizeL;
-	size_t size, alloc_size;
-
-	if (!EV_GET_UINT32(ev, &sizeH, &p, &q)
-	    || !EV_GET_UINT32(ev, &sizeL, &p, &q)) {
-	    /* Wrong buffer length to contain the read count */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-#ifdef USE_VM_PROBES
-	dt_utag = EV_CHAR_P(ev, p, q);
-#endif
-	if (flush_write_check_error(desc, &err
-#ifdef USE_VM_PROBES
-				    , dt_priv, dt_utag
-#endif
-				    ) < 0) {
-	    reply_posix_error(desc, err);
-	    goto done;
-	}
-#if ALWAYS_READ_LINE_AHEAD
-	if (desc->read_bufsize == 0 && desc->read_binp != NULL && desc->read_size > 0) {
-	    /* We have allocated a buffer for line mode but should not really have a 
-	       read-ahead buffer... */
-	    if (lseek_flush_read(desc, &err
-#ifdef USE_VM_PROBES
-				 , dt_priv, dt_utag
-#endif
-				 ) < 0) {
-		reply_posix_error(desc, err);
-		goto done;
-	    }
-	}
-#endif
-#if SIZEOF_SIZE_T == 4
-	if (sizeH != 0) {
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-	size = sizeL;
-#else
-	size = ((size_t)sizeH << 32) | sizeL;
-#endif
-	if ((desc->fd == FILE_FD_INVALID)
-	    || (! (desc->flags & EFILE_MODE_READ)) ) {
-	    reply_posix_error(desc, EBADF);
-	    goto done;
-	}
-	if (size == 0) {
-	    reply_buf(desc, &command, 0);
-	    goto done;
-	}
-	if (desc->read_size >= size) {
-	    /* We already have all data */
-	    TRACE_C('D');
-	    reply_data(desc, desc->read_binp, desc->read_offset, size);
-	    desc->read_offset += size;
-	    desc->read_size -= size;
-	    try_free_read_bin(desc);
-	    goto done;
-	}
-	/* We may have some of the data 
-	 */
-	/* Justification for the following strange formula:
-	 * If the read request is for such a large block as more than 
-	 * half the buffer size it may lead to a lot of unnecessary copying, 
-	 * since the tail of the old buffer is copied to the head of the
-	 * new, and if the tail is almost half the buffer it is a lot
-	 * to copy. Therefore allocate the exact amount needed in 
-	 * this case, giving no lingering tail. */
-	alloc_size = 
-	    size > (desc->read_bufsize>>1) ? 
-	    size : desc->read_bufsize;
-	if (! desc->read_binp) {
-	    /* Need to allocate a new binary for the result */
-	    if (! (desc->read_binp = driver_alloc_binary(alloc_size))) {
-		reply_posix_error(desc, ENOMEM);
-		goto done;
-	    }
-	} else {
-	    /* We already have a buffer */
-	    if (desc->read_binp->orig_size - desc->read_offset < size) {
-		/* Need to allocate a new binary for the result */
-		ErlDrvBinary *binp;
-		if (! (binp = driver_alloc_binary(alloc_size))) {
-		    reply_posix_error(desc, ENOMEM);
-		    goto done;
-		}
-		/* Move data we already have to the new binary */
-		sys_memcpy(binp->orig_bytes, 
-			   desc->read_binp->orig_bytes + desc->read_offset,
-			   desc->read_size);
-		driver_free_binary(desc->read_binp);
-		desc->read_offset = 0;
-		desc->read_binp = binp;
-	    }
-	} 
-	if (! (d = EF_ALLOC(sizeof(struct t_data)))) {
-	    reply_posix_error(desc, ENOMEM);
-	    goto done;
-	}
-	d->command = command;
-	d->reply = !0;
-	d->fd = desc->fd;
-	d->flags = desc->flags;
-	d->c.read.binp = desc->read_binp;
-	d->c.read.bin_offset = desc->read_offset + desc->read_size;
-	d->c.read.bin_size = desc->read_binp->orig_size - d->c.read.bin_offset;
-	d->c.read.size = size;
-#ifdef USE_VM_PROBES
-	dt_i1 = d->fd;
-	dt_i2 = d->flags;
-	dt_i3 = d->c.read.size;
-#endif
-	driver_binary_inc_refc(d->c.read.binp);
-	d->invoke = invoke_read;
-	d->free = free_read;
-	d->level = 1;
-	cq_enq(desc, d);
-    } goto done; /* case FILE_READ: */
-
-    case FILE_READ_LINE: {
-	/*
-	 * Icky little creature... We do mostly as ordinary file read, but with a few differences.
-	 * 1) We have to scan for proper newline sequence if there is a buffer already, we cannot know 
-	 *    in advance if the buffer contains a whole line without scanning.
-	 * 2) We do not know how large the buffer needs to be in advance. We give a default buffer,
-	 *    but the worker may need to allocate a new one. Freeing the old and rereferencing a newly 
-	 *    allocated binary + dealing with offsets and lengts are done in file_async ready
-	 *    for this OP.
-	 */
-#ifdef USE_VM_PROBES
-	dt_utag = EV_CHAR_P(ev, p, q);
-#endif
-	if (flush_write_check_error(desc, &err
-#ifdef USE_VM_PROBES
-				    , dt_priv, dt_utag
-#endif
-				    ) < 0) {
-	    reply_posix_error(desc, err);
-	    goto done;
-	}
-	if (ev->size != 1
-#ifdef USE_VM_PROBES
-	    + FILENAME_BYTELEN(dt_utag) + FILENAME_CHARSIZE
-#endif
-	    ) {
-	    /* Wrong command length */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-	if ((desc->fd == FILE_FD_INVALID)
-	    || (! (desc->flags & EFILE_MODE_READ)) ) {
-	    reply_posix_error(desc, EBADF);
-	    goto done;
-	}
-	if (desc->read_size > 0) {
-	    /* look for '\n' in what we'we already got */
-	    void *nl_ptr = memchr(desc->read_binp->orig_bytes + desc->read_offset,'\n',desc->read_size);
-	    if (nl_ptr != NULL) {
-		/* If found, we're done */
-		int skip = 0;
-		size_t size = ((char *) nl_ptr) - 
-		    ((char *) (desc->read_binp->orig_bytes + desc->read_offset)) + 1;
-		if (size > 1 &&
-		    *(((char *) nl_ptr) - 1) == '\r') {
-		    *(((char *) nl_ptr) - 1) = '\n';		    
-		    skip = 1;
-		    --size;
-		} 
-		reply_data(desc, desc->read_binp, desc->read_offset, size);
-		desc->read_offset += (size + skip);
-		desc->read_size -= (size + skip);
-		try_free_read_bin(desc);
-		goto done;
-	    }
-	}
-	/* Now, it's up to the thread to work out the need for more buffers and such, it's
-	   no use doing it in this thread as we do not have the information required anyway. 
-	   Even a NULL buffer could be handled by the thread, but code is simplified by us 
-	   allocating it */
-	if (! desc->read_binp) {
-	    int alloc_size = (desc->read_bufsize > DEFAULT_LINEBUF_SIZE) ? desc->read_bufsize : 
-		DEFAULT_LINEBUF_SIZE;
-	    /* Allocate a new binary for the result */
-	    if (! (desc->read_binp = driver_alloc_binary(alloc_size))) {
-		reply_posix_error(desc, ENOMEM);
-		goto done;
-	    }
-	}	
-	if (! (d = EF_ALLOC(sizeof(struct t_data)))) {
-	    reply_posix_error(desc, ENOMEM);
-	    goto done;
-	}
-
-	d->command = command;
-	d->reply = !0;
-	d->fd = desc->fd;
-	d->flags = desc->flags;
-	d->c.read_line.binp = desc->read_binp;
-	d->c.read_line.read_offset = desc->read_offset;
-	d->c.read_line.read_size = desc->read_size;
-#ifdef USE_VM_PROBES
-	dt_i1 = d->fd;
-	dt_i2 = d->flags;
-	dt_i3 = d->c.read_line.read_offset;
-#endif
-#if !ALWAYS_READ_LINE_AHEAD
-	d->c.read_line.read_ahead = (desc->read_bufsize > 0);
-#ifdef USE_VM_PROBES
-	dt_i4 = d->c.read_line.read_ahead;
-#endif
-#endif 
-	driver_binary_inc_refc(d->c.read.binp);
-	d->invoke = invoke_read_line;
-	d->free = free_read_line;
-	d->level = 1;
-	cq_enq(desc, d);
-    } goto done;
-    case FILE_WRITE: { /* Dtrace: The dtrace user tag is not last in message, 
-			  but follows the message tag directly. 
-			  This is handled specially in prim_file.erl */
-	ErlDrvSizeT skip = 1;
-	ErlDrvSizeT size = ev->size - skip;
-
-#ifdef USE_VM_PROBES
-	dt_utag = EV_CHAR_P(ev, p, q);
-	skip += FILENAME_BYTELEN(dt_utag) + FILENAME_CHARSIZE;
-	size = ev->size - skip;
-#endif
-	if (lseek_flush_read(desc, &err
-#ifdef USE_VM_PROBES
-			     , dt_priv, dt_utag
-#endif
-			     ) < 0) {
-	    reply_posix_error(desc, err);
-	    goto done;
-	}
-	if (! (desc->flags & EFILE_MODE_WRITE)) {
-	    reply_posix_error(desc, EBADF);
-	    goto done;
-	}
-	if (size == 0) {
-	    reply_Uint(desc, size);
-	    goto done;
-	}
-	MUTEX_LOCK(desc->q_mtx);
-	if (driver_enqv(desc->port, ev, skip)) {
-	    MUTEX_UNLOCK(desc->q_mtx);
-	    reply_posix_error(desc, ENOMEM);
-	    goto done;
-	}
-	desc->write_buffered += size;
-	if (desc->write_buffered < desc->write_bufsize) {
-	    MUTEX_UNLOCK(desc->q_mtx);
-	    reply_Uint(desc, size);
-	    if (desc->timer_state == timer_idle) {
-		desc->timer_state = timer_write;
-		driver_set_timer(desc->port, desc->write_delay);
-	    }
-	} else {
-	    if ((d = async_write(desc, &err, !0, size
-#ifdef USE_VM_PROBES
-				 , &dt_i1, &dt_i2, &dt_i3
-#endif
-				 )) == NULL) {
-		MUTEX_UNLOCK(desc->q_mtx);
-		reply_posix_error(desc, err);
-		goto done;
-	    } else {
-		MUTEX_UNLOCK(desc->q_mtx);
-	    }
-	}
-    } goto done; /* case FILE_WRITE */
-
-    case FILE_PWRITEV: { /* Dtrace: The dtrace user tag is not last in message, 
-			   but follows the message tag directly. 
-			   This is handled specially in prim_file.erl */
-	Uint32 i, j, n; 
-	size_t total;
-#ifdef USE_VM_PROBES
-	char dt_tmp;
-	int dt_utag_bytes = 1;
-
-	dt_utag = EV_CHAR_P(ev, p, q);
-	/* This will work for UTF-8, but not for UTF-16 - extra reminder here */
-#ifdef FILENAMES_16BIT 
-#error 16bit characters in filenames and dtrace in combination is not supported.
-#endif
-	while (EV_GET_CHAR(ev, &dt_tmp, &p, &q) && dt_tmp != '\0') {
-	    dt_utag_bytes++;
-	}
-#endif
-	if (ev->size < 1+4
-#ifdef USE_VM_PROBES
-	    + dt_utag_bytes
-#endif
-	    || !EV_GET_UINT32(ev, &n, &p, &q)) {
-	    /* Buffer too short to contain even the number of pos/size specs */
-	    reply_Uint_posix_error(desc, 0, EINVAL);
-	    goto done;
-	}
-	if (lseek_flush_read(desc, &err
-#ifdef USE_VM_PROBES
-			     , dt_priv, dt_utag
-#endif
-			     ) < 0) {
-	    reply_Uint_posix_error(desc, 0, err);
-	    goto done;
-	}
-	if (flush_write_check_error(desc, &err
-#ifdef USE_VM_PROBES
-				    , dt_priv, dt_utag
-#endif
-				    ) < 0) {
-	    reply_Uint_posix_error(desc, 0, err);
-	    goto done;
-	}
-	if (n == 0) {
-	    /* Trivial case - nothing to write */
-	    if (ev->size != 1+4) {
-		reply_posix_error(desc, err);
-	    } else {
-		reply_Uint(desc, 0);
-	    }
-	    goto done;
-	}
-	if (ev->size < 1+4+8*(2*n)
-#ifdef USE_VM_PROBES
-	    + dt_utag_bytes
-#endif
-	    ) {
-	    /* Buffer too short to contain even the pos/size specs */
-	    reply_Uint_posix_error(desc, 0, EINVAL);
-	    goto done;
-	}
-	d = EF_ALLOC(sizeof(struct t_data) 
-		     + (n * sizeof(struct t_pbuf_spec)));
-	if (! d) {
-	    reply_Uint_posix_error(desc, 0, ENOMEM);
-	    goto done;
-	}
-	d->command = command;
-	d->reply = !0;
-	d->fd = desc->fd;
-	d->flags = desc->flags;
-#ifdef USE_VM_PROBES
-	dt_i1 = d->fd;
-	dt_i2 = d->flags;
-#endif
-	d->c.pwritev.port = desc->port;
-	d->c.pwritev.q_mtx = desc->q_mtx;
-	d->c.pwritev.n = n;
-	d->c.pwritev.cnt = 0;
-	total = 0;
-	j = 0;
-	/* Create pos/size specs in the thread data structure
-	 * for all non-zero size binaries. Calculate total size.
-	 */
-	for(i = 0; i < n; i++) {
-	    Uint32 sizeH, sizeL;
-	    size_t size;
-	    if (   !EV_GET_SINT64(ev, &d->c.pwritev.specs[i].offset, &p, &q)
-		|| !EV_GET_UINT32(ev, &sizeH, &p, &q)
-		|| !EV_GET_UINT32(ev, &sizeL, &p, &q)) {
-		/* Misalignment in buffer */
-		reply_Uint_posix_error(desc, 0, EINVAL);
-		EF_FREE(d);
-		goto done;
-	    }
-#if SIZEOF_SIZE_T == 4
-	    if (sizeH != 0) {
-		reply_Uint_posix_error(desc, 0, EINVAL);
-		EF_FREE(d);
-		goto done;
-	    }
-	    size = sizeL;
-#else
-	    size = ((size_t)sizeH<<32) | sizeL;
-#endif
-	    if (size > 0) {
-		total += size;
-		d->c.pwritev.specs[j].size = size;
-		j++;
-	    }
-	}
-	d->c.pwritev.size = total;
-#ifdef USE_VM_PROBES
-	dt_i3 = d->c.pwritev.size;
-#endif
-	if (j == 0) {
-	    /* Trivial case - nothing to write */
-	    EF_FREE(d);
-	    reply_Uint(desc, 0);
-	} else {
-	    ErlDrvSizeT skip = 1 + 4 + 8 * (2*n) 
-#ifdef USE_VM_PROBES
-		+ dt_utag_bytes
-#endif
-		;
-	    if (skip + total != ev->size) {
-		/* Actual amount of data does not match 
-		 * total of all pos/size specs
-		 */
-		EF_FREE(d);
-		reply_Uint_posix_error(desc, 0, EINVAL);
-	    } else {
-		/* Enqueue the data */
-		MUTEX_LOCK(desc->q_mtx);
-		driver_enqv(desc->port, ev, skip);
-		MUTEX_UNLOCK(desc->q_mtx);
-		/* Execute the command */
-		d->invoke = invoke_pwritev;
-		d->free = free_data;
-		d->level = 1;
-		cq_enq(desc, d);
-	    }
-	}
-    } goto done; /* case FILE_PWRITEV: */
-
-    case FILE_PREADV: { /* Dtrace: The dtrace user tag is not last in message, 
-			   but follows the message tag directly. 
-			   This is handled specially in prim_file.erl */
-	register void * void_ptr;
-	Uint32 i, n;
-	ErlIOVec *res_ev;
-#ifdef USE_VM_PROBES
-	char dt_tmp;
-	int dt_utag_bytes = 1;
-	/* This will work for UTF-8, but not for UTF-16 - extra reminder here */
-#ifdef FILENAMES_16BIT 
-#error 16bit characters in filenames and dtrace in combination is not supported.
-#endif
-	dt_utag = EV_CHAR_P(ev, p, q);
-	while (EV_GET_CHAR(ev, &dt_tmp, &p, &q) && dt_tmp != '\0') {
-	    dt_utag_bytes++;
-	}
-#endif
-	if (lseek_flush_read(desc, &err
-#ifdef USE_VM_PROBES
-			     , dt_priv, dt_utag
-#endif
-			     ) < 0) {
-	    reply_posix_error(desc, err);
-	    goto done;
-	}
-	if (flush_write_check_error(desc, &err
-#ifdef USE_VM_PROBES
-				    , dt_priv, dt_utag
-#endif
-				    ) < 0) {
-	    reply_posix_error(desc, err);
-	    goto done;
-	}
-	if (ev->size < 1+8
-#ifdef USE_VM_PROBES
-	    + dt_utag_bytes
-#endif
-	    || !EV_GET_UINT32(ev, &n, &p, &q)
-	    || !EV_GET_UINT32(ev, &n, &p, &q)) {
-	    /* Buffer too short to contain even the number of pos/size specs */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-	if (ev->size < 1+8+8*(2*n)
-#ifdef USE_VM_PROBES
-	    + dt_utag_bytes
-#endif
-	    ) {
-	    /* Buffer wrong length to contain the pos/size specs */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-	/* Create the thread data structure with the contained ErlIOVec 
-	 * and corresponding binaries for the response 
-	 */
-	d = EF_ALLOC(sizeof(*d)
-		     + (n * sizeof(*d->c.preadv.offsets))
-		     + ((1+n) * (sizeof(*res_ev->iov)
-				 + sizeof(*res_ev->binv))));
-	if (! d) {
-	    reply_posix_error(desc, ENOMEM);
-	    goto done;
-	}
-	d->command = command;
-	d->reply = !0;
-	d->fd = desc->fd;
-	d->flags = desc->flags;
-#ifdef USE_VM_PROBES
-	dt_i1 = d->fd;
-	dt_i2 = d->flags;
-#endif
-	d->c.preadv.n = n;
-	d->c.preadv.cnt = 0;
-	d->c.preadv.size = 0;
-	res_ev = &d->c.preadv.eiov;
-	/* XXX possible alignment problems here for weird machines */
-	res_ev->vsize = 1+d->c.preadv.n;
-	res_ev->iov = void_ptr = &d->c.preadv.offsets[d->c.preadv.n];
-	res_ev->binv = void_ptr = &res_ev->iov[res_ev->vsize];
-	/* Read in the pos/size specs and allocate binaries for the results */
-	for (i = 1; i < 1+n; i++) {
-	    Uint32 sizeH, sizeL;
-	    size_t size;
-	    if (   !EV_GET_SINT64(ev, &d->c.preadv.offsets[i-1], &p, &q)
-		|| !EV_GET_UINT32(ev, &sizeH, &p, &q)
-		|| !EV_GET_UINT32(ev, &sizeL, &p, &q)) {
-		reply_posix_error(desc, EINVAL);
-		break;
-	    }
-#if SIZEOF_SIZE_T == 4
-	    if (sizeH != 0) {
-		reply_posix_error(desc, EINVAL);
-		break;
-	    }
-	    size = sizeL;
-#else
-	    size = ((size_t)sizeH<<32) | sizeL;
-#endif
-#ifdef USE_VM_PROBES
-	    dt_i3 += size;
-#endif
-	    if (! (res_ev->binv[i] = driver_alloc_binary(size))) {
-		reply_posix_error(desc, ENOMEM);
-		break;
-	    } else {
-		res_ev->iov[i].iov_len  = size;
-		res_ev->iov[i].iov_base = res_ev->binv[i]->orig_bytes;
-	    }
-	}
-	if (i < 1+n) {
-	    for (i--; i > 0; i--) {
-		driver_free_binary(res_ev->binv[i]);
-	    }
-	    EF_FREE(d);
-	    goto done;
-	}
-	/* Allocate the header binary (index 0) */
-	res_ev->binv[0] = driver_alloc_binary(4+4+8*n);
-	if (! res_ev->binv[0]) {
-	    reply_posix_error(desc, ENOMEM);
-	    for (i = 1; i < 1+n; i++) {
-		driver_free_binary(res_ev->binv[i]);
-	    }
-	    EF_FREE(d);
-	    goto done;
-	}
-	res_ev->iov[0].iov_len = 4+4+8*n;
-	res_ev->iov[0].iov_base = res_ev->binv[0]->orig_bytes;
-	/* Fill in the number of buffers in the header */
-	put_int32(0, res_ev->iov[0].iov_base);
-	put_int32(n, (char *)(res_ev->iov[0].iov_base) + 4);
-	/**/
-	res_ev->size = res_ev->iov[0].iov_len;
-	if (n == 0) {
-	    /* Trivial case - nothing to read */
-	    reply_ev(desc, FILE_RESP_LDATA, res_ev);
-	    free_preadv(d);
-	    goto done;
-	} else {
-	    d->invoke = invoke_preadv;
-	    d->free = free_preadv;
-	    d->level = 1;
-	    cq_enq(desc, d);
-	}
-    } goto done; /* case FILE_PREADV: */
-
-    case FILE_LSEEK: {
-	Sint64 offset;		/* Offset for seek */
-	Uint32 origin;		/* Origin of seek. */
-
-	if (ev->size < 1+8+4
-	    || !EV_GET_SINT64(ev, &offset, &p, &q)
-	    || !EV_GET_UINT32(ev, &origin, &p, &q)) {
-	    /* Wrong length of buffer to contain offset and origin */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-#ifdef USE_VM_PROBES
-	dt_utag = EV_CHAR_P(ev, p, q);
-#endif
-	if (lseek_flush_read(desc, &err
-#ifdef USE_VM_PROBES
-			     , dt_priv, dt_utag
-#endif
-			     ) < 0) {
-	    reply_posix_error(desc, err);
-	    goto done;
-	}
-	if (flush_write_check_error(desc, &err
-#ifdef USE_VM_PROBES
-				    , dt_priv, dt_utag
-#endif
-				    ) < 0) {
-	    reply_posix_error(desc, err);
-	    goto done;
-	}
-	if ((d = async_lseek(desc, &err, !0, offset, origin
-#ifdef USE_VM_PROBES
-			     , &dt_i1, &dt_i2, &dt_i3
-#endif
-			     )) == NULL) {
-	    reply_posix_error(desc, err);
-	    goto done;
-	}
-    } goto done;
-
-    case FILE_READ_FILE: {
-	char *filename;
-	if (ev->size < 1+1) {
-	    /* Buffer contains empty name */
-	    reply_posix_error(desc, ENOENT);
-	    goto done;
-	}
-#ifndef USE_VM_PROBES
-	/* In the dtrace case, the iov has an extra element, the dtrace utag - we will need 
-	   another test to see that
-	   the filename is in a single buffer: */
-	if (ev->size-1 != ev->iov[q].iov_len-p) {
-	    /* Name not in one single buffer */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-#else
-	if (((byte *)ev->iov[q].iov_base)[ev->iov[q].iov_len-1] != '\0') {
-	    /* Name not in one single buffer */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}	
-#endif
-	filename = EV_CHAR_P(ev, p, q);
-	d = EF_ALLOC(sizeof(struct t_data) -1 + FILENAME_BYTELEN(filename) + FILENAME_CHARSIZE);
-	if (! d) {
-	    reply_posix_error(desc, ENOMEM);
-	    goto done;
-	}
-	d->command = command;
-	d->reply = !0;
-	/* Copy name */
-	FILENAME_COPY(d->b, filename);
-#ifdef USE_VM_PROBES
-	{
-	    char dt_tmp;
-
-	    /* This will work for UTF-8, but not for UTF-16 - extra reminder here */
-#ifdef FILENAMES_16BIT 
-#error 16bit characters in filenames and dtrace in combination is not supported.
-#endif
-	    while (EV_GET_CHAR(ev, &dt_tmp, &p, &q) && dt_tmp != '\0') 
-		;
-	    dt_s1 = d->b;
-	    dt_utag = EV_CHAR_P(ev, p, q);
-	}
-#endif
-	d->c.read_file.binp = NULL;
-	d->invoke = invoke_read_file;
-	d->free = free_read_file;
-	d->level = 2;
-	cq_enq(desc, d);
-    } goto done;
-
-    case FILE_IPREAD: {
-	/* This operation cheets by using invoke_preadv() and free_preadv()
-	 * plus its own invoke_ipread. Therefore the result format is 
-	 * a bit awkward - the header binary contains one extra 64 bit
-	 * field that invoke_preadv() fortunately ignores,
-	 * and the first 64 bit field does not contain the number of 
-	 * data binaries which invoke_preadv() also ignores.
-	 */
-	register void * void_ptr;
-	char mode;
-	Sint64 hdr_offset;
-	Uint32 max_size;
-	ErlIOVec *res_ev;
-	int vsize;
-	if (! EV_GET_CHAR(ev, &mode, &p, &q)) {
-	    /* Empty command */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-	if (mode != IPREAD_S32BU_P32BU) {
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-	if (ev->size < 1+1+8+4
-	    || !EV_GET_SINT64(ev, &hdr_offset, &p, &q)
-	    || !EV_GET_UINT32(ev, &max_size, &p, &q)) {
-	    /* Buffer too short to contain 
-	     * the header offset and max size spec */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-#ifdef USE_VM_PROBES
-	dt_utag = EV_CHAR_P(ev, p, q);
-#endif
-	if (lseek_flush_read(desc, &err
-#ifdef USE_VM_PROBES
-			     , dt_priv, dt_utag
-#endif
-			     ) < 0) {
-	    reply_posix_error(desc, err);
-	    goto done;
-	}
-	if (flush_write_check_error(desc, &err
-#ifdef USE_VM_PROBES
-				    , dt_priv, dt_utag
-#endif
-				    ) < 0) {
-	    reply_posix_error(desc, err);
-	    goto done;
-	}
-	/* Create the thread data structure with the contained ErlIOVec 
-	 * and corresponding binaries for the response 
-	 */
-	vsize = 2;
-	d = EF_ALLOC(sizeof(*d) + 
-		     vsize*(sizeof(*res_ev->iov) + sizeof(*res_ev->binv)));
-	if (! d) {
-	    reply_posix_error(desc, ENOMEM);
-	    goto done;
-	}
-	d->command = command;
-	d->reply = !0;
-	d->fd = desc->fd;
-	d->flags = desc->flags;
-	d->c.preadv.offsets[0] = hdr_offset;
-	d->c.preadv.size = max_size;
-#ifdef USE_VM_PROBES
-	dt_i1 = d->fd;
-	dt_i2 = d->flags;
-	dt_i3 = d->c.preadv.offsets[0];
-	dt_i4 = d->c.preadv.size;
-#endif
-	res_ev = &d->c.preadv.eiov;
-	/* XXX possible alignment problems here for weird machines */
-	res_ev->iov = void_ptr = d + 1;
-	res_ev->binv = void_ptr = res_ev->iov + vsize;
-	res_ev->size = 0;
-	res_ev->vsize = 0;
-	d->invoke = invoke_ipread;
-	d->free = free_preadv;
-	d->level = 1;
-	cq_enq(desc, d);
-    } goto done; /* case FILE_IPREAD: */
-
-    case FILE_SETOPT: {
-	char opt;
-
-	if (ev->size < 1+1
-	    || !EV_GET_CHAR(ev, &opt, &p, &q)) {
-	    /* Buffer too short to contain even the option type */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-#ifdef USE_VM_PROBES
-	dt_i1 = opt;
-	dt_utag = EV_CHAR_P(ev, p, q);
-#endif
-	switch (opt) {
-	case FILE_OPT_DELAYED_WRITE: {
-	    Uint32 sizeH, sizeL, delayH, delayL;
-	    if (ev->size != 1+1+4*sizeof(Uint32)
-#ifdef USE_VM_PROBES
-		+ FILENAME_BYTELEN(dt_utag) + FILENAME_CHARSIZE
-#endif
-		|| !EV_GET_UINT32(ev, &sizeH, &p, &q)
-		|| !EV_GET_UINT32(ev, &sizeL, &p, &q)
-		|| !EV_GET_UINT32(ev, &delayH, &p, &q)
-		|| !EV_GET_UINT32(ev, &delayL, &p, &q)) {
-		/* Buffer has wrong length to contain the option values */
-		reply_posix_error(desc, EINVAL);
-		goto done;
-	    }
-#if SIZEOF_SIZE_T == 4
-	    if (sizeH != 0) {
-		reply_posix_error(desc, EINVAL);
-		goto done;
-	    }
-	    desc->write_bufsize = sizeL;
-#else
-	    desc->write_bufsize = ((size_t)sizeH << 32) | sizeL;
-#endif
-#if SIZEOF_LONG == 4
-	    if (delayH != 0) {
-		reply_posix_error(desc, EINVAL);
-		goto done;
-	    }
-	    desc->write_delay = delayL;
-#else
-	    desc->write_delay = ((unsigned long)delayH << 32) | delayL;
-#endif
-#ifdef USE_VM_PROBES
-	    dt_i2 = desc->write_delay;
-#endif
-	    TRACE_C('K');
-	    reply_ok(desc);
-	} goto done;
-	case FILE_OPT_READ_AHEAD: {
-	    Uint32 sizeH, sizeL;
-	    if (ev->size != 1+1+2*sizeof(Uint32)
-#ifdef USE_VM_PROBES
-		+ FILENAME_BYTELEN(dt_utag)+FILENAME_CHARSIZE
-#endif
-		|| !EV_GET_UINT32(ev, &sizeH, &p, &q)
-		|| !EV_GET_UINT32(ev, &sizeL, &p, &q)) {
-		/* Buffer has wrong length to contain the option values */
-		reply_posix_error(desc, EINVAL);
-		goto done;
-	    }
-#if SIZEOF_SIZE_T == 4
-	    if (sizeH != 0) {
-		reply_posix_error(desc, EINVAL);
-		goto done;
-	    }
-	    desc->read_bufsize = sizeL;
-#else
-	    desc->read_bufsize = ((size_t)sizeH << 32) | sizeL;
-#endif
-#ifdef USE_VM_PROBES
-	    dt_i2 = desc->read_bufsize;
-#endif
-	    TRACE_C('K');
-	    reply_ok(desc);
-	} goto done;
-	default:
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	} /* case FILE_OPT_DELAYED_WRITE: */
-    } ASSERT(0); goto done; /* case FILE_SETOPT: */
-
-    case FILE_SENDFILE: {
-
-#ifdef HAVE_SENDFILE
-        struct t_data *d;
-	Uint32 out_fd, offsetH, offsetL, hd_len, tl_len;
-	Uint64 nbytes;
-	char flags;
-
-	if (ev->size < 1 + 7 * sizeof(Uint32) + sizeof(char)
-		|| !EV_GET_UINT32(ev, &out_fd, &p, &q)
-		|| !EV_GET_CHAR(ev, &flags, &p, &q)
-		|| !EV_GET_UINT32(ev, &offsetH, &p, &q)
-		|| !EV_GET_UINT32(ev, &offsetL, &p, &q)
-		|| !EV_GET_UINT64(ev, &nbytes, &p, &q)
-		|| !EV_GET_UINT32(ev, &hd_len, &p, &q)
-		|| !EV_GET_UINT32(ev, &tl_len, &p, &q)) {
-	    /* Buffer has wrong length to contain all the needed values */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-
-	if (hd_len != 0 || tl_len != 0) {
-	    /* We do not allow header, trailers */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-
-	
-	if (flags & SENDFILE_FLGS_USE_THREADS && !THRDS_AVAILABLE) {
-	    /* We do not allow use_threads flag on a system where
-	       no threads are available. */
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-
-	d = EF_SAFE_ALLOC(sizeof(struct t_data));
-	d->fd = desc->fd;
-	d->command = command;
-	d->invoke = invoke_sendfile;
-	d->free = free_sendfile;
-	d->flags = flags;
-	d->level = 2;
-
-	d->c.sendfile.out_fd = (int) out_fd;
-	d->c.sendfile.written = 0;
-	d->c.sendfile.port = desc->port;
-	d->c.sendfile.q_mtx = desc->q_mtx;
-
-    #if SIZEOF_OFF_T == 4
-	if (offsetH != 0) {
-	    reply_posix_error(desc, EINVAL);
-	    goto done;
-	}
-	d->c.sendfile.offset = (off_t) offsetL;
-    #else
-	d->c.sendfile.offset = ((off_t) offsetH << 32) | offsetL;
-    #endif
-
-	d->c.sendfile.nbytes = nbytes;
-
-	if (USE_THRDS_FOR_SENDFILE(d)) {
-	    SET_BLOCKING(d->c.sendfile.out_fd);
-	} else {
-	    /**
-	     * Write a place holder to queue in order to force file_flush
-	     * to be called before the driver is closed.
-	     */
-	    char tmp[1] = "";
-	    MUTEX_LOCK(d->c.sendfile.q_mtx);
-	    if (driver_enq(d->c.sendfile.port, tmp, 1)) {
-	        MUTEX_UNLOCK(d->c.sendfile.q_mtx);
-		reply_posix_error(desc, ENOMEM);
-		goto done;
-	    }
-	    MUTEX_UNLOCK(d->c.sendfile.q_mtx);
-	}
-
-	cq_enq(desc, d);
-#else
-	reply_posix_error(desc, ENOTSUP);
-#endif
-	goto done;
-        } /* case FILE_SENDFILE: */
-
-    } /* switch(command) */
-
-    if (lseek_flush_read(desc, &err
-#ifdef USE_VM_PROBES
-			 , dt_priv, dt_utag
-#endif
-			 ) < 0) {
-	reply_posix_error(desc, err);
-	goto done;
-    }
-    if (flush_write_check_error(desc, &err
-#ifdef USE_VM_PROBES
-				, dt_priv, dt_utag
-#endif
-				) < 0) {
-	reply_posix_error(desc, err);
-	goto done;
-    } else {
-	/* Flatten buffer and send it to file_output(desc, buf, len) */
-	int len = ev->size;
-	char *buf = EF_ALLOC(len);
-	if (! buf) {
-	    reply_posix_error(desc, ENOMEM);
-	    goto done;
-	}
-	driver_vec_to_buf(ev, buf, len);
-	file_output((ErlDrvData) desc, buf, len);
-	EF_FREE(buf);
-	goto done;
-    }
-
- done:
-    if (d != NULL) {
-#ifdef USE_VM_PROBES
-	/*
-	 * If d == NULL, then either:
-	 *    1). There was an error of some sort, or
-	 *    2). The command given to us is actually implemented
-	 *	  by file_output() instead.
-	 *
-	 * Case #1 is probably a TODO item, perhaps?
-	 * Case #2 we definitely don't want to activate a probe.
-	 */
-	d->sched_i1 = dt_priv->thread_num;
-	d->sched_i2 = dt_priv->tag;
-	d->sched_utag[0] = '\0';
-	if (dt_utag != NULL) {
-	    if (dt_utag[0] == '\0') {
-                dt_utag = NULL;
-            } else {
-		strncpy(d->sched_utag, dt_utag, sizeof(d->sched_utag) - 1);
-		d->sched_utag[sizeof(d->sched_utag) - 1] = '\0';
-	    }
-	}
-	DTRACE11(efile_drv_entry, dt_priv->thread_num, dt_priv->tag++,
-		 dt_utag, command, dt_s1, NULL, dt_i1, dt_i2, dt_i3, dt_i4,
-		 desc->port_str);
-#endif
-    }
-    cq_execute(desc);
-}
-
-#ifdef  USE_VM_PROBES
-dt_private *
-get_dt_private(int base)
-{
-    dt_private *dt_priv = (dt_private *) pthread_getspecific(dt_driver_key);
-
-    if (dt_priv == NULL) {
-	dt_priv = EF_SAFE_ALLOC(sizeof(dt_private));
-	erts_mtx_lock(&dt_driver_mutex);
-	dt_priv->thread_num = (base + dt_driver_idnum++);
-	erts_mtx_unlock(&dt_driver_mutex);
-	dt_priv->tag = 0;
-	pthread_setspecific(dt_driver_key, dt_priv);
-    }
-    return dt_priv;
-}
-#endif  /* USE_VM_PROBES */
diff --git a/erts/emulator/drivers/common/erl_efile.h b/erts/emulator/drivers/common/erl_efile.h
deleted file mode 100644
index b7f063b4f2..0000000000
--- a/erts/emulator/drivers/common/erl_efile.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 1997-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%
- */
-/*
- * Defines the interfaces between the generic efile driver and its
- * operating-system dependent helpers.
- */
-
-#include "sys.h"
-#include "erl_driver.h"
-
-/*
- * Open modes for efile_openfile().
- */
-#define EFILE_MODE_READ 1
-#define EFILE_MODE_WRITE 2	/* Implies truncating file when used alone. */
-#define EFILE_MODE_READ_WRITE 	3
-#define EFILE_MODE_APPEND	4
-#define EFILE_COMPRESSED 	8
-#define EFILE_MODE_EXCL        16
-#define EFILE_NO_TRUNCATE      32 /* Special for reopening on VxWorks */
-#define EFILE_MODE_SYNC        64
-
-/*
- * Seek modes for efile_seek().
- */
-#define	EFILE_SEEK_SET	0
-#define	EFILE_SEEK_CUR	1
-#define	EFILE_SEEK_END	2
-
-/*
- * File types returned by efile_fileinfo().
- */
-#define FT_DEVICE 	1
-#define FT_DIRECTORY 	2
-#define FT_REGULAR	3
-#define FT_SYMLINK	4
-#define FT_OTHER	5
-
-/*
- * Access attributes returned by efile_fileinfo() (the bits can be ORed
- * together).
- */
-#define FA_NONE    	0
-#define FA_WRITE 	1
-#define FA_READ		2
-
-/* Some OS'es (i.e. Windows) has filenames in wide charaqcters. That requires special handling */
-/* Note that we do *not* honor alignment in the communication to the OS specific driver, */
-/* which is not a problem on x86, but might be on other platforms. The OS specific efile */
-/* implementation is expected to align if needed */
-#ifdef __WIN32__
-#define FILENAMES_16BIT 1
-#endif
-
-/* We use sendfilev if it exist on solaris */
-#if !defined(HAVE_SENDFILE) && defined(HAVE_SENDFILEV)
-#define HAVE_SENDFILE
-#endif
-
-/*
- * An handle to an open directory.  To be cast to the correct type
- * in the system-dependent directory functions.
- */
-
-typedef struct _Efile_Dir_Handle* EFILE_DIR_HANDLE;
-
-/*
- * Error information from the last call.
- */  
-typedef struct _Efile_error {
-    int posix_errno;		/* Posix error number, as in <errno.h>. */
-    int os_errno;		/* Os-dependent error number (not used). */
-} Efile_error;
-
-/*
- * Describes what is returned by file:file_info/1.
- */
-
-typedef struct _Efile_info {
-    Uint32 size_low;		/* Size of file, lower 32 bits.. */
-    Uint32 size_high;		/* Size of file, higher 32 bits. */
-    Uint32 type;		/* Type of file -- one of FT_*. */
-    Uint32 access;		/* Access to file -- one of FA_*. */
-    Uint32 mode;		/* Access permissions -- bit field. */
-    Uint32 links;		/* Number of links to file. */
-    Uint32 major_device;	/* Major device or file system. */
-    Uint32 minor_device;	/* Minor device (for devices). */
-    Uint32 inode;		/* Inode number. */
-    Uint32 uid;			/* User id of owner. */
-    Uint32 gid;			/* Group id of owner. */
-    Sint64 accessTime;		/* Last time the file was accessed. */
-    Sint64 modifyTime;		/* Last time the file was modified. */
-    Sint64 cTime;		/* Creation time (Windows) or last
-				 * inode change (Unix).
-				 */
-} Efile_info;
-
-
-#ifdef HAVE_SENDFILE
-/*
- * Describes the structure of headers/trailers for sendfile
- */
-struct t_sendfile_hdtl {
-    SysIOVec *headers;
-    int hdr_cnt;
-    SysIOVec *trailers;
-    int trl_cnt;
-};
-#endif /* HAVE_SENDFILE */
-
-/*
- * Functions.
- */
-int efile_init(void);
-int efile_mkdir(Efile_error* errInfo, char* name);
-int efile_rmdir(Efile_error* errInfo, char* name);
-int efile_delete_file(Efile_error* errInfo, char* name);
-int efile_rename(Efile_error* errInfo, char* src, char* dst);
-int efile_chdir(Efile_error* errInfo, char* name);
-int efile_getdcwd(Efile_error* errInfo, int drive,
-		  char* buffer, size_t size);
-int efile_readdir(Efile_error* errInfo, char* name, 
-		  EFILE_DIR_HANDLE* dir_handle,
-		  char* buffer, size_t *size);
-int efile_openfile(Efile_error* errInfo, char* name, int flags,
-		   int* pfd, Sint64* pSize);
-void efile_closefile(int fd);
-int efile_fdatasync(Efile_error* errInfo, int fd);
-int efile_fsync(Efile_error* errInfo, int fd);
-int efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
-		   char *name, int info_for_link);
-int efile_write_info(Efile_error* errInfo, Efile_info* pInfo, char *name);
-int efile_write(Efile_error* errInfo, int flags, int fd, 
-		char* buf, size_t count);
-int efile_writev(Efile_error* errInfo, int flags, int fd, 
-		 SysIOVec* iov, int iovcnt);
-int efile_read(Efile_error* errInfo, int flags, int fd, 
-	       char* buf, size_t count, size_t* pBytesRead);
-int efile_seek(Efile_error* errInfo, int fd, 
-	       Sint64 offset, int origin, Sint64* new_location);
-int efile_truncate_file(Efile_error* errInfo, int *fd, int flags);
-int efile_pwrite(Efile_error* errInfo, int fd, 
-		 char* buf, size_t count, Sint64 offset);
-int efile_pread(Efile_error* errInfo, int fd, 
-		Sint64 offset, char* buf, size_t count, size_t* pBytesRead);
-int efile_readlink(Efile_error* errInfo, char *name, 
-		   char* buffer, size_t size);
-int efile_altname(Efile_error* errInfo, char *name, 
-		  char* buffer, size_t size);
-int efile_link(Efile_error* errInfo, char* old, char* new);
-int efile_symlink(Efile_error* errInfo, char* old, char* new);
-int efile_may_openfile(Efile_error* errInfo, char *name);
-int efile_fadvise(Efile_error* errInfo, int fd, Sint64 offset, Sint64 length,
-		  int advise);
-#ifdef HAVE_SENDFILE
-int efile_sendfile(Efile_error* errInfo, int in_fd, int out_fd,
-		      off_t *offset, Uint64 *nbytes, struct t_sendfile_hdtl *hdtl);
-#endif /* HAVE_SENDFILE */
-int efile_fallocate(Efile_error* errInfo, int fd, Sint64 offset, Sint64 length);
diff --git a/erts/emulator/drivers/common/gzio.c b/erts/emulator/drivers/common/gzio.c
index f60c781894..86c3b07cea 100644
--- a/erts/emulator/drivers/common/gzio.c
+++ b/erts/emulator/drivers/common/gzio.c
@@ -19,726 +19,16 @@
 #include <unistd.h>
 #endif
 #include <ctype.h>
+
 #include "erl_driver.h"
-#include "erl_efile.h"
 #include "sys.h"
 
-#ifdef __WIN32__
-#ifndef HAVE_CONFLICTING_FREAD_DECLARATION
-#define HAVE_CONFLICTING_FREAD_DECLARATION
-#endif
-#define FILENAMES_16BIT 1
-#endif
-
-#ifdef STDC
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
-#endif
-
 #include "gzio_zutil.h"
 #include "erl_zlib.h"
 #include "gzio.h"
 
-/********struct internal_state {int dummy;}; / * for buggy compilers */
-
-#define Z_BUFSIZE 4096
-
-#define ALLOC(size) driver_alloc(size)
-#define TRYFREE(p) {if (p) driver_free(p);}
-
 static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
 
-/* gzip flag byte */
-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
-#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
-#define COMMENT      0x10 /* bit 4 set: file comment present */
-#define RESERVED     0xE0 /* bits 5..7: reserved */
-
-typedef struct gz_stream {
-    z_stream stream;
-    int      z_err;   /* error code for last stream operation */
-    int      z_eof;   /* set if end of input file */
-#ifdef UNIX
-    int      file;    /* .gz file descriptor */
-#else
-    FILE     *file;   /* .gz file */
-#endif
-    Byte     *inbuf;  /* input buffer */
-    Byte     *outbuf; /* output buffer */
-    uLong    crc;     /* crc32 of uncompressed data */
-    char     *msg;    /* error message */
-    char     *path;   /* path name for debugging only */
-    int      transparent; /* 1 if input file is not a .gz file */
-    char     mode;    /* 'w' or 'r' */
-    int      position; /* Position (for seek) */
-    int (*destroy)(struct gz_stream*); /* Function to destroy
-					    *  this structure. */
-} gz_stream;
-
-local ErtsGzFile gz_open      (const char *path, const char *mode);
-local int    get_byte     (gz_stream *s);
-local void   check_header (gz_stream *s);
-local int    destroy      (gz_stream *s);
-local uLong  getLong      (gz_stream *s);
-
-#ifdef UNIX
-/*
- * In Solaris 8 and earlier, fopen() and its friends cannot handle 
- * file descriptors larger than 255. Therefore, we use read()/write()
- * on all Unix systems.
- */
-# define ERTS_GZWRITE(File, Buf, Count) write((File), (Buf), (Count))
-# define ERTS_GZREAD(File, Buf, Count) read((File), (Buf), (Count))
-#else
-/*
- * On all other operating systems, using fopen(), fread()/fwrite(), since
- * there is not guaranteed to exist any read()/write() (not part of
- * ANSI/ISO-C).
- */
-# define ERTS_GZWRITE(File, Buf, Count) fwrite((Buf), 1, (Count), (File))
-# define ERTS_GZREAD(File, Buf, Count) fread((Buf), 1, (Count), (File))
-#endif
-
-/*
- * Ripped from efile_drv.c
- */
-
-#ifdef FILENAMES_16BIT
-#  define FILENAME_BYTELEN(Str) filename_len_16bit(Str)
-#  define FILENAME_COPY(To,From) filename_cpy_16bit((To),(From)) 
-#  define FILENAME_CHARSIZE 2
-
-   static int filename_len_16bit(const char *str) 
-   {
-       const char *p = str;
-       while(*p != '\0' || p[1] != '\0') {
-	   p += 2;
-       }
-       return (p - str);
-   }
-
-   static void filename_cpy_16bit(char *to, const char *from) 
-   {
-       while(*from != '\0' || from[1] != '\0') {
-	   *to++ = *from++;
-	   *to++ = *from++;
-       }
-       *to++ = *from++;
-       *to++ = *from++;
-   }
-
-#else
-#  define FILENAME_BYTELEN(Str) strlen(Str)
-#  define FILENAME_COPY(To,From) strcpy(To,From) 
-#  define FILENAME_CHARSIZE 1
-#endif
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
-   or path name (if fd == -1).
-     gz_open return NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).
-*/
-local ErtsGzFile gz_open (path, mode)
-    const char *path;
-    const char *mode;
-{
-    int err;
-    int level = Z_DEFAULT_COMPRESSION; /* compression level */
-    char *p = (char*)mode;
-    gz_stream *s;
-    char fmode[80]; /* copy of mode, without the compression level */
-    char *m = fmode;
-
-    if (!path || !mode) return Z_NULL;
-
-    s = (gz_stream *)ALLOC(sizeof(gz_stream));
-    if (!s) return Z_NULL;
-
-    erl_zlib_alloc_init(&s->stream);
-    s->stream.next_in = s->inbuf = Z_NULL;
-    s->stream.next_out = s->outbuf = Z_NULL;
-    s->stream.avail_in = s->stream.avail_out = 0;
-#ifdef UNIX
-    s->file = -1;
-#else
-    s->file = NULL;
-#endif
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->crc = crc32(0L, Z_NULL, 0);
-    s->msg = NULL;
-    s->transparent = 0;
-    s->position = 0;
-    s->destroy = destroy;
-
-    s->path = (char*)ALLOC(FILENAME_BYTELEN(path)+FILENAME_CHARSIZE);
-    if (s->path == NULL) {
-        return s->destroy(s), (ErtsGzFile)Z_NULL;
-    }
-    FILENAME_COPY(s->path, path); /* do this early for debugging */
-
-    s->mode = '\0';
-    do {
-        if (*p == 'r')
-	    s->mode = 'r';
-	if (*p == 'w' || *p == 'a')
-	    s->mode = 'w';
-	if (isdigit((int)*p)) {
-	    level = *p - '0';
-	} else {
-	    *m++ = *p;		/* Copy the mode */
-	}
-    } while (*p++ && m < fmode + sizeof(fmode) - 1);
-    *m = '\0';
-    if (s->mode == '\0')
-	return s->destroy(s), (ErtsGzFile)Z_NULL;
-    
-    if (s->mode == 'w') {
-        err = deflateInit2(&(s->stream), level,
-                           Z_DEFLATED, MAX_WBITS+16, DEF_MEM_LEVEL, 0);
-        /* windowBits is passed < 0 to suppress zlib header */
-
-        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-
-        if (err != Z_OK || s->outbuf == Z_NULL) {
-            return s->destroy(s), (ErtsGzFile)Z_NULL;
-        }
-    } else {
-	/*
-	 * It is tempting to use the built-in support in zlib
-	 * for handling GZIP headers, but unfortunately it
-	 * cannot handle multiple GZIP headers (which occur when
-	 * several GZIP files have been concatenated).
-	 */
-
-	err = inflateInit2(&(s->stream), -MAX_WBITS);
-        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
-
-        if (err != Z_OK || s->inbuf == Z_NULL) {
-            return s->destroy(s), (ErtsGzFile)Z_NULL;
-        }
-    }
-    s->stream.avail_out = Z_BUFSIZE;
-
-    errno = 0;
-#if defined(FILENAMES_16BIT)
-    {
-	FILE* efile_wfopen(const WCHAR* name, const WCHAR* mode);
-	WCHAR wfmode[80];
-	int i = 0;
-	int j;
-	for(j = 0; fmode[j] != '\0'; ++j) {
-	    wfmode[i++] = (WCHAR) fmode[j];
-	}
-	wfmode[i++] = L'\0';
-	s->file = efile_wfopen((WCHAR *)path, wfmode);
-	if (s->file == NULL) {
-	    return s->destroy(s), (ErtsGzFile)Z_NULL;
-	}
-    }
-#elif defined(UNIX)
-    if (s->mode == 'r') {
-	s->file = open(path, O_RDONLY);
-    } else {
-	s->file = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-    }
-    if (s->file == -1) {
-        return s->destroy(s), (ErtsGzFile)Z_NULL;
-    }
-#else
-    s->file = fopen(path, fmode);
-    if (s->file == NULL) {
-        return s->destroy(s), (ErtsGzFile)Z_NULL;
-    }
-#endif
-    if (s->mode == 'r') {
-	check_header(s); /* skip the .gz header */
-    }
-    return (ErtsGzFile)s;
-}
-
-/* ===========================================================================
-   Rewind a gzfile back to the beginning.
-*/
-
-local int gz_rewind (gz_stream *s)
-{
-    TRYFREE(s->msg);
-
-#ifdef UNIX
-    lseek(s->file, 0L, SEEK_SET);
-#else
-    fseek(s->file, 0L, SEEK_SET);
-#endif
-    inflateReset(&(s->stream));
-    s->stream.next_in = Z_NULL;
-    s->stream.next_out = Z_NULL;
-    s->stream.avail_in = s->stream.avail_out = 0;
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->crc = crc32(0L, Z_NULL, 0);
-    s->msg = NULL;
-    s->position = 0;
-    s->stream.next_in = s->inbuf;
-
-    s->stream.avail_out = Z_BUFSIZE;
-
-    check_header(s);		/* skip the .gz header */
-    return 1;
-}
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing.
-*/
-ErtsGzFile erts_gzopen (path, mode)
-    const char *path;
-    const char *mode;
-{
-    return gz_open (path, mode);
-}
-
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been successfully opened for reading.
-*/
-local int get_byte(s)
-    gz_stream *s;
-{
-    if (s->z_eof) return EOF;
-    if (s->stream.avail_in == 0) {
-#ifdef UNIX
-	ssize_t res;
-	errno = 0;
-	res = ERTS_GZREAD(s->file, s->inbuf, Z_BUFSIZE);
-	if (res == 0) {
-	    s->stream.avail_in = 0;
-	    s->z_eof = 1;
-	    return EOF;
-	} else if (res < 0) {
-	    s->stream.avail_in = 0;
-	    s->z_eof = 1;
-	    s->z_err = Z_ERRNO;
-	    return EOF;
-	} else {
-	    s->stream.avail_in = (uInt) res;
-	}
-#else
-	errno = 0;
-	s->stream.avail_in = ERTS_GZREAD(s->file, s->inbuf, Z_BUFSIZE);
-	if (s->stream.avail_in == 0) {
-	    s->z_eof = 1;
-	    if (s->file && ferror(s->file))
-		s->z_err = Z_ERRNO;
-	    return EOF;
-	}
-#endif
-	s->stream.next_in = s->inbuf;
-    }
-    s->stream.avail_in--;
-    return *(s->stream.next_in)++;
-}
-
-/* ===========================================================================
-      Check the gzip header of a gz_stream opened for reading. Set the stream
-    mode to transparent if the gzip magic header is not present; set s->err
-    to Z_DATA_ERROR if the magic header is present but the rest of the header
-    is incorrect.
-    IN assertion: the stream s has already been created sucessfully;
-       s->stream.avail_in is zero for the first time, but may be non-zero
-       for concatenated .gz files.
-*/
-local void check_header(s)
-    gz_stream *s;
-{
-    int method; /* method byte */
-    int flags;  /* flags byte */
-    uInt len;
-    int c;
-
-    /* Check the gzip magic header */
-    for (len = 0; len < 2; len++) {
-	c = get_byte(s);
-	if (c != gz_magic[len]) {
-	    if (len != 0) s->stream.avail_in++, s->stream.next_in--;
-	    if (c != EOF) {
-		s->stream.avail_in++, s->stream.next_in--;
-		s->transparent = 1;
-	    }
-	    s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END;
-	    return;
-	}
-    }
-    method = get_byte(s);
-    flags = get_byte(s);
-    if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
-	s->z_err = Z_DATA_ERROR;
-	return;
-    }
-
-    /* Discard time, xflags and OS code: */
-    for (len = 0; len < 6; len++) (void)get_byte(s);
-
-    if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-	len  =  (uInt)get_byte(s);
-	len += ((uInt)get_byte(s))<<8;
-	/* len is garbage if EOF but the loop below will quit anyway */
-	while (len-- != 0 && get_byte(s) != EOF) ;
-    }
-    if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
-	while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
-	while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
-	for (len = 0; len < 2; len++) (void)get_byte(s);
-    }
-    s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
-}
-
- /* ===========================================================================
- * Cleanup then free the given gz_stream. Return a zlib error code.
-   Try freeing in the reverse order of allocations.
- */
-local int destroy (s)
-    gz_stream *s;
-{
-    int err = Z_OK;
-
-    if (!s) return Z_STREAM_ERROR;
-
-    TRYFREE(s->msg);
-
-    if (s->stream.state != NULL) {
-       if (s->mode == 'w') {
-           err = deflateEnd(&(s->stream));
-       } else if (s->mode == 'r') {
-           err = inflateEnd(&(s->stream));
-       }
-    }
-#ifdef UNIX
-    if (s->file != -1 && close(s->file)) {
-        err = Z_ERRNO;
-    }
-#else
-    if (s->file != NULL && fclose(s->file)) {
-        err = Z_ERRNO;
-    }
-#endif
-    if (s->z_err < 0) err = s->z_err;
-
-    TRYFREE(s->inbuf);
-    TRYFREE(s->outbuf);
-    TRYFREE(s->path);
-    TRYFREE(s);
-    return err;
-}
-
-/* ===========================================================================
-     Reads the given number of uncompressed bytes from the compressed file.
-   gzread returns the number of bytes actually read (0 for end of file).
-*/
-int
-erts_gzread(ErtsGzFile file, voidp buf, unsigned len)
-{
-    gz_stream *s = (gz_stream*)file;
-    Bytef *start = buf; /* starting point for crc computation */
-    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
-
-    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
-
-    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
-    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
-
-    s->stream.next_out = next_out = buf;
-    s->stream.avail_out = len;
-
-    while (s->stream.avail_out != 0) {
-
-	if (s->transparent) {
-	    /* Copy first the lookahead bytes: */
-	    uInt n = s->stream.avail_in;
-	    if (n > s->stream.avail_out) n = s->stream.avail_out;
-	    if (n > 0) {
-		zmemcpy(s->stream.next_out, s->stream.next_in, n);
-		next_out += n;
-		s->stream.next_out = next_out;
-		s->stream.next_in   += n;
-		s->stream.avail_out -= n;
-		s->stream.avail_in  -= n;
-	    }
-	    if (s->stream.avail_out > 0) {
-		s->stream.avail_out -= ERTS_GZREAD(s->file, next_out,
-						   s->stream.avail_out);
-	    }
-	    len -= s->stream.avail_out;
-	    s->stream.total_in  += (uLong)len;
-	    s->stream.total_out += (uLong)len;
-            if (len == 0) s->z_eof = 1;
-	    s->position += (int)len;
-	    return (int)len;
-	}
-        if (s->stream.avail_in == 0 && !s->z_eof) {
-#ifdef UNIX
-	    ssize_t res;
-	    errno = 0;
-	    res = ERTS_GZREAD(s->file, s->inbuf, Z_BUFSIZE);
-	    if (res == 0) {
-		s->stream.avail_in = 0;
-		s->z_eof = 1;
-		return EOF;
-	    } else if (res < 0) {
-		s->stream.avail_in = 0;
-		s->z_eof = 1;
-		s->z_err = Z_ERRNO;
-		return EOF;
-	    } else {
-		s->stream.avail_in = (uInt) res;
-	    }
-#else
-	    errno = 0;
-            s->stream.avail_in = ERTS_GZREAD(s->file, s->inbuf, Z_BUFSIZE);
-            if (s->stream.avail_in == 0) {
-                s->z_eof = 1;
-		if (s->file && ferror(s->file)) {
-		    s->z_err = Z_ERRNO;
-		    break;
-		}
-            }
-#endif
-            s->stream.next_in = s->inbuf;
-        }
-        s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
-
-	if (s->z_err == Z_STREAM_END) {
-	    /* Check CRC and original size */
-	    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-	    start = s->stream.next_out;
-
-	    if (getLong(s) != s->crc) {
-		s->z_err = Z_DATA_ERROR;
-	    } else {
-	        (void)getLong(s);
-                /* The uncompressed length returned by above getlong() may
-                 * be different from s->stream.total_out) in case of
-		 * concatenated .gz files. Check for such files:
-		 */
-		check_header(s);
-		if (s->z_err == Z_OK) {
-		    uLong total_in = s->stream.total_in;
-		    uLong total_out = s->stream.total_out;
-
-		    inflateReset(&(s->stream));
-		    s->stream.total_in = total_in;
-		    s->stream.total_out = total_out;
-		    s->crc = crc32(0L, Z_NULL, 0);
-		}
-	    }
-	}
-	if (s->z_err != Z_OK || s->z_eof) break;
-    }
-    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-
-    s->position += (int)(len - s->stream.avail_out);
-
-    return (int)(len - s->stream.avail_out);
-}
-
-/* ===========================================================================
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of bytes actually written (0 in case of error).
-*/
-int
-erts_gzwrite(ErtsGzFile file, voidp buf, unsigned len)
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.next_in = buf;
-    s->stream.avail_in = len;
-
-    while (s->stream.avail_in != 0) {
-
-        if (s->stream.avail_out == 0) {
-
-            s->stream.next_out = s->outbuf;
-            if (ERTS_GZWRITE(s->file, s->outbuf, Z_BUFSIZE) != Z_BUFSIZE) {
-                s->z_err = Z_ERRNO;
-                break;
-            }
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
-        if (s->z_err != Z_OK) break;
-    }
-    s->position += (int)(len - s->stream.avail_in);
-    return (int)(len - s->stream.avail_in);
-}
-
-/*
- * For use by Erlang file driver.
- *
- * XXX Limitations:
- *  - SEEK_END is not allowed (length of file is not known).
- *  - When writing, only forward seek is supported.
- */
-
-int
-erts_gzseek(ErtsGzFile file, int offset, int whence)
-{
-    int pos;
-    gz_stream* s = (gz_stream *) file;
-
-    switch (whence) {
-    case EFILE_SEEK_SET: whence = SEEK_SET; break;
-    case EFILE_SEEK_CUR: whence = SEEK_CUR; break;
-    case EFILE_SEEK_END: whence = SEEK_END; break;
-    default:
-	errno = EINVAL;
-	return -1;
-    }
-
-    if (s == NULL) {
-	errno = EINVAL;
-	return -1;
-    }
-    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) {
-	errno = EIO;
-	return -1;
-    }
-
-    switch (whence) {
-    case SEEK_SET: pos = offset; break;
-    case SEEK_CUR: pos = s->position+offset; break;
-    case SEEK_END: 
-    default:
-      errno = EINVAL; return -1;
-    }
-
-    if (pos == s->position) {
-	return pos;
-    }
-
-    if (pos < s->position) {
-	if (s->mode == 'w') {
-	    errno = EINVAL;
-	    return -1;
-	}
-	gz_rewind(s);
-    }
-
-    while (s->position < pos) {
-	char buf[512];
-	int n;
-	int save_pos = s->position;
-
-	n = pos - s->position;
-	if (n > sizeof(buf))
-	    n = sizeof(buf);
-
-	if (s->mode == 'r') {
-	    erts_gzread(file, buf, n);
-	} else {
-	    memset(buf, '\0', n);
-	    erts_gzwrite(file, buf, n);
-	}
-	if (save_pos == s->position) break;
-    }
-
-    return s->position;
-}
-
-/* ===========================================================================
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-int
-erts_gzflush(ErtsGzFile file, int flush)
-{
-    uInt len;
-    int done = 0;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.avail_in = 0; /* should be zero already anyway */
-
-    for (;;) {
-        len = Z_BUFSIZE - s->stream.avail_out;
-
-        if (len != 0) {
-            if ((uInt)ERTS_GZWRITE(s->file, s->outbuf, len) != len) {
-                s->z_err = Z_ERRNO;
-                return Z_ERRNO;
-            }
-            s->stream.next_out = s->outbuf;
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        if (done) break;
-        s->z_err = deflate(&(s->stream), flush);
-
-        /* deflate has finished flushing only when it hasn't used up
-         * all the available space in the output buffer: 
-         */
-        done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
- 
-        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
-    }
-#ifndef UNIX
-    fflush(s->file);
-#endif
-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets 
-*/
-local uLong getLong (s)
-    gz_stream *s;
-{
-    uLong x = (uLong)get_byte(s);
-    int c;
-
-    x += ((uLong)get_byte(s))<<8;
-    x += ((uLong)get_byte(s))<<16;
-    c = get_byte(s);
-    if (c == EOF) s->z_err = Z_DATA_ERROR;
-    x += ((uLong)c)<<24;
-    return x;
-}
-
-/* ===========================================================================
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state.
-*/
-int
-erts_gzclose(ErtsGzFile file)
-{
-    int err;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) return Z_STREAM_ERROR;
-
-    if (s->mode == 'w') {
-        err = erts_gzflush (file, Z_FINISH);
-        if (err != Z_OK) return s->destroy(s);
-    }
-    return s->destroy(s);
-}
-
-
 /* ===========================================================================
    Uncompresses the buffer given and returns a pointer to a binary.
    If the buffer was not compressed with gzip, the buffer contents
diff --git a/erts/emulator/drivers/common/gzio.h b/erts/emulator/drivers/common/gzio.h
index ee0ebe7bd8..e331b5208b 100644
--- a/erts/emulator/drivers/common/gzio.h
+++ b/erts/emulator/drivers/common/gzio.h
@@ -20,13 +20,5 @@
 
 #include "zlib.h"
 
-typedef struct erts_gzFile* ErtsGzFile;
-
-ErtsGzFile erts_gzopen (const char *path, const char *mode);
-int erts_gzread(ErtsGzFile file, voidp buf, unsigned len);
-int erts_gzwrite(ErtsGzFile file, voidp buf, unsigned len);
-int erts_gzseek(ErtsGzFile, int, int);
-int erts_gzflush(ErtsGzFile file, int flush);
-int erts_gzclose(ErtsGzFile file);
 ErlDrvBinary* erts_gzinflate_buffer(char*, uLong);
 ErlDrvBinary* erts_gzdeflate_buffer(char*, uLong);
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 95d61fcc5d..4294fb4f46 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -63,6 +63,20 @@
 #include <sys/un.h>
 #endif
 
+#ifdef HAVE_SENDFILE
+#if defined(__linux__) || (defined(__sun) && defined(__SVR4))
+    #include <sys/sendfile.h>
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
+    /* Need to define __BSD_VISIBLE in order to expose prototype of sendfile */
+    #define __BSD_VISIBLE 1
+    #include <sys/socket.h>
+#endif
+#endif
+
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+    #define __DARWIN__ 1
+#endif
+
 /* All platforms fail on malloc errors. */
 #define FATAL_MALLOC
 
@@ -701,6 +715,7 @@ static size_t my_strnlen(const char *s, size_t maxlen)
 #define TCP_REQ_RECV           42
 #define TCP_REQ_UNRECV         43
 #define TCP_REQ_SHUTDOWN       44
+#define TCP_REQ_SENDFILE       45
 /* UDP and SCTP requests */
 #define PACKET_REQ_RECV        60 /* Common for UDP and SCTP         */
 /* #define SCTP_REQ_LISTEN       61 MERGED Different from TCP; not for UDP */
@@ -723,6 +738,7 @@ static size_t my_strnlen(const char *s, size_t maxlen)
 #define TCP_ADDF_DELAYED_ECONNRESET 128 /* An ECONNRESET error occurred on send or shutdown */
 #define TCP_ADDF_SHUTDOWN_WR_DONE 256 /* A shutdown(sock, SHUT_WR) or SHUT_RDWR was made */
 #define TCP_ADDF_LINGER_ZERO 	  512 /* Discard driver queue on port close */
+#define TCP_ADDF_SENDFILE         1024 /* Send from an fd instead of the driver queue */
 
 /* *_REQ_* replies */
 #define INET_REP_ERROR       0
@@ -1235,6 +1251,21 @@ typedef struct {
     inet_async_multi_op *multi_first;/* NULL == no multi-accept-queue, op is in ordinary queue */
     inet_async_multi_op *multi_last;
     MultiTimerData *mtd;        /* Timer structures for multiple accept */
+#ifdef HAVE_SENDFILE
+    struct {
+        ErlDrvSizeT ioq_skip;   /* The number of bytes in the queue at the time
+                                 * sendfile was issued, which must be sent
+                                 * before issuing the sendfile call itself. */
+        int dup_file_fd;        /* The file handle to send from; this is
+                                 * duplicated when sendfile is issued to
+                                 * reduce (but not eliminate) the impact of a
+                                 * nasty race, so we have to remember to close
+                                 * it. */
+        Uint64 bytes_sent;
+        Uint64 offset;
+        Uint64 length;
+    } sendfile;
+#endif
 } tcp_descriptor;
 
 /* send function */
@@ -1245,6 +1276,8 @@ static int tcp_deliver(tcp_descriptor* desc, int len);
 
 static int tcp_shutdown_error(tcp_descriptor* desc, int err);
 
+static int tcp_inet_sendfile(tcp_descriptor* desc);
+
 static int tcp_inet_output(tcp_descriptor* desc, HANDLE event);
 static int tcp_inet_input(tcp_descriptor* desc, HANDLE event);
 
@@ -1329,6 +1362,9 @@ static ErlDrvTermData am_ipv6_v6only;
 static ErlDrvTermData am_netns;
 static ErlDrvTermData am_bind_to_device;
 #endif
+#ifdef HAVE_SENDFILE
+static ErlDrvTermData am_sendfile;
+#endif
 
 static char str_eafnosupport[] = "eafnosupport";
 static char str_einval[] = "einval";
@@ -3875,6 +3911,10 @@ static int inet_init()
     INIT_ATOM(https);
     INIT_ATOM(scheme);
 
+#ifdef HAVE_SENDFILE
+    INIT_ATOM(sendfile);
+#endif
+
     /* add TCP, UDP and SCTP drivers */
     add_driver_entry(&tcp_inet_driver_entry);
 #ifdef HAVE_UDP
@@ -9270,6 +9310,13 @@ static void tcp_inet_stop(ErlDrvData e)
  * will be freed through tcp_inet_stop later on. */
 static void tcp_desc_close(tcp_descriptor* desc)
 {
+#ifdef HAVE_SENDFILE
+    if(desc->tcp_add_flags & TCP_ADDF_SENDFILE) {
+        desc->tcp_add_flags &= ~TCP_ADDF_SENDFILE;
+        close(desc->sendfile.dup_file_fd);
+    }
+#endif
+
     tcp_clear_input(desc);
     tcp_clear_output(desc);
 
@@ -9608,6 +9655,60 @@ static ErlDrvSSizeT tcp_inet_ctl(ErlDrvData e, unsigned int cmd,
 	    return ctl_reply(INET_REP_OK, NULL, 0, rbuf, rsize);
 	}
     }
+
+    case TCP_REQ_SENDFILE: {
+#ifdef HAVE_SENDFILE
+        const ErlDrvSizeT required_len =
+            sizeof(desc->sendfile.dup_file_fd) +
+            sizeof(Uint64) * 2;
+
+        int raw_file_fd;
+
+        DEBUGF(("tcp_inet_ctl(%ld): SENDFILE\r\n", (long)desc->inet.port));
+
+        if (len != required_len) {
+            return ctl_error(EINVAL, rbuf, rsize);
+        } else if (!IS_CONNECTED(INETP(desc))) {
+            return ctl_error(ENOTCONN, rbuf, rsize);
+        }
+
+        sys_memcpy(&raw_file_fd, buf, sizeof(raw_file_fd));
+        buf += sizeof(raw_file_fd);
+
+        desc->sendfile.dup_file_fd = dup(raw_file_fd);
+
+        if(desc->sendfile.dup_file_fd == -1) {
+            return ctl_error(errno, rbuf, rsize);
+        }
+
+        desc->sendfile.offset = get_int64(buf);
+        buf += sizeof(Uint64);
+
+        desc->sendfile.length = get_int64(buf);
+        buf += sizeof(Uint64);
+
+        ASSERT(desc->sendfile.offset >= 0);
+        ASSERT(desc->sendfile.length >= 0);
+
+        desc->sendfile.ioq_skip = driver_sizeq(desc->inet.port);
+        desc->sendfile.bytes_sent = 0;
+
+        desc->inet.caller = driver_caller(desc->inet.port);
+        desc->tcp_add_flags |= TCP_ADDF_SENDFILE;
+
+        /* See if we can finish sending without selecting & rescheduling. */
+        tcp_inet_sendfile(desc);
+
+        if(desc->sendfile.length > 0) {
+            sock_select(INETP(desc), FD_WRITE, 1);
+        }
+
+        return ctl_reply(INET_REP_OK, NULL, 0, rbuf, rsize);
+#else
+        return ctl_error(ENOTSUP, rbuf, rsize);
+#endif
+    }
+
     default:
 	DEBUGF(("tcp_inet_ctl(%ld): %u\r\n", (long)desc->inet.port, cmd)); 
 	return inet_ctl(INETP(desc), cmd, buf, len, rbuf, rsize);
@@ -9747,12 +9848,27 @@ static void tcp_inet_commandv(ErlDrvData e, ErlIOVec* ev)
 static void tcp_inet_flush(ErlDrvData e)
 {
     tcp_descriptor* desc = (tcp_descriptor*)e;
-    if (!(desc->inet.event_mask & FD_WRITE)) {
-	/* Discard send queue to avoid hanging port (OTP-7615) */
-	tcp_clear_output(desc);
+    int discard_output;
+
+    /* Discard send queue to avoid hanging port (OTP-7615) */
+    discard_output = !(desc->inet.event_mask & FD_WRITE);
+
+    discard_output |= desc->tcp_add_flags & TCP_ADDF_LINGER_ZERO;
+
+#ifdef HAVE_SENDFILE
+    /* The old file driver aborted when it was stopped during sendfile, so
+     * we'll clear the flag and discard all output. */
+    if(desc->tcp_add_flags & TCP_ADDF_SENDFILE) {
+        desc->tcp_add_flags &= ~TCP_ADDF_SENDFILE;
+        close(desc->sendfile.dup_file_fd);
+
+        discard_output = 1;
+    }
+#endif
+
+    if (discard_output) {
+        tcp_clear_output(desc);
     }
-    if (desc->tcp_add_flags & TCP_ADDF_LINGER_ZERO)
-	tcp_clear_output(desc);
 }
 
 static void tcp_inet_process_exit(ErlDrvData e, ErlDrvMonitor *monitorp) 
@@ -10647,7 +10763,9 @@ static int tcp_sendv(tcp_descriptor* desc, ErlIOVec* ev)
 	ev->size += h_len;
     }
 
-    if ((sz = driver_sizeq(ix)) > 0) {
+    sz = driver_sizeq(ix);
+
+    if ((desc->tcp_add_flags & TCP_ADDF_SENDFILE) || sz > 0) {
 	driver_enqv(ix, ev, 0);
 	if (sz+ev->size >= desc->high) {
 	    DEBUGF(("tcp_sendv(%ld): s=%d, sender forced busy\r\n",
@@ -10741,8 +10859,9 @@ static int tcp_send(tcp_descriptor* desc, char* ptr, ErlDrvSizeT len)
 
     inet_output_count(INETP(desc), len+h_len);
 
+    sz = driver_sizeq(ix);
 
-    if ((sz = driver_sizeq(ix)) > 0) {
+    if ((desc->tcp_add_flags & TCP_ADDF_SENDFILE) || sz > 0) {
 	if (h_len > 0)
 	    driver_enq(ix, buf, h_len);
 	driver_enq(ix, ptr, len);
@@ -10832,6 +10951,246 @@ static void tcp_inet_drv_input(ErlDrvData data, ErlDrvEvent event)
     (void)tcp_inet_input((tcp_descriptor*)data, (HANDLE)event);
 }
 
+#ifdef HAVE_SENDFILE
+static int tcp_sendfile_completed(tcp_descriptor* desc) {
+    ErlDrvTermData spec[LOAD_PORT_CNT + LOAD_TUPLE_CNT * 2 +
+        LOAD_ATOM_CNT * 2 + LOAD_UINT_CNT * 2];
+    Uint32 sent_low, sent_high;
+    int i;
+
+    desc->tcp_add_flags &= ~TCP_ADDF_SENDFILE;
+    close(desc->sendfile.dup_file_fd);
+
+    /* While we flushed the output queue prior to sending the file, we've
+     * deferred clearing busy status until now as there's no point in doing so
+     * while we still have a file to send.
+     *
+     * The watermark is checked since more data may have been added while we
+     * were sending the file. */
+
+    if (driver_sizeq(desc->inet.port) <= desc->low) {
+        if (IS_BUSY(INETP(desc))) {
+            desc->inet.caller = desc->inet.busy_caller;
+            desc->inet.state &= ~INET_F_BUSY;
+
+            set_busy_port(desc->inet.port, 0);
+
+            /* if we have a timer then cancel and send ok to client */
+            if (desc->busy_on_send) {
+                driver_cancel_timer(desc->inet.port);
+                desc->busy_on_send = 0;
+            }
+
+            inet_reply_ok(INETP(desc));
+        }
+    }
+
+    if (driver_sizeq(desc->inet.port) == 0) {
+        sock_select(INETP(desc), FD_WRITE, 0);
+        send_empty_out_q_msgs(INETP(desc));
+
+        if (desc->tcp_add_flags & TCP_ADDF_PENDING_SHUTDOWN) {
+            tcp_shutdown_async(desc);
+        }
+    }
+
+    sent_low = ((Uint64)desc->sendfile.bytes_sent >> 0) & 0xFFFFFFFF;
+    sent_high = ((Uint64)desc->sendfile.bytes_sent >> 32) & 0xFFFFFFFF;
+
+    i = LOAD_ATOM(spec, 0, am_sendfile);
+    i = LOAD_PORT(spec, i, desc->inet.dport);
+    i = LOAD_ATOM(spec, i, am_ok);
+    i = LOAD_UINT(spec, i, sent_low);
+    i = LOAD_UINT(spec, i, sent_high);
+    i = LOAD_TUPLE(spec, i, 3);
+    i = LOAD_TUPLE(spec, i, 3);
+
+    ASSERT(i == sizeof(spec)/sizeof(*spec));
+
+    return erl_drv_output_term(desc->inet.dport, spec, i);
+}
+
+static int tcp_sendfile_aborted(tcp_descriptor* desc, int socket_error) {
+    ErlDrvTermData spec[LOAD_PORT_CNT + LOAD_TUPLE_CNT * 2 + LOAD_ATOM_CNT * 3];
+    int i;
+
+    /* We don't clean up sendfile state here, as that's done in tcp_desc_close
+     * following normal error handling. All we do here is report the failure. */
+
+    i = LOAD_ATOM(spec, 0, am_sendfile);
+    i = LOAD_PORT(spec, i, desc->inet.dport);
+    i = LOAD_ATOM(spec, i, am_error);
+
+    switch (socket_error) {
+    case ECONNRESET:
+    case ENOTCONN:
+    case EPIPE:
+        i = LOAD_ATOM(spec, i, am_closed);
+        break;
+    default:
+        i = LOAD_ATOM(spec, i, error_atom(socket_error));
+    }
+
+    i = LOAD_TUPLE(spec, i, 2);
+    i = LOAD_TUPLE(spec, i, 3);
+
+    ASSERT(i == sizeof(spec)/sizeof(*spec));
+
+    return erl_drv_output_term(desc->inet.dport, spec, i);
+}
+
+static int tcp_inet_sendfile(tcp_descriptor* desc) {
+    ErlDrvPort ix = desc->inet.port;
+    int result = 0;
+    ssize_t n;
+
+    DEBUGF(("tcp_inet_sendfile(%ld) {s=%d\r\n", (long)ix, desc->inet.s));
+
+    /* If there was any data in the queue by the time sendfile was issued,
+     * we'll need to skip it first. Note that we don't clear busy status until
+     * we're finished sending the file. */
+    while (desc->sendfile.ioq_skip > 0) {
+        ssize_t bytes_to_send;
+        SysIOVec* iov;
+        int vsize;
+
+        ASSERT(driver_sizeq(ix) >= desc->sendfile.ioq_skip);
+
+        if ((iov = driver_peekq(ix, &vsize)) == NULL) {
+            ERTS_INTERNAL_ERROR("ioq empty when sendfile.ioq_skip > 0");
+        }
+
+        bytes_to_send = MIN(desc->sendfile.ioq_skip, iov[0].iov_len);
+        n = sock_send(desc->inet.s, iov[0].iov_base, bytes_to_send, 0);
+
+        if (!IS_SOCKET_ERROR(n)) {
+            desc->sendfile.ioq_skip -= n;
+            driver_deq(ix, n);
+        } else if (sock_errno() == ERRNO_BLOCK) {
+#ifdef __WIN32__
+            desc->inet.send_would_block = 1;
+#endif
+            goto done;
+        } else if (sock_errno() != EINTR) {
+            goto socket_error;
+        }
+    }
+
+    while (desc->sendfile.length > 0) {
+        /* For some reason the maximum ssize_t cannot be used as the max size.
+         * 1GB seems to work on all platforms */
+        const Sint64 SENDFILE_CHUNK_SIZE = ((1UL << 30) - 1);
+
+        ssize_t bytes_to_send = MIN(SENDFILE_CHUNK_SIZE, desc->sendfile.length);
+        off_t offset = desc->sendfile.offset;
+
+#if defined(__linux__)
+        n = sendfile(desc->inet.s, desc->sendfile.dup_file_fd, &offset,
+            bytes_to_send);
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__DARWIN__)
+        {
+            off_t bytes_sent;
+            int error;
+
+    #if defined(__DARWIN__)
+            bytes_sent = bytes_to_send;
+
+            error = sendfile(desc->sendfile.dup_file_fd, desc->inet.s, offset,
+                &bytes_sent, NULL, 0);
+            n = bytes_sent;
+    #else
+            error = sendfile(desc->sendfile.dup_file_fd, desc->inet.s, offset,
+                bytes_to_send, NULL, &bytes_sent, 0);
+            n = bytes_sent;
+    #endif
+
+            if(error < 0) {
+                /* EAGAIN/EINTR report partial success by setting bytes_sent,
+                 * so we have to skip error handling if nonzero, and skip EOF
+                 * handling if zero, as it's possible that we didn't manage to
+                 * send anything at all before being interrupted by a
+                 * signal. */
+                if((errno != EAGAIN && errno != EINTR) || bytes_sent == 0) {
+                    n = -1;
+                }
+            }
+        }
+#elif defined(__sun) && defined(__SVR4) && defined(HAVE_SENDFILEV)
+        {
+            sendfilevec_t sfvec[1];
+            size_t bytes_sent;
+            ssize_t error;
+
+            sfvec[0].sfv_fd = desc->sendfile.dup_file_fd;
+            sfvec[0].sfv_len = bytes_to_send;
+            sfvec[0].sfv_off = offset;
+            sfvec[0].sfv_flag = 0;
+
+            error = sendfilev(desc->inet.s, sfvec, 1, &bytes_sent);
+            n = bytes_sent;
+
+            if(error < 0) {
+                if(errno == EINVAL) {
+                    /* On some solaris versions (I've seen it on SunOS 5.10),
+                     * using a sfv_len larger than the filesize will result in
+                     * a (-1 && errno == EINVAL). We translate this to a
+                     * successful send of the data.*/
+                } else {
+                    /* EAGAIN/EINTR behavior is identical to *BSD. */
+                    if((errno != EAGAIN && errno != EINTR) || bytes_sent == 0) {
+                        n = -1;
+                    }
+                }
+            }
+        }
+#else
+        #error "Unsupported sendfile syscall; update configure test."
+#endif
+
+        if (n > 0) {
+            desc->sendfile.bytes_sent += n;
+            desc->sendfile.offset += n;
+            desc->sendfile.length -= n;
+        } else if (n == 0) {
+            /* EOF. */
+            desc->sendfile.length = 0;
+            break;
+        } else if (IS_SOCKET_ERROR(n) && sock_errno() != EINTR) {
+            if (sock_errno() != ERRNO_BLOCK) {
+                goto socket_error;
+            }
+
+#ifdef __WIN32__
+            desc->inet.send_would_block = 1;
+#endif
+            break;
+        }
+    }
+
+    if (desc->sendfile.length == 0) {
+        tcp_sendfile_completed(desc);
+    }
+
+    goto done;
+
+socket_error: {
+        int socket_errno = sock_errno();
+
+        DEBUGF(("tcp_inet_sendfile(%ld): send errno = %d (errno %d)\r\n",
+            (long)desc->inet.port, socket_errno, errno));
+
+        result = tcp_send_error(desc, socket_errno);
+        tcp_sendfile_aborted(desc, socket_errno);
+
+        goto done;
+    }
+
+done:
+    DEBUGF(("tcp_inet_sendfile(%ld) }\r\n", (long)desc->inet.port));
+    return result;
+}
+#endif /* HAVE_SENDFILE */
+
 /* socket ready for ouput:
 ** 1. INET_STATE_CONNECTING => non block connect ?
 ** 2. INET_STATE_CONNECTED  => write output
@@ -10892,7 +11251,14 @@ static int tcp_inet_output(tcp_descriptor* desc, HANDLE event)
 	async_ok(INETP(desc));
     }
     else if (IS_CONNECTED(INETP(desc))) {
-	for (;;) {
+
+#ifdef HAVE_SENDFILE
+        if(desc->tcp_add_flags & TCP_ADDF_SENDFILE) {
+            return tcp_inet_sendfile(desc);
+        }
+#endif
+
+        for (;;) {
 	    int vsize;
 	    ssize_t n;
 	    SysIOVec* iov;
diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c
deleted file mode 100644
index f8341f788a..0000000000
--- a/erts/emulator/drivers/unix/unix_efile.c
+++ /dev/null
@@ -1,1102 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 1997-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.
- * 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%
- */
-/*
- * Purpose: Provides file and directory operations for Unix.
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#if defined(HAVE_POSIX_FALLOCATE) && !defined(__sun) && !defined(__sun__)
-#define _XOPEN_SOURCE 600
-#endif
-#if !defined(_GNU_SOURCE) && defined(HAVE_LINUX_FALLOC_H)
-#define _GNU_SOURCE
-#endif
-#include "sys.h"
-#include "erl_driver.h"
-#include "erl_efile.h"
-#include <utime.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_UIO_H
-#include <sys/types.h>
-#include <sys/uio.h>
-#if defined(HAVE_SENDFILE) && (defined(__FreeBSD__) || defined(__DragonFly__))
-/* Need to define __BSD_VISIBLE in order to expose prototype of sendfile */
-#define __BSD_VISIBLE 1
-#include <sys/socket.h>
-#endif
-#endif
-#if defined(HAVE_SENDFILE) && (defined(__linux__) || (defined(__sun) && defined(__SVR4)))
-#include <sys/sendfile.h>
-#endif
-
-#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
-#define __DARWIN__ 1
-#endif
-
-#if defined(__DARWIN__) || defined(HAVE_LINUX_FALLOC_H) || defined(HAVE_POSIX_FALLOCATE)
-#include <fcntl.h>
-#endif
-
-#ifdef HAVE_LINUX_FALLOC_H
-#include <linux/falloc.h>
-#endif
-
-#ifdef SUNOS4
-#  define getcwd(buf, size) getwd(buf)
-#endif
-
-/* Find a definition of MAXIOV, that is used in the code later. */
-#if defined IOV_MAX
-#define MAXIOV IOV_MAX
-#elif defined UIO_MAXIOV
-#define MAXIOV UIO_MAXIOV
-#else
-#define MAXIOV 16
-#endif
-
-
-/*
- * Macros for testing file types.
- */
-
-#define ISDIR(st) (S_ISDIR((st).st_mode))
-#define ISREG(st) (S_ISREG((st).st_mode))
-#define ISDEV(st) (S_ISCHR((st).st_mode) || S_ISBLK((st).st_mode))
-#define ISLNK(st) (S_ISLNK((st).st_mode))
-#ifdef NO_UMASK
-#define FILE_MODE 0644
-#define DIR_MODE  0755
-#else
-#define FILE_MODE 0666
-#define DIR_MODE  0777
-#endif
-
-#define IS_DOT_OR_DOTDOT(s) \
-    (s[0] == '.' && (s[1] == '\0' || (s[1] == '.' && s[2] == '\0')))
-
-static int check_error(int result, Efile_error* errInfo);
-
-static int
-check_error(int result, Efile_error *errInfo)
-{
-    if (result < 0) {
-	errInfo->posix_errno = errInfo->os_errno = errno;
-	return 0;
-    }
-    return 1;
-}
-
-int
-efile_init() {
-   return 1;
-}
-
-int
-efile_mkdir(Efile_error* errInfo,	/* Where to return error codes. */
-	    char* name)			/* Name of directory to create. */
-{
-#ifdef NO_MKDIR_MODE
-    return check_error(mkdir(name), errInfo);
-#else
-    return check_error(mkdir(name, DIR_MODE), errInfo);
-#endif
-}
-
-int
-efile_rmdir(Efile_error* errInfo,	/* Where to return error codes. */
-	    char* name)			/* Name of directory to delete. */
-{
-    if (rmdir(name) == 0) {
-	return 1;
-    }
-    if (errno == ENOTEMPTY) {
-	errno = EEXIST;
-    }
-    if (errno == EEXIST) {
-	int saved_errno = errno;
-	struct stat file_stat;
-	struct stat cwd_stat;
-
-	/*
-	 *  The error code might be wrong if this is the current directory.
-	 */
-
-	if (stat(name, &file_stat) == 0 && stat(".", &cwd_stat) == 0 &&
-	    file_stat.st_ino == cwd_stat.st_ino &&
-	    file_stat.st_dev == cwd_stat.st_dev) {
-	    saved_errno = EINVAL;
-	}
-	errno = saved_errno;
-    }
-    return check_error(-1, errInfo);
-}
-
-int
-efile_delete_file(Efile_error* errInfo,	/* Where to return error codes. */
-		  char* name)		/* Name of file to delete. */
-{
-    if (unlink(name) == 0) {
-	return 1;
-    }
-    if (errno == EISDIR) {	/* Linux sets the wrong error code. */
-	errno = EPERM;
-    }
-    return check_error(-1, errInfo);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- *      Changes the name of an existing file or directory, from src to dst.
- *	If src and dst refer to the same file or directory, does nothing
- *	and returns success.  Otherwise if dst already exists, it will be
- *	deleted and replaced by src subject to the following conditions:
- *	    If src is a directory, dst may be an empty directory.
- *	    If src is a file, dst may be a file.
- *	In any other situation where dst already exists, the rename will
- *	fail.  
- *
- * Results:
- *	If the directory was successfully created, returns 1.
- *	Otherwise the return value is 0 and errno is set to
- *	indicate the error.  Some possible values for errno are:
- *
- *	EACCES:     src or dst parent directory can't be read and/or written.
- *	EEXIST:	    dst is a non-empty directory.
- *	EINVAL:	    src is a root directory or dst is a subdirectory of src.
- *	EISDIR:	    dst is a directory, but src is not.
- *	ENOENT:	    src doesn't exist, or src or dst is "".
- *	ENOTDIR:    src is a directory, but dst is not.  
- *	EXDEV:	    src and dst are on different filesystems.
- *	
- * Side effects:
- *	The implementation of rename may allow cross-filesystem renames,
- *	but the caller should be prepared to emulate it with copy and
- *	delete if errno is EXDEV.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-efile_rename(Efile_error* errInfo,	/* Where to return error codes. */
-	     char* src,		        /* Original name. */
-	     char* dst)			/* New name. */
-{
-    if (rename(src, dst) == 0) {
-	return 1;
-    }
-    if (errno == ENOTEMPTY) {
-	errno = EEXIST;
-    }
-#if defined (sparc)
-    /*
-     * SunOS 4.1.4 reports overwriting a non-empty directory with a
-     * directory as EINVAL instead of EEXIST (first rule out the correct
-     * EINVAL result code for moving a directory into itself).  Must be
-     * conditionally compiled because realpath() is only defined on SunOS.
-     */
-
-    if (errno == EINVAL) {
-	char srcPath[MAXPATHLEN], dstPath[MAXPATHLEN];
-	DIR *dirPtr;
-	struct dirent *dirEntPtr;
-
-#ifdef PURIFY
-	memset(srcPath, '\0', sizeof(srcPath));
-	memset(dstPath, '\0', sizeof(dstPath));
-#endif
-
-	if ((realpath(src, srcPath) != NULL)
-		&& (realpath(dst, dstPath) != NULL)
-		&& (strncmp(srcPath, dstPath, strlen(srcPath)) != 0)) {
-	    dirPtr = opendir(dst);
-	    if (dirPtr != NULL) {
-		while ((dirEntPtr = readdir(dirPtr)) != NULL) {
-		    if ((strcmp(dirEntPtr->d_name, ".") != 0) &&
-			    (strcmp(dirEntPtr->d_name, "..") != 0)) {
-			errno = EEXIST;
-			closedir(dirPtr);
-			return check_error(-1, errInfo);
-		    }
-		}
-		closedir(dirPtr);
-	    }
-	}
-	errno = EINVAL;
-    }
-#endif	/* sparc */
-
-    if (strcmp(src, "/") == 0) {
-	/*
-	 * Alpha reports renaming / as EBUSY and Linux reports it as EACCES,
-	 * instead of EINVAL.
-	 */
-	 
-	errno = EINVAL;
-    }
-
-    /*
-     * DEC Alpha OSF1 V3.0 returns EACCES when attempting to move a
-     * file across filesystems and the parent directory of that file is
-     * not writable.  Most other systems return EXDEV.  Does nothing to
-     * correct this behavior.
-     */
-
-    return check_error(-1, errInfo);
-}
-
-int
-efile_chdir(Efile_error* errInfo,   /* Where to return error codes. */
-	    char* name)		    /* Name of directory to make current. */
-{
-    return check_error(chdir(name), errInfo);
-}
-
-
-int
-efile_getdcwd(Efile_error* errInfo,	/* Where to return error codes. */
-	      int drive,		/* 0 - current, 1 - A, 2 - B etc. */
-	      char* buffer,		/* Where to return the current 
-					   directory. */
-	      size_t size)		/* Size of buffer. */
-{
-    if (drive == 0) {
-	if (getcwd(buffer, size) == NULL)
-	    return check_error(-1, errInfo);
-	
-#ifdef SIMSPARCSOLARIS
-	/* We get "host:" prepended to the dirname - remove!. */
-	{
-	  int i = 0;
-	  int j = 0;
-	  while ((buffer[i] != ':') && (buffer[i] != '\0')) i++;
-	  if (buffer[i] == ':') {
-	    i++;
-	    while ((buffer[j++] = buffer[i++]) != '\0');
-	  }
-	}
-#endif	      
-	return 1;
-    }
-
-    /*
-     * Drives other than 0 is not supported on Unix.
-     */
-
-    errno = ENOTSUP;
-    return check_error(-1, errInfo);
-}
-
-int
-efile_readdir(Efile_error* errInfo,	/* Where to return error codes. */
-	      char* name,		/* Name of directory to open. */
-	      EFILE_DIR_HANDLE* p_dir_handle,	/* Pointer to directory 
-						   handle of
-						   open directory.*/
-	      char* buffer,		/* Pointer to buffer for 
-					   one filename. */
-	      size_t *size)		/* in-out Size of buffer, length
-					   of name. */
-{
-    DIR *dp;			/* Pointer to directory structure. */
-    struct dirent* dirp;	/* Pointer to directory entry. */
-
-    /*
-     * If this is the first call, we must open the directory.
-     */
-
-    if (*p_dir_handle == NULL) {
-	dp = opendir(name);
-	if (dp == NULL)
-	    return check_error(-1, errInfo);
-	*p_dir_handle = (EFILE_DIR_HANDLE) dp;
-    }
-
-    /*
-     * Retrieve the name of the next file using the directory handle.
-     */
-
-    dp = *((DIR **)((void *)p_dir_handle));
-    for (;;) {
-	dirp = readdir(dp);
-	if (dirp == NULL) {
-	    closedir(dp);
-	    return 0;
-	}
-	if (IS_DOT_OR_DOTDOT(dirp->d_name))
-	    continue;
-	buffer[0] = '\0';
-	strncat(buffer, dirp->d_name, (*size)-1);
-	*size = strlen(dirp->d_name);
-	return 1;
-    }
-}
-
-int
-efile_openfile(Efile_error* errInfo,	/* Where to return error codes. */
-	       char* name,		/* Name of directory to open. */
-	       int flags,		/* Flags to user for opening. */
-	       int* pfd,		/* Where to store the file 
-					   descriptor. */
-	       Sint64 *pSize)		/* Where to store the size of the 
-					   file. */
-{
-    struct stat statbuf;
-    int fd;
-    int mode;			/* Open mode. */
-
-    switch (flags & (EFILE_MODE_READ|EFILE_MODE_WRITE)) {
-    case EFILE_MODE_READ:
-	mode = O_RDONLY;
-	break;
-    case EFILE_MODE_WRITE:
-	if (flags & EFILE_NO_TRUNCATE)
-	    mode = O_WRONLY | O_CREAT;
-	else
-	    mode = O_WRONLY | O_CREAT | O_TRUNC;
-	break;
-    case EFILE_MODE_READ_WRITE:
-	mode = O_RDWR | O_CREAT;
-	break;
-    default:
-	errno = EINVAL;
-	return check_error(-1, errInfo);
-    }
-
-    if (flags & EFILE_MODE_APPEND) {
-	mode &= ~O_TRUNC;
-	mode |= O_APPEND;
-    }
-    if (flags & EFILE_MODE_EXCL) {
-	mode |= O_EXCL;
-    }
-    if (flags & EFILE_MODE_SYNC) {
-#ifdef O_SYNC
-	mode |= O_SYNC;
-#else
-	errno = ENOTSUP;
-	return check_error(-1, errInfo);
-#endif
-    }
-
-#ifdef HAVE_FSTAT
-    while (((fd = open(name, mode, FILE_MODE)) < 0) && (errno == EINTR));
-    if (!check_error(fd, errInfo)) return 0;
-#endif
-
-    if (
-#ifdef HAVE_FSTAT
-        fstat(fd, &statbuf) < 0
-#else
-        stat(name, &statbuf) < 0
-#endif
-        ) {
-        /* statbuf is undefined: if the caller depends on it,
-           i.e. invoke_read_file(), fail the call immediately */
-        if (pSize && flags == EFILE_MODE_READ) {
-            check_error(-1, errInfo);
-#ifdef HAVE_FSTAT
-            efile_closefile(fd);
-#endif
-            return 0;
-        }
-    }
-    else if (! ISREG(statbuf)) {
-        struct stat nullstatbuf;
-	/*
-	 * For UNIX only, here is some ugly code to allow
-	 * /dev/null to be opened as a file.
-	 */
-        if ( (stat("/dev/null", &nullstatbuf) < 0)
-             || (statbuf.st_ino != nullstatbuf.st_ino)
-             || (statbuf.st_dev != nullstatbuf.st_dev) ) {
-#ifdef HAVE_FSTAT
-            efile_closefile(fd);
-#endif
-	    errno = EISDIR;
-	    return check_error(-1, errInfo);
-        }
-    }
-
-#ifndef HAVE_FSTAT
-    while (((fd = open(name, mode, FILE_MODE)) < 0) && (errno == EINTR));
-    if (!check_error(fd, errInfo)) return 0;
-#endif
-
-    *pfd = fd;
-    if (pSize) *pSize = statbuf.st_size;
-    return 1;
-}
-
-int 
-efile_may_openfile(Efile_error* errInfo, char *name) {
-    struct stat statbuf;	/* Information about the file */
-    int result;
-    
-    result = stat(name, &statbuf);
-    if (!check_error(result, errInfo))
-	return 0;
-    if (!ISREG(statbuf)) {
-	errno = EISDIR;
-	return check_error(-1, errInfo);
-    }
-    return 1;
-}
-
-void
-efile_closefile(int fd)
-{
-    while((close(fd) < 0) && (errno == EINTR));
-}
-
-int
-efile_fdatasync(Efile_error *errInfo, /* Where to return error codes. */
-	    int fd)               /* File descriptor for file to sync data. */
-{
-#if defined(HAVE_FDATASYNC) && !defined(__DARWIN__)
-    return check_error(fdatasync(fd), errInfo);
-#else
-    return efile_fsync(errInfo, fd);
-#endif
-}
-
-int
-efile_fsync(Efile_error *errInfo, /* Where to return error codes. */
-	    int fd)               /* File descriptor for file to sync. */
-{
-#ifdef NO_FSYNC
-  undefined fsync /* XXX: Really? */
-#else
-#if defined(__DARWIN__) && defined(F_FULLFSYNC)
-    return check_error(fcntl(fd, F_FULLFSYNC), errInfo);
-#else
-    return check_error(fsync(fd), errInfo);
-#endif /* __DARWIN__ */
-#endif /* NO_FSYNC */
-}
-
-int
-efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo, 
-	       char* name, int info_for_link)
-{
-    struct stat statbuf;	/* Information about the file */
-    int result;
-
-    if (info_for_link) {
-	result = lstat(name, &statbuf);
-    } else {
-	result = stat(name, &statbuf);
-    }	
-    if (!check_error(result, errInfo)) {
-	return 0;
-    }
-
-#if SIZEOF_OFF_T == 4
-    pInfo->size_high = 0;
-#else
-    pInfo->size_high = (Uint32)(statbuf.st_size >> 32);
-#endif
-    pInfo->size_low = (Uint32)statbuf.st_size;
-
-#ifdef NO_ACCESS
-    /* Just look at read/write access for owner. */
-
-    pInfo->access = ((statbuf.st_mode >> 6) & 07) >> 1;
-
-#else
-    pInfo->access = FA_NONE;
-    if (access(name, R_OK) == 0)
-	pInfo->access |= FA_READ;
-    if (access(name, W_OK) == 0)
-	pInfo->access |= FA_WRITE;
-
-#endif	
-
-    if (ISDEV(statbuf))
-	pInfo->type = FT_DEVICE;
-    else if (ISDIR(statbuf))
-	pInfo->type = FT_DIRECTORY;
-    else if (ISREG(statbuf))
-	pInfo->type = FT_REGULAR;
-    else if (ISLNK(statbuf))
-	pInfo->type = FT_SYMLINK;
-    else
-	pInfo->type = FT_OTHER;
-
-    pInfo->accessTime   = (Sint64)statbuf.st_atime;
-    pInfo->modifyTime   = (Sint64)statbuf.st_mtime;
-    pInfo->cTime        = (Sint64)statbuf.st_ctime;
-
-    pInfo->mode         = statbuf.st_mode;
-    pInfo->links        = statbuf.st_nlink;
-    pInfo->major_device = statbuf.st_dev;
-    pInfo->minor_device = statbuf.st_rdev;
-    pInfo->inode        = statbuf.st_ino;
-    pInfo->uid          = statbuf.st_uid;
-    pInfo->gid          = statbuf.st_gid;
-
-    return 1;
-}
-
-int
-efile_write_info(Efile_error *errInfo, Efile_info *pInfo, char *name)
-{
-    struct utimbuf tval;
-
-    /*
-     * On some systems chown will always fail for a non-root user unless
-     * POSIX_CHOWN_RESTRICTED is not set.  Others will succeed as long as 
-     * you don't try to chown a file to someone besides youself.
-     */
-
-    if (chown(name, pInfo->uid, pInfo->gid) && errno != EPERM) {
-	return check_error(-1, errInfo);
-    }
-
-    if (pInfo->mode != -1) {
-	mode_t newMode = pInfo->mode & (S_ISUID | S_ISGID |
-					S_IRWXU | S_IRWXG | S_IRWXO);
-	if (chmod(name, newMode)) {
-	    newMode &= ~(S_ISUID | S_ISGID);
-	    if (chmod(name, newMode)) {
-		return check_error(-1, errInfo);
-	    }
-	}
-    }
-
-    tval.actime  = (time_t)pInfo->accessTime;
-    tval.modtime = (time_t)pInfo->modifyTime;
-
-    return check_error(utime(name, &tval), errInfo);
-}
-
-
-int
-efile_write(Efile_error* errInfo,	/* Where to return error codes. */
-	    int flags,			/* Flags given when file was 
-					   opened. */
-	    int fd,			/* File descriptor to write to. */
-	    char* buf,			/* Buffer to write. */
-	    size_t count)		/* Number of bytes to write. */
-{
-    ssize_t written;			/* Bytes written in last operation. */
-
-    while (count > 0) {
-	if ((written = write(fd, buf, count)) < 0) {
-	    if (errno != EINTR)
-		return check_error(-1, errInfo);
-	    else
-		written = 0;
-	}
-	ASSERT(written <= count);
-	buf += written;
-	count -= written;
-    }
-    return 1;
-}
-
-int
-efile_writev(Efile_error* errInfo,   /* Where to return error codes */
-	     int flags,              /* Flags given when file was
-				      * opened */
-	     int fd,                 /* File descriptor to write to */
-	     SysIOVec* iov,          /* Vector of buffer structs.
-				      * The structs may be changed i.e.
-				      * due to incomplete writes */
-	     int iovcnt)             /* Number of structs in vector */
-{
-    int cnt = 0;                     /* Buffers so far written */
-
-    ASSERT(iovcnt >= 0);
-    
-    while (cnt < iovcnt) {
-	if ((! iov[cnt].iov_base) || (iov[cnt].iov_len <= 0)) {
-	    /* Empty buffer - skip */
-	    cnt++;
-	} else { /* Non-empty buffer */
-	    ssize_t w;                   /* Bytes written in this call */
-#ifdef HAVE_WRITEV
-	    int b = iovcnt - cnt;        /* Buffers to write */
-	    /* Use as many buffers as MAXIOV allows */
-	    if (b > MAXIOV)
-		b = MAXIOV;
-	    if (b > 1) {
-		do {
-		    w = writev(fd, &iov[cnt], b);
-		} while (w < 0 && errno == EINTR);
-		if (w < 0 && errno == EINVAL) {
-		    goto single_write;
-		}
-	    } else
-	    single_write:
-		/* Degenerated io vector - use regular write */
-#endif
-		{
-		    do {
-			size_t iov_len = iov[cnt].iov_len;
-			size_t limit = 1024*1024*1024; /* 1GB */
-			if (iov_len > limit) {
-			    iov_len = limit;
-			}
-			w = write(fd, iov[cnt].iov_base, iov_len);
-		    } while (w < 0 && errno == EINTR);
-		    ASSERT(w <= iov[cnt].iov_len ||
-			   (w == -1 && errno != EINTR));
-		}
-	    if (w < 0) return check_error(-1, errInfo);
-	    /* Move forward to next buffer to write */
-	    for (; cnt < iovcnt && w > 0; cnt++) {
-		if (iov[cnt].iov_base && iov[cnt].iov_len > 0) {
-		    if (w < iov[cnt].iov_len) {
-			/* Adjust the buffer for next write */
-			iov[cnt].iov_len -= w;
-			iov[cnt].iov_base = ((char *)iov[cnt].iov_base) + w;
-			w = 0;
-			break;
-		    } else {
-			w -= iov[cnt].iov_len;
-		    }
-		}
-	    }
-	    ASSERT(w == 0);
-	} /* else Non-empty buffer */
-    } /* while (cnt< iovcnt) */
-    return 1;
-}
-
-int
-efile_read(Efile_error* errInfo,     /* Where to return error codes. */
-	   int flags,		     /* Flags given when file was opened. */
-	   int fd,		     /* File descriptor to read from. */
-	   char* buf,		     /* Buffer to read into. */
-	   size_t count,	     /* Number of bytes to read. */
-	   size_t *pBytesRead)	     /* Where to return number of 
-					bytes read. */
-{
-    ssize_t n;
-
-    for (;;) {
-	if ((n = read(fd, buf, count)) >= 0)
-	    break;
-	else if (errno != EINTR)
-	    return check_error(-1, errInfo);
-    }
-    *pBytesRead = (size_t) n;
-    return 1;
-}
-
-
-/* pread() and pwrite()                                                   */
-/* Some unix systems, notably Solaris has these syscalls                  */
-/* It is especially nice for i.e. the dets module to have support         */
-/* for this, even if the underlying OS dosn't support it, it is           */
-/* reasonably easy to work around by first calling seek, and then         */
-/* calling read().                                                        */
-/* This later strategy however changes the file pointer, which pread()    */
-/* does not do. We choose to ignore this and say that the location        */
-/* of the file pointer is undefined after a call to any of the p functions*/
-
-
-int
-efile_pread(Efile_error* errInfo,     /* Where to return error codes. */
-	    int fd,		      /* File descriptor to read from. */
-	    Sint64 offset,            /* Offset in bytes from BOF. */
-	    char* buf,		      /* Buffer to read into. */
-	    size_t count,	      /* Number of bytes to read. */
-	    size_t *pBytesRead)	      /* Where to return 
-					 number of bytes read. */
-{
-#if defined(HAVE_PREAD) && defined(HAVE_PWRITE)
-    ssize_t n;
-    off_t off = (off_t) offset;
-    if (off != offset) {
-	errno = EINVAL;
-	return check_error(-1, errInfo);
-    }
-    for (;;) {
-	if ((n = pread(fd, buf, count, offset)) >= 0)
-	    break;
-	else if (errno != EINTR)
-	    return check_error(-1, errInfo);
-    }
-    *pBytesRead = (size_t) n;
-    return 1;
-#else
-    {
-	int res = efile_seek(errInfo, fd, offset, EFILE_SEEK_SET, NULL);
-	if (res) {
-	    return efile_read(errInfo, 0, fd, buf, count, pBytesRead);
-	} else {
-	    return res;
-	}
-    }
-#endif
-}
-
-
-
-int
-efile_pwrite(Efile_error* errInfo,  /* Where to return error codes. */
-	     int fd,		    /* File descriptor to write to. */
-	     char* buf,		    /* Buffer to write. */
-	     size_t count,	    /* Number of bytes to write. */
-	     Sint64 offset)	    /* where to write it */
-{ 
-#if defined(HAVE_PREAD) && defined(HAVE_PWRITE)
-    ssize_t written;		    /* Bytes written in last operation. */
-    off_t off = (off_t) offset;
-    if (off != offset) {
-	errno = EINVAL;
-	return check_error(-1, errInfo);
-    }
-    
-    while (count > 0) {
-	if ((written = pwrite(fd, buf, count, offset)) < 0) {
-	    if (errno != EINTR)
-		return check_error(-1, errInfo);
-	    else
-		written = 0;
-	}
-	ASSERT(written <= count);
-	buf += written;
-	count -= written;
-	offset += written;
-    }
-    return 1;
-#else  /* For unix systems that don't support pread() and pwrite() */    
-    {
-	int res = efile_seek(errInfo, fd, offset, EFILE_SEEK_SET, NULL);
-	
-	if (res) {
-	    return efile_write(errInfo, 0, fd, buf, count);
-	} else {
-	    return res;
-	}
-    }
-#endif
-}
-
-
-int
-efile_seek(Efile_error* errInfo,      /* Where to return error codes. */
-	   int fd,                    /* File descriptor to do the seek on. */
-	   Sint64 offset,             /* Offset in bytes from the given 
-					 origin. */ 
-	   int origin,                /* Origin of seek (SEEK_SET, SEEK_CUR,
-				         SEEK_END). */ 
-	   Sint64 *new_location)      /* Resulting new location in file. */
-{
-    off_t off, result;
-
-    switch (origin) {
-    case EFILE_SEEK_SET: origin = SEEK_SET; break;
-    case EFILE_SEEK_CUR: origin = SEEK_CUR; break;
-    case EFILE_SEEK_END: origin = SEEK_END; break;
-    default:
-	errno = EINVAL;
-	return check_error(-1, errInfo);
-    }
-    off = (off_t) offset;
-    if (off != offset) {
-	errno = EINVAL;
-	return check_error(-1, errInfo);
-    }
-    
-    errno = 0;
-    result = lseek(fd, off, origin);
-
-    /*
-     * Note that the man page for lseek (on SunOs 5) says:
-     * 
-     * "if fildes is a remote file  descriptor  and  offset  is
-     * negative,  lseek()  returns  the  file pointer even if it is
-     * negative."
-     */
-
-    if (result < 0 && errno == 0)
-	errno = EINVAL;
-    if (result < 0)
-	return check_error(-1, errInfo);
-    if (new_location) {
-	*new_location = result;
-    }
-    return 1;
-}
-
-
-int
-efile_truncate_file(Efile_error* errInfo, int *fd, int flags)
-{
-#ifndef NO_FTRUNCATE
-    off_t offset;
-
-    return check_error((offset = lseek(*fd, 0, 1)) >= 0 &&
-		       ftruncate(*fd, offset) == 0 ? 1 : -1,
-		       errInfo);
-#else
-    return 1;
-#endif
-}
-
-int
-efile_readlink(Efile_error* errInfo, char* name, char* buffer, size_t size)
-{
-    int len;
-    ASSERT(size > 0);
-    len = readlink(name, buffer, size-1);
-    if (len == -1) {
-	return check_error(-1, errInfo);
-    }
-    buffer[len] = '\0';
-    return 1;
-}
-
-int
-efile_altname(Efile_error* errInfo, char* name, char* buffer, size_t size)
-{
-    errno = ENOTSUP;
-    return check_error(-1, errInfo);
-}
-
-int
-efile_link(Efile_error* errInfo, char* old, char* new)
-{
-    return check_error(link(old, new), errInfo);
-}
-
-int
-efile_symlink(Efile_error* errInfo, char* old, char* new)
-{
-    return check_error(symlink(old, new), errInfo);
-}
-
-int
-efile_fadvise(Efile_error* errInfo, int fd, Sint64 offset,
-		  Sint64 length, int advise)
-{
-#ifdef HAVE_POSIX_FADVISE
-    return check_error(posix_fadvise(fd, offset, length, advise), errInfo);
-#else
-    return check_error(0, errInfo);
-#endif
-}
-
-#ifdef HAVE_SENDFILE
-/* For some reason the maximum size_t cannot be used as the max size
-   3GB seems to work on all platforms */
-#define SENDFILE_CHUNK_SIZE ((1UL << 30) -1)
-
-/*
- * sendfile: The implementation of the sendfile system call varies
- * a lot on different *nix platforms so to make the api similar in all
- * we have to emulate some things in linux and play with variables on
- * bsd/darwin.
- *
- * All of the calls will split a command which tries to send more than
- * SENDFILE_CHUNK_SIZE of data at once.
- *
- * On platforms where *nbytes of 0 does not mean the entire file, this is
- * simulated.
- *
- * It could be possible to implement header/trailer in sendfile. Though
- * you would have to emulate it in linux and on BSD/Darwin some complex
- * calculations have to be made when using a non blocking socket to figure
- * out how much of the header/file/trailer was sent in each command.
- *
- * The semantics of the API is this:
- * Return value: 1 if all data was sent and the function does not need to
- * be called again. 0 if an error occures OR if there is more data which
- * has to be sent (EAGAIN or EINTR will be set appropriately)
- *
- * The amount of data written in a call is returned through nbytes.
- *
- */
-
-int
-efile_sendfile(Efile_error* errInfo, int in_fd, int out_fd,
-	       off_t *offset, Uint64 *nbytes, struct t_sendfile_hdtl* hdtl)
-{
-    Uint64 written = 0;
-#if defined(__linux__)
-    ssize_t retval;
-    do {
-      /* check if *nbytes is 0 or greater than chunk size */
-      if (*nbytes == 0 || *nbytes > SENDFILE_CHUNK_SIZE)
-	retval = sendfile(out_fd, in_fd, offset, SENDFILE_CHUNK_SIZE);
-      else
-	retval = sendfile(out_fd, in_fd, offset, *nbytes);
-      if (retval > 0) {
-	written += retval;
-	*nbytes -= retval;
-      }
-    } while (retval == SENDFILE_CHUNK_SIZE);
-    if (written != 0) {
-      /* -1 is not returned by the linux API so we have to simulate it */
-      retval = -1;
-      errno = EAGAIN;
-    }
-#elif defined(__sun) && defined(__SVR4) && defined(HAVE_SENDFILEV)
-    ssize_t retval;
-    size_t len;
-    sendfilevec_t fdrec;
-    fdrec.sfv_fd = in_fd;
-    fdrec.sfv_flag = 0;
-    do {
-      fdrec.sfv_off = *offset;
-      len = 0;
-      /* check if *nbytes is 0 or greater than chunk size */
-      if (*nbytes == 0 || *nbytes > SENDFILE_CHUNK_SIZE)
-	fdrec.sfv_len = SENDFILE_CHUNK_SIZE;
-      else
-	fdrec.sfv_len = *nbytes;
-
-      retval = sendfilev(out_fd, &fdrec, 1, &len);
-
-      if (retval == -1 && errno == EINVAL) {
-          /* On some solaris versions (I've seen it on SunOS 5.10),
-             using a sfv_len larger then a filesize will result in
-             a -1 && errno == EINVAL return. We translate this so
-             a successful send of the data.*/
-          retval = len;
-      }
-
-      if (retval != -1 || errno == EAGAIN || errno == EINTR) {
-        *offset += len;
-	*nbytes -= len;
-	written += len;
-      }
-    } while (len == SENDFILE_CHUNK_SIZE);
-#elif defined(__DARWIN__)
-    int retval;
-    off_t len;
-    do {
-      /* check if *nbytes is 0 or greater than chunk size */
-      if(*nbytes > SENDFILE_CHUNK_SIZE)
-	len = SENDFILE_CHUNK_SIZE;
-      else
-	len = *nbytes;
-      retval = sendfile(in_fd, out_fd, *offset, &len, NULL, 0);
-      if (retval != -1 || errno == EAGAIN || errno == EINTR) {
-        *offset += len;
-	*nbytes -= len;
-	written += len;
-      }
-    } while (len == SENDFILE_CHUNK_SIZE);
-#elif defined(__FreeBSD__) || defined(__DragonFly__)
-    off_t len;
-    int retval;
-    do {
-      if (*nbytes > SENDFILE_CHUNK_SIZE)
-	retval = sendfile(in_fd, out_fd, *offset, SENDFILE_CHUNK_SIZE,
-			  NULL, &len, 0);
-      else
-	retval = sendfile(in_fd, out_fd, *offset, *nbytes, NULL, &len, 0);
-      if (retval != -1 || errno == EAGAIN || errno == EINTR) {
-	*offset += len;
-	*nbytes -= len;
-	written += len;
-      }
-    } while(len == SENDFILE_CHUNK_SIZE);
-#endif
-    *nbytes = written;
-    return check_error(retval, errInfo);
-}
-#endif /* HAVE_SENDFILE */
-
-#ifdef HAVE_POSIX_FALLOCATE
-static int
-call_posix_fallocate(int fd, Sint64 offset, Sint64 length)
-{
-    int ret;
-
-    /*
-     * On Linux and Solaris for example, posix_fallocate() returns
-     * a positive error number on error and it does not set errno.
-     * On FreeBSD however (9.0 at least), it returns -1 on error
-     * and it sets errno.
-     */
-    do {
-        ret = posix_fallocate(fd, (off_t) offset, (off_t) length);
-        if (ret > 0) {
-            errno = ret;
-            ret = -1;
-        }
-    } while (ret != 0 && errno == EINTR);
-
-    return ret;
-}
-#endif /* HAVE_POSIX_FALLOCATE */
-
-int
-efile_fallocate(Efile_error* errInfo, int fd, Sint64 offset, Sint64 length)
-{
-#if defined HAVE_FALLOCATE
-    /* Linux specific, more efficient than posix_fallocate. */
-    int ret;
-
-    do {
-        ret = fallocate(fd, FALLOC_FL_KEEP_SIZE, (off_t) offset, (off_t) length);
-    } while (ret != 0 && errno == EINTR);
-
-#if defined HAVE_POSIX_FALLOCATE
-    /* Fallback to posix_fallocate if available. */
-    if (ret != 0) {
-        ret = call_posix_fallocate(fd, offset, length);
-    }
-#endif
-
-    return check_error(ret, errInfo);
-#elif defined F_PREALLOCATE
-    /* Mac OS X specific, equivalent to posix_fallocate. */
-    int ret;
-    fstore_t fs;
-
-    memset(&fs, 0, sizeof(fs));
-    fs.fst_flags = F_ALLOCATECONTIG;
-    fs.fst_posmode = F_VOLPOSMODE;
-    fs.fst_offset = (off_t) offset;
-    fs.fst_length = (off_t) length;
-
-    ret = fcntl(fd, F_PREALLOCATE, &fs);
-
-    if (-1 == ret) {
-        fs.fst_flags = F_ALLOCATEALL;
-        ret = fcntl(fd, F_PREALLOCATE, &fs);
-
-#if defined HAVE_POSIX_FALLOCATE
-        /* Fallback to posix_fallocate if available. */
-        if (-1 == ret) {
-            ret = call_posix_fallocate(fd, offset, length);
-        }
-#endif
-    }
-
-    return check_error(ret, errInfo);
-#elif defined HAVE_POSIX_FALLOCATE
-    /* Other Unixes, use posix_fallocate if available. */
-    return check_error(call_posix_fallocate(fd, offset, length), errInfo);
-#else
-    errno = ENOTSUP;
-    return check_error(-1, errInfo);
-#endif
-}
diff --git a/erts/emulator/drivers/win32/win_efile.c b/erts/emulator/drivers/win32/win_efile.c
deleted file mode 100644
index 2d366b5833..0000000000
--- a/erts/emulator/drivers/win32/win_efile.c
+++ /dev/null
@@ -1,2058 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 1997-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%
- */
-/*
- * Purpose: Provides file and directory operations for Windows.
- */
-
-#include <windows.h>
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include "sys.h"
-#include <ctype.h>
-#include <wchar.h>
-#include "erl_efile.h"
-
-#define DBG_TRACE_MASK 0
-/* 1 = file name ops
- * 2 = file descr ops
- * 4 = errors
- * 8 = path name conversion
- */
-#if !DBG_TRACE_MASK
-#  define DBG_TRACE(M,S)
-#  define DBG_TRACE1(M,FMT,A)
-#  define DBG_TRACE2(M,FMT,A,B)
-#else
-#  define DBG_TRACE(M,S) do { if ((M)&DBG_TRACE_MASK) fwprintf(stderr, L"DBG_TRACE %d: %s\r\n", __LINE__, (WCHAR*)(S)); }while(0)
-#  define DBG_TRACE1(M,FMT,A) do { if ((M)&DBG_TRACE_MASK) fwprintf(stderr, L"DBG_TRACE %d: " L##FMT L"\r\n", __LINE__, (A)); }while(0)
-#  define DBG_TRACE2(M,FMT,A,B) do { if ((M)&DBG_TRACE_MASK) fwprintf(stderr, L"DBG_TRACE %d: " L##FMT L"\r\n", __LINE__, (A), (B)); }while(0)
-#endif
-
-/*
- * Microsoft-specific function to map a WIN32 error code to a Posix errno.
- */
-
-#define ISSLASH(a)  ((a) == L'\\' || (a) == L'/')
-#define ISDIR(st) (((st).st_mode&S_IFMT) == S_IFDIR)
-#define ISREG(st) (((st).st_mode&S_IFMT) == S_IFREG)
-
-#define IS_DOT_OR_DOTDOT(s) \
-    ((s)[0] == L'.' && ((s)[1] == L'\0' || ((s)[1] == L'.' && (s)[2] == L'\0')))
-
-#define FILE_SHARE_FLAGS (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE)
-
-#ifndef INVALID_FILE_ATTRIBUTES
-#define INVALID_FILE_ATTRIBUTES ((DWORD) 0xFFFFFFFF)
-#endif
-
-#define TICKS_PER_SECOND (10000000ULL)
-#define EPOCH_DIFFERENCE (11644473600LL)
-
-#define FILETIME_TO_EPOCH(epoch, ft) \
-    do { \
-	ULARGE_INTEGER ull; \
-	ull.LowPart  = (ft).dwLowDateTime; \
-	ull.HighPart = (ft).dwHighDateTime; \
-	(epoch) = ((ull.QuadPart / TICKS_PER_SECOND) - EPOCH_DIFFERENCE); \
-    } while(0)
-
-#define EPOCH_TO_FILETIME(ft, epoch) \
-    do { \
-	ULARGE_INTEGER ull; \
-	ull.QuadPart = (((epoch) + EPOCH_DIFFERENCE) * TICKS_PER_SECOND); \
-	(ft).dwLowDateTime = ull.LowPart; \
-	(ft).dwHighDateTime = ull.HighPart; \
-    } while(0)
-
-
-static int check_error(int result, Efile_error* errInfo);
-static int set_error(Efile_error* errInfo);
-static int set_os_errno(Efile_error* errInfo, DWORD os_errno);
-static int is_root_unc_name(const WCHAR *path);
-static int extract_root(WCHAR *name);
-static unsigned short dos_to_posix_mode(int attr, const WCHAR *name);
-
-
-struct wpath_tmp_buffer {
-    struct wpath_tmp_buffer* next;
-    WCHAR buffer[1];
-};
-
-typedef struct {
-    Efile_error* errInfo;
-    struct wpath_tmp_buffer* buf_list;
-}Efile_call_state;
-
-static void call_state_init(Efile_call_state* state, Efile_error* errInfo)
-{
-    state->errInfo = errInfo;
-    state->buf_list = NULL;
-}
-static WCHAR* wpath_tmp_alloc(Efile_call_state* state, size_t len)
-{
-    size_t sz = offsetof(struct wpath_tmp_buffer, buffer)
-	+ (len+1)*sizeof(WCHAR);
-    struct wpath_tmp_buffer* p = driver_alloc(sz);
-    p->next = state->buf_list;
-    state->buf_list = p;
-    return p->buffer;
-}
-static void call_state_free(Efile_call_state* state)
-{
-    while(state->buf_list) {
-	struct wpath_tmp_buffer* next = state->buf_list->next;
-	driver_free(state->buf_list);
-	state->buf_list = next;
-    }
-}
-static WCHAR* get_cwd_wpath_tmp(Efile_call_state* state)
-{
-    WCHAR dummy;
-    DWORD size = GetCurrentDirectoryW(0, &dummy);
-    WCHAR* ret = NULL;
-
-    if (size) {
-	ret = wpath_tmp_alloc(state, size);
-	if (!GetCurrentDirectoryW(size, ret)) {
-	    ret = NULL;
-	}
-    }
-    return ret;
-}
-static WCHAR* get_full_wpath_tmp(Efile_call_state* state,
-                                 const WCHAR* file,
-				 WCHAR** file_part,
-				 DWORD extra)
-{
-    WCHAR dummy;
-    DWORD size = GetFullPathNameW(file, 0, &dummy, NULL);
-    WCHAR* ret = NULL;
-
-    if (size) {
-	int ok;
-	ret = wpath_tmp_alloc(state, size + extra);
-	if (file_part) {
-	    ok = (GetFullPathNameW(file, size, ret, file_part) != 0);
-	}
-	else {
-	    ok = (_wfullpath(ret, file, size) != NULL);
-	}
-	if (!ok) {
-	    ret = NULL;
-	}
-    }
-    return ret;
-}
-
-static void ensure_wpath_max(Efile_call_state* state, WCHAR** pathp, size_t max);
-static int do_rmdir(Efile_call_state*, char* name);
-static int do_rename(Efile_call_state*, char* src, char* dst);
-static int do_readdir(Efile_call_state*, char* name, EFILE_DIR_HANDLE*, char* buffer, size_t *size);
-static int do_fileinfo(Efile_call_state*, Efile_info*, char* orig_name, int info_for_link);
-static char* do_readlink(Efile_call_state*, char* name, char* buffer, size_t size);
-static int do_altname(Efile_call_state*, char* orig_name, char* buffer, size_t size);
-
-
-static int errno_map(DWORD last_error) {
-
-    switch (last_error) {
-    case ERROR_SUCCESS:
-	return 0;
-    case ERROR_INVALID_FUNCTION:
-    case ERROR_INVALID_DATA:
-    case ERROR_INVALID_PARAMETER:
-    case ERROR_INVALID_TARGET_HANDLE:
-    case ERROR_INVALID_CATEGORY:
-    case ERROR_NEGATIVE_SEEK:
-	return EINVAL;
-    case ERROR_DIR_NOT_EMPTY:
-	return EEXIST;
-    case ERROR_BAD_FORMAT:
-	return ENOEXEC;
-    case ERROR_PATH_NOT_FOUND:
-    case ERROR_FILE_NOT_FOUND:
-    case ERROR_NO_MORE_FILES:
-	return ENOENT;
-    case ERROR_TOO_MANY_OPEN_FILES:
-	return EMFILE;
-    case ERROR_ACCESS_DENIED:
-    case ERROR_INVALID_ACCESS:
-    case ERROR_CURRENT_DIRECTORY:
-    case ERROR_SHARING_VIOLATION:
-    case ERROR_LOCK_VIOLATION:
-    case ERROR_INVALID_PASSWORD:
-    case ERROR_DRIVE_LOCKED:
-	return EACCES;
-    case ERROR_INVALID_HANDLE:
-	return EBADF;
-    case ERROR_NOT_ENOUGH_MEMORY:
-    case ERROR_OUTOFMEMORY:
-    case ERROR_OUT_OF_STRUCTURES:
-	return ENOMEM;
-    case ERROR_INVALID_DRIVE:
-    case ERROR_BAD_UNIT:
-    case ERROR_NOT_READY:
-    case ERROR_REM_NOT_LIST:
-    case ERROR_DUP_NAME:
-    case ERROR_BAD_NETPATH:
-    case ERROR_NETWORK_BUSY:
-    case ERROR_DEV_NOT_EXIST:
-    case ERROR_BAD_NET_NAME:
-	return ENXIO;
-    case ERROR_NOT_SAME_DEVICE:
-	return EXDEV;
-    case ERROR_WRITE_PROTECT:
-	return EROFS;
-    case ERROR_BAD_LENGTH:
-    case ERROR_BUFFER_OVERFLOW:
-	return E2BIG;
-    case ERROR_SEEK:
-    case ERROR_SECTOR_NOT_FOUND:
-	return ESPIPE;
-    case ERROR_NOT_DOS_DISK:
-	return ENODEV;
-    case ERROR_GEN_FAILURE:
-	return ENODEV;
-    case ERROR_SHARING_BUFFER_EXCEEDED:
-    case ERROR_NO_MORE_SEARCH_HANDLES:
-	return EMFILE;
-    case ERROR_HANDLE_EOF:
-    case ERROR_BROKEN_PIPE:
-	return EPIPE;
-    case ERROR_HANDLE_DISK_FULL:
-    case ERROR_DISK_FULL:
-	return ENOSPC;
-    case ERROR_NOT_SUPPORTED:
-	return ENOTSUP;
-    case ERROR_FILE_EXISTS:
-    case ERROR_ALREADY_EXISTS:
-    case ERROR_CANNOT_MAKE:
-	return EEXIST;
-    case ERROR_ALREADY_ASSIGNED:
-	return EBUSY;
-    case ERROR_NO_PROC_SLOTS:
-	return EAGAIN;
-    case ERROR_CANT_RESOLVE_FILENAME:
-	return EMLINK;
-    case ERROR_PRIVILEGE_NOT_HELD:
-	return EPERM;
-    case ERROR_ARENA_TRASHED:
-    case ERROR_INVALID_BLOCK:
-    case ERROR_BAD_ENVIRONMENT:
-    case ERROR_BAD_COMMAND:
-    case ERROR_CRC:
-    case ERROR_OUT_OF_PAPER:
-    case ERROR_READ_FAULT:
-    case ERROR_WRITE_FAULT:
-    case ERROR_WRONG_DISK:
-    case ERROR_NET_WRITE_FAULT:
-	return EIO;
-    default: /* not to do with files I expect. */
-	return EIO;
-    }	
-}
-
-static int
-check_error(int result, Efile_error* errInfo)
-{
-    if (result < 0) {
-	errInfo->posix_errno = errno;
-	errInfo->os_errno = GetLastError();
-	DBG_TRACE2(4, "ERROR os_error=%d errno=%d @@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-	        errInfo->os_errno, errInfo->posix_errno);
-	return 0;
-    }
-    return 1;
-}
-
-static void
-save_last_error(Efile_error* errInfo)
-{
-    errInfo->posix_errno = errno;
-    errInfo->os_errno = GetLastError();
-    DBG_TRACE2(4, "ERROR os_error=%d errno=%d $$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-	errInfo->os_errno, errInfo->posix_errno);
-}
-
-
-/*
- * Fills the provided error information structure with information
- * with the error code given by GetLastError() and its corresponding
- * Posix error number.
- *
- * Returns 0.
- */
-
-static int
-set_error(Efile_error* errInfo)
-{
-    set_os_errno(errInfo, GetLastError());
-    return 0;
-}
-
-
-static int
-set_os_errno(Efile_error* errInfo, DWORD os_errno)
-{
-    errInfo->os_errno = os_errno;
-    errInfo->posix_errno = errno_map(os_errno);
-    DBG_TRACE2(4, "ERROR os_error=%d errno=%d ############################",
-	    errInfo->os_errno, errInfo->posix_errno);
-    return 0;
-}
-
-int
-efile_init() {
-   return 1;
-}
-
-/*
- * A writev with Unix semantics, but with Windows arguments 
- */
-static int 
-win_writev(Efile_error* errInfo,
-	   HANDLE fd,                  /* handle to file */
-	   FILE_SEGMENT_ELEMENT iov[], /* array of buffer pointers */
-	   DWORD *size)                /* number of bytes to write */
-{
-    OVERLAPPED ov;
-    ov.Offset = 0L;
-    ov.OffsetHigh = 0L;
-    ov.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-    if (ov.hEvent == NULL)
-	return set_error(errInfo);
-    if (! write_file_gather(fd, iov, *size, NULL, &ov))
-	return set_error(errInfo);
-    if (WaitForSingleObject(ov.hEvent, INFINITE) != WAIT_OBJECT_0)
-	return set_error(errInfo);
-    if (! GetOverlappedResult(fd, &ov, size, FALSE))
-	return set_error(errInfo);
-    return 1;
-}
-
-
-/* Check '*pathp' and convert it if needed to something that windows will accept.
- * Typically use UNC path with \\?\ prefix if absolute path is longer than 260.
- */
-static void ensure_wpath(Efile_call_state* state, WCHAR** pathp)
-{
-    ensure_wpath_max(state, pathp, MAX_PATH);
-}
-
-static void ensure_wpath_max(Efile_call_state* state, WCHAR** pathp, size_t max)
-{
-    WCHAR* path = *pathp;
-    WCHAR* p;
-    size_t len = wcslen(path);
-    int unc_fixup = 0;
-
-    if (path[0] == 0) {
-	DBG_TRACE(8, L"Let empty path pass through");
-	return;
-    }
-
-    DBG_TRACE1(8,"IN: %s", path);
-
-    if (path[1] == L':' && ISSLASH(path[2])) { /* absolute path */
-	if (len >= max) {
-	    WCHAR *src, *dst;
-
-	    *pathp = wpath_tmp_alloc(state, 4+len+1);
-	    dst = *pathp;
-	    wcscpy(dst, L"\\\\?\\");
-	    for (src=path,dst+=4; *src; src++) {
-		if (*src == L'/') {
-		    if (dst[-1] != L'\\') {
-			*dst++ =  L'\\';
-		    }
-		    /*else ignore redundant slashes */
-		}
-		else
-		    *dst++ = *src;
-	    }
-	    *dst = 0;
-	    unc_fixup = 1;
-	}
-    }
-    else if (!(ISSLASH(path[0]) && ISSLASH(path[1]))) { /* relative path */
-	DWORD cwdLen = GetCurrentDirectoryW(0, NULL);
-	DWORD absLen = cwdLen + 1 + len;
-	if (absLen >= max) {
-	    WCHAR *fullPath = wpath_tmp_alloc(state, 4+4+absLen);
-	    DWORD fullLen;
-
-	    fullLen = GetFullPathNameW(path, 4 + absLen, fullPath+4, NULL);
-	    if (fullLen >= 4+absLen) {
-		*pathp = path;
-		DBG_TRACE2(8,"ensure_wpath FAILED absLen=%u %s", (int)absLen, path);
-		return;
-	    }
-	    /* GetFullPathNameW can return paths longer than MAX_PATH without the \\?\ prefix.
-	     * At least seen on Windows 7. Go figure...
-	     */
-	    if (fullLen >= max && wcsncmp(fullPath+4, L"\\\\?\\", 4) != 0) {
-		wcsncpy(fullPath, L"\\\\?\\", 4);
-		*pathp = fullPath;
-	    }
-	    else {
-		*pathp = fullPath + 4;
-	    }
-	}
-    }
-
-    if (unc_fixup) {
-	WCHAR* endp;
-
-	p = *pathp;
-	len = wcslen(p);
-	endp = p + len;
-	if (len > 4) {
-	    p += 4;
-	    while (*p) {
-		if (p[0] == L'\\' && p[1] == L'.') {
-		    if (p[2] == L'\\' || !p[2]) { /* single dot */
-			wmemmove(p, p+2, (&endp[1] - &p[2]));
-			endp -= 2;
-		    }
-		    else if (p[2] == L'.' && (p[3] == L'\\' || !p[3])) { /* double dot */
-			WCHAR* r;
-			for (r=p-1; *r == L'\\'; --r)
-			    /*skip redundant slashes*/;
-			for (; *r != L'\\'; --r)
-			    /*find start of prev directory*/;
-			if (r < *pathp + 6)
-			    break;
-			wmemmove(r, p+3, (&endp[1] - &p[3]));
-			p = r;
-		    }
-		    else p += 3;
-		}
-		else ++p;
-	    }
-	}
-    }
-    DBG_TRACE1(8,"OUT: %s", *pathp);
-}
-
-int
-efile_mkdir(Efile_error* errInfo,	/* Where to return error codes. */
-	    char* name)			/* Name of directory to create. */
-{
-    Efile_call_state state;
-    WCHAR* wname = (WCHAR*)name;
-    int ret;
-
-    DBG_TRACE(1, name);
-    call_state_init(&state, errInfo);
-    ensure_wpath_max(&state, &wname, 248); /* Yes, 248 limit for normal paths */
-
-    ret = (int) CreateDirectoryW(wname, NULL);
-    if (!ret)
-	set_error(errInfo);
-
-    call_state_free(&state);
-    return ret;
-}
-
-int
-efile_rmdir(Efile_error* errInfo,	/* Where to return error codes. */
-	    char* name)			/* Name of directory to delete. */
-{
-    Efile_call_state state;
-    int ret;
-
-    DBG_TRACE(1, name);
-    call_state_init(&state, errInfo);
-    ret = do_rmdir(&state, name);
-    call_state_free(&state);
-    return ret;
-}
-
-static int do_rmdir(Efile_call_state* state, char* name)
-{
-    OSVERSIONINFO os;
-    DWORD attr;
-    WCHAR *wname = (WCHAR *) name;
-    WCHAR *buffer = NULL;
-
-    ensure_wpath(state, &wname);
-
-    if (RemoveDirectoryW(wname) != FALSE) {
-	return 1;
-    }
-    errno = errno_map(GetLastError());
-    if (errno == EACCES) {
-	attr = GetFileAttributesW(wname);
-	if (attr != (DWORD) -1) {
-	    if ((attr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-		/* 
-		 * Windows 95 reports calling RemoveDirectory on a file as an 
-		 * EACCES, not an ENOTDIR.
-		 */
-		
-		errno = ENOTDIR;
-		goto end;
-	    }
-
-	    /* 
-	     * Windows 95 reports removing a non-empty directory as
-	     * an EACCES, not an EEXIST.  If the directory is not empty,
-	     * change errno so caller knows what's going on.
-	     */
-
-	    os.dwOSVersionInfoSize = sizeof(os);
-	    GetVersionEx(&os);
-	    if (os.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
-		HANDLE handle;
-		WIN32_FIND_DATAW data;
-		int len = wcslen(wname);
-
-		buffer = wpath_tmp_alloc(state, len + 4);
-		wcscpy(buffer, wname);
-		if (buffer[0] && buffer[len-1] != L'\\' && buffer[len-1] != L'/') {
-		    wcscat(buffer, L"\\");
-		}
-		wcscat(buffer, L"*.*");
-		handle = FindFirstFileW(buffer, &data);
-		if (handle != INVALID_HANDLE_VALUE) {
-		    while (1) {
-			if ((wcscmp(data.cFileName, L".") != 0)
-				&& (wcscmp(data.cFileName, L"..") != 0)) {
-			    /*
-			     * Found something in this directory.
-			     */
-
-			    errno = EEXIST;
-			    break;
-			}
-			if (FindNextFileW(handle, &data) == FALSE) {
-			    break;
-			}
-		    }
-		    FindClose(handle);
-		}
-	    }
-	}
-    }
-
-    if (errno == ENOTEMPTY) {
-	/* 
-	 * Posix allows both EEXIST or ENOTEMPTY, but we'll always
-	 * return EEXIST to allow easy matching in Erlang code.
-	 */
-
-	errno = EEXIST;
-    }
-
- end:
-    save_last_error(state->errInfo);
-    return 0;
-}
-
-int
-efile_delete_file(Efile_error* errInfo,		/* Where to return error codes. */
-		  char* name)			/* Name of file to delete. */
-{
-    Efile_call_state state;
-    int ret;
-    DBG_TRACE(1, name);
-    call_state_init(&state, errInfo);
-    ret = do_delete_file(&state, name);
-    call_state_free(&state);
-    return ret;
-}
-
-static int do_delete_file(Efile_call_state* state, char* name)
-{
-    DWORD attr;
-    WCHAR *wname = (WCHAR *) name;
-
-    ensure_wpath(state, &wname);
-
-    if (DeleteFileW(wname) != FALSE) {
-	return 1;
-    }
-
-    errno = errno_map(GetLastError());
-    if (errno == EACCES) {
-        attr = GetFileAttributesW(wname);
-	if (attr != (DWORD) -1) {
-	    if (attr & FILE_ATTRIBUTE_DIRECTORY) {
-		/*
-		 * Windows NT reports removing a directory as EACCES instead
-		 * of EPERM.
-		 */
-
-		errno = EPERM;
-	    }
-	}
-    } else if (errno == ENOENT) {
-        attr = GetFileAttributesW(wname);
-	if (attr != (DWORD) -1) {
-	    if (attr & FILE_ATTRIBUTE_DIRECTORY) {
-	    	/*
-		 * Windows 95 reports removing a directory as ENOENT instead 
-		 * of EPERM.
-		 */
-
-		errno = EPERM;
-	    }
-	}
-    } else if (errno == EINVAL) {
-	/*
-	 * Windows NT reports removing a char device as EINVAL instead of
-	 * EACCES.
-	 */
-	
-	errno = EACCES;
-    }
-
-    return check_error(-1, state->errInfo);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- *      Changes the name of an existing file or directory, from src to dst.
- *	If src and dst refer to the same file or directory, does nothing
- *	and returns success.  Otherwise if dst already exists, it will be
- *	deleted and replaced by src subject to the following conditions:
- *	    If src is a directory, dst may be an empty directory.
- *	    If src is a file, dst may be a file.
- *	In any other situation where dst already exists, the rename will
- *	fail.  
- *
- *	Some possible error codes:
- *
- *	EACCES:     src or dst parent directory can't be read and/or written.
- *	EEXIST:	    dst is a non-empty directory.
- *	EINVAL:	    src is a root directory or dst is a subdirectory of src.
- *	EISDIR:	    dst is a directory, but src is not.
- *	ENOENT:	    src doesn't exist, or src or dst is "".
- *	ENOTDIR:    src is a directory, but dst is not.  
- *	EXDEV:	    src and dst are on different filesystems.
- *	
- * Side effects:
- *	The implementation of rename may allow cross-filesystem renames,
- *	but the caller should be prepared to emulate it with copy and
- *	delete if errno is EXDEV.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-efile_rename(Efile_error* errInfo, char* src, char* dst)
-{
-    Efile_call_state state;
-    int ret;
-    DBG_TRACE(1, src);
-    call_state_init(&state, errInfo);
-    ret = do_rename(&state, src, dst);
-    call_state_free(&state);
-    return ret;
-}
-
-static int
-do_rename(Efile_call_state* state,
-	  char* src,			/* Original name. */
-	  char* dst)			/* New name. */
-{
-    DWORD srcAttr, dstAttr;
-    WCHAR *wsrc = (WCHAR *) src;
-    WCHAR *wdst = (WCHAR *) dst;
-
-    ensure_wpath(state, &wsrc);
-    ensure_wpath(state, &wdst);
-
-    if (MoveFileW(wsrc, wdst) != FALSE) {
-	return 1;
-    }
-
-    errno = errno_map(GetLastError());
-    srcAttr = GetFileAttributesW(wsrc);
-    dstAttr = GetFileAttributesW(wdst);
-    if (srcAttr == (DWORD) -1) {
-	srcAttr = 0;
-    }
-    if (dstAttr == (DWORD) -1) {
-	dstAttr = 0;
-    }
-
-    if (errno == EBADF) {
-	errno = EACCES;
-	return check_error(-1, state->errInfo);
-    }
-    if (errno == EACCES) {
-	decode:
-	if (srcAttr & FILE_ATTRIBUTE_DIRECTORY) {
-	    WCHAR *srcPath, *dstPath;
-	    WCHAR *srcRest, *dstRest;
-	    int size;
-
-	    srcPath = get_full_wpath_tmp(state, wsrc, &srcRest, 0);
-	    if (!srcPath) {
-		save_last_error(state->errInfo);
-		return 0;
-	    }
-
-	    dstPath = get_full_wpath_tmp(state, wdst, &dstRest, 0);
-	    if (!dstPath) {
-		save_last_error(state->errInfo);
-		return 0;
-	    }
-
-	    if (srcRest == NULL) {
-		srcRest = srcPath + wcslen(srcPath);
-	    }
-	    if (_wcsnicmp(srcPath, dstPath, srcRest - srcPath) == 0) {
-		/*
-		 * Trying to move a directory into itself.
-		 */
-
-		errno = EINVAL;
-	    }
-	    if (extract_root(srcPath)) {
-		/*
-		 * Attempt to move a root directory.  Never allowed.
-		 */
-		errno = EINVAL;
-	    }
-
-	    (void) extract_root(dstPath);
-	    if (dstPath[0] == L'\0') {
-		/*
-		 * The filename was invalid.  (Don't know why,
-		 * but play it safe.)
-		 */
-		errno = EINVAL;
-	    }
-	    if (_wcsicmp(srcPath, dstPath) != 0) {
-		/*
-		 * If src is a directory and dst filesystem != src
-		 * filesystem, errno should be EXDEV.  It is very
-		 * important to get this behavior, so that the caller
-		 * can respond to a cross filesystem rename by
-		 * simulating it with copy and delete.  The MoveFile
-		 * system call already handles the case of moving a
-		 * *file* between filesystems.
-		 */
-
-		errno = EXDEV;
-	    }
-	}
-
-	/*
-	 * Other types of access failure is that dst is a read-only
-	 * filesystem, that an open file referred to src or dest, or that
-	 * src or dest specified the current working directory on the
-	 * current filesystem.  EACCES is returned for those cases.
-	 */
-
-    } else if (errno == EEXIST) {
-	/*
-	 * Reports EEXIST any time the target already exists.  If it makes
-	 * sense, remove the old file and try renaming again.
-	 */
-
-	if (srcAttr & FILE_ATTRIBUTE_DIRECTORY) {
-	    if (dstAttr & FILE_ATTRIBUTE_DIRECTORY) {
-		/*
-		 * Overwrite empty dst directory with src directory.  The
-		 * following call will remove an empty directory.  If it
-		 * fails, it's because it wasn't empty.
-		 */
-
-		if (RemoveDirectoryW(wdst)) {
-		    /*
-		     * Now that that empty directory is gone, we can try
-		     * renaming again.  If that fails, we'll put this empty
-		     * directory back, for completeness.
-		     */
-
-		    if (MoveFileW(wsrc, wdst) != FALSE) {
-			return 1;
-		    }
-
-		    /*
-		     * Some new error has occurred.  Don't know what it
-		     * could be, but report this one.
-		     */
-
-		    errno = errno_map(GetLastError());
-		    CreateDirectoryW(wdst, NULL);
-		    SetFileAttributesW(wdst, dstAttr);
-		    if (errno == EACCES) {
-			/*
-			 * Decode the EACCES to a more meaningful error.
-			 */
-
-			goto decode;
-		    }
-		}
-	    } else {	/* (dstAttr & FILE_ATTRIBUTE_DIRECTORY) == 0 */
-		errno = ENOTDIR;
-	    }
-	} else {    /* (srcAttr & FILE_ATTRIBUTE_DIRECTORY) == 0 */
-	    if (dstAttr & FILE_ATTRIBUTE_DIRECTORY) {
-		errno = EISDIR;
-	    } else {
-		/*
-		 * Overwrite existing file by:
-		 * 
-		 * 1. Rename existing file to temp name.
-		 * 2. Rename old file to new name.
-		 * 3. If success, delete temp file.  If failure,
-		 *    put temp file back to old name.
-		 */
-
-		WCHAR *tempName;
-		int result;
-		WCHAR *rest;
-		
-		tempName = get_full_wpath_tmp(state, wdst, &rest, 14);
-		if (!tempName || !rest) {
-		    save_last_error(state->errInfo);
-		    return 0;
-		}
-
-		*rest = L'\0';
-		result = -1;
-		if (GetTempFileNameW(tempName, L"erlr", 0, tempName) != 0) {
-		    /*
-		     * Strictly speaking, need the following DeleteFile and
-		     * MoveFile to be joined as an atomic operation so no
-		     * other app comes along in the meantime and creates the
-		     * same temp file.
-		     */
-		     
-		    DeleteFileW(tempName);
-		    if (MoveFileW(wdst, tempName) != FALSE) {
-			if (MoveFileW(wsrc, wdst) != FALSE) {
-			    SetFileAttributesW(tempName, FILE_ATTRIBUTE_NORMAL);
-			    DeleteFileW(tempName);
-			    return 1;
-			} else {
-			    DeleteFileW(wdst);
-			    MoveFileW(tempName, wdst);
-			}
-		    } 
-
-		    /*
-		     * Can't backup dst file or move src file.  Return that
-		     * error.  Could happen if an open file refers to dst.
-		     */
-
-		    errno = errno_map(GetLastError());
-		    if (errno == EACCES) {
-			/*
-			 * Decode the EACCES to a more meaningful error.
-			 */
-			goto decode;
-		    }
-		}
-		return result;
-	    }
-	}
-    }
-    return check_error(-1, state->errInfo);
-}
-
-int
-efile_chdir(Efile_error* errInfo,	/* Where to return error codes. */
-	    char* name)			/* Name of directory to make current. */
-{

-    /* We don't even try to handle long paths here

-     * as current working directory is always limited to MAX_PATH

-     * even if we use UNC paths and SetCurrentDirectoryW()

-     */

-    int success = check_error(_wchdir((WCHAR *) name), errInfo);

-    if (!success && errInfo->posix_errno == EINVAL)

-	/* POSIXification of errno */

-	errInfo->posix_errno = ENOENT;
-    return success;
-}
-
-int
-efile_getdcwd(Efile_error* errInfo,		/* Where to return error codes. */
-	      int drive,			/* 0 - current, 1 - A, 2 - B etc. */
-	      char* buffer,			/* Where to return the current directory. */
-	      size_t size)			/* Size of buffer. */
-{
-    WCHAR *wbuffer = (WCHAR *) buffer;
-    size_t wbuffer_size = size / 2; 
-    DBG_TRACE(1, L"#getdcwd#");
-    if (_wgetdcwd(drive, wbuffer, wbuffer_size) == NULL) {
-	return check_error(-1, errInfo);
-    }
-    DBG_TRACE1(8, "getdcwd OS=%s", wbuffer);
-    if (wcsncmp(wbuffer, L"\\\\?\\", 4) == 0) {
-	wmemmove(wbuffer, wbuffer+4, wcslen(wbuffer+4)+1);
-    }
-    for ( ; *wbuffer; wbuffer++) 
-	if (*wbuffer == L'\\')
-	    *wbuffer = L'/';
-    DBG_TRACE1(8, "getdcwd ERLANG=%s", (WCHAR*)buffer);
-    return 1;
-}
-
-int
-efile_readdir(Efile_error* errInfo, char* name, EFILE_DIR_HANDLE* dir_handle,
-	      char* buffer, size_t *size)
-{
-    Efile_call_state state;
-    int ret;
-    DBG_TRACE(dir_handle?2:1, name);
-    call_state_init(&state, errInfo);
-    ret = do_readdir(&state, name, dir_handle, buffer, size);
-    call_state_free(&state);
-    return ret;
-}
-
-static int do_readdir(Efile_call_state* state,
-                      char* name,                   /* Name of directory to list */
-		      EFILE_DIR_HANDLE* dir_handle, /* Handle of opened directory or NULL */
-		      char* buffer,                 /* Buffer to put one filename in */
-		      size_t *size)                 /* in-out size of buffer/size of filename excluding zero
-					               termination in bytes*/
-{
-    HANDLE dir;			/* Handle to directory. */
-    WIN32_FIND_DATAW findData;	/* Data found by FindFirstFile() or FindNext(). */
-    /* Alignment is not honored, this works on x86 because of alignment fixup by processor.
-       Not perfect, but faster than alinging by hand (really) */
-    WCHAR *wbuffer = (WCHAR *) buffer;
-
-    /*
-     * First time we must setup everything.
-     */
-
-    if (*dir_handle == NULL) {
-	WCHAR *wname = (WCHAR *) name;
-	WCHAR* wildcard;
-	int length;
-	WCHAR* s;
-
-	ensure_wpath_max(state, &wname, MAX_PATH-2);
-	length = wcslen(wname);
-
-	wildcard = wpath_tmp_alloc(state, length+3);
-
-	wcscpy(wildcard, wname);
-	s = wildcard+length-1;
-	if (*s != L'/' && *s != L'\\')
-	    *++s = L'\\';
-	*++s = L'*';
-	*++s = L'\0';
-	DEBUGF(("Reading %ws\n", wildcard));
-	dir = FindFirstFileW(wildcard, &findData);
-	if (dir == INVALID_HANDLE_VALUE) {
-	    set_error(state->errInfo);
-	    return 0;
-	}
-	*dir_handle = (EFILE_DIR_HANDLE) dir;
-
-	if (!IS_DOT_OR_DOTDOT(findData.cFileName)) {
-	    wcscpy(wbuffer, findData.cFileName);
-	    *size = wcslen(wbuffer)*2;
-	    return 1;
-	}
-    }
-
-    /*
-     * Retrieve the name of the next file using the directory handle.
-     */
-
-    dir = (HANDLE) *dir_handle;
-
-    for (;;) {
-	if (FindNextFileW(dir, &findData)) {
-	    if (IS_DOT_OR_DOTDOT(findData.cFileName))
-		continue;
-	    wcscpy(wbuffer, findData.cFileName);
-	    *size = wcslen(wbuffer)*2;
-	    return 1;
-	}
-
-	if (GetLastError() == ERROR_NO_MORE_FILES) {
-	    state->errInfo->posix_errno = state->errInfo->os_errno = 0;
-	}
-	else {
-	    set_error(state->errInfo);
-	}
-	FindClose(dir);
-	return 0;
-    }
-}
-
-int
-efile_openfile(Efile_error* errInfo, char* name, int flags, int* pfd, Sint64* pSize)
-{
-    Efile_call_state state;
-    int ret;
-    DBG_TRACE1(1, "openfile(%s)", name);
-    call_state_init(&state, errInfo);
-    ret = do_openfile(&state, name, flags, pfd, pSize);
-    call_state_free(&state);
-    return ret;
-}
-
-static
-int do_openfile(Efile_call_state* state,        /* Where to return error codes. */
-	        char* name,			/* Name of directory to open. */
-	        int flags,			/* Flags to use for opening. */
-	        int* pfd,			/* Where to store the file descriptor. */
-	        Sint64* pSize)			/* Where to store the size of the file. */
-{
-    Efile_error* errInfo = state->errInfo;
-    BY_HANDLE_FILE_INFORMATION fileInfo; /* File information from a handle. */
-    HANDLE fd;			/* Handle to open file. */
-    DWORD access;		/* Access mode: GENERIC_READ, GENERIC_WRITE. */
-    DWORD crFlags;
-    DWORD flagsAndAttrs = FILE_ATTRIBUTE_NORMAL;
-    WCHAR *wname = (WCHAR *) name;
-
-    switch (flags & (EFILE_MODE_READ|EFILE_MODE_WRITE)) {
-    case EFILE_MODE_READ:
-	access = GENERIC_READ;
-	crFlags = OPEN_EXISTING;
-	break;
-    case EFILE_MODE_WRITE:
-	access = GENERIC_WRITE;
-	crFlags = CREATE_ALWAYS;
-	break;
-    case EFILE_MODE_READ_WRITE:
-	access = GENERIC_READ|GENERIC_WRITE;
-	crFlags = OPEN_ALWAYS;
-	break;
-    default:
-	errno = EINVAL;
-	check_error(-1, errInfo);
-	return 0;
-    }
-
-    if (flags & EFILE_MODE_SYNC) {
-        flagsAndAttrs = FILE_FLAG_WRITE_THROUGH;
-    }
-
-    if (flags & EFILE_MODE_APPEND) {
-	crFlags = OPEN_ALWAYS;
-    }
-    if (flags & EFILE_MODE_EXCL) {
-	crFlags = CREATE_NEW;
-    }
-    ensure_wpath(state, &wname);
-    fd = CreateFileW(wname, access,
-		    FILE_SHARE_FLAGS,
-		    NULL, crFlags, flagsAndAttrs, NULL);
-
-    /*
-     * Check for errors.
-     */
-
-    if (fd == INVALID_HANDLE_VALUE) {
-	DWORD attr;
-
-	set_error(errInfo);
-
-	/*
-	 * If the error is EACESS, the reason could be that we tried to
-	 * open a directory.  In that case, we'll change the error code
-	 * to EISDIR.
-	 */
-	if (errInfo->posix_errno && 
-	    (attr = GetFileAttributesW(wname)) != INVALID_FILE_ATTRIBUTES && 
-	    (attr & FILE_ATTRIBUTE_DIRECTORY)) {
-	    errInfo->posix_errno = EISDIR;
-	}
-	return 0;
-    }
-
-    /*
-     * Get and return the length of the open file.
-     */
-       
-    if (!GetFileInformationByHandle(fd, &fileInfo))
-	return set_error(errInfo);
-    *pfd = (int) fd;
-    if (pSize) {
-	*pSize = (Sint64)
-	    (((Uint64)fileInfo.nFileSizeHigh << 32) | 
-	     (Uint64)fileInfo.nFileSizeLow);
-    }
-    return 1;
-}
-
-int 
-efile_may_openfile(Efile_error* errInfo, char *name)
-{
-    Efile_call_state state;
-    WCHAR *wname = (WCHAR *) name;
-    DWORD attr;
-    int ret;
-
-    DBG_TRACE(1, name);
-    call_state_init(&state, errInfo);
-    ensure_wpath(&state, &wname);
-    if ((attr = GetFileAttributesW(wname)) == INVALID_FILE_ATTRIBUTES) {
-	errno = ENOENT;
-	ret = check_error(-1, errInfo);
-    }
-    else if (attr & FILE_ATTRIBUTE_DIRECTORY) {
-	errno = EISDIR;
-	ret = check_error(-1, errInfo);
-    }
-    else ret = 1;
-
-    call_state_free(&state);
-    return ret;
-}
-
-void
-efile_closefile(fd)
-int fd;				/* File descriptor for file to close. */
-{
-    DBG_TRACE(2, L"");
-    CloseHandle((HANDLE) fd);
-}
-
-FILE* efile_wfopen(const WCHAR* name, const WCHAR* mode)
-{
-    Efile_call_state state;
-    Efile_error dummy;
-    FILE* f;
-    call_state_init(&state, &dummy);
-    ensure_wpath(&state, (WCHAR**)&name);
-    f = _wfopen(name, mode);
-    call_state_free(&state);
-    return f;
-}
-
-int
-efile_fdatasync(errInfo, fd)
-Efile_error* errInfo;		/* Where to return error codes. */
-int fd;				/* File descriptor for file to sync. */
-{
-    DBG_TRACE(2, L"");
-    /* Not available in Windows, just call regular fsync */
-    return efile_fsync(errInfo, fd);
-}
-
-int
-efile_fsync(errInfo, fd)
-Efile_error* errInfo;		/* Where to return error codes. */
-int fd;				/* File descriptor for file to sync. */
-{
-    DBG_TRACE(2, L"");
-    if (!FlushFileBuffers((HANDLE) fd)) {
-	return check_error(-1, errInfo);
-    }
-    return 1;
-}
-
-int
-efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
-	       char* orig_name, int info_for_link)
-{
-    Efile_call_state state;
-    int ret;
-    DBG_TRACE(1, L"");
-    call_state_init(&state, errInfo);
-    ret = do_fileinfo(&state, pInfo, orig_name, info_for_link);
-    call_state_free(&state);
-    return ret;
-}
-
-static int
-do_fileinfo(Efile_call_state* state, Efile_info* pInfo,
-	    char* orig_name, int info_for_link)
-{
-    Efile_error* errInfo = state->errInfo;
-    HANDLE findhandle;		/* Handle returned by FindFirstFile(). */
-    WIN32_FIND_DATAW findbuf;	/* Data return by FindFirstFile(). */
-    WCHAR* name = NULL;
-    WCHAR* win_path;
-    int name_len;
-    int drive;			/* Drive for filename (1 = A:, 2 = B: etc). */
-    WCHAR *worig_name = (WCHAR *) orig_name;
-
-    ensure_wpath(state, &worig_name);
-    /* Don't allow wildcards to be interpreted by system */
-
-
-    /*
-     * Move the name to a buffer and make sure to remove a trailing
-     * slash, because it causes FindFirstFile() to fail on Win95.
-     */
-
-    name_len = wcslen(worig_name);
-
-    name = wpath_tmp_alloc(state, name_len+1);
-    wcscpy(name, worig_name);
-    if (name_len > 2 && ISSLASH(name[name_len-1]) &&
-	name[name_len-2] != L':') {
-	name[name_len-1] = L'\0';
-    }
-
-    win_path = name;
-    if (wcsncmp(name, L"\\\\?\\", 4) == 0) {
-	win_path += 4;
-    }
-
-    if (wcspbrk(win_path, L"?*")) {
-    enoent:
-	errInfo->posix_errno = ENOENT;
-	errInfo->os_errno = ERROR_FILE_NOT_FOUND;
-        return 0;
-    }
-
-    /* Try to get disk from name.  If none, get current disk.  */
-
-    if (win_path[1] != L':') {
-	WCHAR* cwd_path = get_cwd_wpath_tmp(state);
-        drive = 0;
-	if (cwd_path[1] == L':') {
-	    drive = towlower(cwd_path[0]) - L'a' + 1;
-	}
-    } else if (*win_path && win_path[2] == L'\0') {
-	/*
-	 * X: and nothing more is an error.
-	 */
-	errInfo->posix_errno = ENOENT;
-	errInfo->os_errno = ERROR_FILE_NOT_FOUND;
-	return 0;
-    } else {
-        drive = towlower(*win_path) - L'a' + 1;
-    }
-
-    findhandle = FindFirstFileW(name, &findbuf);
-    if (findhandle == INVALID_HANDLE_VALUE) {
-	WCHAR* path = NULL;
-
-        if (!(wcspbrk(name, L"./\\") &&
-	      (path = get_full_wpath_tmp(state, name, NULL, 0)) &&
-	      /* root dir. ('C:\') or UNC root dir. ('\\server\share\') */
-	      ((wcslen(path) == 3) || is_root_unc_name(path)) &&
-	      (GetDriveTypeW(path) > 1)   ) ) {
-
-	    errInfo->posix_errno = ENOENT;
-	    errInfo->os_errno = ERROR_FILE_NOT_FOUND;
-	    return 0;
-	}
-
-        /*
-         * Root directories (such as C:\ or \\server\share\ are fabricated.
-         */
-	
-        findbuf.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY;
-        findbuf.nFileSizeHigh = 0;
-        findbuf.nFileSizeLow = 0;
-        findbuf.cFileName[0] = L'\0';
-
-	pInfo->links = 1;
-	pInfo->cTime = pInfo->accessTime = pInfo->modifyTime = 0;
-    } else {
-	SYSTEMTIME SystemTime;
-        FILETIME LocalFTime;
-
-	/*first check if we are a symlink */
-	if (!info_for_link && (findbuf.dwFileAttributes &
-			       FILE_ATTRIBUTE_REPARSE_POINT)){
-	    /*
-	     * given that we know this is a symlink,
-	     we should be able to find its target */
-	    WCHAR* target_name = (WCHAR*) do_readlink(state, (char *) name, NULL, 0);
-	    if (target_name) {
-		FindClose(findhandle);
-		return do_fileinfo(state, pInfo,
-				   (char *) target_name, info_for_link);
-	    }
-	}
-
-	/* number of links: */
-	{
-	    HANDLE handle;	/* Handle returned by CreateFile() */
-	    BY_HANDLE_FILE_INFORMATION fileInfo; /* from  CreateFile() */
-
-            /* We initialise nNumberOfLinks as GetFileInformationByHandle
-               does not always initialise this field */
-            fileInfo.nNumberOfLinks = 1;
-	    if (handle = CreateFileW(name, GENERIC_READ, FILE_SHARE_FLAGS, NULL,
-				    OPEN_EXISTING, 0, NULL)) {
-		GetFileInformationByHandle(handle, &fileInfo);
-		pInfo->links = fileInfo.nNumberOfLinks;
-		CloseHandle(handle);
-	    } else {
-		pInfo->links = 1;
-	    }	
-	}
-
-        FILETIME_TO_EPOCH(pInfo->modifyTime, findbuf.ftLastWriteTime);
-
-        if (findbuf.ftLastAccessTime.dwLowDateTime == 0 &&
-	    findbuf.ftLastAccessTime.dwHighDateTime == 0) {
-	    pInfo->accessTime = pInfo->modifyTime;
-	} else {
-	    FILETIME_TO_EPOCH(pInfo->accessTime, findbuf.ftLastAccessTime);
-	}
-
-        if (findbuf.ftCreationTime.dwLowDateTime == 0 &&
-	    findbuf.ftCreationTime.dwHighDateTime == 0) {
-	    pInfo->cTime = pInfo->modifyTime;
-	} else {
-	    FILETIME_TO_EPOCH(pInfo->cTime ,findbuf.ftCreationTime);
-	}
-        FindClose(findhandle);
-    }
-
-    pInfo->size_low = findbuf.nFileSizeLow;
-    pInfo->size_high = findbuf.nFileSizeHigh;
-	
-    if (info_for_link && (findbuf.dwFileAttributes &
-			  FILE_ATTRIBUTE_REPARSE_POINT))
-	pInfo->type = FT_SYMLINK;
-    else if (findbuf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-	pInfo->type = FT_DIRECTORY;
-    else
-	pInfo->type = FT_REGULAR;
-
-    if (findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
-	pInfo->access = FA_READ;
-    else
-	pInfo->access = FA_READ|FA_WRITE;
-
-    pInfo->mode = dos_to_posix_mode(findbuf.dwFileAttributes, name);
-    pInfo->major_device = drive;
-    pInfo->minor_device = 0;
-    pInfo->inode = 0;
-    pInfo->uid = 0;
-    pInfo->gid = 0;
-    
-    return 1;
-}
-
-int
-efile_write_info(Efile_error* errInfo,
-		 Efile_info* pInfo,
-		 char* name)
-{
-    Efile_call_state state;
-    int ret;
-    call_state_init(&state, errInfo);
-    ret = do_write_info(&state, pInfo, name);
-    call_state_free(&state);
-    return ret;
-}
-
-static int
-do_write_info(Efile_call_state* state,
-              Efile_info* pInfo,
-	      char* name)
-{
-    Efile_error* errInfo = state->errInfo;
-    SYSTEMTIME timebuf;
-    FILETIME ModifyFileTime;
-    FILETIME AccessFileTime;
-    FILETIME CreationFileTime;
-    HANDLE fd;
-    DWORD attr;
-    DWORD tempAttr;
-    WCHAR *wname = (WCHAR *) name;
-
-    DBG_TRACE(1, name);
-
-    ensure_wpath(state, &wname);
-
-    /*
-     * Get the attributes for the file.
-     */
-
-    tempAttr = attr = GetFileAttributesW(wname);
-    if (attr == 0xffffffff) {
-	return set_error(errInfo);
-    }
-    if (pInfo->mode != -1) {
-	if (pInfo->mode & _S_IWRITE) {
-	    /* clear read only bit */
-	    attr &= ~FILE_ATTRIBUTE_READONLY;
-	} else {
-	    /* set read only bit */
-	    attr |= FILE_ATTRIBUTE_READONLY;
-	}
-    }
-
-    /*
-     * Construct all file times.
-     */
-
-    EPOCH_TO_FILETIME(ModifyFileTime,   pInfo->modifyTime);
-    EPOCH_TO_FILETIME(AccessFileTime,   pInfo->accessTime);
-    EPOCH_TO_FILETIME(CreationFileTime, pInfo->cTime);
-
-    /*
-     * If necessary, set the file times.
-     */
-
-    /*
-     * If the has read only access, we must temporarily turn on
-     * write access (this is necessary for native filesystems,
-     * but not for NFS filesystems).
-     */
-
-    if (tempAttr & FILE_ATTRIBUTE_READONLY) {
-	tempAttr &= ~FILE_ATTRIBUTE_READONLY;
-	if (!SetFileAttributesW(wname, tempAttr)) {
-	    return set_error(errInfo);
-	}
-    }
-
-    fd = CreateFileW(wname, GENERIC_READ|GENERIC_WRITE,
-	    FILE_SHARE_FLAGS,
-	    NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-    if (fd != INVALID_HANDLE_VALUE) {
-	BOOL result = SetFileTime(fd, &CreationFileTime, &AccessFileTime, &ModifyFileTime);
-	if (!result) {
-	    return set_error(errInfo);
-	}
-	CloseHandle(fd);
-    }
-
-    /*
-     * If the file doesn't have the correct attributes, set them now.
-     * (It could have been done before setting the file times, above).
-     */
-
-    if (tempAttr != attr) {
-	if (!SetFileAttributesW(wname, attr)) {
-	    return set_error(errInfo);
-	}
-    }
-    return 1;
-}
-
-
-int
-efile_pwrite(errInfo, fd, buf, count, offset)
-Efile_error* errInfo;		/* Where to return error codes. */
-int fd;				/* File descriptor to write to. */
-char* buf;			/* Buffer to write. */
-size_t count;			/* Number of bytes to write. */
-Sint64 offset;			/* where to write it */
-{
-    int res;
-    DBG_TRACE(2, L"");
-    res = efile_seek(errInfo, fd, offset, EFILE_SEEK_SET, NULL);
-    if (res) {
-	return efile_write(errInfo, EFILE_MODE_WRITE, fd, buf, count);
-    } else {
-	return res;
-    }
-}
-
-/* position and read/write as a single atomic op */
-int
-efile_pread(errInfo, fd, offset, buf, count, pBytesRead)
-Efile_error* errInfo;		/* Where to return error codes. */
-int fd;				/* File descriptor to read from. */
-Sint64 offset;			/* Offset in bytes from BOF. */
-char* buf;			/* Buffer to read into. */
-size_t count;			/* Number of bytes to read. */
-size_t* pBytesRead;		/* Where to return number of bytes read. */
-{
-    int res;
-    DBG_TRACE(2, L"");
-    res = efile_seek(errInfo, fd, offset, EFILE_SEEK_SET, NULL);
-    if (res) {
-	return efile_read(errInfo, EFILE_MODE_READ, fd, buf, count, pBytesRead);
-    } else {
-	return res;
-    }
-}
-
-
-
-int
-efile_write(errInfo, flags, fd, buf, count)
-Efile_error* errInfo;		/* Where to return error codes. */
-int flags;			/* Flags given when file was opened. */
-int fd;				/* File descriptor to write to. */
-char* buf;			/* Buffer to write. */
-size_t count;			/* Number of bytes to write. */
-{
-    DWORD written;		/* Bytes written in last operation. */
-    OVERLAPPED overlapped;
-    OVERLAPPED* pOverlapped = NULL;
-
-    DBG_TRACE(2, L"");
-    if (flags & EFILE_MODE_APPEND) {
-	memset(&overlapped, 0, sizeof(overlapped));
-	overlapped.Offset = 0xffffffff;
-	overlapped.OffsetHigh = 0xffffffff;
-	pOverlapped = &overlapped;
-    }
-    while (count > 0) {
-	if (!WriteFile((HANDLE) fd, buf, count, &written, pOverlapped))
-	    return set_error(errInfo);
-	buf += written;
-	count -= written;
-    }
-    return 1;
-}
-
-int
-efile_writev(Efile_error* errInfo,   /* Where to return error codes */
-	     int flags,              /* Flags given when file was
-				      * opened */
-	     int fd,                 /* File descriptor to write to */
-	     SysIOVec* iov,          /* Vector of buffer structs.
-				      * The structs are unchanged 
-				      * after the call */
-	     int iovcnt)             /* Number of structs in vector */
-{
-    int cnt;                         /* Buffers so far written */
-    OVERLAPPED overlapped;
-    OVERLAPPED* pOverlapped = NULL;
-
-    DBG_TRACE(2, L"");
-    ASSERT(iovcnt >= 0);
-    
-    if (flags & EFILE_MODE_APPEND) {
-	memset(&overlapped, 0, sizeof(overlapped));
-	overlapped.Offset = 0xffffffff;
-	overlapped.OffsetHigh = 0xffffffff;
-	pOverlapped = &overlapped;
-    }
-    for (cnt = 0; cnt < iovcnt; cnt++) {
-	if (iov[cnt].iov_base && iov[cnt].iov_len > 0) {
-	    /* Non-empty buffer */
-	    int p;                   /* Position in buffer */
-	    int w = iov[cnt].iov_len;/* Bytes written in this call */
-	    for (p = 0; p < iov[cnt].iov_len; p += w) {
-		if (!WriteFile((HANDLE) fd, 
-			       iov[cnt].iov_base + p, 
-			       iov[cnt].iov_len - p, 
-			       &w, 
-			       pOverlapped))
-		    return set_error(errInfo);
-	    }
-	}
-    }	
-    return 1;
-}
-
-int
-efile_read(errInfo, flags, fd, buf, count, pBytesRead)
-Efile_error* errInfo;		/* Where to return error codes. */
-int flags;			/* Flags given when file was opened. */
-int fd;				/* File descriptor to read from. */
-char* buf;			/* Buffer to read into. */
-size_t count;			/* Number of bytes to read. */
-size_t* pBytesRead;		/* Where to return number of bytes read. */
-{
-    DWORD nbytes = 0;
-
-    DBG_TRACE(2, L"");
-    if (!ReadFile((HANDLE) fd, buf, count, &nbytes, NULL))
-	return set_error(errInfo);
-
-    *pBytesRead = nbytes;
-    return 1;
-}
-
-int
-efile_seek(errInfo, fd, offset, origin, new_location)
-Efile_error* errInfo;		/* Where to return error codes. */
-int fd;				/* File descriptor to do the seek on. */
-Sint64 offset;			/* Offset in bytes from the given origin. */
-int origin;			/* Origin of seek (SEEK_SET, SEEK_CUR,
-				 * SEEK_END).
-				 */
-Sint64* new_location;		/* Resulting new location in file. */
-{
-    LARGE_INTEGER off, new_loc;
-    
-    DBG_TRACE(2, L"");
-    switch (origin) {
-    case EFILE_SEEK_SET: origin = FILE_BEGIN; break;
-    case EFILE_SEEK_CUR: origin = FILE_CURRENT; break;
-    case EFILE_SEEK_END: origin = FILE_END; break;
-    default:
-	errno = EINVAL;
-	check_error(-1, errInfo);
-	break;
-    }
-    
-    off.QuadPart = offset;
-    if (! SetFilePointerEx((HANDLE) fd, off,
-	new_location ? &new_loc : NULL, origin)) {
-	return set_error(errInfo);
-    }
-    if (new_location) {
-	*new_location = new_loc.QuadPart;
-	DEBUGF(("efile_seek(offset=%ld, origin=%d) -> %ld\n", 
-		(long) offset, origin, (long) *new_location));
-    } else {
-	DEBUGF(("efile_seek(offset=%ld, origin=%d)\n", (long) offset, origin));
-    }
-    return 1;
-}
-
-int
-efile_truncate_file(errInfo, fd, flags)
-Efile_error* errInfo;		/* Where to return error codes. */
-int *fd;				/* File descriptor for file to truncate. */
-int flags;
-{
-    DBG_TRACE(2, L"");
-    if (!SetEndOfFile((HANDLE) (*fd)))
-	return set_error(errInfo);
-    return 1;
-}
-
-
-/*
- * is_root_unc_name - returns TRUE if the argument is a UNC name specifying
- *      a root share.  That is, if it is of the form \\server\share\.
- *      This routine will also return true if the argument is of the
- *      form \\server\share (no trailing slash) but Win32 currently
- *      does not like that form.
- *
- *      Forward slashes ('/') may be used instead of backslashes ('\').
- */
-
-static int
-is_root_unc_name(const WCHAR *path)
-{
-    /*
-     * If a root UNC name, path will start with 2 (but not 3) slashes
-     */
-
-    if ((wcslen(path) >= 5) /* minimum string is "//x/y" */
-	&& ISSLASH(path[0]) && ISSLASH(path[1]))
-    {
-        const WCHAR *p = path + 2;
-
-        /*
-         * find the slash between the server name and share name
-         */
-        while ( * ++ p )
-            if ( ISSLASH(*p) )
-                break ;
-
-        if ( *p && p[1] )
-        {
-            /*
-             * is there a further slash?
-             */
-            while ( * ++ p )
-                if ( ISSLASH(*p) )
-                    break ;
-
-            /*
-             * just final slash (or no final slash)
-             */
-            if ( !*p || !p[1])
-                return 1;
-        }
-    }
-
-    return 0 ;
-}
-
-/*
- * Extracts the root part of an absolute filename (by modifying the string
- * pointed to by the name argument).  The name can start
- * with either a driver letter (for example, C:\), or a UNC name
- * (for example, \\guinness\bjorn).
- *
- * If the name is invalid, the buffer will be modified to point to
- * an empty string.
- *
- * Returns: 1 if the name consists of just the root part, 0 if
- * 	    the name was longer.
- */
-
-static int
-extract_root(WCHAR* name)
-{
-    int len = wcslen(name);
-
-    if (iswalpha(name[0]) && name[1] == L':' && ISSLASH(name[2])) {
-	WCHAR c = name[3];
-	name[3] = L'\0';
-	return c == L'\0';
-    } else if (len < 5 || !ISSLASH(name[0]) || !ISSLASH(name[1])) {
-	goto error;
-    } else {			/* Try to find the end of the UNC name. */
-	WCHAR* p;
-	WCHAR c;
-
-        /*
-         * Find the slash between the server name and share name.
-         */
-
-	for (p = name + 2; *p; p++)
-            if (ISSLASH(*p))
-                break;
-	if (*p == L'\0')
-	    goto error;
-
-	/*
-	 * Find the slash after the share name.
-	 */
-
-	for (p++; *p; p++)
-            if (ISSLASH(*p))
-                break;
-	c = *p;
-	*p = L'\0';
-	return c == L'\0' || p[1] == L'\0';
-    }
-
- error:
-    *name = L'\0';
-    return 1;
-}
-
-static unsigned short
-dos_to_posix_mode(int attr, const WCHAR *name)
-{
-    register unsigned short uxmode;
-    unsigned dosmode;
-    register const WCHAR *p;
-
-    dosmode = attr & 0xff;
-    if ((p = name)[1] == L':')
-	p += 2;
-
-    /* check to see if this is a directory - note we must make a special
-     * check for the root, which DOS thinks is not a directory
-     */
-
-    uxmode = (unsigned short)
-	(((ISSLASH(*p) && !p[1]) || (dosmode & FILE_ATTRIBUTE_DIRECTORY) ||
-	       *p == L'\0') ? _S_IFDIR|_S_IEXEC : _S_IFREG);
-
-    /* If attribute byte does not have read-only bit, it is read-write */
-
-    uxmode |= (dosmode & FILE_ATTRIBUTE_READONLY) ?
-	_S_IREAD : (_S_IREAD|_S_IWRITE);
-
-    /* see if file appears to be executable - check extension of name */
-
-    if (p = wcsrchr(name, L'.')) {
-        if (!_wcsicmp(p, L".exe") ||
-	    !_wcsicmp(p, L".cmd") ||
-	    !_wcsicmp(p, L".bat") ||
-	    !_wcsicmp(p, L".com"))
-            uxmode |= _S_IEXEC;
-    }
-
-    /* propagate user read/write/execute bits to group/other fields */
-
-    uxmode |= (uxmode & 0700) >> 3;
-    uxmode |= (uxmode & 0700) >> 6;
-
-    return uxmode;
-}
-
-
-int
-efile_readlink(Efile_error* errInfo, char* name, char* buffer, size_t size)
-{
-    Efile_call_state state;
-    int ret;
-    DBG_TRACE(1, name);
-    call_state_init(&state, errInfo);
-    ret = !!do_readlink(&state, name, buffer, size);
-    call_state_free(&state);
-    return ret;
-}
-
-/* If buffer==0, return buffer allocated by wpath_tmp_allocate
-*/
-static char*
-do_readlink(Efile_call_state* state, char* name, char* buffer, size_t size)
-{
-    /*
-     * load dll and see if we have CreateSymbolicLink at runtime:
-     * (Vista only)
-     */
-    HINSTANCE hModule = NULL;
-    WCHAR *wname = (WCHAR *) name;
-    WCHAR *wbuffer = (WCHAR *) buffer;
-    DWORD wsize = size / sizeof(WCHAR);
-    char* ret = NULL;
-
-    if ((hModule = LoadLibrary("kernel32.dll")) != NULL) {
-	typedef DWORD (WINAPI * GETFINALPATHNAMEBYHANDLEPTR)(
-							     HANDLE hFile,
-							     LPCWSTR lpFilePath,
-							     DWORD cchFilePath,
-							     DWORD dwFlags);
-
-	GETFINALPATHNAMEBYHANDLEPTR pGetFinalPathNameByHandle =
-	    (GETFINALPATHNAMEBYHANDLEPTR)GetProcAddress(hModule, "GetFinalPathNameByHandleW");
-
-	if (pGetFinalPathNameByHandle != NULL) {
-	    DWORD fileAttributes;
-	    ensure_wpath(state, &wname);
-	    /* first check if file is a symlink; {error, einval} otherwise */
-	    fileAttributes = GetFileAttributesW(wname);
-	    if ((fileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
-		DWORD success = 0;
-		HANDLE h = CreateFileW(wname, GENERIC_READ, FILE_SHARE_FLAGS, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
-		int len;
-		if(h != INVALID_HANDLE_VALUE) {
-		    if (!wbuffer) { /* dynamic allocation */
-			WCHAR dummy;
-			wsize = pGetFinalPathNameByHandle(h, &dummy, 0, 0);
-			if (wsize) {
-			    wbuffer = wpath_tmp_alloc(state, wsize);
-			}
-		    }
-		    if (wbuffer
-			&& (success = pGetFinalPathNameByHandle(h, wbuffer, wsize, 0))
-			&& success < wsize) {
-			WCHAR* wp;
-
-			/* GetFinalPathNameByHandle prepends path with "\\?\": */
-			len = wcslen(wbuffer);
-			wmemmove(wbuffer,wbuffer+4,len-3);
-			if (len - 4 >= 2 && wbuffer[1] == L':' && wbuffer[0] >= L'A' &&
-			    wbuffer[0] <= L'Z') {
-			    wbuffer[0] = wbuffer[0] + L'a' - L'A';
-			}
-			
-			for (wp=wbuffer ; *wp; wp++)
-			    if (*wp == L'\\')
-				*wp = L'/';
-		    }
-		    CloseHandle(h);
-		}
-		if (success) {
-		    ret = (char*) wbuffer;
-		} else {
-		    set_error(state->errInfo);
-		}
-	    } else {
-		errno = EINVAL;
-		save_last_error(state->errInfo);
-	    }
-	    goto done;
-	}
-    }
-    errno = ENOTSUP;
-    save_last_error(state->errInfo);
-
-done:
-    if (hModule)
-	FreeLibrary(hModule);
-    return ret;
-}
-
-
-int
-efile_altname(Efile_error* errInfo, char* orig_name, char* buffer, size_t size)
-{
-    Efile_call_state state;
-    int ret;
-    DBG_TRACE(1, orig_name);
-    call_state_init(&state, errInfo);
-    ret = do_altname(&state, orig_name, buffer, size);
-    call_state_free(&state);
-    return ret;
-}
-
-static int
-do_altname(Efile_call_state* state, char* orig_name, char* buffer, size_t size)
-{
-    WIN32_FIND_DATAW wfd;
-    HANDLE fh;
-    WCHAR* name;
-    int name_len;
-    WCHAR* full_path = NULL;
-    WCHAR *worig_name = (WCHAR *) orig_name;
-    WCHAR *wbuffer = (WCHAR *) buffer;
-    int drive;			/* Drive for filename (1 = A:, 2 = B: etc). */
-
-    /* Don't allow wildcards to be interpreted by system */
-
-    if (wcspbrk(worig_name, L"?*")) {
-    enoent:
-	state->errInfo->posix_errno = ENOENT;
-	state->errInfo->os_errno = ERROR_FILE_NOT_FOUND;
-        return 0;
-    }
-
-    /*
-     * Move the name to a buffer and make sure to remove a trailing
-     * slash, because it causes FindFirstFile() to fail on Win95.
-     */
-    ensure_wpath(state, &worig_name);
-    name_len = wcslen(worig_name);
-
-    name = wpath_tmp_alloc(state, name_len + 1);
-    wcscpy(name, worig_name);
-    if (name_len > 2 && ISSLASH(name[name_len-1]) &&
-	name[name_len-2] != L':') {
-	name[name_len-1] = L'\0';
-    }
-    
-    /* Try to get disk from name.  If none, get current disk.  */
-
-    if (name[1] != L':') {
-	WCHAR* cwd_path = get_cwd_wpath_tmp(state);
-        drive = 0;
-        if (cwd_path[1] == L':') {
-	    drive = towlower(cwd_path[0]) - L'a' + 1;
-	}
-    } else if (*name && name[2] == L'\0') {
-	/*
-	 * X: and nothing more is an error.
-	 */
-	goto enoent;
-    } else {
-        drive = towlower(*name) - L'a' + 1;
-    }
-    fh = FindFirstFileW(name,&wfd);
-    if (fh == INVALID_HANDLE_VALUE) {
-	DWORD fff_error = GetLastError();
-        if (!(wcspbrk(name, L"./\\") &&
-	      (full_path = get_full_wpath_tmp(state, name, NULL, 0)) &&
-	      /* root dir. ('C:\') or UNC root dir. ('\\server\share\') */
-	      ((wcslen(full_path) == 3) || is_root_unc_name(full_path)) &&
-	      (GetDriveTypeW(full_path) > 1)   ) ) {
-
-	    set_os_errno(state->errInfo, fff_error);
-	    return 0;
-	}
-        /*
-         * Root directories (such as C:\ or \\server\share\ are fabricated.
-         */
-	wcscpy(wbuffer,name);
-	return 1;
-    }
-	
-    wcscpy(wbuffer,wfd.cAlternateFileName);
-    if (!*wbuffer) {
-	wcscpy(wbuffer,wfd.cFileName);
-    }
-    FindClose(fh);
-    return 1;
-}
-
-
-int
-efile_link(Efile_error* errInfo, char* old, char* new)
-{
-    Efile_call_state state;
-    WCHAR *wold = (WCHAR *) old;
-    WCHAR *wnew = (WCHAR *) new;
-    int ret;
-    DBG_TRACE(1, old);
-    call_state_init(&state, errInfo);
-    ensure_wpath(&state, &wold);
-    ensure_wpath(&state, &wnew);
-    if(!CreateHardLinkW(wnew, wold, NULL)) {
-	ret = set_error(errInfo);
-    }
-    else ret =1;
-    call_state_free(&state);
-    return ret;
-}
-
-int
-efile_symlink(Efile_error* errInfo, char* old, char* new)
-{
-    Efile_call_state state;
-    int ret;
-    DBG_TRACE2(1, "symlink(%s <- %s)", old, new);
-    call_state_init(&state, errInfo);
-    ret = do_symlink(&state, old, new);
-    call_state_free(&state);
-    return ret;
-}
-
-static int
-do_symlink(Efile_call_state* state, char* old, char* new)
-{
-    /*
-     * Load dll and see if we have CreateSymbolicLink at runtime:
-     * (Vista only)
-     */
-    HINSTANCE hModule = NULL;
-    WCHAR *wold = (WCHAR *) old;
-    WCHAR *wnew = (WCHAR *) new;
-
-    DBG_TRACE(1, old);
-    if ((hModule = LoadLibrary("kernel32.dll")) != NULL) {
-	typedef BOOLEAN (WINAPI  * CREATESYMBOLICLINKFUNCPTR) (
-	     LPCWSTR lpSymlinkFileName,
-	     LPCWSTR lpTargetFileName,
-	     DWORD dwFlags);
-
-	CREATESYMBOLICLINKFUNCPTR pCreateSymbolicLink =
-	    (CREATESYMBOLICLINKFUNCPTR) GetProcAddress(hModule,
-						       "CreateSymbolicLinkW");
-	/* A for MBCS, W for UNICODE... char* above implies 'W'! */
-	if (pCreateSymbolicLink != NULL) {
-	  ensure_wpath(state, &wold);
-	  ensure_wpath(state, &wnew);
-	  {
-	    DWORD attr = GetFileAttributesW(wold);
-	    int flag = (attr != INVALID_FILE_ATTRIBUTES &&
-			attr & FILE_ATTRIBUTE_DIRECTORY) ? 1 : 0;
-	    /*  SYMBOLIC_LINK_FLAG_DIRECTORY = 1 */
-	    BOOLEAN success = pCreateSymbolicLink(wnew, wold, flag);
-	    FreeLibrary(hModule);
-
-	    if (success) {
-		return 1;
-	    } else {
-		return set_error(state->errInfo);
-	    }
-	  }
-	} else
-	    FreeLibrary(hModule);
-    }
-    errno = ENOTSUP;
-    return check_error(-1, state->errInfo);
-}
-
-int
-efile_fadvise(Efile_error* errInfo, int fd, Sint64 offset,
-	    Sint64 length, int advise)
-{
-    DBG_TRACE(2, L"");
-    /* posix_fadvise is not available on Windows, do nothing */
-    errno = ERROR_SUCCESS;
-    return check_error(0, errInfo);
-}
-
-int
-efile_fallocate(Efile_error* errInfo, int fd, Sint64 offset, Sint64 length)
-{
-    DBG_TRACE(2, L"");
-    /* No file preallocation method available in Windows. */
-    errno = errno_map(ERROR_NOT_SUPPORTED);
-    SetLastError(ERROR_NOT_SUPPORTED);
-
-    return check_error(-1, errInfo);
-}
diff --git a/erts/emulator/hipe/hipe_amd64.c b/erts/emulator/hipe/hipe_amd64.c
index e3cff4a4ba..f23f341e6d 100644
--- a/erts/emulator/hipe/hipe_amd64.c
+++ b/erts/emulator/hipe/hipe_amd64.c
@@ -28,6 +28,7 @@
 #include "error.h"
 #include "bif.h"
 #include "big.h"	/* term_to_Sint() */
+#include "erl_binary.h"
 
 #include "hipe_arch.h"
 #include "hipe_bif0.h"
@@ -38,6 +39,8 @@
 #undef ERL_FUN_SIZE
 #include "hipe_literals.h"
 
+static void patch_trampoline(void *trampoline, void *destAddress);
+
 const Uint sse2_fnegate_mask[2] = {0x8000000000000000,0};
 
 void hipe_patch_load_fe(Uint64 *address, Uint64 value)
@@ -52,9 +55,9 @@ int hipe_patch_insn(void *address, Uint64 value, Eterm type)
     switch (type) {
       case am_closure:
       case am_constant:
+      case am_c_const:
 	*(Uint64*)address = value;
 	break;
-      case am_c_const:
       case am_atom:
 	/* check that value fits in an unsigned imm32 */
 	/* XXX: are we sure it's not really a signed imm32? */
@@ -71,14 +74,18 @@ int hipe_patch_insn(void *address, Uint64 value, Eterm type)
 
 int hipe_patch_call(void *callAddress, void *destAddress, void *trampoline)
 {
-    Sint rel32;
+    Sint64 destOffset = (Sint64)destAddress - (Sint64)callAddress - 4;
 
-    ASSERT(trampoline == NULL);
+    if ((destOffset < -0x80000000L) || (destOffset >= 0x80000000L)) {
+        destOffset = (Sint64)trampoline - (Sint64)callAddress - 4;
 
-    rel32 = (Sint)destAddress - (Sint)callAddress - 4;
-    if ((Sint)(Sint32)rel32 != rel32)
-	return -1;
-    *(Uint32*)callAddress = (Uint32)rel32;
+        if ((destOffset < -0x80000000L) || (destOffset >= 0x80000000L))
+            return -1;
+
+        patch_trampoline(trampoline, destAddress);
+    }
+
+    *(Uint32*)callAddress = (Uint32)destOffset;
     hipe_flush_icache_word(callAddress);
     return 0;
 }
@@ -96,12 +103,80 @@ static void *alloc_code(unsigned int alloc_bytes)
     return erts_alloc(ERTS_ALC_T_HIPE_EXEC, alloc_bytes);
 }
 
+static int check_callees(Eterm callees)
+{
+    Eterm *tuple;
+    Uint arity;
+    Uint i;
+
+    if (is_not_tuple(callees))
+	return -1;
+    tuple = tuple_val(callees);
+    arity = arityval(tuple[0]);
+    for (i = 1; i <= arity; ++i) {
+	Eterm mfa = tuple[i];
+	if (is_atom(mfa))
+	    continue;
+	if (is_not_tuple(mfa) ||
+	    tuple_val(mfa)[0] != make_arityval(3) ||
+	    is_not_atom(tuple_val(mfa)[1]) ||
+	    is_not_atom(tuple_val(mfa)[2]) ||
+	    is_not_small(tuple_val(mfa)[3]) ||
+	    unsigned_val(tuple_val(mfa)[3]) > 255)
+	    return -1;
+    }
+    return arity;
+}
+
+#define TRAMPOLINE_BYTES 12
+
+static void generate_trampolines(unsigned char *address,
+                                 int nrcallees, Eterm callees,
+                                 unsigned char **trampvec)
+{
+    unsigned char *trampoline = address;
+    int i;
+
+    for(i = 0; i < nrcallees; ++i) {
+        trampoline[0] = 0x48;           /* movabsq $..., %rax; */
+        trampoline[1] = 0xb8;
+        *(void**)(trampoline+2) = NULL; /* callee's address */
+        trampoline[10] = 0xff;          /* jmpq *%rax */
+        trampoline[11] = 0xe0;
+        trampvec[i] = trampoline;
+        trampoline += TRAMPOLINE_BYTES;
+    }
+    hipe_flush_icache_range(address, nrcallees*TRAMPOLINE_BYTES);
+}
+
+static void patch_trampoline(void *trampoline, void *destAddress)
+{
+    unsigned char *tp = (unsigned char*) trampoline;
+
+    ASSERT(tp[0] == 0x48 && tp[1] == 0xb8);
+
+    *(void**)(tp+2) = destAddress; /* callee's address */
+    hipe_flush_icache_word(tp+2);
+}
+
 void *hipe_alloc_code(Uint nrbytes, Eterm callees, Eterm *trampolines, Process *p)
 {
-    if (is_not_nil(callees))
+    int nrcallees;
+    Eterm trampvecbin;
+    unsigned char **trampvec;
+    unsigned char *address;
+
+    nrcallees = check_callees(callees);
+    if (nrcallees < 0)
 	return NULL;
-    *trampolines = NIL;
-    return alloc_code(nrbytes);
+
+    trampvecbin = new_binary(p, NULL, nrcallees*sizeof(unsigned char*));
+    trampvec = (unsigned char **)binary_bytes(trampvecbin);
+
+    address = alloc_code(nrbytes + nrcallees*TRAMPOLINE_BYTES);
+    generate_trampolines(address + nrbytes, nrcallees, callees, trampvec);
+    *trampolines = trampvecbin;
+    return address;
 }
 
 void hipe_free_code(void* code, unsigned int bytes)
@@ -129,10 +204,9 @@ void *hipe_make_native_stub(void *callee_exp, unsigned int beamArity)
      */
     unsigned int codeSize;
     unsigned char *code, *codep;
-    unsigned int callEmuOffset;
 
-    codeSize =	/* 23, 26, 29, or 32 bytes */
-      23 +	/* 23 when all offsets are 8-bit */
+    codeSize =	/* 30, 33, 36, or 39 bytes */
+      30 +	/* 30 when all offsets are 8-bit */
       (P_CALLEE_EXP >= 128 ? 3 : 0) +
       ((P_CALLEE_EXP + 4) >= 128 ? 3 : 0) +
       (P_ARITY >= 128 ? 3 : 0);
@@ -197,14 +271,15 @@ void *hipe_make_native_stub(void *callee_exp, unsigned int beamArity)
     codep[0] = beamArity;
     codep += 1;
 
-    /* jmp callemu; 5 bytes */
-    callEmuOffset = (unsigned char*)nbif_callemu - (code + codeSize);
-    codep[0] = 0xe9;
-    codep[1] =  callEmuOffset        & 0xFF;
-    codep[2] = (callEmuOffset >>  8) & 0xFF;
-    codep[3] = (callEmuOffset >> 16) & 0xFF;
-    codep[4] = (callEmuOffset >> 24) & 0xFF;
-    codep += 5;
+    /* jmp callemu; 12 bytes */
+    codep[0] = 0x48;
+    codep[1] = 0xb8;
+    codep += 2;
+    *(Uint64*)codep = (Uint64)nbif_callemu;
+    codep += 8;
+    codep[0] = 0xff;
+    codep[1] = 0xe0;
+    codep += 2;
 
     ASSERT(codep == code + codeSize);
 
diff --git a/erts/emulator/hipe/hipe_amd64_bifs.m4 b/erts/emulator/hipe/hipe_amd64_bifs.m4
index b3c9a460bb..cf4c59c9af 100644
--- a/erts/emulator/hipe/hipe_amd64_bifs.m4
+++ b/erts/emulator/hipe/hipe_amd64_bifs.m4
@@ -462,6 +462,7 @@ ASYM($1):
 	TYPE_FUNCTION(ASYM($1))
 #endif')
 
+
 /*
  * noproc_primop_interface_0(nbif_name, cbif_name)
  * noproc_primop_interface_1(nbif_name, cbif_name)
diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c
index 380031bf13..a8be64e08d 100644
--- a/erts/emulator/hipe/hipe_bif0.c
+++ b/erts/emulator/hipe/hipe_bif0.c
@@ -1112,7 +1112,7 @@ static struct hipe_mfa_info* mod2mfa_put(struct hipe_mfa_info* mfa)
 struct hipe_ref {
     struct hipe_ref_head head;    /* list of refs to same calleee */
     void *address;
-#if defined(__arm__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__)
+#if defined(__x86_64__) || defined(__arm__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__)
     void *trampoline;
 #endif
     unsigned int flags;
@@ -1543,7 +1543,7 @@ BIF_RETTYPE hipe_bifs_add_ref_2(BIF_ALIST_2)
 
     ref = erts_alloc(ERTS_ALC_T_HIPE_LL, sizeof(struct hipe_ref));
     ref->address = address;
-#if defined(__arm__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__)
+#if defined(__x86_64__) || defined(__arm__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__)
     ref->trampoline = trampoline;
 #endif
     ref->flags = flags;
@@ -1771,7 +1771,8 @@ void hipe_redirect_to_module(Module* modp)
     struct hipe_mfa_info *p;
     struct hipe_ref_head* refh;
 
-    ERTS_LC_ASSERT(erts_thr_progress_is_blocking());
+    ERTS_LC_ASSERT(erts_thr_progress_is_blocking() ||
+                   erts_is_multi_scheduling_blocked());
 
     for (p = mod2mfa_get(modp); p; p = p->next_in_mod) {
         if (p->new_address) {
@@ -1818,7 +1819,7 @@ void hipe_redirect_to_module(Module* modp)
 	    if (ref->flags & REF_FLAG_IS_LOAD_MFA)
 		res = hipe_patch_insn(ref->address, (Uint)p->remote_address, am_load_mfa);
 	    else {
-#if defined(__arm__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__)
+#if defined(__x86_64__) || defined(__arm__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__)
                 void* trampoline = ref->trampoline;
 #else
                 void* trampoline = NULL;
diff --git a/erts/emulator/hipe/hipe_bif0.tab b/erts/emulator/hipe/hipe_bif0.tab
index 4038ca7ef8..6728e20123 100644
--- a/erts/emulator/hipe/hipe_bif0.tab
+++ b/erts/emulator/hipe/hipe_bif0.tab
@@ -109,6 +109,7 @@ atom suspend_0
 atom gc_1
 atom hipe_apply
 atom rethrow
+atom raw_raise
 atom find_na_or_make_stub
 atom nonclosure_address
 atom atomic_inc
@@ -135,8 +136,8 @@ atom bs_utf16_size
 atom bs_put_utf16be
 atom bs_put_utf16le
 atom bs_get_utf16
-atom bs_validate_unicode
 atom bs_validate_unicode_retract
 atom emulate_fpe
 atom emasculate_binary
 atom is_divisible
+atom is_unicode
\ No newline at end of file
diff --git a/erts/emulator/hipe/hipe_bif2.c b/erts/emulator/hipe/hipe_bif2.c
index 9ebbb22846..df377b2153 100644
--- a/erts/emulator/hipe/hipe_bif2.c
+++ b/erts/emulator/hipe/hipe_bif2.c
@@ -190,3 +190,8 @@ BIF_RETTYPE hipe_bifs_llvm_fix_pinned_regs_0(BIF_ALIST_0)
 {
     BIF_RET(am_ok);
 }
+
+BIF_RETTYPE hipe_bifs_build_stacktrace_1(BIF_ALIST_1)
+{
+    BIF_RET(build_stacktrace(BIF_P, BIF_ARG_1));
+}
diff --git a/erts/emulator/hipe/hipe_bif2.tab b/erts/emulator/hipe/hipe_bif2.tab
index bbcb577be0..c4da44606a 100644
--- a/erts/emulator/hipe/hipe_bif2.tab
+++ b/erts/emulator/hipe/hipe_bif2.tab
@@ -32,3 +32,4 @@ bif hipe_bifs:modeswitch_debug_on/0
 bif hipe_bifs:modeswitch_debug_off/0
 bif hipe_bifs:debug_native_called/2
 bif hipe_bifs:llvm_fix_pinned_regs/0
+bif hipe_bifs:build_stacktrace/1
diff --git a/erts/emulator/hipe/hipe_bif_list.m4 b/erts/emulator/hipe/hipe_bif_list.m4
index bebe20a18e..33b3cc1ee5 100644
--- a/erts/emulator/hipe/hipe_bif_list.m4
+++ b/erts/emulator/hipe/hipe_bif_list.m4
@@ -186,6 +186,7 @@ gc_bif_interface_1(nbif_erase_1, erase_1)
 gc_bif_interface_1(nbif_erts_internal_garbage_collect_1, erts_internal_garbage_collect_1)
 gc_nofail_primop_interface_1(nbif_gc_1, hipe_gc)
 gc_bif_interface_2(nbif_put_2, put_2)
+gc_bif_interface_2(nbif_hipe_bifs_build_stacktrace, hipe_bifs_build_stacktrace_1)
 
 /*
  * Debug BIFs that need read access to the full state.
@@ -219,10 +220,12 @@ standard_bif_interface_1(nbif_bnot_1, bnot_1)
 standard_bif_interface_1(nbif_set_timeout, hipe_set_timeout)
 standard_bif_interface_1(nbif_conv_big_to_float, hipe_conv_big_to_float)
 standard_bif_interface_2(nbif_rethrow, hipe_rethrow)
+standard_bif_interface_3(nbif_raw_raise, hipe_raw_raise)
 standard_bif_interface_3(nbif_find_na_or_make_stub, hipe_find_na_or_make_stub)
 standard_bif_interface_2(nbif_nonclosure_address, hipe_nonclosure_address)
 nocons_nofail_primop_interface_0(nbif_fclearerror_error, hipe_fclearerror_error)
-standard_bif_interface_2(nbif_is_divisible, hipe_is_divisible)
+noproc_primop_interface_2(nbif_is_divisible, hipe_is_divisible)
+noproc_primop_interface_1(nbif_is_unicode, hipe_is_unicode)
 
 /*
  * Mbox primops with implicit P parameter.
@@ -244,10 +247,9 @@ noproc_primop_interface_2(nbif_eq_2, eq)
 nofail_primop_interface_3(nbif_bs_get_integer_2, erts_bs_get_integer_2)
 nofail_primop_interface_3(nbif_bs_get_binary_2, erts_bs_get_binary_2)
 nofail_primop_interface_3(nbif_bs_get_float_2, erts_bs_get_float_2)
-standard_bif_interface_3(nbif_bs_put_utf8, hipe_bs_put_utf8)
+nocons_nofail_primop_interface_3(nbif_bs_put_utf8, hipe_bs_put_utf8)
 standard_bif_interface_3(nbif_bs_put_utf16be, hipe_bs_put_utf16be)
 standard_bif_interface_3(nbif_bs_put_utf16le, hipe_bs_put_utf16le)
-standard_bif_interface_1(nbif_bs_validate_unicode, hipe_bs_validate_unicode)
 
 /*
  * Bit-syntax primops without any P parameter.
diff --git a/erts/emulator/hipe/hipe_debug.c b/erts/emulator/hipe/hipe_debug.c
index 222a11db3d..929b2a9432 100644
--- a/erts/emulator/hipe/hipe_debug.c
+++ b/erts/emulator/hipe/hipe_debug.c
@@ -63,12 +63,13 @@ static void print_beam_pc(BeamInstr *pc)
 	printf("normal-process-exit");
     } else {
 	ErtsCodeMFA *cmfa = find_function_from_pc(pc);
-	if (cmfa)
+	if (cmfa) {
+	    fflush(stdout);
 	    erts_printf("%T:%T/%bpu + 0x%bpx",
 			cmfa->module, cmfa->function,
                         cmfa->arity,
                         pc - erts_codemfa_to_code(cmfa));
-	else
+	} else
 	    printf("?");
     }
 }
@@ -116,6 +117,7 @@ static void print_stack(Eterm *sp, Eterm *end)
 	    printf(" | 0x%0*lx | 0x%0*lx | ",
 		   2*(int)sizeof(long), (unsigned long)sp,
 		   2*(int)sizeof(long), (unsigned long)val);
+	    fflush(stdout);
 	    erts_printf("%.30T", val);
 	    printf("\r\n");
 	}
@@ -126,7 +128,9 @@ static void print_stack(Eterm *sp, Eterm *end)
 
 void hipe_print_estack(Process *p)
 {
-    printf(" |       BEAM  STACK       |\r\n");
+    printf(" | %*s BEAM   STACK %*s |\r\n",
+	   2*(int)sizeof(long)-3, "",
+	   2*(int)sizeof(long)-4, "");
     print_stack(p->stop, STACK_START(p));
 }
 
@@ -135,7 +139,9 @@ static void print_heap(Eterm *pos, Eterm *end)
     printf("From: 0x%0*lx to 0x%0*lx\n\r",
 	   2*(int)sizeof(long), (unsigned long)pos,
 	   2*(int)sizeof(long), (unsigned long)end);
-    printf(" |         H E A P         |\r\n");
+    printf(" | %*s H E A P %*s |\r\n",
+	   2*(int)sizeof(long)-1, "",
+	   2*(int)sizeof(long)-1, "");
     printf(" | %*s | %*s |\r\n",
 	   2+2*(int)sizeof(long), "Address",
 	   2+2*(int)sizeof(long), "Contents");
@@ -158,8 +164,10 @@ static void print_heap(Eterm *pos, Eterm *end)
 		++pos;
 		--ari;
 	    }
-	} else
+	} else {
+	    fflush(stdout);
 	    erts_printf("%.30T", val);
+	}
 	printf("\r\n");
     }
     printf(" |%s|%s|\r\n", dashes, dashes);
@@ -173,11 +181,15 @@ void hipe_print_heap(Process *p)
 void hipe_print_pcb(Process *p)
 {
     printf("P: 0x%0*lx\r\n", 2*(int)sizeof(long), (unsigned long)p);
-    printf("-----------------------------------------------\r\n");
-    printf("Offset| Name        | Value      | *Value     |\r\n");
+    printf("%.*s\r\n",
+           6+1+13+1+2*(int)sizeof(long)+4+1+2*(int)sizeof(long)+4+1,
+           "---------------------------------------------------------------");
+    printf("Offset| Name        | Value %*s | *Value %*s |\r\n",
+           2*(int)sizeof(long)-4, "",
+           2*(int)sizeof(long)-5, "");
 #undef U
 #define U(n,x) \
-    printf(" % 4d | %s | 0x%0*lx |            |\r\n", (int)offsetof(Process,x), n, 2*(int)sizeof(long), (unsigned long)p->x)
+    printf(" % 4d | %s | 0x%0*lx | %*s |\r\n", (int)offsetof(Process,x), n, 2*(int)sizeof(long), (unsigned long)p->x, 2*(int)sizeof(long)+2, "")
 #undef P
 #define P(n,x) \
     printf(" % 4d | %s | 0x%0*lx | 0x%0*lx |\r\n", (int)offsetof(Process,x), n, 2*(int)sizeof(long), (unsigned long)p->x, 2*(int)sizeof(long), p->x ? (unsigned long)*(p->x) : -1UL)
@@ -241,5 +253,7 @@ void hipe_print_pcb(Process *p)
 #endif	/* HIPE */
 #undef U
 #undef P
-    printf("-----------------------------------------------\r\n");
+    printf("%.*s\r\n",
+           6+1+14+1+2*(int)sizeof(long)+4+1+2*(int)sizeof(long)+4+1,
+           "---------------------------------------------------------------");
 }
diff --git a/erts/emulator/hipe/hipe_gc.c b/erts/emulator/hipe/hipe_gc.c
index 1a4a4c7952..aaedba1afd 100644
--- a/erts/emulator/hipe/hipe_gc.c
+++ b/erts/emulator/hipe/hipe_gc.c
@@ -91,7 +91,7 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
 			ASSERT(is_boxed(val));
 			*nsp_i = val;
 		    } else if (!erts_is_literal(gval, ptr)) {
-			move_boxed(&ptr, val, &n_htop, nsp_i);
+			move_boxed(ptr, val, &n_htop, nsp_i);
 		    }
 		} else if (is_list(gval)) {
 		    Eterm *ptr = list_val(gval);
@@ -100,7 +100,7 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
 			*nsp_i = ptr[1];
 		    } else if (!erts_is_literal(gval, ptr)) {
 			ASSERT(erts_dbg_within_proc(ptr, p, NULL));
-			move_cons(&ptr, val, &n_htop, nsp_i);
+			move_cons(ptr, val, &n_htop, nsp_i);
 		    }
 		}
 	    }
@@ -206,10 +206,10 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
 			ASSERT(is_boxed(val));
 			*nsp_i = val;
 		    } else if (ErtsInArea(ptr, mature, mature_size)) {
-			move_boxed(&ptr, val, &old_htop, nsp_i);
+			move_boxed(ptr, val, &old_htop, nsp_i);
 		    } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
 			ASSERT(erts_dbg_within_proc(ptr, p, NULL));
-			move_boxed(&ptr, val, &n_htop, nsp_i);
+			move_boxed(ptr, val, &n_htop, nsp_i);
 		    }
 		} else if (is_list(gval)) {
 		    Eterm *ptr = list_val(gval);
@@ -217,10 +217,10 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
 		    if (IS_MOVED_CONS(val)) {
 			*nsp_i = ptr[1];
 		    } else if (ErtsInArea(ptr, mature, mature_size)) {
-			move_cons(&ptr, val, &old_htop, nsp_i);
+			move_cons(ptr, val, &old_htop, nsp_i);
 		    } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
 			ASSERT(erts_dbg_within_proc(ptr, p, NULL));
-			move_cons(&ptr, val, &n_htop, nsp_i);
+			move_cons(ptr, val, &n_htop, nsp_i);
 		    }
 		}
 	    }
@@ -278,7 +278,7 @@ Eterm *sweep_literals_nstack(Process *p, Eterm *old_htop, char *area,
 			ASSERT(is_boxed(val));
 			*nsp_i = val;
 		    } else if (ErtsInArea(ptr, area, area_size)) {
-			move_boxed(&ptr, val, &old_htop, nsp_i);
+			move_boxed(ptr, val, &old_htop, nsp_i);
 		    }
 		} else if (is_list(gval)) {
 		    Eterm *ptr = list_val(gval);
@@ -286,7 +286,7 @@ Eterm *sweep_literals_nstack(Process *p, Eterm *old_htop, char *area,
 		    if (IS_MOVED_CONS(val)) {
 			*nsp_i = ptr[1];
 		    } else if (ErtsInArea(ptr, area, area_size)) {
-			move_cons(&ptr, val, &old_htop, nsp_i);
+			move_cons(ptr, val, &old_htop, nsp_i);
 		    }
 		}
 	    }
diff --git a/erts/emulator/hipe/hipe_mkliterals.c b/erts/emulator/hipe/hipe_mkliterals.c
index 6ea120c65c..3323e8640b 100644
--- a/erts/emulator/hipe/hipe_mkliterals.c
+++ b/erts/emulator/hipe/hipe_mkliterals.c
@@ -462,7 +462,15 @@ static const struct rts_param rts_params[] = {
       0
 #endif
     },
-    /* This parameter is always defined, but its value depends on ERTS_SMP. */
+    /* This flag is always defined, but its value is configuration-dependent. */
+    { 17, "ERTS_USE_LITERAL_TAG",
+      1,
+#if defined(TAG_LITERAL_PTR)
+      1
+#else
+      0
+#endif
+    },
     { 19, "MSG_MESSAGE",
       1, offsetof(struct erl_mesg, m[0])
     },
@@ -522,6 +530,9 @@ static const struct rts_param rts_params[] = {
       1, offsetof(struct process, hipe.gc_is_unsafe)
 #endif
     },
+
+    { 54, "P_MSG_LAST", 1, offsetof(struct process, msg.last) },
+    { 55, "P_MSG_SAVED_LAST", 1, offsetof(struct process, msg.saved_last) },
 };
 
 #define NR_PARAMS	ARRAY_SIZE(rts_params)
@@ -529,6 +540,11 @@ static const struct rts_param rts_params[] = {
 static unsigned int literals_crc;
 static unsigned int system_crc;
 
+/*
+ * Change this version value to detect incompatible changes in primop interface.
+ */
+#define PRIMOP_ABI_VSN 0x090300  /* erts-9.3 */
+
 static void compute_crc(void)
 {
     unsigned int crc_value;
@@ -544,6 +560,8 @@ static void compute_crc(void)
     for (i = 0; i < NR_PARAMS; ++i)
 	if (rts_params[i].is_defined)
 	    crc_value = crc_update_int(crc_value, &rts_params[i].value);
+
+    crc_value ^= PRIMOP_ABI_VSN;
     crc_value &= 0x07FFFFFF;
     system_crc = crc_value;
 }
diff --git a/erts/emulator/hipe/hipe_native_bif.c b/erts/emulator/hipe/hipe_native_bif.c
index 23f64a6991..498b43ac6b 100644
--- a/erts/emulator/hipe/hipe_native_bif.c
+++ b/erts/emulator/hipe/hipe_native_bif.c
@@ -254,6 +254,8 @@ void hipe_handle_exception(Process *c_p)
     /* Synthesized to avoid having to generate code for it. */
     c_p->def_arg_reg[0] = exception_tag[GET_EXC_CLASS(c_p->freason)];
 
+    c_p->msg.saved_last = 0;  /* No longer safe to use this position */
+
     hipe_find_handler(c_p);
 }
 
@@ -312,6 +314,32 @@ BIF_RETTYPE nbif_impl_hipe_rethrow(NBIF_ALIST_2)
     }
 }
 
+/* Called via standard_bif_interface_3 */
+BIF_RETTYPE nbif_impl_hipe_raw_raise(NBIF_ALIST_3)
+{
+    Process *c_p = BIF_P;
+    Eterm class = BIF_ARG_1;
+    Eterm value = BIF_ARG_2;
+    Eterm stacktrace = BIF_ARG_3;
+    Eterm reason;
+
+    if (class == am_error) {
+	c_p->fvalue = value;
+	reason = EXC_ERROR;
+    } else if (class == am_exit) {
+	c_p->fvalue = value;
+	reason = EXC_EXIT;
+    } else if (class == am_throw) {
+	c_p->fvalue = value;
+	reason = EXC_THROWN;
+    } else {
+        return am_badarg;
+    }
+    reason &= ~EXF_SAVETRACE;
+    c_p->ftrace = stacktrace;
+    BIF_ERROR(c_p, reason);
+}
+
 /*
  * Support for compiled binary syntax operations.
  */
@@ -394,12 +422,8 @@ Eterm hipe_bs_utf8_size(Eterm arg)
 	return make_small(4);
 }
 
-BIF_RETTYPE nbif_impl_hipe_bs_put_utf8(NBIF_ALIST_3)
+Eterm hipe_bs_put_utf8(Process* p, Eterm arg, byte* base, Uint offset)
 {
-    Process* p = BIF_P;
-    Eterm arg = BIF_ARG_1;
-    byte* base = (byte*) BIF_ARG_2;
-    Uint offset = (Uint) BIF_ARG_3;
     byte *save_bin_buf;
     Uint save_bin_offset;
     int res;
@@ -415,7 +439,8 @@ BIF_RETTYPE nbif_impl_hipe_bs_put_utf8(NBIF_ALIST_3)
     erts_current_bin = save_bin_buf;
     erts_bin_offset = save_bin_offset;
     if (res == 0)
-	BIF_ERROR(p, BADARG);
+        return 0;
+    ASSERT(new_offset != 0);
     return new_offset;
 }
 
@@ -482,15 +507,12 @@ static int validate_unicode(Eterm arg)
     return 1;
 }
 
-BIF_RETTYPE nbif_impl_hipe_bs_validate_unicode(NBIF_ALIST_1)
+Uint hipe_is_unicode(Eterm arg)
 {
-    Process *p = BIF_P;
-    Eterm arg = BIF_ARG_1;
-    if (!validate_unicode(arg))
-	BIF_ERROR(p, BADARG);
-    return NIL;
+    return (Uint) validate_unicode(arg);
 }
 
+
 int hipe_bs_validate_unicode_retract(ErlBinMatchBuffer* mb, Eterm arg)
 {
     if (!validate_unicode(arg)) {
@@ -500,16 +522,12 @@ int hipe_bs_validate_unicode_retract(ErlBinMatchBuffer* mb, Eterm arg)
     return 1;
 }
 
-/* Called via standard_bif_interface_2 */
-BIF_RETTYPE nbif_impl_hipe_is_divisible(NBIF_ALIST_2)
+Uint hipe_is_divisible(Uint dividend, Uint divisor)
 {
-    /* Arguments are Eterm-sized unsigned integers */
-    Uint dividend = BIF_ARG_1;
-    Uint divisor = BIF_ARG_2;
     if (dividend % divisor) {
-	BIF_ERROR(BIF_P, BADARG);
+        return 0;
     } else {
-	return NIL;
+        return 1;
     }
 }
 
diff --git a/erts/emulator/hipe/hipe_native_bif.h b/erts/emulator/hipe/hipe_native_bif.h
index cbc7ab8dc6..ba42b126be 100644
--- a/erts/emulator/hipe/hipe_native_bif.h
+++ b/erts/emulator/hipe/hipe_native_bif.h
@@ -36,6 +36,7 @@ AEXTERN(int,nbif_suspend_msg,(void));
 AEXTERN(int,nbif_suspend_msg_timeout,(void));
 
 AEXTERN(Eterm,nbif_rethrow,(Process*, Eterm, Eterm));
+AEXTERN(Eterm,nbif_raw_raise,(Process*, Eterm, Eterm, Eterm));
 AEXTERN(Eterm,nbif_set_timeout,(Process*, Eterm));
 
 AEXTERN(Eterm,nbif_gc_1,(void));
@@ -66,9 +67,9 @@ AEXTERN(Eterm,nbif_bs_utf16_size,(Eterm));
 AEXTERN(Eterm,nbif_bs_put_utf16be,(Process*,Eterm,byte*,unsigned int));
 AEXTERN(Eterm,nbif_bs_put_utf16le,(Process*,Eterm,byte*,unsigned int));
 AEXTERN(Eterm,nbif_bs_get_utf16,(void));
-AEXTERN(Eterm,nbif_bs_validate_unicode,(Process*,Eterm));
+AEXTERN(Uint,nbif_is_unicode,(Eterm));
 AEXTERN(Eterm,nbif_bs_validate_unicode_retract,(void));
-AEXTERN(void,nbif_is_divisible,(Process*,Uint,Uint));
+AEXTERN(Uint,nbif_is_divisible,(Uint,Uint));
 
 AEXTERN(void,nbif_select_msg,(Process*));
 AEXTERN(Eterm,nbif_cmp_2,(void));
@@ -82,19 +83,20 @@ void hipe_gc(Process*, Eterm);
 BIF_RETTYPE nbif_impl_hipe_set_timeout(NBIF_ALIST_1);
 void hipe_handle_exception(Process*);
 BIF_RETTYPE nbif_impl_hipe_rethrow(NBIF_ALIST_2);
+BIF_RETTYPE nbif_impl_hipe_raw_raise(NBIF_ALIST_3);
 char *hipe_bs_allocate(int);
 Binary *hipe_bs_reallocate(Binary*, int);
 int hipe_bs_put_small_float(Process*, Eterm, Uint, byte*, unsigned, unsigned);
 void hipe_bs_put_bits(Eterm, Uint, byte*, unsigned, unsigned);
 Eterm hipe_bs_utf8_size(Eterm);
-BIF_RETTYPE nbif_impl_hipe_bs_put_utf8(NBIF_ALIST_3);
+Eterm hipe_bs_put_utf8(Process*, Eterm arg, byte* base, Uint offset);
 Eterm hipe_bs_utf16_size(Eterm);
 BIF_RETTYPE nbif_impl_hipe_bs_put_utf16be(NBIF_ALIST_3);
 BIF_RETTYPE nbif_impl_hipe_bs_put_utf16le(NBIF_ALIST_3);
-BIF_RETTYPE nbif_impl_hipe_bs_validate_unicode(NBIF_ALIST_1);
+Uint hipe_is_unicode(Eterm);
 struct erl_bin_match_buffer;
 int hipe_bs_validate_unicode_retract(struct erl_bin_match_buffer*, Eterm);
-BIF_RETTYPE nbif_impl_hipe_is_divisible(NBIF_ALIST_2);
+Uint hipe_is_divisible(Uint, Uint);
 
 #ifdef NO_FPE_SIGNALS
 AEXTERN(void,nbif_emulate_fpe,(Process*));
@@ -104,6 +106,9 @@ void hipe_emulate_fpe(Process*);
 AEXTERN(void,nbif_emasculate_binary,(Eterm));
 void hipe_emasculate_binary(Eterm);
 
+AEXTERN(BIF_RETTYPE,nbif_hipe_bifs_build_stacktrace,(Process*,Eterm));
+BIF_RETTYPE hipe_bifs_build_stacktrace_1(BIF_ALIST_1);
+
 /*
  * Stuff that is different in SMP and non-SMP.
  */
diff --git a/erts/emulator/hipe/hipe_primops.h b/erts/emulator/hipe/hipe_primops.h
index 6aac5e6205..c5f10672f3 100644
--- a/erts/emulator/hipe/hipe_primops.h
+++ b/erts/emulator/hipe/hipe_primops.h
@@ -46,6 +46,7 @@ PRIMOP_LIST(am_clear_timeout, &nbif_clear_timeout)
 PRIMOP_LIST(am_select_msg, &nbif_select_msg)
 PRIMOP_LIST(am_set_timeout, &nbif_set_timeout)
 PRIMOP_LIST(am_rethrow, &nbif_rethrow)
+PRIMOP_LIST(am_raw_raise, &nbif_raw_raise)
 
 
 PRIMOP_LIST(am_bs_get_integer_2, &nbif_bs_get_integer_2)
@@ -63,7 +64,7 @@ PRIMOP_LIST(am_bs_utf16_size, &nbif_bs_utf16_size)
 PRIMOP_LIST(am_bs_put_utf16be, &nbif_bs_put_utf16be)
 PRIMOP_LIST(am_bs_put_utf16le, &nbif_bs_put_utf16le)
 PRIMOP_LIST(am_bs_get_utf16, &nbif_bs_get_utf16)
-PRIMOP_LIST(am_bs_validate_unicode, &nbif_bs_validate_unicode)
+PRIMOP_LIST(am_is_unicode, &nbif_is_unicode)
 PRIMOP_LIST(am_bs_validate_unicode_retract, &nbif_bs_validate_unicode_retract)
 
 PRIMOP_LIST(am_is_divisible, &nbif_is_divisible)
@@ -83,6 +84,7 @@ PRIMOP_LIST(am_emulate_fpe, &nbif_emulate_fpe)
 #endif
 PRIMOP_LIST(am_emasculate_binary, &nbif_emasculate_binary)
 PRIMOP_LIST(am_debug_native_called, &nbif_hipe_bifs_debug_native_called)
+PRIMOP_LIST(am_build_stacktrace, &nbif_hipe_bifs_build_stacktrace)
 
 #if defined(__sparc__)
 #include "hipe_sparc_primops.h"
diff --git a/erts/emulator/hipe/hipe_risc_stack.c b/erts/emulator/hipe/hipe_risc_stack.c
index 4001bedeb6..bb93a918a2 100644
--- a/erts/emulator/hipe/hipe_risc_stack.c
+++ b/erts/emulator/hipe/hipe_risc_stack.c
@@ -47,8 +47,10 @@ static void print_slot(Eterm *sp, unsigned int live)
     printf(" | 0x%0*lx | 0x%0*lx | ",
 	   2*(int)sizeof(long), (unsigned long)sp,
 	   2*(int)sizeof(long), val);
-    if (live)
+    if (live) {
+	fflush(stdout);
 	erts_printf("%.30T", val);
+    }
     printf("\r\n");
 }
 
@@ -68,7 +70,9 @@ void hipe_print_nstack(Process *p)
 	[0 ... 2*sizeof(long)+3] = '-'
     };
 
-    printf(" |      NATIVE  STACK      |\r\n");
+    printf(" | %*s NATIVE   STACK %*s |\r\n",
+	   2*(int)sizeof(long)-5, "",
+	   2*(int)sizeof(long)-4, "");
     printf(" |%s|%s|\r\n", dashes, dashes);
     printf(" | %*s | 0x%0*lx |\r\n",
 	   2+2*(int)sizeof(long), "heap",
diff --git a/erts/emulator/hipe/hipe_x86_stack.c b/erts/emulator/hipe/hipe_x86_stack.c
index 31582b3a2e..615e07917a 100644
--- a/erts/emulator/hipe/hipe_x86_stack.c
+++ b/erts/emulator/hipe/hipe_x86_stack.c
@@ -43,8 +43,10 @@ static void print_slot(Eterm *sp, unsigned int live)
     printf(" | 0x%0*lx | 0x%0*lx | ",
 	   2*(int)sizeof(long), (unsigned long)sp,
 	   2*(int)sizeof(long), val);
-    if (live)
+    if (live) {
+	fflush(stdout);
 	erts_printf("%.30T", val);
+    }
     printf("\r\n");
 }
 
@@ -74,7 +76,9 @@ void hipe_print_nstack(Process *p)
     sdesc0.livebits[0] = ~1;
     sdesc = &sdesc0;
 
-    printf(" |      NATIVE  STACK      |\r\n");
+    printf(" | %*s NATIVE   STACK %*s |\r\n",
+	   2*(int)sizeof(long)-5, "",
+	   2*(int)sizeof(long)-4, "");
     printf(" |%s|%s|\r\n", dashes, dashes);
     printf(" | %*s | 0x%0*lx |\r\n",
 	   2+2*(int)sizeof(long), "heap",
diff --git a/erts/emulator/internal_doc/CarrierMigration.md b/erts/emulator/internal_doc/CarrierMigration.md
index 2a9594db25..3a796d11b7 100644
--- a/erts/emulator/internal_doc/CarrierMigration.md
+++ b/erts/emulator/internal_doc/CarrierMigration.md
@@ -3,17 +3,17 @@ Carrier Migration
 
 The ERTS memory allocators manage memory blocks in two types of raw
 memory chunks. We call these chunks of raw memory
-*carriers*. Singleblock carriers which only contain one large block,
-and multiblock carriers which contain multiple blocks. A carrier is
+*carriers*. Single-block carriers which only contain one large block,
+and multi-block carriers which contain multiple blocks. A carrier is
 typically created using `mmap()` on unix systems. However, how a
 carrier is created is of minor importance. An allocator instance
-typically manages a mixture of single- and multiblock carriers.
+typically manages a mixture of single- and multi-block carriers.
 
 Problem
 -------
 
 When a carrier is empty, i.e. contains only one large free block, it
-is deallocated. Since multiblock carriers can contain both allocated
+is deallocated. Since multi-block carriers can contain both allocated
 blocks and free blocks at the same time, an allocator instance might
 be stuck with a large amount of poorly utilized carriers if the memory
 load decreases. After a peak in memory usage it is expected that not
@@ -23,9 +23,9 @@ can usually be reused if the memory load increases again. However,
 since each scheduler thread manages its own set of allocator
 instances, and memory load is not necessarily correlated to CPU load, we
 might get into a situation where there are lots of poorly utilized
-multiblock carriers on some allocator instances while we need to
-allocate new multiblock carriers on other allocator instances. In
-scenarios like this, the demand for multiblock carriers in the system
+multi-block carriers on some allocator instances while we need to
+allocate new multi-block carriers on other allocator instances. In
+scenarios like this, the demand for multi-block carriers in the system
 might increase at the same time as the actual memory demand in the
 system has decreased which is both unwanted and quite unexpected for
 the end user.
@@ -34,7 +34,7 @@ Solution
 --------
 
 In order to prevent scenarios like this we've implemented support for
-migration of multiblock carriers between allocator instances of the
+migration of multi-block carriers between allocator instances of the
 same type.
 
 ### Management of Free Blocks ###
@@ -44,7 +44,7 @@ and add it to another we need to be able to move references to the
 free blocks of the carrier between the allocator instances. The
 allocator instance specific data structure referring to the free
 blocks it manages often refers to the same carrier from multiple
-places. For example, when the address order bestfit strategy is used
+places. For example, when the address order best-fit strategy is used
 this data structure is a binary search tree spanning all carriers that
 the allocator instance manages. Free blocks in one specific carrier
 can be referred to from potentially every other carrier that is
@@ -135,7 +135,7 @@ carriers between scheduler specific allocator instances of the same
 allocator type.
 
 Each allocator instance keeps track of the current utilization of its
-multiblock carriers. When the total utilization falls below the "abandon
+multi-block carriers. When the total utilization falls below the "abandon
 carrier utilization limit" it starts to inspect the utilization of the
 current carrier when deallocations are made. If also the utilization
 of the carrier falls below the "abandon carrier utilization limit" it
@@ -144,31 +144,45 @@ and inserts the carrier into the pool.
 
 Since the carrier has been unlinked from the data structure of
 available free blocks, no more allocations will be made in the
-carrier. The allocator instance putting the carrier into the pool,
-however, still has the responsibility of performing deallocations in
-it while it remains in the pool. The allocator instance with this
-deallocation responsibility is here called the **employer**.
-
-Each carrier has a flag field containing information about the
-employing allocator instance, a flag indicating if the carrier is in
-the pool or not, and a flag indicating if it is busy or not. When the
-carrier is in the pool, the employing allocator instance needs to mark it
-as busy while operating on it. If another thread inspects it in order
-to try to fetch it from the pool, it will skip it if it is busy. When
-fetching the carrier from the pool, employment will change and further
+carrier.
+
+The allocator instance that created a carrier is called its **owner**.
+Ownership never changes.
+
+The allocator instance that has the responsibility to perform deallocations in a
+carrier is called its **employer**. The employer may also perform allocations if
+the carrier is not in the pool. Employment may change when a carrier is fetched from
+or inserted into the pool.
+
+Deallocations in a carrier, while it remains in the pool, is always performed
+the owner. That is, all pooled carriers are employed by their owners.
+
+Each carrier has an atomic word containing a pointer to the employing allocator
+instance and three bit flags; IN_POOL, BUSY and HOMECOMING.
+
+When fetching a carrier from the pool, employment may change and further
 deallocations in the carrier will be redirected to the new
 employer using the delayed dealloc functionality.
 
-If a carrier in the pool becomes empty, it will be withdrawn from the
-pool. All carriers that become empty are also always passed to its
-**owning** allocator instance for deallocation using the delayed
-dealloc functionality. Since carriers this way always will be
-deallocated by the owner that allocated the carrier, the
+When a foreign allocator instance abandons a carrier back into the pool, it will
+also pass it back to its **owner** using the delayed dealloc queue. When doing
+this it will set the HOMECOMING bit flag to mark it as "enqueued". The owner
+will later clear the HOMECOMING bit when the carrier is dequeued. This mechanism
+prevents a carrier from being enqueued again before it has been dequeued.
+
+When a carrier becomes empty, it will be deallocated. Carrier deallocation is
+always done by the owner that allocated the carrier. By doing this, the
 underlying functionality of allocating and deallocating carriers can
 remain simple and doesn't have to bother about multiple threads. In a
 NUMA system we will also not mix carriers originating from multiple
 NUMA nodes.
 
+If a carrier in the pool becomes empty, it will be withdrawn from the
+pool and be deallocated by the owner which already employs it.
+
+If a carrier employed by a foreign allocator becomes empty, it will be passed
+back to the owner for deallocation using the delayed dealloc functionality.
+
 In short:
 
 * The allocator instance that created a carrier **owns** it.
@@ -177,34 +191,31 @@ In short:
 * The allocator instance that uses a carrier **employs** it.
 * An **employer** can abandon a carrier into the pool.
 * Pooled carriers are not allocated from.
-* Deallocation in a pooled carrier is still performed by its **employer**.
-* **Employment** can only change when a carrier is fetched from the pool.
+* Pooled carriers are always **employed** by their **owner**.
+* **Employment** can only change from **owner** to a foreign allocator
+  when a carrier is fetched from the pool.
+
 
 ### Searching the pool ###
 
+When an allocator instance needs more carrier space, it inspects the pool. If no
+carrier could be fetched from the pool, it will allocate a new
+carrier. Regardless of where the allocator instance gets the carrier from, it
+just links in the carrier into its data structure of free blocks.
+
 To harbor real time characteristics, searching the pool is
 limited. We only inspect a limited number of carriers. If none of
 those carriers had a free block large enough to satisfy the allocation
-request, the search will fail. A carrier in the pool can also be busy
+request, the search will fail. A carrier in the pool can also be BUSY
 if another thread is currently doing block deallocation work on the
-carrier. A busy carrier will also be skipped by the search as it can
+carrier. A BUSY carrier will also be skipped by the search as it can
 not satisfy the request. The pool is lock-free and we do not want to
 block, waiting for the other thread to finish.
 
-#### Before OTP 17.4 ####
+### The bad cluster problem ###
 
-When an allocator instance needs more carrier space, it always begins
-by inspecting its own carriers that are waiting for thread progress
-before they can be deallocated. If no such carrier could be found, it
-then inspects the pool. If no carrier could be fetched from the pool,
-it will allocate a new carrier. Regardless of where the allocator
-instance gets the carrier from it the just links in the carrier into
-its data structure of free blocks.
-
-#### After OTP 17.4 ####
-
-The old search algorithm had a problem as the search always started at
-the same position in the pool, the sentinel. This could lead to
+Before OTP-17.4 the search algorithm had a problem as the search always started
+at the same position in the pool, the sentinel. This could lead to
 contention from concurrent searching processes. But even worse, it
 could lead to a "bad" state when searches fail with a high rate
 leading to new carriers instead being allocated. These new carriers
@@ -236,26 +247,27 @@ The result is that we prefer carriers created by the thread itself,
 which is good for NUMA performance. And we get more entry points when
 searching the pool, which will ease contention and clustering.
 
+### Our own pooled tree ###
+
 To do the first search among own carriers, every allocator instance
-has two new lists: `pooled_list` and `traitor_list`. These lists are only
-accessed by the allocator itself and they only contain the allocator's
-own carriers. When an owned carrier is abandoned and put in the
-pool, it is also linked into `pooled_list`. When we search our
-`pooled_list` and find a carrier that is no longer in the pool, we
-move that carrier from `pooled_list` to `traitor_list` as it is now
-employed by another allocator. If searching `pooled_list` fails, we
-also do a limited search of `traitor_list`. When finding an abandoned
-carrier in `traitor_list` it is either employed or moved back to
-`pooled_list` if it could not satisfy the allocation request.
-
-When searching `pooled_list` and `traitor_list` we always start at the
-point where the last search ended. This to avoid clustering
-problems and increase the probability to find a "good" carrier. As
-`pooled_list` and `traitor_list` are only accessed by the owning
-allocator instance, they need no thread synchronization at all.
+has a `pooled_tree` of carriers. This tree is only accessed by the allocator
+itself and can only contain its own carriers. When a carrier is
+abandoned and put in the pool, it is also inserted into `pooled_tree`. This is
+either done direct, if the carrier was already employed by its owner, or by
+first passing it back to the owner via the delayed dealloc queue.
+
+When we search our `pooled_tree` and find a carrier that is no longer in the
+pool, we remove that carrier from `pooled_tree` and mark it as TRAITOR, as it is
+now employed by a foreign allocator. We will not find any carriers in
+`pooled_tree` that are marked as BUSY by other threads.
+
+If no carrier in `pooled_tree` had a large enough free block, we search it again
+to find any carrier that may act as an entry point into the shared list of all
+pooled carriers. This in order to, if possible, avoid starting at the sentinel
+and thereby ease the "bad clustering" problem.
 
 Furthermore, the search for own carriers that are scheduled
-for deallocation is now done as the last search option. The idea is
+for deallocation is done as the last search option. The idea is
 that it is better to reuse a poorly utilized carrier than to
 resurrect an empty carrier that was just about to be released back to
 the OS.
@@ -271,14 +283,14 @@ load did not.
 When using the `aoffcaobf` or `aoff` strategies compared to `gf` or
 `bf`, we loose some performance since we get more modifications in the
 data structure of free blocks. This performance penalty is however
-reduced using the `aoffcbf` strategy. A tradeoff between memory
+reduced using the `aoffcbf` strategy. A trade off between memory
 consumption and performance is however inevitable, and it is up to
 the user to decide what is most important. 
 
 Further work
 ------------
 
-It would be quite easy to extend this to allow migration of multiblock
+It would be quite easy to extend this to allow migration of multi-block
 carriers between all allocator types. More or less the only obstacle
 is maintenance of the statistics information.
 
diff --git a/erts/emulator/internal_doc/beam_makeops.md b/erts/emulator/internal_doc/beam_makeops.md
new file mode 100644
index 0000000000..1da8d2ab05
--- /dev/null
+++ b/erts/emulator/internal_doc/beam_makeops.md
@@ -0,0 +1,1846 @@
+The beam\_makeops script
+=======================
+
+This document describes the **beam\_makeops** script.
+
+Introduction
+------------
+
+The **beam\_makeops** Perl script is used at build-time by both the
+compiler and runtime system.  Given a number of input files (all with
+the extension `.tab`), it will generate source files used by the
+Erlang compiler and by the runtime system to load and execute BEAM
+instructions.
+
+Essentially those `.tab` files define:
+
+* External generic BEAM instructions.  They are the instructions that
+are known to both the compiler and the runtime system.  Generic
+instructions are stable between releases.  New generic instructions
+with high numbers than previous instructions can be added in major
+releases.  The OTP 20 release has 159 external generic instructions.
+
+* Internal generic instructions.  They are known only to the runtime
+system and can be changed at any time without compatibility issues.
+They are created by transformation rules (described next).
+
+* Rules for transforming one or more generic instructions to other
+generic instructions.  The transformation rules allow combining,
+splitting, and removal of instructions, as well as shuffling operands.
+Because of the transformation rules, the runtime can have many
+internal generic instructions that are only known to runtime system.
+
+* Specific BEAM instructions.  The specific instructions are the
+instructions that are actually executed by the runtime system.  They
+can be changed at any time without causing compatibility issues.
+The loader translates generic instructions to specific instructions.
+In general, for each generic instruction, there exists a family of
+specific instructions.  The OTP 20 release has 389 specific
+instructions.
+
+* The implementation of specific instructions.
+
+Generic instructions have typed operands. Here are a few examples of
+operands for `move/2`:
+
+    {move,{atom,id},{x,5}}.
+    {move,{x,3},{x,0}}.
+    {move,{x,2},{y,1}}.
+
+When those instructions are loaded, the loader rewrites them
+to specific instructions:
+
+    move_cx id 5
+    move_xx 3 0
+    move_xy 2 1
+
+Corresponding to each generic instruction, there is a family of
+specific instructions.  The types that an instance of a specific
+instruction can handle are encoded in the instruction names.  For
+example, `move_xy` takes an X register number as the first operand and
+a Y register number as the second operand.  `move_cx` takes a tagged
+Erlang term as the first operand and an X register number as the
+second operand.
+
+An example: the move instruction
+--------------------------------
+
+Using the `move` instruction as an example, we will give a quick
+tour to show the main features of **beam\_makeops**.
+
+In the `compiler` application, in the file `genop.tab`, there is the
+following line:
+
+    64: move/2
+
+This is a definition of an external generic BEAM instruction. Most
+importantly it specifices that the opcode is 64.  It also defines that
+it has two operands.  The BEAM assembler will use the opcode when
+creating `.beam` files.  The compiler does not really need the arity,
+but it will use it as an internal sanity check when assembling the
+BEAM code.
+
+Let's have a look at `ops.tab` in `erts/emulator/beam`, where the
+specific `move` instructions are defined.  Here are a few of them:
+
+    move x x
+    move x y
+    move c x
+
+Each specific instructions is defined by following the name of the
+instruction with the types for each operand.  An operand type is a
+single letter.  For example, `x` means an X register, `y`
+means a Y register, and `c` is a "constant" (a tagged term such as
+an integer, an atom, or a literal).
+
+Now let's look at the implementation of the `move` instruction.  There
+are multiple files containing implementations of instructions in the
+`erts/emulator/beam` directory.  The `move` instruction is defined in
+`instrs.tab`.  It looks like this:
+
+    move(Src, Dst) {
+        $Dst = $Src;
+    }
+
+The implementation for an instruction largely follows the C syntax,
+except that the variables in the function head don't have any types.
+The `$` before an identifier denotes a macro expansion.  Thus,
+`$Src` will expand to the code to pick up the source operand for
+the instruction and `$Dst` to the code for the destination register.
+
+We will look at the code for each specific instruction in turn.  To
+make the code easier to understand, let's first look at the memory
+layout for the instruction `{move,{atom,id},{x,5}}`:
+
+         +--------------------+--------------------+
+    I -> |                 40 |       &&lb_move_cx |
+         +--------------------+--------------------+
+         |                        Tagged atom 'id' |
+         +--------------------+--------------------+
+
+This example and all other examples in the document assumes a 64-bit
+archictecture, and furthermore that pointers to C code fit in 32 bits.
+
+`I` in the BEAM virtual machine is the instruction pointer.  When BEAM
+executes an instruction, `I` points to the first word of the
+instruction.
+
+`&&lb_move_cx` is the address to C code that implements `move_cx`.  It
+is stored in the lower 32 bits of the word.  In the upper 32 bits is
+the byte offset to the X register; the register number 5 has been
+multiplied by the word size size 8.
+
+In the next word the tagged atom `id` is stored.
+
+With that background, we can look at the generated code for `move_cx`
+in `beam_hot.h`:
+
+    OpCase(move_cx):
+    {
+      BeamInstr next_pf = BeamCodeAddr(I[2]);
+      xb(BeamExtraData(I[0])) = I[1];
+      I += 2;
+      ASSERT(VALID_INSTR(next_pf));
+      GotoPF(next_pf);
+    }
+
+We will go through each line in turn.
+
+* `OpCase(move_cx):` defines a label for the instruction.  The
+`OpCase()` macro is defined in `beam_emu.c`.  It will expand this line
+to `lb_move_cx:`.
+
+* `BeamInstr next_pf = BeamCodeAddr(I[2]);` fetches the pointer to
+code for the next instruction to be executed.  The `BeamCodeAddr()`
+macro extracts the pointer from the lower 32 bits of the instruction
+word.
+
+* `xb(BeamExtraData(I[0])) = I[1];` is the expansion of `$Dst = $Src`.
+`BeamExtraData()` is a macro that will extract the upper 32 bits from
+the instruction word.  In this example, it will return 40 which is the
+byte offset for X register 5.  The `xb()` macro will cast a byte
+pointer to an `Eterm` pointer and dereference it.  The `I[1]` on
+the right side of the `=` fetches an Erlang term (the atom `id` in
+this case).
+
+* `I += 2` advances the instruction pointer to the next
+instruction.
+
+* In a debug-compiled emulator, `ASSERT(VALID_INSTR(next_pf));` makes
+sure that `next_pf` is a valid instruction (that is, that it points
+within the `process_main()` function in `beam_emu.c`).
+
+* `GotoPF(next_pf);` transfers control to the next instruction.
+
+Now let's look at the implementation of `move_xx`:
+
+    OpCase(move_xx):
+    {
+      Eterm tmp_packed1 = BeamExtraData(I[0]);
+      BeamInstr next_pf = BeamCodeAddr(I[1]);
+      xb((tmp_packed1>>BEAM_TIGHT_SHIFT)) = xb(tmp_packed1&BEAM_TIGHT_MASK);
+      I += 1;
+      ASSERT(VALID_INSTR(next_pf));
+      GotoPF(next_pf);
+    }
+
+We will go through the lines that are new or have changed compared to
+`move_cx`.
+
+* `Eterm tmp_packed1 = BeamExtraData(I[0]);` picks up both X register
+numbers packed into the upper 32 bits of the instruction word.
+
+* `BeamInstr next_pf = BeamCodeAddr(I[1]);` pre-fetches the address of
+the next instruction. Note that because both X registers operands fits
+into the instruction word, the next instruction is in the very next
+word.
+
+* `xb((tmp_packed1>>BEAM_TIGHT_SHIFT)) = xb(tmp_packed1&BEAM_TIGHT_MASK);`
+copies the source to the destination.  (For a 64-bit architecture,
+`BEAM_TIGHT_SHIFT` is 16 and `BEAM_TIGHT_MASK` is `0xFFFF`.)
+
+* `I += 1;` advances the instruction pointer to the next instruction.
+
+`move_xy` is almost identical to `move_xx`.  The only difference is
+the use of the `yb()` macro instead of `xb()` to reference the
+destination register:
+
+    OpCase(move_xy):
+    {
+      Eterm tmp_packed1 = BeamExtraData(I[0]);
+      BeamInstr next_pf = BeamCodeAddr(I[1]);
+      yb((tmp_packed1>>BEAM_TIGHT_SHIFT)) = xb(tmp_packed1&BEAM_TIGHT_MASK);
+      I += 1;
+      ASSERT(VALID_INSTR(next_pf));
+      GotoPF(next_pf);
+    }
+
+### Transformation rules ###
+
+Next let's look at how we can do some optimizations using transformation
+rules.  For simple instructions such as `move/2`, the instruction dispatch
+overhead can be substantial.  A simple optimization is to combine common
+instructions sequences to a single instruction.  One such common sequence
+is multiple `move` instructions moving X registers to Y registers.
+
+Using the following rule we can combine two `move` instructions
+to a `move2` instruction:
+
+    move X1=x Y1=y | move X2=x Y2=y => move2 X1 Y1 X2 Y2
+
+The left side of the arrow (`=>`) is a pattern.  If the pattern
+matches, the matching instructions will be replaced by the
+instructions on the right side.  Variables in a pattern must start
+with an uppercase letter just as in Erlang.  A pattern variable may be
+followed `=` and one or more type letters to constrain the match to
+one of those types.  The variables that are bound on the left side can
+be used on the right side.
+
+We will also need to define a specific instruction and an implementation:
+
+    # In ops.tab
+    move2 x y x y
+
+    // In instrs.tab
+    move2(S1, D1, S2, D2) {
+        Eterm V1, V2;
+        V1 = $S1;
+        V2 = $S2;
+        $D1 = V1;
+        $D2 = V2;
+    }
+
+When the loader has found a match and replaced the matched instructions,
+it will match the new instructions against the transformation rules.
+Because of that, we can define the rule for a `move3/6` instruction
+as follows:
+
+    move2 X1=x Y1=y X2=x Y2=y | move X3=x Y3=y => \
+          move3 X1 Y1 X2 Y2 X3 Y3
+
+(A `\` before a newline can be used to break a long line for readability.)
+
+It would also be possible to define it like this:
+
+    move X1=x Y1=y | move X2=x Y2=y | move X3=x Y3=y => \
+         move3 X1 Y1 X2 Y2 X3 Y3
+
+but in that case it must be defined before the rule for `move2/4`
+because the first matching rule will be applied.
+
+One must be careful not to create infinite loops.  For example, if we
+for some reason would want to reverse the operand order for the `move`
+instruction, we must not do like this:
+
+    move Src Dst => move Dst Src
+
+The loader would swap the operands forever.  To avoid the loop, we must
+rename the instruction.  For example:
+
+    move Src Dst => assign Dst Src
+
+This concludes the quick tour of the features of **beam\_makeops**.
+
+Short overview of instruction loading
+-------------------------------------
+
+To give some background to the rest of this document, here follows a
+quick overview of how instructions are loaded.
+
+* The loader reads and decodes one instruction at a time from the BEAM
+code and creates a generic instruction.  Many transformation rules
+must look at multiple instructions, so the loader will
+keep multiple generic instructions in a linked list.
+
+* The loader tries to apply transformation rules against the
+generic instructions in the linked list.  If a rule matches, the
+matched instructions will be removed and replaced with new
+generic instructions constructed from the right side of the
+transformation.
+
+* If a transformation rule matched, the loader applies the
+transformation rules again.
+
+* If no transformation rule match, the loader will begin rewriting
+the first of generic instructions to a specific instruction.
+
+* First the loader will search for a specific operation where the
+types for all operands match the type for the generic instruction.
+The first matching instruction will be selected.  **beam\_makeops**
+has ordered the specific instructions so that instructions with more
+specific operands comes before instructions with less specific
+operands.  For example, `move_nx` is more specific than `move_cx`.  If
+the first operand is `[]` (NIL), `move_nx` will be selected.
+
+* Given the opcode for the selected specific instruction, the loader
+looks up the pointer to the C code for the instruction and stores
+in the code area for the module being loaded.
+
+* The loader translates each operand to a machine word and stores it
+in the code area.  The operand type for the selected specific
+instruction guides the translation.  For example, if the type is `e`,
+the value of the operand is an index into an arry of external
+functions and will be translated to a pointer to the export entry for
+the function to call.  If the type is `x`, the number of the X
+register will be multiplied by the word size to produce a byte offset.
+
+* The loader runs the packing engine to pack multiple operands into a
+single word.  The packing engine is controlled by a small program,
+which is a string where each character is an instruction.  For
+example, the code to pack the operands for `move_xy` is `"22#"` (on a
+64-bit machine).  That program will pack the byte offsets for both
+registers into the same word as the pointer to C code.
+
+Running beam_makeops
+--------------------
+
+**beam\_makeops** is found in `$ERL_TOP/erts/emulator/utils`.  Options
+start with a hyphen (`-`).  The options are followed by the name of
+the input files.  By convention, all input files have the extension
+`.tab`, but is not enforced by **beam\_makeops**.
+
+### The -outdir option ###
+
+The option `-outdir Directory` specifies the output directory for
+the generated files.  Default is the current working directory.
+
+### Running beam_makeops for the compiler ###
+
+Give the option `-compiler` to produce output files for the compiler.
+The following files will be written to the output directory:
+
+* `beam_opcodes.erl` - Used primarily by `beam_asm` and `beam_diasm`.
+
+* `beam_opcode.hrl` - Used by `beam_asm`.  It contains tag definitions
+used for encoding instruction operands.
+
+The input file should only contain the definition of BEAM_FORMAT_NUMBER
+and external generic instructions.  (Everything else would be ignored.)
+
+### Running beam_makeops for the emulator ###
+
+Give the option `-emulator` to produce output files for the emulator.
+The following output files will be generated in the output directory.
+
+* `beam_hot.h`, `beam_warm.h`, `beam_cold.`h - Implementation of
+instructions.  Included inside the `process_main()` function in
+`beam_emu.c`.
+
+* `beam_opcodes.c` - Defines static data used by the loader
+(`beam_load.c`).  Data about generic instructions, specific
+instructions (including how to pack their operands), and
+transformation rules are all part of this file.
+
+* `beam_opcodes.h` - Miscellanous preprocessor definitions, mainly
+used by `beam_load.c` but also by `beam_{hot,warm,cold}.h`.
+
+* `beam_pred_funcs.h` - Included by `beam_load.c`.  Contains defines
+needed to call guard constraints in transformation rules.
+
+* `beam_tr_funcs.h` - Included by `beam_load.c`.  Contains defines
+needed to call a C function to the right of a transformation rule.
+
+The following options can be given:
+
+* `wordsize 32|64` - Defines the word size.  Default is 32.
+
+* `code-model Model` - The code model as given to `-mcmodel` option
+for GCC.  Default is `unknown`.  If the code model is `small` (and
+the word size is 64 bits), **beam\_makeops** will pack operands
+into the upper 32 bits of the instruction word.
+
+* `DSymbol=0|1` - Defines the value for a symbol.  The symbol can be
+used in `%if` and `%unless` directives.
+
+Syntax of .tab files
+--------------------
+
+### Comments ###
+
+Any line starting with `#` is a comment and is ignored.
+
+A line with `//` is also a comment.  It is recommended to only
+use this style of comments in files that define implementations of
+instructions.
+
+A long line can be broken into shorter lines by a placing a`\` before
+the newline.
+
+### Variable definitions ###
+
+A variable definition binds a variable to a Perl variable.  It is only
+meaningful to add a new definition if **beam\_makeops** is updated
+at the same time to use the variable.  A variable definition looks this:
+
+*name*=*value*[;]
+
+where *name* is the name of a Perl variable in **beam\_makeops**,
+and *value* is the value to be given to the variable.  The line
+can optionally end with a `;` (to avoid messing up the
+C indentation mode in Emacs).
+
+Here follows a description of the variables that are defined.
+
+#### BEAM\_FORMAT\_NUMBER ####
+
+`genop.tab` has the following definition:
+
+    BEAM_FORMAT_NUMBER=0
+
+It defines the version of the instruction set (which will be
+included in the code header in the BEAM code).  Theoretically,
+the version could be bumped, and all instructions changed.
+In practice, we would have two support two instruction sets
+in the runtime system for at least two releases, so it will
+probably never happen in practice.
+
+#### GC\_REGEXP ####
+
+In `macros.tab`, there is a definition of `GC_REGEXP`.
+It will be described in [a later section](#the-gc_regexp-definition).
+
+### Directives ###
+
+There are directives to classify specific instructions depending
+on how frequently used they are:
+
+* `%hot` - Implementation will be placed in `beam_hot.h`. Frequently
+executed instructions.
+
+* `%warm` - Implementation will be placed in `beam_warm.h`.  Binary
+syntax instructions.
+
+* `%cold` - Implementation will be placed in `beam_cold.h`. Trace
+instructions and infrequently used instructions.
+
+Default is `%hot`.  The directives will be applied to declarations
+of the specific instruction that follow.  Here is an example:
+
+    %cold
+    is_number f? xy
+    %hot
+
+#### Conditional compilation directives ####
+
+The `%if` directive includes a range of lines if a condition is
+true.  For example:
+
+    %if ARCH_64
+    i_bs_get_integer_32 x f? x
+    %endif
+
+The specific instruction `i_bs_get_integer_32` will only be defined
+on a 64-bit machine.
+
+The condition can be inverted by using `%unless` instead of `%if`:
+
+    %unless NO_FPE_SIGNALS
+    fcheckerror p => i_fcheckerror
+    i_fcheckerror
+    fclearerror
+    %endif
+
+It is also possible to add an `%else` clause:
+
+    %if ARCH_64
+    BS_SAFE_MUL(A, B, Fail, Dst) {
+        Uint64 res = ($A) * ($B);
+        if (res / $B != $A) {
+            $Fail;
+        }
+        $Dst = res;
+    }
+    %else
+    BS_SAFE_MUL(A, B, Fail, Dst) {
+        Uint64 res = (Uint64)($A) * (Uint64)($B);
+        if ((res >> (8*sizeof(Uint))) != 0) {
+            $Fail;
+        }
+        $Dst = res;
+    }
+    %endif
+
+#### Symbols that are defined in directives ####
+
+The following symbols are always defined.
+
+* `ARCH_64` - is 1 for a 64-bit machine, and 0 otherwise.
+* `ARCH_32` - is 1 for 32-bit machine, and 1 otherwise.
+
+The `Makefile` for building the emulator currently defines the
+following symbols by using the `-D` option on the command line for
+**beam\_makeops**.
+
+* `NO_FPE_SIGNALS` - 1 if FPE signals are not enable in runtime system,
+0 otherwise.
+* `USE_VM_PROBES` - 1 if the runtime system is compiled to use VM probes (support for dtrace or systemtap), 0 otherwise.
+
+### Defining external generic instructions ###
+
+External generic BEAM instructions are known to both the compiler and
+the runtime system.  They remain stable between releases.  A new major
+release may add more external generic instructions, but must not change
+the semantics for a previously defined instruction.
+
+The syntax for an external generic instruction is as follows:
+
+*opcode*: [-]*name*/*arity*
+
+*opcode* is an integer greater than or equal to 1.
+
+*name* is an identifier starting with a lowercase letter.  *arity* is
+an integer denoting the number of operands.
+
+*name* can optionally be preceded by `-` to indicate that it has been
+obsoleted.  The compiler is not allowed to generate BEAM files that
+use obsolete instructions and the loader will refuse to load BEAM
+files that use obsolete instructions.
+
+It only makes sense to define external generic instructions in the
+file `genop.tab` in `lib/compiler/src`, because the compiler must
+know about them in order to use them.
+
+New instructions must be added at the end of the file, with higher
+numbers than the previous instructions.
+
+### Defining internal generic instructions ###
+
+Internal generic instructions are known only to the runtime
+system and can be changed at any time without compatibility issues.
+
+There are two ways to define internal generic instructions:
+
+* Implicitly when a specific instruction is defined.  This is by far
+the most common way.  Whenever a specific instruction is created,
+**beam\_makeops** automatically creates an internal generic instruction
+if it does not previously exist.
+
+* Explicitly.  This is necessary only when a generic instruction does
+not have any corresponding specific instruction.
+
+The syntax for an internal generic instruction is as follows:
+
+*name*/*arity*
+
+*name* is an identifier starting with a lowercase letter.  *arity* is
+an integer denoting the number of operands.
+
+### About generic instructions in general ###
+
+Each generic instruction has an opcode.  The opcode is an integer,
+greater than or equal to 1. For an external generic instruction, it
+must be explicitly given `genop.tab`, while internal generic
+instructions are automatically numbered by **beam\_makeops**.
+
+The identity of a generic instruction is its name combined with its
+arity.  That means that it is allowed to define two distinct generic
+instructions having the same name but with different arities.  For
+example:
+
+    move_window/5
+    move_window/6
+
+Each operand of a generic instruction is tagged with its type.  A generic
+instruction can have one of the following types:
+
+* `x` - X register.
+
+* `y` - Y register.
+
+* `l` - Floating point register number.
+
+* `i` - Tagged literal integer.
+
+* `a` - Tagged literal atom.
+
+* `n` - NIL (`[]`, the empty list).
+
+* `q` - Literal that don't fit in a word, that is an object stored on
+the heap such as a list or tuple.  Any heap object type is supported,
+even types that don't have real literals such as external references.
+
+* `f` - Non-zero failure label.
+
+* `p` - Zero failure label.
+
+* `u` - Untagged integer that fits in a machine word.  It is used for many
+different purposes, such as the number of live registers in `test_heap/2`,
+as a reference to the export for `call_ext/2`, and as the flags operand for
+binary syntax instructions.  When the generic instruction is translated to a
+specific instruction, the type for the operand in the specific operation will
+tell the loader how to treat the operand.
+
+* `o` - Overflow.  If the value for an `u` operand does not fit in a machine
+word, the type of the operand will be changed to `o` (with no associated
+value).  Currently only used internally in the loader in the guard constraint
+function `binary_too_big()`.
+
+* `v` - Arity value.  Only used internally in the loader.
+
+
+### Defining specific instructions ###
+
+The specific instructions are known only to the runtime system and
+are the instructions that are actually executed.  They can be changed
+at any time without causing compatibility issues.
+
+A specific instruction can have at most 6 operands.
+
+A specific instruction is defined by first giving its name followed by
+the types for each operand.  For example:
+
+     move x y
+
+Internally, for example in the generated code and in the output from
+the BEAM disassembler, the instruction `move x y` will be called `move_xy`.
+
+The name for a specific instruction is an identifier starting with a
+lowercase letter.  A type is an lowercase or uppercase letter.
+
+All specific instructions with a given name must have the same number
+of operands. That is, the following is **not** allowed:
+
+     move x x
+     move x y x y
+
+Here follows the type letters that more or less directly corresponds
+to the types for generic instructions.
+
+* `x` - X register.  Will be loaded as a byte offset to the X register
+relative to the base of X register array.  (Can be packed with other
+operands.)
+
+* `y` - Y register.  Will be loaded as a byte offset to the Y register
+relative to the stack frame. (Can be packed with other operands.)
+
+* `r` - X register 0.  An implicit operand that will not be stored in
+the loaded code.
+
+* `l` - Floating point register number.  (Can be packed with other
+operands.)
+
+* `i` - Tagged literal integer (a SMALL that will fit in one word).
+
+* `a` - Tagged atom.
+
+* `n` - NIL or the empty list.  (Will not be stored in the loaded code.)
+
+* `q` - Tagged CONS or BOXED pointer.  That is, a term such as a list
+or tuple.  Any heap object type is supported, even types that don't
+have real literals such as external references.
+
+* `f` - Failure label (non-zero).  The target for a branch
+or call instruction.
+
+* `p` - The 0 failure label, meaning that an exception should be raised
+if the instruction fails.  (Will not be stored in the loaded code.)
+
+* `c` - Any literal term; that is, immediate literals such as SMALL,
+and CONS or BOXED pointers to literals.  (Can be used where the
+operand in the generic instruction has one of the types `i`, `a`, `n`,
+or `q`.)
+
+The types that follow do a type test of the operand at runtime; thus,
+they are generally more expensive in terms of runtime than the types
+described earlier.  However, those operand types are needed to avoid a
+combinatorial explosion in the number of specific instructions and
+overall code size of `process_main()`.
+
+* `s` - Tagged source: X register, Y register, or a literal term.  The
+tag will be tested at runtime to retrieve the value from an X
+register, a Y register, or simply use the value as a tagged Erlang
+term.  (Implementation note: An X register is tagged as a pid, and a Y
+register as a port.  Therefore the literal term must not contain a
+port or pid.)
+
+* `S` - Tagged source register (X or Y).  The tag will be tested at
+runtime to retrieve the value from an X register or a Y register.  Slighly
+cheaper than `s`.
+
+* `d` - Tagged destination register (X or Y).  The tag will be tested
+at runtime to set up a pointer to the destination register.  If the
+instrution performs a garbarge collection, it must use the
+`$REFRESH_GEN_DEST()` macro to refresh the pointer before storing to
+it (there are more details about that in a later section).
+
+* `j` - A failure label (combination of `f` and `p`).  If the branch target 0,
+an exception will be raised if instruction fails, otherwise control will be
+transfered to the target address.
+
+The types that follows are all applied to an operand that has the `u`
+type.
+
+* `t` - An untagged integer that will fit in 12 bits (0-4096).  It can be
+packed with other operands in a word.  Most often used as the number
+of live registers in instructions such as `test_heap`.
+
+* `I` - An untagged integer that will fit in 32 bits.  It can be
+packed with other operands in a word on a 64-bit system.
+
+* `W` - Untagged integer or pointer.  Not possible to pack with other
+operands.
+
+* `e` - Pointer to an export entry.  Use by call instructions that call
+other modules, such as `call_ext`.
+
+* `L` - A label.  Only used by the `label/1` instruction.
+
+* `b` - Pointer to BIF.  Used by instructions that BIFs, such as
+`call_bif`.
+
+* `A` - A tagged arityvalue.  Used in instructions that test the arity
+of a tuple.
+
+* `P` - A byte offset into a tuple.
+
+* `Q` - A byte offset into the stack.  Used for updating the frame
+pointer register.  Can be packed with other operands.
+
+When the loader translates a generic instruction a specific
+instruction, it will choose the most specific instruction that will
+fit the types.  Consider the following two instructions:
+
+    move c x
+    move n x
+
+The `c` operand can encode any literal value, including NIL.  The
+`n` operand only works for NIL.  If we have the generic instruction
+`{move,nil,{x,1}}`, the loader will translate it to `move_nx 1`
+because `move n x` is more specific.  `move_nx` could be slightly
+faster or smaller (depending on the architecture), because the `[]`
+is not stored explicitly as an operand.
+
+#### Syntactic sugar for specific instructions ####
+
+It is possible to specify more than one type letter for each operand.
+Here is an example:
+
+    move cxy xy
+
+This is syntactic sugar for:
+
+    move c x
+    move c y
+    move x x
+    move x y
+    move y x
+    move y y
+
+Note the difference between `move c xy` and `move c d`.  Note that `move c xy`
+is equivalent to the following two definitions:
+
+    move c x
+    move c y
+
+On the other hand, `move c d` is a single instruction.  At runtime,
+the `d` operand will be tested to see whether it refers to an X
+register or a Y register, and a pointer to the register will be set
+up.
+
+#### The '?' type modifier ####
+
+The character `?` can be added to the end of an operand to indicate
+that the operand will not be used every time the instruction is executed.
+For example:
+
+    allocate_heap t I t?
+    is_eq_exact f? x xy
+
+In `allocate_heap`, the last operand is the number of live registers.
+It will only be used if there is not enough heap space and a garbage
+collection must be performed.
+
+In `is_eq_exact`, the failure address (the first operand) will only be
+used if the two register operands are not equal.
+
+Knowing that an operand is not always used can improve how packing
+is done for some instructions.
+
+For the `allocate_heap` instruction, without the `?` the packing would
+be done like this:
+
+         +--------------------+--------------------+
+    I -> |       Stack needed | &&lb_allocate_heap +
+         +--------------------+--------------------+
+         |        Heap needed | Live registers     +
+         +--------------------+--------------------+
+
+"Stack needed" and "Heap needed" are always used, but they are in
+different words.  Thus, at runtime the `allocate_heap` instruction
+must read both words from memory even though it will not always use
+"Live registers".
+
+With the `?`, the operands will be packed like this:
+
+         +--------------------+--------------------+
+    I -> |     Live registers | &&lb_allocate_heap +
+         +--------------------+--------------------+
+         |        Heap needed |       Stack needed +
+         +--------------------+--------------------+
+
+Now "Stack needed" and "Heap needed" are in the same word.
+
+### Defining transformation rules ###
+
+Transformation rules are used to rewrite generic instructions to other
+generic instructions.  The transformations rules are applied
+repeatedly until no rule match.  At that point, the first instruction
+in the resulting instruction sequence will be converted to a specific
+instruction and added to the code for the module being loaded.  Then
+the transformation rules for the remaining instructions are run in the
+same way.
+
+A rule is recognized by its right-pointer arrow: `=>`.  To the left of
+the arrow is one or more instruction patterns, separated by `|`.  To
+the right of the arrow is zero or more instructions, separated by `|`.
+If the instructions from the BEAM code matches the instruction
+patterns on the left side, they will be replaced with instructions on
+the right side (or removed if there are no instructions on the right).
+
+#### Defining instruction patterns ####
+
+We will start looking at the patterns on the left side of the arrow.
+
+A pattern for an instruction consists of its name, followed by a pattern
+for each of its operands.  The operand patterns are separated by spaces.
+
+The simplest possible pattern is a variable.  Just like in Erlang,
+a variable must begin with an uppercase letter.  If the same variable is
+used in multiple operands, the pattern will only match if the operands
+are equal.  For example:
+
+    move Same Same =>
+
+This pattern will match if the operands for `move` are the same.  If
+the pattern match, the instruction will be removed.  (That used to be an
+actual rule a long time ago when the compiler would occasionally produce
+instructions such as `{move,{x,2},{x,2}}`.)
+
+Variables that have been bound on the left side can be used on the
+right side.  For example, this rule will rewrite all `move` instructions
+to `assign` instructions with the operands swapped:
+
+    move Src Dst => assign Dst Src
+
+If we only want to match operands of a certain type, we can
+use a type constraint.  A type constraint consists of one or more
+lowercase letters, each specifying a type.  For example:
+
+    is_integer Fail an => jump Fail
+
+The second operand pattern, `an`, will match if the second operand is
+either an atom or NIL (the empty list).  In case of a match, the
+`is_integer/2` instruction will be replaced with a `jump/1`
+instruction.
+
+An operand pattern can bind a variable and constrain the type at the
+same time by following the variable with a `=` and the constraint.
+For example:
+
+    is_eq_exact Fail=f R=xy C=q => i_is_eq_exact_literal Fail R C
+
+Here the `is_eq_exact` instruction is replaced with a specialized instruction
+that only compares literals, but only if the first operand is a register and
+the second operand is a literal.
+
+#### Further constraining patterns ####
+
+In addition to specifying a type letter, the actual value for the type can
+be specified.  For example:
+
+    move C=c x==1 => move_x1 C
+
+Here the second operand of `move` is constrained to be X register 1.
+
+When specifying an atom constraint, the atom is written as it would be
+in the C source code.  That is, it needs an `am_` prefix, and it must
+be listed in `atom.names`.  For example:
+
+    is_boolean Fail=f a==am_true =>
+    is_boolean Fail=f a==am_false =>
+
+There are several constraints available for testing whether a call is to a BIF
+or a function.
+
+The constraint `u$is_bif` will test whether the given operand refers to a BIF.
+For example:
+
+    call_ext u Bif=u$is_bif => call_bif Bif
+    call_ext u Func         => i_call_ext Func
+
+The `call_ext` instruction can be used to call functions written in
+Erlang as well as BIFs (or more properly called SNIFs).  The
+`u$is_bif` constraint will match if the operand refers to a BIF (that
+is, if it is listed in the file `bif.tab`).  Note that `u$is_bif`
+should only be applied to operands that are known to contain an index
+to the import table chunk in the BEAM file (such operands have the
+type `b` or `e` in the corresponding specific instruction).  If
+applied to other `u` operands, it will at best return a nonsense
+result.
+
+The `u$is_not_bif` constraint matches if the operand does not refer to
+a BIF (not listed in `bif.tab`).  For example:
+
+    move S X0=x==0 | line Loc | call_ext_last Ar Func=u$is_not_bif D => \
+         move S X0 | call_ext_last Ar Func D
+
+The `u$bif:Module:Name/Arity` constraint tests whether the given
+operand refers to a specific BIF.  Note that `Module:Name/Arity`
+**must** be an existing BIF defined in `bif.tab`, or there will
+be a compilation error.  It is useful when a call to a specific BIF
+should be replaced with an instruction as in this example:
+
+    gc_bif2 Fail Live u$bif:erlang:splus/2 S1 S2 Dst => \
+         gen_plus Fail Live S1 S2 Dst
+
+Here the call to the GC BIF `'+'/2` will be replaced with the instruction
+`gen_plus/5`.  Note that the same name as used in the C source code must be
+used for the BIF, which in this case is `splus`.  It is defined like this
+in `bit.tab`:
+
+    ubif erlang:'+'/2 splus_2
+
+The `u$func:Module:Name/Arity` will test whether the given operand is a
+a specific function.  Here is an example:
+
+    bif1 Fail u$func:erlang:is_constant/1 Src Dst => too_old_compiler
+
+`is_constant/1` used to be a BIF a long time ago.  The transformation
+replaces the call with the `too_old_compiler` instruction which will produce
+a nicer error message than the default error would be for a missing guard BIF.
+
+#### Type constraints allowed in patterns ####
+
+Here are all type letters that are allowed on the left side of a transformation
+rule.
+
+* `u` - An untagged integer that fits in a machine word.
+
+* `x` - X register.
+
+* `y` - Y register.
+
+* `l` - Floating point register number.
+
+* `i` - Tagged literal integer.
+
+* `a` - Tagged literal atom.
+
+* `n` - NIL (`[]`, the empty list).
+
+* `q` - Literals that don't fit in a word, such as list or tuples.
+
+* `f` - Non-zero failure label.
+
+* `p` - The zero failure label.
+
+* `j` - Any label.  Equivalent to `fp`.
+
+* `c` - Any literal term.  Equivalent to `ainq`.
+
+* `s` - X register, Y register, or any literal term.  Equivalent to `xyc`.
+
+* `d` - X or Y register.  Equivalent to `xy`.  (In a pattern `d` will
+match both source and destination registers.  As an operand in a specific
+instruction, it must only be used for a destination register.)
+
+* `o` - Overflow.  An untagged integer that does not fit in a machine word.
+
+#### Guard constraints ####
+
+If the constraints described so far is not enough, additional
+constraints can be written in C in `beam_load.c` and be called as a
+guard function on the left side of the transformation.  If the guard
+function returns a non-zero value, the matching of the rule will
+continue, otherwise the match will fail.  For example:
+
+    ensure_map Lit=q | literal_is_map(Lit) =>
+
+The guard test `literal_is_map/1` tests whether the given literal is a map.
+If the literal is a map, the instruction is unnecessary and can be removed.
+
+It is outside the scope for this document to describe in detail how such
+guard functions are written, but for the curious here is the implementation
+of `literal_is_map()`:
+
+    static int
+    literal_is_map(LoaderState* stp, GenOpArg Lit)
+    {
+        Eterm term;
+
+        ASSERT(Lit.type == TAG_q);
+        term = stp->literals[Lit.val].term;
+        return is_map(term);
+    }
+
+#### Handling instruction with variable number of operands ####
+
+Some instructions, such as `select_val/3`, essentially has a variable
+number of operands.  Such instructions have a `{list,[...]}` operand
+as their last operand in the BEAM assembly code.  For example:
+
+    {select_val,{x,0},
+                {f,1},
+                {list,[{atom,b},{f,4},{atom,a},{f,5}]}}.
+
+The loader will convert a `{list,[...]}` operand to an `u` operand whose
+value is the number of elements in the list, followed by each element in
+the list.  The instruction above would be translated to the following
+generic instruction:
+
+    {select_val,{x,0},{f,1},{u,4},{atom,b},{f,4},{atom,a},{f,5}}
+
+To match a variable number of arguments we need to use the special
+operand type `*` like this:
+
+    select_val Src=aiq Fail=f Size=u List=* => \
+        i_const_select_val Src Fail Size List
+
+This transformation renames a `select_val/3` instruction
+with a constant source operand to `i_const_select_val/3`.
+
+#### Constructing new instructions on the right side ####
+
+The most common operand on the right side is a variable that was bound while
+matching the left side.  For example:
+
+    trim N Remaining => i_trim N
+
+An operand can also be a type letter to construct an operand of that type.
+Each type has a default value.  For example, the type `x` has the default
+value 1023, which is the highest X register.  That makes `x` on the right
+side a convenient shortcut for a temporary X register.  For example:
+
+    is_number Fail Literal=q => move Literal x | is_number Fail x
+
+If the second operand for `is_number/2` is a literal, it will be moved to
+X register 1023.  Then `is_number/2` will test whether the value stored in
+X register 1023 is a number.
+
+This kind of transformation is useful when it is rare that an operand can
+be anything else but a register.  In the case of `is_number/2`, the second
+operand is always a register unless the compiler optimizations have been
+disabled.
+
+If the default value is not suitable, the type letter can be followed
+by `=` and a value.  Most types take an integer value.  The value for
+an atom is written the same way as in the C source code.  For example,
+the atom `false` is written as `am_false`.  The atom must be listed in
+`atom.names`.
+
+Here is an example showing how values can be specified:
+
+    bs_put_utf32 Fail=j Flags=u Src=s => \
+        i_bs_validate_unicode Fail Src | \
+        bs_put_integer Fail i=32 u=1 Flags Src
+
+#### Type letters on the right side ####
+
+Here follows all types that are allowed to be used in operands for
+instructions being constructed on the right side of a transformation
+rule.
+
+* `u` - Construct an untagged integer.  The default value is 0.
+
+* `x` - X register.  The default value is 1023.  That makes `x` convenient to
+use as a temporary X register.
+
+* `y` - Y register.  The default value is 0.
+
+* `l` - Foating point register number.  The default value is 0.
+
+* `i` - Tagged literal integer.  The default value is 0.
+
+* `a` - Tagged atom.  The default value is the empty atom (`am_Empty`).
+
+* `n` - NIL (`[]`, the empty list).
+
+#### Function call on the right side ####
+
+Transformations that are not possible to describe with the rule
+language as described here can be written as a C function in
+`beam_load.c` and called from the right side of a transformation.  The
+left side of the transformation will perform the match and bind
+operands to variables.  The variables can then be passed to a
+generator function on the right side.  For example:
+
+    bif2 Fail=j u$bif:erlang:element/2 Index=s Tuple=xy Dst=d => \
+        gen_element(Jump, Index, Tuple, Dst)
+
+This transformation rule matches a call to the BIF `element/2`.
+The operands will be captured and the function `gen_element()` will
+be called.
+
+`gen_element()` will produce one of two instructions depending
+on `Index`.  If `Index` is an integer in the range from 1 up to
+the maximum tuple size, the instruction `i_fast_element/2` will
+be produced, otherwise the instruction `i_element/4` will be
+produced.  The corresponding specific instructions are:
+
+    i_fast_element xy j? I d
+    i_element xy j? s d
+
+The `i_fast_element/2` instruction is faster because the tuple is
+already an untagged integer.  It also knows that the index is at least
+1, so it does not have to test for that.  The `i_element/4`
+instruction will have to fetch the index from a register, test that it
+is an integer, and untag the integer.
+
+It is outside the scope of this document to describe in detail how
+generator functions are written, but for the curious, here is the
+implementation of `gen_element()`:
+
+    static GenOp*
+    gen_element(LoaderState* stp, GenOpArg Fail,
+       GenOpArg Index, GenOpArg Tuple, GenOpArg Dst)
+    {
+        GenOp* op;
+
+        NEW_GENOP(stp, op);
+        op->arity = 4;
+        op->next = NULL;
+
+        if (Index.type == TAG_i && Index.val > 0 &&
+           Index.val <= ERTS_MAX_TUPLE_SIZE &&
+           (Tuple.type == TAG_x || Tuple.type == TAG_y)) {
+            op->op = genop_i_fast_element_4;
+            op->a[0] = Tuple;
+            op->a[1] = Fail;
+            op->a[2].type = TAG_u;
+            op->a[2].val = Index.val;
+            op->a[3] = Dst;
+        } else {
+            op->op = genop_i_element_4;
+            op->a[0] = Tuple;
+            op->a[1] = Fail;
+            op->a[2] = Index;
+            op->a[3] = Dst;
+        }
+
+        return op;
+    }
+}
+
+### Defining the implementation ###
+
+The actual implementation of instructions are also defined in `.tab`
+files processed by **beam\_makeops**.  For practical reasons,
+instruction definitions are stored in several files, at the time of
+writing in the following files:
+
+    bif_instrs.tab
+    arith_instrs.tab
+    bs_instrs.tab
+    float_instrs.tab
+    instrs.tab
+    map_instrs.tab
+    msg_instrs.tab
+    select_instrs.tab
+    trace_instrs.tab
+
+There is also a file that only contains macro definitions:
+
+    macros.tab
+
+The syntax of each file is similar to C code.  In fact, most of
+the contents *is* C code, interspersed with macro invocations.
+
+To allow Emacs to auto-indent the code, each file starts with the
+following line:
+
+    // -*- c -*-
+
+To avoid messing up the indentation, all comments are written
+as C++ style comments (`//`) instead of `#`.  Note that a comment
+must start at the beginning of a line.
+
+The meat of an instruction definition file are macro definitions.
+We have seen this macro definition before:
+
+    move(Src, Dst) {
+        $Dst = $Src;
+    }
+
+A macro definitions must start at the beginning of the line (no spaces
+allowed), the opening curly bracket must be on the same line, and the
+finishing curly bracket must be at the beginning of a line.  It is
+recommended that the macro body is properly indented.
+
+As a convention, the macro arguments in the head all start with an
+uppercase letter.  In the body, the macro arguments can be expanded
+by preceding them with `$`.
+
+A macro definition whose name and arity matches a family of
+specific instructions is assumed to be the implementation of that
+instruction.
+
+A macro can also be invoked from within another macro.  For example,
+`move_deallocate_return/2` avoids repeating code by invoking
+`$deallocate_return()` as a macro:
+
+    move_deallocate_return(Src, Deallocate) {
+        x(0) = $Src;
+        $deallocate_return($Deallocate);
+    }
+
+Here is the definition of `deallocate_return/1`:
+
+    deallocate_return(Deallocate) {
+        //| -no_next
+        int words_to_pop = $Deallocate;
+        SET_I((BeamInstr *) cp_val(*E));
+        E = ADD_BYTE_OFFSET(E, words_to_pop);
+        CHECK_TERM(x(0));
+        DispatchReturn;
+    }
+
+The expanded code for `move_deallocate_return` will look this:
+
+    OpCase(move_deallocate_return_cQ):
+    {
+      x(0) = I[1];
+      do {
+        int words_to_pop = Qb(BeamExtraData(I[0]));
+        SET_I((BeamInstr *) cp_val(*E));
+        E = ADD_BYTE_OFFSET(E, words_to_pop);
+        CHECK_TERM(x(0));
+        DispatchReturn;
+      } while (0);
+    }
+
+When expanding macros, **beam\_makeops** wraps the expansion in a
+`do`/`while` wrapper unless **beam\_makeops** can clearly see that no
+wrapper is needed.  In this case, the wrapper is needed.
+
+Note that arguments for macros cannot be complex expressions, because
+the arguments are split on `,`.  For example, the following would
+not work because **beam\_makeops** would split the expression into
+two arguments:
+
+    $deallocate_return(get_deallocation(y, $Deallocate));
+
+#### Code generation directives ####
+
+Within macro definitions, `//` comments are in general not treated
+specially.  They will be copied to the file with the generated code
+along with the rest of code in the body.
+
+However, there is an exception. Within a macro definition, a line that
+starts with whitespace followed by `//|` is treated specially.  The
+rest of the line is assumed to contain directives to control code
+generation.
+
+Currently, two code generation directives are recognized:
+
+* `-no_prefetch`
+* `-no_next`
+
+##### The -no_prefetch directive #####
+
+To see what `-no_prefetch` does, let's first look at the default code
+generation.  Here is the code generated for `move_cx`:
+
+    OpCase(move_cx):
+    {
+      BeamInstr next_pf = BeamCodeAddr(I[2]);
+      xb(BeamExtraData(I[0])) = I[1];
+      I += 2;
+      ASSERT(VALID_INSTR(next_pf));
+      GotoPF(next_pf);
+    }
+
+Note that the very first thing done is to fetch the address to the
+next instruction.  The reason is that it usually improves performance.
+
+Just as a demonstration, we can add a `-no_prefetch` directive to
+the `move/2` instruction:
+
+    move(Src, Dst) {
+        //| -no_prefetch
+        $Dst = $Src;
+    }
+
+We can see that the prefetch is no longer done:
+
+    OpCase(move_cx):
+    {
+      xb(BeamExtraData(I[0])) = I[1];
+      I += 2;
+      ASSERT(VALID_INSTR(*I));
+      Goto(*I);
+    }
+
+When would we want to turn off the prefetch in practice?
+
+In instructions that will not always execute the next instruction.
+For example:
+
+    is_atom(Fail, Src) {
+        if (is_not_atom($Src)) {
+            $FAIL($Fail);
+        }
+    }
+
+    // From macros.tab
+    FAIL(Fail) {
+        //| -no_prefetch
+        $SET_I_REL($Fail);
+        Goto(*I);
+    }
+
+`is_atom/2` may either execute the next instruction (if the second
+operand is an atom) or branch to the failure label.
+
+The generated code looks like this:
+
+    OpCase(is_atom_fx):
+    {
+      if (is_not_atom(xb(I[1]))) {
+        ASSERT(VALID_INSTR(*(I + (fb(BeamExtraData(I[0]))) + 0)));
+        I += fb(BeamExtraData(I[0])) + 0;;
+        Goto(*I);;
+      }
+      I += 2;
+      ASSERT(VALID_INSTR(*I));
+      Goto(*I);
+    }
+
+##### The -no_next directive #####
+
+Next we will look at when the `-no_next` directive can be used.  Here
+is the `jump/1` instruction:
+
+    jump(Fail) {
+        $JUMP($Fail);
+    }
+
+    // From macros.tab
+    JUMP(Fail) {
+        //| -no_next
+        $SET_I_REL($Fail);
+        Goto(*I);
+    }
+
+The generated code looks like this:
+
+    OpCase(jump_f):
+    {
+      ASSERT(VALID_INSTR(*(I + (fb(BeamExtraData(I[0]))) + 0)));
+      I += fb(BeamExtraData(I[0])) + 0;;
+      Goto(*I);;
+    }
+
+If we remove the `-no_next` directive, the code would look like this:
+
+    OpCase(jump_f):
+    {
+      BeamInstr next_pf = BeamCodeAddr(I[1]);
+      ASSERT(VALID_INSTR(*(I + (fb(BeamExtraData(I[0]))) + 0)));
+      I += fb(BeamExtraData(I[0])) + 0;;
+      Goto(*I);;
+      I += 1;
+      ASSERT(VALID_INSTR(next_pf));
+      GotoPF(next_pf);
+    }
+
+In the end, the C compiler will probably optimize this code to the
+same native code as the first version, but the first version is certainly
+much easier to read for human readers.
+
+#### Macros in the macros.tab file ####
+
+The file `macros.tab` contains many useful macros.  When implementing
+new instructions it is good practice to look through `macros.tab` to
+see if any of existing macros can be used rather than re-inventing
+the wheel.
+
+We will describe a few of the most useful macros here.
+
+##### The GC_REGEXP definition #####
+
+The following line defines a regular expression that will recognize
+a call to a function that does a garbage collection:
+
+     GC_REGEXP=erts_garbage_collect|erts_gc|GcBifFunction;
+
+The purpose is that **beam\_makeops** can verify that an instruction
+that does a garbage collection and has an `d` operand uses the
+`$REFRESH_GEN_DEST()` macro.
+
+If you need to define a new function that does garbage collection,
+you should give it the prefix `erts_gc_`.  If that is not possible
+you should update the regular expression so that it will match your
+new function.
+
+##### FAIL(Fail) #####
+
+Branch to `$Fail`.  Will suppress prefetch (`-no_prefetch`).  Typical use:
+
+    is_nonempty_list(Fail, Src) {
+        if (is_not_list($Src)) {
+            $FAIL($Fail);
+        }
+    }
+
+##### JUMP(Fail) #####
+
+Branch to `$Fail`.  Suppresses generation of dispatch of the next
+instruction (`-no_next`).  Typical use:
+
+    jump(Fail) {
+        $JUMP($Fail);
+    }
+
+##### GC_TEST(NeedStack, NeedHeap, Live) #####
+
+`$GC_TEST(NeedStack, NeedHeap, Live)` tests that given amount of
+stack space and heap space is available.  If not it will do a
+garbage collection.  Typical use:
+
+    test_heap(Nh, Live) {
+        $GC_TEST(0, $Nh, $Live);
+    }
+
+##### AH(NeedStack, NeedHeap, Live) #####
+
+`AH(NeedStack, NeedHeap, Live)` allocates a stack frame and
+optionally additional heap space.
+
+#### Pre-defined macros and variables ####
+
+**beam\_makeops** defines several built-in macros and pre-bound variables.
+
+##### The NEXT_INSTRUCTION pre-bound variable #####
+
+The NEXT_INSTRUCTION is a pre-bound variable that is available in
+all instructions.  It expands to the address of the next instruction.
+
+Here is an example:
+
+    i_call(CallDest) {
+        SET_CP(c_p, $NEXT_INSTRUCTION);
+        $DISPATCH_REL($CallDest);
+    }
+
+When calling a function, the return address is first stored in `c_p->cp`
+(using the `SET_CP()` macro defined in `beam_emu.c`), and then control is
+transferred to the callee.  Here is the generated code:
+
+    OpCase(i_call_f):
+    {
+      SET_CP(c_p, I+1);
+      ASSERT(VALID_INSTR(*(I + (fb(BeamExtraData(I[0]))) + 0)));
+      I += fb(BeamExtraData(I[0])) + 0;;
+      DTRACE_LOCAL_CALL(c_p, erts_code_to_codemfa(I));
+      Dispatch();;
+    }
+
+We can see that that `$NEXT_INSTRUCTION` has been expanded to `I+1`.
+That makes sense since the size of the `i_call_f/1` instruction is
+one word.
+
+##### The IP_ADJUSTMENT pre-bound variable #####
+
+`$IP_ADJUSTMENT` is usually 0.  In a few combined instructions
+(described below) it can be non-zero.  It is used like this
+in `macros.tab`:
+
+    SET_I_REL(Offset) {
+        ASSERT(VALID_INSTR(*(I + ($Offset) + $IP_ADJUSTMENT)));
+        I += $Offset + $IP_ADJUSTMENT;
+    }
+
+Avoid using `IP_ADJUSTMENT` directly.  Use `SET_I_REL()` or
+one of the macros that invoke such as `FAIL()` or `JUMP()`
+defined in `macros.tab`.
+
+#### Pre-defined macro functions ####
+
+##### The IF() macro #####
+
+`$IF(Expr, IfTrue, IfFalse)` evaluates `Expr`, which must be a valid
+Perl expression (which for simple numeric expressions have the same
+syntax as C).  If `Expr` evaluates to 0, the entire `IF()` expression will be
+replaced with `IfFalse`, otherwise it will be replaced with `IfTrue`.
+
+See the description of `OPERAND_POSITION()` for an example.
+
+##### The OPERAND\_POSITION() macro #####
+
+`$OPERAND_POSITION(Expr)` returns the position for `Expr`, if
+`Expr` is an operand that is not packed.  The first operand is
+at position 1.
+
+Returns 0 otherwise.
+
+This macro could be used like this in order to share code:
+
+    FAIL(Fail) {
+        //| -no_prefetch
+        $IF($OPERAND_POSITION($Fail) == 1 && $IP_ADJUSTMENT == 0,
+            goto common_jump,
+            $DO_JUMP($Fail));
+    }
+
+    DO_JUMP(Fail) {
+        $SET_I_REL($Fail);
+        Goto(*I));
+    }
+
+    // In beam_emu.c:
+    common_jump:
+       I += I[1];
+       Goto(*I));
+
+
+#### The $REFRESH\_GEN\_DEST() macro ####
+
+When a specific instruction has a `d` operand, early during execution
+of the instruction, a pointer will be initialized to point to the X or
+Y register in question.
+
+If there is a garbage collection before the result is stored,
+the stack will move and if the `d` operand refered to a Y
+register, the pointer will no longer be valid.  (Y registers are
+stored on the stack.)
+
+In those circumstances, `$REFRESH_GEN_DEST()` must be invoked
+to set up the pointer again.  **beam\_makeops** will notice
+if there is a call to a function that does a garbage collection and
+`$REFRESH_GEN_DEST()` is not called.
+
+Here is a complete example.  The `new_map` instruction is defined
+like this:
+
+    new_map d t I
+
+It is implemented like this:
+
+    new_map(Dst, Live, N) {
+        Eterm res;
+
+        HEAVY_SWAPOUT;
+        res = erts_gc_new_map(c_p, reg, $Live, $N, $NEXT_INSTRUCTION);
+        HEAVY_SWAPIN;
+        $REFRESH_GEN_DEST();
+        $Dst = res;
+        $NEXT($NEXT_INSTRUCTION+$N);
+    }
+
+If we have forgotten the `$REFRESH_GEN_DEST()` there would be a message
+similar to this:
+
+    pointer to destination register is invalid after GC -- use $REFRESH_GEN_DEST()
+    ... from the body of new_map at beam/map_instrs.tab(30)
+
+#### Combined instructions ####
+
+**Problem**: For frequently executed instructions we want to use
+"fast" operands types such as `x` and `y`, as opposed to `s` or `S`.
+To avoid an explosion in code size, we want to share most of the
+implementation between the instructions.  Here are the specific
+instructions for `i_increment/5`:
+
+    i_increment r W t d
+    i_increment x W t d
+    i_increment y W t d
+
+The `i_increment` instruction is implemented like this:
+
+    i_increment(Source, IncrementVal, Live, Dst) {
+        Eterm increment_reg_source = $Source;
+        Eterm increment_val = $IncrementVal;
+        Uint live;
+        Eterm result;
+
+        if (ERTS_LIKELY(is_small(increment_reg_val))) {
+            Sint i = signed_val(increment_reg_val) + increment_val;
+            if (ERTS_LIKELY(IS_SSMALL(i))) {
+                $Dst = make_small(i);
+                $NEXT0();
+            }
+        }
+        live = $Live;
+        HEAVY_SWAPOUT;
+        reg[live] = increment_reg_val;
+        reg[live+1] = make_small(increment_val);
+        result = erts_gc_mixed_plus(c_p, reg, live);
+        HEAVY_SWAPIN;
+        ERTS_HOLE_CHECK(c_p);
+        if (ERTS_LIKELY(is_value(result))) {
+            $REFRESH_GEN_DEST();
+            $Dst = result;
+            $NEXT0();
+        }
+        ASSERT(c_p->freason != BADMATCH || is_value(c_p->fvalue));
+        goto find_func_info;
+    }
+
+There will be three almost identical copies of the code.  Given the
+size of the code, that could be too high cost to pay.
+
+To avoid the three copies of the code, we could use only one specific
+instruction:
+
+    i_increment S W t d
+
+(The same implementation as above will work.)
+
+That reduces the code size, but is slower because `S` means that
+there will be extra code to test whether the operand refers to an X
+register or a Y register.
+
+**Solution**: We can use "combined instructions".  Combined
+instructions are combined from instruction fragments.  The
+bulk of the code can be shared.
+
+Here we will show how `i_increment` can be implemented as a combined
+instruction.  We will show each individual fragment first, and then
+show how to connect them together.  First we will need a variable that
+we can store the value fetched from the register in:
+
+    increment.head() {
+        Eterm increment_reg_val;
+    }
+
+The name `increment` is the name of the group that the fragment
+belongs to.  Note that it does not need to have the same
+name as the instruction.  The group name is followed by `.` and
+the name of the fragment.  The name `head` is pre-defined.
+The code in it will be placed at the beginning of a block, so
+that all fragments in the group can access it.
+
+Next we define the fragment that will pick up the value from the
+register from the first operand:
+
+    increment.fetch(Src) {
+        increment_reg_val = $Src;
+    }
+
+We call this fragment `fetch`.  This fragment will be duplicated three
+times, one for each value of the first operand (`r`, `x`, and `y`).
+
+Next we define the main part of the code that do the actual incrementing.
+
+    increment.execute(IncrementVal, Live, Dst) {
+        Eterm increment_val = $IncrementVal;
+        Uint live;
+        Eterm result;
+
+        if (ERTS_LIKELY(is_small(increment_reg_val))) {
+            Sint i = signed_val(increment_reg_val) + increment_val;
+            if (ERTS_LIKELY(IS_SSMALL(i))) {
+                $Dst = make_small(i);
+                $NEXT0();
+            }
+        }
+        live = $Live;
+        HEAVY_SWAPOUT;
+        reg[live] = increment_reg_val;
+        reg[live+1] = make_small(increment_val);
+        result = erts_gc_mixed_plus(c_p, reg, live);
+        HEAVY_SWAPIN;
+        ERTS_HOLE_CHECK(c_p);
+        if (ERTS_LIKELY(is_value(result))) {
+            $REFRESH_GEN_DEST();
+            $Dst = result;
+            $NEXT0();
+        }
+        ASSERT(c_p->freason != BADMATCH || is_value(c_p->fvalue));
+        goto find_func_info;
+    }
+
+We call this fragment `execute`.  It will handle the three remaining
+operands (`W t d`).  There will only be one copy of this fragment.
+
+Now that we have defined the fragments, we need to inform
+**beam\_makeops** how they should be connected:
+
+    i_increment := increment.fetch.execute;
+
+To the left of the `:=` is the name of the specific instruction that
+should be implemented by the fragments, in this case `i_increment`.
+To the right of `:=` is the name of the group with the fragments,
+followed by a `.`.  Then the name of the fragments in the group are
+listed in the order they should be executed.  Note that the `head`
+fragment is not listed.
+
+The line ends in `;` (to avoid messing up the indentation in Emacs).
+
+(Note that in practice the `:=` line is usually placed before the
+fragments.)
+
+The generated code looks like this:
+
+    {
+      Eterm increment_reg_val;
+      OpCase(i_increment_rWtd):
+      {
+        increment_reg_val = r(0);
+      }
+      goto increment__execute;
+
+      OpCase(i_increment_xWtd):
+      {
+        increment_reg_val = xb(BeamExtraData(I[0]));
+      }
+      goto increment__execute;
+
+      OpCase(i_increment_yWtd):
+      {
+        increment_reg_val = yb(BeamExtraData(I[0]));
+      }
+      goto increment__execute;
+
+      increment__execute:
+      {
+        // Here follows the code from increment.execute()
+        .
+        .
+        .
+    }
+
+##### Some notes about combined instructions #####
+
+The operands that are different must be at
+the beginning of the instruction.  All operands in the last
+fragment must have the same operands in all variants of
+the specific instruction.
+
+As an example, the following specific instructions cannot be
+implemented as a combined instruction:
+
+    i_times j? t x x d
+    i_times j? t x y d
+    i_times j? t s s d
+
+We would have to change the order of the operands so that the
+two operands that are different are placed first:
+
+    i_times x x j? t d
+    i_times x y j? t d
+    i_times s s j? t d
+
+We can then define:
+
+    i_times := times.fetch.execute;
+
+    times.head {
+        Eterm op1, op2;
+    }
+
+    times.fetch(Src1, Src2) {
+        op1 = $Src1;
+        op2 = $Src2;
+    }
+
+    times.execute(Fail, Live, Dst) {
+        // Multiply op1 and op2.
+        .
+        .
+        .
+    }
+
+Several instructions can share a group.  As an example, the following
+instructions have different names, but in the end they all create a
+binary.  The last two operands are common for all of them:
+
+    i_bs_init_fail       xy j? t? x
+    i_bs_init_fail_heap s I j? t? x
+    i_bs_init                W t? x
+    i_bs_init_heap         W I t? x
+
+The instructions are defined like this (formatted with extra
+spaces for clarity):
+
+    i_bs_init_fail_heap := bs_init . fail_heap . verify . execute;
+    i_bs_init_fail      := bs_init . fail      . verify . execute;
+    i_bs_init           := bs_init .           .  plain . execute;
+    i_bs_init_heap      := bs_init .               heap . execute;
+
+Note that the first two instruction have three fragments, while the
+other two only have two fragments.  Here are the fragments:
+
+    bs_init_bits.head() {
+        Eterm num_bits_term;
+        Uint num_bits;
+        Uint alloc;
+    }
+
+    bs_init_bits.plain(NumBits) {
+        num_bits = $NumBits;
+        alloc = 0;
+    }
+
+    bs_init_bits.heap(NumBits, Alloc) {
+        num_bits = $NumBits;
+        alloc = $Alloc;
+    }
+
+    bs_init_bits.fail(NumBitsTerm) {
+        num_bits_term = $NumBitsTerm;
+        alloc = 0;
+    }
+
+    bs_init_bits.fail_heap(NumBitsTerm, Alloc) {
+        num_bits_term = $NumBitsTerm;
+        alloc = $Alloc;
+    }
+
+    bs_init_bits.verify(Fail) {
+        // Verify the num_bits_term, fail using $FAIL
+        // if there is a problem.
+	.
+	.
+	.
+    }
+
+    bs_init_bits.execute(Live, Dst) {
+       // Long complicated code to a create a binary.
+       .
+       .
+       .
+    }
+
+The full definitions of those instructions can be found in `bs_instrs.tab`.
+The generated code can be found in `beam_warm.h`.
diff --git a/erts/emulator/nifs/common/prim_buffer_nif.c b/erts/emulator/nifs/common/prim_buffer_nif.c
new file mode 100644
index 0000000000..a8ef5fc355
--- /dev/null
+++ b/erts/emulator/nifs/common/prim_buffer_nif.c
@@ -0,0 +1,512 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson 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.
+ * 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%
+ */
+
+#define STATIC_ERLANG_NIF 1
+
+#include "erl_nif.h"
+#include "config.h"
+#include "sys.h"
+
+#ifdef VALGRIND
+#  include <valgrind/memcheck.h>
+#endif
+
+#define ACCUMULATOR_SIZE (2 << 10)
+
+#define FIND_NIF_RESCHEDULE_SIZE (1 << 20)
+
+/* NIF interface declarations */
+static int load(ErlNifEnv *env, void** priv_data, ERL_NIF_TERM load_info);
+static int upgrade(ErlNifEnv *env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info);
+static void unload(ErlNifEnv *env, void* priv_data);
+
+static ErlNifResourceType *rtype_buffer;
+
+static ERL_NIF_TERM am_ok;
+static ERL_NIF_TERM am_error;
+
+static ERL_NIF_TERM am_lock_order_violation;
+
+static ERL_NIF_TERM am_acquired;
+static ERL_NIF_TERM am_busy;
+
+static ERL_NIF_TERM am_continue;
+
+static ERL_NIF_TERM am_out_of_memory;
+static ERL_NIF_TERM am_not_found;
+
+typedef struct {
+#ifdef DEBUG
+    erts_atomic32_t concurrent_users;
+#endif
+
+    ErlNifBinary accumulator;
+    size_t accumulated_bytes;
+    int accumulator_present;
+
+    ErlNifIOQueue *queue;
+
+    erts_atomic32_t external_lock;
+} buffer_data_t;
+
+static ERL_NIF_TERM new_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+
+static ERL_NIF_TERM peek_head_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM skip_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM size_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+
+static ERL_NIF_TERM write_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM copying_read_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+
+static ERL_NIF_TERM find_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+
+static ERL_NIF_TERM trylock_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM unlock_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+
+static ErlNifFunc nif_funcs[] = {
+    {"new", 0, new_nif},
+    {"size", 1, size_nif},
+    {"peek_head", 1, peek_head_nif},
+    {"copying_read", 2, copying_read_nif},
+    {"write", 2, write_nif},
+    {"skip", 2, skip_nif},
+    {"find_byte_index", 2, find_nif},
+    {"try_lock", 1, trylock_nif},
+    {"unlock", 1, unlock_nif},
+};
+
+ERL_NIF_INIT(prim_buffer, nif_funcs, load, NULL, upgrade, unload)
+
+static void gc_buffer(ErlNifEnv *env, void* data);
+
+static int load(ErlNifEnv *env, void** priv_data, ERL_NIF_TERM load_info)
+{
+    am_ok = enif_make_atom(env, "ok");
+    am_error = enif_make_atom(env, "error");
+
+    am_lock_order_violation = enif_make_atom(env, "lock_order_violation");
+    am_acquired = enif_make_atom(env, "acquired");
+    am_busy = enif_make_atom(env, "busy");
+
+    am_continue = enif_make_atom(env, "continue");
+
+    am_out_of_memory = enif_make_atom(env, "out_of_memory");
+    am_not_found = enif_make_atom(env, "not_found");
+
+    rtype_buffer = enif_open_resource_type(env, NULL, "gc_buffer", gc_buffer,
+        ERL_NIF_RT_CREATE, NULL);
+
+    *priv_data = NULL;
+
+    return 0;
+}
+
+static void unload(ErlNifEnv *env, void* priv_data)
+{
+
+}
+
+static int upgrade(ErlNifEnv *env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info)
+{
+    if(*old_priv_data != NULL) {
+        return -1; /* Don't know how to do that */
+    }
+
+    if(*priv_data != NULL) {
+        return -1; /* Don't know how to do that */
+    }
+
+    if(load(env, priv_data, load_info)) {
+        return -1;
+    }
+
+    return 0;
+}
+
+static void gc_buffer(ErlNifEnv *env, void* data) {
+    buffer_data_t *buffer = (buffer_data_t*)data;
+
+    if(buffer->accumulator_present) {
+        enif_release_binary(&buffer->accumulator);
+    }
+
+    enif_ioq_destroy(buffer->queue);
+}
+
+static int get_buffer_data(ErlNifEnv *env, ERL_NIF_TERM opaque, buffer_data_t **buffer) {
+    return enif_get_resource(env, opaque, rtype_buffer, (void **)buffer);
+}
+
+/* Copies a number of bytes from the head of the iovec, skipping "vec_skip"
+ * vector elements followed by "byte_skip" bytes on the target vector. */
+static void copy_from_iovec(SysIOVec *iovec, int vec_len, int vec_skip,
+        size_t byte_skip, size_t size, char *data) {
+
+    size_t bytes_copied, skip_offset;
+    int vec_index;
+
+    skip_offset = byte_skip;
+    vec_index = vec_skip;
+    bytes_copied = 0;
+
+    while(bytes_copied < size) {
+        size_t block_size, copy_size;
+        char *block_start;
+
+        ASSERT(vec_index < vec_len);
+
+        block_start = (char*)iovec[vec_index].iov_base;
+        block_size = iovec[vec_index].iov_len;
+
+        copy_size = MIN(size - bytes_copied, block_size - skip_offset);
+        sys_memcpy(&data[bytes_copied], &block_start[skip_offset], copy_size);
+
+        bytes_copied += copy_size;
+        skip_offset = 0;
+
+        vec_index++;
+    }
+}
+
+/* Convenience function for copy_from_iovec over queues. */
+static void copy_from_queue(ErlNifIOQueue *queue, int queue_skip,
+    size_t byte_skip, size_t size, char *data) {
+
+    SysIOVec *queued_data;
+    int queue_length;
+
+    queued_data = enif_ioq_peek(queue, &queue_length);
+    ASSERT(queue_skip < queue_length);
+
+    copy_from_iovec(queued_data, queue_length, queue_skip, byte_skip, size, data);
+}
+
+static int enqueue_write_accumulator(buffer_data_t *buffer) {
+    ASSERT(!buffer->accumulator_present ^ (buffer->accumulated_bytes > 0));
+
+    if(buffer->accumulator_present && buffer->accumulated_bytes > 0) {
+        if(!enif_realloc_binary(&buffer->accumulator, buffer->accumulated_bytes)) {
+            return 0;
+        } else if(!enif_ioq_enq_binary(buffer->queue, &buffer->accumulator, 0)) {
+            return 0;
+        }
+
+        /* The queue owns the accumulator now. */
+        buffer->accumulator_present = 0;
+        buffer->accumulated_bytes = 0;
+    }
+
+    return 1;
+}
+
+static int combine_small_writes(buffer_data_t *buffer, ErlNifIOVec *iovec) {
+    ASSERT(!buffer->accumulator_present ^ (buffer->accumulated_bytes > 0));
+
+    if(buffer->accumulated_bytes + iovec->size >= ACCUMULATOR_SIZE) {
+        if(iovec->size >= (ACCUMULATOR_SIZE / 2)) {
+            return 0;
+        }
+
+        if(!enqueue_write_accumulator(buffer)) {
+            return 0;
+        }
+    }
+
+    if(!buffer->accumulator_present) {
+        if(!enif_alloc_binary(ACCUMULATOR_SIZE, &buffer->accumulator)) {
+            return 0;
+        }
+
+        buffer->accumulator_present = 1;
+    }
+
+    copy_from_iovec(iovec->iov, iovec->iovcnt, 0, 0, iovec->size,
+            (char*)&buffer->accumulator.data[buffer->accumulated_bytes]);
+    buffer->accumulated_bytes += iovec->size;
+
+    return 1;
+}
+
+/* *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** */
+
+static ERL_NIF_TERM new_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    buffer_data_t *buffer;
+    ERL_NIF_TERM result;
+
+    buffer = (buffer_data_t*)enif_alloc_resource(rtype_buffer, sizeof(buffer_data_t));
+    buffer->queue = enif_ioq_create(ERL_NIF_IOQ_NORMAL);
+
+    if(buffer->queue != NULL) {
+#ifdef DEBUG
+        erts_atomic32_init_nob(&buffer->concurrent_users, 0);
+#endif
+        erts_atomic32_init_nob(&buffer->external_lock, 0);
+
+        buffer->accumulator_present = 0;
+        buffer->accumulated_bytes = 0;
+
+        result = enif_make_resource(env, buffer);
+    } else {
+        result = enif_raise_exception(env, am_out_of_memory);
+    }
+
+    enif_release_resource(buffer);
+
+    return result;
+}
+
+static ERL_NIF_TERM size_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    buffer_data_t *buffer;
+
+    size_t total_size;
+
+    if(argc != 1 || !get_buffer_data(env, argv[0], &buffer)) {
+        return enif_make_badarg(env);
+    }
+
+    ASSERT(erts_atomic32_inc_read_acqb(&buffer->concurrent_users) == 1);
+
+    total_size = enif_ioq_size(buffer->queue);
+
+    if(buffer->accumulator_present) {
+        total_size += buffer->accumulated_bytes;
+    } else {
+        ASSERT(buffer->accumulated_bytes == 0);
+    }
+
+    ASSERT(erts_atomic32_dec_read_relb(&buffer->concurrent_users) == 0);
+
+    return enif_make_uint64(env, total_size);
+}
+
+static ERL_NIF_TERM copying_read_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    buffer_data_t *buffer;
+
+    ERL_NIF_TERM result;
+    unsigned char *data;
+    Uint64 block_size;
+
+    if(argc != 2 || !get_buffer_data(env, argv[0], &buffer)
+                 || !enif_get_uint64(env, argv[1], &block_size)) {
+        return enif_make_badarg(env);
+    }
+
+    ASSERT(erts_atomic32_inc_read_acqb(&buffer->concurrent_users) == 1);
+
+    if(!enqueue_write_accumulator(buffer)) {
+        return enif_raise_exception(env, am_out_of_memory);
+    }
+
+    if(enif_ioq_size(buffer->queue) < block_size) {
+        return enif_make_badarg(env);
+    }
+
+    data = enif_make_new_binary(env, block_size, &result);
+
+    if(block_size > 0) {
+        copy_from_queue(buffer->queue, 0, 0, block_size, (char*)data);
+        enif_ioq_deq(buffer->queue, block_size, NULL);
+    }
+
+    ASSERT(erts_atomic32_dec_read_relb(&buffer->concurrent_users) == 0);
+
+    return result;
+}
+
+static ERL_NIF_TERM write_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    buffer_data_t *buffer;
+
+    ErlNifIOVec vec, *iovec = &vec;
+    ERL_NIF_TERM tail;
+
+    if(argc != 2 || !get_buffer_data(env, argv[0], &buffer)
+                 || !enif_inspect_iovec(env, 64, argv[1], &tail, &iovec)) {
+        return enif_make_badarg(env);
+    }
+
+    ASSERT(erts_atomic32_inc_read_acqb(&buffer->concurrent_users) == 1);
+
+    if(!combine_small_writes(buffer, iovec)) {
+        if(!enqueue_write_accumulator(buffer) || !enif_ioq_enqv(buffer->queue, iovec, 0)) {
+            return enif_raise_exception(env, am_out_of_memory);
+        }
+    }
+
+    ASSERT(erts_atomic32_dec_read_relb(&buffer->concurrent_users) == 0);
+
+    if(!enif_is_empty_list(env, tail)) {
+        const ERL_NIF_TERM new_argv[2] = {argv[0], tail};
+
+        return enif_schedule_nif(env, "write", 0, &write_nif, argc, new_argv);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM peek_head_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    buffer_data_t *buffer;
+
+    ERL_NIF_TERM result;
+
+    if(argc != 1 || !get_buffer_data(env, argv[0], &buffer)) {
+        return enif_make_badarg(env);
+    }
+
+    ASSERT(erts_atomic32_inc_read_acqb(&buffer->concurrent_users) == 1);
+
+    if(!enqueue_write_accumulator(buffer)) {
+        return enif_raise_exception(env, am_out_of_memory);
+    }
+
+    if(!enif_ioq_peek_head(env, buffer->queue, NULL, &result)) {
+        return enif_make_badarg(env);
+    }
+
+    ASSERT(erts_atomic32_dec_read_relb(&buffer->concurrent_users) == 0);
+
+    return result;
+}
+
+static ERL_NIF_TERM skip_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    buffer_data_t *buffer;
+
+    Uint64 block_size;
+
+    if(argc != 2 || !get_buffer_data(env, argv[0], &buffer)
+                 || !enif_get_uint64(env, argv[1], &block_size)) {
+        return enif_make_badarg(env);
+    }
+
+    ASSERT(erts_atomic32_inc_read_acqb(&buffer->concurrent_users) == 1);
+
+    if(!enqueue_write_accumulator(buffer)) {
+        return enif_raise_exception(env, am_out_of_memory);
+    } else if(enif_ioq_size(buffer->queue) < block_size) {
+        return enif_make_badarg(env);
+    }
+
+    enif_ioq_deq(buffer->queue, block_size, NULL);
+
+    ASSERT(erts_atomic32_dec_read_relb(&buffer->concurrent_users) == 0);
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM find_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    buffer_data_t *buffer;
+
+    int queue_length, queue_index;
+    SysIOVec *queued_data;
+    size_t queue_size;
+
+    size_t search_offset;
+    int needle;
+
+    if(argc != 2 || !get_buffer_data(env, argv[0], &buffer)
+                 || !enif_get_int(env, argv[1], &needle)) {
+        return enif_make_badarg(env);
+    }
+
+    ASSERT(erts_atomic32_inc_read_acqb(&buffer->concurrent_users) == 1);
+
+    if(!enqueue_write_accumulator(buffer)) {
+        return enif_raise_exception(env, am_out_of_memory);
+    } else if(needle < 0 || needle > 255) {
+        return enif_make_badarg(env);
+    }
+
+    queued_data = enif_ioq_peek(buffer->queue, &queue_length);
+    queue_size = enif_ioq_size(buffer->queue);
+    queue_index = 0;
+
+    search_offset = 0;
+
+    if(queue_size > (FIND_NIF_RESCHEDULE_SIZE / 100)) {
+        if(enif_thread_type() == ERL_NIF_THR_NORMAL_SCHEDULER) {
+            int timeslice_percent;
+
+            if(queue_size >= FIND_NIF_RESCHEDULE_SIZE) {
+                ASSERT(erts_atomic32_dec_read_relb(&buffer->concurrent_users) == 0);
+
+                return enif_schedule_nif(env, "find",
+                    ERL_NIF_DIRTY_JOB_CPU_BOUND, &find_nif, argc, argv);
+            }
+
+            timeslice_percent = (queue_size * 100) / FIND_NIF_RESCHEDULE_SIZE;
+            enif_consume_timeslice(env, timeslice_percent);
+        }
+    }
+
+    while(queue_index < queue_length) {
+        char *needle_address;
+        char *block_start;
+        size_t block_size;
+
+        block_start = queued_data[queue_index].iov_base;
+        block_size = queued_data[queue_index].iov_len;
+
+        needle_address = memchr(block_start, needle, block_size);
+
+        if(needle_address != NULL) {
+            size_t result = search_offset + (needle_address - block_start);
+
+            ASSERT(erts_atomic32_dec_read_relb(&buffer->concurrent_users) == 0);
+
+            return enif_make_tuple2(env, am_ok, enif_make_uint64(env, result));
+        }
+
+        search_offset += block_size;
+        queue_index++;
+    }
+
+    ASSERT(erts_atomic32_dec_read_relb(&buffer->concurrent_users) == 0);
+
+    return am_not_found;
+}
+
+/* */
+
+static ERL_NIF_TERM trylock_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    buffer_data_t *buffer;
+
+    if(argc != 1 || !get_buffer_data(env, argv[0], &buffer)) {
+        return enif_make_badarg(env);
+    }
+
+    if(erts_atomic32_cmpxchg_acqb(&buffer->external_lock, 1, 0) == 0) {
+        return am_acquired;
+    }
+
+    return am_busy;
+}
+
+static ERL_NIF_TERM unlock_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    buffer_data_t *buffer;
+
+    if(argc != 1 || !get_buffer_data(env, argv[0], &buffer)) {
+        return enif_make_badarg(env);
+    }
+
+    if(erts_atomic32_cmpxchg_relb(&buffer->external_lock, 0, 1) == 0) {
+        return enif_raise_exception(env, am_lock_order_violation);
+    }
+
+    return am_ok;
+}
diff --git a/erts/emulator/nifs/common/prim_file_nif.c b/erts/emulator/nifs/common/prim_file_nif.c
new file mode 100644
index 0000000000..6874f41d75
--- /dev/null
+++ b/erts/emulator/nifs/common/prim_file_nif.c
@@ -0,0 +1,1237 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson 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.
+ * 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%
+ */
+
+#define STATIC_ERLANG_NIF 1
+
+#include "erl_nif.h"
+#include "config.h"
+#include "sys.h"
+
+#ifdef VALGRIND
+#  include <valgrind/memcheck.h>
+#endif
+
+#include "erl_driver.h"
+#include "prim_file_nif.h"
+
+/* NIF interface declarations */
+static int load(ErlNifEnv *env, void** priv_data, ERL_NIF_TERM load_info);
+static int upgrade(ErlNifEnv *env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info);
+static void unload(ErlNifEnv *env, void* priv_data);
+
+static ErlNifResourceType *efile_resource_type;
+
+static ERL_NIF_TERM am_ok;
+static ERL_NIF_TERM am_error;
+static ERL_NIF_TERM am_continue;
+
+static ERL_NIF_TERM am_file_info;
+
+/* File modes */
+static ERL_NIF_TERM am_read;
+static ERL_NIF_TERM am_write;
+static ERL_NIF_TERM am_exclusive;
+static ERL_NIF_TERM am_append;
+static ERL_NIF_TERM am_sync;
+static ERL_NIF_TERM am_skip_type_check;
+
+/* enum efile_access_t; read and write are defined above.*/
+static ERL_NIF_TERM am_read_write;
+static ERL_NIF_TERM am_none;
+
+/* enum efile_advise_t */
+static ERL_NIF_TERM am_normal;
+static ERL_NIF_TERM am_random;
+static ERL_NIF_TERM am_sequential;
+static ERL_NIF_TERM am_will_need;
+static ERL_NIF_TERM am_dont_need;
+static ERL_NIF_TERM am_no_reuse;
+
+/* enum efile_filetype_t */
+static ERL_NIF_TERM am_device;
+static ERL_NIF_TERM am_directory;
+static ERL_NIF_TERM am_regular;
+static ERL_NIF_TERM am_symlink;
+static ERL_NIF_TERM am_other;
+
+/* enum efile_seek_t, 'eof' marker. */
+static ERL_NIF_TERM am_bof;
+static ERL_NIF_TERM am_cur;
+static ERL_NIF_TERM am_eof;
+
+static ERL_NIF_TERM read_info_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM set_permissions_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM set_owner_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM set_time_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+
+static ERL_NIF_TERM read_link_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM list_dir_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+
+static ERL_NIF_TERM make_hard_link_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM make_soft_link_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM rename_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM make_dir_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM del_file_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM del_dir_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM get_device_cwd_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM get_cwd_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM set_cwd_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+
+static ERL_NIF_TERM read_file_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+
+static ERL_NIF_TERM get_handle_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM altname_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+
+static ERL_NIF_TERM open_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+
+/* All file handle operations are passed through a wrapper that handles state
+ * transitions, marking it as busy during the course of the operation, and
+ * closing on completion if the owner died in the middle of an operation.
+ *
+ * This is pretty ugly but required as there's no way to tell when it's safe to
+ * asynchronously close a file; the event could have fired just before landing
+ * in a system call which will fail with EBADF at best or alias a newly opened
+ * fd at worst.
+ *
+ * The old driver got away with enqueueing the close operation on the same
+ * async queue as all of its other operations, but since dirty schedulers use a
+ * single global queue there's no natural way to schedule an asynchronous close
+ * "behind" other operations.
+ *
+ * The states may transition as follows:
+ *
+ * IDLE ->
+ *      BUSY (file_handle_wrapper) |
+ *      CLOSED (owner_death_callback)
+ *
+ * BUSY ->
+ *      IDLE (file_handle_wrapper)
+ *      CLOSED (close_nif_impl)
+ *      CLOSE_PENDING (owner_death_callback)
+ *
+ * CLOSE_PENDING ->
+ *      CLOSED (file_handle_wrapper)
+ */
+
+typedef ERL_NIF_TERM (*file_op_impl_t)(efile_data_t *d, ErlNifEnv *env,
+    int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM file_handle_wrapper(file_op_impl_t operation, ErlNifEnv *env,
+    int argc, const ERL_NIF_TERM argv[]);
+
+#define WRAP_FILE_HANDLE_EXPORT(name) \
+    static ERL_NIF_TERM name ## _impl (efile_data_t *d, ErlNifEnv *env, \
+        int argc, const ERL_NIF_TERM argv[]);\
+    static ERL_NIF_TERM name(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) { \
+        return file_handle_wrapper( name ## _impl , env, argc, argv); \
+    }
+
+WRAP_FILE_HANDLE_EXPORT(close_nif)
+WRAP_FILE_HANDLE_EXPORT(read_nif)
+WRAP_FILE_HANDLE_EXPORT(write_nif)
+WRAP_FILE_HANDLE_EXPORT(pread_nif)
+WRAP_FILE_HANDLE_EXPORT(pwrite_nif)
+WRAP_FILE_HANDLE_EXPORT(seek_nif)
+WRAP_FILE_HANDLE_EXPORT(sync_nif)
+WRAP_FILE_HANDLE_EXPORT(truncate_nif)
+WRAP_FILE_HANDLE_EXPORT(allocate_nif)
+WRAP_FILE_HANDLE_EXPORT(advise_nif)
+WRAP_FILE_HANDLE_EXPORT(get_handle_nif)
+WRAP_FILE_HANDLE_EXPORT(ipread_s32bu_p32bu_nif)
+
+static ErlNifFunc nif_funcs[] = {
+    /* File handle ops */
+    {"open_nif", 2, open_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"close_nif", 1, close_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"read_nif", 2, read_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"write_nif", 2, write_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"pread_nif", 3, pread_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"pwrite_nif", 3, pwrite_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"seek_nif", 3, seek_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"sync_nif", 2, sync_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"truncate_nif", 1, truncate_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"allocate_nif", 3, allocate_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"advise_nif", 4, advise_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+
+    /* Filesystem ops */
+    {"make_hard_link_nif", 2, make_hard_link_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"make_soft_link_nif", 2, make_soft_link_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"rename_nif", 2, rename_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"read_info_nif", 2, read_info_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"set_permissions_nif", 2, set_permissions_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"set_owner_nif", 3, set_owner_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"set_time_nif", 4, set_time_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"read_link_nif", 1, read_link_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"list_dir_nif", 1, list_dir_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"make_dir_nif", 1, make_dir_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"del_file_nif", 1, del_file_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"del_dir_nif", 1, del_dir_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"get_device_cwd_nif", 1, get_device_cwd_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"set_cwd_nif", 1, set_cwd_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"get_cwd_nif", 0, get_cwd_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+
+    /* These operations are equivalent to chained calls of other operations,
+     * but have been moved down to avoid excessive rescheduling. */
+    {"ipread_s32bu_p32bu_nif", 3, ipread_s32bu_p32bu_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+    {"read_file_nif", 1, read_file_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+
+    /* Internal ops. */
+    {"get_handle_nif", 1, get_handle_nif},
+    {"altname_nif", 1, altname_nif, ERL_NIF_DIRTY_JOB_IO_BOUND},
+};
+
+ERL_NIF_INIT(prim_file, nif_funcs, load, NULL, upgrade, unload)
+
+static void owner_death_callback(ErlNifEnv* env, void* obj, ErlNifPid* pid, ErlNifMonitor* mon);
+static void gc_callback(ErlNifEnv *env, void* data);
+
+static int load(ErlNifEnv *env, void** priv_data, ERL_NIF_TERM load_info)
+{
+    ErlNifResourceTypeInit callbacks;
+
+    am_ok = enif_make_atom(env, "ok");
+    am_error = enif_make_atom(env, "error");
+    am_continue = enif_make_atom(env, "continue");
+
+    am_read = enif_make_atom(env, "read");
+    am_write = enif_make_atom(env, "write");
+    am_exclusive = enif_make_atom(env, "exclusive");
+    am_append = enif_make_atom(env, "append");
+    am_sync = enif_make_atom(env, "sync");
+    am_skip_type_check = enif_make_atom(env, "skip_type_check");
+
+    am_read_write = enif_make_atom(env, "read_write");
+    am_none = enif_make_atom(env, "none");
+
+    am_normal = enif_make_atom(env, "normal");
+    am_random = enif_make_atom(env, "random");
+    am_sequential = enif_make_atom(env, "sequential");
+    am_will_need = enif_make_atom(env, "will_need");
+    am_dont_need = enif_make_atom(env, "dont_need");
+    am_no_reuse = enif_make_atom(env, "no_reuse");
+
+    am_device = enif_make_atom(env, "device");
+    am_directory = enif_make_atom(env, "directory");
+    am_regular = enif_make_atom(env, "regular");
+    am_symlink = enif_make_atom(env, "symlink");
+    am_other = enif_make_atom(env, "other");
+
+    am_file_info = enif_make_atom(env, "file_info");
+
+    am_bof = enif_make_atom(env, "bof");
+    am_cur = enif_make_atom(env, "cur");
+    am_eof = enif_make_atom(env, "eof");
+
+    callbacks.down = owner_death_callback;
+    callbacks.dtor = gc_callback;
+    callbacks.stop = NULL;
+
+    efile_resource_type = enif_open_resource_type_x(env, "efile", &callbacks,
+        ERL_NIF_RT_CREATE, NULL);
+
+    *priv_data = NULL;
+
+    return 0;
+}
+
+static void unload(ErlNifEnv *env, void* priv_data)
+{
+
+}
+
+static int upgrade(ErlNifEnv *env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info)
+{
+    if(*old_priv_data != NULL) {
+        return -1; /* Don't know how to do that */
+    }
+    if(*priv_data != NULL) {
+        return -1; /* Don't know how to do that */
+    }
+    if(load(env, priv_data, load_info)) {
+        return -1;
+    }
+    return 0;
+}
+
+static ERL_NIF_TERM posix_error_to_tuple(ErlNifEnv *env, posix_errno_t posix_errno) {
+    ERL_NIF_TERM error = enif_make_atom(env, erl_errno_id(posix_errno));
+    return enif_make_tuple2(env, am_error, error);
+}
+
+static int get_file_data(ErlNifEnv *env, ERL_NIF_TERM opaque, efile_data_t **d) {
+    return enif_get_resource(env, opaque, efile_resource_type, (void **)d);
+}
+
+static ERL_NIF_TERM file_handle_wrapper(file_op_impl_t operation, ErlNifEnv *env,
+        int argc, const ERL_NIF_TERM argv[]) {
+
+    efile_data_t *d;
+
+    enum efile_state_t previous_state;
+    ERL_NIF_TERM result;
+
+    if(argc < 1 || !get_file_data(env, argv[0], &d)) {
+        return enif_make_badarg(env);
+    }
+
+    previous_state = erts_atomic32_cmpxchg_acqb(&d->state,
+        EFILE_STATE_BUSY, EFILE_STATE_IDLE);
+
+    if(previous_state == EFILE_STATE_IDLE) {
+        result = operation(d, env, argc - 1, &argv[1]);
+
+        previous_state = erts_atomic32_cmpxchg_relb(&d->state,
+            EFILE_STATE_IDLE, EFILE_STATE_BUSY);
+
+        ASSERT(previous_state != EFILE_STATE_IDLE);
+
+        if(previous_state == EFILE_STATE_CLOSE_PENDING) {
+            /* This is the only point where a change from CLOSE_PENDING is
+             * possible, and we're running synchronously, so we can't race with
+             * anything else here. */
+            erts_atomic32_set_acqb(&d->state, EFILE_STATE_CLOSED);
+            efile_close(d);
+        }
+    } else {
+        /* CLOSE_PENDING should be impossible at this point since it requires
+         * a transition from BUSY; the only valid state here is CLOSED. */
+        ASSERT(previous_state == EFILE_STATE_CLOSED);
+
+        result = posix_error_to_tuple(env, EINVAL);
+    }
+
+    return result;
+}
+
+static void owner_death_callback(ErlNifEnv* env, void* obj, ErlNifPid* pid, ErlNifMonitor* mon) {
+    efile_data_t *d = (efile_data_t*)obj;
+
+    (void)env;
+    (void)pid;
+    (void)mon;
+
+    for(;;) {
+        enum efile_state_t previous_state;
+
+        previous_state = erts_atomic32_cmpxchg_acqb(&d->state,
+            EFILE_STATE_CLOSED, EFILE_STATE_IDLE);
+
+        switch(previous_state) {
+        case EFILE_STATE_IDLE:
+            efile_close(d);
+            return;
+        case EFILE_STATE_CLOSE_PENDING:
+        case EFILE_STATE_CLOSED:
+            /* We're either already closed or managed to mark ourselves for
+             * closure in the previous iteration. */
+            return;
+        case EFILE_STATE_BUSY:
+            /* Schedule ourselves to be closed once the current operation
+             * finishes, retrying the [IDLE -> CLOSED] transition in case we
+             * narrowly passed the [BUSY -> IDLE] one. */
+            erts_atomic32_cmpxchg_nob(&d->state,
+                EFILE_STATE_CLOSE_PENDING, EFILE_STATE_BUSY);
+            break;
+        }
+    }
+}
+
+static void gc_callback(ErlNifEnv *env, void* data) {
+    efile_data_t *d = (efile_data_t*)data;
+
+    enum efile_state_t previous_state;
+
+    (void)env;
+
+    previous_state = erts_atomic32_cmpxchg_acqb(&d->state,
+        EFILE_STATE_CLOSED, EFILE_STATE_IDLE);
+
+    ASSERT(previous_state != EFILE_STATE_CLOSE_PENDING &&
+        previous_state != EFILE_STATE_BUSY);
+
+    if(previous_state == EFILE_STATE_IDLE) {
+        efile_close(d);
+    }
+}
+
+static ERL_NIF_TERM efile_filetype_to_atom(enum efile_filetype_t type) {
+    switch(type) {
+        case EFILE_FILETYPE_DEVICE: return am_device;
+        case EFILE_FILETYPE_DIRECTORY: return am_directory;
+        case EFILE_FILETYPE_REGULAR: return am_regular;
+        case EFILE_FILETYPE_SYMLINK: return am_symlink;
+        case EFILE_FILETYPE_OTHER: return am_other;
+    }
+
+    return am_other;
+}
+
+static ERL_NIF_TERM efile_access_to_atom(enum efile_access_t type) {
+    if(type & EFILE_ACCESS_READ && !(type & EFILE_ACCESS_WRITE)) {
+        return am_read;
+    } else if(type & EFILE_ACCESS_WRITE && !(type & EFILE_ACCESS_READ)) {
+        return am_write;
+    } else if(type & EFILE_ACCESS_READ_WRITE) {
+        return am_read_write;
+    }
+
+    return am_none;
+}
+
+static enum efile_modes_t efile_translate_modelist(ErlNifEnv *env, ERL_NIF_TERM list) {
+    enum efile_modes_t modes;
+    ERL_NIF_TERM head, tail;
+
+    modes = 0;
+
+    while(enif_get_list_cell(env, list, &head, &tail)) {
+        if(enif_is_identical(head, am_read)) {
+            modes |= EFILE_MODE_READ;
+        } else if(enif_is_identical(head, am_write)) {
+            modes |= EFILE_MODE_WRITE;
+        } else if(enif_is_identical(head, am_exclusive)) {
+            modes |= EFILE_MODE_EXCLUSIVE;
+        } else if(enif_is_identical(head, am_append)) {
+            modes |= EFILE_MODE_APPEND;
+        } else if(enif_is_identical(head, am_sync)) {
+            modes |= EFILE_MODE_SYNC;
+        } else if(enif_is_identical(head, am_skip_type_check)) {
+            modes |= EFILE_MODE_SKIP_TYPE_CHECK;
+        } else {
+            /* Modes like 'raw', 'ram', 'delayed_writes' etc are handled
+             * further up the chain. */
+        }
+
+        list = tail;
+    }
+
+    if(modes & (EFILE_MODE_APPEND | EFILE_MODE_EXCLUSIVE)) {
+        /* 'append' and 'exclusive' are documented as "open for writing." */
+        modes |= EFILE_MODE_WRITE;
+    } else if(!(modes & EFILE_MODE_READ_WRITE)) {
+        /* Defaulting to read if !(W|R) is undocumented, but specifically
+         * tested against in file_SUITE. */
+        modes |= EFILE_MODE_READ;
+    }
+
+    return modes;
+}
+
+static ERL_NIF_TERM open_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+    efile_data_t *d;
+
+    ErlNifPid controlling_process;
+    enum efile_modes_t modes;
+    ERL_NIF_TERM result;
+    efile_path_t path;
+
+    if(argc != 2 || !enif_is_list(env, argv[1])) {
+        return enif_make_badarg(env);
+    }
+
+    modes = efile_translate_modelist(env, argv[1]);
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_open(&path, modes, efile_resource_type, &d))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    result = enif_make_resource(env, d);
+    enif_release_resource(d);
+
+    enif_self(env, &controlling_process);
+
+    if(enif_monitor_process(env, d, &controlling_process, &d->monitor)) {
+        return posix_error_to_tuple(env, EINVAL);
+    }
+
+    return enif_make_tuple2(env, am_ok, result);
+}
+
+static ERL_NIF_TERM close_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    enum efile_state_t previous_state;
+
+    if(argc != 0) {
+        return enif_make_badarg(env);
+    }
+
+    previous_state = erts_atomic32_cmpxchg_acqb(&d->state,
+        EFILE_STATE_CLOSED, EFILE_STATE_BUSY);
+
+    ASSERT(previous_state == EFILE_STATE_CLOSE_PENDING ||
+        previous_state == EFILE_STATE_BUSY);
+
+    if(previous_state == EFILE_STATE_BUSY) {
+        enif_demonitor_process(env, d, &d->monitor);
+
+        if(!efile_close(d)) {
+            return posix_error_to_tuple(env, d->posix_errno);
+        }
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM read_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    Sint64 bytes_read, block_size;
+    SysIOVec read_vec[1];
+    ErlNifBinary result;
+
+    if(argc != 1 || !enif_is_number(env, argv[0])) {
+        return enif_make_badarg(env);
+    }
+
+    if(!enif_get_int64(env, argv[0], &block_size) || block_size < 0) {
+        return posix_error_to_tuple(env, EINVAL);
+    }
+
+    if(!enif_alloc_binary(block_size, &result)) {
+        return posix_error_to_tuple(env, ENOMEM);
+    }
+
+    read_vec[0].iov_base = result.data;
+    read_vec[0].iov_len = result.size;
+
+    bytes_read = efile_readv(d, read_vec, 1);
+    ASSERT(bytes_read <= block_size);
+
+    if(bytes_read < 0) {
+        return posix_error_to_tuple(env, d->posix_errno);
+    } else if(bytes_read == 0) {
+        enif_release_binary(&result);
+        return am_eof;
+    }
+
+    if(bytes_read < block_size && !enif_realloc_binary(&result, bytes_read)) {
+        ERTS_INTERNAL_ERROR("Failed to shrink read result.");
+    }
+
+    return enif_make_tuple2(env, am_ok, enif_make_binary(env, &result));
+}
+
+static ERL_NIF_TERM write_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    ErlNifIOVec vec, *input = &vec;
+    Sint64 bytes_written;
+    ERL_NIF_TERM tail;
+
+    if(argc != 1 || !enif_inspect_iovec(env, 64, argv[0], &tail, &input)) {
+        return enif_make_badarg(env);
+    }
+
+    bytes_written = efile_writev(d, input->iov, input->iovcnt);
+
+    if(bytes_written < 0) {
+        return posix_error_to_tuple(env, d->posix_errno);
+    }
+
+    if(!enif_is_empty_list(env, tail)) {
+        ASSERT(bytes_written > 0);
+        return enif_make_tuple2(env, am_continue, tail);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM pread_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    Sint64 bytes_read, block_size, offset;
+    SysIOVec read_vec[1];
+    ErlNifBinary result;
+
+    if(argc != 2 || !enif_is_number(env, argv[0])
+                 || !enif_is_number(env, argv[1])) {
+        return enif_make_badarg(env);
+    }
+
+    if(!enif_get_int64(env, argv[0], &offset) ||
+       !enif_get_int64(env, argv[1], &block_size) ||
+       (offset < 0 || block_size < 0)) {
+        return posix_error_to_tuple(env, EINVAL);
+    }
+
+    if(!enif_alloc_binary(block_size, &result)) {
+        return posix_error_to_tuple(env, ENOMEM);
+    }
+
+    read_vec[0].iov_base = result.data;
+    read_vec[0].iov_len = result.size;
+
+    bytes_read = efile_preadv(d, offset, read_vec, 1);
+
+    if(bytes_read < 0) {
+        return posix_error_to_tuple(env, d->posix_errno);
+    } else if(bytes_read == 0) {
+        enif_release_binary(&result);
+        return am_eof;
+    }
+
+    if(bytes_read < block_size && !enif_realloc_binary(&result, bytes_read)) {
+        ERTS_INTERNAL_ERROR("Failed to shrink pread result.");
+    }
+
+    return enif_make_tuple2(env, am_ok, enif_make_binary(env, &result));
+}
+
+static ERL_NIF_TERM pwrite_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    ErlNifIOVec vec, *input = &vec;
+    Sint64 bytes_written, offset;
+    ERL_NIF_TERM tail;
+
+    if(argc != 2 || !enif_is_number(env, argv[0])
+                 || !enif_inspect_iovec(env, 64, argv[1], &tail, &input)) {
+        return enif_make_badarg(env);
+    }
+
+    if(!enif_get_int64(env, argv[0], &offset) || offset < 0) {
+        return posix_error_to_tuple(env, EINVAL);
+    }
+
+    bytes_written = efile_pwritev(d, offset, input->iov, input->iovcnt);
+
+    if(bytes_written < 0) {
+        return posix_error_to_tuple(env, d->posix_errno);
+    }
+
+    if(!enif_is_empty_list(env, tail)) {
+        ASSERT(bytes_written > 0);
+        return enif_make_tuple3(env, am_continue,
+            enif_make_int64(env, bytes_written), tail);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM seek_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    Sint64 new_position, offset;
+    enum efile_seek_t seek;
+
+    if(argc != 2 || !enif_get_int64(env, argv[1], &offset)) {
+        return enif_make_badarg(env);
+    }
+
+    if(enif_is_identical(argv[0], am_bof)) {
+        seek = EFILE_SEEK_BOF;
+    } else if(enif_is_identical(argv[0], am_cur)) {
+        seek = EFILE_SEEK_CUR;
+    } else if(enif_is_identical(argv[0], am_eof)) {
+        seek = EFILE_SEEK_EOF;
+    } else {
+        return enif_make_badarg(env);
+    }
+
+    if(!efile_seek(d, seek, offset, &new_position)) {
+        return posix_error_to_tuple(env, d->posix_errno);
+    }
+
+    return enif_make_tuple2(env, am_ok, enif_make_uint64(env, new_position));
+}
+
+static ERL_NIF_TERM sync_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    int data_only;
+
+    if(argc != 1 || !enif_get_int(env, argv[0], &data_only)) {
+        return enif_make_badarg(env);
+    }
+
+    if(!efile_sync(d, data_only)) {
+        return posix_error_to_tuple(env, d->posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM truncate_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    if(argc != 0) {
+        return enif_make_badarg(env);
+    }
+
+    if(!efile_truncate(d)) {
+        return posix_error_to_tuple(env, d->posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM allocate_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    Sint64 offset, length;
+
+    if(argc != 2 || !enif_is_number(env, argv[0])
+                 || !enif_is_number(env, argv[1])) {
+        return enif_make_badarg(env);
+    }
+
+    if(!enif_get_int64(env, argv[0], &offset) ||
+       !enif_get_int64(env, argv[1], &length) ||
+       (offset < 0 || length < 0)) {
+        return posix_error_to_tuple(env, EINVAL);
+    }
+
+    if(!efile_allocate(d, offset, length)) {
+        return posix_error_to_tuple(env, d->posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM advise_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    enum efile_advise_t advise;
+    Sint64 offset, length;
+
+    if(argc != 3 || !enif_is_number(env, argv[0])
+                 || !enif_is_number(env, argv[1])) {
+        return enif_make_badarg(env);
+    }
+
+    if(!enif_get_int64(env, argv[0], &offset) ||
+       !enif_get_int64(env, argv[1], &length) ||
+       (offset < 0 || length < 0)) {
+        return posix_error_to_tuple(env, EINVAL);
+    }
+
+    if(enif_is_identical(argv[2], am_normal)) {
+        advise = EFILE_ADVISE_NORMAL;
+    } else if(enif_is_identical(argv[2], am_random)) {
+        advise = EFILE_ADVISE_RANDOM;
+    } else if(enif_is_identical(argv[2], am_sequential)) {
+        advise = EFILE_ADVISE_SEQUENTIAL;
+    } else if(enif_is_identical(argv[2], am_will_need)) {
+        advise = EFILE_ADVISE_WILL_NEED;
+    } else if(enif_is_identical(argv[2], am_dont_need)) {
+        advise = EFILE_ADVISE_DONT_NEED;
+    } else if(enif_is_identical(argv[2], am_no_reuse)) {
+        advise = EFILE_ADVISE_NO_REUSE;
+    } else {
+        /* The tests check for EINVAL instead of badarg. Sigh. */
+        return posix_error_to_tuple(env, EINVAL);
+    }
+
+    if(!efile_advise(d, offset, length, advise)) {
+        return posix_error_to_tuple(env, d->posix_errno);
+    }
+
+    return am_ok;
+}
+
+/* This undocumented function reads a pointer and then reads the data block
+ * described by said pointer. It was reverse-engineered from the old
+ * implementation so while all tests pass it may not be entirely correct. Our
+ * current understanding is as follows:
+ *
+ * Pointer layout:
+ *
+ *     <<Size:1/integer-unit:32, Offset:1/integer-unit:32>>
+ *
+ * Where Offset is the -absolute- address to the data block.
+ *
+ * *) If we fail to read the pointer block in its entirety, we return eof.
+ * *) If the provided max_payload_size is larger than Size, we return eof.
+ * *) If we fail to read any data whatsoever at Offset, we return
+ *    {ok, {Size, Offset, eof}}
+ * *) Otherwise, we return {ok, {Size, Offset, Data}}. Note that the size
+ *    of Data may be smaller than Size if we encounter EOF before we could
+ *    read the entire block.
+ *
+ * On errors we'll return {error, posix()} regardless of whether they
+ * happened before or after reading the pointer block. */
+static ERL_NIF_TERM ipread_s32bu_p32bu_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    Sint64 payload_offset, payload_size;
+
+    SysIOVec read_vec[1];
+    Sint64 bytes_read;
+
+    ErlNifBinary payload;
+
+    if(argc != 2 || !enif_is_number(env, argv[0])
+                 || !enif_is_number(env, argv[1])) {
+        return enif_make_badarg(env);
+    }
+
+    {
+        Sint64 max_payload_size, pointer_offset;
+        unsigned char pointer_block[8];
+
+        if(!enif_get_int64(env, argv[0], &pointer_offset) ||
+           !enif_get_int64(env, argv[1], &max_payload_size) ||
+           (pointer_offset < 0 || max_payload_size >= 1u << 31)) {
+            return posix_error_to_tuple(env, EINVAL);
+        }
+
+        read_vec[0].iov_base = pointer_block;
+        read_vec[0].iov_len = sizeof(pointer_block);
+
+        bytes_read = efile_preadv(d, pointer_offset, read_vec, 1);
+
+        if(bytes_read < 0) {
+            return posix_error_to_tuple(env, d->posix_errno);
+        } else if(bytes_read < sizeof(pointer_block)) {
+            return am_eof;
+        }
+
+        payload_size = (Uint32)get_int32(&pointer_block[0]);
+        payload_offset = (Uint32)get_int32(&pointer_block[4]);
+
+        if(payload_size > max_payload_size) {
+            return am_eof;
+        }
+    }
+
+    if(!enif_alloc_binary(payload_size, &payload)) {
+        return posix_error_to_tuple(env, ENOMEM);
+    }
+
+    read_vec[0].iov_base = payload.data;
+    read_vec[0].iov_len = payload.size;
+
+    bytes_read = efile_preadv(d, payload_offset, read_vec, 1);
+
+    if(bytes_read < 0) {
+        return posix_error_to_tuple(env, d->posix_errno);
+    } else if(bytes_read == 0) {
+        enif_release_binary(&payload);
+
+        return enif_make_tuple2(env, am_ok,
+                enif_make_tuple3(env,
+                    enif_make_uint(env, payload_size),
+                    enif_make_uint(env, payload_offset),
+                    am_eof));
+    }
+
+    if(bytes_read < payload.size && !enif_realloc_binary(&payload, bytes_read)) {
+        ERTS_INTERNAL_ERROR("Failed to shrink ipread payload.");
+    }
+
+    return enif_make_tuple2(env, am_ok,
+        enif_make_tuple3(env,
+            enif_make_uint(env, payload_size),
+            enif_make_uint(env, payload_offset),
+            enif_make_binary(env, &payload)));
+}
+
+static ERL_NIF_TERM get_handle_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    if(argc != 0) {
+        return enif_make_badarg(env);
+    }
+
+    return efile_get_handle(env, d);
+}
+
+static ERL_NIF_TERM read_info_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_fileinfo_t info = {0};
+    efile_path_t path;
+    int follow_links;
+
+    if(argc != 2 || !enif_get_int(env, argv[1], &follow_links)) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_read_info(&path, follow_links, &info))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    /* #file_info as declared in file.hrl */
+    return enif_make_tuple(env, 14,
+        am_file_info,
+        enif_make_uint64(env, info.size),
+        efile_filetype_to_atom(info.type),
+        efile_access_to_atom(info.access),
+        enif_make_int64(env, MAX(EFILE_MIN_FILETIME, info.a_time)),
+        enif_make_int64(env, MAX(EFILE_MIN_FILETIME, info.m_time)),
+        enif_make_int64(env, MAX(EFILE_MIN_FILETIME, info.c_time)),
+        enif_make_uint(env, info.mode),
+        enif_make_uint(env, info.links),
+        enif_make_uint(env, info.major_device),
+        enif_make_uint(env, info.minor_device),
+        enif_make_uint(env, info.inode),
+        enif_make_uint(env, info.uid),
+        enif_make_uint(env, info.gid)
+    );
+}
+
+static ERL_NIF_TERM set_permissions_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t path;
+    Uint32 permissions;
+
+    if(argc != 2 || !enif_get_uint(env, argv[1], &permissions)) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_set_permissions(&path, permissions))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM set_owner_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t path;
+    Uint32 uid, gid;
+
+    if(argc != 3 || !enif_get_uint(env, argv[1], &uid)
+                 || !enif_get_uint(env, argv[2], &gid)) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_set_owner(&path, uid, gid))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM set_time_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    Sint64 accessed, modified, created;
+    efile_path_t path;
+
+    if(argc != 4 || !enif_get_int64(env, argv[1], &accessed)
+                 || !enif_get_int64(env, argv[2], &modified)
+                 || !enif_get_int64(env, argv[3], &created)) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_set_time(&path, accessed, modified, created))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM read_link_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t path;
+    ERL_NIF_TERM result;
+
+    if(argc != 1) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_read_link(env, &path, &result))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return enif_make_tuple2(env, am_ok, result);
+}
+
+static ERL_NIF_TERM list_dir_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t path;
+    ERL_NIF_TERM result;
+
+    if(argc != 1) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_list_dir(env, &path, &result))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return enif_make_tuple2(env, am_ok, result);
+}
+
+static ERL_NIF_TERM rename_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t existing_path, new_path;
+
+    if(argc != 2) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &existing_path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_marshal_path(env, argv[1], &new_path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_rename(&existing_path, &new_path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM make_hard_link_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t existing_path, new_path;
+
+    if(argc != 2) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &existing_path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_marshal_path(env, argv[1], &new_path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_make_hard_link(&existing_path, &new_path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM make_soft_link_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t existing_path, new_path;
+
+    if(argc != 2) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &existing_path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_marshal_path(env, argv[1], &new_path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_make_soft_link(&existing_path, &new_path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM make_dir_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t path;
+
+    if(argc != 1) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_make_dir(&path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM del_file_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t path;
+
+    if(argc != 1) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_del_file(&path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM del_dir_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t path;
+
+    if(argc != 1) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_del_dir(&path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return am_ok;
+}
+
+static ERL_NIF_TERM get_device_cwd_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    ERL_NIF_TERM result;
+    int device_index;
+
+    if(argc != 1 || !enif_get_int(env, argv[0], &device_index)) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_get_device_cwd(env, device_index, &result))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return enif_make_tuple2(env, am_ok, result);
+}
+
+static ERL_NIF_TERM get_cwd_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+    ERL_NIF_TERM result;
+
+    if(argc != 0) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_get_cwd(env, &result))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return enif_make_tuple2(env, am_ok, result);
+}
+
+static ERL_NIF_TERM set_cwd_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t path;
+
+    if(argc != 1) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_set_cwd(&path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return am_ok;
+}
+
+/** @brief Reads an entire file into \c result, stopping after \c size bytes or
+ * EOF. It will read until EOF if size is 0. */
+static posix_errno_t read_file(efile_data_t *d, size_t size, ErlNifBinary *result) {
+    size_t initial_buffer_size;
+    ssize_t bytes_read;
+
+    if(size == 0) {
+        initial_buffer_size = 16 << 10;
+    } else {
+        initial_buffer_size = size;
+    }
+
+    if(!enif_alloc_binary(initial_buffer_size, result)) {
+        return ENOMEM;
+    }
+
+    bytes_read = 0;
+
+    for(;;) {
+        ssize_t block_bytes_read;
+        SysIOVec read_vec[1];
+
+        read_vec[0].iov_base = result->data + bytes_read;
+        read_vec[0].iov_len = result->size - bytes_read;
+
+        block_bytes_read = efile_readv(d, read_vec, 1);
+
+        if(block_bytes_read < 0) {
+            enif_release_binary(result);
+            return d->posix_errno;
+        }
+
+        bytes_read += block_bytes_read;
+
+        if(block_bytes_read < (result->size - bytes_read)) {
+            /* EOF */
+            break;
+        } else if(bytes_read == size) {
+            break;
+        }
+
+        if(!enif_realloc_binary(result, bytes_read * 2)) {
+            enif_release_binary(result);
+            return ENOMEM;
+        }
+    }
+
+    /* The file may have shrunk since we queried its size, so we have to do
+     * this even when the size is known. */
+    if(bytes_read < result->size && !enif_realloc_binary(result, bytes_read)) {
+        ERTS_INTERNAL_ERROR("Failed to shrink read_file result.");
+    }
+
+    return 0;
+}
+
+static ERL_NIF_TERM read_file_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_fileinfo_t info = {0};
+    efile_path_t path;
+    efile_data_t *d;
+
+    ErlNifBinary result;
+
+    if(argc != 1) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_read_info(&path, 1, &info))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_open(&path, EFILE_MODE_READ, efile_resource_type, &d))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    posix_errno = read_file(d, info.size, &result);
+    enif_release_resource(d);
+
+    if(posix_errno) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return enif_make_tuple2(env, am_ok, enif_make_binary(env, &result));
+}
+
+static ERL_NIF_TERM altname_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
+    posix_errno_t posix_errno;
+
+    efile_path_t path;
+    ERL_NIF_TERM result;
+
+    if(argc != 1) {
+        return enif_make_badarg(env);
+    }
+
+    if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
+        return posix_error_to_tuple(env, posix_errno);
+    } else if((posix_errno = efile_altname(env, &path, &result))) {
+        return posix_error_to_tuple(env, posix_errno);
+    }
+
+    return enif_make_tuple2(env, am_ok, result);
+}
diff --git a/erts/emulator/nifs/common/prim_file_nif.h b/erts/emulator/nifs/common/prim_file_nif.h
new file mode 100644
index 0000000000..cc9bc8f5c3
--- /dev/null
+++ b/erts/emulator/nifs/common/prim_file_nif.h
@@ -0,0 +1,240 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson 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.
+ * 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%
+ */
+
+typedef int posix_errno_t;
+
+enum efile_modes_t {
+    EFILE_MODE_READ = (1 << 0),
+    EFILE_MODE_WRITE = (1 << 1), /* Implies truncating file when used alone. */
+    EFILE_MODE_APPEND = (1 << 2),
+    EFILE_MODE_EXCLUSIVE = (1 << 3),
+    EFILE_MODE_SYNC = (1 << 4),
+
+    EFILE_MODE_SKIP_TYPE_CHECK = (1 << 5), /* Special for device files on Unix. */
+    EFILE_MODE_NO_TRUNCATE = (1 << 6), /* Special for reopening on VxWorks. */
+
+    EFILE_MODE_READ_WRITE = EFILE_MODE_READ | EFILE_MODE_WRITE
+};
+
+enum efile_access_t {
+    EFILE_ACCESS_NONE = 0,
+    EFILE_ACCESS_READ = 1,
+    EFILE_ACCESS_WRITE = 2,
+    EFILE_ACCESS_READ_WRITE = EFILE_ACCESS_READ | EFILE_ACCESS_WRITE
+};
+
+enum efile_seek_t {
+    EFILE_SEEK_BOF,
+    EFILE_SEEK_CUR,
+    EFILE_SEEK_EOF
+};
+
+enum efile_filetype_t {
+    EFILE_FILETYPE_DEVICE,
+    EFILE_FILETYPE_DIRECTORY,
+    EFILE_FILETYPE_REGULAR,
+    EFILE_FILETYPE_SYMLINK,
+    EFILE_FILETYPE_OTHER
+};
+
+enum efile_advise_t {
+    EFILE_ADVISE_NORMAL,
+    EFILE_ADVISE_RANDOM,
+    EFILE_ADVISE_SEQUENTIAL,
+    EFILE_ADVISE_WILL_NEED,
+    EFILE_ADVISE_DONT_NEED,
+    EFILE_ADVISE_NO_REUSE
+};
+
+enum efile_state_t {
+    EFILE_STATE_IDLE = 0,
+    EFILE_STATE_BUSY = 1,
+    EFILE_STATE_CLOSE_PENDING = 2,
+    EFILE_STATE_CLOSED = 3
+};
+
+typedef struct {
+    Sint64 size;            /* Size of file */
+    Uint32 type;            /* Type of file -- one of EFILE_FILETYPE_*. */
+    Uint32 access;          /* Access to file -- one of EFILE_ACCESS_*. */
+    Uint32 mode;            /* Access permissions -- bit field. */
+    Uint32 links;           /* Number of links to file. */
+    Uint32 major_device;    /* Major device or file system. */
+    Uint32 minor_device;    /* Minor device (for devices). */
+    Uint32 inode;           /* Inode number. */
+    Uint32 uid;             /* User id of owner. */
+    Uint32 gid;             /* Group id of owner. */
+    Sint64 a_time;          /* Last time the file was accessed. */
+    Sint64 m_time;          /* Last time the file was modified. */
+    Sint64 c_time;          /* Windows: creation time, Unix: last inode
+                             * change. */
+} efile_fileinfo_t;
+
+/* The smallest value that can be converted freely between universal, local,
+ * and POSIX time, as required by read_file_info/2. Corresponds to
+ * {{1902,1,1},{0,0,0}} */
+#define EFILE_MIN_FILETIME -2145916800
+
+/* Initializes an efile_data_t; must be used in efile_open on success. */
+#define EFILE_INIT_RESOURCE(__d, __modes) do { \
+        erts_atomic32_init_acqb(&(__d)->state, EFILE_STATE_IDLE); \
+        (__d)->posix_errno = 0; \
+        (__d)->modes = __modes; \
+    } while(0)
+
+typedef struct {
+    erts_atomic32_t state;
+
+    posix_errno_t posix_errno;
+    enum efile_modes_t modes;
+
+    ErlNifMonitor monitor;
+} efile_data_t;
+
+typedef ErlNifBinary efile_path_t;
+
+/* @brief Translates the given "raw name" into the format expected by the APIs
+ * used by the underlying implementation. The result is transient and does not
+ * need to be released.
+ *
+ * This may change the structure of the path and its results should never be
+ * passed on to the user. Refer to the OS-specific implementation for details.
+ *
+ * @param path The term to translate; it must have been encoded with
+ * prim_file:internal_native2name for compatibility reasons. */
+posix_errno_t efile_marshal_path(ErlNifEnv *env, ERL_NIF_TERM path, efile_path_t *result);
+
+/* @brief Returns the underlying handle as an implementation-defined term.
+ *
+ * This is an internal function intended to support tests and tricky
+ * operations like sendfile(2). */
+ERL_NIF_TERM efile_get_handle(ErlNifEnv *env, efile_data_t *d);
+
+/* @brief Read until EOF or the given iovec has been filled.
+ *
+ * @return -1 on failure, or the number of bytes read on success. The return
+ * value will be 0 if no bytes could be read before EOF or the end of the
+ * iovec. */
+Sint64 efile_readv(efile_data_t *d, SysIOVec *iov, int iovlen);
+
+/* @brief Write the entirety of the given iovec.
+ *
+ * @return -1 on failure, or the number of bytes written on success. "Partial"
+ * failures will be reported with -1 and not the number of bytes we managed to
+ * write to disk before the failure. */
+Sint64 efile_writev(efile_data_t *d, SysIOVec *iov, int iovlen);
+
+/* @brief As \c efile_readv, but starting from a file offset. */
+Sint64 efile_preadv(efile_data_t *d, Sint64 offset, SysIOVec *iov, int iovlen);
+
+/* @brief As \c efile_writev, but starting from a file offset. */
+Sint64 efile_pwritev(efile_data_t *d, Sint64 offset, SysIOVec *iov, int iovlen);
+
+int efile_seek(efile_data_t *d, enum efile_seek_t seek, Sint64 offset, Sint64 *new_position);
+
+int efile_sync(efile_data_t *d, int data_only);
+
+int efile_advise(efile_data_t *d, Sint64 offset, Sint64 length, enum efile_advise_t advise);
+int efile_allocate(efile_data_t *d, Sint64 offset, Sint64 length);
+int efile_truncate(efile_data_t *d);
+
+posix_errno_t efile_open(const efile_path_t *path, enum efile_modes_t modes,
+        ErlNifResourceType *nif_type, efile_data_t **d);
+
+/** @brief Closes a file. The file must have entered the CLOSED state prior to
+ * calling this to prevent double close. */
+int efile_close(efile_data_t *d);
+
+/* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */
+
+posix_errno_t efile_read_info(const efile_path_t *path, int follow_link, efile_fileinfo_t *result);
+
+/** @brief Sets the file times to the given values. Refer to efile_fileinfo_t
+ * for a description of each. */
+posix_errno_t efile_set_time(const efile_path_t *path, Sint64 a_time, Sint64 m_time, Sint64 c_time);
+
+/** @brief On Unix, this sets the file permissions according to the docs for
+ * file:write_file_info/2. On Windows it uses the "owner write permission" flag
+ * to toggle whether the file is read-only or not. */
+posix_errno_t efile_set_permissions(const efile_path_t *path, Uint32 permissions);
+
+/** @brief On Unix, this will set the owner/group to the given values. It will
+ * do nothing on other platforms. */
+posix_errno_t efile_set_owner(const efile_path_t *path, Uint32 owner, Uint32 group);
+
+/** @brief Resolves the final path of the given link. */
+posix_errno_t efile_read_link(ErlNifEnv *env, const efile_path_t *path, ERL_NIF_TERM *result);
+
+/** @brief Lists the contents of the given directory.
+ * @param result [out] A list of all the directory/file names contained in the
+ * given directory. */
+posix_errno_t efile_list_dir(ErlNifEnv *env, const efile_path_t *path, ERL_NIF_TERM *result);
+
+/** @brief Changes the name of an existing file or directory, from old_path
+ * to new_path.
+ *
+ * If old_path and new_path refer to the same file or directory, it does
+ * nothing and returns success. Otherwise if new_path already exists, it will
+ * be deleted and replaced by src subject to the following conditions:
+ *
+ *     If old_path is a directory, new_path may be an empty directory.
+ *     If old_path is a file, new_path may be a file.
+ *
+ * Neither of these are guaranteed to be atomic. In any other situation where
+ * new_path already exists, the rename will fail.
+ *
+ * Some possible error codes:
+ *
+ * - EACCES:     Either paths or one of their parent directories can't be read
+ *               and/or written.
+ * - EEXIST:     new_path is a non-empty directory.
+ * - EINVAL:     old_path is a root directory or new_path is a subdirectory
+ *               of new_path.
+ * - EISDIR:     new_path is a directory, but old_path is not.
+ * - ENOTDIR:    old_path is a directory, but new_path is not.
+ * - ENOENT:     old_path doesn't exist, or either path is "".
+ * - EXDEV:      The paths are on different filesystems.
+ *
+ * The implementation of rename may allow cross-filesystem renames,
+ * but the caller should be prepared to emulate it with copy and
+ * delete if errno is EXDEV. */
+posix_errno_t efile_rename(const efile_path_t *old_path, const efile_path_t *new_path);
+
+posix_errno_t efile_make_hard_link(const efile_path_t *existing_path, const efile_path_t *new_path);
+posix_errno_t efile_make_soft_link(const efile_path_t *existing_path, const efile_path_t *new_path);
+posix_errno_t efile_make_dir(const efile_path_t *path);
+
+posix_errno_t efile_del_file(const efile_path_t *path);
+posix_errno_t efile_del_dir(const efile_path_t *path);
+
+posix_errno_t efile_get_cwd(ErlNifEnv *env, ERL_NIF_TERM *result);
+posix_errno_t efile_set_cwd(const efile_path_t *path);
+
+/** @brief A Windows-specific function for returning the working directory of a
+ * given device.
+ *
+ * @param device_index The drive index; 1 for A, 2 for B, etc.
+ * @param result [out] The working directory of the given device
+ */
+posix_errno_t efile_get_device_cwd(ErlNifEnv *env, int device_index, ERL_NIF_TERM *result);
+
+/** @brief A Windows-specific function for returning the 8.3-name of a given
+ * file or directory. */
+posix_errno_t efile_altname(ErlNifEnv *env, const efile_path_t *path, ERL_NIF_TERM *result);
diff --git a/erts/emulator/nifs/common/zlib_nif.c b/erts/emulator/nifs/common/zlib_nif.c
index fa29b4fb71..b709ed5a6f 100644
--- a/erts/emulator/nifs/common/zlib_nif.c
+++ b/erts/emulator/nifs/common/zlib_nif.c
@@ -717,7 +717,9 @@ static ERL_NIF_TERM zlib_deflateEnd(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 
 static ERL_NIF_TERM zlib_deflateParams(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
     zlib_data_t *d;
+
     int res, level, strategy;
+    Bytef dummy_buffer;
 
     if(argc != 3 || !get_zlib_data(env, argv[0], &d)
                  || !enif_get_int(env, argv[1], &level)
@@ -729,12 +731,27 @@ static ERL_NIF_TERM zlib_deflateParams(ErlNifEnv *env, int argc, const ERL_NIF_T
         return enif_raise_exception(env, am_not_initialized);
     }
 
-    /* deflateParams will flush everything currently in the stream, corrupting
-     * the heap unless it's empty. We therefore pretend to have a full output
-     * buffer, forcing a Z_BUF_ERROR if there's anything left to be flushed. */
-    d->s.avail_out = 0;
+    /* This is a bit of a hack; deflateParams flushes with Z_BLOCK which won't
+     * stop at a byte boundary, so we can't split this operation up, and we
+     * can't allocate a buffer large enough to fit it in one go since we have
+     * to support zlib versions that lack deflatePending.
+     *
+     * We therefore flush everything prior to this call to ensure that we are
+     * stopped on a byte boundary and have no pending data. We then hand it a
+     * dummy buffer to detect when this assumption doesn't hold (Hopefully
+     * never), and to smooth over an issue with zlib 1.2.11 which always
+     * returns Z_BUF_ERROR when d->s.avail_out is 0, regardless of whether
+     * there's any pending data or not. */
+
+    d->s.next_out = &dummy_buffer;
+    d->s.avail_out = 1;
+
     res = deflateParams(&d->s, level, strategy);
 
+    if(d->s.avail_out == 0) {
+        return zlib_return(env, Z_STREAM_ERROR);
+    }
+
     return zlib_return(env, res);
 }
 
@@ -929,7 +946,7 @@ static ERL_NIF_TERM zlib_inflate(ErlNifEnv *env, int argc, const ERL_NIF_TERM ar
         return enif_raise_exception(env, am_not_initialized);
     }
 
-    if(d->eos_seen) {
+    if(d->eos_seen && enif_ioq_size(d->input_queue) > 0) {
         int res;
 
         switch(d->eos_behavior) {
@@ -943,11 +960,10 @@ static ERL_NIF_TERM zlib_inflate(ErlNifEnv *env, int argc, const ERL_NIF_TERM ar
             }
 
             d->eos_seen = 0;
+
             break;
         case EOS_BEHAVIOR_CUT:
             zlib_reset_input(d);
-
-            return enif_make_tuple2(env, am_finished, enif_make_list(env, 0));
         }
     }
 
diff --git a/erts/emulator/nifs/unix/unix_prim_file.c b/erts/emulator/nifs/unix/unix_prim_file.c
new file mode 100644
index 0000000000..4a6c476882
--- /dev/null
+++ b/erts/emulator/nifs/unix/unix_prim_file.c
@@ -0,0 +1,944 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson 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.
+ * 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%
+ */
+
+#include "erl_nif.h"
+#include "config.h"
+#include "sys.h"
+
+#ifdef VALGRIND
+#  include <valgrind/memcheck.h>
+#endif
+
+#include "prim_file_nif.h"
+
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+#define __DARWIN__ 1
+#endif
+
+#if defined(__DARWIN__) || defined(HAVE_LINUX_FALLOC_H) || defined(HAVE_POSIX_FALLOCATE)
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_LINUX_FALLOC_H
+#include <linux/falloc.h>
+#endif
+
+#include <utime.h>
+
+/* Macros for testing file types. */
+#ifdef NO_UMASK
+#define FILE_MODE 0644
+#define DIR_MODE  0755
+#else
+#define FILE_MODE 0666
+#define DIR_MODE  0777
+#endif
+
+/* Old platforms might not have IOV_MAX defined. */
+#if !defined(IOV_MAX) && defined(UIO_MAXIOV)
+#define IOV_MAX UIO_MAXIOV
+#elif !defined(IOV_MAX)
+#define IOV_MAX 16
+#endif
+
+typedef struct {
+    efile_data_t common;
+    int fd;
+} efile_unix_t;
+
+static int has_invalid_null_termination(const ErlNifBinary *path) {
+    const char *null_pos, *end_pos;
+
+    null_pos = memchr(path->data, '\0', path->size);
+    end_pos = (const char*)&path->data[path->size] - 1;
+
+    if(null_pos == NULL) {
+        return 1;
+    }
+
+    /* prim_file:internal_name2native sometimes feeds us data that is "doubly"
+     * NUL-terminated, so we'll accept any number of trailing NULs so long as
+     * they aren't interrupted by anything else. */
+    while(null_pos < end_pos && (*null_pos) == '\0') {
+        null_pos++;
+    }
+
+    return null_pos != end_pos;
+}
+
+posix_errno_t efile_marshal_path(ErlNifEnv *env, ERL_NIF_TERM path, efile_path_t *result) {
+    if(!enif_inspect_binary(env, path, result)) {
+        return EINVAL;
+    }
+
+    if(has_invalid_null_termination(result)) {
+        return EINVAL;
+    }
+
+    return 0;
+}
+
+ERL_NIF_TERM efile_get_handle(ErlNifEnv *env, efile_data_t *d) {
+    efile_unix_t *u = (efile_unix_t*)d;
+
+    ERL_NIF_TERM result;
+    unsigned char *bits;
+
+    bits = enif_make_new_binary(env, sizeof(u->fd), &result);
+    memcpy(bits, &u->fd, sizeof(u->fd));
+
+    return result;
+}
+
+static int open_file_type_check(const efile_path_t *path, int fd) {
+    struct stat file_info;
+    int error;
+
+#ifndef HAVE_FSTAT
+    error = stat((const char*)path->data, &file_info);
+    (void)fd;
+#else
+    error = fstat(fd, &file_info);
+    (void)path;
+#endif
+
+    if(error < 0) {
+        /* If we failed to stat assume success and let the next call handle the
+         * error. The old driver checked whether the file was to be used
+         * immediately in a read within the call, but the new implementation
+         * never does that. */
+         return 1;
+    }
+
+    /* Allow everything that isn't a directory, and error out on the next call
+     * if it's unsupported. */
+    if(S_ISDIR(file_info.st_mode)) {
+        return 0;
+    }
+
+    return 1;
+}
+
+posix_errno_t efile_open(const efile_path_t *path, enum efile_modes_t modes,
+        ErlNifResourceType *nif_type, efile_data_t **d) {
+
+    int flags, fd;
+
+    flags = 0;
+
+    if(modes & EFILE_MODE_READ && !(modes & EFILE_MODE_WRITE)) {
+        flags |= O_RDONLY;
+    } else if(modes & EFILE_MODE_WRITE && !(modes & EFILE_MODE_READ)) {
+        if(!(modes & EFILE_MODE_NO_TRUNCATE)) {
+            flags |= O_TRUNC;
+        }
+
+        flags |= O_WRONLY | O_CREAT;
+    } else if(modes & EFILE_MODE_READ_WRITE) {
+        flags |= O_RDWR | O_CREAT;
+    } else {
+        return EINVAL;
+    }
+
+    if(modes & EFILE_MODE_APPEND) {
+        flags &= ~O_TRUNC;
+        flags |= O_APPEND;
+    }
+
+    if(modes & EFILE_MODE_EXCLUSIVE) {
+        flags |= O_EXCL;
+    }
+
+    if(modes & EFILE_MODE_SYNC) {
+#ifndef O_SYNC
+        return ENOTSUP;
+#else
+        flags |= O_SYNC;
+#endif
+    }
+
+    do {
+        fd = open((const char*)path->data, flags, FILE_MODE);
+    } while(fd == -1 && errno == EINTR);
+
+    if(fd != -1) {
+        efile_unix_t *u;
+
+        if(!(modes & EFILE_MODE_SKIP_TYPE_CHECK) && !open_file_type_check(path, fd)) {
+            close(fd);
+
+            /* This is blatantly incorrect, but we're documented as returning
+             * this for everything that isn't a file. */
+            return EISDIR;
+        }
+
+        u = (efile_unix_t*)enif_alloc_resource(nif_type, sizeof(efile_unix_t));
+        u->fd = fd;
+
+        EFILE_INIT_RESOURCE(&u->common, modes);
+        (*d) = &u->common;
+
+        return 0;
+    }
+
+    (*d) = NULL;
+    return errno;
+}
+
+int efile_close(efile_data_t *d) {
+    efile_unix_t *u = (efile_unix_t*)d;
+    int fd;
+
+    ASSERT(erts_atomic32_read_nob(&d->state) == EFILE_STATE_CLOSED);
+    ASSERT(u->fd != -1);
+
+    fd = u->fd;
+    u->fd = -1;
+
+    /* close(2) either always closes (*BSD, Linux) or leaves the fd in an
+     * undefined state (POSIX 2008, Solaris), so we must not retry on EINTR. */
+
+    if(close(fd) < 0) {
+        u->common.posix_errno = errno;
+        return 0;
+    }
+
+    return 1;
+}
+
+static void shift_iov(SysIOVec **iov, int *iovlen, ssize_t shift) {
+    SysIOVec *head_vec = (*iov);
+
+    ASSERT(shift >= 0);
+
+    while(shift > 0) {
+        ASSERT(head_vec < &(*iov)[*iovlen]);
+
+        if(shift < head_vec->iov_len) {
+            head_vec->iov_base = (char*)head_vec->iov_base + shift;
+            head_vec->iov_len -= shift;
+            break;
+        } else {
+            shift -= head_vec->iov_len;
+            head_vec++;
+        }
+    }
+
+    (*iovlen) -= head_vec - (*iov);
+    (*iov) = head_vec;
+}
+
+Sint64 efile_readv(efile_data_t *d, SysIOVec *iov, int iovlen) {
+    efile_unix_t *u = (efile_unix_t*)d;
+
+    Sint64 bytes_read;
+    ssize_t result;
+
+    bytes_read = 0;
+
+    do {
+        int use_fallback = 0;
+
+        if(iovlen < 1) {
+            result = 0;
+            break;
+        }
+
+        /* writev(2) implies readv(2) */
+#ifdef HAVE_WRITEV
+        result = readv(u->fd, iov, MIN(IOV_MAX, iovlen));
+
+        /* Fall back to using read(2) if readv(2) reports that the combined
+         * size of iov is greater than SSIZE_T_MAX. */
+        use_fallback = (result < 0 && errno == EINVAL);
+#else
+        use_fallback = 1;
+#endif
+
+        if(use_fallback) {
+            result = read(u->fd, iov->iov_base, iov->iov_len);
+        }
+
+        if(result > 0) {
+            shift_iov(&iov, &iovlen, result);
+            bytes_read += result;
+        }
+    } while(result > 0 || (result < 0 && errno == EINTR));
+
+    u->common.posix_errno = errno;
+
+    if(result == 0 && bytes_read > 0) {
+        return bytes_read;
+    }
+
+    return result;
+}
+
+Sint64 efile_writev(efile_data_t *d, SysIOVec *iov, int iovlen) {
+    efile_unix_t *u = (efile_unix_t*)d;
+
+    Sint64 bytes_written;
+    ssize_t result;
+
+    bytes_written = 0;
+
+    do {
+        int use_fallback = 0;
+
+        if(iovlen < 1) {
+            result = 0;
+            break;
+        }
+
+#ifdef HAVE_WRITEV
+        result = writev(u->fd, iov, MIN(IOV_MAX, iovlen));
+
+        /* Fall back to using write(2) if writev(2) reports that the combined
+         * size of iov is greater than SSIZE_T_MAX. */
+        use_fallback = (result < 0 && errno == EINVAL);
+#else
+        use_fallback = 1;
+#endif
+
+        if(use_fallback) {
+            result = write(u->fd, iov->iov_base, iov->iov_len);
+        }
+
+        if(result > 0) {
+            shift_iov(&iov, &iovlen, result);
+            bytes_written += result;
+        }
+    } while(result > 0 || (result < 0 && errno == EINTR));
+
+    u->common.posix_errno = errno;
+
+    if(result == 0 && bytes_written > 0) {
+        return bytes_written;
+    }
+
+    return result;
+}
+
+Sint64 efile_preadv(efile_data_t *d, Sint64 offset, SysIOVec *iov, int iovlen) {
+    efile_unix_t *u = (efile_unix_t*)d;
+
+    Uint64 bytes_read;
+    Sint64 result;
+
+#if !defined(HAVE_PREADV) && !defined(HAVE_PREAD)
+    /* This function is documented as leaving the file position undefined, but
+     * the old driver always reset it so there's probably code in the wild that
+     * relies on this behavior. */
+    off_t original_position = lseek(u->fd, 0, SEEK_CUR);
+
+    if(original_position < 0 || lseek(u->fd, offset, SEEK_SET) < 0) {
+        u->common.posix_errno = errno;
+        return -1;
+    }
+#endif
+
+    bytes_read = 0;
+
+    do {
+        if(iovlen < 1) {
+            result = 0;
+            break;
+        }
+
+#if defined(HAVE_PREADV)
+        result = preadv(u->fd, iov, MIN(IOV_MAX, iovlen), offset);
+#elif defined(HAVE_PREAD)
+        result = pread(u->fd, iov->iov_base, iov->iov_len, offset);
+#else
+        result = read(u->fd, iov->iov_base, iov->iov_len);
+#endif
+
+        if(result > 0) {
+            shift_iov(&iov, &iovlen, result);
+            bytes_read += result;
+            offset += result;
+        }
+    } while(result > 0 || (result < 0 && errno == EINTR));
+
+    u->common.posix_errno = errno;
+
+#if !defined(HAVE_PREADV) && !defined(HAVE_PREAD)
+    if(result >= 0) {
+        if(lseek(u->fd, original_position, SEEK_SET) < 0) {
+            u->common.posix_errno = errno;
+            return -1;
+        }
+    }
+#endif
+
+    if(result == 0 && bytes_read > 0) {
+        return bytes_read;
+    }
+
+    return result;
+}
+
+Sint64 efile_pwritev(efile_data_t *d, Sint64 offset, SysIOVec *iov, int iovlen) {
+    efile_unix_t *u = (efile_unix_t*)d;
+
+    Sint64 bytes_written;
+    ssize_t result;
+
+#if !defined(HAVE_PWRITEV) && !defined(HAVE_PWRITE)
+    off_t original_position = lseek(u->fd, 0, SEEK_CUR);
+
+    if(original_position < 0 || lseek(u->fd, offset, SEEK_SET) < 0) {
+        u->common.posix_errno = errno;
+        return -1;
+    }
+#endif
+
+    bytes_written = 0;
+
+    do {
+        if(iovlen < 1) {
+            result = 0;
+            break;
+        }
+
+#if defined(HAVE_PWRITEV)
+        result = pwritev(u->fd, iov, MIN(IOV_MAX, iovlen), offset);
+#elif defined(HAVE_PWRITE)
+        result = pwrite(u->fd, iov->iov_base, iov->iov_len, offset);
+#else
+        result = write(u->fd, iov->iov_base, iov->iov_len);
+#endif
+
+        if(result > 0) {
+            shift_iov(&iov, &iovlen, result);
+            bytes_written += result;
+            offset += result;
+        }
+    } while(result > 0 || (result < 0 && errno == EINTR));
+
+    u->common.posix_errno = errno;
+
+#if !defined(HAVE_PWRITEV) && !defined(HAVE_PWRITE)
+    if(result >= 0) {
+        if(lseek(u->fd, original_position, SEEK_SET) < 0) {
+            u->common.posix_errno = errno;
+            return -1;
+        }
+    }
+#endif
+
+    if(result == 0 && bytes_written > 0) {
+        return bytes_written;
+    }
+
+    return result;
+}
+
+int efile_seek(efile_data_t *d, enum efile_seek_t seek, Sint64 offset, Sint64 *new_position) {
+    efile_unix_t *u = (efile_unix_t*)d;
+    off_t result;
+    int whence;
+
+    switch(seek) {
+        case EFILE_SEEK_BOF: whence = SEEK_SET; break;
+        case EFILE_SEEK_CUR: whence = SEEK_CUR; break;
+        case EFILE_SEEK_EOF: whence = SEEK_END; break;
+        default: ERTS_INTERNAL_ERROR("Invalid seek parameter");
+    }
+
+    result = lseek(u->fd, offset, whence);
+
+    /*
+     * The man page for lseek (on SunOs 5) says:
+     *
+     * "if fildes is a remote file descriptor and offset is negative, lseek()
+     * returns the file pointer even if it is negative."
+     */
+    if(result < 0 && errno == 0) {
+        errno = EINVAL;
+    }
+
+    if(result < 0) {
+        u->common.posix_errno = errno;
+        return 0;
+    }
+
+    (*new_position) = result;
+
+    return 1;
+}
+
+int efile_sync(efile_data_t *d, int data_only) {
+    efile_unix_t *u = (efile_unix_t*)d;
+
+#if defined(HAVE_FDATASYNC) && !defined(__DARWIN__)
+    if(data_only) {
+        if(fdatasync(u->fd) < 0) {
+            u->common.posix_errno = errno;
+            return 0;
+        }
+
+        return 1;
+    }
+#endif
+
+#if defined(__DARWIN__) && defined(F_FULLFSYNC)
+    if(fcntl(u->fd, F_FULLFSYNC) < 0) {
+#else
+    if(fsync(u->fd) < 0) {
+#endif
+        u->common.posix_errno = errno;
+        return 0;
+    }
+
+    return 1;
+}
+
+int efile_advise(efile_data_t *d, Sint64 offset, Sint64 length, enum efile_advise_t advise) {
+    efile_unix_t *u = (efile_unix_t*)d;
+#ifdef HAVE_POSIX_FADVISE
+    int p_advise;
+
+    switch(advise) {
+        case EFILE_ADVISE_NORMAL: p_advise = POSIX_FADV_NORMAL; break;
+        case EFILE_ADVISE_RANDOM: p_advise = POSIX_FADV_RANDOM; break;
+        case EFILE_ADVISE_SEQUENTIAL: p_advise = POSIX_FADV_SEQUENTIAL; break;
+        case EFILE_ADVISE_WILL_NEED: p_advise = POSIX_FADV_WILLNEED; break;
+        case EFILE_ADVISE_DONT_NEED: p_advise = POSIX_FADV_DONTNEED; break;
+        case EFILE_ADVISE_NO_REUSE: p_advise = POSIX_FADV_NOREUSE; break;
+        default:
+            u->common.posix_errno = EINVAL;
+            return 0;
+    }
+
+    if(posix_fadvise(u->fd, offset, length, p_advise) < 0) {
+        u->common.posix_errno = errno;
+        return 0;
+    }
+
+    return 1;
+#else
+    /* We'll pretend to support this syscall as it's only a recommendation even
+     * on systems that do support it. */
+    return 1;
+#endif
+}
+
+int efile_allocate(efile_data_t *d, Sint64 offset, Sint64 length) {
+    efile_unix_t *u = (efile_unix_t*)d;
+    int ret = -1;
+
+    /* We prefer OS-specific methods, but fall back to posix_fallocate on
+     * failure. It's unclear whether this has any practical benefit on
+     * modern systems, but the old driver did it. */
+
+#if defined(HAVE_FALLOCATE)
+    /* Linux-specific */
+    do {
+        ret = fallocate(u->fd, FALLOC_FL_KEEP_SIZE, offset, length);
+    } while(ret < 0 && errno == EINTR);
+#elif defined(F_PREALLOCATE)
+    /* Mac-specific */
+    fstore_t fs = {};
+
+    fs.fst_flags = F_ALLOCATECONTIG;
+    fs.fst_posmode = F_VOLPOSMODE;
+    fs.fst_offset = offset;
+    fs.fst_length = length;
+
+    ret = fcntl(u->fd, F_PREALLOCATE, &fs);
+    if(ret < 0) {
+        fs.fst_flags = F_ALLOCATEALL;
+        ret = fcntl(u->fd, F_PREALLOCATE, &fs);
+    }
+#elif !defined(HAVE_POSIX_FALLOCATE)
+    u->common.posix_errno = ENOTSUP;
+    return 0;
+#endif
+
+#ifdef HAVE_POSIX_FALLOCATE
+    if(ret < 0) {
+        do {
+            ret = posix_fallocate(u->fd, offset, length);
+
+            /* On Linux and Solaris for example, posix_fallocate() returns a
+             * positive error number on error and it does not set errno. On
+             * FreeBSD however (9.0 at least), it returns -1 on error and it
+             * sets errno. */
+            if (ret > 0) {
+                errno = ret;
+                ret = -1;
+            }
+        } while(ret < 0 && errno == EINTR);
+    }
+#endif
+
+    if(ret < 0) {
+        u->common.posix_errno = errno;
+        return 0;
+    }
+
+    return 1;
+}
+
+int efile_truncate(efile_data_t *d) {
+    efile_unix_t *u = (efile_unix_t*)d;
+    off_t offset;
+
+    offset = lseek(u->fd, 0, SEEK_CUR);
+
+    if(offset < 0) {
+        u->common.posix_errno = errno;
+        return 0;
+    }
+
+    if(ftruncate(u->fd, offset) < 0) {
+        u->common.posix_errno = errno;
+        return 0;
+    }
+
+    return 1;
+}
+
+posix_errno_t efile_read_info(const efile_path_t *path, int follow_links, efile_fileinfo_t *result) {
+    struct stat data;
+
+    if(follow_links) {
+        if(stat((const char*)path->data, &data) < 0) {
+            return errno;
+        }
+    } else {
+        if(lstat((const char*)path->data, &data) < 0) {
+            return errno;
+        }
+    }
+
+    if(S_ISCHR(data.st_mode) || S_ISBLK(data.st_mode)) {
+        result->type = EFILE_FILETYPE_DEVICE;
+    } else if(S_ISDIR(data.st_mode)) {
+        result->type = EFILE_FILETYPE_DIRECTORY;
+    } else if(S_ISREG(data.st_mode)) {
+        result->type = EFILE_FILETYPE_REGULAR;
+    } else if(S_ISLNK(data.st_mode)) {
+        result->type = EFILE_FILETYPE_SYMLINK;
+    } else {
+        result->type = EFILE_FILETYPE_OTHER;
+    }
+
+    result->a_time = (Sint64)data.st_atime;
+    result->m_time = (Sint64)data.st_mtime;
+    result->c_time = (Sint64)data.st_ctime;
+    result->size = data.st_size;
+
+    result->major_device = data.st_dev;
+    result->minor_device = data.st_rdev;
+    result->links = data.st_nlink;
+    result->inode = data.st_ino;
+    result->mode = data.st_mode;
+    result->uid = data.st_uid;
+    result->gid = data.st_gid;
+
+#ifndef NO_ACCESS
+    result->access = EFILE_ACCESS_NONE;
+
+    if(access((const char*)path->data, R_OK) == 0) {
+        result->access |= EFILE_ACCESS_READ;
+    }
+    if(access((const char*)path->data, W_OK) == 0) {
+        result->access |= EFILE_ACCESS_WRITE;
+    }
+#else
+    /* Just look at read/write access for owner. */
+    result->access = ((data.st_mode >> 6) & 07) >> 1;
+#endif
+
+    return 0;
+}
+
+posix_errno_t efile_set_permissions(const efile_path_t *path, Uint32 permissions) {
+    const mode_t MUTABLE_MODES = (S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO);
+    mode_t new_modes = permissions & MUTABLE_MODES;
+
+    if(chmod((const char*)path->data, new_modes) < 0) {
+        new_modes &= ~(S_ISUID | S_ISGID);
+
+        if (chmod((const char*)path->data, new_modes) < 0) {
+            return errno;
+        }
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_set_owner(const efile_path_t *path, Uint32 owner, Uint32 group) {
+    if(chown((const char*)path->data, owner, group) < 0) {
+        return errno;
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_set_time(const efile_path_t *path, Sint64 a_time, Sint64 m_time, Sint64 c_time) {
+    struct utimbuf tval;
+
+    tval.actime = (time_t)a_time;
+    tval.modtime = (time_t)m_time;
+
+    (void)c_time;
+
+    if(utime((const char*)path->data, &tval) < 0) {
+        return errno;
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_read_link(ErlNifEnv *env, const efile_path_t *path, ERL_NIF_TERM *result) {
+    ErlNifBinary result_bin;
+
+    if(!enif_alloc_binary(256, &result_bin)) {
+        return ENOMEM;
+    }
+
+    for(;;) {
+        ssize_t bytes_copied;
+
+        bytes_copied = readlink((const char*)path->data, (char*)result_bin.data,
+            result_bin.size);
+
+        if(bytes_copied <= 0) {
+            posix_errno_t saved_errno = errno;
+            enif_release_binary(&result_bin);
+            return saved_errno;
+        } else if(bytes_copied < result_bin.size) {
+            if(!enif_realloc_binary(&result_bin, bytes_copied)) {
+                enif_release_binary(&result_bin);
+                return ENOMEM;
+            }
+
+            (*result) = enif_make_binary(env, &result_bin);
+
+            return 0;
+        }
+
+        /* The result didn't fit into the buffer, so we'll try again with a
+         * larger one. */
+
+        if(!enif_realloc_binary(&result_bin, result_bin.size * 2)) {
+            enif_release_binary(&result_bin);
+            return ENOMEM;
+        }
+    }
+}
+
+static int is_ignored_name(int name_length, const char *name) {
+    if(name_length == 1 && name[0] == '.') {
+        return 1;
+    } else if(name_length == 2 && memcmp(name, "..", 2) == 0) {
+        return 1;
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_list_dir(ErlNifEnv *env, const efile_path_t *path, ERL_NIF_TERM *result) {
+    ERL_NIF_TERM list_head;
+
+    struct dirent *dir_entry;
+    DIR *dir_stream;
+
+    dir_stream = opendir((const char*)path->data);
+    if(dir_stream == NULL) {
+        posix_errno_t saved_errno = errno;
+        *result = enif_make_list(env, 0);
+        return saved_errno;
+    }
+
+    list_head = enif_make_list(env, 0);
+    dir_entry = readdir(dir_stream);
+
+    while(dir_entry != NULL) {
+        int name_length = strlen(dir_entry->d_name);
+
+        if(!is_ignored_name(name_length, dir_entry->d_name)) {
+            unsigned char *name_bytes;
+            ERL_NIF_TERM name_term;
+
+            name_bytes = enif_make_new_binary(env, name_length, &name_term);
+            sys_memcpy(name_bytes, dir_entry->d_name, name_length);
+
+            list_head = enif_make_list_cell(env, name_term, list_head);
+        }
+
+        dir_entry = readdir(dir_stream);
+    }
+
+    (*result) = list_head;
+    closedir(dir_stream);
+
+    return 0;
+}
+
+posix_errno_t efile_rename(const efile_path_t *old_path, const efile_path_t *new_path) {
+    if(rename((const char*)old_path->data, (const char*)new_path->data) < 0) {
+        if(errno == ENOTEMPTY) {
+            return EEXIST;
+        }
+
+        if(strcmp((const char*)old_path->data, "/") == 0) {
+            /* Alpha reports renaming / as EBUSY and Linux reports it as EACCES
+             * instead of EINVAL.*/
+             return EINVAL;
+        }
+
+        return errno;
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_make_hard_link(const efile_path_t *existing_path, const efile_path_t *new_path) {
+    if(link((const char*)existing_path->data, (const char*)new_path->data) < 0) {
+        return errno;
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_make_soft_link(const efile_path_t *existing_path, const efile_path_t *new_path) {
+    if(symlink((const char*)existing_path->data, (const char*)new_path->data) < 0) {
+        return errno;
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_make_dir(const efile_path_t *path) {
+#ifdef NO_MKDIR_MODE
+    if(mkdir((const char*)path->data) < 0) {
+#else
+    if(mkdir((const char*)path->data, DIR_MODE) < 0) {
+#endif
+        return errno;
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_del_file(const efile_path_t *path) {
+    if(unlink((const char*)path->data) < 0) {
+        /* Linux sets the wrong error code. */
+        if(errno == EISDIR) {
+            return EPERM;
+        }
+
+        return errno;
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_del_dir(const efile_path_t *path) {
+    if(rmdir((const char*)path->data) < 0) {
+        posix_errno_t saved_errno = errno;
+
+        if(saved_errno == ENOTEMPTY) {
+            saved_errno = EEXIST;
+        }
+
+        /* The error code might be wrong if we're trying to delete the current
+         * directory. */
+        if(saved_errno == EEXIST) {
+            struct stat path_stat, cwd_stat;
+            int has_stat;
+
+            has_stat = (stat((const char*)path->data, &path_stat) == 0);
+            has_stat &= (stat(".", &cwd_stat) == 0);
+
+            if(has_stat && path_stat.st_ino == cwd_stat.st_ino) {
+                if(path_stat.st_dev == cwd_stat.st_dev) {
+                    return EINVAL;
+                }
+            }
+        }
+
+        return saved_errno;
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_set_cwd(const efile_path_t *path) {
+    if(chdir((const char*)path->data) < 0) {
+        return errno;
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_get_device_cwd(ErlNifEnv *env, int device_index, ERL_NIF_TERM *result) {
+    (void)device_index;
+    (void)result;
+    (void)env;
+
+    return ENOTSUP;
+}
+
+posix_errno_t efile_get_cwd(ErlNifEnv *env, ERL_NIF_TERM *result) {
+    ErlNifBinary result_bin;
+    size_t bytes_copied;
+
+    if(!enif_alloc_binary(256, &result_bin)) {
+        return ENOMEM;
+    }
+
+    while(getcwd((char*)result_bin.data, result_bin.size) == NULL) {
+        posix_errno_t saved_errno = errno;
+
+        if(saved_errno != ERANGE) {
+            enif_release_binary(&result_bin);
+            return saved_errno;
+        } else {
+            if(!enif_realloc_binary(&result_bin, result_bin.size * 2)) {
+                enif_release_binary(&result_bin);
+                return ENOMEM;
+            }
+        }
+    }
+
+    /* getcwd(2) guarantees null-termination. */
+    bytes_copied = strlen((const char*)result_bin.data);
+
+    if(!enif_realloc_binary(&result_bin, bytes_copied)) {
+        enif_release_binary(&result_bin);
+        return ENOMEM;
+    }
+
+    (*result) = enif_make_binary(env, &result_bin);
+
+    return 0;
+}
+
+posix_errno_t efile_altname(ErlNifEnv *env, const efile_path_t *path, ERL_NIF_TERM *result) {
+    (void)path;
+    (void)result;
+
+    return ENOTSUP;
+}
diff --git a/erts/emulator/nifs/win32/win_prim_file.c b/erts/emulator/nifs/win32/win_prim_file.c
new file mode 100644
index 0000000000..9b79182f2c
--- /dev/null
+++ b/erts/emulator/nifs/win32/win_prim_file.c
@@ -0,0 +1,1428 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson 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.
+ * 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%
+ */
+
+#include "erl_nif.h"
+#include "config.h"
+#include "sys.h"
+
+#include "prim_file_nif.h"
+
+#include <windows.h>
+#include <strsafe.h>
+#include <wchar.h>
+
+#define IS_SLASH(a)  ((a) == L'\\' || (a) == L'/')
+
+#define FILE_SHARE_FLAGS (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE)
+
+#define LP_PREFIX L"\\\\?\\"
+#define LP_PREFIX_SIZE (sizeof(LP_PREFIX) - sizeof(WCHAR))
+#define LP_PREFIX_LENGTH (LP_PREFIX_SIZE / sizeof(WCHAR))
+
+#define PATH_LENGTH(path) (path->size / sizeof(WCHAR) - 1)
+
+#define ASSERT_PATH_FORMAT(path) \
+    do { \
+        ASSERT(PATH_LENGTH(path) >= 4 && \
+            !memcmp(path->data, LP_PREFIX, LP_PREFIX_SIZE)); \
+        ASSERT(PATH_LENGTH(path) == wcslen((WCHAR*)path->data)); \
+    } while(0)
+
+#define TICKS_PER_SECOND (10000000ULL)
+#define EPOCH_DIFFERENCE (11644473600LL)
+
+#define FILETIME_TO_EPOCH(epoch, ft) \
+    do { \
+        ULARGE_INTEGER ull; \
+        ull.LowPart  = (ft).dwLowDateTime; \
+        ull.HighPart = (ft).dwHighDateTime; \
+        (epoch) = ((ull.QuadPart / TICKS_PER_SECOND) - EPOCH_DIFFERENCE); \
+    } while(0)
+
+#define EPOCH_TO_FILETIME(ft, epoch) \
+    do { \
+        ULARGE_INTEGER ull; \
+        ull.QuadPart = (((epoch) + EPOCH_DIFFERENCE) * TICKS_PER_SECOND); \
+        (ft).dwLowDateTime = ull.LowPart; \
+        (ft).dwHighDateTime = ull.HighPart; \
+    } while(0)
+
+typedef struct {
+    efile_data_t common;
+    HANDLE handle;
+} efile_win_t;
+
+static int windows_to_posix_errno(DWORD last_error);
+
+static int has_invalid_null_termination(const ErlNifBinary *path) {
+    const WCHAR *null_pos, *end_pos;
+
+    null_pos = wmemchr((const WCHAR*)path->data, L'\0', path->size);
+    end_pos = (const WCHAR*)&path->data[path->size] - 1;
+
+    if(null_pos == NULL) {
+        return 1;
+    }
+
+    /* prim_file:internal_name2native sometimes feeds us data that is "doubly"
+     * NUL-terminated, so we'll accept any number of trailing NULs so long as
+     * they aren't interrupted by anything else. */
+    while(null_pos < end_pos && (*null_pos) == L'\0') {
+        null_pos++;
+    }
+
+    return null_pos != end_pos;
+}
+
+static posix_errno_t get_full_path(ErlNifEnv *env, WCHAR *input, efile_path_t *result) {
+    DWORD maximum_length, actual_length;
+    int add_long_prefix;
+
+    maximum_length = GetFullPathNameW(input, 0, NULL, NULL);
+    add_long_prefix = 0;
+
+    if(maximum_length == 0) {
+        /* POSIX doesn't have the concept of a "path error" in the same way
+         * Windows does, so we'll return ENOENT since that's what most POSIX
+         * APIs would return if they were fed such garbage. */
+        return ENOENT;
+    }
+
+    maximum_length += LP_PREFIX_LENGTH;
+
+    if(!enif_alloc_binary(maximum_length * sizeof(WCHAR), result)) {
+        return ENOMEM;
+    }
+
+    actual_length = GetFullPathNameW(input, maximum_length, (WCHAR*)result->data, NULL);
+
+    if(actual_length < maximum_length) {
+        int has_long_path_prefix;
+        WCHAR *path_start;
+
+        /* Make sure we have a long-path prefix; GetFullPathNameW only adds one
+         * if the path is relative. */
+        has_long_path_prefix = actual_length >= LP_PREFIX_LENGTH &&
+            !sys_memcmp(result->data, LP_PREFIX, LP_PREFIX_SIZE);
+
+        if(!has_long_path_prefix) {
+            sys_memmove(result->data + LP_PREFIX_SIZE, result->data,
+                (actual_length + 1) * sizeof(WCHAR));
+            sys_memcpy(result->data, LP_PREFIX, LP_PREFIX_SIZE);
+            actual_length += LP_PREFIX_LENGTH;
+        }
+
+        path_start = (WCHAR*)result->data;
+
+        /* We're removing trailing slashes since quite a few APIs refuse to
+         * work with them, and none require them. We only check the last
+         * character since GetFullPathNameW folds slashes together. */
+        if(IS_SLASH(path_start[actual_length - 1])) {
+            if(path_start[actual_length - 2] != L':') {
+                path_start[actual_length - 1] = L'\0';
+                actual_length--;
+            }
+        }
+
+        if(!enif_realloc_binary(result, (actual_length + 1) * sizeof(WCHAR))) {
+            enif_release_binary(result);
+            return ENOMEM;
+        }
+
+        enif_make_binary(env, result);
+        return 0;
+    }
+
+    /* We may end up here if the current directory changes to something longer
+     * between/during GetFullPathName. There's nothing sensible we can do about
+     * this. */
+
+    enif_release_binary(result);
+
+    return EINVAL;
+}
+
+posix_errno_t efile_marshal_path(ErlNifEnv *env, ERL_NIF_TERM path, efile_path_t *result) {
+    ErlNifBinary raw_path;
+
+    if(!enif_inspect_binary(env, path, &raw_path)) {
+        return EINVAL;
+    } else if(raw_path.size % sizeof(WCHAR)) {
+        return EINVAL;
+    }
+
+    if(has_invalid_null_termination(&raw_path)) {
+        return EINVAL;
+    }
+
+    return get_full_path(env, (WCHAR*)raw_path.data, result);
+}
+
+ERL_NIF_TERM efile_get_handle(ErlNifEnv *env, efile_data_t *d) {
+    efile_win_t *w = (efile_win_t*)d;
+
+    ERL_NIF_TERM result;
+    unsigned char *bits;
+
+    bits = enif_make_new_binary(env, sizeof(w->handle), &result);
+    memcpy(bits, &w->handle, sizeof(w->handle));
+
+    return result;
+}
+
+/** @brief Converts a native path to the preferred form in "erlang space,"
+ * without path-prefixes, forward-slashes, or NUL terminators. */
+static int normalize_path_result(ErlNifBinary *path) {
+    WCHAR *path_iterator, *path_start, *path_end;
+    int length;
+
+    path_start = (WCHAR*)path->data;
+    length = wcslen(path_start);
+
+    ASSERT(length < path->size / sizeof(WCHAR));
+
+    /* Get rid of the long-path prefix, if present. */
+    if(length >= LP_PREFIX_LENGTH) {
+        if(!sys_memcmp(path_start, LP_PREFIX, LP_PREFIX_SIZE)) {
+            length -= LP_PREFIX_LENGTH;
+
+            sys_memmove(path_start, &path_start[LP_PREFIX_LENGTH],
+                length * sizeof(WCHAR));
+        }
+    }
+
+    path_end = &path_start[length];
+    path_iterator = path_start;
+
+    /* Convert drive letters to lowercase, if present. */
+    if(length >= 2 && path_start[1] == L':') {
+        WCHAR drive_letter = path_start[0];
+
+        if(drive_letter >= L'A' && drive_letter <= L'Z') {
+            path_start[0] = drive_letter - L'A' + L'a';
+        }
+    }
+
+    while(path_iterator < path_end) {
+        if(*path_iterator == L'\\') {
+            *path_iterator = L'/';
+        }
+
+        path_iterator++;
+    }
+
+    /* Truncate the result to its actual length; we don't want to include the
+     * NUL terminator. */
+    return enif_realloc_binary(path, length * sizeof(WCHAR));
+}
+
+/* @brief Checks whether all the given attributes are set on the object at the
+ * given path. Note that it assumes false on errors. */
+static int has_file_attributes(const efile_path_t *path, DWORD mask) {
+    DWORD attributes = GetFileAttributesW((WCHAR*)path->data);
+
+    if(attributes == INVALID_FILE_ATTRIBUTES) {
+        return 0;
+    }
+
+    return !!((attributes & mask) == mask);
+}
+
+static int is_ignored_name(int name_length, const WCHAR *name) {
+    if(name_length == 1 && name[0] == L'.') {
+        return 1;
+    } else if(name_length == 2 && !sys_memcmp(name, L"..", 2 * sizeof(WCHAR))) {
+        return 1;
+    }
+
+    return 0;
+}
+
+static int get_drive_number(const efile_path_t *path) {
+    const WCHAR *path_start;
+    int length;
+
+    ASSERT_PATH_FORMAT(path);
+
+    path_start = (WCHAR*)path->data + LP_PREFIX_LENGTH;
+    length = PATH_LENGTH(path) - LP_PREFIX_LENGTH;
+
+    if(length >= 2 && path_start[1] == L':') {
+        WCHAR drive_letter = path_start[0];
+
+        if(drive_letter >= L'A' && drive_letter <= L'Z') {
+            return drive_letter - L'A' + 1;
+        } else if(drive_letter >= L'a' && drive_letter <= L'z') {
+            return drive_letter - L'a' + 1;
+        }
+    }
+
+    return -1;
+}
+
+/* @brief Checks whether two *paths* are on the same mount point; they don't
+ * have to refer to existing or accessible files/directories. */
+static int has_same_mount_point(const efile_path_t *path_a, const efile_path_t *path_b) {
+    WCHAR *mount_a, *mount_b;
+    int result = 0;
+
+    mount_a = enif_alloc(path_a->size);
+    mount_b = enif_alloc(path_b->size);
+
+    if(mount_a != NULL && mount_b != NULL) {
+        int length_a, length_b;
+
+        length_a = PATH_LENGTH(path_a);
+        length_b = PATH_LENGTH(path_b);
+
+        if(GetVolumePathNameW((WCHAR*)path_a->data, mount_a, length_a)) {
+            ASSERT(wcslen(mount_a) <= length_a);
+
+            if(GetVolumePathNameW((WCHAR*)path_b->data, mount_b, length_b)) {
+                ASSERT(wcslen(mount_b) <= length_b);
+
+                result = !_wcsicmp(mount_a, mount_b);
+            }
+        }
+    }
+
+    if(mount_b != NULL) {
+        enif_free(mount_b);
+    }
+
+    if(mount_a != NULL) {
+        enif_free(mount_a);
+    }
+
+    return result;
+}
+
+/* Mirrors the PathIsRootW function of the shell API, but doesn't choke on
+ * paths longer than MAX_PATH. */
+static int is_path_root(const efile_path_t *path) {
+    const WCHAR *path_start, *path_end;
+    int length;
+
+    ASSERT_PATH_FORMAT(path);
+
+    path_start = (WCHAR*)path->data + LP_PREFIX_LENGTH;
+    length = PATH_LENGTH(path) - LP_PREFIX_LENGTH;
+
+    path_end = &path_start[length];
+
+    if(length == 1) {
+        /* A single \ refers to the root of the current working directory. */
+        return IS_SLASH(path_start[0]);
+    } else if(length == 3 && iswalpha(path_start[0]) && path_start[1] == L':') {
+        /* Drive letter. */
+        return IS_SLASH(path_start[2]);
+    } else if(length >= 4) {
+        /* Check whether we're a UNC root, eg. \\server, \\server\share */
+        const WCHAR *path_iterator;
+
+        if(!IS_SLASH(path_start[0]) || !IS_SLASH(path_start[1])) {
+            return 0;
+        }
+
+        path_iterator = path_start + 2;
+
+        /* Slide to the slash between the server and share names, if present. */
+        while(path_iterator < path_end && !IS_SLASH(*path_iterator)) {
+            path_iterator++;
+        }
+
+        /* Slide past the end of the string, stopping at the first slash we
+         * encounter. */
+        do {
+            path_iterator++;
+        }  while(path_iterator < path_end && !IS_SLASH(*path_iterator));
+
+        /* If we're past the end of the string and it didnt't end with a slash,
+         * then we're a root path. */
+        return path_iterator >= path_end && !IS_SLASH(path_start[length - 1]);
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_open(const efile_path_t *path, enum efile_modes_t modes,
+        ErlNifResourceType *nif_type, efile_data_t **d) {
+
+    DWORD attributes, access_flags, open_mode;
+    HANDLE handle;
+
+    ASSERT_PATH_FORMAT(path);
+
+    access_flags = 0;
+    open_mode = 0;
+
+    if(modes & EFILE_MODE_READ && !(modes & EFILE_MODE_WRITE)) {
+        access_flags = GENERIC_READ;
+        open_mode = OPEN_EXISTING;
+    } else if(modes & EFILE_MODE_WRITE && !(modes & EFILE_MODE_READ)) {
+        access_flags = GENERIC_WRITE;
+        open_mode = CREATE_ALWAYS;
+    } else if(modes & EFILE_MODE_READ_WRITE) {
+        access_flags = GENERIC_READ | GENERIC_WRITE;
+        open_mode = OPEN_ALWAYS;
+    } else {
+        return EINVAL;
+    }
+
+    if(modes & EFILE_MODE_APPEND) {
+        access_flags |= FILE_APPEND_DATA;
+        open_mode = OPEN_ALWAYS;
+    }
+
+    if(modes & EFILE_MODE_EXCLUSIVE) {
+        open_mode = CREATE_NEW;
+    }
+
+    if(modes & EFILE_MODE_SYNC) {
+        attributes = FILE_FLAG_WRITE_THROUGH;
+    } else {
+        attributes = FILE_ATTRIBUTE_NORMAL;
+    }
+
+    handle = CreateFileW((WCHAR*)path->data, access_flags,
+        FILE_SHARE_FLAGS, NULL, open_mode, attributes, NULL);
+
+    if(handle != INVALID_HANDLE_VALUE) {
+        efile_win_t *w;
+
+        w = (efile_win_t*)enif_alloc_resource(nif_type, sizeof(efile_win_t));
+        w->handle = handle;
+
+        EFILE_INIT_RESOURCE(&w->common, modes);
+        (*d) = &w->common;
+
+        return 0;
+    } else {
+        DWORD last_error = GetLastError();
+
+        /* Rewrite all failures on directories to EISDIR to match the old
+         * driver. */
+        if(has_file_attributes(path, FILE_ATTRIBUTE_DIRECTORY)) {
+            return EISDIR;
+        }
+
+        return windows_to_posix_errno(last_error);
+    }
+}
+
+int efile_close(efile_data_t *d) {
+    efile_win_t *w = (efile_win_t*)d;
+    HANDLE handle;
+
+    ASSERT(erts_atomic32_read_nob(&d->state) == EFILE_STATE_CLOSED);
+    ASSERT(w->handle != INVALID_HANDLE_VALUE);
+
+    handle = w->handle;
+    w->handle = INVALID_HANDLE_VALUE;
+
+    if(!CloseHandle(handle)) {
+        w->common.posix_errno = windows_to_posix_errno(GetLastError());
+        return 0;
+    }
+
+    return 1;
+}
+
+static void shift_overlapped(OVERLAPPED *overlapped, DWORD shift) {
+    LARGE_INTEGER offset;
+
+    ASSERT(shift >= 0);
+
+    offset.HighPart = overlapped->OffsetHigh;
+    offset.LowPart = overlapped->Offset;
+
+    /* ~(Uint64)0 is a magic value ("append to end of file") which needs to be
+     * preserved. Other positions resulting in overflow would have errored out
+     * just prior to this point. */
+    if(offset.QuadPart != ERTS_UINT64_MAX) {
+        offset.QuadPart += shift;
+    }
+
+    /* All unused fields must be zeroed for the next call. */
+    sys_memset(overlapped, 0, sizeof(*overlapped));
+    overlapped->OffsetHigh = offset.HighPart;
+    overlapped->Offset = offset.LowPart;
+}
+
+static void shift_iov(SysIOVec **iov, int *iovlen, DWORD shift) {
+    SysIOVec *head_vec = (*iov);
+
+    ASSERT(shift >= 0);
+
+    while(shift > 0) {
+        ASSERT(head_vec < &(*iov)[*iovlen]);
+
+        if(shift < head_vec->iov_len) {
+            head_vec->iov_base = (char*)head_vec->iov_base + shift;
+            head_vec->iov_len -= shift;
+            break;
+        } else {
+            shift -= head_vec->iov_len;
+            head_vec++;
+        }
+    }
+
+    (*iovlen) -= head_vec - (*iov);
+    (*iov) = head_vec;
+}
+
+typedef BOOL (WINAPI *io_op_t)(HANDLE, LPVOID, DWORD, LPDWORD, LPOVERLAPPED);
+
+static Sint64 internal_sync_io(efile_win_t *w, io_op_t operation,
+        SysIOVec *iov, int iovlen, OVERLAPPED *overlapped) {
+
+    Sint64 bytes_processed = 0;
+
+    for(;;) {
+        DWORD block_bytes_processed, last_error;
+        BOOL succeeded;
+
+        if(iovlen < 1) {
+            return bytes_processed;
+        }
+
+        succeeded = operation(w->handle, iov->iov_base, iov->iov_len,
+            &block_bytes_processed, overlapped);
+        last_error = GetLastError();
+
+        if(!succeeded && (last_error != ERROR_HANDLE_EOF)) {
+            w->common.posix_errno = windows_to_posix_errno(last_error);
+            return -1;
+        } else if(block_bytes_processed == 0) {
+            /* EOF */
+            return bytes_processed;
+        }
+
+        if(overlapped != NULL) {
+            shift_overlapped(overlapped, block_bytes_processed);
+        }
+
+        shift_iov(&iov, &iovlen, block_bytes_processed);
+
+        bytes_processed += block_bytes_processed;
+    }
+}
+
+Sint64 efile_readv(efile_data_t *d, SysIOVec *iov, int iovlen) {
+    efile_win_t *w = (efile_win_t*)d;
+
+    return internal_sync_io(w, ReadFile, iov, iovlen, NULL);
+}
+
+Sint64 efile_writev(efile_data_t *d, SysIOVec *iov, int iovlen) {
+    efile_win_t *w = (efile_win_t*)d;
+
+    OVERLAPPED __overlapped, *overlapped;
+    Uint64 bytes_written;
+
+    if(w->common.modes & EFILE_MODE_APPEND) {
+        overlapped = &__overlapped;
+
+        sys_memset(overlapped, 0, sizeof(*overlapped));
+        overlapped->OffsetHigh = 0xFFFFFFFF;
+        overlapped->Offset = 0xFFFFFFFF;
+    } else {
+        overlapped = NULL;
+    }
+
+    return internal_sync_io(w, WriteFile, iov, iovlen, overlapped);
+}
+
+Sint64 efile_preadv(efile_data_t *d, Sint64 offset, SysIOVec *iov, int iovlen) {
+    efile_win_t *w = (efile_win_t*)d;
+
+    OVERLAPPED overlapped;
+
+    sys_memset(&overlapped, 0, sizeof(overlapped));
+    overlapped.OffsetHigh = (offset >> 32) & 0xFFFFFFFF;
+    overlapped.Offset = offset & 0xFFFFFFFF;
+
+    return internal_sync_io(w, ReadFile, iov, iovlen, &overlapped);
+}
+
+Sint64 efile_pwritev(efile_data_t *d, Sint64 offset, SysIOVec *iov, int iovlen) {
+    efile_win_t *w = (efile_win_t*)d;
+
+    OVERLAPPED overlapped;
+
+    sys_memset(&overlapped, 0, sizeof(overlapped));
+    overlapped.OffsetHigh = (offset >> 32) & 0xFFFFFFFF;
+    overlapped.Offset = offset & 0xFFFFFFFF;
+
+    return internal_sync_io(w, WriteFile, iov, iovlen, &overlapped);
+}
+
+int efile_seek(efile_data_t *d, enum efile_seek_t seek, Sint64 offset, Sint64 *new_position) {
+    efile_win_t *w = (efile_win_t*)d;
+
+    LARGE_INTEGER large_offset, large_new_position;
+    DWORD whence;
+
+    switch(seek) {
+        case EFILE_SEEK_BOF: whence = FILE_BEGIN; break;
+        case EFILE_SEEK_CUR: whence = FILE_CURRENT; break;
+        case EFILE_SEEK_EOF: whence = FILE_END; break;
+        default: ERTS_INTERNAL_ERROR("Invalid seek parameter");
+    }
+
+    large_offset.QuadPart = offset;
+
+    if(!SetFilePointerEx(w->handle, large_offset, &large_new_position, whence)) {
+        w->common.posix_errno = windows_to_posix_errno(GetLastError());
+        return 0;
+    }
+
+    (*new_position) = large_new_position.QuadPart;
+
+    return 1;
+}
+
+int efile_sync(efile_data_t *d, int data_only) {
+    efile_win_t *w = (efile_win_t*)d;
+
+    /* Windows doesn't support data-only syncing. */
+    (void)data_only;
+
+    if(!FlushFileBuffers(w->handle)) {
+        w->common.posix_errno = windows_to_posix_errno(GetLastError());
+        return 0;
+    }
+
+    return 1;
+}
+
+int efile_advise(efile_data_t *d, Sint64 offset, Sint64 length, enum efile_advise_t advise) {
+    /* Windows doesn't support this, but we'll pretend it does since the call
+     * is only a recommendation even on systems that do support it. */
+
+    (void)d;
+    (void)offset;
+    (void)length;
+    (void)advise;
+
+    return 1;
+}
+
+int efile_allocate(efile_data_t *d, Sint64 offset, Sint64 length) {
+    efile_win_t *w = (efile_win_t*)d;
+
+    (void)d;
+    (void)offset;
+    (void)length;
+
+    w->common.posix_errno = ENOTSUP;
+
+    return 0;
+}
+
+int efile_truncate(efile_data_t *d) {
+    efile_win_t *w = (efile_win_t*)d;
+
+    if(!SetEndOfFile(w->handle)) {
+        w->common.posix_errno = windows_to_posix_errno(GetLastError());
+        return 0;
+    }
+
+    return 1;
+}
+
+static int is_executable_file(const efile_path_t *path) {
+    /* We're using the file extension in order to be quirks-compliant with the
+     * old driver, which never bothered to check the actual permissions. We
+     * could easily do so now (cf. GetNamedSecurityInfo) but the execute
+     * permission is only relevant for files that are started with the default
+     * loader, and batch files run just fine with read permission alone. */
+
+    int length = PATH_LENGTH(path);
+
+    if(length >= 4) {
+        const WCHAR *last_four = &((WCHAR*)path->data)[length - 4];
+
+        if (!_wcsicmp(last_four, L".exe") ||
+            !_wcsicmp(last_four, L".cmd") ||
+            !_wcsicmp(last_four, L".bat") ||
+            !_wcsicmp(last_four, L".com")) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_read_info(const efile_path_t *path, int follow_links, efile_fileinfo_t *result) {
+    BY_HANDLE_FILE_INFORMATION native_file_info;
+    DWORD attributes;
+
+    sys_memset(&native_file_info, 0, sizeof(native_file_info));
+
+    attributes = GetFileAttributesW((WCHAR*)path->data);
+
+    if(attributes == INVALID_FILE_ATTRIBUTES) {
+        DWORD last_error = GetLastError();
+
+        /* Querying a network share root fails with ERROR_BAD_NETPATH, so we'll
+         * fake it as a directory just like local roots. */
+        if(!is_path_root(path) || last_error != ERROR_BAD_NETPATH) {
+            return windows_to_posix_errno(last_error);
+        }
+
+        attributes = FILE_ATTRIBUTE_DIRECTORY;
+    } else if(is_path_root(path)) {
+        /* Local (or mounted) roots can be queried with GetFileAttributesW but
+         * lack support for GetFileInformationByHandle, so we'll skip that
+         * part. */
+    } else {
+        HANDLE handle;
+
+        if(follow_links && (attributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
+            posix_errno_t posix_errno;
+            efile_path_t resolved_path;
+
+            posix_errno = internal_read_link(path, &resolved_path);
+
+            if(posix_errno != 0) {
+                return posix_errno;
+            }
+
+            return efile_read_info(&resolved_path, 0, result);
+        }
+
+        handle = CreateFileW((const WCHAR*)path->data, GENERIC_READ,
+            FILE_SHARE_FLAGS, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS,
+            NULL);
+
+        /* The old driver never cared whether this succeeded. */
+        if(handle != INVALID_HANDLE_VALUE) {
+            GetFileInformationByHandle(handle, &native_file_info);
+            CloseHandle(handle);
+        }
+
+        FILETIME_TO_EPOCH(result->m_time, native_file_info.ftLastWriteTime);
+        FILETIME_TO_EPOCH(result->a_time, native_file_info.ftLastAccessTime);
+        FILETIME_TO_EPOCH(result->c_time, native_file_info.ftCreationTime);
+
+        if(result->m_time == -EPOCH_DIFFERENCE) {
+            /* Default to 1970 just like the old driver. */
+            result->m_time = 0;
+        }
+
+        if(result->a_time == -EPOCH_DIFFERENCE) {
+            result->a_time = result->m_time;
+        }
+
+        if(result->c_time == -EPOCH_DIFFERENCE) {
+            result->c_time = result->m_time;
+        }
+    }
+
+    if(attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+        result->type = EFILE_FILETYPE_SYMLINK;
+        /* This should be _S_IFLNK, but the old driver always set
+         * non-directories to _S_IFREG. */
+        result->mode |= _S_IFREG;
+    } else if(attributes & FILE_ATTRIBUTE_DIRECTORY) {
+        result->type = EFILE_FILETYPE_DIRECTORY;
+        result->mode |= _S_IFDIR | _S_IEXEC;
+    } else {
+        if(is_executable_file(path)) {
+            result->mode |= _S_IEXEC;
+        }
+
+        result->type = EFILE_FILETYPE_REGULAR;
+        result->mode |= _S_IFREG;
+    }
+
+    if(!(attributes & FILE_ATTRIBUTE_READONLY)) {
+        result->access = EFILE_ACCESS_READ | EFILE_ACCESS_WRITE;
+        result->mode |= _S_IREAD | _S_IWRITE;
+    } else {
+        result->access = EFILE_ACCESS_READ;
+        result->mode |= _S_IREAD;
+    }
+
+    /* Propagate user mode-bits to group/other fields */
+    result->mode |= (result->mode & 0700) >> 3;
+    result->mode |= (result->mode & 0700) >> 6;
+
+    result->size =
+        ((Uint64)native_file_info.nFileSizeHigh << 32ull) |
+        (Uint64)native_file_info.nFileSizeLow;
+
+    result->links = MAX(1, native_file_info.nNumberOfLinks);
+
+    result->major_device = get_drive_number(path);
+    result->minor_device = 0;
+    result->inode = 0;
+    result->uid = 0;
+    result->gid = 0;
+
+    return 0;
+}
+
+posix_errno_t efile_set_permissions(const efile_path_t *path, Uint32 permissions) {
+    DWORD attributes = GetFileAttributesW((WCHAR*)path->data);
+
+    if(attributes == INVALID_FILE_ATTRIBUTES) {
+        return windows_to_posix_errno(GetLastError());
+    }
+
+    if(permissions & _S_IWRITE) {
+        attributes &= ~FILE_ATTRIBUTE_READONLY;
+    } else {
+        attributes |= FILE_ATTRIBUTE_READONLY;
+    }
+
+    if(SetFileAttributesW((WCHAR*)path->data, attributes)) {
+        return 0;
+    }
+
+    return windows_to_posix_errno(GetLastError());
+}
+
+posix_errno_t efile_set_owner(const efile_path_t *path, Uint32 owner, Uint32 group) {
+    (void)path;
+    (void)owner;
+    (void)group;
+
+    return 0;
+}
+
+posix_errno_t efile_set_time(const efile_path_t *path, Sint64 a_time, Sint64 m_time, Sint64 c_time) {
+    FILETIME accessed, modified, created;
+    DWORD last_error, attributes;
+    HANDLE handle;
+
+    attributes = GetFileAttributesW((WCHAR*)path->data);
+
+    if(attributes == INVALID_FILE_ATTRIBUTES) {
+        return windows_to_posix_errno(GetLastError());
+    }
+
+    /* If the file is read-only, we have to make it temporarily writable while
+     * setting new metadata. */
+    if(attributes & FILE_ATTRIBUTE_READONLY) {
+        DWORD without_readonly = attributes & ~FILE_ATTRIBUTE_READONLY;
+
+        if(!SetFileAttributesW((WCHAR*)path->data, without_readonly)) {
+            return windows_to_posix_errno(GetLastError());
+        }
+    }
+
+    EPOCH_TO_FILETIME(modified, m_time);
+    EPOCH_TO_FILETIME(accessed, a_time);
+    EPOCH_TO_FILETIME(created, c_time);
+
+    handle = CreateFileW((WCHAR*)path->data, GENERIC_READ | GENERIC_WRITE,
+        FILE_SHARE_FLAGS, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+    last_error = GetLastError();
+
+    if(handle != INVALID_HANDLE_VALUE) {
+        if(SetFileTime(handle, &created, &accessed, &modified)) {
+            last_error = ERROR_SUCCESS;
+        } else {
+            last_error = GetLastError();
+        }
+
+        CloseHandle(handle);
+    }
+
+    if(attributes & FILE_ATTRIBUTE_READONLY) {
+        SetFileAttributesW((WCHAR*)path->data, attributes);
+    }
+
+    return windows_to_posix_errno(last_error);
+}
+
+static posix_errno_t internal_read_link(const efile_path_t *path, efile_path_t *result) {
+    DWORD required_length, actual_length;
+    HANDLE link_handle;
+    DWORD last_error;
+
+    link_handle = CreateFileW((WCHAR*)path->data, GENERIC_READ,
+        FILE_SHARE_FLAGS, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+    last_error = GetLastError();
+
+    if(link_handle == INVALID_HANDLE_VALUE) {
+        return windows_to_posix_errno(last_error);
+    }
+
+    required_length = GetFinalPathNameByHandleW(link_handle, NULL, 0, 0);
+    last_error = GetLastError();
+
+    if(required_length <= 0) {
+        CloseHandle(link_handle);
+        return windows_to_posix_errno(last_error);
+    }
+
+    /* Unlike many other path functions (eg. GetFullPathNameW), this one
+     * includes the NUL terminator in its required length. */
+    if(!enif_alloc_binary(required_length * sizeof(WCHAR), result)) {
+        CloseHandle(link_handle);
+        return ENOMEM;
+    }
+
+    actual_length = GetFinalPathNameByHandleW(link_handle,
+        (WCHAR*)result->data, required_length, 0);
+    last_error = GetLastError();
+
+    CloseHandle(link_handle);
+
+    if(actual_length == 0 || actual_length >= required_length) {
+        enif_release_binary(result);
+        return windows_to_posix_errno(last_error);
+    }
+
+    /* GetFinalPathNameByHandle always prepends with "\\?\" and NUL-terminates,
+     * so we never have to touch-up the resulting path. */
+
+    ASSERT_PATH_FORMAT(result);
+
+    return 0;
+}
+
+posix_errno_t efile_read_link(ErlNifEnv *env, const efile_path_t *path, ERL_NIF_TERM *result) {
+    posix_errno_t posix_errno;
+    ErlNifBinary result_bin;
+    DWORD attributes;
+
+    ASSERT_PATH_FORMAT(path);
+
+    attributes = GetFileAttributesW((WCHAR*)path->data);
+
+    if(attributes == INVALID_FILE_ATTRIBUTES) {
+        return windows_to_posix_errno(GetLastError());
+    } else if(!(attributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
+        return EINVAL;
+    }
+
+    posix_errno = internal_read_link(path, &result_bin);
+
+    if(posix_errno == 0) {
+        if(!normalize_path_result(&result_bin)) {
+            enif_release_binary(&result_bin);
+            return ENOMEM;
+        }
+
+        (*result) = enif_make_binary(env, &result_bin);
+    }
+
+    return posix_errno;
+}
+
+posix_errno_t efile_list_dir(ErlNifEnv *env, const efile_path_t *path, ERL_NIF_TERM *result) {
+    ERL_NIF_TERM list_head;
+    WIN32_FIND_DATAW data;
+    HANDLE search_handle;
+    WCHAR *search_path;
+    DWORD last_error;
+
+    ASSERT_PATH_FORMAT(path);
+
+    search_path = enif_alloc(path->size + 2 * sizeof(WCHAR));
+
+    if(search_path == NULL) {
+        return ENOMEM;
+    }
+
+    sys_memcpy(search_path, path->data, path->size);
+    search_path[PATH_LENGTH(path) + 0] = L'\\';
+    search_path[PATH_LENGTH(path) + 1] = L'*';
+    search_path[PATH_LENGTH(path) + 2] = L'\0';
+
+    search_handle = FindFirstFileW(search_path, &data);
+    last_error = GetLastError();
+
+    enif_free(search_path);
+
+    if(search_handle == INVALID_HANDLE_VALUE) {
+        return windows_to_posix_errno(last_error);
+    }
+
+    list_head = enif_make_list(env, 0);
+
+    do {
+        int name_length = wcslen(data.cFileName);
+
+        if(!is_ignored_name(name_length, data.cFileName)) {
+            unsigned char *name_bytes;
+            ERL_NIF_TERM name_term;
+            size_t name_size;
+
+            name_size = name_length * sizeof(WCHAR);
+
+            name_bytes = enif_make_new_binary(env, name_size, &name_term);
+            sys_memcpy(name_bytes, data.cFileName, name_size);
+
+            list_head = enif_make_list_cell(env, name_term, list_head);
+        }
+    } while(FindNextFileW(search_handle, &data));
+
+    FindClose(search_handle);
+    (*result) = list_head;
+
+    return 0;
+}
+
+posix_errno_t efile_rename(const efile_path_t *old_path, const efile_path_t *new_path) {
+    BOOL old_is_directory, new_is_directory;
+    DWORD move_flags, last_error;
+
+    ASSERT_PATH_FORMAT(old_path);
+    ASSERT_PATH_FORMAT(new_path);
+
+    move_flags = MOVEFILE_COPY_ALLOWED | MOVEFILE_WRITE_THROUGH;
+
+    if(MoveFileExW((WCHAR*)old_path->data, (WCHAR*)new_path->data, move_flags)) {
+        return 0;
+    }
+
+    last_error = GetLastError();
+
+    old_is_directory = has_file_attributes(old_path, FILE_ATTRIBUTE_DIRECTORY);
+    new_is_directory = has_file_attributes(new_path, FILE_ATTRIBUTE_DIRECTORY);
+
+    switch(last_error) {
+    case ERROR_SHARING_VIOLATION:
+    case ERROR_ACCESS_DENIED:
+        if(old_is_directory) {
+            BOOL moved_into_itself;
+
+            moved_into_itself = (old_path->size <= new_path->size) &&
+                !_wcsnicmp((WCHAR*)old_path->data, (WCHAR*)new_path->data,
+                    PATH_LENGTH(old_path));
+
+            if(moved_into_itself) {
+                return EINVAL;
+            } else if(is_path_root(old_path)) {
+                return EINVAL;
+            }
+
+            /* Renaming a directory across volumes needs to be rewritten as
+             * EXDEV so that the caller can respond by simulating it with
+             * copy/delete operations.
+             *
+             * Files are handled through MOVEFILE_COPY_ALLOWED. */
+            if(!has_same_mount_point(old_path, new_path)) {
+                return EXDEV;
+            }
+        }
+        break;
+    case ERROR_PATH_NOT_FOUND:
+    case ERROR_FILE_NOT_FOUND:
+        return ENOENT;
+    case ERROR_ALREADY_EXISTS:
+    case ERROR_FILE_EXISTS:
+        if(old_is_directory && !new_is_directory) {
+            return ENOTDIR;
+        } else if(!old_is_directory && new_is_directory) {
+            return EISDIR;
+        } else if(old_is_directory && new_is_directory) {
+            /* This will fail if the destination isn't empty. */
+            if(RemoveDirectoryW((WCHAR*)new_path->data)) {
+                return efile_rename(old_path, new_path);
+            }
+
+            return EEXIST;
+        } else if(!old_is_directory && !new_is_directory) {
+            /* This is pretty iffy; the public documentation says that the
+             * operation may EACCES on some systems when either file is open,
+             * which gives us room to use MOVEFILE_REPLACE_EXISTING and be done
+             * with it, but the old implementation simulated Unix semantics and
+             * there's a lot of code that relies on that.
+             *
+             * The simulation renames the destination to a scratch name to get
+             * around the fact that it's impossible to open (and by extension
+             * rename) a file that's been deleted while open. It has a few
+             * drawbacks though;
+             *
+             * 1) It's not atomic as there's a small window where there's no
+             *    file at all on the destination path.
+             * 2) It will confuse applications that subscribe to folder
+             *    changes.
+             * 3) It will fail if we lack general permission to write in the
+             *    same folder. */
+
+            WCHAR *swap_path = enif_alloc(new_path->size + sizeof(WCHAR) * 64);
+
+            if(swap_path == NULL) {
+                return ENOMEM;
+            } else {
+                static LONGLONG unique_counter = 0;
+                WCHAR *swap_path_end;
+
+                /* We swap in the same folder as the destination to be
+                 * reasonably sure that it's on the same volume. Note that
+                 * we're avoiding GetTempFileNameW as it will fail on long
+                 * paths. */
+
+                sys_memcpy(swap_path, (WCHAR*)new_path->data, new_path->size);
+                swap_path_end = swap_path + PATH_LENGTH(new_path);
+
+                while(!IS_SLASH(*swap_path_end)) {
+                    ASSERT(swap_path_end > swap_path);
+                    swap_path_end--;
+                }
+
+                StringCchPrintfW(&swap_path_end[1], 64, L"erl-%lx-%llx.tmp",
+                    GetCurrentProcessId(), unique_counter);
+                InterlockedIncrement64(&unique_counter);
+            }
+
+            if(MoveFileExW((WCHAR*)new_path->data, swap_path, MOVEFILE_REPLACE_EXISTING)) {
+                if(MoveFileExW((WCHAR*)old_path->data, (WCHAR*)new_path->data, move_flags)) {
+                    last_error = ERROR_SUCCESS;
+                    DeleteFileW(swap_path);
+                } else {
+                    last_error = GetLastError();
+                    MoveFileW(swap_path, (WCHAR*)new_path->data);
+                }
+            } else {
+                last_error = GetLastError();
+                DeleteFileW(swap_path);
+            }
+
+            enif_free(swap_path);
+
+            return windows_to_posix_errno(last_error);
+        }
+
+        return EEXIST;
+    }
+
+    return windows_to_posix_errno(last_error);
+}
+
+posix_errno_t efile_make_hard_link(const efile_path_t *existing_path, const efile_path_t *new_path) {
+    ASSERT_PATH_FORMAT(existing_path);
+    ASSERT_PATH_FORMAT(new_path);
+
+    if(!CreateHardLinkW((WCHAR*)new_path->data, (WCHAR*)existing_path->data, NULL)) {
+        return windows_to_posix_errno(GetLastError());
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_make_soft_link(const efile_path_t *existing_path, const efile_path_t *new_path) {
+    DWORD link_flags;
+
+    ASSERT_PATH_FORMAT(existing_path);
+    ASSERT_PATH_FORMAT(new_path);
+
+    if(has_file_attributes(existing_path, FILE_ATTRIBUTE_DIRECTORY)) {
+        link_flags = SYMBOLIC_LINK_FLAG_DIRECTORY;
+    } else {
+        link_flags = 0;
+    }
+
+    if(!CreateSymbolicLinkW((WCHAR*)new_path->data, (WCHAR*)existing_path->data, link_flags)) {
+        return windows_to_posix_errno(GetLastError());
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_make_dir(const efile_path_t *path) {
+    ASSERT_PATH_FORMAT(path);
+
+    if(!CreateDirectoryW((WCHAR*)path->data, NULL)) {
+        return windows_to_posix_errno(GetLastError());
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_del_file(const efile_path_t *path) {
+    ASSERT_PATH_FORMAT(path);
+
+    if(!DeleteFileW((WCHAR*)path->data)) {
+        DWORD last_error = GetLastError();
+
+        switch(last_error) {
+        case ERROR_INVALID_NAME:
+            /* Attempted to delete a device or similar. */
+            return EACCES;
+        case ERROR_ACCESS_DENIED:
+            /* Windows NT reports removing a directory as EACCES instead of
+             * EPERM. */
+            if(has_file_attributes(path, FILE_ATTRIBUTE_DIRECTORY)) {
+                return EPERM;
+            }
+            break;
+        }
+
+        return windows_to_posix_errno(last_error);
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_del_dir(const efile_path_t *path) {
+    ASSERT_PATH_FORMAT(path);
+
+    if(!RemoveDirectoryW((WCHAR*)path->data)) {
+        DWORD last_error = GetLastError();
+
+        if(last_error == ERROR_DIRECTORY) {
+            return ENOTDIR;
+        }
+
+        return windows_to_posix_errno(last_error);
+    }
+
+    return 0;
+}
+
+posix_errno_t efile_set_cwd(const efile_path_t *path) {
+    const WCHAR *path_start;
+
+    ASSERT_PATH_FORMAT(path);
+
+    /* We have to use _wchdir since that's the only function that updates the
+     * per-drive working directory, but it naively assumes that all paths
+     * starting with \\ are UNC paths, so we have to skip the \\?\-prefix. */
+    path_start = (WCHAR*)path->data + LP_PREFIX_LENGTH;
+
+    if(_wchdir(path_start)) {
+        return windows_to_posix_errno(GetLastError());
+    }
+
+    return 0;
+}
+
+static int is_valid_drive(int device_index) {
+    WCHAR drive_path[4] = {L'?', L':', L'\\', L'\0'};
+
+    if(device_index == 0) {
+        /* Default drive; always valid. */
+        return 1;
+    } else if(device_index > (L'Z' - L'A' + 1)) {
+        return 0;
+    }
+
+    drive_path[0] = device_index + L'A' - 1;
+
+    switch(GetDriveTypeW(drive_path)) {
+    case DRIVE_NO_ROOT_DIR:
+    case DRIVE_UNKNOWN:
+        return 0;
+    }
+
+    return 1;
+}
+
+posix_errno_t efile_get_device_cwd(ErlNifEnv *env, int device_index, ERL_NIF_TERM *result) {
+    ErlNifBinary result_bin;
+
+    /* _wgetdcwd might crash the entire emulator on debug builds since the CRT
+     * invalid parameter handler asserts if passed a non-existent drive (Or
+     * simply one that has been unmounted), so we check it ourselves to avoid
+     * that. */
+    if(!is_valid_drive(device_index)) {
+        return EACCES;
+    }
+
+    if(!enif_alloc_binary(MAX_PATH * sizeof(WCHAR), &result_bin)) {
+        return ENOMEM;
+    }
+
+    if(_wgetdcwd(device_index, (WCHAR*)result_bin.data, MAX_PATH) == NULL) {
+        enif_release_binary(&result_bin);
+        return EACCES;
+    }
+
+    if(!normalize_path_result(&result_bin)) {
+        enif_release_binary(&result_bin);
+        return ENOMEM;
+    }
+
+    (*result) = enif_make_binary(env, &result_bin);
+
+    return 0;
+}
+
+posix_errno_t efile_get_cwd(ErlNifEnv *env, ERL_NIF_TERM *result) {
+    return efile_get_device_cwd(env, 0, result);
+}
+
+posix_errno_t efile_altname(ErlNifEnv *env, const efile_path_t *path, ERL_NIF_TERM *result) {
+    ErlNifBinary result_bin;
+
+    ASSERT_PATH_FORMAT(path);
+
+    if(is_path_root(path)) {
+        /* Root paths can't be queried so we'll just return them as they are. */
+        if(!enif_alloc_binary(path->size, &result_bin)) {
+            return ENOMEM;
+        }
+
+        sys_memcpy(result_bin.data, path->data, path->size);
+    } else {
+        WIN32_FIND_DATAW data;
+        HANDLE handle;
+
+        WCHAR *name_buffer;
+        int name_length;
+
+        /* Reject path wildcards. */
+        if(wcspbrk(&((const WCHAR*)path->data)[4], L"?*")) {
+            return ENOENT;
+        }
+
+        handle = FindFirstFileW((const WCHAR*)path->data, &data);
+
+        if(handle == INVALID_HANDLE_VALUE) {
+            return windows_to_posix_errno(GetLastError());
+        }
+
+        FindClose(handle);
+
+        name_length = wcslen(data.cAlternateFileName);
+
+        if(name_length > 0) {
+            name_buffer = data.cAlternateFileName;
+        } else {
+            name_length = wcslen(data.cFileName);
+            name_buffer = data.cFileName;
+        }
+
+        /* Include NUL-terminator; it will be removed after normalization. */
+        name_length += 1;
+
+        if(!enif_alloc_binary(name_length * sizeof(WCHAR), &result_bin)) {
+            return ENOMEM;
+        }
+
+        sys_memcpy(result_bin.data, name_buffer, name_length * sizeof(WCHAR));
+    }
+
+    if(!normalize_path_result(&result_bin)) {
+        enif_release_binary(&result_bin);
+        return ENOMEM;
+    }
+
+    (*result) = enif_make_binary(env, &result_bin);
+
+    return 0;
+}
+
+static int windows_to_posix_errno(DWORD last_error) {
+    switch(last_error) {
+    case ERROR_SUCCESS:
+        return 0;
+    case ERROR_INVALID_FUNCTION:
+    case ERROR_INVALID_DATA:
+    case ERROR_INVALID_PARAMETER:
+    case ERROR_INVALID_TARGET_HANDLE:
+    case ERROR_INVALID_CATEGORY:
+    case ERROR_NEGATIVE_SEEK:
+        return EINVAL;
+    case ERROR_DIR_NOT_EMPTY:
+        return EEXIST;
+    case ERROR_BAD_FORMAT:
+        return ENOEXEC;
+    case ERROR_PATH_NOT_FOUND:
+    case ERROR_FILE_NOT_FOUND:
+    case ERROR_NO_MORE_FILES:
+    case ERROR_INVALID_NAME:
+        return ENOENT;
+    case ERROR_TOO_MANY_OPEN_FILES:
+        return EMFILE;
+    case ERROR_ACCESS_DENIED:
+    case ERROR_INVALID_ACCESS:
+    case ERROR_CURRENT_DIRECTORY:
+    case ERROR_SHARING_VIOLATION:
+    case ERROR_LOCK_VIOLATION:
+    case ERROR_INVALID_PASSWORD:
+    case ERROR_DRIVE_LOCKED:
+        return EACCES;
+    case ERROR_INVALID_HANDLE:
+        return EBADF;
+    case ERROR_NOT_ENOUGH_MEMORY:
+    case ERROR_OUTOFMEMORY:
+    case ERROR_OUT_OF_STRUCTURES:
+        return ENOMEM;
+    case ERROR_INVALID_DRIVE:
+    case ERROR_BAD_UNIT:
+    case ERROR_NOT_READY:
+    case ERROR_REM_NOT_LIST:
+    case ERROR_DUP_NAME:
+    case ERROR_BAD_NETPATH:
+    case ERROR_NETWORK_BUSY:
+    case ERROR_DEV_NOT_EXIST:
+    case ERROR_BAD_NET_NAME:
+        return ENXIO;
+    case ERROR_NOT_SAME_DEVICE:
+        return EXDEV;
+    case ERROR_WRITE_PROTECT:
+        return EROFS;
+    case ERROR_BAD_LENGTH:
+    case ERROR_BUFFER_OVERFLOW:
+        return E2BIG;
+    case ERROR_SEEK:
+    case ERROR_SECTOR_NOT_FOUND:
+        return ESPIPE;
+    case ERROR_NOT_DOS_DISK:
+        return ENODEV;
+    case ERROR_GEN_FAILURE:
+        return ENODEV;
+    case ERROR_SHARING_BUFFER_EXCEEDED:
+    case ERROR_NO_MORE_SEARCH_HANDLES:
+        return EMFILE;
+    case ERROR_HANDLE_EOF:
+    case ERROR_BROKEN_PIPE:
+        return EPIPE;
+    case ERROR_HANDLE_DISK_FULL:
+    case ERROR_DISK_FULL:
+        return ENOSPC;
+    case ERROR_NOT_SUPPORTED:
+        return ENOTSUP;
+    case ERROR_FILE_EXISTS:
+    case ERROR_ALREADY_EXISTS:
+    case ERROR_CANNOT_MAKE:
+        return EEXIST;
+    case ERROR_ALREADY_ASSIGNED:
+        return EBUSY;
+    case ERROR_NO_PROC_SLOTS:
+        return EAGAIN;
+    case ERROR_CANT_RESOLVE_FILENAME:
+        return EMLINK;
+    case ERROR_PRIVILEGE_NOT_HELD:
+        return EPERM;
+    case ERROR_ARENA_TRASHED:
+    case ERROR_INVALID_BLOCK:
+    case ERROR_BAD_ENVIRONMENT:
+    case ERROR_BAD_COMMAND:
+    case ERROR_CRC:
+    case ERROR_OUT_OF_PAPER:
+    case ERROR_READ_FAULT:
+    case ERROR_WRITE_FAULT:
+    case ERROR_WRONG_DISK:
+    case ERROR_NET_WRITE_FAULT:
+        return EIO;
+    default: /* not to do with files I expect. */
+        return EIO;
+    }
+}
diff --git a/erts/emulator/sys/common/erl_osenv.c b/erts/emulator/sys/common/erl_osenv.c
new file mode 100644
index 0000000000..9f54d1dff0
--- /dev/null
+++ b/erts/emulator/sys/common/erl_osenv.c
@@ -0,0 +1,396 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 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.
+ * 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%
+ */
+
+#include "erl_osenv.h"
+
+#include "global.h"
+#include "erl_alloc.h"
+#include "erl_process.h"
+
+#define STACKBUF_SIZE (512)
+
+typedef struct __env_rbtnode_t {
+    struct __env_rbtnode_t *parent;
+    struct __env_rbtnode_t *left;
+    struct __env_rbtnode_t *right;
+
+    int is_red;
+
+    erts_osenv_data_t key;
+    erts_osenv_data_t value;
+} env_rbtnode_t;
+
+#define ERTS_RBT_PREFIX env
+#define ERTS_RBT_T env_rbtnode_t
+#define ERTS_RBT_KEY_T erts_osenv_data_t
+#define ERTS_RBT_FLAGS_T int
+#define ERTS_RBT_INIT_EMPTY_TNODE(T) \
+    do { \
+        (T)->parent = NULL; \
+        (T)->left = NULL; \
+        (T)->right = NULL; \
+        (T)->is_red = 0; \
+    } while(0)
+#define ERTS_RBT_IS_RED(T) ((T)->is_red)
+#define ERTS_RBT_SET_RED(T) ((T)->is_red = 1)
+#define ERTS_RBT_IS_BLACK(T) (!ERTS_RBT_IS_RED(T))
+#define ERTS_RBT_SET_BLACK(T) ((T)->is_red = 0)
+#define ERTS_RBT_GET_FLAGS(T) ((T)->is_red)
+#define ERTS_RBT_SET_FLAGS(T, F) ((T)->is_red = F)
+#define ERTS_RBT_GET_PARENT(T) ((T)->parent)
+#define ERTS_RBT_SET_PARENT(T, P) ((T)->parent = P)
+#define ERTS_RBT_GET_RIGHT(T) ((T)->right)
+#define ERTS_RBT_SET_RIGHT(T, R) ((T)->right = (R))
+#define ERTS_RBT_GET_LEFT(T) ((T)->left)
+#define ERTS_RBT_SET_LEFT(T, L) ((T)->left = (L))
+#define ERTS_RBT_GET_KEY(T) ((T)->key)
+#define ERTS_RBT_IS_LT(KX, KY) (compare_env_keys(KX, KY) < 0)
+#define ERTS_RBT_IS_EQ(KX, KY) (compare_env_keys(KX, KY) == 0)
+#define ERTS_RBT_WANT_FOREACH_DESTROY
+#define ERTS_RBT_WANT_FOREACH
+#define ERTS_RBT_WANT_REPLACE
+#define ERTS_RBT_WANT_DELETE
+#define ERTS_RBT_WANT_INSERT
+#define ERTS_RBT_WANT_LOOKUP
+
+static int compare_env_keys(const erts_osenv_data_t a, const erts_osenv_data_t b);
+
+#include "erl_rbtree.h"
+
+static int compare_env_keys(const erts_osenv_data_t a, const erts_osenv_data_t b) {
+    int relation = sys_memcmp(a.data, b.data, MIN(a.length, b.length));
+
+    if(relation != 0) {
+        return relation;
+    }
+
+    if(a.length < b.length) {
+        return -1;
+    } else if(a.length == b.length) {
+        return 0;
+    } else {
+        return 1;
+    }
+}
+
+static void *convert_value_to_native(Eterm term, char *stackbuf,
+        int stackbuf_size, Sint *length) {
+    int encoding;
+    void *result;
+
+    if(is_atom(term)) {
+        return NULL;
+    }
+
+    encoding = erts_get_native_filename_encoding();
+    *length = erts_native_filename_need(term, encoding);
+
+    if(*length < 0) {
+        return NULL;
+    } else if(*length >= stackbuf_size) {
+        result = erts_alloc(ERTS_ALC_T_TMP, *length);
+    } else {
+        result = stackbuf;
+    }
+
+    erts_native_filename_put(term, encoding, (byte*)result);
+
+    return result;
+}
+
+static void *convert_key_to_native(Eterm term, char *stackbuf,
+        int stackbuf_size, Sint *length) {
+    byte *name_iterator, *name_end;
+    void *result;
+    int encoding;
+
+    result = convert_value_to_native(term, stackbuf, stackbuf_size, length);
+
+    if(result == NULL || length == 0) {
+        return NULL;
+    }
+
+    encoding = erts_get_native_filename_encoding();
+
+    name_iterator = (byte*)result;
+    name_end = &name_iterator[*length];
+
+#ifdef __WIN32__
+    /* Windows stores per-drive working directories as variables starting with
+     * '=', so we skip the first character to tolerate that. */
+    name_iterator = erts_raw_env_next_char(name_iterator, encoding);
+#endif
+
+    while(name_iterator < name_end) {
+        if(erts_raw_env_char_is_7bit_ascii_char('=', name_iterator, encoding)) {
+            if(result != stackbuf) {
+                erts_free(ERTS_ALC_T_TMP, result);
+            }
+
+            return NULL;
+        }
+
+        name_iterator = erts_raw_env_next_char(name_iterator, encoding);
+    }
+
+    return result;
+}
+
+void erts_osenv_init(erts_osenv_t *env) {
+    env->variable_count = 0;
+    env->content_size = 0;
+    env->tree = NULL;
+}
+
+static void destroy_foreach(env_rbtnode_t *node, void *_state) {
+    erts_free(ERTS_ALC_T_ENVIRONMENT, node);
+    (void)_state;
+}
+
+void erts_osenv_clear(erts_osenv_t *env) {
+    env_rbt_foreach_destroy(&env->tree, &destroy_foreach, NULL);
+    erts_osenv_init(env);
+}
+
+struct __env_merge {
+    int overwrite_existing;
+    erts_osenv_t *env;
+};
+
+static void merge_foreach(env_rbtnode_t *node, void *_state) {
+    struct __env_merge *state = (struct __env_merge*)(_state);
+    env_rbtnode_t *existing_node;
+
+    existing_node = env_rbt_lookup(state->env->tree, node->key);
+
+    if(existing_node == NULL || state->overwrite_existing) {
+        erts_osenv_put_native(state->env, &node->key, &node->value);
+    }
+}
+
+void erts_osenv_merge(erts_osenv_t *env, const erts_osenv_t *with, int overwrite) {
+    struct __env_merge merge_state;
+
+    merge_state.overwrite_existing = overwrite;
+    merge_state.env = env;
+
+    env_rbt_foreach(with->tree, merge_foreach, &merge_state);
+}
+
+struct __env_foreach_term {
+    erts_osenv_foreach_term_cb_t user_callback;
+    struct process *process;
+    void *user_state;
+};
+
+static void foreach_term_wrapper(env_rbtnode_t *node, void *_state) {
+    struct __env_foreach_term *state = (struct __env_foreach_term*)_state;
+    Eterm key, value;
+
+    key = erts_convert_native_to_filename(state->process,
+        node->key.length, (byte*)node->key.data);
+    value = erts_convert_native_to_filename(state->process,
+        node->value.length, (byte*)node->value.data);
+
+    state->user_callback(state->process, state->user_state, key, value);
+}
+
+void erts_osenv_foreach_term(const erts_osenv_t *env, struct process *process,
+        void *state, erts_osenv_foreach_term_cb_t callback) {
+    struct __env_foreach_term wrapper_state;
+
+    wrapper_state.user_callback = callback;
+    wrapper_state.user_state = state;
+    wrapper_state.process = process;
+
+    env_rbt_foreach(env->tree, foreach_term_wrapper, &wrapper_state);
+}
+
+int erts_osenv_get_term(const erts_osenv_t *env, Process *process,
+        Eterm key_term, Eterm *out_term) {
+    char key_stackbuf[STACKBUF_SIZE];
+    erts_osenv_data_t key;
+    int result;
+
+    key.data = convert_key_to_native(key_term, key_stackbuf,
+        STACKBUF_SIZE, &key.length);
+    result = -1;
+
+    if(key.data != NULL) {
+        env_rbtnode_t *node;
+
+        node = env_rbt_lookup(env->tree, key);
+        result = 0;
+
+        if(node != NULL) {
+            (*out_term) = erts_convert_native_to_filename(process,
+                node->value.length, (byte*)node->value.data);
+            result = 1;
+        }
+
+        if(key.data != key_stackbuf) {
+            erts_free(ERTS_ALC_T_TMP, key.data);
+        }
+    }
+
+    return result;
+}
+
+int erts_osenv_put_term(erts_osenv_t *env, Eterm key_term, Eterm value_term) {
+    char key_stackbuf[STACKBUF_SIZE], value_stackbuf[STACKBUF_SIZE];
+    erts_osenv_data_t key, value;
+    int result;
+
+    key.data = convert_key_to_native(key_term, key_stackbuf,
+        STACKBUF_SIZE, &key.length);
+    value.data = convert_value_to_native(value_term, value_stackbuf,
+        STACKBUF_SIZE, &value.length);
+    result = -1;
+
+    if(value.data != NULL && key.data != NULL) {
+        result = erts_osenv_put_native(env, &key, &value);
+    }
+
+    if(value.data != NULL && value.data != value_stackbuf) {
+        erts_free(ERTS_ALC_T_TMP, value.data);
+    }
+
+    if(key.data != NULL && key.data != key_stackbuf) {
+        erts_free(ERTS_ALC_T_TMP, key.data);
+    }
+
+    return result;
+}
+
+int erts_osenv_unset_term(erts_osenv_t *env, Eterm key_term) {
+    char key_stackbuf[STACKBUF_SIZE];
+    erts_osenv_data_t key;
+    int result;
+
+    key.data = convert_key_to_native(key_term, key_stackbuf,
+        STACKBUF_SIZE, &key.length);
+    result = -1;
+
+    if(key.data != NULL) {
+        result = erts_osenv_unset_native(env, &key);
+
+        if(key.data != key_stackbuf) {
+            erts_free(ERTS_ALC_T_TMP, key.data);
+        }
+    }
+
+    return result;
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+struct __env_foreach_native {
+    erts_osenv_foreach_native_cb_t user_callback;
+    void *user_state;
+};
+
+static void foreach_native_wrapper(env_rbtnode_t *node, void *_state) {
+    struct __env_foreach_native *state = (struct __env_foreach_native*)_state;
+
+    state->user_callback(state->user_state, &node->key, &node->value);
+}
+
+void erts_osenv_foreach_native(const erts_osenv_t *env, void *state,
+        erts_osenv_foreach_native_cb_t callback) {
+    struct __env_foreach_native wrapper_state;
+
+    wrapper_state.user_callback = callback;
+    wrapper_state.user_state = state;
+
+    env_rbt_foreach(env->tree, foreach_native_wrapper, &wrapper_state);
+}
+
+int erts_osenv_get_native(const erts_osenv_t *env,
+        const erts_osenv_data_t *key,
+        erts_osenv_data_t *value) {
+    env_rbtnode_t *node = env_rbt_lookup(env->tree, *key);
+
+    if(node != NULL) {
+        if(value != NULL) {
+            if(node->value.length > value->length) {
+                return -1;
+            }
+
+            sys_memcpy(value->data, node->value.data, node->value.length);
+            value->length = node->value.length;
+        }
+
+        return 1;
+    }
+
+    return 0;
+}
+
+int erts_osenv_put_native(erts_osenv_t *env, const erts_osenv_data_t *key,
+        const erts_osenv_data_t *value) {
+    env_rbtnode_t *old_node, *new_node;
+
+    new_node = erts_alloc(ERTS_ALC_T_ENVIRONMENT, sizeof(env_rbtnode_t) +
+        key->length + value->length);
+
+    new_node->key.data = (char*)(&new_node[1]);
+    new_node->key.length = key->length;
+    new_node->value.data = &((char*)new_node->key.data)[key->length];
+    new_node->value.length = value->length;
+
+    sys_memcpy(new_node->key.data, key->data, key->length);
+    sys_memcpy(new_node->value.data, value->data, value->length);
+
+    old_node = env_rbt_lookup(env->tree, *key);
+
+    if(old_node != NULL) {
+        env->content_size -= old_node->value.length;
+        env->content_size -= old_node->key.length;
+        env_rbt_replace(&env->tree, old_node, new_node);
+    } else {
+        env_rbt_insert(&env->tree, new_node);
+        env->variable_count++;
+    }
+
+    env->content_size += new_node->value.length;
+    env->content_size += new_node->key.length;
+
+    if(old_node != NULL) {
+        erts_free(ERTS_ALC_T_ENVIRONMENT, old_node);
+    }
+
+    return 1;
+}
+
+int erts_osenv_unset_native(erts_osenv_t *env, const erts_osenv_data_t *key) {
+    env_rbtnode_t *old_node = env_rbt_lookup(env->tree, *key);
+
+    if(old_node != NULL) {
+        env->content_size -= old_node->value.length;
+        env->content_size -= old_node->key.length;
+        env->variable_count -= 1;
+
+        env_rbt_delete(&env->tree, old_node);
+        erts_free(ERTS_ALC_T_ENVIRONMENT, old_node);
+        return 1;
+    }
+
+    return 0;
+}
diff --git a/erts/emulator/sys/common/erl_osenv.h b/erts/emulator/sys/common/erl_osenv.h
new file mode 100644
index 0000000000..4777f2148a
--- /dev/null
+++ b/erts/emulator/sys/common/erl_osenv.h
@@ -0,0 +1,121 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 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.
+ * 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%
+ */
+
+/* This is a replacement for getenv(3) and friends, operating on instances so
+ * we can keep a common implementation for both the global and local (per-port)
+ * environments.
+ *
+ * The instances are not thread-safe on their own but unlike getenv(3) we're
+ * guaranteed to be the only user, so placing locks around all our accesses
+ * will suffice.
+ *
+ * Use erts_sys_rwlock_global_osenv to access the global environment. */
+
+#ifndef __ERL_OSENV_H__
+#define __ERL_OSENV_H__
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+typedef struct __erts_osenv_data_t erts_osenv_data_t;
+
+typedef struct __erts_osenv_t {
+    struct __env_rbtnode_t *tree;
+    int variable_count;
+    int content_size;
+} erts_osenv_t;
+
+#include "sys.h"
+
+struct __erts_osenv_data_t {
+    Sint length;
+    void *data;
+};
+
+void erts_osenv_init(erts_osenv_t *env);
+void erts_osenv_clear(erts_osenv_t *env);
+
+/* @brief Merges \c with into \c env
+ *
+ * @param overwrite Whether to overwrite existing entries or keep them as they
+ * are. */
+void erts_osenv_merge(erts_osenv_t *env, const erts_osenv_t *with, int overwrite);
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* @brief Copies env[key] into \c value
+ *
+ * @return 1 on success, 0 if the key couldn't be found, and -1 if the input
+ * was invalid. */
+int erts_osenv_get_term(const erts_osenv_t *env, struct process *process,
+    Eterm key, Eterm *value);
+
+/* @brief Copies \c value into \c env[key]
+ *
+ * @return 1 on success, -1 if the input was invalid. */
+int erts_osenv_put_term(erts_osenv_t *env, Eterm key, Eterm value);
+
+/* @brief Removes \c env[key]
+ *
+ * @return 1 on success, 0 if the key couldn't be found, and -1 if the input
+ * was invalid. */
+int erts_osenv_unset_term(erts_osenv_t *env, Eterm key);
+
+/* @brief Copies env[key] into \c value
+ *
+ * @param value [in,out] The buffer to copy the value into, may be NULL if you
+ * only wish to query presence.
+ *
+ * @return 1 on success, 0 if the key couldn't be found, and -1 if if the value
+ * didn't fit into the buffer. */
+int erts_osenv_get_native(const erts_osenv_t *env, const erts_osenv_data_t *key,
+    erts_osenv_data_t *value);
+
+/* @brief Copies \c value into \c env[key]
+ *
+ * @return 1 on success, -1 on failure. */
+int erts_osenv_put_native(erts_osenv_t *env, const erts_osenv_data_t *key,
+    const erts_osenv_data_t *value);
+
+/* @brief Removes \c key from the env.
+ *
+ * @return 1 on success, 0 if the key couldn't be found. */
+int erts_osenv_unset_native(erts_osenv_t *env, const erts_osenv_data_t *key);
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+typedef void (*erts_osenv_foreach_term_cb_t)(struct process *process,
+    void *state, Eterm key, Eterm value);
+
+typedef void (*erts_osenv_foreach_native_cb_t)(void *state,
+    const erts_osenv_data_t *key,
+    const erts_osenv_data_t *value);
+
+/* @brief Walks through all environment variables, calling \c callback for each
+ * one. It's unsafe to modify \c env within the callback. */
+void erts_osenv_foreach_term(const erts_osenv_t *env, struct process *process,
+    void *state, erts_osenv_foreach_term_cb_t callback);
+
+/* @copydoc erts_osenv_foreach_term */
+void erts_osenv_foreach_native(const erts_osenv_t *env, void *state,
+    erts_osenv_foreach_native_cb_t callback);
+
+#endif
diff --git a/erts/emulator/sys/common/erl_sys_common_misc.c b/erts/emulator/sys/common/erl_sys_common_misc.c
index 420138ff0a..96bdbacb9e 100644
--- a/erts/emulator/sys/common/erl_sys_common_misc.c
+++ b/erts/emulator/sys/common/erl_sys_common_misc.c
@@ -150,59 +150,50 @@ int
 sys_double_to_chars_fast(double f, char *buffer, int buffer_size, int decimals,
 			 int compact)
 {
-    /* Note that some C compilers don't support "static const" propagation
-     * so we use a defines */
-    #define SYS_DOUBLE_RND_CONST 0.55555555555555555
+    #define SYS_DOUBLE_RND_CONST 0.5
     #define FRAC_SIZE            52
     #define EXP_SIZE             11
-    #define EXP_MASK             ((1ll << EXP_SIZE) - 1)
+    #define EXP_MASK             (((Uint64)1 << EXP_SIZE) - 1)
     #define MAX_DECIMALS         (sizeof(cs_sys_double_pow10) \
 				   / sizeof(cs_sys_double_pow10[0]))
-    #define FRAC_MASK            ((1ll << FRAC_SIZE) - 1)
-    #define FRAC_MASK2           ((1ll << (FRAC_SIZE + 1)) - 1)
-    #define MAX_FLOAT            (1ll << (FRAC_SIZE+1))
+    #define FRAC_MASK            (((Uint64)1 << FRAC_SIZE) - 1)
+    #define FRAC_MASK2           (((Uint64)1 << (FRAC_SIZE + 1)) - 1)
+    #define MAX_FLOAT            ((Uint64)1 << (FRAC_SIZE+1))
 
     static const double cs_sys_double_pow10[] = {
-        SYS_DOUBLE_RND_CONST / 1ll,
-        SYS_DOUBLE_RND_CONST / 10ll,
-        SYS_DOUBLE_RND_CONST / 100ll,
-        SYS_DOUBLE_RND_CONST / 1000ll,
-        SYS_DOUBLE_RND_CONST / 10000ll,
-        SYS_DOUBLE_RND_CONST / 100000ll,
-        SYS_DOUBLE_RND_CONST / 1000000ll,
-        SYS_DOUBLE_RND_CONST / 10000000ll,
-        SYS_DOUBLE_RND_CONST / 100000000ll,
-        SYS_DOUBLE_RND_CONST / 1000000000ll,
-        SYS_DOUBLE_RND_CONST / 10000000000ll,
-        SYS_DOUBLE_RND_CONST / 100000000000ll,
-        SYS_DOUBLE_RND_CONST / 1000000000000ll,
-        SYS_DOUBLE_RND_CONST / 10000000000000ll,
-        SYS_DOUBLE_RND_CONST / 100000000000000ll,
-        SYS_DOUBLE_RND_CONST / 1000000000000000ll,
-        SYS_DOUBLE_RND_CONST / 10000000000000000ll,
-        SYS_DOUBLE_RND_CONST / 100000000000000000ll,
-        SYS_DOUBLE_RND_CONST / 1000000000000000000ll
+        SYS_DOUBLE_RND_CONST / 1e0,
+        SYS_DOUBLE_RND_CONST / 1e1,
+        SYS_DOUBLE_RND_CONST / 1e2,
+        SYS_DOUBLE_RND_CONST / 1e3,
+        SYS_DOUBLE_RND_CONST / 1e4,
+        SYS_DOUBLE_RND_CONST / 1e5,
+        SYS_DOUBLE_RND_CONST / 1e6,
+        SYS_DOUBLE_RND_CONST / 1e7,
+        SYS_DOUBLE_RND_CONST / 1e8,
+        SYS_DOUBLE_RND_CONST / 1e9,
+        SYS_DOUBLE_RND_CONST / 1e10,
+        SYS_DOUBLE_RND_CONST / 1e11,
+        SYS_DOUBLE_RND_CONST / 1e12,
+        SYS_DOUBLE_RND_CONST / 1e13,
+        SYS_DOUBLE_RND_CONST / 1e14,
+        SYS_DOUBLE_RND_CONST / 1e15,
+        SYS_DOUBLE_RND_CONST / 1e16,
+        SYS_DOUBLE_RND_CONST / 1e17,
+        SYS_DOUBLE_RND_CONST / 1e18
     };
 
-    long long mantissa, int_part = 0, frac_part = 0;
-    short exp;
+    Uint64 mantissa, int_part, frac_part;
+    int exp;
+    int fbits;
     int max;
     int neg;
     double fr;
-    union { long long L; double F; } x;
+    union { Uint64 L; double F; } x;
     char *p = buffer;
 
     if (decimals < 0)
         return -1;
 
-    /* Round the number to given decimal places. The number of 5's in the
-     * SYS_DOUBLE_RND_CONST constant is chosen such that adding any more 5's doesn't
-     * change the double precision of the number, i.e.:
-     * 1> term_to_binary(0.55555555555555555, [{minor_version, 1}]).
-     * <<131,70,63,225,199,28,113,199,28,114>>
-     * 2> term_to_binary(0.5555555555555555555, [{minor_version, 1}]).
-     * <<131,70,63,225,199,28,113,199,28,114>>
-     */
     if (f >= 0) {
         neg = 0;
         fr  = decimals < MAX_DECIMALS ? (f + cs_sys_double_pow10[decimals]) : f;
@@ -233,7 +224,7 @@ sys_double_to_chars_fast(double f, char *buffer, int buffer_size, int decimals,
     }
 
     exp      -= EXP_MASK >> 1;
-    mantissa |= (1ll << FRAC_SIZE);
+    mantissa |= ((Uint64)1 << FRAC_SIZE);
 
     /* Don't bother with optimizing too large numbers or too large precision */
     if (x.F > MAX_FLOAT || decimals >= MAX_DECIMALS) {
@@ -248,11 +239,16 @@ sys_double_to_chars_fast(double f, char *buffer, int buffer_size, int decimals,
         return p - buffer;
     } else if (exp >= FRAC_SIZE) {
         int_part  = mantissa << (exp - FRAC_SIZE);
+        frac_part = 0;
+        fbits = FRAC_SIZE;  /* not important as frac_part==0 */
     } else if (exp >= 0) {
-        int_part  = mantissa >> (FRAC_SIZE - exp);
-        frac_part = (mantissa << (exp + 1)) & FRAC_MASK2;
+        fbits = FRAC_SIZE - exp;
+        int_part  = mantissa >> fbits;
+        frac_part = mantissa & (((Uint64)1 << fbits) -1);
     } else /* if (exp < 0) */ {
-        frac_part = (mantissa & FRAC_MASK2) >> -(exp + 1);
+        int_part = 0;
+        frac_part = mantissa;
+        fbits = FRAC_SIZE - exp;
     }
 
     if (!int_part) {
@@ -262,9 +258,8 @@ sys_double_to_chars_fast(double f, char *buffer, int buffer_size, int decimals,
     } else {
         int ret, i, n;
         while (int_part != 0) {
-            long long j = int_part / 10;
-            *p++ = (char)(int_part - ((j << 3) + (j << 1)) + '0');
-            int_part = j;
+            *p++ = (char)((int_part % 10) + '0');
+            int_part /= 10;
         }
         if (neg)
             *p++ = '-';
@@ -290,11 +285,22 @@ sys_double_to_chars_fast(double f, char *buffer, int buffer_size, int decimals,
         max = decimals;
 
         for (i = 0; i < max; i++) {
-            /* frac_part *= 10; */
-            frac_part = (frac_part << 3) + (frac_part << 1);
-
-            *p++ = (char)((frac_part >> (FRAC_SIZE + 1)) + '0');
-            frac_part &= FRAC_MASK2;
+            if (frac_part > (ERTS_UINT64_MAX/5)) {
+                frac_part >>= 3;
+                fbits -= 3;
+            }
+
+            /* Multiply by 10 (5*2) to extract decimal digit as integer part */
+            frac_part *= 5;
+            fbits--;
+
+            if (fbits >= 64) {
+                *p++ = '0';
+            }
+            else {
+                *p++ = (char)((frac_part >> fbits) + '0');
+                frac_part &= ((Uint64)1 << fbits) - 1;
+            }
         }
 
         /* Delete trailing zeroes */
diff --git a/erts/emulator/sys/unix/erl_child_setup.c b/erts/emulator/sys/unix/erl_child_setup.c
index 69fc6c2879..57973b10d7 100644
--- a/erts/emulator/sys/unix/erl_child_setup.c
+++ b/erts/emulator/sys/unix/erl_child_setup.c
@@ -437,6 +437,21 @@ main(int argc, char *argv[])
         exit(1);
     }
 
+    /* Ignore SIGTERM.
+       Some container environments send SIGTERM to all processes
+       when terminating. We don't want erl_child_setup to terminate
+       in these cases as that will prevent beam from properly
+       cleaning up.
+    */
+    sa.sa_handler = SIG_IGN;
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = 0;
+
+    if (sigaction(SIGTERM, &sa, 0) == -1) {
+        perror(NULL);
+        exit(1);
+    }
+
     forker_hash_init();
 
     SET_CLOEXEC(uds_fd);
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h
index b6f5b319ee..e367d565a7 100644
--- a/erts/emulator/sys/unix/erl_unix_sys.h
+++ b/erts/emulator/sys/unix/erl_unix_sys.h
@@ -133,7 +133,7 @@
 #define  ERTS_SYS_CONTINOUS_FD_NUMBERS
 
 
-typedef void *GETENV_STATE;
+void erts_sys_env_init(void);
 
 /*
 ** For the erl_timer_sup module.
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index 6315135151..189ca083d7 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -62,9 +62,6 @@
 
 #include "erl_mseg.h"
 
-extern char **environ;
-erts_rwmtx_t environ_rwmtx;
-
 #define MAX_VSIZE 16		/* Max number of entries allowed in an I/O
 				 * vector sock_sendv().
 				 */
@@ -77,7 +74,7 @@ erts_rwmtx_t environ_rwmtx;
 
 #include "erl_check_io.h"
 #include "erl_cpu_topology.h"
-
+#include "erl_osenv.h"
 extern int  driver_interrupt(int, int);
 extern void do_break(void);
 
@@ -454,10 +451,10 @@ prepare_crash_dump(int secs)
     close(crashdump_companion_cube_fd);
 
     envsz = sizeof(env);
-    i = erts_sys_getenv__("ERL_CRASH_DUMP_NICE", env, &envsz);
+    i = erts_sys_explicit_8bit_getenv("ERL_CRASH_DUMP_NICE", env, &envsz);
     if (i >= 0) {
 	int nice_val;
-	nice_val = i != 0 ? 0 : atoi(env);
+	nice_val = i != 1 ? 0 : atoi(env);
 	if (nice_val > 39) {
 	    nice_val = 39;
 	}
@@ -749,34 +746,6 @@ void os_version(int *pMajor, int *pMinor, int *pBuild) {
     *pBuild = get_number(&release); /* Pointer to build number. */
 }
 
-void init_getenv_state(GETENV_STATE *state)
-{
-   erts_rwmtx_rlock(&environ_rwmtx);
-   *state = NULL;
-}
-
-char *getenv_string(GETENV_STATE *state0)
-{
-   char **state = (char **) *state0;
-   char *cp;
-
-   ERTS_LC_ASSERT(erts_lc_rwmtx_is_rlocked(&environ_rwmtx));
-
-   if (state == NULL)
-      state = environ;
-
-   cp = *state++;
-   *state0 = (GETENV_STATE) state;
-
-   return cp;
-}
-
-void fini_getenv_state(GETENV_STATE *state)
-{
-   *state = NULL;
-   erts_rwmtx_runlock(&environ_rwmtx);
-}
-
 void erts_do_break_handling(void)
 {
     struct termios temp_mode;
@@ -830,90 +799,6 @@ void sys_get_pid(char *buffer, size_t buffer_size){
     erts_snprintf(buffer, buffer_size, "%lu",(unsigned long) p);
 }
 
-int
-erts_sys_putenv_raw(char *key, char *value) {
-    return erts_sys_putenv(key, value);
-}
-int
-erts_sys_putenv(char *key, char *value)
-{
-    int res;
-    char *env;
-    Uint need = strlen(key) + strlen(value) + 2;
-
-#ifdef HAVE_COPYING_PUTENV
-    env = erts_alloc(ERTS_ALC_T_TMP, need);
-#else
-    env = erts_alloc(ERTS_ALC_T_PUTENV_STR, need);
-    erts_atomic_add_nob(&sys_misc_mem_sz, need);
-#endif
-    strcpy(env,key);
-    strcat(env,"=");
-    strcat(env,value);
-    erts_rwmtx_rwlock(&environ_rwmtx);
-    res = putenv(env);
-    erts_rwmtx_rwunlock(&environ_rwmtx);
-#ifdef HAVE_COPYING_PUTENV
-    erts_free(ERTS_ALC_T_TMP, env);
-#endif
-    return res;
-}
-
-int
-erts_sys_getenv__(char *key, char *value, size_t *size)
-{
-    int res;
-    char *orig_value = getenv(key);
-    if (!orig_value)
-	res = -1;
-    else {
-	size_t len = sys_strlen(orig_value);
-	if (len >= *size) {
-	    *size = len + 1;
-	    res = 1;
-	}
-	else {
-	    *size = len;
-	    sys_memcpy((void *) value, (void *) orig_value, len+1);
-	    res = 0;
-	}
-    }
-    return res;
-}
-
-int
-erts_sys_getenv_raw(char *key, char *value, size_t *size) {
-    return erts_sys_getenv(key, value, size);
-}
-
-/*
- * erts_sys_getenv
- * returns:
- *  -1, if environment key is not set with a value
- *   0, if environment key is set and value fits into buffer size
- *   1, if environment key is set but does not fit into buffer size
- *      size is set with the needed buffer size value
- */
-
-int
-erts_sys_getenv(char *key, char *value, size_t *size)
-{
-    int res;
-    erts_rwmtx_rlock(&environ_rwmtx);
-    res = erts_sys_getenv__(key, value, size);
-    erts_rwmtx_runlock(&environ_rwmtx);
-    return res;
-}
-
-int
-erts_sys_unsetenv(char *key)
-{
-    int res;
-    erts_rwmtx_rwlock(&environ_rwmtx);
-    res = unsetenv(key);
-    erts_rwmtx_rwunlock(&environ_rwmtx);
-    return res;
-}
 
 void sys_init_io(void) { }
 void erts_sys_alloc_init(void) { }
@@ -1260,14 +1145,9 @@ erts_sys_main_thread(void)
     }
 }
 
-
 void
 erl_sys_args(int* argc, char** argv)
 {
-
-    erts_rwmtx_init(&environ_rwmtx, "environ", NIL,
-        ERTS_LOCK_FLAGS_PROPERTY_STATIC | ERTS_LOCK_FLAGS_CATEGORY_GENERIC);
-
     ASSERT(argc && argv);
 
     max_files = erts_check_io_max_files();
@@ -1275,4 +1155,5 @@ erl_sys_args(int* argc, char** argv)
     init_smp_sig_notify();
     init_smp_sig_suspend();
 
+    erts_sys_env_init();
 }
diff --git a/erts/emulator/sys/unix/sys_drivers.c b/erts/emulator/sys/unix/sys_drivers.c
index 0228e1af54..b7ac89d89a 100644
--- a/erts/emulator/sys/unix/sys_drivers.c
+++ b/erts/emulator/sys/unix/sys_drivers.c
@@ -55,9 +55,6 @@
 
 #include "erl_threads.h"
 
-extern char **environ;
-extern erts_rwmtx_t environ_rwmtx;
-
 extern erts_atomic_t sys_misc_mem_sz;
 
 static Eterm forker_port;
@@ -180,7 +177,7 @@ erl_sys_late_init(void)
     opts.read_write = 0;
     opts.hide_window = 0;
     opts.wd = NULL;
-    opts.envir = NULL;
+    erts_osenv_init(&opts.envir);
     opts.exit_status = 0;
     opts.overlapped_io = 0;
     opts.spawn_type = ERTS_SPAWN_ANY;
@@ -443,85 +440,55 @@ static void close_pipes(int ifd[2], int ofd[2])
     close(ofd[1]);
 }
 
-static char **build_unix_environment(char *block)
+struct __add_spawn_env_state {
+    struct iovec *iov;
+    int *iov_index;
+
+    Sint32 *payload_size;
+    char *env_block;
+};
+
+static void add_spawn_env_block_foreach(void *_state,
+                                        const erts_osenv_data_t *key,
+                                        const erts_osenv_data_t *value)
 {
-    int i;
-    int j;
-    int len;
-    char *cp;
-    char **cpp;
-    char** old_env;
-    
-    ERTS_LC_ASSERT(erts_lc_rwmtx_is_rlocked(&environ_rwmtx));
-
-    cp = block;
-    len = 0;
-    while (*cp != '\0') {
-	cp += strlen(cp) + 1;
-	len++;
-    }
-    old_env = environ;
-    while (*old_env++ != NULL) {
-	len++;
-    }
-    
-    cpp = (char **) erts_alloc_fnf(ERTS_ALC_T_ENVIRONMENT,
-				   sizeof(char *) * (len+1));
-    if (cpp == NULL) {
-	return NULL;
-    }
+    struct __add_spawn_env_state *state;
+    struct iovec *iov;
 
-    cp = block;
-    len = 0;
-    while (*cp != '\0') {
-	cpp[len] = cp;
-	cp += strlen(cp) + 1;
-	len++;
-    }
-    
-    i = len;
-    for (old_env = environ; *old_env; old_env++) {
-	char* old = *old_env;
-
-	for (j = 0; j < len; j++) {
-	    char *s, *t;
-
-	    /* check if cpp[j] equals old
-	       before the = sign,
-	       i.e.
-	       "TMPDIR=/tmp/" */
-	    s = cpp[j];
-	    t = old;
-	    while (*s == *t && *s != '=') {
-		s++, t++;
-	    }
-	    if (*s == '=' && *t == '=') {
-		break;
-	    }
-	}
+    state = (struct __add_spawn_env_state*)(_state);
+    iov = &state->iov[*state->iov_index];
 
-	if (j == len) {		/* New version not found */
-	    cpp[len++] = old;
-	}
-    }
+    iov->iov_base = state->env_block;
 
-    for (j = 0; j < i; ) {
-        size_t last = strlen(cpp[j])-1;
-	if (cpp[j][last] == '=' && strchr(cpp[j], '=') == cpp[j]+last) {
-	    cpp[j] = cpp[--len];
-	    if (len < i) {
-		i--;
-	    } else {
-		j++;
-	    }
-	}
-	else {
-	    j++;
-	}
-    }
+    sys_memcpy(state->env_block, key->data, key->length);
+    state->env_block += key->length;
+    *state->env_block++ = '=';
+    sys_memcpy(state->env_block, value->data, value->length);
+    state->env_block += value->length;
+    *state->env_block++ = '\0';
 
-    cpp[len] = NULL;
-    return cpp;
+    iov->iov_len = state->env_block - (char*)iov->iov_base;
+
+    (*state->payload_size) += iov->iov_len;
+    (*state->iov_index)++;
+}
+
+static void *add_spawn_env_block(const erts_osenv_t *env, struct iovec *iov,
+                                  int *iov_index, Sint32 *payload_size) {
+    struct __add_spawn_env_state add_state;
+    char *env_block;
+
+    env_block = erts_alloc(ERTS_ALC_T_TMP, env->content_size +
+        env->variable_count * sizeof("=\0"));
+
+    add_state.iov = iov;
+    add_state.iov_index = iov_index;
+    add_state.env_block = env_block;
+    add_state.payload_size = payload_size;
+
+    erts_osenv_foreach_native(env, &add_state, add_spawn_env_block_foreach);
+
+    return env_block;
 }
 
 static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
@@ -531,7 +498,6 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
 #define CMD_LINE_PREFIX_STR_SZ (sizeof(CMD_LINE_PREFIX_STR) - 1)
 
     int len;
-    char **new_environ;
     ErtsSysDriverData *dd;
     char *cmd_line;
     char wd_buff[MAXPATHLEN+1];
@@ -598,19 +564,7 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
 	memcpy((void *) (cmd_line + CMD_LINE_PREFIX_STR_SZ), (void *) name, len);
 	cmd_line[CMD_LINE_PREFIX_STR_SZ + len] = '\0';
 	len = CMD_LINE_PREFIX_STR_SZ + len + 1;
-    }
-
-    erts_rwmtx_rlock(&environ_rwmtx);
-
-    if (opts->envir == NULL) {
-	new_environ = environ;
-    } else if ((new_environ = build_unix_environment(opts->envir)) == NULL) {
-	erts_rwmtx_runlock(&environ_rwmtx);
-        close_pipes(ifd, ofd);
-	erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
-	errno = ENOMEM;
-	return ERL_DRV_ERROR_ERRNO;
-    }
+}
 
     if ((cwd = getcwd(wd_buff, MAXPATHLEN+1)) == NULL) {
         /* on some OSs this call opens a fd in the
@@ -619,9 +573,6 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
         int err = errno;
         close_pipes(ifd, ofd);
         erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
-        if (new_environ != environ)
-            erts_free(ERTS_ALC_T_ENVIRONMENT, (void *) new_environ);
-        erts_rwmtx_runlock(&environ_rwmtx);
         errno = err;
         return ERL_DRV_ERROR_ERRNO;
     }
@@ -629,6 +580,7 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
     wd = opts->wd;
 
     {
+        void *environment_block;
         struct iovec *io_vector;
         int iov_len = 5;
         char nullbuff[] = "\0";
@@ -641,10 +593,8 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
 
         if (wd) iov_len++;
 
-        /* count number of elements in environment */
-        while(new_environ[env_len] != NULL)
-            env_len++;
-        iov_len += 1 + env_len; /* num envs including size int */
+        /* num envs including size int */
+        iov_len += 1 + opts->envir.variable_count;
 
         /* count number of element in argument list */
         if (opts->spawn_type == ERTS_SPAWN_EXECUTABLE) {
@@ -661,10 +611,7 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
 
         if (!io_vector) {
             close_pipes(ifd, ofd);
-            erts_rwmtx_runlock(&environ_rwmtx);
             erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
-            if (new_environ != environ)
-                erts_free(ERTS_ALC_T_ENVIRONMENT, (void *) new_environ);
             errno = ENOMEM;
             return ERL_DRV_ERROR_ERRNO;
         }
@@ -699,16 +646,13 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
         io_vector[i++].iov_len = 1;
         buffsz += io_vector[i-1].iov_len;
 
+        env_len = htonl(opts->envir.variable_count);
         io_vector[i].iov_base = (void*)&env_len;
-        env_len = htonl(env_len);
         io_vector[i++].iov_len = sizeof(env_len);
         buffsz += io_vector[i-1].iov_len;
 
-        for (j = 0; new_environ[j] != NULL; j++) {
-            io_vector[i].iov_base = new_environ[j];
-            io_vector[i++].iov_len = strlen(new_environ[j]) + 1;
-            buffsz += io_vector[i-1].iov_len;
-        }
+        environment_block = add_spawn_env_block(&opts->envir, io_vector, &i,
+            &buffsz);
 
         /* only append arguments if this was a spawn_executable */
         if (opts->spawn_type == ERTS_SPAWN_EXECUTABLE) {
@@ -744,9 +688,6 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
                 int err = errno;
                 close_pipes(ifd, ofd);
                 erts_free(ERTS_ALC_T_TMP, io_vector);
-                if (new_environ != environ)
-                    erts_free(ERTS_ALC_T_ENVIRONMENT, (void *) new_environ);
-                erts_rwmtx_runlock(&environ_rwmtx);
                 erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
                 errno = err;
                 return ERL_DRV_ERROR_ERRNO;
@@ -767,16 +708,12 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
             driver_select(port_num, ofd[1], ERL_DRV_WRITE|ERL_DRV_USE, 1);
         }
 
+        erts_free(ERTS_ALC_T_TMP, environment_block);
         erts_free(ERTS_ALC_T_TMP, io_vector);
     }
 
     erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
 
-    if (new_environ != environ)
-	erts_free(ERTS_ALC_T_ENVIRONMENT, (void *) new_environ);
-
-    erts_rwmtx_runlock(&environ_rwmtx);
-
     dd = create_driver_data(port_num, ifd[0], ofd[1], opts->packet_bytes,
                              DO_WRITE | DO_READ, opts->exit_status,
                              0, 0);
@@ -1652,15 +1589,13 @@ static ErlDrvData forker_start(ErlDrvPort port_num, char* name,
 
     forker_port = erts_drvport2id(port_num);
 
-    res = erts_sys_getenv_raw("BINDIR", bindir, &bindirsz);
-    if (res != 0) {
-        if (res < 0)
-            erts_exit(1,
-                     "Environment variable BINDIR is not set\n");
-        if (res > 0)
-            erts_exit(1,
-                     "Value of environment variable BINDIR is too large\n");
+    res = erts_sys_explicit_8bit_getenv("BINDIR", bindir, &bindirsz);
+    if (res == 0) {
+        erts_exit(1, "Environment variable BINDIR is not set\n");
+    } else if(res < 0) {
+        erts_exit(1, "Value of environment variable BINDIR is too large\n");
     }
+
     if (bindir[0] != DIR_SEPARATOR_CHAR)
         erts_exit(1,
                  "Environment variable BINDIR does not contain an"
diff --git a/erts/emulator/sys/unix/sys_env.c b/erts/emulator/sys/unix/sys_env.c
new file mode 100644
index 0000000000..4d8301f985
--- /dev/null
+++ b/erts/emulator/sys/unix/sys_env.c
@@ -0,0 +1,133 @@
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "sys.h"
+#include "erl_osenv.h"
+#include "erl_alloc.h"
+
+#include "erl_thr_progress.h"
+
+static erts_osenv_t sysenv_global_env;
+static erts_rwmtx_t sysenv_rwmtx;
+
+extern char **environ;
+
+static void import_initial_env(void);
+
+void erts_sys_env_init() {
+    erts_rwmtx_init(&sysenv_rwmtx, "environ", NIL,
+        ERTS_LOCK_FLAGS_PROPERTY_STATIC | ERTS_LOCK_FLAGS_CATEGORY_GENERIC);
+
+    erts_osenv_init(&sysenv_global_env);
+    import_initial_env();
+}
+
+const erts_osenv_t *erts_sys_rlock_global_osenv() {
+    erts_rwmtx_rlock(&sysenv_rwmtx);
+    return &sysenv_global_env;
+}
+
+erts_osenv_t *erts_sys_rwlock_global_osenv() {
+    erts_rwmtx_rwlock(&sysenv_rwmtx);
+    return &sysenv_global_env;
+}
+
+void erts_sys_rwunlock_global_osenv() {
+    erts_rwmtx_rwunlock(&sysenv_rwmtx);
+}
+
+void erts_sys_runlock_global_osenv() {
+    erts_rwmtx_runlock(&sysenv_rwmtx);
+}
+
+int erts_sys_explicit_8bit_putenv(char *key, char *value) {
+    erts_osenv_data_t env_key, env_value;
+    int result;
+
+    env_key.length = sys_strlen(key);
+    env_key.data = key;
+
+    env_value.length = sys_strlen(value);
+    env_value.data = value;
+
+    {
+        erts_osenv_t *env = erts_sys_rwlock_global_osenv();
+        result = erts_osenv_put_native(env, &env_key, &env_value);
+        erts_sys_rwunlock_global_osenv();
+    }
+
+    return result;
+}
+
+int erts_sys_explicit_8bit_getenv(char *key, char *value, size_t *size) {
+    erts_osenv_data_t env_key, env_value;
+    int result;
+
+    env_key.length = sys_strlen(key);
+    env_key.data = key;
+
+    /* Reserve space for NUL termination. */
+    env_value.length = *size - 1;
+    env_value.data = value;
+
+    {
+        const erts_osenv_t *env = erts_sys_rlock_global_osenv();
+        result = erts_osenv_get_native(env, &env_key, &env_value);
+        erts_sys_runlock_global_osenv();
+    }
+
+    if(result == 1) {
+        value[env_value.length] = '\0';
+    }
+
+    *size = env_value.length;
+
+    return result;
+}
+
+int erts_sys_explicit_host_getenv(char *key, char *value, size_t *size) {
+    char *orig_value;
+    size_t length;
+    
+    orig_value = getenv(key);
+
+    if(orig_value == NULL) {
+        return 0;
+    }
+
+    length = sys_strlen(orig_value);
+
+    if (length >= *size) {
+        *size = length + 1;
+        return -1;
+    }
+
+    sys_memcpy((void*)value, (void*)orig_value, length + 1);
+    *size = length;
+
+    return 1;
+}
+
+static void import_initial_env(void) {
+    char **environ_iterator, *environ_variable;
+
+    environ_iterator = environ;
+
+    while ((environ_variable = *(environ_iterator++)) != NULL) {
+        char *separator_index = strchr(environ_variable, '=');
+
+        if (separator_index != NULL) {
+            erts_osenv_data_t env_key, env_value;
+
+            env_key.length = separator_index - environ_variable;
+            env_key.data = environ_variable;
+    
+            env_value.length = sys_strlen(separator_index) - 1;
+            env_value.data = separator_index + 1;
+
+            erts_osenv_put_native(&sysenv_global_env, &env_key, &env_value);
+        }
+    }
+}
diff --git a/erts/emulator/sys/win32/erl_win32_sys_ddll.c b/erts/emulator/sys/win32/erl_win32_sys_ddll.c
index 274133a346..fc2179328f 100644
--- a/erts/emulator/sys/win32/erl_win32_sys_ddll.c
+++ b/erts/emulator/sys/win32/erl_win32_sys_ddll.c
@@ -46,9 +46,17 @@ static TWinDynDriverCallbacks wddc;
 static TWinDynNifCallbacks nif_callbacks;
 
 void erl_sys_ddll_init(void) {
+    WCHAR cwd_buffer[MAX_PATH];
+
     tls_index = TlsAlloc();
     ERL_INIT_CALLBACK_STRUCTURE(wddc);
 
+    /* LOAD_WITH_ALTERED_SEARCH_PATH removes the startup directory from the
+     * search path, so we add it separately to be backwards compatible. */
+    if (GetCurrentDirectoryW(sizeof(cwd_buffer), cwd_buffer)) {
+        SetDllDirectoryW(cwd_buffer);
+    }
+
 #define ERL_NIF_API_FUNC_DECL(RET,NAME,ARGS) nif_callbacks.NAME = NAME
 #include "erl_nif_api_funcs.h"
 #undef ERL_NIF_API_FUNC_DECL
@@ -81,7 +89,10 @@ int erts_sys_ddll_open(const char *full_name, void **handle, ErtsSysDdllError* e
 						   ERTS_ALC_T_TMP, &used, EXT_LEN);
     wcscpy(&wcp[used/2 - 1], FILE_EXT_WCHAR);
 
-    if ((hinstance = LoadLibraryW(wcp)) == NULL) {
+    /* LOAD_WITH_ALTERED_SEARCH_PATH adds the specified DLL's directory to the
+     * dependency search path. This also removes the directory we started in,
+     * but we've explicitly added that in in erl_sys_ddll_init. */
+    if ((hinstance = LoadLibraryExW(wcp, NULL, LOAD_WITH_ALTERED_SEARCH_PATH)) == NULL) {
 	code = ERL_DE_DYNAMIC_ERROR_OFFSET - GetLastError();
 	if (err != NULL) {
 	    err->str = erts_sys_ddll_error(code);
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 0598a12351..a1c630d68a 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -77,6 +77,7 @@ static int create_pipe(LPHANDLE, LPHANDLE, BOOL, BOOL);
 static int application_type(const wchar_t* originalName, wchar_t fullPath[MAX_PATH],
 			   BOOL search_in_path, BOOL handle_quotes,
 			   int *error_return);
+static void *build_env_block(const erts_osenv_t *env);
 
 HANDLE erts_service_event;
 
@@ -1190,7 +1191,6 @@ spawn_start(ErlDrvPort port_num, char* utf8_name, SysDriverOpts* opts)
     int ok;
     int neededSelects = 0;
     SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
-    char* envir = opts->envir;
     int errno_return = -1;
     wchar_t *name;
     int len;
@@ -1265,29 +1265,33 @@ spawn_start(ErlDrvPort port_num, char* utf8_name, SysDriverOpts* opts)
 	name[i] = L'\0';
     }
     DEBUGF(("Spawning \"%S\"\n", name));
-    envir = win_build_environment(envir); /* Always a unicode environment */ 
-    ok = create_child_process(name,
-			      hChildStdin,
-			      hChildStdout,
-			      hChildStderr,
-			      &dp->port_pid,
-			      &pid,
-			      opts->hide_window,
-			      (LPVOID) envir,
-			      (wchar_t *) opts->wd,
-			      opts->spawn_type,
-			      (wchar_t **) opts->argv,
-			      &errno_return);
-    CloseHandle(hChildStdin);
-    CloseHandle(hChildStdout);
-    if (close_child_stderr && hChildStderr != INVALID_HANDLE_VALUE &&
-	hChildStderr != 0) {
-	CloseHandle(hChildStderr);
-    }
-    erts_free(ERTS_ALC_T_TMP, name);
-
-    if (envir != NULL) {
-	erts_free(ERTS_ALC_T_ENVIRONMENT, envir);
+
+    {
+        void *environment_block = build_env_block(&opts->envir);
+
+        ok = create_child_process(name,
+                                  hChildStdin,
+                                  hChildStdout,
+                                  hChildStderr,
+                                  &dp->port_pid,
+                                  &pid,
+                                  opts->hide_window,
+                                  environment_block,
+                                  (wchar_t *) opts->wd,
+                                  opts->spawn_type,
+                                  (wchar_t **) opts->argv,
+                                  &errno_return);
+
+        CloseHandle(hChildStdin);
+        CloseHandle(hChildStdout);
+
+        if (close_child_stderr && hChildStderr != INVALID_HANDLE_VALUE &&
+            hChildStderr != 0) {
+            CloseHandle(hChildStderr);
+        }
+
+        erts_free(ERTS_ALC_T_TMP, environment_block);
+        erts_free(ERTS_ALC_T_TMP, name);
     }
 
     if (!ok) {
@@ -1338,6 +1342,41 @@ spawn_start(ErlDrvPort port_num, char* utf8_name, SysDriverOpts* opts)
     return retval;
 }
 
+struct __build_env_state {
+    WCHAR *next_variable;
+};
+
+static void build_env_foreach(void *_state, const erts_osenv_data_t *key,
+                              const erts_osenv_data_t *value)
+{
+    struct __build_env_state *state = (struct __build_env_state*)(_state);
+
+    sys_memcpy(state->next_variable, key->data, key->length);
+    state->next_variable += (int)key->length / sizeof(WCHAR);
+    *state->next_variable++ = L'=';
+
+    sys_memcpy(state->next_variable, value->data, value->length);
+    state->next_variable += (int)value->length / sizeof(WCHAR);
+    *state->next_variable++ = L'\0';
+}
+
+/* Builds an environment block suitable for CreateProcessW. */
+static void *build_env_block(const erts_osenv_t *env) {
+    struct __build_env_state build_state;
+    WCHAR *env_block;
+
+    env_block = erts_alloc(ERTS_ALC_T_TMP, env->content_size +
+        (env->variable_count * sizeof(L"=\0") + sizeof(L'\0')));
+
+    build_state.next_variable = env_block;
+
+    erts_osenv_foreach_native(env, &build_state, build_env_foreach);
+
+    (*build_state.next_variable) = L'\0';
+
+    return env_block;
+}
+
 static int
 create_file_thread(AsyncIo* aio, int mode)
 {
diff --git a/erts/emulator/sys/win32/sys_env.c b/erts/emulator/sys/win32/sys_env.c
index 5792816267..c78161b344 100644
--- a/erts/emulator/sys/win32/sys_env.c
+++ b/erts/emulator/sys/win32/sys_env.c
@@ -1,319 +1,212 @@
-/*

- * %CopyrightBegin%

- *

- * Copyright Ericsson AB 2002-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%

- */

-

-#ifdef HAVE_CONFIG_H

-#  include "config.h"

-#endif

-

-#include "sys.h"

-#include "erl_sys_driver.h"

-#include "erl_alloc.h"

-

-static WCHAR *merge_environment(WCHAR *current, WCHAR *add);

-static WCHAR *arg_to_env(WCHAR **arg);

-static WCHAR **env_to_arg(WCHAR *env);

-static WCHAR **find_arg(WCHAR **arg, WCHAR *str);

-static int compare(const void *a, const void *b);

-

-static erts_rwmtx_t environ_rwmtx;
-

-void

-erts_sys_env_init(void)

-{

-    erts_rwmtx_init(&environ_rwmtx, "environ", NIL,
-        ERTS_LOCK_FLAGS_PROPERTY_STATIC | ERTS_LOCK_FLAGS_CATEGORY_GENERIC);

-}

-

-int

-erts_sys_putenv_raw(char *key, char *value)

-{

-    int res;

-    erts_rwmtx_rwlock(&environ_rwmtx);
-    res = (SetEnvironmentVariable((LPCTSTR) key,

-				  (LPCTSTR) value) ? 0 : 1);

-    erts_rwmtx_rwunlock(&environ_rwmtx);
-    return res;

-}

-

-int

-erts_sys_putenv(char *key, char *value)

-{

-    int res;

-    WCHAR *wkey = (WCHAR *) key;

-    WCHAR *wvalue = (WCHAR *) value;

-    erts_rwmtx_rwlock(&environ_rwmtx);
-    res = (SetEnvironmentVariableW(wkey,

-				   wvalue) ? 0 : 1);

-    erts_rwmtx_rwunlock(&environ_rwmtx);
-    return res;

-}

-

-int

-erts_sys_getenv(char *key, char *value, size_t *size)

-{

-    size_t req_size = 0;

-    int res = 0;

-    DWORD new_size;

-    WCHAR *wkey = (WCHAR *) key;

-    WCHAR *wvalue = (WCHAR *) value;

-    DWORD wsize = *size / (sizeof(WCHAR) / sizeof(char));

-

-    SetLastError(0);

-    erts_rwmtx_rlock(&environ_rwmtx);
-    new_size = GetEnvironmentVariableW(wkey,

-				       wvalue,

-				      (DWORD) wsize);

-    res = !new_size && GetLastError() == ERROR_ENVVAR_NOT_FOUND ? -1 : 0;

-    erts_rwmtx_runlock(&environ_rwmtx);
-    if (res < 0)

-	return res;

-    res = new_size > wsize ? 1 : 0;

-    *size = new_size * (sizeof(WCHAR) / sizeof(char));

-    return res;

-}

-int

-erts_sys_getenv__(char *key, char *value, size_t *size)

-{

-    size_t req_size = 0;

-    int res = 0;

-    DWORD new_size;

-

-    SetLastError(0);

-    new_size = GetEnvironmentVariable((LPCTSTR) key,

-				      (LPTSTR) value,

-				      (DWORD) *size);

-    res = !new_size && GetLastError() == ERROR_ENVVAR_NOT_FOUND ? -1 : 0;

-    if (res < 0)

-	return res;

-    res = new_size > *size ? 1 : 0;

-    *size = new_size;

-    return res;

-}

-

-int

-erts_sys_getenv_raw(char *key, char *value, size_t *size)

-{

-    int res;

-    erts_rwmtx_rlock(&environ_rwmtx);
-    res = erts_sys_getenv__(key, value, size);

-    erts_rwmtx_runlock(&environ_rwmtx);
-    return res;

-}

-

-void init_getenv_state(GETENV_STATE *state)

-{

-    erts_rwmtx_rlock(&environ_rwmtx);
-    state->environment_strings = GetEnvironmentStringsW();

-    state->next_string = state->environment_strings;

-}

-

-char *getenv_string(GETENV_STATE *state)

-{

-    ERTS_LC_ASSERT(erts_lc_rwmtx_is_rlocked(&environ_rwmtx));
-    if (state->next_string[0] == L'\0') {

-	return NULL;

-    } else {

-	WCHAR *res = state->next_string;

-	state->next_string += wcslen(res) + 1;

-	return (char *) res;

-    }

-}

-

-void fini_getenv_state(GETENV_STATE *state)

-{

-    FreeEnvironmentStringsW(state->environment_strings);

-    state->environment_strings = state->next_string = NULL;

-    erts_rwmtx_runlock(&environ_rwmtx);
-}

-

-int erts_sys_unsetenv(char *key)

-{

-    int res = 0;

-    WCHAR *wkey = (WCHAR *) key;

-

-    SetLastError(0);

-    erts_rwmtx_rlock(&environ_rwmtx);
-    GetEnvironmentVariableW(wkey,

-                            NULL,

-                            0);

-    if (GetLastError() != ERROR_ENVVAR_NOT_FOUND) {

-        res = (SetEnvironmentVariableW(wkey,

-                                       NULL) ? 0 : 1);

-    }

-    erts_rwmtx_runlock(&environ_rwmtx);
-    return res;

-}

-

-char*

-win_build_environment(char* new_env)

-{

-    if (new_env == NULL) {

-	return NULL;

-    } else {

-	WCHAR *tmp, *merged, *tmp_new;

-

-	tmp_new = (WCHAR *) new_env;

-	

-	erts_rwmtx_rlock(&environ_rwmtx);
-	tmp = GetEnvironmentStringsW();

-	merged = merge_environment(tmp, tmp_new);

-

-	FreeEnvironmentStringsW(tmp);

-	erts_rwmtx_runlock(&environ_rwmtx);
-	return (char *) merged;

-    }

-}

-

-static WCHAR *

-merge_environment(WCHAR *old, WCHAR *add)

-{

-    WCHAR **a_arg = env_to_arg(add);

-    WCHAR **c_arg = env_to_arg(old);

-    WCHAR *ret;

-    int i, j;

-    

-    for(i = 0; c_arg[i] != NULL; ++i)

-	;

-

-    for(j = 0; a_arg[j] != NULL; ++j)

-	;

-

-    c_arg = erts_realloc(ERTS_ALC_T_TMP,

-			 c_arg, (i+j+1) * sizeof(WCHAR *));

-

-    for(j = 0; a_arg[j] != NULL; ++j){

-	WCHAR **tmp;

-	WCHAR *current = a_arg[j];

-	WCHAR *eq_p = wcschr(current,L'=');

-	int unset = (eq_p!=NULL && eq_p[1]==L'\0');

-

-	if ((tmp = find_arg(c_arg, current)) != NULL) {

-	    if (!unset) {

-		*tmp = current;

-	    } else {

-		*tmp = c_arg[--i];

-		c_arg[i] = NULL;

-	    }

-	} else if (!unset) {

-	    c_arg[i++] = current;

-	    c_arg[i] = NULL;

-	}

-    }

-    ret = arg_to_env(c_arg);

-    erts_free(ERTS_ALC_T_TMP, c_arg);

-    erts_free(ERTS_ALC_T_TMP, a_arg);

-    return ret;

-}

-

-static WCHAR**

-find_arg(WCHAR **arg, WCHAR *str)

-{

-    WCHAR *tmp;

-    int len;

-

-    if ((tmp = wcschr(str, L'=')) != NULL) {

-	tmp++;

-	len = tmp - str;

-	while (*arg != NULL){

-	    if (_wcsnicmp(*arg, str, len) == 0){

-		return arg;

-	    }

-	    ++arg;

-	}

-    }

-    return NULL;

-}

-

-static int

-compare(const void *a, const void *b)

-{

-    WCHAR *s1 = *((WCHAR **) a);

-    WCHAR *s2 = *((WCHAR **) b);

-    WCHAR *e1 = wcschr(s1,L'=');

-    WCHAR *e2 = wcschr(s2,L'=');

-    int ret;

-    int len;

-  

-    if(!e1)

-	e1 = s1 + wcslen(s1);

-    if(!e2)

-	e2 = s2 + wcslen(s2);

-  

-    if((e1 - s1) > (e2 - s2))

-	len = (e2 - s2);

-    else

-	len = (e1 - s1);

-  

-    ret = _wcsnicmp(s1,s2,len);

-    if (ret == 0)

-	return ((e1 - s1) - (e2 - s2));

-    else

-	return ret;

-}

-

-static WCHAR**

-env_to_arg(WCHAR *env)

-{

-    WCHAR **ret;

-    WCHAR *tmp;

-    int i;

-    int num_strings = 0;

-

-    for(tmp = env; *tmp != '\0'; tmp += wcslen(tmp)+1) {

-	++num_strings;

-    }

-    ret = erts_alloc(ERTS_ALC_T_TMP, sizeof(WCHAR *) * (num_strings + 1));

-    i = 0;

-    for(tmp = env; *tmp != '\0'; tmp += wcslen(tmp)+1){

-	ret[i++] = tmp;

-    }

-    ret[i] = NULL;

-    return ret;

-}

-

-static WCHAR *

-arg_to_env(WCHAR **arg)

-{

-    WCHAR *block;

-    WCHAR *ptr;

-    int i;

-    int totlen = 1;		/* extra '\0' */

-

-    for(i = 0; arg[i] != NULL; ++i) {

-	totlen += wcslen(arg[i])+1;

-    }

-

-    /* sort the environment vector */

-    qsort(arg, i, sizeof(WCHAR *), &compare);

-

-    if (totlen == 1){

-	block = erts_alloc(ERTS_ALC_T_ENVIRONMENT, 2 * sizeof(WCHAR));

-	block[0] = block[1] = '\0'; 

-    } else {

-	block = erts_alloc(ERTS_ALC_T_ENVIRONMENT, totlen * sizeof(WCHAR));

-	ptr = block;

-	for(i=0; arg[i] != NULL; ++i){

-	    wcscpy(ptr, arg[i]);

-	    ptr += wcslen(ptr)+1;

-	}

-	*ptr = '\0';

-    }

-    return block;

-}

+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2002-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.
+ * 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%
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "sys.h"
+#include "erl_sys_driver.h"
+#include "erl_alloc.h"
+
+static erts_osenv_t sysenv_global_env;
+static erts_rwmtx_t sysenv_rwmtx;
+
+static void import_initial_env(void);
+
+void erts_sys_env_init() {
+    erts_rwmtx_init(&sysenv_rwmtx, "environ", NIL,
+        ERTS_LOCK_FLAGS_PROPERTY_STATIC | ERTS_LOCK_FLAGS_CATEGORY_GENERIC);
+
+    erts_osenv_init(&sysenv_global_env);
+    import_initial_env();
+}
+
+const erts_osenv_t *erts_sys_rlock_global_osenv() {
+    erts_rwmtx_rlock(&sysenv_rwmtx);
+    return &sysenv_global_env;
+}
+
+erts_osenv_t *erts_sys_rwlock_global_osenv() {
+    erts_rwmtx_rwlock(&sysenv_rwmtx);
+    return &sysenv_global_env;
+}
+
+void erts_sys_runlock_global_osenv() {
+    erts_rwmtx_runlock(&sysenv_rwmtx);
+}
+
+void erts_sys_rwunlock_global_osenv() {
+    erts_rwmtx_rwunlock(&sysenv_rwmtx);
+}
+
+int erts_sys_explicit_host_getenv(char *key, char *value, size_t *size) {
+    size_t new_size = GetEnvironmentVariableA(key, value, (DWORD)*size);
+
+    if(new_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND) {
+        return 0;
+    } else if(new_size > *size) {
+        return -1;
+    }
+
+    *size = new_size;
+    return 1;
+}
+
+int erts_sys_explicit_8bit_putenv(char *key, char *value) {
+    WCHAR *wide_key, *wide_value;
+    int key_length, value_length;
+    int result;
+
+    /* Note that we do *NOT* honor the filename encoding flags (+fnu/+fnl)
+     * here; the previous implementation used SetEnvironmentVariableA and
+     * things may break if we step away from that. */
+
+    key_length = MultiByteToWideChar(CP_ACP, 0, key, -1, NULL, 0);
+    value_length = MultiByteToWideChar(CP_ACP, 0, value, -1, NULL, 0);
+
+    /* Report "not found" if either string isn't convertible. */
+    if(key_length == 0 || value_length == 0) {
+        return 0;
+    }
+
+    wide_key = erts_alloc(ERTS_ALC_T_TMP, key_length * sizeof(WCHAR));
+    wide_value = erts_alloc(ERTS_ALC_T_TMP, value_length * sizeof(WCHAR));
+
+    MultiByteToWideChar(CP_ACP, 0, key, -1, wide_key, key_length);
+    MultiByteToWideChar(CP_ACP, 0, value, -1, wide_value, value_length);
+
+    {
+        erts_osenv_data_t env_key, env_value;
+        erts_osenv_t *env;
+
+        env = erts_sys_rwlock_global_osenv();
+
+        /* -1 to exclude the NUL terminator. */
+        env_key.length = (key_length - 1) * sizeof(WCHAR);
+        env_key.data = wide_key;
+
+        env_value.length = (value_length - 1) * sizeof(WCHAR);
+        env_value.data = wide_value;
+
+        result = erts_osenv_put_native(env, &env_key, &env_value);
+        erts_sys_rwunlock_global_osenv();
+    }
+
+    erts_free(ERTS_ALC_T_TMP, wide_key);
+    erts_free(ERTS_ALC_T_TMP, wide_value);
+
+    return result;
+}
+
+int erts_sys_explicit_8bit_getenv(char *key, char *value, size_t *size) {
+    erts_osenv_data_t env_key, env_value;
+    int key_length, value_length, result;
+    WCHAR *wide_key, *wide_value;
+
+    key_length = MultiByteToWideChar(CP_ACP, 0, key, -1, NULL, 0);
+
+    /* Report "not found" if the string isn't convertible. */
+    if(key_length == 0) {
+        return 0;
+    }
+
+    wide_key = erts_alloc(ERTS_ALC_T_TMP, key_length * sizeof(WCHAR));
+    MultiByteToWideChar(CP_ACP, 0, key, -1, wide_key, key_length);
+
+    /* We assume that the worst possible size is twice the output buffer width,
+     * as we could theoretically be on a code page that requires surrogates. */
+    value_length = (*size) * 2;
+    wide_value = erts_alloc(ERTS_ALC_T_TMP, value_length * sizeof(WCHAR));
+
+    {
+        const erts_osenv_t *env = erts_sys_rlock_global_osenv();
+
+        /* -1 to exclude the NUL terminator. */
+        env_key.length = (key_length - 1) * sizeof(WCHAR);
+        env_key.data = wide_key;
+
+        env_value.length = value_length * sizeof(WCHAR);
+        env_value.data = wide_value;
+
+        result = erts_osenv_get_native(env, &env_key, &env_value);
+        erts_sys_runlock_global_osenv();
+    }
+
+    if(result == 1 && env_value.length > 0) {
+        /* This function doesn't NUL-terminate if the provided size is >= 0,
+         * so we pass (*size - 1) to reserve space for it and then do it
+         * manually. */
+        *size = WideCharToMultiByte(CP_ACP, 0, env_value.data,
+            env_value.length / sizeof(WCHAR), value, *size - 1, NULL, NULL);
+
+        if(*size == 0) {
+            if(GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
+                result = -1;
+            } else {
+                result = 0;
+            }
+        }
+    } else {
+        *size = 0;
+    }
+
+    if(*size > 0) {
+        value[*size] = '\0';
+    }
+
+    erts_free(ERTS_ALC_T_TMP, wide_key);
+    erts_free(ERTS_ALC_T_TMP, wide_value);
+
+    return result;
+}
+
+static void import_initial_env(void) {
+    WCHAR *environment_block, *current_variable;
+
+    environment_block = GetEnvironmentStringsW();
+    current_variable = environment_block;
+
+    while(wcslen(current_variable) > 0) {
+        WCHAR *separator_index = wcschr(current_variable, L'=');
+
+        /* We tolerate environment variables starting with '=' as the per-drive
+         * working directories are stored this way. */
+        if(separator_index == current_variable) {
+            separator_index = wcschr(separator_index + 1, L'=');
+        }
+
+        if(separator_index != NULL && separator_index != current_variable) {
+            erts_osenv_data_t env_key, env_value;
+
+            env_key.length = (separator_index - current_variable) * sizeof(WCHAR);
+            env_key.data = current_variable;
+
+            env_value.length = (wcslen(separator_index) - 1) * sizeof(WCHAR);
+            env_value.data = separator_index + 1;
+
+            erts_osenv_put_native(&sysenv_global_env, &env_key, &env_value);
+        }
+
+        current_variable += wcslen(current_variable) + 1;
+    }
+
+    FreeEnvironmentStringsW(environment_block);
+}
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index 5e5cd6f578..88ff2a7a92 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -31,6 +31,7 @@
 	 mseg_clear_cache/1,
 	 erts_mmap/1,
 	 cpool/1,
+         set_dyn_param/1,
 	 migration/1]).
 
 -include_lib("common_test/include/ct.hrl").
@@ -41,6 +42,7 @@ suite() ->
 
 all() -> 
     [basic, coalesce, threads, realloc_copy, bucket_index,
+     set_dyn_param,
      bucket_mask, rbtree, mseg_clear_cache, erts_mmap, cpool, migration].
 
 init_per_testcase(Case, Config) when is_list(Config) ->
@@ -65,7 +67,11 @@ mseg_clear_cache(Cfg) -> drv_case(Cfg).
 cpool(Cfg) -> drv_case(Cfg).
 
 migration(Cfg) ->
-    drv_case(Cfg, concurrent, "+MZe true").
+    %% Enable test_alloc.
+    %% Disable driver_alloc to avoid recursive alloc_util calls
+    %% through enif_mutex_create() in my_creating_mbc().
+    drv_case(Cfg, concurrent, "+MZe true +MRe false"),
+    drv_case(Cfg, concurrent, "+MZe true +MRe false +MZas ageffcbf").
 
 erts_mmap(Config) when is_list(Config) ->
     case {os:type(), mmsc_flags()} of
@@ -110,7 +116,7 @@ erts_mmap_do(Config, SCO, SCRPM, SCRFSD) ->
 	       0 -> O1;
 	       _ -> O1 ++ " +MMscrfsd"++integer_to_list(SCRFSD)
 	   end,
-    {ok, Node} = start_node(Config, Opts),
+    {ok, Node} = start_node(Config, Opts, []),
     Self = self(),
     Ref = make_ref(),
     F = fun() ->
@@ -140,6 +146,82 @@ erts_mmap_do(Config, SCO, SCRPM, SCRFSD) ->
     Result.
 
 
+%% Test erlang:system_flag(erts_alloc, ...)
+set_dyn_param(_Config) ->
+    {_, _, _, AlcList} = erlang:system_info(allocator),
+
+    {Enabled, Disabled, Others} =
+        lists:foldl(fun({sys_alloc,_}, {Es, Ds, Os}) ->
+                            {Es, [sys_alloc | Ds], Os};
+
+                       ({AT, Opts}, {Es, Ds, Os}) when is_list(Opts) ->
+                            case lists:keyfind(e, 1, Opts) of
+                                {e, true} ->
+                                    {[AT | Es], Ds, Os};
+                                {e, false} ->
+                                    {Es, [AT | Ds], Os};
+                                false ->
+                                    {Es, Ds, [AT | Os]}
+                            end;
+
+                       (_, Acc) -> Acc
+                    end,
+                    {[], [], []},
+                    AlcList),
+
+    Param = sbct,
+    lists:foreach(fun(AT) -> set_dyn_param_enabled(AT, Param) end,
+                  Enabled),
+
+    lists:foreach(fun(AT) ->
+                          Tpl = {AT, Param, 12345},
+                          io:format("~p\n", [Tpl]),
+                          notsup = erlang:system_flag(erts_alloc, Tpl)
+                  end,
+                  Disabled),
+
+    lists:foreach(fun(AT) ->
+                          Tpl = {AT, Param, 12345},
+                          io:format("~p\n", [Tpl]),
+                          {'EXIT',{badarg,_}} =
+                              (catch erlang:system_flag(erts_alloc, Tpl))
+                  end,
+                  Others),
+    ok.
+
+set_dyn_param_enabled(AT, Param) ->
+    OldVal = get_alc_param(AT, Param),
+
+    Val1 = OldVal div 2,
+    Tuple = {AT, Param, Val1},
+    io:format("~p\n", [Tuple]),
+    ok = erlang:system_flag(erts_alloc, Tuple),
+    Val1 = get_alc_param(AT, Param),
+
+    ok = erlang:system_flag(erts_alloc, {AT, Param, OldVal}),
+    OldVal = get_alc_param(AT, Param),
+    ok.
+
+get_alc_param(AT, Param) ->
+    lists:foldl(fun({instance,_,Istats}, Acc) ->
+                        {options,Opts} = lists:keyfind(options, 1, Istats),
+                        {Param,Val} = lists:keyfind(Param, 1, Opts),
+                        {as,Strategy} = lists:keyfind(as, 1, Opts),
+
+                        case {param_for_strat(Param, Strategy), Acc} of
+                            {false, _} -> Acc;
+                            {true, undefined} -> Val;
+                            {true, _} ->
+                                Val = Acc
+                        end
+                end,
+                undefined,
+                erlang:system_info({allocator, AT})).
+
+param_for_strat(sbct, gf) -> false;
+param_for_strat(_, _) -> true.
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%                                                                        %%
 %% Internal functions                                                     %%
@@ -151,7 +233,9 @@ drv_case(Config) ->
 drv_case(Config, Mode, NodeOpts) when is_list(Config) ->
     case os:type() of
 	{Family, _} when Family == unix; Family == win32 ->
-	    {ok, Node} = start_node(Config, NodeOpts),
+            %%Prog = {prog,"/my/own/otp/bin/cerl -debug"},
+            Prog = [],
+	    {ok, Node} = start_node(Config, NodeOpts, Prog),
 	    Self = self(),
 	    Ref = make_ref(),
 	    spawn_link(Node,
@@ -217,19 +301,35 @@ wait_for_memory_deallocations() ->
     end.
 
 print_stats(migration) ->
-    {Btot,Ctot} = lists:foldl(fun({instance,Inr,Istats}, {Bacc,Cacc}) ->
-				      {mbcs,MBCS} = lists:keyfind(mbcs, 1, Istats),
-				      Btup = lists:keyfind(blocks, 1, MBCS),
-				      Ctup = lists:keyfind(carriers, 1, MBCS),
-				      io:format("{instance,~p,~p,~p}\n", [Inr, Btup, Ctup]),
-				      {tuple_add(Bacc,Btup),tuple_add(Cacc,Ctup)};
-				 (_, Acc) -> Acc
-			      end,
-			      {{blocks,0,0,0},{carriers,0,0,0}},
-			      erlang:system_info({allocator,test_alloc})),
-
+    IFun = fun({instance,Inr,Istats}, {Bacc,Cacc,Pacc}) ->
+                   {mbcs,MBCS} = lists:keyfind(mbcs, 1, Istats),
+                   Btup = lists:keyfind(blocks, 1, MBCS),
+                   Ctup = lists:keyfind(carriers, 1, MBCS),
+
+                   Ptup = case lists:keyfind(mbcs_pool, 1, Istats) of
+                              {mbcs_pool,POOL} ->
+                                  {blocks, Bpool} = lists:keyfind(blocks, 1, POOL),
+                                  {carriers, Cpool} = lists:keyfind(carriers, 1, POOL),
+                                  {pool, Bpool, Cpool};
+                              false ->
+                                  {pool, 0, 0}
+                          end,
+                   io:format("{instance,~p,~p,~p,~p}}\n",
+                             [Inr, Btup, Ctup, Ptup]),
+                   {tuple_add(Bacc,Btup),tuple_add(Cacc,Ctup),
+                    tuple_add(Pacc,Ptup)};
+              (_, Acc) -> Acc
+           end,
+
+    {Btot,Ctot,Ptot} = lists:foldl(IFun,
+                                   {{blocks,0,0,0},{carriers,0,0,0},{pool,0,0}},
+                                   erlang:system_info({allocator,test_alloc})),
+
+    {pool, PBtot, PCtot} = Ptot,
     io:format("Number of blocks  : ~p\n", [Btot]),
-    io:format("Number of carriers: ~p\n", [Ctot]);
+    io:format("Number of carriers: ~p\n", [Ctot]),
+    io:format("Number of pooled blocks  : ~p\n", [PBtot]),
+    io:format("Number of pooled carriers: ~p\n", [PCtot]);
 print_stats(_) -> ok.
 
 tuple_add(T1, T2) ->
@@ -326,13 +426,13 @@ handle_result(_State, Result0) ->
 	    continue
     end.
 
-start_node(Config, Opts) when is_list(Config), is_list(Opts) ->
+start_node(Config, Opts, Prog) when is_list(Config), is_list(Opts) ->
     case proplists:get_value(debug,Config) of
 	true -> {ok, node()};
-	_ -> start_node_1(Config, Opts)
+	_ -> start_node_1(Config, Opts, Prog)
     end.
 
-start_node_1(Config, Opts) ->
+start_node_1(Config, Opts, Prog) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
 			++ "-"
@@ -341,7 +441,11 @@ start_node_1(Config, Opts) ->
 			++ integer_to_list(erlang:system_time(second))
 			++ "-"
 			++ integer_to_list(erlang:unique_integer([positive]))),
-    test_server:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
+    ErlArg = case Prog of
+                 [] -> [];
+                 _ -> [{erl,[Prog]}]
+             end,
+    test_server:start_node(Name, slave, [{args, Opts++" -pa "++Pa} | ErlArg]).
 
 stop_node(Node) when Node =:= node() -> ok;
 stop_node(Node) ->
diff --git a/erts/emulator/test/alloc_SUITE_data/allocator_test.h b/erts/emulator/test/alloc_SUITE_data/allocator_test.h
index 97ee58cdad..5272f86c98 100644
--- a/erts/emulator/test/alloc_SUITE_data/allocator_test.h
+++ b/erts/emulator/test/alloc_SUITE_data/allocator_test.h
@@ -156,7 +156,8 @@ typedef void* erts_cond;
 #define IS_SMP_ENABLED		((int)		ALC_TEST0(0xf13))
 #define ALLOC_TEST(S)		((void*)	ALC_TEST1(0xf14, (S)))
 #define FREE_TEST(P)		((void)		ALC_TEST1(0xf15, (P)))
-#define SET_TEST_MBC_USER_HEADER(SZ,CMBC,DMBC) ((int)ALC_TEST3(0xf16, (SZ), (CMBC), (DMBC)))
-#define GET_TEST_MBC_SIZE()     ((int)          ALC_TEST0(0xf17))
+#define REALLOC_TEST(P,S)	((void*)	ALC_TEST2(0xf16, (P), (S)))
+#define SET_TEST_MBC_USER_HEADER(SZ,CMBC,DMBC) ((int)ALC_TEST3(0xf17, (SZ), (CMBC), (DMBC)))
+#define GET_TEST_MBC_SIZE()     ((int)          ALC_TEST0(0xf18))
 
 #endif
diff --git a/erts/emulator/test/alloc_SUITE_data/migration.c b/erts/emulator/test/alloc_SUITE_data/migration.c
index b9a4de03b3..1d974225fc 100644
--- a/erts/emulator/test/alloc_SUITE_data/migration.c
+++ b/erts/emulator/test/alloc_SUITE_data/migration.c
@@ -223,6 +223,42 @@ static int rand_int(MigrationState* state, int low, int high)
     return low + (x % (high+1-low));
 }
 
+enum Operation
+{
+    ALLOCATE_OP,
+    FREE_OP,
+    REALLOC_OP,
+    CLEANUP_OP
+};
+
+static enum Operation rand_op(MigrationState* state)
+{
+    int r = rand_int(state, 1, 100);
+    switch (state->phase) {
+    case GROWING:
+        FATAL_ASSERT(state->nblocks < state->max_nblocks);
+        if (r > 10 || state->nblocks == 0)
+            return ALLOCATE_OP;
+        else if (r > 5)
+            return FREE_OP;
+        else
+            return REALLOC_OP;
+
+    case SHRINKING:
+        FATAL_ASSERT(state->nblocks > 0);
+        if (r > 10 || state->nblocks == state->max_nblocks)
+            return FREE_OP;
+        else if (r > 5)
+            return ALLOCATE_OP;
+        else
+            return REALLOC_OP;
+
+    case CLEANUP:
+        return CLEANUP_OP;
+    default:
+        FATAL_ASSERT(!"Invalid op phase");
+    }
+}
 
 static void do_cleanup(TestCaseState_t *tcs, MigrationState* state)
 {
@@ -275,53 +311,75 @@ testcase_run(TestCaseState_t *tcs)
 	state->goal_nblocks = rand_int(state, 1, state->max_nblocks);
     }
 
-    switch (state->phase) {
-    case GROWING: {
+    switch (rand_op(state)) {
+    case ALLOCATE_OP: {
 	MyBlock* p;
 	FATAL_ASSERT(!state->blockv[state->nblocks]);
-	p = ALLOC_TEST(rand_int(state, state->block_size/2, state->block_size));
+        p = ALLOC_TEST(rand_int(state, state->block_size/2, state->block_size));
 	FATAL_ASSERT(p);
 	add_block(p, state);
-	state->blockv[state->nblocks] = p;
-	if (++state->nblocks >= state->goal_nblocks) {
-	    /*testcase_printf(tcs, "%d: Grown to %d blocks", tcs->thr_nr, state->nblocks);*/
-	    state->phase = SHRINKING;
-	    state->goal_nblocks = rand_int(state, 0, state->goal_nblocks-1);
-	}
-	else
-	    FATAL_ASSERT(!state->blockv[state->nblocks]);
+	state->blockv[state->nblocks++] = p;
 	break;
     }
-    case SHRINKING: {
+    case FREE_OP: {
 	int ix = rand_int(state, 0, state->nblocks-1);
 	FATAL_ASSERT(state->blockv[ix]);
 	remove_block(state->blockv[ix]);
 	FREE_TEST(state->blockv[ix]);
 	state->blockv[ix] = state->blockv[--state->nblocks];
 	state->blockv[state->nblocks] = NULL;
-
-	if (state->nblocks <= state->goal_nblocks) {
-	    /*testcase_printf(tcs, "%d: Shrunk to %d blocks", tcs->thr_nr, state->nblocks);*/
-	    if (++state->round >= MAX_ROUNDS) {
-		state->phase = CLEANUP;
-	    } else {
-		state->phase = GROWING;
-		state->goal_nblocks = rand_int(state, state->goal_nblocks+1, state->max_nblocks);
-	    }
-	}
 	break;
     }
+    case REALLOC_OP: {
+        int ix = rand_int(state, 0, state->nblocks-1);
+        MyBlock* p;
+        FATAL_ASSERT(state->blockv[ix]);
+        remove_block(state->blockv[ix]);
+        p = REALLOC_TEST(state->blockv[ix], rand_int(state, state->block_size/2, state->block_size));
+        FATAL_ASSERT(p);
+        add_block(p, state);
+        state->blockv[ix] = p;
+        break;
+    }
+    case CLEANUP_OP:
+        do_cleanup(tcs, state);
+        break;
+    default:
+	FATAL_ASSERT(!"Invalid operation");
+    }
+
+    switch (state->phase) {
+    case GROWING: {
+        if (state->nblocks >= state->goal_nblocks) {
+            /*testcase_printf(tcs, "%d: Grown to %d blocks", tcs->thr_nr, state->nblocks);*/
+            state->phase = SHRINKING;
+            state->goal_nblocks = rand_int(state, 0, state->goal_nblocks-1);
+        }
+        else
+            FATAL_ASSERT(!state->blockv[state->nblocks]);
+        break;
+    }
+    case SHRINKING: {
+        if (state->nblocks <= state->goal_nblocks) {
+            /*testcase_printf(tcs, "%d: Shrunk to %d blocks", tcs->thr_nr, state->nblocks);*/
+            if (++state->round >= MAX_ROUNDS) {
+                state->phase = CLEANUP;
+            } else {
+                state->phase = GROWING;
+                state->goal_nblocks = rand_int(state, state->goal_nblocks+1, state->max_nblocks);
+            }
+        }
+        break;
+    }
     case CLEANUP:
-	do_cleanup(tcs, state);
-	break;
+    case DONE:
+        break;
 
     default:
 	FATAL_ASSERT(!"Invalid phase");
     }
 
-    if (state->phase == DONE) {
-    }
-    else {
+    if (state->phase != DONE) {
 	testcase_continue(tcs);
     }
 }
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 61536bacd7..a3c3daac15 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -48,6 +48,7 @@
 	 bad_list_to_binary/1, bad_binary_to_list/1,
 	 t_split_binary/1, bad_split/1,
 	 terms/1, terms_float/1, float_middle_endian/1,
+         b2t_used_big/1,
 	 external_size/1, t_iolist_size/1,
 	 t_hash/1,
 	 bad_size/1,
@@ -57,7 +58,9 @@
 	 otp_5484/1,otp_5933/1,
 	 ordering/1,unaligned_order/1,gc_test/1,
 	 bit_sized_binary_sizes/1,
-	 otp_6817/1,deep/1,obsolete_funs/1,robustness/1,otp_8117/1,
+	 otp_6817/1,deep/1,
+         term2bin_tuple_fallbacks/1,
+         robustness/1,otp_8117/1,
 	 otp_8180/1, trapping/1, large/1,
 	 error_after_yield/1, cmp_old_impl/1]).
 
@@ -72,12 +75,14 @@ all() ->
      t_split_binary, bad_split,
      bad_list_to_binary, bad_binary_to_list, terms,
      terms_float, float_middle_endian, external_size, t_iolist_size,
+     b2t_used_big,
      bad_binary_to_term_2, safe_binary_to_term2,
      bad_binary_to_term, bad_terms, t_hash, bad_size,
      bad_term_to_binary, more_bad_terms, otp_5484, otp_5933,
      ordering, unaligned_order, gc_test,
      bit_sized_binary_sizes, otp_6817, otp_8117, deep,
-     obsolete_funs, robustness, otp_8180, trapping, large,
+     term2bin_tuple_fallbacks,
+     robustness, otp_8180, trapping, large,
      error_after_yield, cmp_old_impl].
 
 groups() -> 
@@ -257,6 +262,7 @@ test_deep_bitstr(List) ->
     {Bin,bitstring_to_list(Bin)}.
 
 bad_list_to_binary(Config) when is_list(Config) ->
+    test_bad_bin(<<1:1>>),
     test_bad_bin(atom),
     test_bad_bin(42),
     test_bad_bin([1|2]),
@@ -425,40 +431,77 @@ bad_term_to_binary(Config) when is_list(Config) ->
 
 terms(Config) when is_list(Config) ->
     TestFun = fun(Term) ->
-		      try
-			  S = io_lib:format("~p", [Term]),
-			  io:put_chars(S)
-		      catch
-			  error:badarg ->
-			      io:put_chars("bit sized binary")
-		      end,
+                      S = io_lib:format("~p", [Term]),
+                      io:put_chars(S),
 		      Bin = term_to_binary(Term),
 		      case erlang:external_size(Bin) of
 			  Sz when is_integer(Sz), size(Bin) =< Sz ->
 			      ok
 		      end,
-              Bin1 = term_to_binary(Term, [{minor_version, 1}]),
-              case erlang:external_size(Bin1, [{minor_version, 1}]) of
-              Sz1 when is_integer(Sz1), size(Bin1) =< Sz1 ->
-                  ok
-              end,
+                      Bin1 = term_to_binary(Term, [{minor_version, 1}]),
+                      case erlang:external_size(Bin1, [{minor_version, 1}]) of
+                          Sz1 when is_integer(Sz1), size(Bin1) =< Sz1 ->
+                              ok
+                      end,
 		      Term = binary_to_term_stress(Bin),
 		      Term = binary_to_term_stress(Bin, [safe]),
-		      Unaligned = make_unaligned_sub_binary(Bin),
-		      Term = binary_to_term_stress(Unaligned),
-		      Term = binary_to_term_stress(Unaligned, []),
-		      Term = binary_to_term_stress(Bin, [safe]),
+                      Bin_sz = byte_size(Bin),
+		      {Term,Bin_sz} = binary_to_term_stress(Bin, [used]),
+
+                      BinE = <<Bin/binary, 1, 2, 3>>,
+		      {Term,Bin_sz} = binary_to_term_stress(BinE, [used]),
+
+		      BinU = make_unaligned_sub_binary(Bin),
+		      Term = binary_to_term_stress(BinU),
+		      Term = binary_to_term_stress(BinU, []),
+		      Term = binary_to_term_stress(BinU, [safe]),
+		      {Term,Bin_sz} = binary_to_term_stress(BinU, [used]),
+
+                      BinUE = make_unaligned_sub_binary(BinE),
+		      {Term,Bin_sz} = binary_to_term_stress(BinUE, [used]),
+
 		      BinC = erlang:term_to_binary(Term, [compressed]),
+                      BinC_sz = byte_size(BinC),
+		      true = BinC_sz =< size(Bin),
 		      Term = binary_to_term_stress(BinC),
-		      true = size(BinC) =< size(Bin),
+		      {Term, BinC_sz} = binary_to_term_stress(BinC, [used]),
+
 		      Bin = term_to_binary(Term, [{compressed,0}]),
 		      terms_compression_levels(Term, size(Bin), 1),
-		      UnalignedC = make_unaligned_sub_binary(BinC),
-		      Term = binary_to_term_stress(UnalignedC)
+
+		      BinUC = make_unaligned_sub_binary(BinC),
+		      Term = binary_to_term_stress(BinUC),
+                      {Term,BinC_sz} = binary_to_term_stress(BinUC, [used]),
+
+                      BinCE = <<BinC/binary, 1, 2, 3>>,
+		      {Term,BinC_sz} = binary_to_term_stress(BinCE, [used]),
+
+		      BinUCE = make_unaligned_sub_binary(BinCE),
+		      Term = binary_to_term_stress(BinUCE),
+                      {Term,BinC_sz} = binary_to_term_stress(BinUCE, [used])
 	      end,
     test_terms(TestFun),
     ok.
 
+%% Test binary_to_term(_, [used]) returning a big Used integer.
+b2t_used_big(_Config) ->
+    case erlang:system_info(wordsize) of
+        8 ->
+            {skipped, "This is not a 32-bit machine"};
+        4 ->
+            %% Use a long utf8 atom for large external format but compact on heap.
+            BigAtom = binary_to_atom(<< <<16#F0908D88:32>> || _ <- lists:seq(1,255) >>,
+                                     utf8),
+            Atoms = (1 bsl 17) + (1 bsl 9),
+            BigAtomList = lists:duplicate(Atoms, BigAtom),
+            BigBin = term_to_binary(BigAtomList),
+            {BigAtomList, Used} = binary_to_term(BigBin, [used]),
+            2 = erts_debug:size(Used),
+            Used = byte_size(BigBin),
+            Used = 1 + 1 + 4 + Atoms*(1+2+4*255) + 1,
+            ok
+    end.
+
 terms_compression_levels(Term, UncompressedSz, Level) when Level < 10 ->
     BinC = erlang:term_to_binary(Term, [{compressed,Level}]),
     Term = binary_to_term_stress(BinC),
@@ -1160,7 +1203,7 @@ very_big_num(0, Result) ->
     Result.
 
 make_port() ->
-    open_port({spawn, efile}, [eof]).
+    hd(erlang:ports()).
 
 make_pid() ->
     spawn_link(?MODULE, sleeper, []).
@@ -1261,40 +1304,28 @@ deep_roundtrip(T) ->
     B = term_to_binary(T),
     T = binary_to_term(B).
 
-obsolete_funs(Config) when is_list(Config) ->
+term2bin_tuple_fallbacks(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
 
-    X = id({1,2,3}),
-    Y = id([a,b,c,d]),
-    Z = id({x,y,z}),
-    obsolete_fun(fun() -> ok end),
-    obsolete_fun(fun() -> X end),
-    obsolete_fun(fun(A) -> {A,X} end),
-    obsolete_fun(fun() -> {X,Y} end),
-    obsolete_fun(fun() -> {X,Y,Z} end),
-
-    obsolete_fun(fun ?MODULE:all/1),
+    term2bin_tf(fun ?MODULE:all/1),
+    term2bin_tf(<<1:1>>),
+    term2bin_tf(<<90,80:7>>),
 
     erts_debug:set_internal_state(available_internal_state, false),
     ok.
 
-obsolete_fun(Fun) ->
-    Tuple = case erlang:fun_info(Fun, type) of
-		{type,external} ->
-		    {module,M} = erlang:fun_info(Fun, module),
-		    {name,F} = erlang:fun_info(Fun, name),
-		    {M,F};
-		{type,local} ->
-		    {module,M} = erlang:fun_info(Fun, module),
-		    {index,I} = erlang:fun_info(Fun, index),
-		    {uniq,U} = erlang:fun_info(Fun, uniq),
-		    {env,E} = erlang:fun_info(Fun, env),
-		    {'fun',M,I,U,list_to_tuple(E)}
-	    end,
-    Tuple = no_fun_roundtrip(Fun).
-
-no_fun_roundtrip(Term) ->
-    binary_to_term_stress(erts_debug:get_internal_state({term_to_binary_no_funs,Term})).
+term2bin_tf(Term) ->
+    Tuple = case Term of
+                Fun when is_function(Fun) ->
+                    {type, external} = erlang:fun_info(Fun, type),
+                    {module,M} = erlang:fun_info(Fun, module),
+                    {name,F} = erlang:fun_info(Fun, name),
+                    {M,F};
+                BS when bit_size(BS) rem 8 =/= 0 ->
+                    Bits = bit_size(BS) rem 8,
+                    {<<BS/bitstring, 0:(8-Bits)>>, Bits}
+            end,
+    Tuple = binary_to_term_stress(erts_debug:get_internal_state({term_to_binary_tuple_fallbacks,Term})).
 
 %% Test non-standard encodings never generated by term_to_binary/1
 %% but recognized by binary_to_term/1.
@@ -1442,13 +1473,13 @@ error_after_yield(Type, M, F, AN, AFun, TrapFunc) ->
 					   apply(M, F, A),
 					   exit({unexpected_success, {M, F, A}})
 				       catch
-					   error:Type ->
+					   error:Type:Stk ->
 					       erlang:trace(self(),false,[running,{tracer,Tracer}]),
 					       %% We threw the exception from the native
 					       %% function we trapped to, but we want
 					       %% the BIF that originally was called
 					       %% to appear in the stack trace.
-					       [{M, F, A, _} | _] = erlang:get_stacktrace()
+					       [{M, F, A, _} | _] = Stk
 				       end
 			       end),
     receive
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl
index 1251d644ae..d19f7f81ad 100644
--- a/erts/emulator/test/call_trace_SUITE.erl
+++ b/erts/emulator/test/call_trace_SUITE.erl
@@ -1116,8 +1116,8 @@ get_deep_4_loc(Arg) ->
         deep_4(Arg),
         ct:fail(should_not_return_to_here)
     catch
-        _:_ ->
-            [{?MODULE,deep_4,1,Loc0}|_] = erlang:get_stacktrace(),
+        _:_:Stk ->
+            [{?MODULE,deep_4,1,Loc0}|_] = Stk,
             Loc0
     end.
 
diff --git a/erts/emulator/test/code_SUITE.erl b/erts/emulator/test/code_SUITE.erl
index 77321aa50f..661a2ee6c9 100644
--- a/erts/emulator/test/code_SUITE.erl
+++ b/erts/emulator/test/code_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2017. 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.
@@ -25,8 +25,10 @@
          multi_proc_purge/1, t_check_old_code/1,
          external_fun/1,get_chunk/1,module_md5/1,
          constant_pools/1,constant_refc_binaries/1,
+         fake_literals/1,
          false_dependency/1,coverage/1,fun_confusion/1,
-         t_copy_literals/1, t_copy_literals_frags/1]).
+         t_copy_literals/1, t_copy_literals_frags/1,
+         erl_544/1]).
 
 -define(line_trace, 1).
 -include_lib("common_test/include/ct.hrl").
@@ -38,8 +40,10 @@ all() ->
      call_purged_fun_code_reload, call_purged_fun_code_there,
      multi_proc_purge, t_check_old_code, external_fun, get_chunk,
      module_md5,
-     constant_pools, constant_refc_binaries, false_dependency,
-     coverage, fun_confusion, t_copy_literals, t_copy_literals_frags].
+     constant_pools, constant_refc_binaries, fake_literals,
+     false_dependency,
+     coverage, fun_confusion, t_copy_literals, t_copy_literals_frags,
+     erl_544].
 
 init_per_suite(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
@@ -554,6 +558,62 @@ wait_for_memory_deallocations() ->
             wait_for_memory_deallocations()
     end.
 
+fake_literals(_Config) ->
+    Mod = fake__literals__module,
+    try
+        do_fake_literals(Mod)
+    after
+        _ = code:purge(Mod),
+        _ = code:delete(Mod),
+        _ = code:purge(Mod),
+        _ = code:delete(Mod)
+    end,
+    ok.
+
+do_fake_literals(Mod) ->
+    Tid = ets:new(test, []),
+    ExtTerms = get_external_terms(),
+    Term0 = {self(),make_ref(),Tid,fun() -> ok end,ExtTerms},
+    Terms = [begin
+                 make_literal_module(Mod, Term0),
+                 Mod:term()
+             end || _ <- lists:seq(1, 10)],
+    verify_lit_terms(Terms, Term0),
+    true = ets:delete(Tid),
+    ok.
+
+make_literal_module(Mod, Term) ->
+    Exp = [{term,0}],
+    Attr = [],
+    Fs = [{function,term,0,2,
+           [{label,1},
+            {line,[]},
+            {func_info,{atom,Mod},{atom,term},0},
+            {label,2},
+            {move,{literal,Term},{x,0}},
+            return]}],
+    Asm = {Mod,Exp,Attr,Fs,2},
+    {ok,Mod,Beam} = compile:forms(Asm, [from_asm,binary,report]),
+    code:load_binary(Mod, atom_to_list(Mod), Beam).
+
+verify_lit_terms([H|T], Term) ->
+    case H =:= Term of
+        true ->
+            verify_lit_terms(T, Term);
+        false ->
+            error({bad_term,H})
+    end;
+verify_lit_terms([], _) ->
+    ok.
+
+get_external_terms() ->
+    {ok,Node} =	test_server:start_node(?FUNCTION_NAME, slave, []),
+    Ref = rpc:call(Node, erlang, make_ref, []),
+    Ports = rpc:call(Node, erlang, ports, []),
+    Pid = rpc:call(Node, erlang, self, []),
+    _ = test_server:stop_node(Node),
+    {Ref,hd(Ports),Pid}.
+
 %% OTP-7559: c_p->cp could contain garbage and create a false dependency
 %% to a module in a process. (Thanks to Richard Carlsson.)
 false_dependency(Config) when is_list(Config) ->
@@ -860,6 +920,53 @@ reloader(Mod,Code,Time) ->
               reloader(Mod,Code,Time)
     end.
 
+erl_544(Config) when is_list(Config) ->
+    case file:native_name_encoding() of
+        utf8 ->
+            {ok, CWD} = file:get_cwd(),
+            try
+                Mod = erl_544,
+                FileName = atom_to_list(Mod) ++ ".erl",
+                Priv = proplists:get_value(priv_dir, Config),
+                Data = proplists:get_value(data_dir, Config),
+                {ok, FileContent} = file:read_file(filename:join(Data,
+                                                                 FileName)),
+                Dir = filename:join(Priv, [16#2620,16#2620,16#2620]),
+                File = filename:join(Dir, FileName),
+                io:format("~ts~n", [File]),
+                ok = file:make_dir(Dir),
+                ok = file:set_cwd(Dir),
+                ok = file:write_file(File, [FileContent]),
+                {ok, Mod} = compile:file(File),
+                Res1 = (catch Mod:err()),
+                io:format("~p~n", [Res1]),
+                {'EXIT', {err, [{Mod, err, 0, Info1}|_]}} = Res1,
+                File = proplists:get_value(file, Info1),
+                Me = self(),
+                Go = make_ref(),
+                Tester = spawn_link(fun () ->
+                                            Mod:wait(Me, Go),
+                                            Mod:err()
+                                    end),
+                receive Go -> ok end,
+                Res2 = process_info(Tester, current_stacktrace),
+                io:format("~p~n", [Res2]),
+                {current_stacktrace, Stack} = Res2,
+                [{Mod, wait, 2, Info2}|_] = Stack,
+                File = proplists:get_value(file, Info2),
+                StackFun = fun(_, _, _) -> false end,
+                FormatFun = fun (Term, _) -> io_lib:format("~tp", [Term]) end,
+                Formated =
+                    lib:format_stacktrace(1, Stack, StackFun, FormatFun),
+                true = is_list(Formated),
+                ok
+            after
+                ok = file:set_cwd(CWD)
+            end,
+            ok;
+        _Enc ->
+            {skipped, "Only run when native file name encoding is utf8"}
+    end.
 
 %% Utilities.
 
diff --git a/erts/emulator/test/code_SUITE_data/erl_544.erl b/erts/emulator/test/code_SUITE_data/erl_544.erl
new file mode 100644
index 0000000000..c93f3ef5bc
--- /dev/null
+++ b/erts/emulator/test/code_SUITE_data/erl_544.erl
@@ -0,0 +1,35 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 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.
+%% 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(erl_544).
+
+-export([err/0, wait/2]).
+
+err() ->
+    erlang:error(err).
+
+wait(Pid, Msg) ->
+    erlang:yield(),
+    Pid ! Msg,
+    receive
+    after infinity ->
+            ok
+    end,
+    err().
diff --git a/erts/emulator/test/ddll_SUITE.erl b/erts/emulator/test/ddll_SUITE.erl
index 031b05790d..4998fc08be 100644
--- a/erts/emulator/test/ddll_SUITE.erl
+++ b/erts/emulator/test/ddll_SUITE.erl
@@ -775,7 +775,7 @@ errors(Config) when is_list(Config) ->
     {error, bad_driver_name} = erl_ddll:load_driver(Path, wrongname_drv),
 
     %% We assume that there is a statically linked driver named "ddll":
-    {error, linked_in_driver} = erl_ddll:unload_driver(efile),
+    {error, linked_in_driver} = erl_ddll:unload_driver(ram_file_drv),
     {error, not_loaded} = erl_ddll:unload_driver("__pucko_driver__"),
 
     case os:type() of
diff --git a/erts/emulator/test/dirty_bif_SUITE.erl b/erts/emulator/test/dirty_bif_SUITE.erl
index 981ec4d48d..46eb0cba58 100644
--- a/erts/emulator/test/dirty_bif_SUITE.erl
+++ b/erts/emulator/test/dirty_bif_SUITE.erl
@@ -108,90 +108,80 @@ dirty_bif_exception(Config) when is_list(Config) ->
 			      erts_debug:dirty_cpu(error, Error),
 			      ct:fail(expected_exception)
 			  catch
-			      error:ErrorType ->
-				  [{erts_debug,dirty_cpu,[error, Error],_}|_]
-				      = erlang:get_stacktrace(),
+			      error:ErrorType:Stk1 ->
+				  [{erts_debug,dirty_cpu,[error, Error],_}|_] = Stk1,
 				  ok
 			  end,
 			  try
 			      apply(erts_debug,dirty_cpu,[error, Error]),
 			      ct:fail(expected_exception)
 			  catch
-			      error:ErrorType ->
-				  [{erts_debug,dirty_cpu,[error, Error],_}|_]
-				      = erlang:get_stacktrace(),
+			      error:ErrorType:Stk2 ->
+				  [{erts_debug,dirty_cpu,[error, Error],_}|_] = Stk2,
 				  ok
 			  end,
 			  try
 			      erts_debug:dirty_io(error, Error),
 			      ct:fail(expected_exception)
 			  catch
-			      error:ErrorType ->
-				  [{erts_debug,dirty_io,[error, Error],_}|_]
-				      = erlang:get_stacktrace(),
+			      error:ErrorType:Stk3 ->
+				  [{erts_debug,dirty_io,[error, Error],_}|_] = Stk3,
 				  ok
 			  end,
 			  try
 			      apply(erts_debug,dirty_io,[error, Error]),
 			      ct:fail(expected_exception)
 			  catch
-			      error:ErrorType ->
-				  [{erts_debug,dirty_io,[error, Error],_}|_]
-				      = erlang:get_stacktrace(),
+			      error:ErrorType:Stk4 ->
+				  [{erts_debug,dirty_io,[error, Error],_}|_] = Stk4,
 				  ok
 			  end,
 			  try
 			      erts_debug:dirty(normal, error, Error),
 			      ct:fail(expected_exception)
 			  catch
-			      error:ErrorType ->
-				  [{erts_debug,dirty,[normal, error, Error],_}|_]
-				      = erlang:get_stacktrace(),
+			      error:ErrorType:Stk5 ->
+				  [{erts_debug,dirty,[normal, error, Error],_}|_] = Stk5,
 				  ok
 			  end,
 			  try
 			      apply(erts_debug,dirty,[normal, error, Error]),
 			      ct:fail(expected_exception)
 			  catch
-			      error:ErrorType ->
-				  [{erts_debug,dirty,[normal, error, Error],_}|_]
-				      = erlang:get_stacktrace(),
+			      error:ErrorType:Stk6 ->
+				  [{erts_debug,dirty,[normal, error, Error],_}|_] = Stk6,
 				  ok
 			  end,
 			  try
 			      erts_debug:dirty(dirty_cpu, error, Error),
 			      ct:fail(expected_exception)
 			  catch
-			      error:ErrorType ->
-				  [{erts_debug,dirty,[dirty_cpu, error, Error],_}|_]
-				      = erlang:get_stacktrace(),
+			      error:ErrorType:Stk7 ->
+				  [{erts_debug,dirty,[dirty_cpu, error, Error],_}|_] = Stk7,
 				  ok
 			  end,
 			  try
 			      apply(erts_debug,dirty,[dirty_cpu, error, Error]),
 			      ct:fail(expected_exception)
 			  catch
-			      error:ErrorType ->
-				  [{erts_debug,dirty,[dirty_cpu, error, Error],_}|_]
-				      = erlang:get_stacktrace(),
+			      error:ErrorType:Stk8 ->
+				  [{erts_debug,dirty,[dirty_cpu, error, Error],_}|_] = Stk8,
 				  ok
 			  end,
 			  try
 			      erts_debug:dirty(dirty_io, error, Error),
 			      ct:fail(expected_exception)
 			  catch
-			      error:ErrorType ->
-				  [{erts_debug,dirty,[dirty_io, error, Error],_}|_]
-				      = erlang:get_stacktrace(),
+			      error:ErrorType:Stk9 ->
+				  [{erts_debug,dirty,[dirty_io, error, Error],_}|_] = Stk9,
 				  ok
 			  end,
 			  try
 			      apply(erts_debug,dirty,[dirty_io, error, Error]),
 			      ct:fail(expected_exception)
 			  catch
-			      error:ErrorType ->
-				  [{erts_debug,dirty,[dirty_io, error, Error],_}|_]
-				      = erlang:get_stacktrace(),
+			      error:ErrorType:Stk10 ->
+				  [{erts_debug,dirty,[dirty_io, error, Error],_}|_] = Stk10,
 				  ok
 			  end
 		  end,
@@ -204,25 +194,22 @@ dirty_bif_multischedule_exception(Config) when is_list(Config) ->
     try
 	erts_debug:dirty_cpu(reschedule,1001)
     catch
-	error:badarg ->
-	    [{erts_debug,dirty_cpu,[reschedule, 1001],_}|_]
-		= erlang:get_stacktrace(),
+	error:badarg:Stk1 ->
+	    [{erts_debug,dirty_cpu,[reschedule, 1001],_}|_] = Stk1,
 	    ok
     end,
     try
 	erts_debug:dirty_io(reschedule,1001)
     catch
-	error:badarg ->
-	    [{erts_debug,dirty_io,[reschedule, 1001],_}|_]
-		= erlang:get_stacktrace(),
+	error:badarg:Stk2 ->
+	    [{erts_debug,dirty_io,[reschedule, 1001],_}|_] = Stk2,
 	    ok
     end,
     try
 	erts_debug:dirty(normal,reschedule,1001)
     catch
-	error:badarg ->
-	    [{erts_debug,dirty,[normal,reschedule,1001],_}|_]
-		= erlang:get_stacktrace(),
+	error:badarg:Stk3 ->
+	    [{erts_debug,dirty,[normal,reschedule,1001],_}|_] = Stk3,
 	    ok
     end.
 
@@ -230,6 +217,11 @@ dirty_scheduler_exit(Config) when is_list(Config) ->
     {ok, Node} = start_node(Config, "+SDio 1"),
     [ok] = mcall(Node,
                  [fun() ->
+                          %% Perform a dry run to ensure that all required code
+                          %% is loaded. Otherwise the test will fail since code
+                          %% loading is done through dirty IO and it won't make
+                          %% any progress during this test.
+                          _DryRun = test_dirty_scheduler_exit(),
 			  Start = erlang:monotonic_time(millisecond),
                           ok = test_dirty_scheduler_exit(),
 			  End = erlang:monotonic_time(millisecond),
@@ -246,23 +238,22 @@ test_dse(0,Pids) ->
     timer:sleep(100),
     kill_dse(Pids,[]);
 test_dse(N,Pids) ->
-    Pid = spawn_link(fun () -> erts_debug:dirty_io(wait, 5000) end),
+    Pid = spawn_link(fun () -> erts_debug:dirty_io(wait, 1000) end),
     test_dse(N-1,[Pid|Pids]).
 
 kill_dse([],Killed) ->
-    wait_dse(Killed);
+    wait_dse(Killed, ok);
 kill_dse([Pid|Pids],AlreadyKilled) ->
     exit(Pid,kill),
     kill_dse(Pids,[Pid|AlreadyKilled]).
 
-wait_dse([]) ->
-    ok;
-wait_dse([Pid|Pids]) ->
+wait_dse([], Result) ->
+    Result;
+wait_dse([Pid|Pids], Result) ->
     receive
-        {'EXIT',Pid,Reason} ->
-	    killed = Reason
-    end,
-    wait_dse(Pids).
+        {'EXIT', Pid, killed} -> wait_dse(Pids, Result);
+        {'EXIT', Pid, _Other} -> wait_dse(Pids, failed)
+    end.
 
 dirty_call_while_terminated(Config) when is_list(Config) ->
     Me = self(),
diff --git a/erts/emulator/test/dirty_nif_SUITE.erl b/erts/emulator/test/dirty_nif_SUITE.erl
index 13806fd5c4..93d0ac392c 100644
--- a/erts/emulator/test/dirty_nif_SUITE.erl
+++ b/erts/emulator/test/dirty_nif_SUITE.erl
@@ -109,9 +109,8 @@ dirty_nif_exception(Config) when is_list(Config) ->
 	call_dirty_nif_exception(1),
 	ct:fail(expected_badarg)
     catch
-	error:badarg ->
-	    [{?MODULE,call_dirty_nif_exception,[1],_}|_] =
-		erlang:get_stacktrace(),
+	error:badarg:Stk1 ->
+	    [{?MODULE,call_dirty_nif_exception,[1],_}|_] = Stk1,
 	    ok
     end,
     try
@@ -121,9 +120,8 @@ dirty_nif_exception(Config) when is_list(Config) ->
 	call_dirty_nif_exception(0),
 	ct:fail(expected_badarg)
     catch
-	error:badarg ->
-	    [{?MODULE,call_dirty_nif_exception,[0],_}|_] =
-		erlang:get_stacktrace(),
+	error:badarg:Stk2 ->
+	    [{?MODULE,call_dirty_nif_exception,[0],_}|_] = Stk2,
 	    ok
     end,
     %% this checks that a dirty NIF can raise various terms as
@@ -138,8 +136,8 @@ nif_raise_exceptions(NifFunc) ->
                             erlang:apply(?MODULE,NifFunc,[Term]),
                             ct:fail({expected,Term})
                         catch
-                            error:Term ->
-                                [{?MODULE,NifFunc,[Term],_}|_] = erlang:get_stacktrace(),
+                            error:Term:Stk ->
+                                [{?MODULE,NifFunc,[Term],_}|_] = Stk,
                                 ok
                         end
                 end, ok, ExcTerms).
@@ -151,6 +149,11 @@ dirty_scheduler_exit(Config) when is_list(Config) ->
     [ok] = mcall(Node,
                  [fun() ->
                           ok = erlang:load_nif(NifLib, []),
+                          %% Perform a dry run to ensure that all required code
+                          %% is loaded. Otherwise the test will fail since code
+                          %% loading is done through dirty IO and it won't make
+                          %% any progress during this test.
+                          _DryRun = test_dirty_scheduler_exit(),
 			  Start = erlang:monotonic_time(millisecond),
                           ok = test_dirty_scheduler_exit(),
 			  End = erlang:monotonic_time(millisecond),
@@ -171,19 +174,18 @@ test_dse(N,Pids) ->
     test_dse(N-1,[Pid|Pids]).
 
 kill_dse([],Killed) ->
-    wait_dse(Killed);
+    wait_dse(Killed, ok);
 kill_dse([Pid|Pids],AlreadyKilled) ->
     exit(Pid,kill),
     kill_dse(Pids,[Pid|AlreadyKilled]).
 
-wait_dse([]) ->
-    ok;
-wait_dse([Pid|Pids]) ->
+wait_dse([], Result) ->
+    Result;
+wait_dse([Pid|Pids], Result) ->
     receive
-        {'EXIT',Pid,Reason} ->
-	    killed = Reason
-    end,
-    wait_dse(Pids).
+        {'EXIT', Pid, killed} -> wait_dse(Pids, Result);
+        {'EXIT', Pid, _Other} -> wait_dse(Pids, failed)
+    end.
 
 dirty_call_while_terminated(Config) when is_list(Config) ->
     Me = self(),
@@ -287,9 +289,9 @@ access_dirty_heap(Dirty, RGL, N, R) ->
 %% dirty NIF where the main lock is needed for that access do not get
 %% blocked. Each test passes its pid to dirty_sleeper, which sends a
 %% 'ready' message when it's running on a dirty scheduler and just before
-%% it starts a 6 second sleep. When it receives the message, it verifies
+%% it starts a 2 second sleep. When it receives the message, it verifies
 %% that access to the dirty process is as it expects.  After the dirty
-%% process finishes its 6 second sleep but before it returns from the dirty
+%% process finishes its 2 second sleep but before it returns from the dirty
 %% scheduler, it sends a 'done' message. If the tester already received
 %% that message, the test fails because it means attempting to access the
 %% dirty process waited for that process to return to a regular scheduler,
@@ -353,7 +355,7 @@ dirty_process_trace(Config) when is_list(Config) ->
 			      error(missing_trace_return_message)
 		      end
 	      after
-		  6500 ->
+		  2500 ->
 		      error(missing_done_message)
 	      end,
 	      ok
@@ -380,7 +382,7 @@ code_purge(Config) when is_list(Config) ->
     Start = erlang:monotonic_time(),
     {Pid1, Mon1} = spawn_monitor(fun () ->
 				       dirty_code_test:func(fun () ->
-								    %% Sleep for 6 seconds
+								    %% Sleep for 2 seconds
 								    %% in dirty nif...
 								    dirty_sleeper()
 							    end)
@@ -388,7 +390,7 @@ code_purge(Config) when is_list(Config) ->
     {module, dirty_code_test} = erlang:load_module(dirty_code_test, Bin),
     {Pid2, Mon2} = spawn_monitor(fun () ->
 				       dirty_code_test:func(fun () ->
-								    %% Sleep for 6 seconds
+								    %% Sleep for 2 seconds
 								    %% in dirty nif...
 								    dirty_sleeper()
 							    end)
@@ -490,7 +492,7 @@ test_dirty_process_access(Start, Test, Finish) ->
 			 ok
 		 end
 	 after
-	     3000 ->
+	     1000 ->
 		 error(timeout)
 	 end,
     ok = Finish(NifPid).
diff --git a/erts/emulator/test/dirty_nif_SUITE_data/dirty_nif_SUITE.c b/erts/emulator/test/dirty_nif_SUITE_data/dirty_nif_SUITE.c
index 0321b9898f..2a8b999307 100644
--- a/erts/emulator/test/dirty_nif_SUITE_data/dirty_nif_SUITE.c
+++ b/erts/emulator/test/dirty_nif_SUITE_data/dirty_nif_SUITE.c
@@ -217,9 +217,9 @@ dirty_sleeper(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
     }
 
 #ifdef __WIN32__
-    Sleep(6000);
+    Sleep(2000);
 #else
-    sleep(6);
+    sleep(2);
 #endif
 
     if (argc == 1) {
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 2d0ae9c83e..e40d346e10 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -35,13 +35,18 @@
 
 -include_lib("common_test/include/ct.hrl").
 
+%-define(Line, erlang:display({line,?LINE}),).
+-define(Line,).
+
 -export([all/0, suite/0, groups/0,
          ping/1, bulk_send_small/1,
+         group_leader/1,
+         optimistic_dflags/1,
          bulk_send_big/1, bulk_send_bigbig/1,
          local_send_small/1, local_send_big/1,
          local_send_legal/1, link_to_busy/1, exit_to_busy/1,
          lost_exit/1, link_to_dead/1, link_to_dead_new_node/1,
-         applied_monitor_node/1, ref_port_roundtrip/1, nil_roundtrip/1,
+         ref_port_roundtrip/1, nil_roundtrip/1,
          trap_bif_1/1, trap_bif_2/1, trap_bif_3/1,
          stop_dist/1,
          dist_auto_connect_never/1, dist_auto_connect_once/1,
@@ -61,6 +66,8 @@
 
 %% Internal exports.
 -export([sender/3, receiver2/2, dummy_waiter/0, dead_process/0,
+         group_leader_1/1,
+         optimistic_dflags_echo/0, optimistic_dflags_sender/1,
          roundtrip/1, bounce/1, do_dist_auto_connect/1, inet_rpc_server/1,
          dist_parallel_sender/3, dist_parallel_receiver/0,
          dist_evil_parallel_receiver/0]).
@@ -74,8 +81,10 @@ suite() ->
 
 all() ->
     [ping, {group, bulk_send}, {group, local_send},
+     group_leader,
+     optimistic_dflags,
      link_to_busy, exit_to_busy, lost_exit, link_to_dead,
-     link_to_dead_new_node, applied_monitor_node,
+     link_to_dead_new_node,
      ref_port_roundtrip, nil_roundtrip, stop_dist,
      {group, trap_bif}, {group, dist_auto_connect},
      dist_parallel_send, atom_roundtrip, unicode_atom_roundtrip,
@@ -124,6 +133,96 @@ ping(Config) when is_list(Config) ->
 
     ok.
 
+%% Test erlang:group_leader(_, ExternalPid), i.e. DOP_GROUP_LEADER
+group_leader(Config) when is_list(Config) ->
+    ?Line Sock = start_relay_node(group_leader_1, []),
+    ?Line Sock2 = start_relay_node(group_leader_2, []),
+    try
+        ?Line Node2 = inet_rpc_nodename(Sock2),
+        ?Line {ok, ok} = do_inet_rpc(Sock, ?MODULE, group_leader_1, [Node2])
+    after
+        ?Line stop_relay_node(Sock),
+        ?Line stop_relay_node(Sock2)
+    end,
+    ok.
+
+group_leader_1(Node2) ->
+    ?Line ExtPid = spawn(Node2, fun F() ->
+                                        receive {From, group_leader} ->
+                                                From ! {self(), group_leader, group_leader()}
+                                        end,
+                                        F()
+                                end),
+    ?Line GL1 = self(),
+    ?Line group_leader(GL1, ExtPid),
+    ?Line ExtPid ! {self(), group_leader},
+    ?Line {ExtPid, group_leader, GL1} = receive_one(),
+
+    %% Kill connection and repeat test when group_leader/2 triggers auto-connect
+    ?Line net_kernel:monitor_nodes(true),
+    ?Line net_kernel:disconnect(Node2),
+    ?Line {nodedown, Node2} = receive_one(),
+    ?Line GL2 = spawn(fun() -> dummy end),
+    ?Line group_leader(GL2, ExtPid),
+    ?Line {nodeup, Node2} = receive_one(),
+    ?Line ExtPid ! {self(), group_leader},
+    ?Line {ExtPid, group_leader, GL2} = receive_one(),
+    ok.
+
+%% Test optimistic distribution flags toward pending connections (DFLAG_DIST_HOPEFULLY)
+optimistic_dflags(Config) when is_list(Config) ->
+    ?Line Sender = start_relay_node(optimistic_dflags_sender, []),
+    ?Line Echo = start_relay_node(optimistic_dflags_echo, []),
+    try
+        ?Line {ok, ok} = do_inet_rpc(Echo, ?MODULE, optimistic_dflags_echo, []),
+
+        ?Line EchoNode = inet_rpc_nodename(Echo),
+        ?Line {ok, ok} = do_inet_rpc(Sender, ?MODULE, optimistic_dflags_sender, [EchoNode])
+    after
+        ?Line stop_relay_node(Sender),
+        ?Line stop_relay_node(Echo)
+    end,
+    ok.
+
+optimistic_dflags_echo() ->
+    P = spawn(fun F() ->
+                      receive {From, Term} ->
+                              From ! {self(), Term}
+                      end,
+                      F()
+              end),
+    register(optimistic_dflags_echo, P),
+    optimistic_dflags_echo ! {self(), hello},
+    {P, hello} = receive_one(),
+    ok.
+
+optimistic_dflags_sender(EchoNode) ->
+    ?Line net_kernel:monitor_nodes(true),
+
+    optimistic_dflags_do(EchoNode, <<1:1>>),
+    optimistic_dflags_do(EchoNode, fun lists:map/2),
+    ok.
+
+optimistic_dflags_do(EchoNode, Term) ->
+    ?Line {optimistic_dflags_echo, EchoNode} ! {self(), Term},
+    ?Line {nodeup, EchoNode} = receive_one(),
+    ?Line {EchoPid, Term} = receive_one(),
+    %% repeat with pid destination
+    ?Line net_kernel:disconnect(EchoNode),
+    ?Line {nodedown, EchoNode} = receive_one(),
+    ?Line EchoPid ! {self(), Term},
+    ?Line {nodeup, EchoNode} = receive_one(),
+    ?Line {EchoPid, Term} = receive_one(),
+
+    ?Line net_kernel:disconnect(EchoNode),
+    ?Line {nodedown, EchoNode} = receive_one(),
+    ok.
+
+
+receive_one() ->
+    receive M -> M after 1000 -> timeout end.
+
+
 bulk_send_small(Config) when is_list(Config) ->
     bulk_send(64, 32).
 
@@ -639,31 +738,11 @@ link_to_dead_new_node(Config) when is_list(Config) ->
     end,
     ok.
 
-%% Test that monitor_node/2 works when applied.
-applied_monitor_node(Config) when is_list(Config) ->
-    NonExisting = list_to_atom("__non_existing__@" ++ hostname()),
-
-    %% Tail-recursive call to apply (since the node is non-existing,
-    %% there will be a trap).
-
-    true = tail_apply(erlang, monitor_node, [NonExisting, true]),
-    [{nodedown, NonExisting}] = test_server:messages_get(),
-
-    %% Ordinary call (with trap).
-
-    true = apply(erlang, monitor_node, [NonExisting, true]),
-    [{nodedown, NonExisting}] = test_server:messages_get(),
-
-    ok.
-
-tail_apply(M, F, A) ->
-    apply(M, F, A).
-
 %% Test that sending a port or reference to another node and back again
 %% doesn't correct them in any way.
 ref_port_roundtrip(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    Port = open_port({spawn, efile}, []),
+    Port = make_port(),
     Ref = make_ref(),
     {ok, Node} = start_node(ref_port_roundtrip),
     net_adm:ping(Node),
@@ -684,6 +763,9 @@ ref_port_roundtrip(Config) when is_list(Config) ->
     end,
     ok.
 
+make_port() ->
+    hd(erlang:ports()).
+
 roundtrip(Term) ->
     exit(Term).
 
@@ -1158,8 +1240,6 @@ contended_atom_cache_entry_test(Config, Type) ->
     spawn_link(
       SNode,
       fun () ->
-              erts_debug:set_internal_state(available_internal_state,
-                                            true),
               Master = self(),
               CIX = get_cix(),
               TestAtoms = case Type of
@@ -1244,7 +1324,7 @@ get_cix(CIX) when is_integer(CIX), CIX < 0 ->
 get_cix(CIX) when is_integer(CIX) ->
     get_cix(CIX,
             unwanted_cixs(),
-            erts_debug:get_internal_state(max_atom_out_cache_index)).
+            get_internal_state(max_atom_out_cache_index)).
 
 get_cix(CIX, Unwanted, MaxCIX) when CIX > MaxCIX ->
     get_cix(0, Unwanted, MaxCIX);
@@ -1256,8 +1336,8 @@ get_cix(CIX, Unwanted, MaxCIX) ->
 
 unwanted_cixs() ->
     lists:map(fun (Node) ->
-                      erts_debug:get_internal_state({atom_out_cache_index,
-                                                     Node})
+                      get_internal_state({atom_out_cache_index,
+                                          Node})
               end,
               nodes()).
 
@@ -1266,7 +1346,7 @@ get_conflicting_atoms(_CIX, 0) ->
     [];
 get_conflicting_atoms(CIX, N) ->
     Atom = list_to_atom("atom" ++ integer_to_list(erlang:unique_integer([positive]))),
-    case erts_debug:get_internal_state({atom_out_cache_index, Atom}) of
+    case get_internal_state({atom_out_cache_index, Atom}) of
         CIX ->
             [Atom|get_conflicting_atoms(CIX, N-1)];
         _ ->
@@ -1277,7 +1357,7 @@ get_conflicting_unicode_atoms(_CIX, 0) ->
     [];
 get_conflicting_unicode_atoms(CIX, N) ->
     Atom = string_to_atom([16#1f608] ++ "atom" ++ integer_to_list(erlang:unique_integer([positive]))),
-    case erts_debug:get_internal_state({atom_out_cache_index, Atom}) of
+    case get_internal_state({atom_out_cache_index, Atom}) of
         CIX ->
             [Atom|get_conflicting_unicode_atoms(CIX, N-1)];
         _ ->
@@ -1365,81 +1445,59 @@ bad_dist_structure(Config) when is_list(Config) ->
     start_monitor(Offender,P),
     P ! one,
     send_bad_structure(Offender, P,{?DOP_MONITOR_P_EXIT,'replace',P,normal},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+
     start_monitor(Offender,P),
     send_bad_structure(Offender, P,{?DOP_MONITOR_P_EXIT,'replace',P,normal,normal},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+
     start_link(Offender,P),
     send_bad_structure(Offender, P,{?DOP_LINK},0),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+
     start_link(Offender,P),
     send_bad_structure(Offender, P,{?DOP_UNLINK,'replace'},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+
     start_link(Offender,P),
     send_bad_structure(Offender, P,{?DOP_UNLINK,'replace',make_ref()},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+
     start_link(Offender,P),
     send_bad_structure(Offender, P,{?DOP_UNLINK,make_ref(),P},0),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+
     start_link(Offender,P),
     send_bad_structure(Offender, P,{?DOP_UNLINK,normal,normal},0),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+
     start_monitor(Offender,P),
     send_bad_structure(Offender, P,{?DOP_MONITOR_P,'replace',P},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+
     start_monitor(Offender,P),
     send_bad_structure(Offender, P,{?DOP_MONITOR_P,'replace',P,normal},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+
     start_monitor(Offender,P),
     send_bad_structure(Offender, P,{?DOP_DEMONITOR_P,'replace',P},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+
     start_monitor(Offender,P),
     send_bad_structure(Offender, P,{?DOP_DEMONITOR_P,'replace',P,normal},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+
     send_bad_structure(Offender, P,{?DOP_EXIT,'replace',P},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_EXIT,make_ref(),normal,normal},0),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_EXIT_TT,'replace',token,P},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_EXIT_TT,make_ref(),token,normal,normal},0),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_EXIT2,'replace',P},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_EXIT2,make_ref(),normal,normal},0),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_EXIT2_TT,'replace',token,P},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_EXIT2_TT,make_ref(),token,normal,normal},0),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace'},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace','atomic'},2),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace',P},0),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_REG_SEND_TT,'replace','',name},2,{message}),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_REG_SEND_TT,'replace','',name,token},0,{message}),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace',''},2,{message}),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',P},0,{message}),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',name},0,{message}),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',name,{token}},2,{message}),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_SEND_TT,'',P},0,{message}),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_SEND_TT,'',name,token},0,{message}),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_SEND,''},0,{message}),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_SEND,'',name},0,{message}),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     send_bad_structure(Offender, P,{?DOP_SEND,'',P,{token}},0,{message}),
-    pong = rpc:call(Victim, net_adm, ping, [Offender]),
     P ! two,
     P ! check_msgs,
     receive
@@ -1685,13 +1743,16 @@ bad_dist_ext_size(Config) when is_list(Config) ->
     start_node_monitors([Offender,Victim]),
 
     Parent = self(),
-    P = spawn_link(Victim,
+    P = spawn_opt(Victim,
                    fun () ->
                            Parent ! {self(), started},
                            receive check_msgs -> ok end,  %% DID CRASH HERE
                            bad_dist_ext_check_msgs([one]),
                            Parent ! {self(), messages_checked}
-                   end),
+                   end,
+                 [link,
+                  %% on_heap to force total_heap_size to inspect msg queue
+                  {message_queue_data, on_heap}]),
 
     receive {P, started} -> ok end,
     P ! one,
@@ -1714,6 +1775,7 @@ bad_dist_ext_size(Config) when is_list(Config) ->
 
     verify_still_up(Offender, Victim),
 
+    %% Let process_info(P, total_heap_size) find bad msg and disconnect
     rpc:call(Victim, erlang, process_info, [P, total_heap_size]),
 
     verify_down(Offender, connection_closed, Victim, killed),
@@ -1795,10 +1857,11 @@ send_bad_structure(Offender,Victim,Bad,WhereToPutSelf) ->
 send_bad_structure(Offender,Victim,Bad,WhereToPutSelf,PayLoad) ->
     Parent = self(),
     Done = make_ref(),
-    spawn(Offender,
+    spawn_link(Offender,
           fun () ->
                   Node = node(Victim),
                   pong = net_adm:ping(Node),
+                  erlang:monitor_node(Node, true),
                   DCtrl = dctrl(Node),
                   Bad1 = case WhereToPutSelf of
                              0 ->
@@ -1812,7 +1875,16 @@ send_bad_structure(Offender,Victim,Bad,WhereToPutSelf,PayLoad) ->
                       [] -> [];
                       _Other -> [dmsg_ext(PayLoad)]
                   end,
+
+                  receive {nodedown, Node} -> exit("premature nodedown")
+                  after 10 -> ok
+                  end,
+
                   dctrl_send(DCtrl, DData),
+
+                  receive {nodedown, Node} -> ok
+                  after 5000 -> exit("missing nodedown")
+                  end,
                   Parent ! {DData,Done}
           end),
     receive
@@ -1893,11 +1965,26 @@ send_bad_dhdr(BadNode, ToNode) when is_atom(BadNode), is_atom(ToNode) ->
     receive Done -> ok end.
 
 dctrl(Node) when is_atom(Node) ->
-    case catch erts_debug:get_internal_state(available_internal_state) of
-        true -> true;
-        _ -> erts_debug:set_internal_state(available_internal_state, true)
-    end,
-    erts_debug:get_internal_state({dist_ctrl, Node}).
+    get_internal_state({dist_ctrl, Node}).
+
+get_internal_state(Op) ->
+    try erts_debug:get_internal_state(Op) of
+        R -> R
+    catch
+        error:undef ->
+            erts_debug:set_internal_state(available_internal_state, true),
+            erts_debug:get_internal_state(Op)
+    end.
+
+set_internal_state(Op, Val) ->
+    try erts_debug:set_internal_state(Op, Val) of
+        R -> R
+    catch
+        error:undef ->
+            erts_debug:set_internal_state(available_internal_state, true),
+            erts_debug:set_internal_state(Op, Val)
+    end.
+
 
 dmsg_hdr() ->
     [131, % Version Magic
@@ -2040,11 +2127,9 @@ freeze_node(Node, MS) ->
     Freezer = self(),
     spawn_link(Node,
                fun () ->
-                       erts_debug:set_internal_state(available_internal_state,
-                                                     true),
                        dctrl_dop_send(Freezer, DoingIt),
                        receive after Own -> ok end,
-                       erts_debug:set_internal_state(block, MS+Own)
+                       set_internal_state(block, MS+Own)
                end),
     receive DoingIt -> ok end,
     receive after Own -> ok end.
@@ -2248,8 +2333,7 @@ forever(Fun) ->
     forever(Fun).
 
 abort(Why) ->
-    erts_debug:set_internal_state(available_internal_state, true),
-    erts_debug:set_internal_state(abort, Why).
+    set_internal_state(abort, Why).
 
 
 start_busy_dist_port_tracer() ->
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 475e03087a..294c42780d 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -80,6 +80,7 @@
          async_blast/1,
          thr_msg_blast/1,
          consume_timeslice/1,
+         env/1,
          z_test/1]).
 
 -export([bin_prefix/2]).
@@ -166,6 +167,7 @@ all() -> %% Keep a_test first and z_test last...
      async_blast,
      thr_msg_blast,
      consume_timeslice,
+     env,
      z_test].
 
 groups() -> 
@@ -1768,7 +1770,10 @@ smp_select0(Config) ->
 smp_select_loop(_, 0) ->
     ok;
 smp_select_loop(Port, N) ->
-    "ok" = erlang:port_control(Port, ?CHKIO_SMP_SELECT, []),
+    case erlang:port_control(Port, ?CHKIO_SMP_SELECT, []) of
+        "yield" -> erlang:yield();
+        "ok" -> ok
+    end,
     receive
         stop -> 
             io:format("Worker ~p stopped with ~p laps left\n",[self(), N]), 
@@ -2360,6 +2365,51 @@ count_proc_sched(Ps, PNs) ->
               PNs
     end.
 
+%%
+%% Tests whether erl_drv_putenv reflects in os:getenv and vice versa.
+%%
+env(Config) when is_list(Config) ->
+    ok = load_driver(proplists:get_value(data_dir, Config), env_drv),
+    Port = open_port({spawn_driver, env_drv}, []),
+    true = is_port(Port),
+
+    Keys = ["env_drv_a_key", "env_drv_b_key", "env_drv_c_key"],
+    Values = ["a_value", "b_value", "c_value"],
+
+    [env_put_test(Port, Key, Value) || Key <- Keys, Value <- Values],
+    [env_get_test(Port, Key, Value) || Key <- Keys, Value <- Values],
+    [env_oversize_test(Port, Key) || Key <- Keys],
+    [env_notfound_test(Port, Key) || Key <- Keys],
+
+    true = port_close(Port),
+    erl_ddll:unload_driver(env_drv),
+    ok.
+
+env_control(Port, Command, Key, Value) ->
+    KeyBin = list_to_binary(Key),
+    ValueBin = list_to_binary(Value),
+    Header = <<(byte_size(KeyBin)), (byte_size(ValueBin))>>,
+    Payload = <<KeyBin/binary, ValueBin/binary>>,
+    port_control(Port, Command, <<Header/binary, Payload/binary>>).
+
+env_put_test(Port, Key, Value) ->
+    os:unsetenv(Key),
+    [0] = env_control(Port, 0, Key, Value),
+    Value = os:getenv(Key).
+
+env_get_test(Port, Key, ExpectedValue) ->
+    true = os:putenv(Key, ExpectedValue),
+    [0] = env_control(Port, 1, Key, ExpectedValue).
+
+env_oversize_test(Port, Key) ->
+    os:putenv(Key, [$A || _ <- lists:seq(1, 1024)]),
+    [127] = env_control(Port, 1, Key, "").
+
+env_notfound_test(Port, Key) ->
+    true = os:unsetenv(Key),
+    [255] = env_control(Port, 1, Key, "").
+
+
 a_test(Config) when is_list(Config) ->
     rpc(Config, fun check_io_debug/0).
 
@@ -2614,8 +2664,8 @@ rpc(Config, Fun) ->
                                 Result
                                     = try Fun() of
                                           Res -> Res
-                                      catch E:R ->
-                                              {'EXIT',E,R,erlang:get_stacktrace()}
+                                      catch E:R:Stk ->
+                                              {'EXIT',E,R,Stk}
                                       end,
                                 Self ! {Ref, Result}
                         end),
diff --git a/erts/emulator/test/driver_SUITE_data/Makefile.src b/erts/emulator/test/driver_SUITE_data/Makefile.src
index 1fedd72200..bcabaa689d 100644
--- a/erts/emulator/test/driver_SUITE_data/Makefile.src
+++ b/erts/emulator/test/driver_SUITE_data/Makefile.src
@@ -16,7 +16,8 @@ MISC_DRVS =		outputv_drv@dll@ \
 			thr_free_drv@dll@ \
 			async_blast_drv@dll@ \
 			thr_msg_blast_drv@dll@ \
-			consume_timeslice_drv@dll@
+			consume_timeslice_drv@dll@ \
+			env_drv@dll@
 
 SYS_INFO_DRVS = 	sys_info_base_drv@dll@ \
 			sys_info_prev_drv@dll@ \
diff --git a/erts/emulator/test/driver_SUITE_data/chkio_drv.c b/erts/emulator/test/driver_SUITE_data/chkio_drv.c
index d548c4b1dc..ee8f28e8b1 100644
--- a/erts/emulator/test/driver_SUITE_data/chkio_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/chkio_drv.c
@@ -961,7 +961,6 @@ chkio_drv_control(ErlDrvData drv_data,
 	break;
     }
     case CHKIO_SMP_SELECT: {
-	int rounds = 1; /*rand(); */
 	ChkioSmpSelect* pip = (ChkioSmpSelect*) cddp->test_data;
 	if (pip == NULL) {
 	    erl_drv_mutex_lock(smp_pipes_mtx);
@@ -978,7 +977,8 @@ chkio_drv_control(ErlDrvData drv_data,
 	    }
 	    erl_drv_mutex_unlock(smp_pipes_mtx);	    
 	}
-	while (rounds--) {
+        res_str = NULL;
+	{
 	    int op = rand_r(&pip->rand_state);
 	    switch (pip->state) {
 	    case Closed: {
@@ -988,7 +988,6 @@ chkio_drv_control(ErlDrvData drv_data,
 		    fcntl(fds[0], F_SETFL, flags|O_NONBLOCK) < 0) {
 
 		    driver_failure_posix(cddp->port, errno);
-		    rounds = 0;
 		    break;
 		}
 		TRACEF(("%T: Created pipe [%d->%d]\n", cddp->id, fds[1], fds[0]));
@@ -1075,7 +1074,9 @@ chkio_drv_control(ErlDrvData drv_data,
 		    pip->next_write++;
 		}
 		break;
-	    case Waiting:
+            case Waiting:
+                res_str = "yield";
+                res_len = -1;
 		break;
 	    default:
 		fprintf(stderr, "Strange state %d\n", pip->state);
@@ -1091,9 +1092,11 @@ chkio_drv_control(ErlDrvData drv_data,
 	    else {
 		cddp->test_data = pip;
 	    }
-	}	
-	res_str = "ok";
-	res_len = -1;
+	}
+        if (!res_str) {
+            res_str = "ok";
+            res_len = -1;
+        }
 	break;
     }
     case CHKIO_DRV_USE:
diff --git a/erts/emulator/test/driver_SUITE_data/env_drv.c b/erts/emulator/test/driver_SUITE_data/env_drv.c
new file mode 100644
index 0000000000..0e910eeb84
--- /dev/null
+++ b/erts/emulator/test/driver_SUITE_data/env_drv.c
@@ -0,0 +1,108 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 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.
+ * 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%
+ */
+
+/* Tests whether erl_drv_putenv/erl_drv_getenv work correctly and reflect
+ * changes to os:putenv/getenv. */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "erl_driver.h"
+
+static ErlDrvSSizeT env_drv_ctl(ErlDrvData drv_data, unsigned int cmd,
+        char* buf, ErlDrvSizeT len, char** rbuf, ErlDrvSizeT rsize);
+
+static ErlDrvEntry env_drv_entry = { 
+    NULL /* init */,
+    NULL /* start */,
+    NULL /* stop */,
+    NULL /* output */,
+    NULL /* ready_input */,
+    NULL /* ready_output */,
+    "env_drv",
+    NULL /* finish */,
+    NULL /* handle */,
+    env_drv_ctl,
+    NULL /* timeout */,
+    NULL /* outputv*/,
+    NULL /* ready_async */,
+    NULL /* flush */,
+    NULL /* call*/,
+    NULL /* event */,
+    ERL_DRV_EXTENDED_MARKER,
+    ERL_DRV_EXTENDED_MAJOR_VERSION,
+    ERL_DRV_EXTENDED_MINOR_VERSION,
+    ERL_DRV_FLAG_USE_PORT_LOCKING,
+    NULL /* handle2 */,
+    NULL /* handle_monitor */
+};
+
+DRIVER_INIT(env_drv) {
+    return &env_drv_entry;
+}
+
+static int test_putenv(ErlDrvData drv_data, char *buf, ErlDrvSizeT len) {
+    char key[256], value[256];
+    int key_len, value_len;
+
+    key_len = buf[0];
+    value_len = buf[1];
+
+    sprintf(key, "%.*s", key_len, &buf[2]);
+    sprintf(value, "%.*s", value_len, &buf[2 + key_len]);
+
+    return erl_drv_putenv(key, value);
+}
+
+static int test_getenv(ErlDrvData drv_data, char *buf, ErlDrvSizeT len) {
+    char expected_value[256], stored_value[256], key[256];
+    int expected_value_len, key_len;
+    size_t stored_value_len;
+    int res;
+
+    key_len = buf[0];
+    sprintf(key, "%.*s", key_len, &buf[2]);
+
+    expected_value_len = buf[1];
+    sprintf(expected_value, "%.*s", expected_value_len, &buf[2 + key_len]);
+
+    stored_value_len = sizeof(stored_value);
+    res = erl_drv_getenv(key, stored_value, &stored_value_len);
+
+    if(res == 0) {
+        return strcmp(stored_value, expected_value) != 0;
+    } else if(res == 1) {
+        return 127;
+    }
+
+    return 255;
+}
+
+static ErlDrvSSizeT env_drv_ctl(ErlDrvData drv_data, unsigned int cmd,
+        char* buf, ErlDrvSizeT len, char** rbuf, ErlDrvSizeT rsize) {
+
+    if(cmd == 0) {
+        (**rbuf) = (char)test_putenv(drv_data, buf, len);
+    } else {
+        (**rbuf) = (char)test_getenv(drv_data, buf, len);
+    }
+
+    return 1;
+}
diff --git a/erts/emulator/test/efile_SUITE.erl b/erts/emulator/test/efile_SUITE.erl
index 08d5597d78..821381bf0d 100644
--- a/erts/emulator/test/efile_SUITE.erl
+++ b/erts/emulator/test/efile_SUITE.erl
@@ -19,12 +19,9 @@
 
 -module(efile_SUITE).
 -export([all/0, suite/0]).
--export([async_dist/1,
-         iter_max_files/1,
-         proc_zero_sized_files/1
-        ]).
+-export([iter_max_files/1, proc_zero_sized_files/1]).
 
--export([do_iter_max_files/2, do_async_dist/1]).
+-export([do_iter_max_files/2]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("stdlib/include/assert.hrl").
@@ -32,84 +29,7 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [iter_max_files, async_dist, proc_zero_sized_files].
-
-do_async_dist(Dir) ->
-    X = 100,
-    AT = erlang:system_info(thread_pool_size),
-    Keys = file_keys(Dir,AT*X,[],[]),
-    Tab = ets:new(x,[ordered_set]),
-    [ ets:insert(Tab,{N,0}) || N <- lists:seq(0,AT-1) ],
-    [ ets:update_counter(Tab,(N rem AT),1) || N <- Keys ],
-    Res = [ V || {_,V} <- ets:tab2list(Tab) ],
-    ets:delete(Tab),
-    {Res, sdev(Res)/X}.
-
-sdev(List) ->
-    Len = length(List),
-    Mean = lists:sum(List)/Len,
-    math:sqrt(lists:sum([ (X - Mean) * (X - Mean) || X <- List ]) / Len).
-
-file_keys(_,0,FdList,FnList) ->
-    [ file:close(FD) || FD <- FdList ],
-    [ file:delete(FN) || FN <- FnList ],
-    [];
-file_keys(Dir,Num,FdList,FnList) ->
-    Name = "dummy"++integer_to_list(Num),
-    FN = filename:join([Dir,Name]),
-    case file:open(FN,[write,raw]) of
-        {ok,FD} ->
-            {file_descriptor,prim_file,{Port,_}} = FD,
-            <<X:32/integer-big>> = 
-            iolist_to_binary(erlang:port_control(Port,$K,[])),
-            [X | file_keys(Dir,Num-1,[FD|FdList],[FN|FnList])];
-        {error,_} ->
-            % Try freeing up FD's if there are any
-            case FdList of 
-                [] ->
-                    exit({cannot_open_file,FN});
-                _ ->
-                    [ file:close(FD) || FD <- FdList ],
-                    [ file:delete(F) || F <- FnList ],
-                    file_keys(Dir,Num,[],[])
-            end
-    end.
-
-%% Check that the distribution of files over async threads is fair
-async_dist(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir,Config),
-    Dir = filename:dirname(code:which(?MODULE)),
-    AsyncSizes = [7,10,100,255,256,64,63,65],
-    Max = 0.5,
-
-    lists:foreach(fun(Size) ->
-                          {ok,Node} = 
-                          test_server:start_node
-                          (test_iter_max_files,slave,
-                           [{args,
-                             "+A "++integer_to_list(Size)++
-                             " -pa " ++ Dir}]),
-                          {Distr,SD} = rpc:call(Node,?MODULE,do_async_dist,
-                                                [DataDir]),
-                          test_server:stop_node(Node),
-                          if
-                              SD > Max ->
-                                  io:format("Bad async queue distribution for "
-                                            "~p async threads:~n"
-                                            "    Standard deviation is ~p~n"
-                                            "    Key distribution:~n    ~lp~n",
-                                            [Size,SD,Distr]),
-                                  exit({bad_async_dist,Size,SD,Distr});
-                              true ->
-                                  io:format("OK async queue distribution for "
-                                            "~p async threads:~n"
-                                            "    Standard deviation is ~p~n"
-                                            "    Key distribution:~n    ~lp~n",
-                                            [Size,SD,Distr]),
-                                  ok
-                          end
-                  end, AsyncSizes),
-    ok.
+    [iter_max_files, proc_zero_sized_files].
 
 %%
 %% Open as many files as possible. Do this several times and check 
@@ -117,17 +37,23 @@ async_dist(Config) when is_list(Config) ->
 %%
 
 iter_max_files(Config) when is_list(Config) ->
+    case os:type() of
+        {win32, _} -> {skip, "Windows lacks a hard limit on file handles"};
+        _ -> iter_max_files_1(Config)
+    end.
+
+iter_max_files_1(Config) ->
     DataDir = proplists:get_value(data_dir,Config),
     TestFile = filename:join(DataDir, "existing_file"),
     N = 10,
-    %% Run on a different node in order to set the max ports
+    %% Run on a different node in order to make the test more stable.
     Dir = filename:dirname(code:which(?MODULE)),
     {ok,Node} = test_server:start_node(test_iter_max_files,slave,
-                                       [{args,"+Q 1524 -pa " ++ Dir}]),
+                                       [{args,"-pa " ++ Dir}]),
     L = rpc:call(Node,?MODULE,do_iter_max_files,[N, TestFile]),
     test_server:stop_node(Node),
     io:format("Number of files opened in each test:~n~w\n", [L]),
-    all_equal(L),
+    verify_max_files(L),
     Head = hd(L),
     if  Head >= 2 -> ok;
         true -> ct:fail(too_few_files)
@@ -139,12 +65,15 @@ do_iter_max_files(N, Name) when N > 0 ->
 do_iter_max_files(_, _) ->
     [].
 
-all_equal([E, E| T]) ->
-    all_equal([E| T]);
-all_equal([_]) ->
-    ok;
-all_equal([]) ->
-    ok.
+%% The attempts shouldn't vary too much; we used to require that they were all
+%% exactly equal, but after we reimplemented the file driver as a NIF we
+%% noticed that the only reason it was stable on Darwin was because the port
+%% limit was hit before ulimit.
+verify_max_files(Attempts) ->
+    N = length(Attempts),
+    Mean = lists:sum(Attempts) / N,
+    Variance = lists:sum([(X - Mean) * (X - Mean) || X <- Attempts]) / N,
+    true = math:sqrt(Variance) =< 1 + (Mean / 1000).
 
 max_files(Name) ->
     Fds = open_files(Name),
diff --git a/erts/emulator/test/erl_link_SUITE.erl b/erts/emulator/test/erl_link_SUITE.erl
index d8c5b663e3..a66ca7a57d 100644
--- a/erts/emulator/test/erl_link_SUITE.erl
+++ b/erts/emulator/test/erl_link_SUITE.erl
@@ -200,13 +200,16 @@ monitor_nodes(Config) when is_list(Config) ->
     monitor_node(A, true),
     check_monitor_node(self(), A, 1),
     check_monitor_node(self(), B, 3),
+    ok = receive {nodedown, C} -> ok after 1000 -> timeout end,
+    %%OTP-21: monitor_node(_,false) does not trigger auto-connect anymore
+    %%        and therefore no nodedown if it fails.
+    %%ok = receive {nodedown, C} -> ok after 1000 -> timeout end,
+    ok = receive {nodedown, C} -> ok after 1000 -> timeout end,
+    ok = receive {nodedown, D} -> ok after 1000 -> timeout end,
+    ok = receive {nodedown, D} -> ok after 1000 -> timeout end,
     check_monitor_node(self(), C, 0),
     check_monitor_node(self(), D, 0),
-    receive {nodedown, C} -> ok end,
-    receive {nodedown, C} -> ok end,
-    receive {nodedown, C} -> ok end,
-    receive {nodedown, D} -> ok end,
-    receive {nodedown, D} -> ok end,
+
     stop_node(A),
     receive {nodedown, A} -> ok end,
     check_monitor_node(self(), A, 0),
diff --git a/erts/emulator/test/exception_SUITE.erl b/erts/emulator/test/exception_SUITE.erl
index be9b63d534..da0292f385 100644
--- a/erts/emulator/test/exception_SUITE.erl
+++ b/erts/emulator/test/exception_SUITE.erl
@@ -395,12 +395,12 @@ raise(Conf) when is_list(Conf) ->
     try 
         try foo({'div',{1,0}}) 
         catch
-            error:badarith ->
+            error:badarith:A0 ->
                 put(raise, A0 = erlang:get_stacktrace()),
                 erlang:raise(error, badarith, A0)
         end
     catch
-        error:badarith ->
+        error:badarith:A1 ->
             A1 = erlang:get_stacktrace(),
             A1 = get(raise)
     end,
diff --git a/erts/emulator/test/guard_SUITE.erl b/erts/emulator/test/guard_SUITE.erl
index 1a93a9f5c2..f2c1595392 100644
--- a/erts/emulator/test/guard_SUITE.erl
+++ b/erts/emulator/test/guard_SUITE.erl
@@ -500,7 +500,7 @@ all_types() ->
      {atom, xxxx},
      {ref, make_ref()},
      {pid, self()},
-     {port, open_port({spawn, efile}, [])},
+     {port, make_port()},
      {function, fun(_) -> "" end},
      {function, fun erlang:abs/1},
      {binary, list_to_binary([])},
@@ -551,4 +551,7 @@ type_test(bitstring, X) when is_bitstring(X) ->
 type_test(function, X) when is_function(X) ->
     function.
 
+make_port() ->
+    hd(erlang:ports()).
+
 id(I) -> I.
diff --git a/erts/emulator/test/iovec_SUITE.erl b/erts/emulator/test/iovec_SUITE.erl
index 49dc64b0d2..963b7e2501 100644
--- a/erts/emulator/test/iovec_SUITE.erl
+++ b/erts/emulator/test/iovec_SUITE.erl
@@ -25,7 +25,8 @@
 -export([integer_lists/1, binary_lists/1, empty_lists/1, empty_binary_lists/1,
          mixed_lists/1, improper_lists/1, illegal_lists/1, cons_bomb/1,
          sub_binary_lists/1, iolist_to_iovec_idempotence/1,
-         iolist_to_iovec_correctness/1]).
+         iolist_to_iovec_correctness/1, unaligned_sub_binaries/1,
+         direct_binary_arg/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -36,7 +37,8 @@ suite() ->
 all() ->
     [integer_lists, binary_lists, empty_lists, empty_binary_lists, mixed_lists,
      sub_binary_lists, illegal_lists, improper_lists, cons_bomb,
-     iolist_to_iovec_idempotence, iolist_to_iovec_correctness].
+     iolist_to_iovec_idempotence, iolist_to_iovec_correctness,
+     unaligned_sub_binaries, direct_binary_arg].
 
 init_per_suite(Config) ->
     Config.
@@ -78,7 +80,7 @@ illegal_lists(Config) when is_list(Config) ->
     BitStrs = gen_variations(["gurka", <<1:1>>, "gaffel"]),
     BadInts = gen_variations(["gurka", 890, "gaffel"]),
     Atoms = gen_variations([gurka, "gaffel"]),
-    BadTails = [["test" | 0], ["gurka", gaffel]],
+    BadTails = [["test" | 0], ["gurka" | gaffel], ["gaffel" | <<1:1>>]],
 
     Variations =
         BitStrs ++ BadInts ++ Atoms ++ BadTails,
@@ -98,14 +100,7 @@ cons_bomb(Config) when is_list(Config) ->
     BinBase = gen_variations([<<I:8>> || I <- lists:seq(1, 255)]),
     MixBase = gen_variations([<<12, 45, 78>>, lists:seq(1, 255)]),
 
-    Rounds =
-        case system_mem_size() of
-            Mem when Mem >= (16 bsl 30) -> 32;
-            Mem when Mem >= (3 bsl 30) -> 28;
-            _ -> 20
-        end,
-
-    Variations = gen_variations([IntBase, BinBase, MixBase], Rounds),
+    Variations = gen_variations([IntBase, BinBase, MixBase], 16),
     equivalence_test(fun erlang:iolist_to_iovec/1, Variations).
 
 iolist_to_iovec_idempotence(Config) when is_list(Config) ->
@@ -130,6 +125,21 @@ iolist_to_iovec_correctness(Config) when is_list(Config) ->
     true = is_iolist_equal(Optimized, Variations),
     ok.
 
+unaligned_sub_binaries(Config) when is_list(Config) ->
+    UnalignedBins = [gen_unaligned_binary(I) || I <- lists:seq(32, 4 bsl 10, 512)],
+    UnalignedVariations = gen_variations(UnalignedBins),
+
+    Optimized = erlang:iolist_to_iovec(UnalignedVariations),
+
+    true = is_iolist_equal(Optimized, UnalignedVariations),
+    ok.
+
+direct_binary_arg(Config) when is_list(Config) ->
+    {'EXIT',{badarg, _}} = (catch erlang:iolist_to_iovec(<<1:1>>)),
+    [<<1>>] = erlang:iolist_to_iovec(<<1>>),
+    [] = erlang:iolist_to_iovec(<<>>),
+    ok.
+
 illegality_test(Fun, Variations) ->
     [{'EXIT',{badarg, _}} = (catch Fun(Variation)) || Variation <- Variations],
     ok.
@@ -145,11 +155,18 @@ equivalence_test(Fun, [Head | _] = Variations) ->
 is_iolist_equal(A, B) ->
     iolist_to_binary(A) =:= iolist_to_binary(B).
 
+gen_unaligned_binary(Size) ->
+    Bin0 = << <<I>> || I <- lists:seq(1, Size) >>,
+    <<0:3,Bin:Size/binary,31:5>> = id(<<0:3,Bin0/binary,31:5>>),
+    Bin.
+
+id(I) -> I.
+
 %% Generates a bunch of lists whose contents will be equal to Base repeated a
 %% few times. The lists only differ by their structure, so their reduction to
 %% a simpler format should yield the same result.
 gen_variations(Base) ->
-    gen_variations(Base, 16).
+    gen_variations(Base, 12).
 gen_variations(Base, N) ->
     [gen_flat_list(Base, N),
      gen_nested_list(Base, N),
@@ -169,8 +186,3 @@ gen_nasty_list_1([Head | Base], Result) when is_list(Head) ->
     gen_nasty_list_1(Base, [[Result], [gen_nasty_list_1(Head, [])]]);
 gen_nasty_list_1([Head | Base], Result) ->
     gen_nasty_list_1(Base, [[Result], [Head]]).
-
-system_mem_size() ->
-    application:ensure_all_started(os_mon),
-    {Tot,_Used,_}  = memsup:get_memory_data(),
-    Tot.
diff --git a/erts/emulator/test/lcnt_SUITE.erl b/erts/emulator/test/lcnt_SUITE.erl
index 504b9b54cf..4e52c2813c 100644
--- a/erts/emulator/test/lcnt_SUITE.erl
+++ b/erts/emulator/test/lcnt_SUITE.erl
@@ -28,14 +28,16 @@
      init_per_testcase/2, end_per_testcase/2]).
 
 -export(
-    [toggle_lock_counting/1, error_on_invalid_category/1, preserve_locks/1]).
+    [toggle_lock_counting/1, error_on_invalid_category/1, preserve_locks/1,
+     registered_processes/1, registered_db_tables/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
      {timetrap, {seconds, 10}}].
 
 all() ->
-    [toggle_lock_counting, error_on_invalid_category, preserve_locks].
+    [toggle_lock_counting, error_on_invalid_category, preserve_locks,
+     registered_processes, registered_db_tables].
 
 init_per_suite(Config) ->
     case erlang:system_info(lock_counting) of
@@ -154,3 +156,25 @@ preserve_locks(Config) when is_list(Config) ->
 error_on_invalid_category(Config) when is_list(Config) ->
     {error, badarg, q_invalid} = erts_debug:lcnt_control(mask, [q_invalid]),
     ok.
+
+registered_processes(Config) when is_list(Config) ->
+    %% There ought to be at least one registered process (init/code_server)
+    erts_debug:lcnt_control(mask, [process]),
+    [_, {locks, ProcLocks}] = erts_debug:lcnt_collect(),
+    true = lists:any(
+        fun
+            ({proc_main, RegName, _, _}) when is_atom(RegName) -> true;
+            (_Lock) -> false
+        end, ProcLocks),
+    ok.
+
+registered_db_tables(Config) when is_list(Config) ->
+    %% There ought to be at least one registered table (code)
+    erts_debug:lcnt_control(mask, [db]),
+    [_, {locks, DbLocks}] = erts_debug:lcnt_collect(),
+    true = lists:any(
+        fun
+            ({db_tab, RegName, _, _}) when is_atom(RegName) -> true;
+            (_Lock) -> false
+        end, DbLocks),
+    ok.
diff --git a/erts/emulator/test/map_SUITE.erl b/erts/emulator/test/map_SUITE.erl
index 02f3c89318..c9e971af8a 100644
--- a/erts/emulator/test/map_SUITE.erl
+++ b/erts/emulator/test/map_SUITE.erl
@@ -52,7 +52,7 @@
          t_bif_map_values/1,
          t_bif_map_to_list/1,
          t_bif_map_from_list/1,
-         t_bif_erts_internal_maps_to_list/1,
+         t_bif_map_next/1,
 
          %% erlang
          t_erlang_hash/1,
@@ -119,7 +119,7 @@ all() -> [t_build_and_match_literals, t_build_and_match_literals_large,
           t_bif_map_update,
           t_bif_map_values,
           t_bif_map_to_list, t_bif_map_from_list,
-          t_bif_erts_internal_maps_to_list,
+          t_bif_map_next,
 
           %% erlang
           t_erlang_hash, t_map_encode_decode,
@@ -2364,41 +2364,71 @@ t_bif_map_from_list(Config) when is_list(Config) ->
     {'EXIT', {badarg,_}} = (catch maps:from_list(id(42))),
     ok.
 
-t_bif_erts_internal_maps_to_list(Config) when is_list(Config) ->
-    %% small maps
-    [] = erts_internal:maps_to_list(#{},-1),
-    [] = erts_internal:maps_to_list(#{},-2),
-    [] = erts_internal:maps_to_list(#{},10),
-    [{a,1},{b,2}] = lists:sort(erts_internal:maps_to_list(#{a=>1,b=>2}, 2)),
-    [{a,1},{b,2}] = lists:sort(erts_internal:maps_to_list(#{a=>1,b=>2}, -1)),
-    [{_,_}] = erts_internal:maps_to_list(#{a=>1,b=>2}, 1),
-    [{a,1},{b,2},{c,3}] = lists:sort(erts_internal:maps_to_list(#{c=>3,a=>1,b=>2},-2)),
-    [{a,1},{b,2},{c,3}] = lists:sort(erts_internal:maps_to_list(#{c=>3,a=>1,b=>2},3)),
-    [{a,1},{b,2},{c,3}] = lists:sort(erts_internal:maps_to_list(#{c=>3,a=>1,b=>2},5)),
-    [{_,_},{_,_}] = erts_internal:maps_to_list(#{c=>3,a=>1,b=>2},2),
-    [{_,_}] = erts_internal:maps_to_list(#{c=>3,a=>1,b=>2},1),
-    [] = erts_internal:maps_to_list(#{c=>3,a=>1,b=>2},0),
-
-    %% big maps
-    M = maps:from_list([{I,ok}||I <- lists:seq(1,500)]),
-    [] = erts_internal:maps_to_list(M,0),
-    [{_,_}] = erts_internal:maps_to_list(M,1),
-    [{_,_},{_,_}] = erts_internal:maps_to_list(M,2),
-    Ls1 = erts_internal:maps_to_list(M,10),
-    10 = length(Ls1),
-    Ls2 = erts_internal:maps_to_list(M,20),
-    20 = length(Ls2),
-    Ls3 = erts_internal:maps_to_list(M,120),
-    120 = length(Ls3),
-    Ls4 = erts_internal:maps_to_list(M,-1),
-    500 = length(Ls4),
+t_bif_map_next(Config) when is_list(Config) ->
 
-    %% error cases
-    {'EXIT', {{badmap,[{a,b},b]},_}} = (catch erts_internal:maps_to_list(id([{a,b},b]),id(1))),
-    {'EXIT', {badarg,_}} = (catch erts_internal:maps_to_list(id(#{}),id(a))),
-    {'EXIT', {badarg,_}} = (catch erts_internal:maps_to_list(id(#{1=>2}),id(<<>>))),
+    erts_debug:set_internal_state(available_internal_state, true),
+
+    try
+
+        none = maps:next(maps:iterator(id(#{}))),
+
+        verify_iterator(#{}),
+        verify_iterator(#{a => 1, b => 2, c => 3}),
+
+        %% Use fatmap in order to test iterating in very deep maps
+        FM = fatmap(43),
+        verify_iterator(FM),
+
+        {'EXIT', {{badmap,[{a,b},b]},_}} = (catch maps:iterator(id([{a,b},b]))),
+        {'EXIT', {badarg,_}} = (catch maps:next(id(a))),
+        {'EXIT', {badarg,_}} = (catch maps:next(id([a|FM]))),
+        {'EXIT', {badarg,_}} = (catch maps:next(id([1|#{}]))),
+        {'EXIT', {badarg,_}} = (catch maps:next(id([-1|#{}]))),
+        {'EXIT', {badarg,_}} = (catch maps:next(id([-1|FM]))),
+        {'EXIT', {badarg,_}} = (catch maps:next(id([16#FFFFFFFFFFFFFFFF|FM]))),
+        {'EXIT', {badarg,_}} = (catch maps:next(id([-16#FFFFFFFFFFFFFFFF|FM]))),
+
+        %% This us a whitebox test that the error code works correctly.
+        %% It uses a path for a tree of depth 4 and tries to do next on
+        %% each of those paths.
+        (fun F(0) -> ok;
+             F(N) ->
+                 try maps:next([N|FM]) of
+                     none ->
+                         F(N-1);
+                     {_K,_V,_I} ->
+                         F(N-1)
+                 catch error:badarg ->
+                         F(N-1)
+                 end
+         end)(16#FFFF),
+
+        ok
+    after
+            erts_debug:set_internal_state(available_internal_state, false)
+    end.
+
+verify_iterator(Map) ->
+    KVs = t_fold(fun(K, V, A) -> [{K, V} | A] end, [], Map),
+
+    %% Verify that KVs created by iterating Map is of
+    %% correct size and contains all elements
+    true = length(KVs) == maps:size(Map),
+    [maps:get(K, Map) || {K, _} <- KVs],
     ok.
 
+
+t_fold(Fun, Init, Map) ->
+    t_fold_1(Fun, Init, maps:iterator(Map)).
+
+t_fold_1(Fun, Acc, Iter) ->
+    case maps:next(Iter) of
+        {K, V, NextIter} ->
+            t_fold_1(Fun, Fun(K,V,Acc), NextIter);
+        none ->
+            Acc
+    end.
+
 t_bif_build_and_check(Config) when is_list(Config) ->
     ok = check_build_and_remove(750,[fun(K) -> [K,K] end,
 				     fun(K) -> [float(K),K] end,
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index bec2291867..b6e15ababb 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -2257,9 +2257,8 @@ nif_schedule(Config) when is_list(Config) ->
     {B,A} = call_nif_schedule(A, B),
     ok = try call_nif_schedule(1, 2)
 	 catch
-	     error:badarg ->
-		 [{?MODULE,call_nif_schedule,[1,2],_}|_] =
-		     erlang:get_stacktrace(),
+	     error:badarg:Stk ->
+		 [{?MODULE,call_nif_schedule,[1,2],_}|_] = Stk,
 		 ok
 	 end,
     ok.
@@ -2429,8 +2428,8 @@ nif_raise_exceptions(NifFunc) ->
                             erlang:apply(?MODULE,NifFunc,[Term]),
                             ct:fail({expected,Term})
                         catch
-                            error:Term ->
-                                [{?MODULE,NifFunc,[Term],_}|_] = erlang:get_stacktrace(),
+                            error:Term:Stk ->
+                                [{?MODULE,NifFunc,[Term],_}|_] = Stk,
                                 ok
                         end
                 end, ok, ExcTerms).
@@ -3037,18 +3036,37 @@ nif_ioq(Config) ->
          {enqbraw,a},
          {enqbraw,a, 5},
          {peek,   a},
+         {peek_head,  a},
          {deq,    a, 42},
 
          %% Test enqv
          {enqv,   a, 2, 100},
+         {peek_head,  a},
          {deq,    a, all},
 
          %% This skips all elements but one in the iolist
          {enqv,   a, 5, iolist_size(nif_ioq_payload(5)) - 1},
+         {peek_head,  a},
          {peek,   a},
 
-         %% Test to enqueue a bunch of refc binaries
+         %% Ensure that enqueued refc binaries are intact after a roundtrip.
+         %%
+         %% This test and the ones immediately following it does not go through
+         %% erlang:iolist_to_iovec/1
          {enqv,   a, [nif_ioq_payload(refcbin) || _ <- lists:seq(1,20)], 0},
+         {peek,   a},
+
+         %% ... heap binaries
+         {enqv,   a, [nif_ioq_payload(heapbin) || _ <- lists:seq(1,20)], 0},
+         {peek,   a},
+
+         %% ... plain sub-binaries
+         {enqv,   a, [nif_ioq_payload(subbin) || _ <- lists:seq(1,20)], 0},
+         {peek,   a},
+
+         %% ... unaligned binaries
+         {enqv,   a, [nif_ioq_payload(unaligned_bin) || _ <- lists:seq(1,20)], 0},
+         {peek,   a},
 
          %% Enq stuff to destroy with data in queue
          {enqv,   a, 2, 100},
@@ -3074,9 +3092,13 @@ nif_ioq(Config) ->
 
     Q = ioq_nif(create),
 
+    false = ioq_nif(peek_head, Q),
+
     {'EXIT', {badarg, _}} = (catch ioq_nif(deq, Q, 1)),
     {'EXIT', {badarg, _}} = (catch ioq_nif(enqv, Q, 1, 1234)),
 
+    false = ioq_nif(peek_head, Q),
+
     {'EXIT', {badarg, _}} = (catch ioq_nif(enqv, Q, [atom_in_list], 0)),
     {'EXIT', {badarg, _}} = (catch ioq_nif(enqv, Q, [make_ref()], 0)),
     {'EXIT', {badarg, _}} = (catch ioq_nif(enqv, Q, [256], 0)),
@@ -3085,6 +3107,8 @@ nif_ioq(Config) ->
     {'EXIT', {badarg, _}} = (catch ioq_nif(enqv, Q, [1 bsl 64], 0)),
     {'EXIT', {badarg, _}} = (catch ioq_nif(enqv, Q, [{tuple}], 0)),
 
+    false = ioq_nif(peek_head, Q),
+
     {'EXIT', {badarg, _}} = (catch ioq_nif(inspect,  [atom_in_list], use_stack)),
     {'EXIT', {badarg, _}} = (catch ioq_nif(inspect,  [make_ref()], no_stack)),
     {'EXIT', {badarg, _}} = (catch ioq_nif(inspect,  [256], use_stack)),
@@ -3145,6 +3169,20 @@ nif_ioq_run([{peek, Name} = H|T], State) ->
 
     true = iolist_to_binary(B) == iolist_to_binary(Data),
     nif_ioq_run(T, State);
+nif_ioq_run([{peek_head, Name} = H|T], State) ->
+    #{ q := IOQ, b := B } = maps:get(Name, State),
+    RefData = iolist_to_binary(B),
+
+    ct:log("~p", [H]),
+
+    {true, QueueHead} = ioq_nif(peek_head, IOQ),
+    true = byte_size(QueueHead) > 0,
+
+    {RefHead, _Tail} = split_binary(RefData, byte_size(QueueHead)),
+
+    true = QueueHead =:= RefHead,
+
+    nif_ioq_run(T, State);
 nif_ioq_run([{deq, Name, all}|T], State) ->
     #{ q := IOQ, b := B } = maps:get(Name, State),
     Size = ioq_nif(size, IOQ),
@@ -3184,13 +3222,16 @@ nif_ioq_payload(N) when is_integer(N) ->
     Tail = if N > 3 -> nif_ioq_payload(N-3); true -> [] end,
     Head = element(1, lists:split(N,[nif_ioq_payload(subbin),
                                      nif_ioq_payload(heapbin),
-                                     nif_ioq_payload(refcbin) | Tail])),
+                                     nif_ioq_payload(refcbin),
+                                     nif_ioq_payload(unaligned_bin) | Tail])),
     erlang:iolist_to_iovec(Head);
 nif_ioq_payload(subbin) ->
     Bin = nif_ioq_payload(refcbin),
     Sz = size(Bin) - 1,
     <<_:8,SubBin:Sz/binary,_/bits>> = Bin,
     SubBin;
+nif_ioq_payload(unaligned_bin) ->
+    make_unaligned_binary(<< <<I>> || I <- lists:seq(1, 255) >>);
 nif_ioq_payload(heapbin) ->
     <<"a literal heap binary">>;
 nif_ioq_payload(refcbin) ->
@@ -3198,6 +3239,13 @@ nif_ioq_payload(refcbin) ->
 nif_ioq_payload(Else) ->
     Else.
 
+make_unaligned_binary(Bin0) ->
+    Size = byte_size(Bin0),
+    <<0:3,Bin:Size/binary,31:5>> = id(<<0:3,Bin0/binary,31:5>>),
+    Bin.
+
+id(I) -> I.
+
 %% The NIFs:
 lib_version() -> undefined.
 call_history() -> ?nif_stub.
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index 79560a38aa..fa9ae1015c 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -3403,6 +3403,15 @@ static ERL_NIF_TERM ioq(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 		return enif_make_badarg(env);
 	    else
 		return enif_make_atom(env, "true");
+        } else if (enif_is_identical(argv[0], enif_make_atom(env, "peek_head"))) {
+            ERL_NIF_TERM head_term;
+
+            if(enif_ioq_peek_head(env, ioq->q, NULL, &head_term)) {
+                return enif_make_tuple2(env,
+                    enif_make_atom(env, "true"), head_term);
+            }
+
+            return enif_make_atom(env, "false");
         } else if (enif_is_identical(argv[0], enif_make_atom(env, "peek"))) {
             int iovlen, num, i, off = 0;
             SysIOVec *iov = enif_ioq_peek(ioq->q, &iovlen);
diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl
index be90f929df..7df001fec5 100644
--- a/erts/emulator/test/node_container_SUITE.erl
+++ b/erts/emulator/test/node_container_SUITE.erl
@@ -966,6 +966,8 @@ check_refc(ThisNodeName,ThisCreation,Table,EntryList) when is_list(EntryList) ->
                         {case Referrer of
                              {system,delayed_delete_timer} ->
                                  true;
+                             {system,thread_progress_delete_timer} ->
+                                 true;
                              _ ->
                                  DDT
                          end,
diff --git a/erts/emulator/test/num_bif_SUITE.erl b/erts/emulator/test/num_bif_SUITE.erl
index 17555d63c6..592542405f 100644
--- a/erts/emulator/test/num_bif_SUITE.erl
+++ b/erts/emulator/test/num_bif_SUITE.erl
@@ -118,6 +118,7 @@ t_float(Config) when is_list(Config) ->
 %% Tests float_to_list/1, float_to_list/2, float_to_binary/1, float_to_binary/2
 
 t_float_to_string(Config) when is_list(Config) ->
+    rand_seed(),
     test_fts("0.00000000000000000000e+00", 0.0),
     test_fts("2.50000000000000000000e+01", 25.0),
     test_fts("2.50000000000000000000e+00", 2.5),
@@ -167,8 +168,8 @@ t_float_to_string(Config) when is_list(Config) ->
     test_fts("1.12300",1.123, [{decimals, 5}]),
     test_fts("1.123",1.123, [{decimals, 5}, compact]),
     test_fts("1.1234",1.1234,[{decimals, 6}, compact]),
-    test_fts("1.01",1.005, [{decimals, 2}]),
-    test_fts("-1.01",-1.005,[{decimals, 2}]),
+    test_fts("1.00",1.005, [{decimals, 2}]),  %% 1.005 is really 1.0049999999...
+    test_fts("-1.00",-1.005,[{decimals, 2}]),
     test_fts("0.999",0.999, [{decimals, 3}]),
     test_fts("-0.999",-0.999,[{decimals, 3}]),
     test_fts("1.0",0.999, [{decimals, 2}, compact]),
@@ -184,6 +185,9 @@ t_float_to_string(Config) when is_list(Config) ->
     test_fts("123000000000000000000.0",1.23e20, [{decimals,   10}, compact]),
     test_fts("1.2300000000e+20",1.23e20, [{scientific, 10}, compact]),
     test_fts("1.23000000000000000000e+20",1.23e20, []),
+
+    fts_rand_float_decimals(1000),
+
     ok.
 
 test_fts(Expect, Float) ->
@@ -197,6 +201,49 @@ test_fts(Expect, Float, Args) ->
     BinExpect = float_to_binary(Float,Args).
 
 
+rand_float_reasonable() ->
+    F = rand_float(),
+    case abs(F) > 1.0e238 of
+        true -> rand_float_reasonable();
+        false -> F
+    end.
+
+fts_rand_float_decimals(0) -> ok;
+fts_rand_float_decimals(N) ->
+    [begin
+         F0 = rand_float_reasonable(),
+         L0 = float_to_list(F0, [{decimals, D}]),
+         L1 = case D of
+                  0 -> L0 ++ ".0";
+                  _ -> L0
+              end,
+         F1 = list_to_float(L1),
+         Diff = abs(F0-F1),
+         MaxDiff = max_diff_decimals(F0, D),
+         ok = case Diff =< MaxDiff of
+                  true -> ok;
+                  false ->
+                      io:format("F0 = ~w ~w\n",  [F0, <<F0/float>>]),
+                      io:format("L1 = ~s\n",  [L1]),
+                      io:format("F1 = ~w ~w\n",  [F1, <<F1/float>>]),
+                      io:format("Diff = ~w, MaxDiff = ~w\n", [Diff, MaxDiff]),
+                      error
+              end
+     end
+     || D <- lists:seq(0,15)],
+
+    fts_rand_float_decimals(N-1).
+
+max_diff_decimals(F, D) ->
+    IntBits = floor(math:log2(abs(F))) + 1,
+    FracBits = (52 - IntBits),
+    Log10_2 = 0.3010299956639812,  % math:log10(2)
+    MaxDec = floor(FracBits * Log10_2),
+
+    Resolution = math:pow(2, IntBits - 53),
+
+    (math:pow(10, -min(D,MaxDec)) / 2) + Resolution.
+
 %% Tests list_to_float/1.
 
 t_string_to_float_safe(Config) when is_list(Config) ->
@@ -331,18 +378,26 @@ t_trunc_and_friends(_Config) ->
     -18446744073709551616 = trunc_and_friends(-float(1 bsl 64)),
 
     %% Random.
+    rand_seed(),
     t_trunc_and_friends_rand(100),
     ok.
 
+rand_seed() ->
+    rand:seed(exrop),
+    io:format("\n*** rand:export_seed() = ~w\n\n", [rand:export_seed()]),
+    ok.
+
+rand_float() ->
+    F0 = rand:uniform() * math:pow(10, 50*rand:normal()),
+    case rand:uniform() of
+        U when U < 0.5 -> -F0;
+        _ -> F0
+    end.
+
 t_trunc_and_friends_rand(0) ->
     ok;
 t_trunc_and_friends_rand(N) ->
-    F0 = rand:uniform() * math:pow(10, 50*rand:normal()),
-    F = case rand:uniform() of
-	    U when U < 0.5 -> -F0;
-	    _ -> F0
-	end,
-    _ = trunc_and_friends(F),
+    _ = trunc_and_friends(rand_float()),
     t_trunc_and_friends_rand(N-1).
 
 trunc_and_friends(F) ->
@@ -491,7 +546,7 @@ t_string_to_integer(Config) when is_list(Config) ->
 				       list_to_binary(Value),Base)),
 			  {'EXIT', {badarg, _}} =
 			      (catch erlang:list_to_integer(Value,Base))
-		  end,[{" 1",1},{" 1",37},{"2",2},{"C",11},
+		  end,[{" 1",1},{" 1",37},{"2",2},{"B",11},{"b",11},{":", 16},
 		       {"1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111z",16},
 		       {"1z111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111",16},
 		       {"111z11111111",16}]),
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index a9f20f9928..a8bcfac84d 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -2532,8 +2532,13 @@ system_task_on_suspended(Config) when is_list(Config) ->
     end.
 
 gc_request_when_gc_disabled(Config) when is_list(Config) ->
-    Master = self(),
     AIS = erts_debug:set_internal_state(available_internal_state, true),
+    gc_request_when_gc_disabled_do(ref),
+    gc_request_when_gc_disabled_do(immed),
+    erts_debug:set_internal_state(available_internal_state, AIS).
+
+gc_request_when_gc_disabled_do(ReqIdType) ->
+    Master = self(),
     {P, M} = spawn_opt(fun () ->
 			       true = erts_debug:set_internal_state(gc_state,
 								    false),
@@ -2545,7 +2550,10 @@ gc_request_when_gc_disabled(Config) when is_list(Config) ->
 			       receive after 100 -> ok end
 		       end, [monitor, link]),
     receive {P, gc_state, false} -> ok end,
-    ReqId = make_ref(),
+    ReqId = case ReqIdType of
+                ref -> make_ref();
+                immed -> immed
+            end,
     async = garbage_collect(P, [{async, ReqId}]),
     receive
 	{garbage_collect, ReqId, Result} ->
@@ -2554,7 +2562,6 @@ gc_request_when_gc_disabled(Config) when is_list(Config) ->
 	    ok
     end,
     receive {garbage_collect, ReqId, true} -> ok end,
-    erts_debug:set_internal_state(available_internal_state, AIS),
     receive {'DOWN', M, process, P, _Reason} -> ok end,
     ok.
 
diff --git a/erts/emulator/test/receive_SUITE.erl b/erts/emulator/test/receive_SUITE.erl
index a12019ec83..1fe11428b4 100644
--- a/erts/emulator/test/receive_SUITE.erl
+++ b/erts/emulator/test/receive_SUITE.erl
@@ -25,14 +25,16 @@
 -include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,
-	 call_with_huge_message_queue/1,receive_in_between/1]).
+	 call_with_huge_message_queue/1,receive_in_between/1,
+         receive_opt_exception/1,receive_opt_recursion/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
      {timetrap, {minutes, 3}}].
 
-all() -> 
-    [call_with_huge_message_queue, receive_in_between].
+all() ->
+    [call_with_huge_message_queue, receive_in_between,
+     receive_opt_exception, receive_opt_recursion].
 
 call_with_huge_message_queue(Config) when is_list(Config) ->
     Pid = spawn_link(fun echo_loop/0),
@@ -113,6 +115,60 @@ receive_one() ->
 	dummy -> ok
     end.
 
+receive_opt_exception(_Config) ->
+    Recurse = fun() ->
+                      %% Overwrite with the same mark,
+                      %% and never consume it.
+                      ThrowFun = fun() -> throw(aborted) end,
+                      aborted = (catch do_receive_opt_exception(ThrowFun)),
+                      ok
+              end,
+    do_receive_opt_exception(Recurse),
+
+    %% Eat the second message.
+    receive
+        Ref when is_reference(Ref) -> ok
+    end.
+
+do_receive_opt_exception(Disturber) ->
+    %% Create a receive mark.
+    Ref = make_ref(),
+    self() ! Ref,
+    Disturber(),
+    receive
+        Ref ->
+            ok
+    after 0 ->
+            error(the_expected_message_was_not_there)
+    end.
+
+receive_opt_recursion(_Config) ->
+    Recurse = fun() ->
+                      %% Overwrite with the same mark,
+                      %% and never consume it.
+                      NoOp = fun() -> ok end,
+                      BlackHole = spawn(NoOp),
+                      expected = do_receive_opt_recursion(BlackHole, NoOp, true),
+                      ok
+              end,
+    do_receive_opt_recursion(self(), Recurse, false),
+    ok.
+
+do_receive_opt_recursion(Recipient, Disturber, IsInner) ->
+    Ref = make_ref(),
+    Recipient ! Ref,
+    Disturber(),
+    receive
+        Ref -> ok
+    after 0 ->
+            case IsInner of
+                true ->
+                    expected;
+                false ->
+                    error(the_expected_message_was_not_there)
+            end
+    end.
+
 %%%
 %%% Common helpers.
 %%%
diff --git a/erts/emulator/utils/beam_makeops b/erts/emulator/utils/beam_makeops
index d7791d23fa..da994fae3e 100755
--- a/erts/emulator/utils/beam_makeops
+++ b/erts/emulator/utils/beam_makeops
@@ -19,7 +19,7 @@
 # %CopyrightEnd%
 #
 use strict;
-use vars qw($BEAM_FORMAT_NUMBER);
+use vars qw($BEAM_FORMAT_NUMBER $GC_REGEXP);
 use constant COLD => 0;
 use constant WARM => 1;
 use constant HOT => 2;
@@ -36,6 +36,7 @@ use constant PACK_CMD_LOOSE => '3';
 use constant PACK_CMD_WIDE => '4';
 
 $BEAM_FORMAT_NUMBER = undef;
+$GC_REGEXP = undef;
 
 my $target = \&emulator_output;
 my $outdir = ".";		# Directory for output files.
@@ -77,6 +78,10 @@ my %num_specific;
 my %gen_to_spec;
 my %specific_op;
 
+# The following hashes are used for error checking.
+my %print_name;
+my %specific_op_arity;
+
 # Information about each specific operator. Key is the print name (e.g. get_list_xxy).
 # Value is a hash.
 my %spec_op_info;
@@ -131,7 +136,10 @@ my $loader_types = "nprvlqo";
 my $genop_types = $compiler_types . $loader_types;
 
 #
-# Defines the argument types and their loaded size assuming no packing.
+# Define the operand types and their loaded size assuming no packing.
+#
+# Those are the types that can be used in the definition of a specific
+# instruction.
 #
 my %arg_size = ('r' => 0,	# x(0) - x register zero
 		'x' => 1,	# x(N), N > 0 - x register
@@ -154,12 +162,35 @@ my %arg_size = ('r' => 0,	# x(0) - x register zero
 		'A' => 1,	# arity value
 		'P' => 1,	# byte offset into tuple or stack
 		'Q' => 1,	# like 'P', but packable
-		'h' => 1,	# character
+		'h' => 1,	# character (not used)
 		'l' => 1,	# float reg
 		'q' => 1,	# literal term
 	     );
 
 #
+# Define the types that may be used in a transformation rule.
+#
+# %pattern_type defines the types that may be used in a pattern
+# on the left side.
+#
+# %construction_type defines the types that may be used when
+# constructing a new instruction on the right side (a subset of
+# the pattern types that are possible to construct).
+#
+my $pattern_types = "acdfjilnopqsuxy";
+my %pattern_type;
+@pattern_type{split("", $pattern_types)} = (1) x length($pattern_types);
+
+my %construction_type;
+foreach my $type (keys %pattern_type) {
+    $construction_type{$type} = 1
+        if index($genop_types, $type) >= 0;
+}
+foreach my $makes_no_sense ('f', 'j', 'o', 'p', 'q') {
+    delete $construction_type{$makes_no_sense};
+}
+
+#
 # Generate bits.
 #
 my %type_bit;
@@ -194,7 +225,8 @@ sub define_type_bit {
     define_type_bit('S', $type_bit{'d'});
     define_type_bit('j', $type_bit{'f'} | $type_bit{'p'});
 
-    # Aliases (for matching purposes).
+    # Aliases of 'u'.  Those specify how to load the operand and
+    # what kind of packing can be done.
     define_type_bit('t', $type_bit{'u'});
     define_type_bit('I', $type_bit{'u'});
     define_type_bit('W', $type_bit{'u'});
@@ -279,9 +311,15 @@ if ($wordsize == 64) {
 # Add placeholders for built-in macros.
 #
 
-$c_code{'IS_PACKED'} = ['$Expr',"built-in macro",('Expr')];
-$c_code{'ARG_POSITION'} = ['$Expr',"built-in macro",('Expr')];
-foreach my $name (keys %c_code) {
+my %predef_macros =
+    (OPERAND_POSITION => ['Expr'],
+     IF => ['Expr','IfTrue','IfFalse'],
+     REFRESH_GEN_DEST => [],
+    );
+foreach my $name (keys %predef_macros) {
+    my @args = @{$predef_macros{$name}};
+    my $body = join(':', map { '$' . $_ } @args);
+    $c_code{$name} = [$body,"built-in macro",@args],
     $c_code_used{$name} = 1;
 }
 
@@ -359,8 +397,10 @@ while (<>) {
     #
     if (/^([\w_][\w\d_]+)=(.*)/) {
 	no strict 'refs';
-	my($name) = $1;
-	$$name = $2;
+	my $name = $1;
+        my $value = $2;
+        $value =~ s/;\s*$//;
+	$$name = $value;
 	next;
     }
 
@@ -1019,6 +1059,22 @@ sub parse_specific_op {
     my $key = "$name/$arity";
     foreach my $args_ref (@res) {
         @args = @$args_ref;
+        my $arity = @args;
+        my $loc = "$ARGV($.)";
+        if (defined $specific_op_arity{$name}) {
+            my($prev_arity,$loc) = @{$specific_op_arity{$name}};
+            if ($arity != $prev_arity) {
+                error("$name defined with arity $arity, " .
+                      "but previously defined with arity $prev_arity at $loc");
+            }
+        }
+        $specific_op_arity{$name} = [$arity,$loc];
+        my $print_name = print_name($name, @args);
+        if (defined $print_name{$print_name}) {
+            error("$name @args: already defined at " .
+                  $print_name{$print_name});
+        }
+        $print_name{$print_name} = $loc;
         push @{$specific_op{$key}}, [$name,$hotness,@args];
     }
 
@@ -1333,7 +1389,9 @@ sub cg_basic {
 #
 
 sub cg_combined_size {
-    my %params = (@_, pack_options => \@basic_pack_options);
+    my %params = (@_,
+                  pack_options => \@basic_pack_options,
+                  size_only => 1);
     $params{pack_options} = \@extended_pack_options
         if $params{first};
     my($size) = code_gen(%params);
@@ -1361,6 +1419,7 @@ sub code_gen {
     my %params = (extra_comments => '',
                   offset => 0,
                   inc => 0,
+                  size_only => 0,
                   @_);
     my $name = $params{name};
     my $extra_comments = $params{extra_comments};
@@ -1393,6 +1452,7 @@ sub code_gen {
 
     my $need_block = 0;
     my $arg_offset = $offset;
+    my $has_gen_dest = 0;
     @args = map { s/[?]$//g; $_ } @args;
     foreach (@args) {
 	my($this_size) = $arg_size{$_};
@@ -1403,6 +1463,7 @@ sub code_gen {
                     "Eterm* dst_ptr = REG_TARGET_PTR(dst);\n";
                 push(@f, "*dst_ptr");
                 $this_size = $1;
+                $has_gen_dest = 1;
                 last SWITCH;
             };
 	    /^packed:[a-zA-z]:(\d):(.*)/ and do {
@@ -1435,6 +1496,7 @@ sub code_gen {
                 $var_decls .= "Eterm dst = " . arg_offset($arg_offset) . ";\n" .
                     "Eterm* dst_ptr = REG_TARGET_PTR(dst);\n";
                 push(@f, "*dst_ptr");
+                $has_gen_dest = 1;
                 last SWITCH;
             };
             defined $arg_size{$_} and do {
@@ -1449,10 +1511,10 @@ sub code_gen {
     }
 
     #
-    # If the implementation is in beam_emu.c, there is nothing
-    # more to do.
+    # If the implementation is in beam_emu.c or if
+    # the caller only wants the size, we are done.
     #
-    unless (defined $c_code_ref) {
+    if (not defined $c_code_ref or $params{size_only}) {
         return ($size+1, undef, '');
     }
 
@@ -1517,9 +1579,36 @@ sub code_gen {
                     "{",
                     "$var_decls$body",
                     "}", "");
+
+    # Make sure that $REFRESH_GEN_DEST() is used when a
+    # general destination ('d') may have been clobbered by
+    # a GC.
+    my $gc_error = verify_gc_code($code, $has_gen_dest);
+    if (defined $gc_error) {
+        warn $gc_error;
+        error("... from the body of $name at $where");
+    }
+
+    # Done.
     ($size+1, $code, $pack_spec);
 }
 
+sub verify_gc_code {
+    my $code = shift;
+    my $has_gen_dest = shift;
+
+    return unless $has_gen_dest;
+
+    if ($code =~ /$GC_REGEXP/o) {
+        my $code_after_gc = substr($code, $+[0]);
+        unless ($code_after_gc =~ /dst_ptr = REG_TARGET_PTR/) {
+            return "pointer to destination register is invalid after GC -- " .
+                "use \$REFRESH_GEN_DEST()\n";
+        }
+    }
+    return undef;
+}
+
 sub arg_offset {
     my $offset = shift;
     "I[" . ($offset+1) . "]";
@@ -1619,17 +1708,26 @@ sub expand_macro {
     }
 
     # Handle built-in macros.
-    if ($name eq 'ARG_POSITION') {
+    if ($name eq 'OPERAND_POSITION') {
         if ($body =~ /^I\[(\d+)\]$/) {
             $body = $1;
         } else {
             $body = 0;
         }
-    } elsif ($name eq 'IS_PACKED') {
-        $body = ($body =~ /^I\[\d+\]$/) ? 0 : 1;
+    } elsif ($name eq 'IF') {
+        my $expr = $new_bindings{Expr};
+        my $bool = eval $expr;
+        if ($@ ne '') {
+            &error("bad expression '$expr' in \$IF()");
+        }
+        my $part = $bool ? 'IfTrue' : 'IfFalse';
+        $body = $new_bindings{$part};
+    } elsif ($name eq 'REFRESH_GEN_DEST') {
+        $body = "dst_ptr = REG_TARGET_PTR(dst)";
     }
 
-    # Wrap body if needed and return resul.t
+
+    # Wrap body if needed and return result.
     $body = "do {\n$body\n} while (0)"
         if needs_do_wrapper($body);
     ($body,$rest);
@@ -2156,12 +2254,19 @@ sub tr_parse_op {
     if (/^([a-z*]+)(.*)/) {
 	$type = $1;
 	$_ = $2;
+        error("$type: only a single type is allowed on right side of transformations")
+            if not $src and length($type) > 1;
 	foreach (split('', $type)) {
-	    error("bad type in $op")
-		unless defined $type_bit{$_} or $type eq '*';
-	    $_ eq 'r' and
-		error("$op: 'r' is not allowed in transformations")
-	}
+            next if $src and $type eq '*';
+            error("$op: not a type")
+                unless defined $type_bit{$_};
+            error("$op: the type '$_' is not allowed in transformations")
+                unless defined $pattern_type{$_};
+            if (not $src) {
+                error("$op: type '$_' is not allowed on the right side of transformations")
+                    unless defined $construction_type{$_};
+            }
+        }
     }
 
     # Get an optional condition. (In source.)
@@ -2194,10 +2299,18 @@ sub tr_parse_op {
     }
 
     # Get an optional value. (In destination.)
-    $type_val = $type eq 'x' ? 1023 : 0;
+    if ($type eq 'x') {
+        $type_val = 1023;
+    } elsif ($type eq 'a') {
+        $type_val = 'am_Empty';
+    } else {
+        $type_val = 0;
+    }
     if (/^=(.*)/) {
-	error("value not allowed in source: $op")
+	error("$op: value not allowed in source")
 	    if $src;
+        error("$op: the type 'n' must not be given a value")
+            if $type eq 'n';
 	$type_val = $1;
 	$_ = '';
     }
@@ -2207,13 +2320,16 @@ sub tr_parse_op {
     error("garbage '$_' after operand: $op")
 	unless /^\s*$/;
 
-    # Test that destination has no conditions.
+    # Check the conditions.
 
-    unless ($src) {
-	error("condition not allowed in destination: $op")
+    if ($src) {
+        error("$op: the type '$type' is not allowed to be compared with a literal value")
+            if $cond and not $construction_type{$type};
+    } else {
+	error("$op: condition not allowed in destination")
 	    if $cond;
-	error("variable name and type cannot be combined in destination: $op")
-	    if $var && $type;
+	error("$op: variable name and type cannot be combined in destination")
+	    if $var and $type;
     }
 
     ($var,$type,$type_val,$cond,$cond_val);
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 08e326b33b..f7774c6e2e 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -80,6 +80,8 @@ static char *plusM_au_alloc_switches[] = {
     "as",
     "asbcst",
     "acul",
+    "acnl",
+    "acfml",
     "e",
     "t",
     "lmbcs",
@@ -537,19 +539,44 @@ int main(int argc, char **argv)
     } else {
         add_Eargs(emu);       /* argv[0] = erl or cerl */
     }
-    /*
-     * Add the bindir to the path (unless it is there already).
-     */
+
+    /* Add the bindir to the front of the PATH, and remove all subsequent
+     * occurrences to avoid ballooning it on repeated up/downgrades. */
 
     s = get_env("PATH");
-    if (!s) {
-	erts_snprintf(tmpStr, sizeof(tmpStr), "%s" PATHSEP "%s" DIRSEP "bin", bindir, rootdir);
-    } else if (strstr(s, bindir) == NULL) {
-	erts_snprintf(tmpStr, sizeof(tmpStr), "%s" PATHSEP "%s" DIRSEP "bin" PATHSEP "%s", bindir,
-		rootdir, s);
+
+    if (s == NULL) {
+        erts_snprintf(tmpStr, sizeof(tmpStr),
+            "%s" PATHSEP "%s" DIRSEP "bin" PATHSEP, bindir, rootdir);
+    } else if (strstr(s, rootdir) == NULL) {
+        erts_snprintf(tmpStr, sizeof(tmpStr),
+            "%s" PATHSEP "%s" DIRSEP "bin" PATHSEP "%s", bindir, rootdir, s);
     } else {
-	erts_snprintf(tmpStr, sizeof(tmpStr), "%s", s);
+        const char *bindir_slug, *bindir_slug_index;
+        int bindir_slug_length;
+        const char *in_index;
+        char *out_index;
+
+        erts_snprintf(tmpStr, sizeof(tmpStr), "%s" PATHSEP, bindir);
+
+        bindir_slug = strsave(tmpStr);
+        bindir_slug_length = strlen(bindir_slug);
+
+        out_index = &tmpStr[bindir_slug_length];
+        in_index = s;
+
+        while ((bindir_slug_index = strstr(in_index, bindir_slug))) {
+            int block_length = (bindir_slug_index - in_index);
+
+            memcpy(out_index, in_index, block_length);
+
+            in_index = bindir_slug_index + bindir_slug_length;
+            out_index += block_length;
+        }
+
+        strcpy(out_index, in_index);
     }
+
     free_env_val(s);
     set_env("PATH", tmpStr);
     
diff --git a/erts/etc/common/inet_gethost.c b/erts/etc/common/inet_gethost.c
index b746487668..4fc7a93348 100644
--- a/erts/etc/common/inet_gethost.c
+++ b/erts/etc/common/inet_gethost.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2017. All Rights Reserved.
+ * Copyright Ericsson AB 1998-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.
@@ -1770,7 +1770,7 @@ static int worker_loop(void)
 		}
 #elif defined(HAVE_GETIPNODEBYNAME) /*#ifdef HAVE_GETADDRINFO */
 		DEBUGF(5,("Starting getipnodebyname(%s)",data));
-		he = getipnodebyname(data, AF_INET6, AI_DEFAULT, &error_num);
+		he = getipnodebyname(data, AF_INET6, 0, &error_num);
 		if (he) {
 		    free_he = 1;
 		    error_num = 0;
diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index 95e065b156..02ace9126c 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -1693,7 +1693,7 @@ define etp-proc-state-int
     printf "dirty-cpu-proc | "
   end
   if ($arg0 & 0x2000000)
-    printf "on-heap-msgq | "
+    printf "GARBAGE<0x2000000> | "
   end
   if ($arg0 & 0x1000000)
     printf "off-heap-msgq | "
@@ -1717,7 +1717,7 @@ define etp-proc-state-int
     printf "trapping-exit | "
   end
   if ($arg0 & 0x40000)
-    printf "bound | "
+    printf "GARBAGE<0x40000> | "
   end
   if ($arg0 & 0x20000)
     printf "garbage-collecting | "
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index f928163705..725343d701 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -1346,11 +1346,8 @@ static int sf_open(const char *path, int type, mode_t mode) {
 }
 
 static int sf_close(int fd) {
-    int res = 0;
-
-    do { res = close(fd); } while(res < 0 && errno == EINTR);
-
-    return res;
+    /* "close() should not be retried after an EINTR" */
+    return close(fd);
 }
 
 /* Extract any control sequences that are ment only for run_erl
diff --git a/erts/lib_src/common/erl_printf_format.c b/erts/lib_src/common/erl_printf_format.c
index 3daa066fd3..5a680d6f9d 100644
--- a/erts/lib_src/common/erl_printf_format.c
+++ b/erts/lib_src/common/erl_printf_format.c
@@ -326,12 +326,12 @@ static int fmt_double(fmtfn_t fn,void*arg,double val,
 {
     int res;
     int fi = 0;
-    char format_str[7];
+    char format_str[8];
     char sbuf[32];
     char *bufp = sbuf;
     double dexp;
     int exp;
-    size_t max_size = 1;
+    size_t max_size = 2;  /* including possible sign */
     int size;
     int new_fmt = fmt;
     int fpe_was_unmasked;
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index af6facb5f2..02e77bfbb2 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
diff --git a/erts/preloaded/ebin/erl_tracer.beam b/erts/preloaded/ebin/erl_tracer.beam
index 7ca25803be..7754d64a6b 100644
--- a/erts/preloaded/ebin/erl_tracer.beam
+++ b/erts/preloaded/ebin/erl_tracer.beam
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 181a718287..cf4b5c56ea 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/ebin/erts_code_purger.beam b/erts/preloaded/ebin/erts_code_purger.beam
index b7c061d9a0..655e1d2e06 100644
--- a/erts/preloaded/ebin/erts_code_purger.beam
+++ b/erts/preloaded/ebin/erts_code_purger.beam
diff --git a/erts/preloaded/ebin/erts_dirty_process_code_checker.beam b/erts/preloaded/ebin/erts_dirty_process_code_checker.beam
index 6467b1c016..2a4cb53d3e 100644
--- a/erts/preloaded/ebin/erts_dirty_process_code_checker.beam
+++ b/erts/preloaded/ebin/erts_dirty_process_code_checker.beam
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index 5416826f19..b79f734a6d 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
diff --git a/erts/preloaded/ebin/erts_literal_area_collector.beam b/erts/preloaded/ebin/erts_literal_area_collector.beam
index fbd3249d70..bb2676a9e8 100644
--- a/erts/preloaded/ebin/erts_literal_area_collector.beam
+++ b/erts/preloaded/ebin/erts_literal_area_collector.beam
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index 1c8d0e626a..a2dd41b435 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
diff --git a/erts/preloaded/ebin/otp_ring0.beam b/erts/preloaded/ebin/otp_ring0.beam
index 73a017d981..6a03451ad5 100644
--- a/erts/preloaded/ebin/otp_ring0.beam
+++ b/erts/preloaded/ebin/otp_ring0.beam
diff --git a/erts/preloaded/ebin/prim_buffer.beam b/erts/preloaded/ebin/prim_buffer.beam
new file mode 100644
index 0000000000..06d9276247
--- /dev/null
+++ b/erts/preloaded/ebin/prim_buffer.beam
diff --git a/erts/preloaded/ebin/prim_eval.beam b/erts/preloaded/ebin/prim_eval.beam
index 7e46b79671..17c59708e7 100644
--- a/erts/preloaded/ebin/prim_eval.beam
+++ b/erts/preloaded/ebin/prim_eval.beam
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index 32755d5c28..902b0945c6 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam
index c03415c758..a42f45c180 100644
--- a/erts/preloaded/ebin/prim_inet.beam
+++ b/erts/preloaded/ebin/prim_inet.beam
diff --git a/erts/preloaded/ebin/prim_zip.beam b/erts/preloaded/ebin/prim_zip.beam
index 77d0d2edb0..1ec6870178 100644
--- a/erts/preloaded/ebin/prim_zip.beam
+++ b/erts/preloaded/ebin/prim_zip.beam
diff --git a/erts/preloaded/ebin/zlib.beam b/erts/preloaded/ebin/zlib.beam
index f388bc723a..7a5f4d7527 100644
--- a/erts/preloaded/ebin/zlib.beam
+++ b/erts/preloaded/ebin/zlib.beam
diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
index edb9f35258..a2872082f2 100644
--- a/erts/preloaded/src/Makefile
+++ b/erts/preloaded/src/Makefile
@@ -36,6 +36,7 @@ include $(ERL_TOP)/lib/kernel/vsn.mk
 PRE_LOADED_ERL_MODULES = \
 	erl_prim_loader \
 	init \
+	prim_buffer \
 	prim_file \
 	prim_inet \
 	zlib \
@@ -116,7 +117,7 @@ prim_eval.beam: prim_eval.S prim_eval.abstr
 
 # Include dependencies -- list below added by PaN
 $(EBIN)/erl_prim_loader.beam: $(KERNEL_SRC)/inet_boot.hrl $(KERNEL_INCLUDE)/file.hrl
-$(EBIN)/prim_file.beam: $(KERNEL_INCLUDE)/file.hrl
+$(EBIN)/prim_file.beam: $(KERNEL_SRC)/file_int.hrl $(KERNEL_INCLUDE)/file.hrl
 $(EBIN)/prim_inet.beam: $(KERNEL_SRC)/inet_int.hrl $(KERNEL_INCLUDE)/inet_sctp.hrl
 $(EBIN)/prim_zip.beam: zip_internal.hrl $(KERNEL_INCLUDE)/file.hrl $(STDLIB_INCLUDE)/zip.hrl
 $(EBIN)/init.erl: $(KERNEL_INCLUDE)/file.hrl
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index 1d09aeded9..b82b9f5b46 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -56,7 +56,7 @@
 -export([purge_archive_cache/0]).
 
 %% Used by init and the code server.
--export([get_modules/2,get_modules/3]).
+-export([get_modules/2,get_modules/3, is_basename/1]).
 
 -include_lib("kernel/include/file.hrl").
 
@@ -151,9 +151,8 @@ start_inet(Parent) ->
     loop(State, Parent, []).
 
 start_efile(Parent) ->
-    {ok, Port} = prim_file:start(),
     %% Check that we started in a valid directory.
-    case prim_file:get_cwd(Port) of
+    case prim_file:get_cwd() of
 	{error, _} ->
 	    %% At this point in the startup, we have no error_logger at all.
 	    Report = "Invalid current directory or invalid filename "
@@ -165,7 +164,7 @@ start_efile(Parent) ->
     end,
     PS = prim_init(),
     State = #state {loader = efile,
-                    data = Port,
+                    data = noport,
                     timeout = ?EFILE_IDLE_TIMEOUT,
                     prim_state = PS},
     loop(State, Parent, []).
@@ -401,12 +400,12 @@ handle_get_cwd(State = #state{loader = inet}, Drive) ->
     ?SAFE2(inet_get_cwd(State, Drive), State).
     
 handle_stop(State = #state{loader = efile}) ->
-    efile_stop_port(State);
+    State;
 handle_stop(State = #state{loader = inet}) ->
     inet_stop_port(State).
 
-handle_exit(State = #state{loader = efile}, Who, Reason) ->
-    efile_exit_port(State, Who, Reason);
+handle_exit(State = #state{loader = efile}, _Who, _Reason) ->
+    State;
 handle_exit(State = #state{loader = inet}, Who, Reason) ->
     inet_exit_port(State, Who, Reason).
 
@@ -475,15 +474,6 @@ efile_get_cwd(#state{prim_state = PS} = State, Drive) ->
     {Res, PS2} = prim_get_cwd(PS, Drive),
     {Res, State#state{prim_state = PS2}}.
 
-efile_stop_port(#state{data=Port}=State) ->
-    prim_file:close(Port),
-    State#state{data=noport}.
-
-efile_exit_port(State, Port, Reason) when State#state.data =:= Port ->
-    exit({port_died,Reason});
-efile_exit_port(State, _Port, _Reason) ->
-    State.
-
 efile_timeout_handler(State, _Parent) ->
     prim_purge_cache(),
     State.
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index f743b7d26b..370ecdc3f6 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -31,8 +31,7 @@
 -export([localtime_to_universaltime/1]).
 -export([suspend_process/1]).
 -export([min/2, max/2]).
--export([dlink/1, dunlink/1, dsend/2, dsend/3, dgroup_leader/2,
-	 dexit/2, dmonitor_node/3, dmonitor_p/2]).
+-export([dmonitor_node/3, dmonitor_p/2]).
 -export([delay_trap/2]).
 -export([set_cookie/2, get_cookie/0]).
 -export([nodes/0]).
@@ -44,9 +43,7 @@
 -export([memory/0, memory/1]).
 -export([alloc_info/1, alloc_sizes/1]).
 
--export([gather_sched_wall_time_result/1,
-	 await_sched_wall_time_modifications/2,
-	 gather_gc_info_result/1]).
+-export([gather_gc_info_result/1]).
 
 -export([dist_ctrl_input_handler/2,
          dist_ctrl_put_data/2,
@@ -124,7 +121,7 @@
 -export([crc32/2, crc32_combine/3, date/0, decode_packet/3]).
 -export([delete_element/2]).
 -export([delete_module/1, demonitor/1, demonitor/2, display/1]).
--export([display_nl/0, display_string/1, dist_exit/3, erase/0, erase/1]).
+-export([display_nl/0, display_string/1, erase/0, erase/1]).
 -export([error/1, error/2, exit/1, exit/2, external_size/1]).
 -export([external_size/2, finish_after_on_load/2, finish_loading/1, float/1]).
 -export([float_to_binary/1, float_to_binary/2,
@@ -427,9 +424,11 @@ binary_to_term(_Binary) ->
     erlang:nif_error(undefined).
 
 %% binary_to_term/2
--spec binary_to_term(Binary, Opts) -> term() when
+-spec binary_to_term(Binary, Opts) -> term() | {term(), Used} when
       Binary :: ext_binary(),
-      Opts :: [safe].
+      Opt :: safe | used,
+      Opts :: [Opt],
+      Used :: pos_integer().
 binary_to_term(_Binary, _Opts) ->
     erlang:nif_error(undefined).
 
@@ -702,14 +701,6 @@ display_nl() ->
 display_string(_P1) ->
     erlang:nif_error(undefined).
 
-%% dist_exit/3
--spec erlang:dist_exit(P1, P2, P3) -> true when
-      P1 :: pid(),
-      P2 :: kill | noconnection | normal,
-      P3 :: pid() | port().
-dist_exit(_P1, _P2, _P3) ->
-    erlang:nif_error(undefined).
-
 %% dt_append_vm_tag_data/1
 -spec erlang:dt_append_vm_tag_data(IoData) -> IoDataRet when
       IoData :: iodata(),
@@ -2412,6 +2403,10 @@ subtract(_,_) ->
                                 OldDirtyCPUSchedulersOnline when
       DirtyCPUSchedulersOnline :: pos_integer(),
       OldDirtyCPUSchedulersOnline :: pos_integer();
+                        (erts_alloc, {Alloc, F, V}) -> ok | notsup when
+      Alloc :: atom(),
+      F :: atom(),
+      V :: integer();
                         (fullsweep_after, Number) -> OldNumber when
       Number :: non_neg_integer(),
       OldNumber :: non_neg_integer();
@@ -2463,7 +2458,7 @@ term_to_binary(_Term) ->
       Term :: term(),
       Options :: [compressed |
                   {compressed, Level :: 0..9} |
-                  {minor_version, Version :: 0..1} ].
+                  {minor_version, Version :: 0..2} ].
 term_to_binary(_Term, _Options) ->
     erlang:nif_error(undefined).
 
@@ -2568,10 +2563,10 @@ tuple_to_list(_Tuple) ->
       Settings :: [{Subsystem :: atom(),
                     [{Parameter :: atom(),
                       Value :: term()}]}];
-         (alloc_util_allocators) -> [Alloc] when
-      Alloc :: atom();
          ({allocator, Alloc}) -> [_] when %% More or less anything
       Alloc :: atom();
+         (alloc_util_allocators) -> [Alloc] when
+      Alloc :: atom();
          ({allocator_sizes, Alloc}) -> [_] when %% More or less anything
       Alloc :: atom();
          (atom_count) -> pos_integer();
@@ -2598,6 +2593,7 @@ tuple_to_list(_Tuple) ->
          (driver_version) -> string();
 	 (dynamic_trace) -> none | dtrace | systemtap;
          (dynamic_trace_probes) -> boolean();
+         (end_time) -> non_neg_integer();
          (elib_malloc) -> false;
          (eager_check_io) -> boolean();
          (ets_limit) -> pos_integer();
@@ -2625,6 +2621,7 @@ tuple_to_list(_Tuple) ->
          (otp_release) -> string();
          (os_monotonic_time_source) -> [{atom(),term()}];
          (os_system_time_source) -> [{atom(),term()}];
+         (port_parallelism) -> boolean();
          (port_count) -> non_neg_integer();
          (port_limit) -> pos_integer();
          (process_count) -> pos_integer();
@@ -2654,7 +2651,8 @@ tuple_to_list(_Tuple) ->
          (trace_control_word) -> non_neg_integer();
          (update_cpu_info) -> changed | unchanged;
          (version) -> string();
-         (wordsize | {wordsize, internal} | {wordsize, external}) -> 4 | 8.
+         (wordsize | {wordsize, internal} | {wordsize, external}) -> 4 | 8;
+         (overview) -> boolean().
 system_info(_Item) ->
     erlang:nif_error(undefined).
 
@@ -3265,34 +3263,11 @@ dist_ctrl_get_data_notification(_DHandle) ->
 dist_get_stat(_DHandle) ->
     erlang:nif_error(undefined).
 
-%%
-%% If the emulator wants to perform a distributed command and
-%% a connection is not established to the actual node the following 
-%% functions are called in order to set up the connection and then
-%% reactivate the command.
-%%
-
--spec erlang:dlink(pid() | port()) -> 'true'.
-dlink(Pid) ->
-    case net_kernel:connect(erlang:node(Pid)) of
-	true -> erlang:link(Pid);
-	false -> erlang:dist_exit(erlang:self(), noconnection, Pid), true
-    end.
-
-%% Can this ever happen?
--spec erlang:dunlink(identifier()) -> 'true'.
-dunlink(Pid) ->
-    case net_kernel:connect(erlang:node(Pid)) of
-	true -> erlang:unlink(Pid);
-	false -> true
-    end.
-
-dmonitor_node(Node, Flag, []) ->
-    case net_kernel:connect(Node) of
-	true -> erlang:monitor_node(Node, Flag, []);
-	false -> erlang:self() ! {nodedown, Node}, true
-    end;
 
+dmonitor_node(Node, _Flag, []) ->
+    %% Only called when auto-connect attempt failed early in VM
+    erlang:self() ! {nodedown, Node},
+    true;
 dmonitor_node(Node, Flag, Opts) ->
     case lists:member(allow_passive_connect, Opts) of
 	true ->
@@ -3304,71 +3279,12 @@ dmonitor_node(Node, Flag, Opts) ->
 	    dmonitor_node(Node,Flag,[])
     end.
 
-dgroup_leader(Leader, Pid) ->
-    case net_kernel:connect(erlang:node(Pid)) of
-	true -> erlang:group_leader(Leader, Pid);
-	false -> true  %% bad arg ?
-    end.
-
-dexit(Pid, Reason) -> 
-    case net_kernel:connect(erlang:node(Pid)) of
-	true -> erlang:exit(Pid, Reason);
-	false -> true
-    end.
-
-dsend(Pid, Msg) when erlang:is_pid(Pid) ->
-    case net_kernel:connect(erlang:node(Pid)) of
-	true -> erlang:send(Pid, Msg);
-	false -> Msg
-    end;
-dsend(Port, Msg) when erlang:is_port(Port) ->
-    case net_kernel:connect(erlang:node(Port)) of
-	true -> erlang:send(Port, Msg);
-	false -> Msg
-    end;
-dsend({Name, Node}, Msg) ->
-    case net_kernel:connect(Node) of
-	true -> erlang:send({Name,Node}, Msg);
-	false -> Msg;
-	ignored -> Msg				% Not distributed.
-    end.
-
-dsend(Pid, Msg, Opts) when erlang:is_pid(Pid) ->
-    case net_kernel:connect(erlang:node(Pid)) of
-	true -> erlang:send(Pid, Msg, Opts);
-	false -> ok
-    end;
-dsend(Port, Msg, Opts) when erlang:is_port(Port) ->
-    case net_kernel:connect(erlang:node(Port)) of
-	true -> erlang:send(Port, Msg, Opts);
-	false -> ok
-    end;
-dsend({Name, Node}, Msg, Opts) ->
-    case net_kernel:connect(Node) of
-	true -> erlang:send({Name,Node}, Msg, Opts);
-	false -> ok;
-	ignored -> ok				% Not distributed.
-    end.
-
 -spec erlang:dmonitor_p('process', pid() | {atom(),atom()}) -> reference().
 dmonitor_p(process, ProcSpec) ->
-    %% ProcSpec = pid() | {atom(),atom()}
-    %% ProcSpec CANNOT be an atom because a locally registered process
-    %% is never handled here.
-    Node = case ProcSpec of
-	       {S,N} when erlang:is_atom(S),
-                          erlang:is_atom(N),
-                          N =/= erlang:node() -> N;
-	       _ when erlang:is_pid(ProcSpec) -> erlang:node(ProcSpec)
-	   end,
-    case net_kernel:connect(Node) of
-	true ->
-	    erlang:monitor(process, ProcSpec);
-	false ->
-	    Ref = erlang:make_ref(),
-	    erlang:self() ! {'DOWN', Ref, process, ProcSpec, noconnection},
-	    Ref
-    end.
+    %% Only called when auto-connect attempt failed early in VM
+    Ref = erlang:make_ref(),
+    erlang:self() ! {'DOWN', Ref, process, ProcSpec, noconnection},
+    Ref.
 
 %%
 %% Trap function used when modified timing has been enabled.
@@ -3821,15 +3737,14 @@ memory_is_supported() ->
 
 get_blocks_size([{blocks_size, Sz, _, _} | Rest], Acc) ->
     get_blocks_size(Rest, Acc+Sz);
-get_blocks_size([{_, _, _, _} | Rest], Acc) ->
-    get_blocks_size(Rest, Acc);
 get_blocks_size([{blocks_size, Sz} | Rest], Acc) ->
     get_blocks_size(Rest, Acc+Sz);
-get_blocks_size([{_, _} | Rest], Acc) ->
+get_blocks_size([_ | Rest], Acc) ->
     get_blocks_size(Rest, Acc);
 get_blocks_size([], Acc) ->
     Acc.
 
+
 blocks_size([{Carriers, SizeList} | Rest], Acc) when Carriers == mbcs;
 						     Carriers == mbcs_pool;
 						     Carriers == sbcs ->
@@ -4069,38 +3984,6 @@ receive_allocator(Ref, N, Acc) ->
 	    receive_allocator(Ref, N-1, insert_info(InfoList, Acc))
     end.
 
--spec erlang:await_sched_wall_time_modifications(Ref, Result) -> boolean() when
-      Ref :: reference(),
-      Result :: boolean().
-
-await_sched_wall_time_modifications(Ref, Result) ->
-    sched_wall_time(Ref, erlang:system_info(schedulers)),
-    Result.
-
--spec erlang:gather_sched_wall_time_result(Ref) -> [{pos_integer(),
-						     non_neg_integer(),
-						     non_neg_integer()}] when
-      Ref :: reference().
-
-gather_sched_wall_time_result(Ref) when erlang:is_reference(Ref) ->
-    sched_wall_time(Ref, erlang:system_info(schedulers), []).
-
-sched_wall_time(_Ref, 0) ->
-    ok;
-sched_wall_time(Ref, N) ->
-    receive Ref -> sched_wall_time(Ref, N-1) end.
-
-sched_wall_time(_Ref, 0, Acc) ->
-    Acc;
-sched_wall_time(Ref, N, undefined) ->
-    receive {Ref, _} -> sched_wall_time(Ref, N-1, undefined) end;
-sched_wall_time(Ref, N, Acc) ->
-    receive
-	{Ref, undefined} -> sched_wall_time(Ref, N-1, undefined);
-	{Ref, SWTL} when erlang:is_list(SWTL) -> sched_wall_time(Ref, N-1, Acc ++ SWTL);
-	{Ref, SWT} -> sched_wall_time(Ref, N-1, [SWT|Acc])
-    end.
-
 -spec erlang:gather_gc_info_result(Ref) ->
    {number(),number(),0} when Ref :: reference().
 
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src
index e2ab8686d2..338f168158 100644
--- a/erts/preloaded/src/erts.app.src
+++ b/erts/preloaded/src/erts.app.src
@@ -28,6 +28,7 @@
 		init,
 		otp_ring0,
 		erts_code_purger,
+		prim_buffer,
 		prim_eval,
 		prim_file,
 		prim_inet,
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index bb1824ecd4..a51c0c4c0e 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -32,7 +32,7 @@
 -export([await_port_send_result/3]).
 -export([cmp_term/2]).
 -export([map_to_tuple_keys/1, term_type/1, map_hashmap_children/1,
-         maps_to_list/2]).
+         map_next/3]).
 -export([open_port/2, port_command/3, port_connect/2, port_close/1,
 	 port_control/3, port_call/3, port_info/1, port_info/2]).
 
@@ -63,6 +63,14 @@
 
 -export([dist_ctrl_put_data/2]).
 
+-export([get_dflags/0]).
+-export([new_connection/1]).
+-export([abort_connection/2]).
+
+-export([scheduler_wall_time/1, system_flag_scheduler_wall_time/1,
+         gather_sched_wall_time_result/1,
+	 await_sched_wall_time_modifications/2]).
+
 %% Auto import name clash
 -export([check_process_code/1]).
 
@@ -367,20 +375,23 @@ term_type(_T) ->
 map_hashmap_children(_M) ->
     erlang:nif_error(undefined).
 
+%% return the next assoc in the iterator and a new iterator
+-spec map_next(I, M, A) -> {K,V,NI} | list() when
+      I :: non_neg_integer(),
+      M :: map(),
+      K :: term(),
+      V :: term(),
+      A :: iterator | list(),
+      NI :: maps:iterator().
+
+map_next(_I, _M, _A) ->
+    erlang:nif_error(undefined).
+
 -spec erts_internal:flush_monitor_messages(Ref, Multi, Res) -> term() when
       Ref :: reference(),
       Multi :: boolean(),
       Res :: term().
 
-%% return a list of key value pairs, at most of length N
--spec maps_to_list(M,N) -> Pairs when
-    M :: map(),
-    N :: integer(),
-    Pairs :: list().
-
-maps_to_list(_M, _N) ->
-    erlang:nif_error(undefined).
-
 %% erlang:demonitor(Ref, [flush]) traps to
 %% erts_internal:flush_monitor_messages(Ref, Res) when
 %% it needs to flush monitor messages.
@@ -498,3 +509,68 @@ dist_ctrl_put_data(DHandle, IoList) ->
                           | RootST],
 	    erlang:raise(Class, Reason, StackTrace)
     end.
+
+
+-spec erts_internal:get_dflags() -> {erts_dflags, integer(), integer(),
+                                     integer(), integer(), integer()}.
+get_dflags() ->
+    erlang:nif_error(undefined).
+
+-spec erts_internal:new_connection(Node) -> ConnId when
+      Node :: atom(),
+      ConnId :: {integer(), erlang:dist_handle()}.
+new_connection(_Node) ->
+    erlang:nif_error(undefined).
+
+-spec erts_internal:abort_connection(Node, ConnId) -> boolean() when
+      Node :: atom(),
+      ConnId :: {integer(), erlang:dist_handle()}.
+abort_connection(_Node, _ConnId) ->
+    erlang:nif_error(undefined).
+
+%% Scheduler wall time
+
+-spec erts_internal:system_flag_scheduler_wall_time(Enable) -> boolean() when
+      Enable :: boolean().
+
+system_flag_scheduler_wall_time(Bool) ->
+    kernel_refc:scheduler_wall_time(Bool).
+
+
+-spec erts_internal:await_sched_wall_time_modifications(Ref, Result) -> boolean() when
+      Ref :: reference(),
+      Result :: boolean().
+
+-spec erts_internal:scheduler_wall_time(Enable) -> boolean() when
+      Enable :: boolean().
+
+scheduler_wall_time(_Enable) ->
+    erlang:nif_error(undefined).
+
+await_sched_wall_time_modifications(Ref, Result) ->
+    sched_wall_time(Ref, erlang:system_info(schedulers)),
+    Result.
+
+-spec erts_internal:gather_sched_wall_time_result(Ref) -> [{pos_integer(),
+						     non_neg_integer(),
+						     non_neg_integer()}] when
+      Ref :: reference().
+
+gather_sched_wall_time_result(Ref) when erlang:is_reference(Ref) ->
+    sched_wall_time(Ref, erlang:system_info(schedulers), []).
+
+sched_wall_time(_Ref, 0) ->
+    ok;
+sched_wall_time(Ref, N) ->
+    receive Ref -> sched_wall_time(Ref, N-1) end.
+
+sched_wall_time(_Ref, 0, Acc) ->
+    Acc;
+sched_wall_time(Ref, N, undefined) ->
+    receive {Ref, _} -> sched_wall_time(Ref, N-1, undefined) end;
+sched_wall_time(Ref, N, Acc) ->
+    receive
+	{Ref, undefined} -> sched_wall_time(Ref, N-1, undefined);
+	{Ref, SWTL} when erlang:is_list(SWTL) -> sched_wall_time(Ref, N-1, Acc ++ SWTL);
+	{Ref, SWT} -> sched_wall_time(Ref, N-1, [SWT|Acc])
+    end.
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index 34a9f6b8b9..e0ae6b1656 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -32,8 +32,8 @@
 %%                         (Optional - default efile)
 %%        -hosts [Node]  : List of hosts from which we can boot.
 %%                         (Mandatory if -loader inet)
-%%        -mode embedded : Load all modules at startup, no automatic loading
-%%        -mode interactive : Auto load modules (default system behaviour).
+%%        -mode interactive : Auto load modules not needed at startup (default system behaviour).
+%%        -mode embedded : Load all modules in the boot script, disable auto loading.
 %%        -path          : Override path in bootfile.
 %%        -pa Path+      : Add my own paths first.
 %%        -pz Path+      : Add my own paths last.
@@ -200,10 +200,11 @@ boot(BootArgs) ->
     register(init, self()),
     process_flag(trap_exit, true),
 
-    %% Load the zlib nif
+    %% Load the static nifs
     zlib:on_load(),
-    %% Load the tracer nif
     erl_tracer:on_load(),
+    prim_buffer:on_load(),
+    prim_file:on_load(),
 
     {Start0,Flags,Args} = parse_boot_args(BootArgs),
     %% We don't get to profile parsing of BootArgs
diff --git a/erts/preloaded/src/prim_buffer.erl b/erts/preloaded/src/prim_buffer.erl
new file mode 100644
index 0000000000..e0d35a6792
--- /dev/null
+++ b/erts/preloaded/src/prim_buffer.erl
@@ -0,0 +1,140 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(prim_buffer).
+
+-export([on_load/0]).
+
+%% This is a mutable binary buffer that helps break out buffering logic from
+%% NIFs/drivers, which is often the only thing that prevents the C code from
+%% being reduced to bare system call wrappers.
+%%
+%% All operations in this file are thread-unsafe and risk crashing the emulator
+%% if you're not careful.
+
+-export([new/0, size/1, wipe/1, read/2, read_iovec/2, write/2, skip/2]).
+
+-export([find_byte_index/2]).
+
+-export([try_lock/1, unlock/1]).
+
+-type prim_buffer() :: term().
+
+%% Controls when to copy rather than extract sub-binaries from the buffer,
+%% reducing the risk of small reads keeping a large binary alive.
+-define(COPYING_READ_LIMIT, 512).
+
+%% Reads that fit into heap binaries are always copied since the cost of
+%% peeking binaries that short is largely equivalent to copying.
+-define(ERL_ONHEAP_BIN_LIMIT, 64).
+
+on_load() ->
+    case erlang:load_nif(atom_to_list(?MODULE), 0) of
+        ok -> ok
+    end.
+
+-spec new() -> prim_buffer().
+new() ->
+    erlang:nif_error(undef).
+
+-spec size(Buffer :: prim_buffer()) -> non_neg_integer().
+size(_Buffer) ->
+    erlang:nif_error(undef).
+
+%% Reads data as a binary from the front of the buffer. This will almost always
+%% result in copying so it should be avoided unless you absolutely must have a
+%% binary.
+-spec read(Buffer :: prim_buffer(), Size :: non_neg_integer()) -> binary().
+read(Buffer, Size) when Size =< ?ERL_ONHEAP_BIN_LIMIT ->
+    copying_read(Buffer, Size);
+read(Buffer, Size) when Size > ?ERL_ONHEAP_BIN_LIMIT ->
+    iolist_to_binary(read_iovec(Buffer, Size)).
+
+%% Reads data as an erlang:iovec() binary from the front of the buffer,
+%% avoiding copying if reasonable.
+-spec read_iovec(Buffer, Size) -> IOVec when
+      Buffer :: prim_buffer(),
+      Size :: non_neg_integer(),
+      IOVec :: erlang:iovec().
+read_iovec(Buffer, Size) when Size =< ?ERL_ONHEAP_BIN_LIMIT ->
+    [copying_read(Buffer, Size)];
+read_iovec(Buffer, Size) when Size > ?ERL_ONHEAP_BIN_LIMIT ->
+    Head = peek_head(Buffer),
+    HeadSize = byte_size(Head),
+    if
+        (HeadSize - Size) > ?COPYING_READ_LIMIT, Size =< ?COPYING_READ_LIMIT ->
+            [copying_read(Buffer, Size)];
+        HeadSize > Size ->
+            skip(Buffer, Size),
+            {First, _Rest} = split_binary(Head, Size),
+            [First];
+        HeadSize < Size ->
+            skip(Buffer, HeadSize),
+            [Head | read_iovec(Buffer, Size - HeadSize)];
+        HeadSize =:= Size ->
+            skip(Buffer, Size),
+            [Head]
+    end.
+
+%% Writes an erlang:iovec() to the back of the buffer.
+-spec write(Buffer :: prim_buffer(), IOVec :: erlang:iovec()) -> ok.
+write(_Buffer, _IOVec) ->
+    erlang:nif_error(undef).
+
+%% Removes data from the front of the buffer without reading it.
+-spec skip(Buffer :: prim_buffer(), Size :: non_neg_integer()) -> ok.
+skip(_Buffer, _Size) ->
+    erlang:nif_error(undef).
+
+-spec wipe(Buffer :: prim_buffer()) -> ok.
+wipe(Buffer) ->
+    skip(Buffer, prim_buffer:size(Buffer)).
+
+%% Finds the start-index of the first occurence of Needle, for implementing
+%% read_line and similar.
+-spec find_byte_index(Buffer, Needle) -> Result when
+      Buffer :: prim_buffer(),
+      Needle :: non_neg_integer(),
+      Result :: {ok, non_neg_integer()} |
+                not_found.
+find_byte_index(_Buffer, _Needle) ->
+    erlang:nif_error(undef).
+
+%% Attempts to take a unique lock on the buffer. Failure handling is left to
+%% the user.
+-spec try_lock(Buffer :: prim_buffer()) -> acquired | busy.
+try_lock(_Buffer) ->
+    erlang:nif_error(undef).
+
+-spec unlock(Buffer :: prim_buffer()) -> ok.
+unlock(_Buffer) ->
+    erlang:nif_error(undef).
+
+%% Unexported helper functions:
+
+%% Reads data from the front of the buffer, returning a copy of the data to
+%% avoid holding references.
+-spec copying_read(Buffer :: prim_buffer(), Size :: non_neg_integer()) -> binary().
+copying_read(_Buffer, _Size) ->
+    erlang:nif_error(undef).
+
+%% Returns the binary at the front of the buffer without modifying the buffer.
+-spec peek_head(Buffer :: prim_buffer()) -> binary().
+peek_head(_Buffer) ->
+    erlang:nif_error(undef).
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index ab5359ebbc..35042a7c72 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-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.
@@ -19,147 +19,45 @@
 %%
 -module(prim_file).
 
-%% Interface module to the file driver.
+-export([on_load/0]).
 
+-export([open/2, close/1,
+         sync/1, datasync/1, truncate/1, advise/4, allocate/3,
+         read_line/1, read/2, write/2, position/2,
+         pread/2, pread/3, pwrite/2, pwrite/3]).
 
+%% OTP internal.
+-export([ipread_s32bu_p32bu/3, sendfile/8, altname/1, get_handle/1]).
 
-%%% Interface towards a single file's contents. Uses ?FD_DRV.
+-export([read_file/1, write_file/2]).
 
-%% Generic file contents operations
--export([open/2, close/1, datasync/1, sync/1, advise/4, position/2, truncate/1,
-	 write/2, pwrite/2, pwrite/3, read/2, read_line/1, pread/2, pread/3,
-	 copy/3, sendfile/8, allocate/3]).
+-export([read_link/1, read_link_all/1,
+         read_link_info/1, read_link_info/2,
+         read_file_info/1, read_file_info/2,
+         write_file_info/2, write_file_info/3]).
 
-%% Specialized file operations
--export([open/1, open/3]).
--export([read_file/1, read_file/2, write_file/2]).
--export([ipread_s32bu_p32bu/3]).
+-export([list_dir/1, list_dir_all/1]).
 
+-export([get_cwd/0, get_cwd/1, set_cwd/1,
+         delete/1, rename/2,
+         make_dir/1, del_dir/1,
+         make_link/2, make_symlink/2]).
 
-
-%%% Interface towards file system and metadata. Uses ?DRV.
-
-%% Takes an optional port (opens a ?DRV port per default) as first argument.
--export([get_cwd/0, get_cwd/1, get_cwd/2, 
-	 set_cwd/1, set_cwd/2,
-	 delete/1, delete/2, 
-	 rename/2, rename/3, 
-	 make_dir/1, make_dir/2,
-	 del_dir/1, del_dir/2,
-	 read_file_info/1, read_file_info/2, read_file_info/3,
-	 altname/1, altname/2,
-	 write_file_info/2, write_file_info/3, write_file_info/4,
-	 make_link/2, make_link/3,
-	 make_symlink/2, make_symlink/3,
-	 read_link/1, read_link/2, read_link_all/1, read_link_all/2,
-	 read_link_info/1, read_link_info/2, read_link_info/3,
-	 list_dir/1, list_dir/2, list_dir_all/1, list_dir_all/2]).
-%% How to start and stop the ?DRV port.
--export([start/0, stop/1]).
-
-%% Debug exports
--export([open_int/4, open_mode/1, open_mode/4]).
-
-%%%-----------------------------------------------------------------
-%%% Includes and defines
-
--include("file.hrl").
-
--define(DRV,    "efile").
--define(FD_DRV, "efile").
-
+-define(MIN_READLINE_SIZE, 256).
 -define(LARGEFILESIZE, (1 bsl 63)).
 
-%% Driver commands
--define(FILE_OPEN,             1).
--define(FILE_READ,             2).
--define(FILE_LSEEK,            3).
--define(FILE_WRITE,            4).
--define(FILE_FSTAT,            5).
--define(FILE_PWD,              6).
--define(FILE_READDIR,          7).
--define(FILE_CHDIR,            8).
--define(FILE_FSYNC,            9).
--define(FILE_MKDIR,            10).
--define(FILE_DELETE,           11).
--define(FILE_RENAME,           12).
--define(FILE_RMDIR,            13).
--define(FILE_TRUNCATE,         14).
--define(FILE_READ_FILE,        15).
--define(FILE_WRITE_INFO,       16).
--define(FILE_LSTAT,            19).
--define(FILE_READLINK,         20).
--define(FILE_LINK,             21).
--define(FILE_SYMLINK,          22).
--define(FILE_CLOSE,            23).
--define(FILE_PWRITEV,          24).
--define(FILE_PREADV,           25).
--define(FILE_SETOPT,           26).
--define(FILE_IPREAD,           27).
--define(FILE_ALTNAME,          28).
--define(FILE_READ_LINE,        29).
--define(FILE_FDATASYNC,        30).
--define(FILE_ADVISE,           31).
--define(FILE_SENDFILE,         32).
--define(FILE_ALLOCATE,         33).
-
-%% Driver responses
--define(FILE_RESP_OK,          0).
--define(FILE_RESP_ERROR,       1).
--define(FILE_RESP_DATA,        2).
--define(FILE_RESP_NUMBER,      3).
--define(FILE_RESP_INFO,        4).
--define(FILE_RESP_NUMERR,      5).
--define(FILE_RESP_LDATA,       6).
--define(FILE_RESP_N2DATA,      7).
--define(FILE_RESP_EOF,         8).
--define(FILE_RESP_FNAME,       9).
--define(FILE_RESP_ALL_DATA,   10).
--define(FILE_RESP_LFNAME,     11).
-
-%% Open modes for the driver's open function.
--define(EFILE_MODE_READ,       1).
--define(EFILE_MODE_WRITE,      2).
--define(EFILE_MODE_READ_WRITE, 3).  
--define(EFILE_MODE_APPEND,     4).
--define(EFILE_COMPRESSED,      8).
--define(EFILE_MODE_EXCL,       16).
-%% Note: bit 5 (32) is used internally for VxWorks
--define(EFILE_MODE_SYNC,       64).
-
-%% Use this mask to get just the mode bits to be passed to the driver.
--define(EFILE_MODE_MASK, 127).
-
-%% Seek modes for the driver's seek function.
--define(EFILE_SEEK_SET, 0).
--define(EFILE_SEEK_CUR, 1).
--define(EFILE_SEEK_END, 2).
-
-%% Options
--define(FILE_OPT_DELAYED_WRITE, 0).
--define(FILE_OPT_READ_AHEAD,    1).
-
-%% IPREAD variants
--define(IPREAD_S32BU_P32BU, 0).
-
-%% POSIX file advises
--define(POSIX_FADV_NORMAL,     0).
--define(POSIX_FADV_RANDOM,     1).
--define(POSIX_FADV_SEQUENTIAL, 2).
--define(POSIX_FADV_WILLNEED,   3).
--define(POSIX_FADV_DONTNEED,   4).
--define(POSIX_FADV_NOREUSE,    5).
-
-%% Sendfile flags
--define(EFILE_SENDFILE_USE_THREADS, 1).
+-export([copy/3]).
 
+-include("file_int.hrl").
+
+-type prim_file_ref() :: term().
 
 %%% BIFs
 
 -export([internal_name2native/1,
          internal_native2name/1,
          internal_normalize_utf8/1,
-	 is_translatable/1]).
+         is_translatable/1]).
 
 -type prim_file_name() :: string() | unicode:unicode_binary().
 -type prim_file_name_error() :: 'error' | 'ignore' | 'warning'.
@@ -185,1316 +83,733 @@ internal_normalize_utf8(_) ->
 is_translatable(_) ->
     erlang:nif_error(undefined).
 
-%%% End of BIFs
-
-%%%-----------------------------------------------------------------
-%%% Functions operating on a file through a handle. ?FD_DRV.
-%%%
-%%% Generic file contents operations.
-%%%
-%%% Supposed to be called by applications through module file.
-
-
-%% Opens a file using the driver port Port. Returns {error, Reason}
-%% | {ok, FileDescriptor}
-open(Port, File, ModeList) when is_port(Port), 
-                                (is_list(File) orelse is_binary(File)), 
-                                is_list(ModeList) ->
-    case open_mode(ModeList) of
-	{Mode, _Portopts, _Setopts} ->
-	    open_int(Port, File, Mode, []);
-	Reason ->
-	    {error, Reason}
-    end;
-open(_,_,_) ->
-    {error, badarg}.
-
-%% Opens a file. Returns {error, Reason} | {ok, FileDescriptor}.
-open(File, ModeList) when (is_list(File) orelse is_binary(File)), 
-			  is_list(ModeList) ->
-    case open_mode(ModeList) of
-	{Mode, Portopts, Setopts} ->
-	    open_int({?FD_DRV, Portopts},File, Mode, Setopts);
-	Reason ->
-	    {error, Reason}
-    end;
-open(_, _) ->
-    {error, badarg}.
+%%
 
-%% Opens a port that can be used for open/3 or read_file/2.
-%% Returns {ok, Port} | {error, Reason}.
-open(Portopts) when is_list(Portopts) ->
-    drv_open(?FD_DRV, [binary|Portopts]);
-open(_) ->
-    {error, badarg}.
+%% Returns {error, Reason} | {ok, BytesCopied}
+copy(#file_descriptor{module = ?MODULE} = Source,
+     #file_descriptor{module = ?MODULE} = Dest,
+     Length)
+  when is_integer(Length), Length >= 0;
+       is_atom(Length) ->
+    %% XXX Should be moved down to the driver for optimization.
+    file:copy_opened(Source, Dest, Length).
 
-open_int({Driver, Portopts}, File, Mode, Setopts) ->
-    case drv_open(Driver, Portopts) of
-	{ok, Port} ->
-	    open_int(Port, File, Mode, Setopts);
-	{error, _} = Error ->
-	    Error
-    end;
-open_int(Port, File, Mode, Setopts) ->
-    M = Mode band ?EFILE_MODE_MASK,
-    case drv_command(Port, [<<?FILE_OPEN, M:32>>, pathname(File)]) of
-	{ok, Number} ->
-	    open_int_setopts(Port, Number, Setopts);
-	Error ->
-	    drv_close(Port),
-	    Error
-    end.
+on_load() ->
+    ok = erlang:load_nif(atom_to_list(?MODULE), 0).
 
-open_int_setopts(Port, Number, []) ->
-    {ok, #file_descriptor{module = ?MODULE, data = {Port, Number}}};    
-open_int_setopts(Port, Number, [Cmd | Tail]) ->
-    case drv_command(Port, Cmd) of
-	ok ->
-	    open_int_setopts(Port, Number, Tail);
-	Error ->
-	    drv_close(Port),
-	    Error
+open(Name, Modes) ->
+    %% The try/catch pattern seen here is used throughout the file to adhere to
+    %% the public file interface, which has leaked through for ages because of
+    %% "raw files."
+    try open_nif(encode_path(Name), Modes) of
+        {ok, Ref} -> {ok, make_fd(Ref, Modes)};
+        {error, Reason} -> {error, Reason}
+    catch
+        error:badarg -> {error, badarg}
     end.
 
+make_fd(FRef, Modes) ->
+    #file_descriptor{module = ?MODULE, data = build_fd_data(FRef, Modes) }.
 
-
-%% Returns ok.
-
-close(#file_descriptor{module = ?MODULE, data = {Port, _}}) ->
-    case drv_command(Port, <<?FILE_CLOSE>>) of
-	ok ->
-	    drv_close(Port);
-	Error ->
-	    Error
-    end;
-%% Closes a port opened with open/1.
-close(Port) when is_port(Port) ->
-    drv_close(Port).
-
--define(ADVISE(Offs, Len, Adv),
-	<<?FILE_ADVISE, Offs:64/signed, Len:64/signed,
-	  Adv:32/signed>>).
-
-%% Returns {error, Reason} | ok.
-advise(#file_descriptor{module = ?MODULE, data = {Port, _}},
-       Offset, Length, Advise) ->
-    case Advise of
-	normal ->
-	    Cmd = ?ADVISE(Offset, Length, ?POSIX_FADV_NORMAL),
-	    drv_command(Port, Cmd);
-	random ->
-	    Cmd = ?ADVISE(Offset, Length, ?POSIX_FADV_RANDOM),
-	    drv_command(Port, Cmd);
-	sequential ->
-	    Cmd = ?ADVISE(Offset, Length, ?POSIX_FADV_SEQUENTIAL),
-	    drv_command(Port, Cmd);
-	will_need ->
-	    Cmd = ?ADVISE(Offset, Length, ?POSIX_FADV_WILLNEED),
-	    drv_command(Port, Cmd);
-	dont_need ->
-	    Cmd = ?ADVISE(Offset, Length, ?POSIX_FADV_DONTNEED),
-	    drv_command(Port, Cmd);
-	no_reuse ->
-	    Cmd = ?ADVISE(Offset, Length, ?POSIX_FADV_NOREUSE),
-	    drv_command(Port, Cmd);
-	_ ->
-	    {error, einval}
+close(Fd) ->
+    try
+        #{ handle := FRef } = get_fd_data(Fd),
+        close_nif(FRef)
+    catch
+        error:badarg -> {error, badarg}
     end.
 
-%% Returns {error, Reason} | ok.
-allocate(#file_descriptor{module = ?MODULE, data = {Port, _}}, Offset, Length) ->
-    Cmd = <<?FILE_ALLOCATE, Offset:64/signed, Length:64/signed>>,
-    drv_command(Port, Cmd).
-
-%% Returns {error, Reason} | ok.
-write(#file_descriptor{module = ?MODULE, data = {Port, _}}, Bytes) ->
-    case drv_command_nt(Port, [?FILE_WRITE,erlang:dt_prepend_vm_tag_data(Bytes)],undefined) of
-	{ok, _Size} ->
-	    ok;
-	Error ->
-	    Error
+read(Fd, Size) ->
+    try
+        #{ handle := FRef,
+           r_ahead_size := RASz,
+           r_buffer := RBuf } = get_fd_data(Fd),
+        read_1(FRef, RBuf, prim_buffer:size(RBuf), RASz, Size)
+    catch
+        error:badarg -> {error, badarg}
     end.
 
-%% Returns ok | {error, {WrittenCount, Reason}}
-pwrite(#file_descriptor{module = ?MODULE, data = {Port, _}}, L)
-  when is_list(L) ->
-    pwrite_int(Port, L, 0, [], []).
-
-pwrite_int(_, [], 0, [], []) ->
-    ok;
-pwrite_int(Port, [], N, Spec, Data) ->
-    Header = list_to_binary([?FILE_PWRITEV, erlang:dt_prepend_vm_tag_data(<<N:32>>) | reverse(Spec)]),
-    case drv_command_nt(Port, [Header | reverse(Data)], undefined) of
-	{ok, _Size} ->
-	    ok;
-	Error ->
-	    Error
-    end;
-pwrite_int(Port, [{Offs, Bytes} | T], N, Spec, Data)
-  when is_integer(Offs) ->
-    if
-	-(?LARGEFILESIZE) =< Offs, Offs < ?LARGEFILESIZE ->
-	    pwrite_int(Port, T, N, Spec, Data, Offs, Bytes);
-	true ->
-	    {error, einval}
+-spec read_1(FRef, RBuf, RBufSz, RASz, RSz) -> Result when
+      FRef :: prim_file_ref(),
+      RBuf :: term(),
+      RBufSz :: non_neg_integer(),
+      RASz :: non_neg_integer(),
+      RSz :: non_neg_integer(),
+      Result :: eof | {ok, binary()} | {error, Reason :: atom()}.
+read_1(_FRef, RBuf, RBufSz, _RASz, RSz) when RBufSz >= RSz ->
+    {ok, prim_buffer:read(RBuf, RSz)};
+read_1(FRef, RBuf, RBufSz, RASz, RSz) when RBufSz > 0 ->
+    Buffered = prim_buffer:read(RBuf, RBufSz),
+    case read_1(FRef, RBuf, 0, RASz, RSz - RBufSz) of
+        {ok, Data} ->
+            {ok, <<Buffered/binary, Data/binary>>};
+        eof ->
+            {ok, Buffered};
+        {error, Reason} ->
+            {error, Reason}
     end;
-pwrite_int(_, [_|_], _N, _Spec, _Data) ->
-    {error, badarg}.
+read_1(FRef, RBuf, RBufSz, RASz, RSz) when RBufSz =:= 0 ->
+    case read_nif(FRef, RASz + RSz) of
+        {ok, Data} when byte_size(Data) > RSz ->
+            {First, Rest} = split_binary(Data, RSz),
+            prim_buffer:write(RBuf, [Rest]),
+            {ok, First};
+        {ok, Data} when byte_size(Data) =< RSz ->
+            {ok, Data};
+        eof ->
+            eof;
+        {error, Reason} ->
+            {error, Reason}
+    end.
 
-pwrite_int(Port, T, N, Spec, Data, Offs, Bin)
-  when is_binary(Bin) ->
-    Size = byte_size(Bin),
-    pwrite_int(Port, T, N+1, 
-	       [<<Offs:64/signed, Size:64>> | Spec], 
-	       [Bin | Data]);
-pwrite_int(Port, T, N, Spec, Data, Offs, Bytes) ->
-    try list_to_binary(Bytes) of
-	Bin ->
-	    pwrite_int(Port, T, N, Spec, Data, Offs, Bin)
+read_line(Fd) ->
+    try
+        #{ handle := FRef,
+           r_ahead_size := RASz,
+           r_buffer := RBuf } = get_fd_data(Fd),
+        SearchResult = prim_buffer:find_byte_index(RBuf, $\n),
+        LineSize = max(?MIN_READLINE_SIZE, RASz),
+        read_line_1(FRef, RBuf, SearchResult, LineSize)
     catch
-	error:Reason ->
-	    {error, Reason}
+        error:badarg -> {error, badarg}
     end.
 
-
-
-%% Returns {error, Reason} | ok.
-pwrite(#file_descriptor{module = ?MODULE, data = {Port, _}}, Offs, Bytes) 
-  when is_integer(Offs) ->
-    if
-	-(?LARGEFILESIZE) =< Offs, Offs < ?LARGEFILESIZE ->
-	    case pwrite_int(Port, [], 0, [], [], Offs, Bytes) of
-		{error, {_, Reason}} ->
-		    {error, Reason};
-		Result ->
-		    Result
-	    end;
-	true ->
-	    {error, einval}
+-spec read_line_1(FRef, RBuf, SearchResult, LineSize) -> Result when
+      FRef :: prim_file_ref(),
+      RBuf :: term(),
+      SearchResult :: not_found | {ok, non_neg_integer()},
+      LineSize :: non_neg_integer(),
+      Result :: eof | {ok, binary()} | {error, Reason :: atom()}.
+read_line_1(FRef, RBuf, not_found, LineSize) ->
+    case read_nif(FRef, LineSize) of
+        {ok, Data} ->
+            prim_buffer:write(RBuf, [Data]),
+            SearchResult = prim_buffer:find_byte_index(RBuf, $\n),
+            read_line_1(FRef, RBuf, SearchResult, LineSize);
+        eof ->
+            case prim_buffer:size(RBuf) of
+                Size when Size > 0 -> {ok, prim_buffer:read(RBuf, Size)};
+                Size when Size =:= 0 -> eof
+            end;
+        {error, Reason} ->
+            {error, Reason}
     end;
-pwrite(#file_descriptor{module = ?MODULE}, _, _) ->
-    {error, badarg}.
-
+read_line_1(_FRef, RBuf, {ok, LFIndex}, _LineSize) ->
+    %% Translate CRLF into just LF, completely ignoring which encoding is used.
+    CRIndex = (LFIndex - 1),
+    case prim_buffer:read(RBuf, LFIndex + 1) of
+        <<Line:CRIndex/binary, "\r\n">> -> {ok, <<Line/binary, "\n">>};
+        Line -> {ok, Line}
+    end.
 
-%% Returns {error, Reason} | ok.
-datasync(#file_descriptor{module = ?MODULE, data = {Port, _}}) ->
-    drv_command(Port, [?FILE_FDATASYNC]).
-
-%% Returns {error, Reason} | ok.
-sync(#file_descriptor{module = ?MODULE, data = {Port, _}}) ->
-    drv_command(Port, [?FILE_FSYNC]).
-
-%% Returns {ok, Data} | eof | {error, Reason}.
-read_line(#file_descriptor{module = ?MODULE, data = {Port, _}}) ->
-    case drv_command(Port, <<?FILE_READ_LINE>>) of
-	{ok, {0, _Data}} ->
-	    eof;
-	{ok, {_Size, Data}} ->
-	    {ok, Data};
-	{error, enomem} ->
-	    erlang:garbage_collect(),
-	    case drv_command(Port, <<?FILE_READ_LINE>>) of
-		{ok, {0, _Data}} ->
-		    eof;
-		{ok, {_Size, Data}} ->
-		    {ok, Data};
-		Other ->
-		    Other
-	    end;
-	Error ->
-	    Error
+write(Fd, IOData) ->
+    try
+        #{ handle := FRef } = get_fd_data(Fd),
+        reset_write_position(Fd),
+        write_1(FRef, erlang:iolist_to_iovec(IOData))
+    catch
+        error:badarg -> {error, badarg}
     end.
-	
-%% Returns {ok, Data} | eof | {error, Reason}.
-read(#file_descriptor{module = ?MODULE, data = {Port, _}}, Size)
-  when is_integer(Size), 0 =< Size ->
-    if
-	Size < ?LARGEFILESIZE ->
-	    case drv_command(Port, <<?FILE_READ, Size:64>>) of
-		{ok, {0, _Data}} when Size =/= 0 ->
-		    eof;
-		{ok, {_Size, Data}} ->
-		    {ok, Data};
-		{error, enomem} ->
-		    %% Garbage collecting here might help if
-		    %% the current processes have some old binaries left.
-		    erlang:garbage_collect(),
-		    case drv_command(Port, <<?FILE_READ, Size:64>>) of
-			{ok, {0, _Data}} when Size =/= 0 ->
-			    eof;
-			{ok, {_Size, Data}} ->
-			    {ok, Data};
-			Other ->
-			    Other
-		    end;
-		Error ->
-		    Error
-	    end;
-	true ->
-	    {error, einval}
+write_1(FRef, IOVec) ->
+    case write_nif(FRef, IOVec) of
+        {continue, Remainder} ->
+            write_1(FRef, Remainder);
+        ok ->
+            ok;
+        {error, Reason} ->
+            {error, Reason}
     end.
 
-%% Returns {ok, [Data|eof, ...]} | {error, Reason}
-pread(#file_descriptor{module = ?MODULE, data = {Port, _}}, L)
-  when is_list(L) ->
-    pread_int(Port, L, 0, []).
-
-pread_int(_, [], 0, []) ->
-    {ok, []};
-pread_int(Port, [], N, Spec) ->
-    drv_command_nt(Port, [?FILE_PREADV, erlang:dt_prepend_vm_tag_data(<<0:32, N:32>>) | reverse(Spec)],undefined);
-pread_int(Port, [{Offs, Size} | T], N, Spec)
-  when is_integer(Offs), is_integer(Size), 0 =< Size ->
-    if
-	-(?LARGEFILESIZE) =< Offs, Offs < ?LARGEFILESIZE,
-	Size < ?LARGEFILESIZE ->
-	    pread_int(Port, T, N+1, [<<Offs:64/signed, Size:64>> | Spec]);
-	true ->
-	    {error, einval}
-    end;
-pread_int(_, [_|_], _N, _Spec) ->
-    {error, badarg}.
-
-
-
-%% Returns {ok, Data} | eof | {error, Reason}.
-pread(#file_descriptor{module = ?MODULE, data = {Port, _}}, Offs, Size) 
-  when is_integer(Offs), is_integer(Size), 0 =< Size ->
-    if
-	-(?LARGEFILESIZE) =< Offs, Offs < ?LARGEFILESIZE,
-	Size < ?LARGEFILESIZE ->
-	    case drv_command_nt(Port, 
-				[?FILE_PREADV, erlang:dt_prepend_vm_tag_data(<<0:32, 1:32,
-									     Offs:64/signed, Size:64>>)], undefined) of
-		{ok, [eof]} ->
-		    eof;
-		{ok, [Data]} ->
-		    {ok, Data};
-		Error ->
-		    Error
-	    end;
-	true ->
-	    {error, einval}
-    end;
-pread(#file_descriptor{module = ?MODULE, data = {_, _}}, _, _) ->
-    {error, badarg}.
-
-
-
-%% Returns {ok, Position} | {error, Reason}.
-position(#file_descriptor{module = ?MODULE, data = {Port, _}}, At) ->
-    case lseek_position(At) of
-	{Offs, Whence}
-	when -(?LARGEFILESIZE) =< Offs, Offs < ?LARGEFILESIZE ->
-	    drv_command(Port, <<?FILE_LSEEK, Offs:64/signed, Whence:32>>);
-	{_, _} ->
-	    {error, einval};
-	Reason ->
-	    {error, Reason}
+truncate(Fd) ->
+    try
+        #{ handle := FRef } = get_fd_data(Fd),
+        reset_write_position(Fd),
+        truncate_nif(FRef)
+    catch
+        error:badarg -> {error, badarg}
     end.
 
-%% Returns {error, Reason} | ok.
-truncate(#file_descriptor{module = ?MODULE, data = {Port, _}}) ->
-    drv_command(Port, <<?FILE_TRUNCATE>>).
-
-
-
-%% Returns {error, Reason} | {ok, BytesCopied}
-copy(#file_descriptor{module = ?MODULE} = Source,
-     #file_descriptor{module = ?MODULE} = Dest,
-     Length)
-  when is_integer(Length), Length >= 0;
-       is_atom(Length) ->
-    %% XXX Should be moved down to the driver for optimization.
-    file:copy_opened(Source, Dest, Length).
-
-
-
-ipread_s32bu_p32bu(#file_descriptor{module = ?MODULE,
-				    data = {_, _}} = Handle,
-		   Offs,
-		   Infinity) when is_atom(Infinity) ->
-    ipread_s32bu_p32bu(Handle, Offs, (1 bsl 31)-1);
-ipread_s32bu_p32bu(#file_descriptor{module = ?MODULE, data = {Port, _}},
-		   Offs,
-		   MaxSize)
-  when is_integer(Offs), is_integer(MaxSize) ->
-    if
-	-(?LARGEFILESIZE) =< Offs, Offs < ?LARGEFILESIZE,
-	0 =< MaxSize, MaxSize < (1 bsl 31) ->
-	    drv_command(Port, <<?FILE_IPREAD, ?IPREAD_S32BU_P32BU,
-			       Offs:64, MaxSize:32>>);
-	true ->
-	    {error, einval}
-    end;
-ipread_s32bu_p32bu(#file_descriptor{module = ?MODULE, data = {_, _}},
-		   _Offs,
-		   _MaxSize) ->
-    {error, badarg}.
+advise(Fd, Offset, Length, Advise) ->
+    try
+        #{ handle := FRef } = get_fd_data(Fd),
+        advise_nif(FRef, Offset, Length, Advise)
+    catch
+        error:badarg -> {error, badarg}
+    end.
 
+allocate(Fd, Offset, Length) ->
+    try
+        #{ handle := FRef } = get_fd_data(Fd),
+        allocate_nif(FRef, Offset, Length)
+    catch
+        error:badarg -> {error, badarg}
+    end.
 
+sync(Fd) ->
+    try
+        #{ handle := FRef } = get_fd_data(Fd),
+        sync_nif(FRef, 0)
+    catch
+        error:badarg -> {error, badarg}
+    end.
 
-%% Returns {ok, Contents} | {error, Reason}
-read_file(File) when (is_list(File) orelse is_binary(File)) ->
-    case drv_open(?FD_DRV, [binary]) of
-	{ok, Port} ->
-	    Result = read_file(Port, File),
-	    close(Port),
-	    Result;
-	{error, _} = Error ->
-	    Error
-    end;
-read_file(_) ->
-    {error, badarg}.
+datasync(Fd) ->
+    try
+        #{ handle := FRef } = get_fd_data(Fd),
+        sync_nif(FRef, 1)
+    catch
+        error:badarg -> {error, badarg}
+    end.
 
-%% Takes a Port opened with open/1.
-read_file(Port, File) when is_port(Port),
-			   (is_list(File) orelse is_binary(File)) ->
-    Cmd = [?FILE_READ_FILE | pathname(File)],
-    case drv_command(Port, Cmd) of
-	{error, enomem} ->
-	    %% It could possibly help to do a 
-	    %% garbage collection here, 
-	    %% if the file server has some references
-	    %% to binaries read earlier.
-	    erlang:garbage_collect(),
-	    drv_command(Port, Cmd);
-	Result ->
-	    Result
+position(Fd, {cur, Offset}) ->
+    try
+        %% Adjust our current position according to how much we've read ahead.
+        #{ r_buffer := RBuf } = get_fd_data(Fd),
+        position_1(Fd, cur, Offset - prim_buffer:size(RBuf))
+    catch
+        error:badarg -> {error, badarg}
     end;
-read_file(_,_) ->
-    {error, badarg}.
-
-    
-
-%% Returns {error, Reason} | ok.
-write_file(File, Bin) when (is_list(File) orelse is_binary(File)) ->
-    case open(File, [binary, write]) of
-	{ok, Handle} ->
-	    Result = write(Handle, Bin),
-	    close(Handle),
-	    Result;
-	Error ->
-	    Error
+position(Fd, {Mark, Offset}) ->
+    try
+        position_1(Fd, Mark, Offset)
+    catch
+        error:badarg -> {error, badarg}
     end;
-write_file(_, _) -> 
-    {error, badarg}.
+position(Fd, cur) -> position(Fd, {cur, 0});
+position(Fd, bof) -> position(Fd, {bof, 0});
+position(Fd, eof) -> position(Fd, {eof, 0});
+position(Fd, Offset) -> position(Fd, {bof, Offset}).
 
+position_1(Fd, Mark, Offset) ->
+    #{ handle := FRef, r_buffer := RBuf } = get_fd_data(Fd),
+    prim_buffer:wipe(RBuf),
+    seek_nif(FRef, Mark, Offset).
 
-%% Returns {error, Reason} | {ok, BytesCopied}
-%sendfile(_,_,_,_,_,_,_,_,_,_) ->
-%    {error, enotsup};
-sendfile(#file_descriptor{module = ?MODULE, data = {Port, _}},
-	 Dest, Offset, Bytes, _ChunkSize, Headers, Trailers,
-	 Flags) ->
-    case erlang:port_get_data(Dest) of
-	Data when Data == inet_tcp; Data == inet6_tcp ->
-	    ok = inet:lock_socket(Dest,true),
-	    {ok, DestFD} = prim_inet:getfd(Dest),
-	    IntFlags = translate_sendfile_flags(Flags),
-	    try drv_command(Port, [<<?FILE_SENDFILE, DestFD:32,
-				     IntFlags:8,
-				     Offset:64/unsigned,
-				     Bytes:64/unsigned,
-				     (iolist_size(Headers)):32/unsigned,
-				     (iolist_size(Trailers)):32/unsigned>>,
-				   Headers,Trailers])
-	    after
-		ok = inet:lock_socket(Dest,false)
-	    end;
-	_Else ->
-	    {error,badarg}
+pread(Fd, Offset, Size) ->
+    try
+        #{ handle := FRef } = get_fd_data(Fd),
+        pread_nif(FRef, Offset, Size)
+    catch
+        error:badarg -> {error, badarg}
     end.
 
-translate_sendfile_flags([{use_threads,true}|T]) ->
-    ?EFILE_SENDFILE_USE_THREADS bor translate_sendfile_flags(T);
-translate_sendfile_flags([_|T]) ->
-    translate_sendfile_flags(T);
-translate_sendfile_flags([]) ->
-    0.
-
-
-%%%-----------------------------------------------------------------
-%%% Functions operating on files without handle to the file. ?DRV.
-%%%
-%%% Supposed to be called by applications through module file.
-
-
-
-%% Returns {ok, Port}, the Port should be used as first argument in all
-%% the following functions. Returns {error, Reason} upon failure.
-start() ->
-    drv_open(?DRV, [binary]).
-
-stop(Port) when is_port(Port) ->
-    try erlang:port_close(Port) of
-	_ ->
-	    ok
+pread(Fd, LocNums) ->
+    try
+        #{ handle := FRef } = get_fd_data(Fd),
+        pread_list(FRef, LocNums, [])
     catch
-	_:_ ->
-	    ok
+        error:badarg -> {error, badarg}
     end.
 
+-spec pread_list(FRef, LocNums, ResultList) -> Result when
+      FRef :: prim_file_ref(),
+      LocNums :: list({Offset :: non_neg_integer(),
+                       Size :: non_neg_integer()}),
+      ResultList :: list(eof | binary()),
+      Result :: {ok, ResultList} | {error, Reason :: atom()}.
+pread_list(_FRef, [], ResultList) ->
+    {ok, reverse_list(ResultList)};
+pread_list(FRef, [{Offset, Size} | Rest], ResultList) ->
+    case pread_nif(FRef, Offset, Size) of
+        {ok, Data} ->
+            pread_list(FRef, Rest, [Data | ResultList]);
+        eof ->
+            pread_list(FRef, Rest, [eof | ResultList]);
+        {error, Reason} ->
+            {error, Reason}
+    end.
 
+pwrite(Fd, Offset, IOData) ->
+    try
+        #{ handle := FRef, r_buffer := RBuf } = get_fd_data(Fd),
+        prim_buffer:wipe(RBuf),
+        pwrite_plain(FRef, Offset, erlang:iolist_to_iovec(IOData))
+    catch
+        error:badarg -> {error, badarg}
+    end.
+pwrite_plain(FRef, Offset, IOVec) ->
+    case pwrite_nif(FRef, Offset, IOVec) of
+        {continue, BytesWritten, Remainder} ->
+            pwrite_plain(FRef, Offset + BytesWritten, Remainder);
+        ok ->
+            ok;
+        {error, Reason} ->
+            {error, Reason}
+    end.
 
-%%% The following functions take an optional Port as first argument.
-%%% If the port is not supplied, a temporary one is opened and then
-%%% closed after the request has been performed.
-
-
-
-%% get_cwd/{0,1,2}
-
-get_cwd() ->
-    get_cwd_int(0).
-
-get_cwd(Port) when is_port(Port) ->
-    get_cwd_int(Port, 0);
-get_cwd([]) ->
-    get_cwd_int(0);
-get_cwd([Letter, $: | _]) when $a =< Letter, Letter =< $z ->
-    get_cwd_int(Letter - $a + 1);
-get_cwd([Letter, $: | _]) when $A =< Letter, Letter =< $Z ->
-    get_cwd_int(Letter - $A + 1);
-get_cwd([_|_]) ->
-    {error, einval};
-get_cwd(_) ->
-    {error, badarg}.
-
-get_cwd(Port, []) when is_port(Port) ->
-    get_cwd_int(Port, 0);
-get_cwd(Port, [Letter, $: | _])
-  when is_port(Port), $a =< Letter, Letter =< $z ->
-    get_cwd_int(Port, Letter - $a + 1);
-get_cwd(Port, [Letter, $: | _])
-  when is_port(Port), $A =< Letter, Letter =< $Z ->
-    get_cwd_int(Port, Letter - $A + 1);
-get_cwd(Port, [_|_]) when is_port(Port) ->
-    {error, einval};
-get_cwd(_, _) ->
-    {error, badarg}.
-
-get_cwd_int(Drive) ->
-    get_cwd_int({?DRV, [binary]}, Drive).
-
-get_cwd_int(Port, Drive) ->
-    drv_command(Port, <<?FILE_PWD, Drive>>,
-		fun handle_fname_response/1).
-
-
-
-%% set_cwd/{1,2}
+pwrite(Fd, LocBytes) ->
+    try
+        #{ handle := FRef, r_buffer := RBuf } = get_fd_data(Fd),
+        prim_buffer:wipe(RBuf),
+        pwrite_list(FRef, LocBytes, 0)
+    catch
+        error:badarg -> {error, badarg}
+    end.
 
-set_cwd(Dir) ->
-    set_cwd_int({?DRV, [binary]}, Dir).
+-spec pwrite_list(FRef, LocBytes, Successes) -> Result when
+      FRef :: prim_file_ref(),
+      LocBytes :: list({Offset :: non_neg_integer(),
+                        IOData :: iodata()}),
+      Successes :: non_neg_integer(),
+      Result :: ok | {error, {Successes, Reason :: atom()}}.
+pwrite_list(_FRef, [], _Successes) ->
+    ok;
+pwrite_list(FRef, [{Offset, IOData} | Rest], Successes) ->
+    case pwrite_plain(FRef, Offset, erlang:iolist_to_iovec(IOData)) of
+        {error, Reason} -> {error, {Successes, Reason}};
+        ok -> pwrite_list(FRef, Rest, Successes + 1)
+    end.
 
-set_cwd(Port, Dir) when is_port(Port) ->
-    set_cwd_int(Port, Dir).
+sendfile(Fd, Socket, Offset, Bytes, _ChunkSize, [], [], _Flags) ->
+    %% There's a very nasty race in here; if we die just prior to duplicating
+    %% the handle down in the sendfile call, it might get reused by something
+    %% entirely different and we'll leak unknown data to the socket until it
+    %% dies soon after.
+    %%
+    %% This bug was inherited from the old driver, except it was vulnerable to
+    %% the bug at any point and not just during setup.
+    %%
+    %% We'll have to live with this until we have a way to unambiguously
+    %% transfer things between drivers or NIFs. Current ideas all fall afoul
+    %% of the Two Generals problem.
+    try
+        advise(Fd, Offset, Bytes, sequential),
+        prim_inet:sendfile(Socket, get_handle(Fd), Offset, Bytes)
+    catch
+        error:badarg -> {error, badarg}
+    end;
+sendfile(_Fd, _Socket, _Offset, _Bytes, _ChunkSize, _Headers, _Trailers, _Flags) ->
+    {error, enotsup}.
 
-set_cwd_int(Port, Dir) when is_binary(Dir) ->
-    case prim_file:is_translatable(Dir) of
-	false ->
-	    {error, no_translation};
-	true ->
-	    drv_command(Port, [?FILE_CHDIR, pathname(Dir)])
+%% Undocumented internal function that reads a data block with indirection.
+%%
+%% This is only used once in DETS and can easily be emulated with pread/2, but
+%% it's pretty performance-sensitive so we've implemented it down in the NIF to
+%% avoid excessive rescheduling.
+-spec ipread_s32bu_p32bu(Fd, Offset, MaxSize) -> Result when
+      Fd :: #file_descriptor{},
+      Offset :: non_neg_integer(),
+      MaxSize :: non_neg_integer() | infinity,
+      Result :: {ok, Size :: non_neg_integer(),
+                     Pointer :: non_neg_integer(),
+                     Data :: iodata() | eof} |
+                eof |
+                {error, Reason :: atom()}.
+ipread_s32bu_p32bu(Fd, Offset, Infinity) when is_atom(Infinity) ->
+    ipread_s32bu_p32bu(Fd, Offset, (1 bsl 31) - 1);
+ipread_s32bu_p32bu(Fd, Offset, MaxSize)
+        when is_integer(Offset), is_integer(MaxSize) ->
+    try
+        #{ handle := FRef } = get_fd_data(Fd),
+        ipread_s32bu_p32bu_nif(FRef, Offset, MaxSize)
+    catch
+        error:badarg -> {error, badarg}
     end;
-set_cwd_int(Port, Dir) when is_list(Dir) ->
-    drv_command(Port, [?FILE_CHDIR, pathname(Dir)]);
-set_cwd_int(_, _) ->
+ipread_s32bu_p32bu(_Fd, _Offset, _MaxSize) ->
     {error, badarg}.
-
-
-
-%% delete/{1,2}
-
-delete(File) ->
-    delete_int({?DRV, [binary]}, File).
-
-delete(Port, File) when is_port(Port) ->
-    delete_int(Port, File).
-
-delete_int(Port, File) ->
-    drv_command(Port, [?FILE_DELETE, pathname(File)]).
-
-
-
-%% rename/{2,3}
-
-rename(From, To) ->
-    rename_int({?DRV, [binary]}, From, To).
-
-rename(Port, From, To) when is_port(Port) ->
-    rename_int(Port, From, To).
-
-rename_int(Port, From, To) ->
-    drv_command(Port, [?FILE_RENAME, pathname(From), pathname(To)]).
-
-
-
-%% make_dir/{1,2}
-
-make_dir(Dir) ->
-    make_dir_int({?DRV, [binary]}, Dir).
-
-make_dir(Port, Dir) when is_port(Port) ->
-    make_dir_int(Port, Dir).
-
-make_dir_int(Port, Dir) ->
-    drv_command(Port, [?FILE_MKDIR, pathname(Dir)]).
-
-
-
-%% del_dir/{1,2}
-
-del_dir(Dir) ->
-    del_dir_int({?DRV, [binary]}, Dir).
-
-del_dir(Port, Dir) when is_port(Port) ->
-    del_dir_int(Port, Dir).
-
-del_dir_int(Port, Dir) ->
-    drv_command(Port, [?FILE_RMDIR, pathname(Dir)]).
-
-
-
-%% read_file_info/{1,2,3}
-
-read_file_info(File) ->
-    read_file_info_int({?DRV, [binary]}, File, local).
-
-read_file_info(Port, File) when is_port(Port) ->
-    read_file_info_int(Port, File, local);
-read_file_info(File, Opts) ->
-    read_file_info_int({?DRV, [binary]}, File, plgv(time, Opts, local)).
-
-read_file_info(Port, File, Opts) when is_port(Port) ->
-    read_file_info_int(Port, File, plgv(time, Opts, local)).
-
-read_file_info_int(Port, File, TimeType) ->
+ipread_s32bu_p32bu_nif(_FRef, _Offset, _MaxSize) ->
+    erlang:nif_error(undef).
+
+%% Returns the binary representation of the underlying handle, for use in
+%% tricky operations like sendfile/8.
+-spec get_handle(Fd) -> Result when
+      Fd :: #file_descriptor{},
+      Result :: binary() | {error, Reason :: atom()}.
+get_handle(Fd) ->
     try
-	case drv_command(Port, [?FILE_FSTAT, pathname(File)]) of
-	    {ok, FI} -> {ok, FI#file_info{
-			ctime = from_seconds(FI#file_info.ctime, TimeType),
-			mtime = from_seconds(FI#file_info.mtime, TimeType),
-			atime = from_seconds(FI#file_info.atime, TimeType)
-		    }};
-	    Error    -> Error
-	end
+        #{ handle := FRef } = get_fd_data(Fd),
+        get_handle_nif(FRef)
     catch
-	error:_ -> {error, badarg}
+        error:badarg -> {error, badarg}
     end.
 
+%% Resets the write head to the position the user believes we're at, which may
+%% not be the same as the real one when read caching is in effect.
+reset_write_position(Fd) ->
+    #{ r_buffer := RBuf } = Fd#file_descriptor.data,
+    case prim_buffer:size(RBuf) of
+        Size when Size > 0 -> position(Fd, cur);
+        Size when Size =:= 0 -> ok
+    end.
 
-%% altname/{1,2}
-
-altname(File) ->
-    altname_int({?DRV, [binary]}, File).
-
-altname(Port, File) when is_port(Port) ->
-    altname_int(Port, File).
-
-altname_int(Port, File) ->
-    drv_command(Port, [?FILE_ALTNAME, pathname(File)],
-		fun handle_fname_response/1).
-
-%% write_file_info/{2,3,4}
-
-write_file_info(File, Info) ->
-    write_file_info_int({?DRV, [binary]}, File, Info, local).
-
-write_file_info(Port, File, Info) when is_port(Port) ->
-    write_file_info_int(Port, File, Info, local);
-write_file_info(File, Info, Opts) ->
-    write_file_info_int({?DRV, [binary]}, File, Info, plgv(time, Opts, local)).
-
-write_file_info(Port, File, Info, Opts) when is_port(Port) ->
-    write_file_info_int(Port, File, Info, plgv(time, Opts, local)).
+get_fd_data(#file_descriptor{ data = Data }) ->
+    #{ owner := Owner } = Data,
+    case self() of
+        Owner -> Data;
+        _ -> error(not_on_controlling_process)
+    end.
 
-write_file_info_int(Port, File, 
-		    #file_info{mode=Mode, 
-			       uid=Uid, 
-			       gid=Gid,
-			       atime=Atime0, 
-			       mtime=Mtime0, 
-			       ctime=Ctime0},
-		       TimeType) ->
+build_fd_data(FRef, Modes) ->
+    Defaults =
+        #{ owner => self(),
+           handle => FRef,
+           r_ahead_size => 0,
+           r_buffer => prim_buffer:new() },
+    fill_fd_option_map(Modes, Defaults).
+
+fill_fd_option_map([], Map) ->
+    Map;
+
+fill_fd_option_map([read_ahead | Modes], Map) ->
+    fill_fd_option_map([{read_ahead, 64 bsl 10} | Modes], Map);
+fill_fd_option_map([{read_ahead, Size} | Modes], Map) ->
+    fill_fd_option_map(Modes, Map#{ r_ahead_size => Size });
+
+fill_fd_option_map([_Ignored | Modes], Map) ->
+    fill_fd_option_map(Modes, Map).
+
+open_nif(_Name, _Modes) ->
+    erlang:nif_error(undef).
+close_nif(_FileRef) ->
+    erlang:nif_error(undef).
+read_nif(_FileRef, _Size) ->
+    erlang:nif_error(undef).
+write_nif(_FileRef, _IOVec) ->
+    erlang:nif_error(undef).
+pread_nif(_FileRef, _Offset, _Size) ->
+    erlang:nif_error(undef).
+pwrite_nif(_FileRef, _Offset, _IOVec) ->
+    erlang:nif_error(undef).
+seek_nif(_FileRef, _Mark, _Offset) ->
+    erlang:nif_error(undef).
+sync_nif(_FileRef, _DataOnly) ->
+    erlang:nif_error(undef).
+advise_nif(_FileRef, _Offset, _Length, _Advise) ->
+    erlang:nif_error(undef).
+allocate_nif(_FileRef, _Offset, _Length) ->
+    erlang:nif_error(undef).
+truncate_nif(_FileRef) ->
+    erlang:nif_error(undef).
+get_handle_nif(_FileRef) ->
+    erlang:nif_error(undef).
 
-    % Atime and/or Mtime might be undefined
-    %  - use localtime() for atime, if atime is undefined
-    %  - use atime as mtime if mtime is undefined
-    %  - use mtime as ctime if ctime is undefined
+%%
+%% Quality-of-life helpers
+%%
 
+read_file(Filename) ->
+    %% We're doing this operation in the NIF to avoid excessive rescheduling.
     try
-	Atime = file_info_validate_atime(Atime0, TimeType),
-	Mtime = file_info_validate_mtime(Mtime0, Atime),
-	Ctime = file_info_validate_ctime(Ctime0, Mtime),
-
-	drv_command(Port, [?FILE_WRITE_INFO, 
-		int_to_int32bytes(Mode), 
-		int_to_int32bytes(Uid), 
-		int_to_int32bytes(Gid),
-		int_to_int64bytes(to_seconds(Atime, TimeType)), 
-		int_to_int64bytes(to_seconds(Mtime, TimeType)), 
-		int_to_int64bytes(to_seconds(Ctime, TimeType)),
-		pathname(File)])
+        read_file_nif(encode_path(Filename))
     catch
-	error:_ -> {error, badarg}
+        error:badarg -> {error, badarg}
+    end.
+read_file_nif(_Filename) ->
+    erlang:nif_error(undef).
+
+write_file(Filename, Bytes) ->
+    write_file(Filename, Bytes, []).
+write_file(Filename, Bytes, Modes) ->
+    case open(Filename, [write, binary | Modes]) of
+        {ok, Fd} ->
+            Result = write(Fd, Bytes),
+            close(Fd),
+            Result;
+        {error, Reason} ->
+            {error, Reason}
     end.
 
+%%
+%% Filesystem operations
+%%
 
-file_info_validate_atime(Atime, _) when Atime =/= undefined -> Atime;
-file_info_validate_atime(undefined, local)     -> erlang:localtime();
-file_info_validate_atime(undefined, universal) -> erlang:universaltime();
-file_info_validate_atime(undefined, posix)     -> erlang:universaltime_to_posixtime(erlang:universaltime()).
-
-file_info_validate_mtime(undefined, Atime) -> Atime;
-file_info_validate_mtime(Mtime, _)         -> Mtime.
-
-file_info_validate_ctime(undefined, Mtime) -> Mtime;
-file_info_validate_ctime(Ctime, _)         -> Ctime.
-
-%% make_link/{2,3}
-
-make_link(Old, New) ->
-    make_link_int({?DRV, [binary]}, Old, New).
-
-make_link(Port, Old, New) when is_port(Port) ->
-    make_link_int(Port, Old, New).
-
-make_link_int(Port, Old, New) ->
-    drv_command(Port, [?FILE_LINK, pathname(Old), pathname(New)]).
-
-
-
-%% make_symlink/{2,3}
-
-make_symlink(Old, New) ->
-    make_symlink_int({?DRV, [binary]}, Old, New).
-
-make_symlink(Port, Old, New) when is_port(Port) ->
-    make_symlink_int(Port, Old, New).
-
-make_symlink_int(Port, Old, New) ->
-    drv_command(Port, [?FILE_SYMLINK, pathname(Old), pathname(New)]).
-
-
-
-%% read_link/{2,3}
-
-read_link(Link) ->
-    read_link_int({?DRV, [binary]}, Link).
-
-read_link(Port, Link) when is_port(Port) ->
-    read_link_int(Port, Link).
-
-read_link_int(Port, Link) ->
-    drv_command(Port, [?FILE_READLINK, pathname(Link)],
-		fun handle_fname_response/1).
-
-%% read_link_all/{2,3}
-
-read_link_all(Link) ->
-    read_link_all_int({?DRV, [binary]}, Link).
-
-read_link_all(Port, Link) when is_port(Port) ->
-    read_link_all_int(Port, Link).
-
-read_link_all_int(Port, Link) ->
-    drv_command(Port, [?FILE_READLINK, pathname(Link)],
-		fun handle_fname_response_all/1).
-
-
-
-%% read_link_info/{2,3}
-
-read_link_info(Link) ->
-    read_link_info_int({?DRV, [binary]}, Link, local).
-
-read_link_info(Port, Link) when is_port(Port) ->
-    read_link_info_int(Port, Link, local);
+read_link(Name) -> read_link_1(Name, false).
+read_link_all(Name) -> read_link_1(Name, true).
 
-read_link_info(Link, Opts) ->
-    read_link_info_int({?DRV, [binary]}, Link, plgv(time, Opts, local)).
+read_link_1(Name, AcceptRawNames) ->
+    try read_link_nif(encode_path(Name)) of
+        {ok, RawName} -> translate_raw_name(RawName, AcceptRawNames);
+        {error, Reason} -> {error, Reason}
+    catch
+        error:badarg -> {error, badarg}
+    end.
 
-read_link_info(Port, Link, Opts) when is_port(Port) ->
-    read_link_info_int(Port, Link, plgv(time, Opts, local)).
+translate_raw_name(RawName, SilentFailure) ->
+    case decode_path(RawName) of
+        Converted when is_list(Converted) -> {ok, Converted};
+        {error, _Reason} when SilentFailure =:= false -> {error, einval};
+        {error, _Reason} when SilentFailure =:= true -> {ok, RawName}
+    end.
 
+list_dir(Name) -> list_dir_1(Name, true).
+list_dir_all(Name) -> list_dir_1(Name, false).
 
-read_link_info_int(Port, Link, TimeType) ->
-    try
-	case drv_command(Port, [?FILE_LSTAT, pathname(Link)]) of
-	    {ok, FI} -> {ok, FI#file_info{
-			ctime = from_seconds(FI#file_info.ctime, TimeType),
-			mtime = from_seconds(FI#file_info.mtime, TimeType),
-			atime = from_seconds(FI#file_info.atime, TimeType)
-		    }};
-	    Error    -> Error
-	end
+list_dir_1(Name, SkipInvalid) ->
+    try list_dir_nif(encode_path(Name)) of
+        {ok, RawNames} -> list_dir_convert(RawNames, SkipInvalid, []);
+        {error, Reason} -> {error, Reason}
     catch
-	error:_ -> {error, badarg}
+        error:badarg -> {error, badarg}
     end.
 
-%% list_dir/{1,2}
-
-list_dir(Dir) ->
-    list_dir_int({?DRV, [binary]}, Dir).
-
-list_dir(Port, Dir) when is_port(Port) ->
-    list_dir_int(Port, Dir).
-
-list_dir_int(Port, Dir) ->
-    drv_command(Port, [?FILE_READDIR, pathname(Dir)],
-		fun(P) ->
-			case list_dir_response(P, []) of
-			    {ok, RawNames} ->
-				try
-				    {ok, list_dir_convert(RawNames)}
-				catch
-				    throw:Reason ->
-					Reason
-				end;
-			    Error ->
-				Error
-			end
-		end).
-
-list_dir_all(Dir) ->
-    list_dir_all_int({?DRV, [binary]}, Dir).
-
-list_dir_all(Port, Dir) when is_port(Port) ->
-    list_dir_all_int(Port, Dir).
-
-list_dir_all_int(Port, Dir) ->
-    drv_command(Port, [?FILE_READDIR, pathname(Dir)],
-		fun(P) ->
-			case list_dir_response(P, []) of
-			    {ok, RawNames} ->
-				{ok, list_dir_convert_all(RawNames)};
-			    Error ->
-				Error
-			end
-		end).
-
-list_dir_response(Port, Acc0) ->
-    case drv_get_response(Port) of
-	{lfname, []} ->
-	    {ok, Acc0};
-	{lfname, Names} ->
-	    Acc = [Name || <<L:16,Name:L/binary>> <= Names] ++ Acc0,
-	    list_dir_response(Port, Acc);
-	Error ->
-	    Error
+list_dir_convert([], _SkipInvalid, Result) ->
+    {ok, Result};
+list_dir_convert([RawName | Rest], SkipInvalid, Result) ->
+    case decode_path(RawName) of
+        Converted when is_list(Converted) ->
+            list_dir_convert(Rest, SkipInvalid, [Converted | Result]);
+        {error, _} when SkipInvalid =:= false ->
+            list_dir_convert(Rest, SkipInvalid, [RawName | Result]);
+
+        %% If the filename cannot be converted, return error or ignore with
+        %% optional error logger warning depending on +fn{u|a}{i|e|w} emulator
+        %% switches.
+        {error, ignore} ->
+            list_dir_convert(Rest, SkipInvalid, Result);
+        {error, warning} ->
+            error_logger:warning_msg(
+                "Non-unicode filename ~p ignored\n", [RawName]),
+            list_dir_convert(Rest, SkipInvalid, Result);
+        {error, _} ->
+            {error, {no_translation, RawName}}
     end.
 
-list_dir_convert([Name|Names]) ->
-    %% If the filename cannot be converted, return error or ignore
-    %% with optional error logger warning, depending on +fn{u|a}{i|e|w}
-    %% emulator switches.
-    case prim_file:internal_native2name(Name) of
-	{error, warning} ->
-	    error_logger:warning_msg("Non-unicode filename ~p ignored\n",
-				     [Name]),
-	    list_dir_convert(Names);
-	{error, ignore} ->
-	    list_dir_convert(Names);
-	{error, error} ->
-	    throw({error, {no_translation, Name}});
-	Converted when is_list(Converted) ->
-	    [Converted|list_dir_convert(Names)]
-    end;
-list_dir_convert([]) -> [].
-
-list_dir_convert_all([Name|Names]) ->
-    %% If the filename cannot be converted, retain the filename as
-    %% a binary.
-    case prim_file:internal_native2name(Name) of
-	{error, _} ->
-	    [Name|list_dir_convert_all(Names)];
-	Converted when is_list(Converted) ->
-	    [Converted|list_dir_convert_all(Names)]
-    end;
-list_dir_convert_all([]) -> [].
-
-%%%-----------------------------------------------------------------
-%%% Functions to communicate with the driver
-
-handle_fname_response(Port) ->
-    case drv_get_response(Port) of
-	{fname, Name} ->
-	    case prim_file:internal_native2name(Name) of
-		{error, warning} ->
-		    error_logger:warning_msg("Non-unicode filename ~p "
-					     "ignored when reading link\n",
-					     [Name]),
-		    {error, einval};
-		{error, _} ->
-		    {error, einval};
-		Converted when is_list(Converted) ->
-		    {ok, Converted}
-	    end;
-	Error ->
-	    Error
+read_file_info(Filename) ->
+    read_info_1(Filename, 1, local).
+read_file_info(Filename, Opts) ->
+    read_info_1(Filename, 1, proplist_get_value(time, Opts, local)).
+
+read_link_info(Name) ->
+    read_info_1(Name, 0, local).
+read_link_info(Name, Opts) ->
+    read_info_1(Name, 0, proplist_get_value(time, Opts, local)).
+
+read_info_1(Name, FollowLinks, TimeType) ->
+    try read_info_nif(encode_path(Name), FollowLinks) of
+        {error, Reason} -> {error, Reason};
+        FileInfo ->
+            CTime = from_posix_seconds(FileInfo#file_info.ctime, TimeType),
+            MTime = from_posix_seconds(FileInfo#file_info.mtime, TimeType),
+            ATime = from_posix_seconds(FileInfo#file_info.atime, TimeType),
+            {ok, FileInfo#file_info{ ctime = CTime, mtime = MTime, atime = ATime }}
+    catch
+        error:badarg -> {error, badarg}
     end.
 
-handle_fname_response_all(Port) ->
-    case drv_get_response(Port) of
-	{fname, Name} ->
-	    case prim_file:internal_native2name(Name) of
-		{error, _} ->
-		    {ok, Name};
-		Converted when is_list(Converted) ->
-		    {ok, Converted}
-	    end;
-	Error ->
-	    Error
+write_file_info(Filename, Info) ->
+    write_file_info_1(Filename, Info, local).
+write_file_info(Filename, Info, Opts) ->
+    write_file_info_1(Filename, Info, proplist_get_value(time, Opts, local)).
+
+write_file_info_1(Filename, Info, TimeType) ->
+    #file_info{ mode = Modes,
+                uid = Uid,
+                gid = Gid,
+                atime = ATime0,
+                mtime = MTime0,
+                ctime = CTime0} = Info,
+    try
+        % ATime and/or MTime might be undefined
+        %  - use localtime() for atime, if atime is undefined
+        %  - use atime as mtime if mtime is undefined
+        %  - use mtime as ctime if ctime is undefined
+        ATime = file_info_convert_atime(ATime0, TimeType),
+        MTime = file_info_convert_mtime(MTime0, ATime, TimeType),
+        CTime = file_info_convert_ctime(CTime0, MTime, TimeType),
+        EncodedName = encode_path(Filename),
+
+        %% This is a bit ugly but we need to handle partial failures the same
+        %% way the old driver did.
+        throw_on_error(set_owner(EncodedName, Uid, Gid)),
+        throw_on_error(set_permissions(EncodedName, Modes)),
+        throw_on_error(set_time(EncodedName, ATime, MTime, CTime))
+    catch
+        throw:Reason -> {error, Reason};
+        error:_ -> {error, badarg}
     end.
 
-%% Opens a driver port and converts any problems into {error, emfile}.
-%% Returns {ok, Port} when successful.
+set_owner(_EncodedName, undefined, undefined) ->
+    ok;
+set_owner(EncodedName, Uid, Gid) ->
+    set_owner_nif(EncodedName, Uid, Gid).
+set_owner_nif(_Path, _Uid, _Gid) ->
+    erlang:nif_error(undef).
 
-drv_open(Driver, Portopts) ->
-    try erlang:open_port({spawn_driver, Driver}, Portopts) of
-	Port ->
-	    {ok, Port}
+set_permissions(_EncodedName, undefined) ->
+    ok;
+set_permissions(EncodedName, Permissions) ->
+    set_permissions_nif(EncodedName, Permissions).
+set_permissions_nif(_Path, _Permissions) ->
+    erlang:nif_error(undef).
+
+set_time(EncodedName, ATime, MTime, CTime) ->
+    set_time_nif(EncodedName, ATime, MTime, CTime).
+set_time_nif(_Path, _ATime, _MTime, _CTime) ->
+    erlang:nif_error(undef).
+
+throw_on_error(ok) -> ok;
+throw_on_error({error, enotsup}) -> ok;
+throw_on_error({error, Reason}) -> throw(Reason).
+
+file_info_convert_atime(ATime, TimeType) when ATime =/= undefined ->
+    to_posix_seconds(ATime, TimeType);
+file_info_convert_atime(undefined, local) ->
+    to_posix_seconds(erlang:localtime(), local);
+file_info_convert_atime(undefined, universal) ->
+    to_posix_seconds(erlang:universaltime(), universal);
+file_info_convert_atime(undefined, posix) ->
+    erlang:universaltime_to_posixtime(erlang:universaltime()).
+
+file_info_convert_mtime(undefined, ATime, _TimeType) ->
+    ATime;
+file_info_convert_mtime(MTime, _ATime, TimeType) ->
+    to_posix_seconds(MTime, TimeType).
+
+file_info_convert_ctime(undefined, MTime, _TimeType) ->
+    MTime;
+file_info_convert_ctime(CTime, _MTime, TimeType) ->
+    to_posix_seconds(CTime, TimeType).
+
+%% This is only relevant on Windows, so we assume that format to simplify the
+%% internals.
+get_cwd([Letter, $:]) when Letter >= $A, Letter =< $Z ->
+    get_dcwd(Letter - $A + 1);
+get_cwd([Letter, $:]) when Letter >= $a, Letter =< $z ->
+    get_dcwd(Letter - $a + 1);
+get_cwd([_|_]) ->
+    {error, einval};
+get_cwd(_) ->
+    {error, badarg}.
+get_dcwd(Index) ->
+    try get_device_cwd_nif(Index) of
+        {ok, RawPath} -> {ok, decode_path(RawPath)};
+        {error, Reason} -> {error, Reason}
     catch
-	error:Reason ->
-	    {error, Reason}
+        error:badarg -> {error, badarg}
     end.
 
-
-
-%% Closes a port in a safe way. Returns ok.
-
-drv_close(Port) ->
-    Save = erlang:dt_spread_tag(false),
+get_cwd() ->
+    try get_cwd_nif() of
+        {ok, RawPath} -> {ok, decode_path(RawPath)};
+        {error, Reason} -> {error, Reason}
+    catch
+        error:badarg -> {error, badarg}
+    end.
+set_cwd(Path) ->
     try
-	try erlang:port_close(Port) catch error:_ -> ok end,
-	receive %% Ugly workaround in case the caller==owner traps exits
-	    {'EXIT', Port, _Reason} -> 
-		ok
-	after 0 -> 
-		ok
-	end
-    after
-	erlang:dt_restore_tag(Save)
+        case is_path_translatable(Path) of
+            true -> set_cwd_nif(encode_path(Path));
+            false -> {error, no_translation}
+        end
+    catch
+        error:badarg -> {error, badarg}
     end.
 
-
-
-%% Issues a command to a port and gets the response.
-%% If Port is {Driver, Portopts} a port is first opened and 
-%% then closed after the result has been received.
-%% Returns {ok, Result} or {error, Reason}.
-
-drv_command(Port, Command) ->
-    drv_command(Port, Command, undefined).
-
-drv_command(Port, Command, R) when is_binary(Command) ->
-    drv_command(Port, Command, true, R);
-drv_command(Port, Command, R) ->
-    try erlang:iolist_size(Command) of
-	_ ->
-	    drv_command(Port, Command, true, R)
+delete(Path) ->
+    try
+        del_file_nif(encode_path(Path))
     catch
-	error:Reason ->
-	    {error, Reason}
+        error:badarg -> {error, badarg}
     end.
 
-drv_command(Port, Command, Validated, R) when is_port(Port) ->
-    Save = erlang:dt_spread_tag(false),
-    try erlang:port_command(Port, erlang:dt_append_vm_tag_data(Command)) of
-	true ->
-	    drv_get_response(Port, R)
+rename(Source, Destination) ->
+    try
+        rename_nif(encode_path(Source), encode_path(Destination))
     catch
-	%% If the Command is valid, knowing that the port is a port,
-	%% a badarg error must mean it is a dead port, that is:
-	%% a currently invalid filehandle, -> einval, not badarg.
-	error:badarg when Validated ->
-	    {error, einval};
-	error:badarg ->
-	    try erlang:iolist_size(Command) of
-		_ -> % Valid
-		    {error, einval}
-	    catch
-		error:_ ->
-		    {error, badarg}
-	    end;
-	error:Reason ->
-	    {error, Reason}
-    after
-	erlang:dt_restore_tag(Save)
-    end;
-drv_command({Driver, Portopts}, Command, Validated, R) ->
-    case drv_open(Driver, Portopts) of
-	{ok, Port} ->
-	    Result = drv_command(Port, Command, Validated, R),
-	    drv_close(Port),
-	    Result;
-	Error ->
-	    Error
+        error:badarg -> {error, badarg}
     end.
-drv_command_nt(Port, Command, R) when is_port(Port) ->
-    Save = erlang:dt_spread_tag(false),
-    try erlang:port_command(Port, Command) of
-	true ->
-	    drv_get_response(Port, R)
+make_dir(Path) ->
+    try
+        make_dir_nif(encode_path(Path))
     catch
-	error:badarg ->
-	    try erlang:iolist_size(Command) of
-		_ -> % Valid
-		    {error, einval}
-	    catch
-		error:_ ->
-		    {error, badarg}
-	    end;
-	error:Reason ->
-	    {error, Reason}
-    after
-	erlang:dt_restore_tag(Save)
+        error:badarg -> {error, badarg}
     end.
-
-
-    
-%% Receives the response from a driver port.
-%% Returns: {ok, ListOrBinary}|{error, Reason}
-
-drv_get_response(Port, undefined) ->
-    drv_get_response(Port);
-drv_get_response(Port, Fun) when is_function(Fun, 1) ->
-    Fun(Port).
-
-drv_get_response(Port) ->
-    erlang:bump_reductions(100),
-    receive
-	{Port, {data, [Response|Rest] = Data}} ->
-	    try translate_response(Response, Rest)
-	    catch
-		error:Reason ->
-		    {error, {bad_response_from_port, Data, 
-			     {Reason, erlang:get_stacktrace()}}}
-	    end;
-	{'EXIT', Port, Reason} ->
-	    {error, {port_died, Reason}}
+del_dir(Path) ->
+    try
+        del_dir_nif(encode_path(Path))
+    catch
+        error:badarg -> {error, badarg}
     end.
-
-
-%%%-----------------------------------------------------------------
-%%% Utility functions.
-
-%% Converts a list of mode atoms into a mode word for the driver.
-%% Returns {Mode, Portopts, Setopts} where Portopts is a list of 
-%% options for erlang:open_port/2 and Setopts is a list of 
-%% setopt commands to send to the port, or error Reason upon failure.
-
-open_mode(List) when is_list(List) ->
-    case open_mode(List, 0, [], []) of
-	{Mode, Portopts, Setopts} when Mode band 
-			  (?EFILE_MODE_READ bor ?EFILE_MODE_WRITE) 
-			  =:= 0 ->
-	    {Mode bor ?EFILE_MODE_READ, Portopts, Setopts};
-	Other ->
-	    Other
+make_link(Existing, New) ->
+    try
+        make_hard_link_nif(encode_path(Existing), encode_path(New))
+    catch
+        error:badarg -> {error, badarg}
     end.
-
-open_mode([raw|Rest], Mode, Portopts, Setopts) ->
-    open_mode(Rest, Mode, Portopts, Setopts);
-open_mode([read|Rest], Mode, Portopts, Setopts) ->
-    open_mode(Rest, Mode bor ?EFILE_MODE_READ, Portopts, Setopts);
-open_mode([write|Rest], Mode, Portopts, Setopts) ->
-    open_mode(Rest, Mode bor ?EFILE_MODE_WRITE, Portopts, Setopts);
-open_mode([binary|Rest], Mode, Portopts, Setopts) ->
-    open_mode(Rest, Mode, [binary | Portopts], Setopts);
-open_mode([compressed|Rest], Mode, Portopts, Setopts) ->
-    open_mode(Rest, Mode bor ?EFILE_COMPRESSED, Portopts, Setopts);
-open_mode([append|Rest], Mode, Portopts, Setopts) ->
-    open_mode(Rest, Mode bor ?EFILE_MODE_APPEND bor ?EFILE_MODE_WRITE, 
-	      Portopts, Setopts);
-open_mode([exclusive|Rest], Mode, Portopts, Setopts) ->
-    open_mode(Rest, Mode bor ?EFILE_MODE_EXCL, Portopts, Setopts);
-open_mode([sync|Rest], Mode, Portopts, Setopts) ->
-    open_mode(Rest, Mode bor ?EFILE_MODE_SYNC, Portopts, Setopts);
-open_mode([delayed_write|Rest], Mode, Portopts, Setopts) ->
-    open_mode([{delayed_write, 64*1024, 2000}|Rest], Mode,
-	      Portopts, Setopts);
-open_mode([{delayed_write, Size, Delay}|Rest], Mode, Portopts, Setopts) 
-  when is_integer(Size), 0 =< Size, is_integer(Delay), 0 =< Delay ->
-    if
-	Size < ?LARGEFILESIZE, Delay < 1 bsl 64 ->
-	    open_mode(Rest, Mode, Portopts, 
-		      [<<?FILE_SETOPT, ?FILE_OPT_DELAYED_WRITE,
-			Size:64, Delay:64>> 
-		       | Setopts]);
-	true ->
-	    einval
-    end;
-open_mode([read_ahead|Rest], Mode, Portopts, Setopts) ->
-    open_mode([{read_ahead, 64*1024}|Rest], Mode, Portopts, Setopts);
-open_mode([{read_ahead, Size}|Rest], Mode, Portopts, Setopts)
-  when is_integer(Size), 0 =< Size ->
-    if
-	Size < ?LARGEFILESIZE ->
-	    open_mode(Rest, Mode, Portopts,
-		      [<<?FILE_SETOPT, ?FILE_OPT_READ_AHEAD,
-			Size:64>> | Setopts]);
-	true ->
-	    einval
-    end;
-open_mode([], Mode, Portopts, Setopts) ->
-    {Mode, reverse(Portopts), reverse(Setopts)};
-open_mode(_, _Mode, _Portopts, _Setopts) ->
-    badarg.
-
-
-
-%% Converts a position tuple {bof, X} | {cur, X} | {eof, X} into
-%% {Offset, OriginCode} for the driver.
-%% Returns badarg upon failure.
-
-lseek_position(Pos)
-  when is_integer(Pos) ->
-    lseek_position({bof, Pos});
-lseek_position(bof) ->
-    lseek_position({bof, 0});
-lseek_position(cur) ->
-    lseek_position({cur, 0});
-lseek_position(eof) ->
-    lseek_position({eof, 0});
-lseek_position({bof, Offset})
-  when is_integer(Offset) ->
-    {Offset, ?EFILE_SEEK_SET};
-lseek_position({cur, Offset})
-  when is_integer(Offset) ->
-    {Offset, ?EFILE_SEEK_CUR};
-lseek_position({eof, Offset})
-  when is_integer(Offset) ->
-    {Offset, ?EFILE_SEEK_END};
-lseek_position(_) ->
-    badarg.
-
-
-
-%% Translates the response from the driver into 
-%% {ok, Result} or {error, Reason}.
-
--dialyzer({no_improper_lists, translate_response/2}).
-translate_response(?FILE_RESP_OK, []) ->
-    ok;
-translate_response(?FILE_RESP_ERROR, List) when is_list(List) ->
-    {error, list_to_atom(List)};
-translate_response(?FILE_RESP_NUMBER, List) ->
-    {N, []} = get_uint64(List),
-    {ok, N};
-translate_response(?FILE_RESP_DATA, List) ->
-    {_N, _Data} = ND = get_uint64(List),
-    {ok, ND};
-translate_response(?FILE_RESP_INFO, List) when is_list(List) ->
-    {ok, transform_info(List)};
-translate_response(?FILE_RESP_NUMERR, L0) ->
-    {N, L1} = get_uint64(L0),
-    {error, {N, list_to_atom(L1)}};
-translate_response(?FILE_RESP_LDATA, List) ->
-    {ok, transform_ldata(List)};
-translate_response(?FILE_RESP_N2DATA, 
-		   <<Offset:64, 0:64, Size:64>>) ->
-    {ok, {Size, Offset, eof}};
-translate_response(?FILE_RESP_N2DATA, 
-		   [<<Offset:64, 0:64, Size:64>> | <<>>]) ->
-    {ok, {Size, Offset, eof}};
-translate_response(?FILE_RESP_N2DATA = X, 
-		   [<<_:64, 0:64, _:64>> | _] = Data) ->
-    {error, {bad_response_from_port, [X | Data]}};
-translate_response(?FILE_RESP_N2DATA = X, 
-		   [<<_:64, _:64, _:64>> | <<>>] = Data) ->
-    {error, {bad_response_from_port, [X | Data]}};
-translate_response(?FILE_RESP_N2DATA, 
-		   [<<Offset:64, _ReadSize:64, Size:64>> | D]) ->
-    {ok, {Size, Offset, D}};
-translate_response(?FILE_RESP_N2DATA = X, L0) when is_list(L0) ->
-    {Offset, L1}    = get_uint64(L0),
-    {ReadSize, L2}  = get_uint64(L1),
-    {Size, L3}      = get_uint64(L2),
-    case {ReadSize, L3} of
-	{0, []} ->
-	    {ok, {Size, Offset, eof}};
-	{0, _} ->
-	    {error, {bad_response_from_port, [X | L0]}};
-	{_, []} ->
-	    {error, {bad_response_from_port, [X | L0]}};
-	_ ->
-	    {ok, {Size, Offset, L3}}
-    end;
-translate_response(?FILE_RESP_EOF, []) ->
-    eof;
-translate_response(?FILE_RESP_FNAME, Data) ->
-    {fname, Data};
-translate_response(?FILE_RESP_LFNAME, Data) ->
-    {lfname, Data};
-translate_response(?FILE_RESP_ALL_DATA, Data) ->
-    {ok, Data};
-translate_response(X, Data) ->
-    {error, {bad_response_from_port, [X | Data]}}.
-
-transform_info([
-    Hsize1, Hsize2, Hsize3, Hsize4, 
-    Lsize1, Lsize2, Lsize3, Lsize4,
-    Type1,  Type2,  Type3,  Type4,
-    Atime1, Atime2, Atime3, Atime4, Atime5, Atime6, Atime7, Atime8,
-    Mtime1, Mtime2, Mtime3, Mtime4, Mtime5, Mtime6, Mtime7, Mtime8,
-    Ctime1, Ctime2, Ctime3, Ctime4, Ctime5, Ctime6, Ctime7, Ctime8,
-    Mode1,  Mode2,  Mode3,  Mode4,
-    Links1, Links2, Links3, Links4,
-    Major1, Major2, Major3, Major4,
-    Minor1, Minor2, Minor3, Minor4,
-    Inode1, Inode2, Inode3, Inode4,
-    Uid1,   Uid2,   Uid3,   Uid4,
-    Gid1,   Gid2,   Gid3,   Gid4,
-    Access1,Access2,Access3,Access4]) ->
-    #file_info {
-		size   = uint32(Hsize1,Hsize2,Hsize3,Hsize4)*16#100000000 + uint32(Lsize1,Lsize2,Lsize3,Lsize4),
-		type   = file_type(uint32(Type1,Type2,Type3,Type4)),
-		access = file_access(uint32(Access1,Access2,Access3,Access4)),
-		atime  = sint64(Atime1, Atime2, Atime3, Atime4, Atime5, Atime6, Atime7, Atime8),
-		mtime  = sint64(Mtime1, Mtime2, Mtime3, Mtime4, Mtime5, Mtime6, Mtime7, Mtime8),
-		ctime  = sint64(Ctime1, Ctime2, Ctime3, Ctime4, Ctime5, Ctime6, Ctime7, Ctime8),
-		mode   = uint32(Mode1,Mode2,Mode3,Mode4),
-		links  = uint32(Links1,Links2,Links3,Links4),
-		major_device = uint32(Major1,Major2,Major3,Major4),
-		minor_device = uint32(Minor1,Minor2,Minor3,Minor4),
-		inode = uint32(Inode1,Inode2,Inode3,Inode4),
-		uid   = uint32(Uid1,Uid2,Uid3,Uid4),
-		gid   = uint32(Gid1,Gid2,Gid3,Gid4)
-	    }.
-    
-    
-file_type(1) -> device;
-file_type(2) -> directory;
-file_type(3) -> regular;
-file_type(4) -> symlink;
-file_type(_) -> other.
-
-file_access(0) -> none;   
-file_access(1) -> write;
-file_access(2) -> read;
-file_access(3) -> read_write.
-
-int_to_int32bytes(Int) when is_integer(Int) ->
-    <<Int:32>>;
-int_to_int32bytes(undefined) ->
-    <<-1:32>>.
-
-int_to_int64bytes(Int) when is_integer(Int) ->
-    <<Int:64/signed>>.
-
-
-sint64(I1,I2,I3,I4,I5,I6,I7,I8) when I1 > 127 ->
-    ((I1 bsl 56) bor (I2 bsl 48) bor (I3 bsl 40) bor (I4 bsl 32) bor
-	(I5 bsl 24) bor (I6 bsl 16) bor (I7 bsl  8) bor I8) - (1 bsl 64);
-sint64(I1,I2,I3,I4,I5,I6,I7,I8) ->
-    ((I1 bsl 56) bor (I2 bsl 48) bor (I3 bsl 40) bor (I4 bsl 32) bor
-	(I5 bsl 24) bor (I6 bsl 16) bor (I7 bsl  8) bor I8).
-
-
-uint32(X1,X2,X3,X4) ->
-    (X1 bsl 24) bor (X2 bsl 16) bor (X3 bsl 8) bor X4.
-
-get_uint64(L0) ->
-    {X1, L1} = get_uint32(L0),
-    {X2, L2} = get_uint32(L1),
-    {(X1 bsl 32) bor X2, L2}.
-
-get_uint32([X1,X2,X3,X4|List]) ->
-    {(((((X1 bsl 8) bor X2) bsl 8) bor X3) bsl 8) bor X4, List}.
-
-
-%% Binary mode
-transform_ldata(<<0:32, 0:32>>) ->
-    [];
-transform_ldata([<<0:32, N:32, Sizes/binary>> | Datas]) ->
-    transform_ldata(N, Sizes, Datas, []);
-%% List mode
-transform_ldata([_,_,_,_,_,_,_,_|_] = L0) ->
-    {0, L1} = get_uint32(L0),
-    {N, L2} = get_uint32(L1),
-    transform_ldata(N, L2, []).
-
-%% List mode
-transform_ldata(0, List, Sizes) ->
-    transform_ldata(0, List, reverse(Sizes), []);
-transform_ldata(N, L0, Sizes) ->
-    {Size, L1} = get_uint64(L0),
-    transform_ldata(N-1, L1, [Size | Sizes]).
-
-%% Binary mode
-transform_ldata(1, <<0:64>>, <<>>, R) ->
-    reverse(R, [eof]);
-transform_ldata(1, <<Size:64>>, Data, R) 
-  when byte_size(Data) =:= Size ->
-    reverse(R, [Data]);
-transform_ldata(N, <<0:64, Sizes/binary>>, [<<>> | Datas], R) ->
-    transform_ldata(N-1, Sizes, Datas, [eof | R]);
-transform_ldata(N, <<Size:64, Sizes/binary>>, [Data | Datas], R) 
-  when byte_size(Data) =:= Size ->
-    transform_ldata(N-1, Sizes, Datas, [Data | R]);
-%% List mode
-transform_ldata(0, [], [], R) ->
-    reverse(R);
-transform_ldata(0, List, [0 | Sizes], R) ->
-    transform_ldata(0, List, Sizes, [eof | R]);
-transform_ldata(0, List, [Size | Sizes], R) ->
-    {Front, Rear} = lists_split(List, Size),
-    transform_ldata(0, Rear, Sizes, [Front | R]).
-
-lists_split(List, 0) when is_list(List) ->
-    {[], List};
-lists_split(List, N) when is_list(List), is_integer(N), N < 0 ->
-    erlang:error(badarg, [List, N]);
-lists_split(List, N) when is_list(List), is_integer(N) ->
-    case lists_split(List, N, []) of
-	premature_end_of_list ->
-	    erlang:error(badarg, [List, N]);
-	Result ->
-	    Result
+make_symlink(Existing, New) ->
+    try
+        make_soft_link_nif(encode_path(Existing), encode_path(New))
+    catch
+        error:badarg -> {error, badarg}
     end.
 
-lists_split(List, 0, Rev) ->
-    {reverse(Rev), List};
-lists_split([], _, _) ->
-    premature_end_of_list;
-lists_split([Hd | Tl], N, Rev) ->
-    lists_split(Tl, N-1, [Hd | Rev]).
-
-%% We KNOW that lists:reverse/2 is a BIF.
-
-reverse(X) -> lists:reverse(X, []).
-reverse(L, T) -> lists:reverse(L, T).
+altname(Path) ->
+    try altname_nif(encode_path(Path)) of
+        {ok, RawPath} -> {ok, decode_path(RawPath)};
+        Other -> Other
+    catch
+        error:badarg -> {error, badarg}
+    end.
 
-% Will add zero termination too
-% The 'EXIT' tuple from a bad argument will eventually generate an error
-% in list_to_binary, which is caught and generates the {error,badarg} return
-pathname(File) ->
-    (catch prim_file:internal_name2native(File)).
+list_dir_nif(_Path) ->
+    erlang:nif_error(undef).
+read_link_nif(_Path) ->
+    erlang:nif_error(undef).
+read_info_nif(_Path, _FollowLinks) ->
+    erlang:nif_error(undef).
+make_hard_link_nif(_Existing, _New) ->
+    erlang:nif_error(undef).
+make_soft_link_nif(_Existing, _New) ->
+    erlang:nif_error(undef).
+rename_nif(_Source, _Destination) ->
+    erlang:nif_error(undef).
+make_dir_nif(_Path) ->
+    erlang:nif_error(undef).
+del_file_nif(_Path) ->
+    erlang:nif_error(undef).
+del_dir_nif(_Path) ->
+    erlang:nif_error(undef).
+get_device_cwd_nif(_DevicePath) ->
+    erlang:nif_error(undef).
+set_cwd_nif(_Path) ->
+    erlang:nif_error(undef).
+get_cwd_nif() ->
+    erlang:nif_error(undef).
+altname_nif(_Path) ->
+    erlang:nif_error(undef).
 
+%%
+%% General helper functions.
+%%
 
-%% proplist:get_value/3
-plgv(K, [{K, V}|_], _) -> V;
-plgv(K, [_|KVs], D)    -> plgv(K, KVs, D);
-plgv(_, [], D)         -> D.
+%% We know for certain that lists:reverse/2 is a BIF, so it's safe to use it
+%% even though this module is preloaded.
+reverse_list(List) -> lists:reverse(List).
+
+proplist_get_value(_Key, [], Default) ->
+    Default;
+proplist_get_value(Key, [{Key, Value} | _Rest], _Default) ->
+    Value;
+proplist_get_value(Key, [Key | _Rest], _Default) ->
+    true;
+proplist_get_value(Key, [_Other | Rest], Default) ->
+    proplist_get_value(Key, Rest, Default).
+
+encode_path(Path) ->
+    prim_file:internal_name2native(Path).
+decode_path(NativePath) when is_binary(NativePath) ->
+    prim_file:internal_native2name(NativePath).
+
+is_path_translatable(Path) when is_list(Path) ->
+    true;
+is_path_translatable(Path) ->
+    prim_file:is_translatable(Path).
 
-%%
 %% We don't actually want this here
+%%
 %% We want to use posix time in all prim but erl_prim_loader makes that tricky
 %% It is probably needed to redo the whole erl_prim_loader
 
-from_seconds(Seconds, posix) when is_integer(Seconds) ->
+from_posix_seconds(Seconds, posix) when is_integer(Seconds) ->
     Seconds;
-from_seconds(Seconds, universal) when is_integer(Seconds) ->
+from_posix_seconds(Seconds, universal) when is_integer(Seconds) ->
     erlang:posixtime_to_universaltime(Seconds);
-from_seconds(Seconds, local) when is_integer(Seconds) ->
+from_posix_seconds(Seconds, local) when is_integer(Seconds) ->
     erlang:universaltime_to_localtime(erlang:posixtime_to_universaltime(Seconds)).
 
-to_seconds(Seconds, posix) when is_integer(Seconds) ->
+to_posix_seconds(Seconds, posix) when is_integer(Seconds) ->
     Seconds;
-to_seconds({_,_} = Datetime, universal) ->
+to_posix_seconds({_,_} = Datetime, universal) ->
     erlang:universaltime_to_posixtime(Datetime);
-to_seconds({_,_} = Datetime, local) ->
+to_posix_seconds({_,_} = Datetime, local) ->
     erlang:universaltime_to_posixtime(erlang:localtime_to_universaltime(Datetime)).
diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl
index 017a706a8b..2a3605260d 100644
--- a/erts/preloaded/src/prim_inet.erl
+++ b/erts/preloaded/src/prim_inet.erl
@@ -31,7 +31,7 @@
 -export([connect/3, connect/4, async_connect/4]).
 -export([accept/1, accept/2, async_accept/2]).
 -export([shutdown/2]).
--export([send/2, send/3, sendto/4, sendmsg/3]).
+-export([send/2, send/3, sendto/4, sendmsg/3, sendfile/4]).
 -export([recv/2, recv/3, async_recv/3]).
 -export([unrecv/2]).
 -export([recvfrom/2, recvfrom/3]).
@@ -500,6 +500,55 @@ sendmsg(S, #sctp_sndrcvinfo{}=SRI, Data) when is_port(S) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
+%% SENDFILE(outsock(), Fd, Offset, Length) -> {ok,BytesSent} | {error, Reason}
+%%
+%% send Length data bytes from a file handle, to a socket, starting at Offset
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% "sendfile" is for TCP:
+
+sendfile(S, FileHandle, Offset, Length)
+        when not is_port(S);
+             not is_binary(FileHandle);
+             not is_integer(Offset);
+             not is_integer(Length) ->
+    {error, badarg};
+sendfile(S, FileHandle, Offset, Length) ->
+    case erlang:port_info(S, connected) of
+        {connected, Pid} when Pid =:= self() ->
+            sendfile_1(S, FileHandle, Offset, Length);
+        {connected, Pid} when Pid =/= self() ->
+            {error, not_owner};
+        _Other ->
+            {error, einval}
+    end.
+
+sendfile_1(S, FileHandle, Offset, 0) ->
+    sendfile_1(S, FileHandle, Offset, (1 bsl 63) - 1);
+sendfile_1(_S, _FileHandle, Offset, Length) when
+         Offset < 0; Offset > ((1 bsl 63) - 1);
+         Length < 0; Length > ((1 bsl 63) - 1) ->
+    {error, einval};
+sendfile_1(S, FileHandle, Offset, Length) ->
+    Args = [FileHandle,
+            ?int64(Offset),
+            ?int64(Length)],
+    case ctl_cmd(S, ?TCP_REQ_SENDFILE, Args) of
+        {ok, []} ->
+            receive
+                {sendfile, S, {ok, SentLow, SentHigh}} ->
+                    {ok, SentLow bor (SentHigh bsl 32)};
+                {sendfile, S, {error, Reason}} ->
+                    {error, Reason};
+                {'EXIT', S, _Reason} ->
+                    {error, closed}
+            end;
+        {error, Reason} ->
+            {error, Reason}
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
 %% RECV(insock(), Length, [Timeout]) -> {ok,Data} | {error, Reason}
 %%
 %% receive Length data bytes from a socket
diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl
index 03c9ae38a1..a4ef42204d 100644
--- a/erts/preloaded/src/zlib.erl
+++ b/erts/preloaded/src/zlib.erl
@@ -188,14 +188,13 @@ deflateReset_nif(_Z) ->
 deflateParams(Z, Level0, Strategy0) ->
     Level = arg_level(Level0),
     Strategy = arg_strategy(Strategy0),
+    Progress = deflate(Z, <<>>, sync),
     case deflateParams_nif(Z, Level, Strategy) of
-        buf_error ->
-            %% We had data left in the pipe; flush everything and stash it away
-            %% for the next deflate call before trying again.
-            Output = deflate(Z, <<>>, full),
-            save_progress(Z, deflate, Output),
-            deflateParams_nif(Z, Level, Strategy);
-        Any -> Any
+        ok ->
+            save_progress(Z, deflate, Progress),
+            ok;
+        Other ->
+            Other
     end.
 deflateParams_nif(_Z, _Level, _Strategy) ->
     erlang:nif_error(undef).
diff --git a/erts/test/erlc_SUITE.erl b/erts/test/erlc_SUITE.erl
index 237558a129..394ecc8964 100644
--- a/erts/test/erlc_SUITE.erl
+++ b/erts/test/erlc_SUITE.erl
@@ -257,7 +257,7 @@ erlc() ->
 make_dep_options(Config) ->
     {SrcDir,OutDir,Cmd} = get_cmd(Config),
     FileName = filename:join(SrcDir, "erl_test_ok.erl"),
-
+    BeamFileName = filename:join(OutDir, "erl_test_ok.beam"),
 
     DepRE = ["/erl_test_ok[.]beam: \\\\$",
              "/system_test/erlc_SUITE_data/src/erl_test_ok[.]erl \\\\$",
@@ -285,22 +285,29 @@ make_dep_options(Config) ->
      "missing.hrl$",
      "_OK_"],
 
+    file:delete(BeamFileName),
+
     %% Test plain -M
     run(Config, Cmd, FileName, "-M", DepRE),
+    false = exists(BeamFileName),
 
     %% Test -MF File
     DepFile = filename:join(OutDir, "my.deps"),
     run(Config, Cmd, FileName, "-MF "++DepFile, ["_OK_"]),
     {ok,MFBin} = file:read_file(DepFile),
     verify_result(binary_to_list(MFBin)++["_OK_"], DepRE),
+    false = exists(BeamFileName),
 
     %% Test -MD
     run(Config, Cmd, FileName, "-MD", ["_OK_"]),
     MDFile = filename:join(OutDir, "erl_test_ok.Pbeam"),
     {ok,MFBin} = file:read_file(MDFile),
+    file:delete(MDFile), %% used further down!
+    false = exists(BeamFileName),
 
     %% Test -M -MT Target
     run(Config, Cmd, FileName, "-M -MT target", DepRETarget),
+    false = exists(BeamFileName),
 
     %% Test -MF File -MT Target
     TargetDepFile = filename:join(OutDir, "target.deps"),
@@ -308,23 +315,110 @@ make_dep_options(Config) ->
         ["_OK_"]),
     {ok,TargetBin} = file:read_file(TargetDepFile),
     verify_result(binary_to_list(TargetBin)++["_OK_"], DepRETarget),
+    file:delete(TargetDepFile),
+    false = exists(BeamFileName),
 
     %% Test -MD -MT Target
     run(Config, Cmd, FileName, "-MD -MT target", ["_OK_"]),
     TargetMDFile = filename:join(OutDir, "erl_test_ok.Pbeam"),
     {ok,TargetBin} = file:read_file(TargetMDFile),
+    file:delete(TargetDepFile),
+    false = exists(BeamFileName),
 
     %% Test -M -MQ Target. (Note: Passing a $ on the command line
     %% portably for Unix and Windows is tricky, so we will just test
     %% that MQ works at all.)
     run(Config, Cmd, FileName, "-M -MQ target", DepRETarget),
+    false = exists(BeamFileName),
 
     %% Test -M -MP
     run(Config, Cmd, FileName, "-M -MP", DepREMP),
+    false = exists(BeamFileName),
 
     %% Test -M -MG
     MissingHeader = filename:join(SrcDir, "erl_test_missing_header.erl"),
     run(Config, Cmd, MissingHeader, "-M -MG", DepREMissing),
+    false = exists(BeamFileName),
+
+    %%
+    %% check the above variants with side-effect -MMD
+    %%
+
+    %% since compiler is run on the erlang code a warning will be
+    %% issued by the compiler, match that.
+    WarningRE = "/system_test/erlc_SUITE_data/src/erl_test_ok.erl:[0-9]+: "
+        "Warning: function foo/0 is unused$",
+    ErrorRE = "/system_test/erlc_SUITE_data/src/erl_test_missing_header.erl:"
+        "[0-9]+: can't find include file \"missing.hrl\"$",
+
+    DepRE_MMD = insert_before("_OK_", WarningRE, DepRE),
+    DepRETarget_MMD = insert_before("_OK_", WarningRE, DepRETarget),
+    DepREMP_MMD = insert_before("_OK_",WarningRE,DepREMP),
+    DepREMissing_MMD = (insert_before("_OK_",ErrorRE,DepREMissing)--
+                            ["_OK_"]) ++ ["_ERROR_"],
+    CompRE = [WarningRE,"_OK_"],
+
+
+    %% Test plain -MMD -M
+    run(Config, Cmd, FileName, "-MMD -M", DepRE_MMD),
+    true = exists(BeamFileName),
+    file:delete(BeamFileName),
+
+    %% Test -MMD -MF File
+    DepFile = filename:join(OutDir, "my.deps"),
+    run(Config, Cmd, FileName, "-MMD -MF "++DepFile, CompRE),
+    {ok,MFBin} = file:read_file(DepFile),
+    verify_result(binary_to_list(MFBin)++["_OK_"], DepRE),
+    true = exists(BeamFileName),
+    file:delete(BeamFileName),
+
+    %% Test -MMD -MD
+    run(Config, Cmd, FileName, "-MMD -MD", CompRE),
+    MDFile = filename:join(OutDir, "erl_test_ok.Pbeam"),
+    {ok,MFBin} = file:read_file(MDFile),
+    file:delete(MDFile), %% used further down!
+    true = exists(BeamFileName),
+    file:delete(BeamFileName),
+
+    %% Test -MMD -M -MT Target
+    run(Config, Cmd, FileName, "-MMD -M -MT target", DepRETarget_MMD),
+    true = exists(BeamFileName),
+    file:delete(BeamFileName),
+
+    %% Test -MMD -MF File -MT Target
+    TargetDepFile = filename:join(OutDir, "target.deps"),
+    run(Config, Cmd, FileName, "-MMD -MF "++TargetDepFile++" -MT target",
+        CompRE),
+    {ok,TargetBin} = file:read_file(TargetDepFile),
+    verify_result(binary_to_list(TargetBin)++["_OK_"], DepRETarget),
+    file:delete(TargetDepFile),
+    true = exists(BeamFileName),
+    file:delete(BeamFileName),
+
+    %% Test -MMD -MD -MT Target
+    run(Config, Cmd, FileName, "-MMD -MD -MT target", CompRE),
+    TargetMDFile = filename:join(OutDir, "erl_test_ok.Pbeam"),
+    {ok,TargetBin} = file:read_file(TargetMDFile),
+    file:delete(TargetDepFile),
+    true = exists(BeamFileName),
+    file:delete(BeamFileName),
+
+    %% Test -MMD -M -MQ Target. (Note: Passing a $ on the command line
+    %% portably for Unix and Windows is tricky, so we will just test
+    %% that MQ works at all.)
+    run(Config, Cmd, FileName, "-MMD -M -MQ target", DepRETarget_MMD),
+    true = exists(BeamFileName),
+    file:delete(BeamFileName),
+
+    %% Test -MMD -M -MP
+    run(Config, Cmd, FileName, "-MMD -M -MP", DepREMP_MMD),
+    true = exists(BeamFileName),
+    file:delete(BeamFileName),
+
+    %% Test -MMD -M -MG
+    MissingHeader = filename:join(SrcDir, "erl_test_missing_header.erl"),
+    run(Config, Cmd, MissingHeader, "-MMD -M -MG", DepREMissing_MMD),
+    false = exists(BeamFileName),
     ok.
 
 %% Runs a command.
@@ -341,6 +435,12 @@ verify_result(Result, Expect) ->
     io:format("Expected: ~p", [Expect]),
     match_messages(Messages, Expect).
 
+%% insert What before Item, crash if Item is not found
+insert_before(Item, What, [Item|List]) ->
+    [What,Item|List];
+insert_before(Item, What, [Other|List]) ->
+    [Other|insert_before(Item, What, List)].
+
 split([$\n|Rest], Current, Lines) ->
     split(Rest, [], [lists:reverse(Current)|Lines]);
 split([$\r|Rest], Current, Lines) ->
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl
index cd7a894eb5..bb1afecafc 100644
--- a/erts/test/z_SUITE.erl
+++ b/erts/test/z_SUITE.erl
@@ -40,7 +40,7 @@
     
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap, {minutes, 5}}].
+     {timetrap, {minutes, 10}}].
 
 all() -> 
     [core_files].
@@ -255,6 +255,8 @@ core_file_search(#core_search_conf{search_dir = Base,
 				     core_cand(Conf, Core, Cores);
 				 "core." ++ _ ->
 				     core_cand(Conf, Core, Cores);
+				 "vgcore." ++ _ -> % valgrind
+				     core_cand(Conf, Core, Cores);
 				 Bin when is_binary(Bin) -> %Icky filename; ignore
 				     Cores;
 				 BName ->
diff --git a/erts/vsn.mk b/erts/vsn.mk
index a788b2e491..50b77fdbc0 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 9.1.3
+VSN = 9.2.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index ae6660c143..1abe983221 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,6 +32,31 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 5.0.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    There was a issue with BER encoding and the
+	    <c>undec_rest</c> option in generated decoders. An
+	    exception could be thrown instead of returning an error
+	    tuple.</p>
+          <p>
+	    Own Id: OTP-14786 Aux Id: ERL-518 </p>
+        </item>
+        <item>
+          <p>
+	    The asn1ct:test functions crashed on decoders generated
+	    with options <c>no_ok_wrapper</c>, <c>undec_rest</c>.</p>
+          <p>
+	    Own Id: OTP-14787 Aux Id: ERL-518 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 5.0.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index f36d71a601..81a2735a0d 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -1335,25 +1335,39 @@ test_value(Module, Type, Value) ->
     in_process(fun() ->
                    case catch Module:encode(Type, Value) of
                        {ok, Bytes} ->
-                           NewBytes = prepare_bytes(Bytes),
-                           case Module:decode(Type, NewBytes) of
-                               {ok, Value} ->
-                                   {ok, {Module, Type, Value}};
-                               {ok, Res}   ->
-                                   {error, {asn1,
-                                            {encode_decode_mismatch,
-                                             {{Module, Type, Value}, Res}}}};
-                               Error       ->
-                                   {error, {asn1,
-                                            {{decode,
-                                              {Module, Type, Value}, Error}}}}
-                           end;
+                           test_value_decode(Module, Type, Value, Bytes);
+                       Bytes when is_binary(Bytes) ->
+                           test_value_decode(Module, Type, Value, Bytes);
                        Error ->
                            {error, {asn1,
                                     {encode, {{Module, Type, Value}, Error}}}}
                    end
                end).
 
+
+test_value_decode(Module, Type, Value, Bytes) ->
+    NewBytes = prepare_bytes(Bytes),
+    case Module:decode(Type, NewBytes) of
+        {ok,Value}      -> {ok, {Module,Type,Value}};
+        {ok,Value,<<>>} -> {ok, {Module,Type,Value}};
+        Value           -> {ok, {Module,Type,Value}};
+        {Value,<<>>}    -> {ok, {Module,Type,Value}};
+
+        %% Errors:
+        {ok, Res}   ->
+            {error, {asn1,
+                     {encode_decode_mismatch,
+                      {{Module, Type, Value}, Res}}}};
+        {ok, Res, Rest} ->
+            {error, {asn1,
+                     {encode_decode_mismatch,
+                      {{Module, Type, Value}, {Res,Rest}}}}};
+        Error       ->
+            {error, {asn1,
+                     {{decode,
+                       {Module, Type, Value}, Error}}}}
+    end.
+
 value(Module, Type) -> value(Module, Type, []).
 
 value(Module, Type, Includes) ->
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index 84c7f39d55..efbc6d6380 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -707,6 +707,7 @@ gen_exports([_|_]=L0, Prefix, Arity) ->
 pgen_dispatcher(Erules, []) ->
     gen_info_functions(Erules);
 pgen_dispatcher(Gen, Types) ->
+    %% MODULE HEAD
     emit(["-export([encode/2,decode/2]).",nl,nl]),
     gen_info_functions(Gen),
 
@@ -714,6 +715,7 @@ pgen_dispatcher(Gen, Types) ->
     NoFinalPadding = lists:member(no_final_padding, Options),
     NoOkWrapper = proplists:get_bool(no_ok_wrapper, Options),
 
+    %% ENCODER
     Call = case Gen of
 	       #gen{erule=per,aligned=true} ->
 		   asn1ct_func:need({per,complete,1}),
@@ -740,6 +742,7 @@ pgen_dispatcher(Gen, Types) ->
     end,
     emit([nl,nl]),
 
+    %% DECODER
     ReturnRest = proplists:get_bool(undec_rest, Gen#gen.options),
     Data = case Gen#gen.erule =:= ber andalso ReturnRest of
 	       true -> "Data0";
@@ -747,6 +750,12 @@ pgen_dispatcher(Gen, Types) ->
 	   end,
 
     emit(["decode(Type, ",Data,") ->",nl]),
+
+    case NoOkWrapper of
+        false -> emit(["try",nl]);
+        true -> ok
+    end,
+
     DecWrap =
 	case {Gen,ReturnRest} of
 	    {#gen{erule=ber},false} ->
@@ -754,32 +763,38 @@ pgen_dispatcher(Gen, Types) ->
 		"element(1, ber_decode_nif(Data))";
 	    {#gen{erule=ber},true} ->
 		asn1ct_func:need({ber,ber_decode_nif,1}),
-		emit(["{Data,Rest} = ber_decode_nif(Data0),",nl]),
+		emit(["   {Data,Rest} = ber_decode_nif(Data0),",nl]),
 		"Data";
 	    {_,_} ->
 		"Data"
 	end,
-    emit([case NoOkWrapper of
-	      false -> "try";
-	      true -> "case"
-	  end, " decode_disp(Type, ",DecWrap,") of",nl]),
-    case Gen of
-	#gen{erule=ber} ->
-	    emit(["  Result ->",nl]);
-	#gen{erule=per} ->
-	    emit(["  {Result,Rest} ->",nl])
-    end,
-    case ReturnRest of
-	false -> result_line(NoOkWrapper, ["Result"]);
-	true ->  result_line(NoOkWrapper, ["Result","Rest"])
+
+    DecodeDisp = ["decode_disp(Type, ",DecWrap,")"],
+    case {Gen,ReturnRest} of
+	{#gen{erule=ber},true} ->
+	    emit(["   Result = ",DecodeDisp,",",nl]),
+            result_line(NoOkWrapper, ["Result","Rest"]);
+	{#gen{erule=ber},false} ->
+	    emit(["   Result = ",DecodeDisp,",",nl]),
+            result_line(NoOkWrapper, ["Result"]);
+
+
+	{#gen{erule=per},true} ->
+	    emit(["   {Result,Rest} = ",DecodeDisp,",",nl]),
+            result_line(NoOkWrapper, ["Result","Rest"]);
+	{#gen{erule=per},false} ->
+	    emit(["   {Result,_Rest} = ",DecodeDisp,",",nl]),
+            result_line(NoOkWrapper, ["Result"])
     end,
+
     case NoOkWrapper of
 	false ->
 	    emit([nl,try_catch(),nl,nl]);
 	true ->
-	    emit([nl,"end.",nl,nl])
+	    emit([".",nl,nl])
     end,
 
+    %% REST of MODULE
     gen_decode_partial_incomplete(Gen),
     gen_partial_inc_dispatcher(Gen),
 
@@ -787,7 +802,7 @@ pgen_dispatcher(Gen, Types) ->
     gen_dispatcher(Types, "decode_disp", "dec_").
 
 result_line(NoOkWrapper, Items) ->
-    S = ["    "|case NoOkWrapper of
+    S = ["   "|case NoOkWrapper of
 		    false -> result_line_1(["ok"|Items]);
 		    true -> result_line_1(Items)
 		end],
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 82e9326294..c09b0f47d1 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -47,14 +47,20 @@ dialyzer_suppressions(#gen{erule=per,aligned=Aligned}) ->
               false -> uper;
               true -> per
           end,
-    case asn1ct_func:is_used({Mod,complete,1}) of
+    suppress({Mod,complete,1}),
+    suppress({per_common,to_bitstring,2}),
+    emit(["    ok.",nl]).
+
+suppress({M,F,A}=MFA) ->
+    case asn1ct_func:is_used(MFA) of
 	false ->
 	    ok;
 	true ->
-	    emit(["    _ = complete(Arg),",nl])
-    end,
-    emit(["    ok.",nl]).
-
+	    Args =
+                [lists:concat(["element(",I,", Arg)"])
+                 || I <- lists:seq(1, A)],
+	    emit(["    ",{call,M,F,Args},com,nl])
+    end.
 
 gen_encode(Erules,Type) when is_record(Type,typedef) ->
     gen_encode_user(Erules,Type).
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index b98a704e28..bfeffa969f 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -1355,8 +1355,8 @@ xref_export_all(_Config) ->
         [] ->
             ok;
         [_|_] ->
-            S = [io_lib:format("~p:~p/~p\n", [M,F,A]) || {M,F,A} <- Unused],
-            io:format("There are unused functions:\n\n~s\n", [S]),
+            Msg = [io_lib:format("~p:~p/~p\n", [M,F,A]) || {M,F,A} <- Unused],
+            io:format("There are unused functions:\n\n~s\n", [Msg]),
             ?t:fail(unused_functions)
     end.
 
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index ef83b9e3dc..4cd89089e9 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.0.3
+ASN1_VSN = 5.0.4
diff --git a/lib/common_test/doc/src/Makefile b/lib/common_test/doc/src/Makefile
index b60b04c4ae..293ef591cb 100644
--- a/lib/common_test/doc/src/Makefile
+++ b/lib/common_test/doc/src/Makefile
@@ -60,6 +60,7 @@ XML_REF6_FILES = common_test_app.xml
 XML_PART_FILES = part.xml
 
 XML_CHAPTER_FILES = \
+	introduction.xml \
 	basics_chapter.xml \
 	getting_started_chapter.xml \
 	install_chapter.xml \
@@ -74,8 +75,7 @@ XML_CHAPTER_FILES = \
 	event_handler_chapter.xml \
 	ct_hooks_chapter.xml \
 	dependencies_chapter.xml \
-	notes.xml \
-	notes_history.xml
+	notes.xml
 
 BOOK_FILES = book.xml
 
diff --git a/lib/common_test/doc/src/ct.xml b/lib/common_test/doc/src/ct.xml
index 1a3cfdb0c5..afd8741cd1 100644
--- a/lib/common_test/doc/src/ct.xml
+++ b/lib/common_test/doc/src/ct.xml
@@ -1060,6 +1060,42 @@
       </desc>
     </func>
 
+     <func>
+      <name>remaining_test_procs() -&gt; {TestProcs,SharedGL,OtherGLs}</name>
+      <fsummary>>This function will return the identity of test- and group
+       leader processes that are still running at the time of this call.</fsummary>
+      <type>
+        <v>TestProcs = [{pid(),GL}]</v>
+	<v>GL = pid()</v>
+        <v>SharedGL = pid()</v>
+        <v>OtherGLs = [pid()]</v>
+      </type>
+      <desc><marker id="remaining_test_procs-0"/>
+        <p>This function will return the identity of test- and group
+	leader processes that are still running at the time of this call.
+	<c>TestProcs</c> are processes in the system that have a Common Test IO
+	process as group leader. <c>SharedGL</c> is the central Common Test
+	IO process, responsible for printing to log files for configuration
+	functions and sequentially executing test cases. <c>OtherGLs</c> are
+	Common Test IO processes that print to log files for test cases
+	in parallel test case groups.</p>
+	<p>The process information returned by this function may be
+	used to locate and terminate remaining processes after tests have
+	finished executing. The function would typically by called from
+	Common Test Hook functions.</p>
+	<p>Note that processes that execute configuration functions or
+	test cases are never included in <c>TestProcs</c>. It is therefore safe
+	to use post configuration hook functions (such as post_end_per_suite,
+	post_end_per_group, post_end_per_testcase) to terminate all processes
+	in <c>TestProcs</c> that have the current group leader process as its group
+	leader.</p>
+	<p>Note also that the shared group leader (<c>SharedGL</c>) must never be
+	terminated by the user, only by Common Test. Group leader processes
+	for parallel test case groups (<c>OtherGLs</c>) may however be terminated
+	in post_end_per_group hook functions.</p>
+      </desc>
+    </func>   
+
     <func>
       <name>remove_config(Callback, Config) -&gt; ok</name>
       <fsummary>Removes configuration variables (together with
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index b039023e0f..c6b928bb5d 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,6 +33,33 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.15.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A new function, <c>ct:remaining_test_procs/0</c>, returns
+	    the identity of test- and group leader processes that are
+	    still running at the time of the call.</p>
+          <p>
+	    Own Id: OTP-13832</p>
+        </item>
+        <item>
+          <p>
+	    A "latest test result" link is now displayed in the
+	    footer of each test index page, which performs a jump to
+	    the most recently generated test index. This is useful
+	    for making quick comparisons of results between test runs
+	    without having to traverse the log file tree.</p>
+          <p>
+	    Own Id: OTP-14281</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.15.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src
index 0aa4aacf16..9becde110b 100644
--- a/lib/common_test/src/common_test.app.src
+++ b/lib/common_test/src/common_test.app.src
@@ -92,7 +92,7 @@
     "sasl-2.4.2",
     "snmp-5.1.2",
     "ssh-4.0",
-    "stdlib-3.4",
+    "stdlib-3.5",
     "syntax_tools-1.7",
     "tools-2.8",
     "xmerl-1.3.8"
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 875301a8b2..fd7fa07b81 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -89,6 +89,8 @@
 -export([get_target_name/1]).
 -export([parse_table/1, listenv/1]).
 
+-export([remaining_test_procs/0]).
+
 %%----------------------------------------------------------------------
 %% Exported types
 %%----------------------------------------------------------------------
@@ -870,8 +872,8 @@ fail(Reason) ->
     try
 	exit({test_case_failed,Reason})
     catch
-	Class:R ->
-	    case erlang:get_stacktrace() of
+	Class:R:S ->
+	    case S of
 		[{?MODULE,fail,1,_}|Stk] -> ok;
 		Stk -> ok
 	    end,
@@ -892,8 +894,8 @@ fail(Format, Args) ->
 	    try
 		exit({test_case_failed,lists:flatten(Str)})
 	    catch
-		Class:R ->
-		    case erlang:get_stacktrace() of
+		Class:R:S ->
+		    case S of
 			[{?MODULE,fail,2,_}|Stk] -> ok;
 			Stk -> ok
 		    end,
@@ -1474,3 +1476,36 @@ continue() ->
 %%%      in order to let the test case proceed.</p>
 continue(TestCase) -> 
     test_server:continue(TestCase).
+
+
+%%%-----------------------------------------------------------------
+%%% @spec remaining_test_procs() -> {TestProcs,SharedGL,OtherGLs}
+%%%       TestProcs = [{pid(),GL}]
+%%%       GL = SharedGL = pid()
+%%%       OtherGLs = [pid()]
+%%%
+%%% @doc <p>This function will return the identity of test- and group
+%%%      leader processes that are still running at the time of this call.
+%%%      TestProcs are processes in the system that have a Common Test IO
+%%%      process as group leader. SharedGL is the central Common Test
+%%%      IO process, responsible for printing to log files for configuration
+%%%      functions and sequentially executing test cases. OtherGLs are
+%%%      Common Test IO processes that print to log files for test cases
+%%%      in parallel test case groups.</p>
+%%%      <p>The process information returned by this function may be
+%%%      used to locate and terminate remaining processes after tests have
+%%%      finished executing. The function would typically by called from
+%%%      Common Test Hook functions.</p>
+%%%      <p>Note that processes that execute configuration functions or
+%%%      test cases are never included in TestProcs. It is therefore safe
+%%%      to use post configuration hook functions (such as post_end_per_suite,
+%%%      post_end_per_group, post_end_per_testcase) to terminate all processes
+%%%      in TestProcs that have the current group leader process as its group
+%%%      leader.</p>
+%%%      <p>Note also that the shared group leader (SharedGL) must never be
+%%%      terminated by the user, only by Common Test. Group leader processes
+%%%      for parallel test case groups (OtherGLs) may however be terminated
+%%%      in post_end_per_group hook functions.</p>
+%%%      
+remaining_test_procs() ->
+    ct_util:remaining_test_procs().
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index b3f983dd46..6c87b11f8d 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -81,6 +81,7 @@ start(Mode) ->
 
 do_start(Parent) ->
     process_flag(trap_exit,true),
+    ct_util:mark_process(),
     register(ct_config_server,self()),
     ct_util:create_table(?attr_table,bag,#ct_conf.key),
     {ok,StartDir} = file:get_cwd(),
diff --git a/lib/common_test/src/ct_default_gl.erl b/lib/common_test/src/ct_default_gl.erl
index d1b52e5f4f..9ae430c546 100644
--- a/lib/common_test/src/ct_default_gl.erl
+++ b/lib/common_test/src/ct_default_gl.erl
@@ -55,6 +55,7 @@ stop() ->
 
 init([ParentGL]) ->
     register(?MODULE, self()),
+    ct_util:mark_process(),
     {ok,#{parent_gl_pid => ParentGL,
 	  parent_gl_monitor => erlang:monitor(process,ParentGL)}}.
 
diff --git a/lib/common_test/src/ct_event.erl b/lib/common_test/src/ct_event.erl
index 1a0ee4f3cd..8b5bba7600 100644
--- a/lib/common_test/src/ct_event.erl
+++ b/lib/common_test/src/ct_event.erl
@@ -137,6 +137,7 @@ is_alive() ->
 %% this function is called to initialize the event handler.
 %%--------------------------------------------------------------------
 init(RecvPids) ->
+    ct_util:mark_process(),
     %% RecvPids = [{RecvTag,Pid}]
     {ok,#state{receivers=RecvPids}}.
 
diff --git a/lib/common_test/src/ct_gen_conn.erl b/lib/common_test/src/ct_gen_conn.erl
index badb7c52ae..456bfd8bd1 100644
--- a/lib/common_test/src/ct_gen_conn.erl
+++ b/lib/common_test/src/ct_gen_conn.erl
@@ -186,9 +186,11 @@ end_log() ->
 do_within_time(Fun,Timeout) ->
     Self = self(),
     Silent = get(silent),
-    TmpPid = spawn_link(fun() -> put(silent,Silent),
-				 R = Fun(),
-				 Self ! {self(),R}
+    TmpPid = spawn_link(fun() -> 
+                                ct_util:mark_process(),
+                                put(silent,Silent),
+                                R = Fun(),
+                                Self ! {self(),R}
 			end),
     ConnPid = get(conn_pid),
     receive
@@ -301,6 +303,7 @@ return({To,Ref},Result) ->
 
 init_gen(Parent,Opts) ->
     process_flag(trap_exit,true),
+    ct_util:mark_process(),
     put(silent,false),
     try (Opts#gen_opts.callback):init(Opts#gen_opts.name,
 				      Opts#gen_opts.address,
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
index f0592a40be..bb33f0243b 100644
--- a/lib/common_test/src/ct_hooks.erl
+++ b/lib/common_test/src/ct_hooks.erl
@@ -233,8 +233,7 @@ call([{Hook, call_id, NextFun} | Rest], Config, Meta, Hooks) ->
 		     Rest ++ [{NewId, call_init}, {NewId,NextFun}]}
 	    end,
 	call(resort(NewRest,NewHooks,Meta), Config, Meta, NewHooks)
-    catch Error:Reason ->
-	    Trace = erlang:get_stacktrace(),
+    catch Error:Reason:Trace ->
 	    ct_logs:log("Suite Hook","Failed to start a CTH: ~tp:~tp",
 			[Error,{Reason,Trace}]),
 	    call([], {fail,"Failed to start CTH"
@@ -422,8 +421,7 @@ catch_apply(M,F,A, Default, Fallback) ->
 catch_apply(M,F,A) ->
     try
         erlang:apply(M,F,A)
-    catch _:Reason ->
-            Trace = erlang:get_stacktrace(),
+    catch _:Reason:Trace ->
             ct_logs:log("Suite Hook","Call to CTH failed: ~w:~tp",
                             [error,{Reason,Trace}]),
             throw({error_in_cth_call,
diff --git a/lib/common_test/src/ct_hooks_lock.erl b/lib/common_test/src/ct_hooks_lock.erl
index fea298e535..a82be288e1 100644
--- a/lib/common_test/src/ct_hooks_lock.erl
+++ b/lib/common_test/src/ct_hooks_lock.erl
@@ -78,6 +78,7 @@ release() ->
 
 %% @doc Initiates the server
 init(Id) ->
+    ct_util:mark_process(),
     {ok, #state{ id = Id }}.
 
 %% @doc Handling call messages
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 028c265420..9861b1e521 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -666,6 +666,7 @@ log_timestamp({MS,S,US}) ->
 
 logger(Parent, Mode, Verbosity) ->
     register(?MODULE,self()),
+    ct_util:mark_process(),
     %%! Below is a temporary workaround for the limitation of
     %%! max one test run per second. 
     %%! --->
@@ -1004,6 +1005,7 @@ print_to_log(async, FromPid, Category, TCGL, Content, EscChars, State) ->
 	if FromPid /= TCGL ->
 		IoFun = create_io_fun(FromPid, CtLogFd, EscChars),
 		fun() ->
+                        ct_util:mark_process(),
 			test_server:permit_io(TCGL, self()),
 
 			%% Since asynchronous io gets can get buffered if
@@ -1035,6 +1037,7 @@ print_to_log(async, FromPid, Category, TCGL, Content, EscChars, State) ->
 		end;
 	   true ->
 		fun() ->
+                        ct_util:mark_process(),
 			unexpected_io(FromPid, Category, ?MAX_IMPORTANCE,
 				      Content, CtLogFd, EscChars)
 		end
@@ -3002,6 +3005,7 @@ simulate() ->
     S = self(),
     Pid = spawn(fun() -> 
 			register(?MODULE,self()),
+                        ct_util:mark_process(),
 			S ! {self(),started},
 			simulate_logger_loop() 
 		end),
@@ -3129,8 +3133,8 @@ locate_priv_file(FileName) ->
 			filename:join(get(ct_run_dir), FileName);
 		    _ ->			
 			%% executed on other process than ct_logs
-			{ok,RunDir} = get_log_dir(true),
-			filename:join(RunDir, FileName)
+			{ok,LogDir} = get_log_dir(true),
+			filename:join(LogDir, FileName)
 		end,
 	    case filelib:is_file(PrivResultFile) of
 		true ->
@@ -3212,6 +3216,10 @@ get_ts_html_wrapper(TestName, Logdir, PrintLabel, Cwd, TableCols, Encoding) ->
 					  ?all_runs_name), Cwd),
     TestIndex = make_relative(filename:join(filename:dirname(CtLogdir),
 					    ?index_name), Cwd),
+    LatestTest = make_relative(filename:join(filename:dirname(CtLogdir),
+                                           ?suitelog_name++".latest.html"),
+                             Cwd),
+
     case Basic of
 	true ->
 	    TileFile = filename:join(filename:join(CTPath,"priv"),"tile1.jpg"),
@@ -3238,7 +3246,9 @@ get_ts_html_wrapper(TestName, Logdir, PrintLabel, Cwd, TableCols, Encoding) ->
 	      "<a href=\"", uri(AllRuns),
 	      "\">Test run history\n</a>  |  ",
 	      "<a href=\"", uri(TestIndex),
-	      "\">Top level test index\n</a>\n</p>\n",
+	      "\">Top level test index\n</a>  |  ",
+	      "<a href=\"", uri(LatestTest),
+              "\">Latest test result</a>\n</p>\n",
 	      Copyright,"</center>\n</body>\n</html>\n"]};
 	_ ->
 	    Copyright = 
@@ -3285,7 +3295,9 @@ get_ts_html_wrapper(TestName, Logdir, PrintLabel, Cwd, TableCols, Encoding) ->
 	      "<a href=\"", uri(AllRuns),
 	      "\">Test run history\n</a>  |  ",
 	      "<a href=\"", uri(TestIndex),
-	      "\">Top level test index\n</a>\n</p>\n",
+	      "\">Top level test index\n</a>  |  ",
+	      "<a href=\"", uri(LatestTest),
+              "\">Latest test result</a>\n</p>\n",
 	      Copyright,"</center>\n</body>\n</html>\n"]}
     end.
 
diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl
index 44d3fb8f64..e2ea525cdd 100644
--- a/lib/common_test/src/ct_master.erl
+++ b/lib/common_test/src/ct_master.erl
@@ -346,6 +346,7 @@ init_master(Parent,NodeOptsList,EvHandlers,MasterLogDir,LogDirs,
     case whereis(ct_master) of
 	undefined ->
 	    register(ct_master,self()),
+            ct_util:mark_process(),
 	    ok;
 	_Pid ->
 	    io:format("~nWarning: ct_master already running!~n"),
@@ -690,6 +691,7 @@ refresh_logs([],Refreshed) ->
 init_node_ctrl(MasterPid,Cookie,Opts) ->
     %% make sure tests proceed even if connection to master is lost
     process_flag(trap_exit, true),
+    ct_util:mark_process(),
     MasterNode = node(MasterPid),
     group_leader(whereis(user),self()),
     io:format("~n********** node_ctrl process ~w started on ~w **********~n",
diff --git a/lib/common_test/src/ct_master_event.erl b/lib/common_test/src/ct_master_event.erl
index d535d1274e..bd4d1efc92 100644
--- a/lib/common_test/src/ct_master_event.erl
+++ b/lib/common_test/src/ct_master_event.erl
@@ -116,6 +116,7 @@ sync_notify(Event) ->
 %% this function is called to initialize the event handler.
 %%--------------------------------------------------------------------
 init(_) ->
+    ct_util:mark_process(),
     ct_master_logs:log("CT Master Event Handler started","",[]),
     {ok,#state{}}.
 
diff --git a/lib/common_test/src/ct_master_logs.erl b/lib/common_test/src/ct_master_logs.erl
index fd92f73f63..1308720823 100644
--- a/lib/common_test/src/ct_master_logs.erl
+++ b/lib/common_test/src/ct_master_logs.erl
@@ -88,6 +88,7 @@ stop() ->
 
 init(Parent,LogDir,Nodes) ->
     register(?MODULE,self()),
+    ct_util:mark_process(),
     Time = calendar:local_time(),
     RunDir = make_dirname(Time),
     RunDirAbs = filename:join(LogDir,RunDir),
diff --git a/lib/common_test/src/ct_repeat.erl b/lib/common_test/src/ct_repeat.erl
index c043c9846c..177ef37d1f 100644
--- a/lib/common_test/src/ct_repeat.erl
+++ b/lib/common_test/src/ct_repeat.erl
@@ -70,6 +70,7 @@ loop_test(If,Args) when is_list(Args) ->
 				    CtrlPid = self(),
 				    spawn(
 				      fun() ->
+                                              ct_util:mark_process(),
 					      stop_after(CtrlPid,Secs,ForceStop)
 				      end)
 			    end,
@@ -134,6 +135,7 @@ spawn_tester(script,Ctrl,Args) ->
 
 spawn_tester(func,Ctrl,Opts) ->
     Tester = fun() ->
+                     ct_util:mark_process(),
 		     case catch ct_run:run_test2(Opts) of
 			 {'EXIT',Reason} ->
 			     exit(Reason);
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 9436236719..afc5fee4f7 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -250,6 +250,8 @@ finish(Tracing, ExitStatus, Args) ->
     end.
 
 script_start1(Parent, Args) ->
+    %% tag this process
+    ct_util:mark_process(),
     %% read general start flags
     Label = get_start_opt(label, fun([Lbl]) -> Lbl end, Args),
     Profile = get_start_opt(profile, fun([Prof]) -> Prof end, Args),
@@ -440,11 +442,9 @@ script_start2(Opts = #opts{vts = undefined,
                 TestSpecData ->
 		    execute_all_specs(TestSpecData, Opts, Args, [])
             catch
-                throw:{error,Reason} ->
-		    StackTrace = erlang:get_stacktrace(),
+                throw:{error,Reason}:StackTrace ->
 		    {error,{invalid_testspec,{Reason,StackTrace}}};
-                _:Reason ->
-		    StackTrace = erlang:get_stacktrace(),
+                _:Reason:StackTrace ->
 		    {error,{invalid_testspec,{Reason,StackTrace}}}
             end;
 	[] ->
@@ -956,7 +956,10 @@ run_test(StartOpts) when is_list(StartOpts) ->
 -spec run_test1_fun(_) -> fun(() -> no_return()).
 
 run_test1_fun(StartOpts) ->
-    fun() -> run_test1(StartOpts) end.
+    fun() -> 
+            ct_util:mark_process(),
+            run_test1(StartOpts)
+    end.
 
 run_test1(StartOpts) when is_list(StartOpts) ->
     case proplists:get_value(refresh_logs, StartOpts) of
@@ -1206,11 +1209,9 @@ run_spec_file(Relaxed,
 	TestSpecData ->
 	    run_all_specs(TestSpecData, Opts, StartOpts, [])
     catch
-	throw:{error,CTReason} ->
-	    StackTrace = erlang:get_stacktrace(),
+	throw:{error,CTReason}:StackTrace ->
 	    exit({error,{invalid_testspec,{CTReason,StackTrace}}});
-	_:CTReason ->
-	    StackTrace = erlang:get_stacktrace(),
+	_:CTReason:StackTrace ->
 	    exit({error,{invalid_testspec,{CTReason,StackTrace}}})
     end.
 
@@ -1447,7 +1448,10 @@ run_testspec(TestSpec) ->
 -spec run_testspec1_fun(_) -> fun(() -> no_return()).
 
 run_testspec1_fun(TestSpec) ->
-    fun() -> run_testspec1(TestSpec) end.
+    fun() -> 
+            ct_util:mark_process(),
+            run_testspec1(TestSpec)
+    end.
 
 run_testspec1(TestSpec) ->
     {ok,Cwd} = file:get_cwd(),
@@ -1906,10 +1910,12 @@ possibly_spawn(true, Tests, Skip, Opts) ->
     CTUtilSrv = whereis(ct_util_server),
     Supervisor = 
 	fun() ->
+                ct_util:mark_process(),
 		process_flag(trap_exit, true),
 		link(CTUtilSrv),
 		TestRun =
 		    fun() ->
+                            ct_util:mark_process(),
 			    TestResult = (catch do_run_test(Tests, Skip, Opts)),
 			    case TestResult of
 				{EType,_} = Error when EType == user_error;
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index 61e6446df8..0c16ad5980 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -318,6 +318,7 @@ monitor_master(MasterNode) ->
 
 % code of the masterdeath-waiter process
 monitor_master_int(MasterNode) ->
+    ct_util:mark_process(),
     erlang:monitor_node(MasterNode, true),
     receive
         {nodedown, MasterNode}->
diff --git a/lib/common_test/src/ct_telnet_client.erl b/lib/common_test/src/ct_telnet_client.erl
index c8d217cd2a..76e4b9ea70 100644
--- a/lib/common_test/src/ct_telnet_client.erl
+++ b/lib/common_test/src/ct_telnet_client.erl
@@ -118,6 +118,7 @@ get_data(Pid) ->
 %%%-----------------------------------------------------------------
 %%% Internal functions
 init(Parent, Server, Port, Timeout, KeepAlive, NoDelay, ConnName) ->
+    ct_util:mark_process(),
     case gen_tcp:connect(Server, Port, [list,{packet,0},{nodelay,NoDelay}], Timeout) of
 	{ok,Sock} ->
 	    dbg("~tp connected to: ~tp (port: ~w, keep_alive: ~w)\n",
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index bb445bb0d2..bd3755722f 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -1425,7 +1425,12 @@ skip_groups1(Suite,Groups,Cmt,Suites0) ->
 	    GrAndCases1 = GrAndCases0 ++ SkipGroups,
 	    insert_in_order({Suite,GrAndCases1},Suites0,replace);
 	false ->
-	    insert_in_order({Suite,SkipGroups},Suites0,replace)
+	    case Suites0 of
+		[{all,_}=All|Skips]->
+		    [All|Skips++[{Suite,SkipGroups}]];
+                _ ->
+                    insert_in_order({Suite,SkipGroups},Suites0,replace)
+            end
     end.
 
 skip_cases(Node,Dir,Suite,Cases,Cmt,Tests,false) when is_list(Cases) ->
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 3c0fead5b2..e904bb1e7c 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -65,6 +65,9 @@
 
 -export([warn_duplicates/1]).
 
+-export([mark_process/0, mark_process/1, is_marked/1, is_marked/2,
+         remaining_test_procs/0]).
+
 -export([get_profile_data/0, get_profile_data/1,
 	 get_profile_data/2, open_url/3]).
 
@@ -126,6 +129,7 @@ start(Mode, LogDir, Verbosity) ->
 do_start(Parent, Mode, LogDir, Verbosity) ->
     process_flag(trap_exit,true),
     register(ct_util_server,self()),
+    mark_process(),
     create_table(?conn_table,#conn.handle),
     create_table(?board_table,2),
     create_table(?suite_table,#suite_data.key),
@@ -205,11 +209,10 @@ do_start(Parent, Mode, LogDir, Verbosity) ->
 	    self() ! {{stop,{self(),{user_error,CTHReason}}},
 		      {Parent,make_ref()}}
     catch
-	_:CTHReason ->
+	_:CTHReason:StackTrace ->
 	    ErrorInfo = if is_atom(CTHReason) ->
 				io_lib:format("{~tp,~tp}",
-					      [CTHReason,
-					       erlang:get_stacktrace()]);
+					      [CTHReason, StackTrace]);
 			   true ->
 				CTHReason
 			end,
@@ -934,6 +937,70 @@ warn_duplicates(Suites) ->
 %%% @spec
 %%%
 %%% @doc
+mark_process() ->
+    mark_process(system).
+
+mark_process(Type) ->
+    put(ct_process_type, Type).
+
+is_marked(Pid) ->
+    is_marked(Pid, system).
+
+is_marked(Pid, Type) ->
+    case process_info(Pid, dictionary) of
+        {dictionary,List} ->
+            Type == proplists:get_value(ct_process_type, List);
+        undefined ->
+            false
+    end.
+
+remaining_test_procs() ->
+    Procs = processes(),
+    {SharedGL,OtherGLs,Procs2} =
+        lists:foldl(
+          fun(Pid, ProcTypes = {Shared,Other,Procs1}) ->
+                  case is_marked(Pid, group_leader) of
+                      true ->
+                          if not is_pid(Shared) ->
+                                  case test_server_io:get_gl(true) of
+                                      Pid ->
+                                          {Pid,Other,
+                                           lists:delete(Pid,Procs1)};
+                                      _ ->
+                                          {Shared,[Pid|Other],Procs1}
+                                  end;
+                             true ->          % SharedGL already found
+                                  {Shared,[Pid|Other],Procs1}
+                          end;
+                      false ->
+                          case is_marked(Pid) of
+                              true ->
+                                  {Shared,Other,lists:delete(Pid,Procs1)};
+                              false ->
+                                  ProcTypes
+                          end
+                  end
+          end, {undefined,[],Procs}, Procs),
+
+    AllGLs = [SharedGL | OtherGLs],
+    TestProcs =
+        lists:flatmap(fun(Pid) ->
+                              case process_info(Pid, group_leader) of
+                                  {group_leader,GL} ->
+                                      case lists:member(GL, AllGLs) of
+                                          true  -> [{Pid,GL}];
+                                          false -> []
+                                      end;
+                                  undefined ->
+                                      []
+                              end
+                      end, Procs2),
+    {TestProcs, SharedGL, OtherGLs}.
+
+%%%-----------------------------------------------------------------
+%%% @spec
+%%%
+%%% @doc
 get_profile_data() ->
     get_profile_data(all).
 
diff --git a/lib/common_test/src/ct_webtool.erl b/lib/common_test/src/ct_webtool.erl
index 9016aca899..c7174b13f5 100644
--- a/lib/common_test/src/ct_webtool.erl
+++ b/lib/common_test/src/ct_webtool.erl
@@ -343,6 +343,7 @@ code_change(_,State,_)->
 % Start the gen_server
 %----------------------------------------------------------------------
 init({Path,Config})->
+    ct_util:mark_process(),
     case filelib:is_dir(Path) of
 	true ->
 	    {ok, Table} = get_tool_files_data(),
@@ -770,7 +771,7 @@ fill_out(Nr)->
 %Controls whether the user selected a tool to start
 %----------------------------------------------------------------------
 get_tools(Input)->
-    case httpd:parse_query(Input) of
+    case uri_string:dissect_query(Input) of
 	[]->
 	    no_tools;
 	 Tools->
diff --git a/lib/common_test/src/ct_webtool_sup.erl b/lib/common_test/src/ct_webtool_sup.erl
index c02ec69d04..6c6dbde0a6 100644
--- a/lib/common_test/src/ct_webtool_sup.erl
+++ b/lib/common_test/src/ct_webtool_sup.erl
@@ -46,6 +46,7 @@ stop(Pid)->
 %%          {error, Reason}   
 %%----------------------------------------------------------------------
 init(_StartArgs) ->
+    ct_util:mark_process(),
     %%Child1 = 
     %%Child2 ={webcover_backend,{webcover_backend,start_link,[]},permanent,2000,worker,[webcover_backend]},
     %%{ok,{{simple_one_for_one,5,10},[Child1]}}.
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
index 8b29d0f96d..b05f0bd28b 100644
--- a/lib/common_test/src/cth_log_redirect.erl
+++ b/lib/common_test/src/cth_log_redirect.erl
@@ -56,6 +56,7 @@ id(_Opts) ->
     ?MODULE.
 
 init(?MODULE, _Opts) ->
+    ct_util:mark_process(),
     error_logger:add_report_handler(?MODULE),
     tc_log_async.
 
@@ -121,8 +122,8 @@ handle_event({_Type,GL,_Msg}, #eh_state{handle_remote_events = false} = State)
   when node(GL) /= node() ->
     {ok, State};
 handle_event(Event, #eh_state{log_func = LogFunc} = State) ->
-    case lists:keyfind(sasl, 1, application:which_applications()) of
-	false ->
+    case whereis(sasl_sup) of
+	undefined ->
 	    sasl_not_started;
 	_Else ->
 	    {ok, ErrLogType} = application:get_env(sasl, errlog_type),
diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index 35a73e6d2e..9469619aa9 100644
--- a/lib/common_test/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -415,6 +415,7 @@ run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
     St = #st{ref=Ref,pid=Pid,mf={Mod,Func},last_known_loc=unknown,
 	     status=starting,ret_val=[],comment="",timeout=infinity,
 	     config=hd(Args)},
+    ct_util:mark_process(),
     run_test_case_msgloop(St).
 
 %% Ugly bug (pre R5A):
@@ -785,6 +786,7 @@ spawn_fw_call(Mod,IPTC={init_per_testcase,Func},CurrConf,Pid,
 	      Why,Loc,SendTo) ->
     FwCall =
 	fun() ->
+                ct_util:mark_process(),
 		Skip = {skip,{failed,{Mod,init_per_testcase,Why}}},
 		%% if init_per_testcase fails, the test case
 		%% should be skipped
@@ -815,6 +817,7 @@ spawn_fw_call(Mod,EPTC={end_per_testcase,Func},EndConf,Pid,
 	      Why,_Loc,SendTo) ->
     FwCall =
 	fun() ->
+                ct_util:mark_process(),
 		{RetVal,Report} =
 		    case proplists:get_value(tc_status, EndConf) of
 			undefined ->
@@ -864,6 +867,7 @@ spawn_fw_call(Mod,EPTC={end_per_testcase,Func},EndConf,Pid,
 spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo) ->
     FwCall =
 	fun() ->
+                ct_util:mark_process(),
 		test_server_sup:framework_call(report, [framework_error,
 							{{FwMod,FwFunc},
 							 FwError}]),
@@ -880,6 +884,7 @@ spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo) ->
     spawn_link(FwCall);
 
 spawn_fw_call(Mod,Func,CurrConf,Pid,Error,Loc,SendTo) ->
+    ct_util:mark_process(),
     {Func1,EndTCFunc} = case Func of
 			    CF when CF == init_per_suite; CF == end_per_suite;
 				    CF == init_per_group; CF == end_per_group ->
@@ -918,6 +923,7 @@ start_job_proxy() ->
 
 %% The io_reply_proxy is not the most satisfying solution but it works...
 io_reply_proxy(ReplyTo) ->
+    ct_util:mark_process(),
     receive
 	IoReply when is_tuple(IoReply),
 		     element(1, IoReply) == io_reply ->
@@ -927,6 +933,7 @@ io_reply_proxy(ReplyTo) ->
     end.
 
 job_proxy_msgloop() ->
+    ct_util:mark_process(),
     receive
 
 	%%
@@ -1333,13 +1340,12 @@ do_init_per_testcase(Mod, Args) ->
 	    {skip,Reason};
 	exit:{Skip,Reason} when Skip =:= skip; Skip =:= skipped ->
 	    {skip,Reason};
-	throw:Other ->
-	    set_loc(erlang:get_stacktrace()),
+	throw:Other:Stk ->
+	    set_loc(Stk),
 	    Line = get_loc(),
 	    print_init_conf_result(Line,"thrown",Other),
 	    {skip,{failed,{Mod,init_per_testcase,Other}}};
-	_:Reason0 ->
-	    Stk = erlang:get_stacktrace(),
+	_:Reason0:Stk ->
 	    Reason = {Reason0,Stk},
 	    set_loc(Stk),
 	    Line = get_loc(),
@@ -1388,20 +1394,19 @@ do_end_per_testcase(Mod,EndFunc,Func,Conf) ->
 	_ ->
 	    ok
     catch
-	throw:Other ->
+	throw:Other:Stk ->
 	    Comment0 = case read_comment() of
 			   ""  -> "";
 			   Cmt -> Cmt ++ test_server_ctrl:xhtml("<br>",
 								"<br />")
 		       end,
-	    set_loc(erlang:get_stacktrace()),
+	    set_loc(Stk),
 	    comment(io_lib:format("~ts<font color=\"red\">"
 				  "WARNING: ~w thrown!"
 				  "</font>\n",[Comment0,EndFunc])),
 	    print_end_tc_warning(EndFunc,Other,"thrown",get_loc()),
 	    {failed,{Mod,end_per_testcase,Other}};
-	  Class:Reason ->
-	    Stk = erlang:get_stacktrace(),
+	  Class:Reason:Stk ->
 	    set_loc(Stk),
 	    Why = case Class of
 		      exit -> {'EXIT',Reason};
@@ -1543,8 +1548,7 @@ ts_tc(M, F, A) ->
 		 throw:{skipped, Reason} -> {skip, Reason};
 		 exit:{skip, Reason} -> {skip, Reason};
 		 exit:{skipped, Reason} -> {skip, Reason};
-		 Type:Reason ->
-		     Stk = erlang:get_stacktrace(),
+		 Type:Reason:Stk ->
 		     set_loc(Stk),
 		     case Type of
 			 throw ->
@@ -1733,8 +1737,8 @@ fail(Reason) ->
     try
 	exit({suite_failed,Reason})
     catch
-	Class:R ->
-	    case erlang:get_stacktrace() of
+	Class:R:Stacktrace ->
+	    case Stacktrace of
 		[{?MODULE,fail,1,_}|Stk] -> ok;
 		Stk -> ok
 	    end,
@@ -1756,8 +1760,8 @@ fail() ->
     try
 	exit(suite_failed)
     catch
-	Class:R ->
-	    case erlang:get_stacktrace() of
+	Class:R:Stacktrace ->
+	    case Stacktrace of
 		[{?MODULE,fail,0,_}|Stk] -> ok;
 		Stk -> ok
 	    end,
@@ -1804,6 +1808,7 @@ break(CBM, TestCase, Comment) ->
 spawn_break_process(Pid, PName) ->
     spawn(fun() ->
 		  register(PName, self()),
+                  ct_util:mark_process(),
 		  receive
 		      continue -> continue(Pid);
 		      cancel -> ok
@@ -2001,6 +2006,7 @@ time_ms_apply(Func, TCPid, MultAndScale) ->
 
 user_timetrap_supervisor(Func, Spawner, TCPid, GL, T0, MultAndScale) ->
     process_flag(trap_exit, true),
+    ct_util:mark_process(),
     Spawner ! {self(),infinity},
     MonRef = monitor(process, TCPid),
     UserTTSup = self(),
@@ -2034,15 +2040,15 @@ call_user_timetrap(Func, Sup) when is_function(Func) ->
     try Func() of
 	Result -> 
 	    Sup ! {self(),Result}
-    catch _:Error ->
-	    exit({Error,erlang:get_stacktrace()})
+    catch _:Error:Stk ->
+	    exit({Error,Stk})
     end;
 call_user_timetrap({M,F,A}, Sup) ->
     try apply(M,F,A) of
 	Result -> 
 	    Sup ! {self(),Result}
-    catch _:Error ->
-	    exit({Error,erlang:get_stacktrace()})
+    catch _:Error:Stk ->
+	    exit({Error,Stk})
     end.
 
 save_user_timetrap(TCPid, UserTTSup, StartTime) ->
@@ -2571,6 +2577,7 @@ run_on_shielded_node(Fun, CArgs) when is_function(Fun), is_list(CArgs) ->
 -spec start_job_proxy_fun(_, _) -> fun(() -> no_return()).
 start_job_proxy_fun(Master, Fun) ->
     fun () ->
+            ct_util:mark_process(),
             _ = start_job_proxy(),
             receive
                 Ref ->
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index c70ea4ef9d..a76c8c12de 100644
--- a/lib/common_test/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -89,6 +89,7 @@
 -define(logdir_ext, ".logs").
 -define(data_dir_suffix, "_data/").
 -define(suitelog_name, "suite.log").
+-define(suitelog_latest_name, "suite.log.latest").
 -define(coverlog_name, "cover.html").
 -define(raw_coverlog_name, "cover.log").
 -define(cross_coverlog_name, "cross_cover.html").
@@ -1126,6 +1127,7 @@ init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels,
 	    RejectIoReqs, CreatePrivDir, TCCallback, ExtraTools) ->
     process_flag(trap_exit, true),
     _ = test_server_io:start_link(),
+    put(app, common_test),
     put(test_server_name, Name),
     put(test_server_dir, Dir),
     put(test_server_total_time, 0),
@@ -1150,6 +1152,12 @@ init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels,
     end,
 
     %% before first print, read and set logging options
+    FWLogDir =
+        case test_server_sup:framework_call(get_log_dir, [], []) of
+            {ok,FwDir} -> FwDir;
+            _          -> filename:dirname(Dir)
+        end,
+    put(test_server_framework_logdir, FWLogDir),
     LogOpts = test_server_sup:framework_call(get_logopts, [], []),
     put(test_server_logopts, LogOpts),
 
@@ -1712,6 +1720,12 @@ start_log_file() ->
     test_server_io:set_fd(html, Html),
     test_server_io:set_fd(unexpected_io, Unexpected),
 
+    %% we must assume the redirection file (to the latest suite index) can
+    %% be stored on the level above the log directory of the current test
+    TopDir = filename:dirname(get(test_server_framework_logdir)),
+    RedirectLink = filename:join(TopDir, ?suitelog_latest_name ++ ?html_ext),
+    make_html_link(RedirectLink, HtmlName, redirect),
+
     make_html_link(filename:absname(?last_test ++ ?html_ext),
 		   HtmlName, filename:basename(Dir)),
     LinkName = filename:join(Dir, ?last_link),
@@ -1740,11 +1754,18 @@ make_html_link(LinkName, Target, Explanation) ->
 	       false ->
 		   "file:" ++ uri_encode(Target)
 	   end,
-    H = [html_header(Explanation),
-	 "<h1>Last test</h1>\n"
-	 "<a href=\"",Href,"\">",Explanation,"</a>\n"
-	 "</body>\n</html>\n"],
+    H = if Explanation == redirect ->
+                Meta = ["<meta http-equiv=\"refresh\" "
+                        "content=\"0; url=", Href, "\" />\n"],
+                [html_header("redirect", Meta), "</html>\n"];
+           true ->
+                [html_header(Explanation),
+                 "<h1>Last test</h1>\n"
+                 "<a href=\"",Href,"\">",Explanation,"</a>\n"
+                 "</body>\n</html>\n"]
+        end,
     ok = write_html_file(LinkName, H).
+    
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% start_minor_log_file(Mod, Func, ParallelTC) -> AbsName
@@ -3705,6 +3726,7 @@ run_test_case(Ref, Num, Mod, Func, Args, RunInit, TimetrapData, Mode) ->
 	    spawn_link(
 	      fun() ->
 		      process_flag(trap_exit, true),
+                      ct_util:mark_process(),
 		      _ = [put(Key, Val) || {Key,Val} <- Dictionary],
 		      set_io_buffering({tc,Main}),
 		      run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
@@ -5658,6 +5680,13 @@ html_header(Title) ->
      "<body bgcolor=\"white\" text=\"black\" "
      "link=\"blue\" vlink=\"purple\" alink=\"red\">\n"].
 
+html_header(Title, Meta) ->
+    ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"
+     "<!-- autogenerated by '", atom_to_list(?MODULE), "'. -->\n"
+     "<html>\n"
+     "<head>\n"
+     "<title>", Title, "</title>\n"] ++ Meta ++ ["</head>\n"].
+
 open_html_file(File) ->
     open_utf8_file(File).
 
@@ -5710,7 +5739,7 @@ uri_encode_comp([Char|Chars],Encoding) ->
     Reserved = sets:is_element(Char, reserved()),
     case (Char>127 andalso Encoding==latin1) orelse Reserved of
 	true ->
-	    [ $% | http_util:integer_to_hexlist(Char)] ++
+	    [ $% | integer_to_list(Char, 16)] ++
 		uri_encode_comp(Chars,Encoding);
 	false ->
 	    [Char | uri_encode_comp(Chars,Encoding)]
diff --git a/lib/common_test/src/test_server_gl.erl b/lib/common_test/src/test_server_gl.erl
index ce7682d101..24dd5cd54c 100644
--- a/lib/common_test/src/test_server_gl.erl
+++ b/lib/common_test/src/test_server_gl.erl
@@ -132,6 +132,7 @@ set_props(GL, PropList) ->
 %%% Internal functions.
 
 init([TSIO]) ->
+    ct_util:mark_process(group_leader),
     EscChars = case application:get_env(test_server, esc_chars) of
 		   {ok,ECBool} -> ECBool;
 		   _           -> true
diff --git a/lib/common_test/src/test_server_io.erl b/lib/common_test/src/test_server_io.erl
index 062e3bd8ff..ef31521950 100644
--- a/lib/common_test/src/test_server_io.erl
+++ b/lib/common_test/src/test_server_io.erl
@@ -184,6 +184,7 @@ reset_state() ->
 
 init([]) ->
     process_flag(trap_exit, true),
+    ct_util:mark_process(),
     Empty = gb_trees:empty(),
     {ok,Shared} = test_server_gl:start_link(self()),
     {ok,#st{fds=Empty,shared_gl=Shared,gls=gb_sets:empty(),
@@ -262,7 +263,7 @@ handle_call(reset_state, From, #st{phase=stopping,pending_ops=Ops}=St) ->
 		 {Result,NewSt1}
 	 end,
     {noreply,St#st{pending_ops=[{From,Op}|Ops]}};
-handle_call(reset_state, _From, #st{fds=Fds,tags=Tags,gls=Gls,
+handle_call(reset_state, _From, #st{fds=Fds,tags=Tags,shared_gl=Shared0,gls=Gls,
 				    offline_buffer=OfflineBuff}) ->
     %% close open log files
     lists:foreach(fun(Tag) ->
@@ -273,6 +274,7 @@ handle_call(reset_state, _From, #st{fds=Fds,tags=Tags,gls=Gls,
 				  file:close(Fd)
 			  end
 		  end, Tags),
+    test_server_gl:stop(Shared0),
     GlList = gb_sets:to_list(Gls),
     _ = [test_server_gl:stop(GL) || GL <- GlList],
     timer:sleep(100),
@@ -320,7 +322,7 @@ handle_call(finish, From, St) ->
 
 handle_info({'EXIT',Pid,normal}, #st{gls=Gls0,stopping=From}=St) ->
     Gls = gb_sets:delete_any(Pid, Gls0),
-    case gb_sets:is_empty(Gls) andalso stopping =/= undefined of
+    case gb_sets:is_empty(Gls) andalso From =/= undefined of
 	true ->
 	    %% No more group leaders left.
 	    gen_server:reply(From, ok),
@@ -329,6 +331,9 @@ handle_info({'EXIT',Pid,normal}, #st{gls=Gls0,stopping=From}=St) ->
 	    %% Wait for more group leaders to finish.
 	    {noreply,St#st{gls=Gls,phase=stopping}}
     end;
+handle_info({'EXIT',Pid,killed}, #st{gls=Gls0}=St) ->
+    %% forced termination of group leader
+    {noreply,St#st{gls=gb_sets:delete_any(Pid, Gls0)}};
 handle_info({'EXIT',_Pid,Reason}, _St) ->
     exit(Reason);
 handle_info(stop_group_leaders, #st{gls=Gls}=St) ->
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index f0f9cea6e0..b2d4f199c3 100644
--- a/lib/common_test/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -749,6 +749,7 @@ unpack(Bin) ->
 id(I) -> I.
    
 print_data(Port) ->
+    ct_util:mark_process(),
     receive
 	{Port, {data, Bytes}} ->
 	    io:put_chars(Bytes),
diff --git a/lib/common_test/src/test_server_sup.erl b/lib/common_test/src/test_server_sup.erl
index 21f4be22fe..139621141d 100644
--- a/lib/common_test/src/test_server_sup.erl
+++ b/lib/common_test/src/test_server_sup.erl
@@ -56,6 +56,7 @@ timetrap(Timeout0, Scale, Pid) ->
 
 timetrap(Timeout0, ReportTVal, Scale, Pid) ->
     process_flag(priority, max),
+    ct_util:mark_process(),
     Timeout = if not Scale -> Timeout0;
 		 true -> test_server:timetrap_scale_factor() * Timeout0
 	      end,
@@ -773,14 +774,15 @@ framework_call(Callback,Func,Args,DefaultReturn) ->
 		false ->
 		    ok
 	    end,
+            ct_util:mark_process(),
 	    try apply(Mod,Func,Args) of
 		Result ->
 		    Result
 	    catch
 		exit:Why ->
 		    EH(Why);
-		error:Why ->
-		    EH({Why,erlang:get_stacktrace()});
+		error:Why:Stacktrace ->
+		    EH({Why,Stacktrace});
 		throw:Why ->
 		    EH(Why)
 	    end;
@@ -850,6 +852,7 @@ util_start() ->
 	undefined ->	
 	    spawn_link(fun() ->
 			       register(?MODULE, self()),
+                               put(app, common_test),
 			       util_loop(#util_state{starter=Starter})
 		       end),
 	    ok;
diff --git a/lib/common_test/src/vts.erl b/lib/common_test/src/vts.erl
index 99a109cfe8..2bf3e82ade 100644
--- a/lib/common_test/src/vts.erl
+++ b/lib/common_test/src/vts.erl
@@ -157,6 +157,7 @@ test_info(_VtsPid,Type,Data) ->
 init(Parent) ->
     register(?MODULE,self()),
     process_flag(trap_exit,true),
+    ct_util:mark_process(),
     Parent ! {self(),started},
     {ok,Cwd} = file:get_cwd(),
     InitState = #state{start_dir=Cwd},
@@ -284,6 +285,7 @@ run_test1(State=#state{tests=Tests,current_log_dir=LogDir,
 		       logopts=LogOpts}) ->
     Self=self(),
     RunTest = fun() ->
+                      ct_util:mark_process(),
 		      case ct_run:do_run(Tests,[],LogDir,LogOpts) of
 			  {error,_Reason} ->
 			      aborted();
@@ -917,7 +919,7 @@ get_input_data(Input,Key)->
     end.
 
 parse(Input) ->
-    httpd:parse_query(Input).
+    uri_string:dissect_query(Input).
 
 vts_integer_to_list(X) when is_atom(X) ->
     atom_to_list(X);
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index 0d9149f489..ecd1f727a2 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -73,7 +73,8 @@ MODULES= \
 	ct_log_SUITE \
         ct_SUITE \
 	ct_keep_logs_SUITE \
-	ct_unicode_SUITE
+	ct_unicode_SUITE \
+	ct_auto_clean_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 HRL_FILES= test_server_test_lib.hrl
diff --git a/lib/common_test/test/ct_auto_clean_SUITE.erl b/lib/common_test/test/ct_auto_clean_SUITE.erl
new file mode 100644
index 0000000000..fd81430d0d
--- /dev/null
+++ b/lib/common_test/test/ct_auto_clean_SUITE.erl
@@ -0,0 +1,262 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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(ct_auto_clean_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) -> Config1 | {skip,Reason}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the suite.
+%%
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    DataDir = ?config(data_dir, Config),
+    CTHs = filelib:wildcard(filename:join(DataDir,"cth_*.erl")),
+    ct:pal("CTHs: ~p",[CTHs]),
+    [ct:pal("Compiling ~p: ~p",
+	    [FileName,compile:file(FileName,[{outdir,DataDir},debug_info])]) ||
+	FileName <- CTHs],
+    ct_test_support:init_per_suite([{path_dirs,[DataDir]} | Config]).
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config) -> void()
+%%
+%% Config = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%%
+%% Description: Cleanup after the suite.
+%%--------------------------------------------------------------------
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) -> Config1 |
+%%                                                   {skip,Reason}
+%% TestCase = atom()
+%%   Name of the test case that is about to run.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the test case.
+%%
+%% Description: Initialization before each test case.
+%%
+%% Note: This function is free to add any key/value pairs to the Config
+%% variable, but should NOT alter/remove any existing entries.
+%%--------------------------------------------------------------------
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config) -> void()
+%%
+%% TestCase = atom()
+%%   Name of the test case that is finished.
+%% Config = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%%
+%% Description: Cleanup after each test case.
+%%--------------------------------------------------------------------
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+%%--------------------------------------------------------------------
+%% Function: all(Clause) -> Descr | TestCases | {skip,Reason}
+%%
+%% Clause = doc | suite
+%%   Indicates expected return value.
+%% Descr = [string()] | []
+%%   String that describes the test suite.
+%% TestCases = [TestCase] 
+%% TestCase = atom()
+%%   Name of a test case.
+%% Reason = term()
+%%   The reason for skipping the test suite.
+%%
+%% Description: Returns a description of the test suite (doc) and a
+%%              list of all test cases in the suite (suite).
+%%--------------------------------------------------------------------
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [clean].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Function: TestCase(Arg) -> Descr | Spec | ok | exit() | {skip,Reason}
+%%
+%% Arg = doc | suite | Config
+%%   Indicates expected behaviour and return value.
+%% Config = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Descr = [string()] | []
+%%   String that describes the test case.
+%% Spec = [tuple()] | []
+%%   A test specification.
+%% Reason = term()
+%%   The reason for skipping the test case.
+%%
+%% Description: Test case function. Returns a description of the test
+%%              case (doc), then returns a test specification (suite),
+%%              or performs the actual test (Config).
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%% 
+
+clean(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+
+    ACSuite = filename:join(DataDir, "ac_SUITE"),
+    Opts0 = ct_test_support:get_opts(Config),
+    Opts = eh_opts(Config) ++ Opts0 ++ [{suite,ACSuite},
+                                        {ct_hooks,[cth_auto_clean]}],
+
+    ERPid = ct_test_support:start_event_receiver(Config),
+
+    ok = ct_test_support:run(Opts, Config),
+
+    Events = ct_test_support:get_events(ERPid, Config),
+    ct_test_support:log_events(?FUNCTION_NAME, 
+			       ct_test_support:reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+    TestEvents = events_to_check(?FUNCTION_NAME),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+eh_opts(Config) ->        
+    Level = ?config(trace_level, Config),
+    [{event_handler,{?eh,[{cbm,ct_test_support},{trace_level,Level}]}}].
+
+events_to_check(Test) ->
+    %% 2 tests (ct:run_test + script_start) is default
+    events_to_check(Test, 2).
+
+events_to_check(_, 0) ->
+    [];
+events_to_check(Test, N) ->
+    events(Test) ++ events_to_check(Test, N-1).
+
+events(clean) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,9}},
+
+     {?eh,tc_start,{ac_SUITE,init_per_suite}},
+     {?eh,tc_done,{ac_SUITE,init_per_suite,ok}},
+
+     {?eh,tc_start,{ac_SUITE,tc1}},
+     {?eh,tc_done,{ac_SUITE,tc1,ok}},
+
+     {?eh,test_stats,{1,0,{0,0}}},
+
+     {?eh,tc_start,{ac_SUITE,tc2}},
+     {?eh,tc_done,{ac_SUITE,tc2,ok}},
+
+     {?eh,test_stats,{2,0,{0,0}}},
+
+     [{?eh,tc_start,{ac_SUITE,{init_per_group,s1,[]}}},
+      {?eh,tc_done,{ac_SUITE,{init_per_group,s1,[]},ok}},
+
+      {?eh,tc_start,{ac_SUITE,stc1}},
+      {?eh,tc_done,{ac_SUITE,stc1,ok}},
+
+      {?eh,test_stats,{3,0,{0,0}}},
+
+      {?eh,tc_start,{ac_SUITE,stc2}},
+      {?eh,tc_done,{ac_SUITE,stc2,ok}},
+
+      {?eh,test_stats,{4,0,{0,0}}},
+
+      {?eh,tc_start,{ac_SUITE,{end_per_group,s1,[]}}},
+      {?eh,tc_done,{ac_SUITE,{end_per_group,s1,[]},ok}}],
+
+     {parallel,
+      [{?eh,tc_start,{ac_SUITE,{init_per_group,p1,[parallel]}}},
+       {?eh,tc_done,{ac_SUITE,{init_per_group,p1,[parallel]},ok}},
+
+       {?eh,tc_start,{ac_SUITE,ptc1}},
+       {?eh,tc_start,{ac_SUITE,ptc2}},
+       {?eh,tc_done,{ac_SUITE,ptc1,ok}},
+       {?eh,test_stats,{5,0,{0,0}}},
+       {?eh,tc_done,{ac_SUITE,ptc2,ok}},
+       {?eh,test_stats,{6,0,{0,0}}},
+
+       {?eh,tc_start,{ac_SUITE,{end_per_group,p1,[parallel]}}},
+       {?eh,tc_done,{ac_SUITE,{end_per_group,p1,[parallel]},ok}}]},
+
+     [{?eh,tc_start,{ac_SUITE,{init_per_group,s2,[]}}},
+      {?eh,tc_done,{ac_SUITE,{init_per_group,s2,[]},ok}},
+
+      {?eh,tc_start,{ac_SUITE,stc1}},
+      {?eh,tc_done,{ac_SUITE,stc1,ok}},
+
+      {?eh,test_stats,{7,0,{0,0}}},
+
+      {?eh,tc_start,{ac_SUITE,stc2}},
+      {?eh,tc_done,{ac_SUITE,stc2,ok}},
+
+      {?eh,test_stats,{8,0,{0,0}}},
+
+      {?eh,tc_start,{ac_SUITE,{end_per_group,s2,[]}}},
+      {?eh,tc_done,{ac_SUITE,{end_per_group,s2,[]},ok}}],
+
+     {?eh,tc_start,{ac_SUITE,tc1}},
+     {?eh,tc_done,{ac_SUITE,tc1,ok}},
+
+     {?eh,test_stats,{9,0,{0,0}}},
+
+     {?eh,tc_start,{ac_SUITE,end_per_suite}},
+     {?eh,tc_done,{ac_SUITE,end_per_suite,ok}},
+
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
diff --git a/lib/common_test/test/ct_auto_clean_SUITE_data/ac_SUITE.erl b/lib/common_test/test/ct_auto_clean_SUITE_data/ac_SUITE.erl
new file mode 100644
index 0000000000..dae7c1e22c
--- /dev/null
+++ b/lib/common_test/test/ct_auto_clean_SUITE_data/ac_SUITE.erl
@@ -0,0 +1,181 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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(ac_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% @spec suite() -> Info
+%% Info = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+%%--------------------------------------------------------------------
+%% @spec init_per_suite(Config0) ->
+%%     Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    start_processes(),
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_suite(Config0) -> term() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    start_processes(),
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    start_processes(),
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_group(GroupName, Config0) ->
+%%               term() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    start_processes(),
+    ok.
+                    
+%%--------------------------------------------------------------------
+%% @spec init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    start_processes(),
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_testcase(TestCase, Config0) ->
+%%               term() | {save_config,Config1} | {fail,Reason}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    start_processes(),
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%% @end
+%%--------------------------------------------------------------------
+groups() ->
+    [{s1,[],[stc1,stc2]},
+     {p1,[parallel],[ptc1,ptc2]},
+     {s2,[],[stc1,stc2]}].
+
+%%! What about nested groups??
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() -> 
+    [
+     [tc1,tc2],
+     {group,s1},
+     {group,p1},
+     {group,s2},
+     tc1
+    ].
+
+tc1(_Config) ->
+    start_processes(),
+    ok.
+
+tc2(_Config) ->
+    start_processes(),
+    ok.
+
+stc1(_Config) ->
+    start_processes(),
+    ok.
+
+stc2(_Config) ->
+    start_processes(),
+    ok.
+
+ptc1(_Config) ->
+    start_processes(),
+    ok.
+
+ptc2(_Config) ->
+    start_processes(),
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% 
+
+start_processes() ->
+    Init = fun() ->
+                   process_flag(trap_exit, true),
+                   do_spawn(fun() -> receive _ -> ok end end),
+                   receive _ ->
+                           ok
+                   end
+           end,
+    do_spawn(Init).
+
+do_spawn(Fun) ->
+    Pid = spawn(Fun),
+    ct:log("Process ~w started with group leader ~w",
+           [Pid,element(2, process_info(Pid, group_leader))]),
+    Pid.
diff --git a/lib/common_test/test/ct_auto_clean_SUITE_data/cth_auto_clean.erl b/lib/common_test/test/ct_auto_clean_SUITE_data/cth_auto_clean.erl
new file mode 100644
index 0000000000..137c81969d
--- /dev/null
+++ b/lib/common_test/test/ct_auto_clean_SUITE_data/cth_auto_clean.erl
@@ -0,0 +1,214 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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(cth_auto_clean).
+
+%% CTH Callbacks
+-export([id/1, init/2,
+	 pre_init_per_suite/3, post_init_per_suite/4,
+         pre_end_per_suite/3, post_end_per_suite/4,
+	 pre_init_per_group/4, post_init_per_group/5,
+	 pre_end_per_group/4, post_end_per_group/5,
+	 pre_init_per_testcase/4, post_init_per_testcase/5,
+	 pre_end_per_testcase/4, post_end_per_testcase/5]).
+
+id(_Opts) ->
+    ?MODULE.
+
+init(?MODULE, _Opts) ->
+    ok.
+
+pre_init_per_suite(_Suite, Config, State) ->
+    identify(?FUNCTION_NAME),
+    SharedGL = test_server_io:get_gl(true),
+    SharedGL = find_and_kill(),
+    do_until(fun() -> ct:remaining_test_procs() end, {[],SharedGL,[]}),
+    %% get status of processes at startup, to be compared with end result
+    {Config, [{all_procs,processes()} | State]}.
+
+post_init_per_suite(_Suite, _Config, Return, State) ->
+    identify(?FUNCTION_NAME),
+    SharedGL = find_and_kill(),
+    do_until(fun() -> ct:remaining_test_procs() end, {[],SharedGL,[]}),
+    {Return, State}.
+
+pre_end_per_suite(_Suite, Config, State) ->
+    identify(?FUNCTION_NAME),
+    SharedGL = find_and_kill(),
+    do_until(fun() -> ct:remaining_test_procs() end, {[],SharedGL,[]}),
+    {Config, State}.
+
+post_end_per_suite(_Suite, _Config, Return, State) ->
+    identify(?FUNCTION_NAME),
+    SharedGL = find_and_kill(),
+    do_until(fun() -> ct:remaining_test_procs() end, {[],SharedGL,[]}),
+    AllProcs = processes(),
+    Remaining = AllProcs--proplists:get_value(all_procs, State),
+    ct:pal("Final remaining processes = ~p", [Remaining]),
+    %% only the end_per_suite process shoud remain at this point!
+    Remaining = [self()],
+    {Return, State}.
+
+pre_init_per_group(_Suite, _Group, Config, State) ->
+    identify(?FUNCTION_NAME),
+    SharedGL = find_and_kill(procs_and_gls),
+    do_until(fun() -> ct:remaining_test_procs() end, {[],SharedGL,[]}),
+    {Config, State}.
+
+post_init_per_group(_Suite, _Group, _Config, Result, State) -> 
+    identify(?FUNCTION_NAME),
+    SharedGL = find_and_kill(procs_and_gls),
+    do_until(fun() -> ct:remaining_test_procs() end, {[],SharedGL,[]}),
+    {Result, State}.
+
+pre_init_per_testcase(_Suite, _TC, Config, State) ->
+    identify(?FUNCTION_NAME),
+    ThisGL = group_leader(),
+    find_and_kill(proc, ThisGL),
+    case proplists:get_value(tc_group_properties, Config) of
+        [{name,_},parallel] ->
+            timer:sleep(1000);
+        _ ->
+            do_until(fun() -> element(1,ct:remaining_test_procs()) end, [])
+    end,
+    {Config, State}.
+
+post_init_per_testcase(_Suite, _TC, Config, Return, State) ->
+    identify(?FUNCTION_NAME),
+    ThisGL = group_leader(),
+    find_and_kill(proc, ThisGL),
+    case proplists:get_value(tc_group_properties, Config) of
+        [{name,_},parallel] ->
+            timer:sleep(1000);
+        _ ->
+            do_until(fun() -> element(1,ct:remaining_test_procs()) end, [])
+    end,
+    {Return, State}.
+
+pre_end_per_testcase(_Suite, _TC, Config, State) ->
+    identify(?FUNCTION_NAME),
+    ThisGL = group_leader(),
+    find_and_kill(proc, ThisGL),
+    case proplists:get_value(tc_group_properties, Config) of
+        [{name,_},parallel] ->
+            timer:sleep(1000);
+        _ ->
+            do_until(fun() -> element(1,ct:remaining_test_procs()) end, [])
+    end,
+    {Config, State}.
+
+post_end_per_testcase(_Suite, _TC, Config, Result, State) ->
+    identify(?FUNCTION_NAME),
+    ThisGL = group_leader(),
+    find_and_kill(proc, ThisGL),
+    case proplists:get_value(tc_group_properties, Config) of
+        [{name,_},parallel] ->
+            timer:sleep(1000);
+        _ ->
+            do_until(fun() -> element(1,ct:remaining_test_procs()) end, [])
+    end,
+    {Result, State}.
+
+pre_end_per_group(_Suite, _Group, Config, State) ->
+    identify(?FUNCTION_NAME),
+    SharedGL = find_and_kill(procs_and_gls),
+    do_until(fun() -> ct:remaining_test_procs() end, {[],SharedGL,[]}),
+    {Config, State}.
+
+post_end_per_group(_Suite, _Group, _Config, Return, State) ->
+    identify(?FUNCTION_NAME),
+    SharedGL = find_and_kill(procs_and_gls),
+    do_until(fun() -> ct:remaining_test_procs() end, {[],SharedGL,[]}),
+    {Return, State}.
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+identify(Func) ->
+    ct:pal("********** THIS IS ~w on ~w", [Func, self()]),
+    ok.
+
+find_and_kill() ->
+    find_and_kill(procs).
+
+find_and_kill(procs) ->
+    {Procs,SharedGL,_ParallelGLs} = ct:remaining_test_procs(),
+    ct:pal("Remaining test processes = ~p", [pi(Procs)]),
+    [pkill(P, kill) || {P,_GL} <- Procs],
+    SharedGL;
+
+find_and_kill(procs_and_gls) ->
+    {Procs,SharedGL,GLs} = ct:remaining_test_procs(),
+    ct:pal("Remaining test processes = ~p", [pi(Procs)]),
+    [pkill(P, kill) || {P,_GL} <- Procs],
+    ct:pal("Remaining group leaders = ~p", [pi(GLs)]),
+    [pkill(GL, kill) || GL <- GLs, GL /= SharedGL],
+    SharedGL.
+
+find_and_kill(proc, ProcGL) ->
+    {Procs,SharedGL,GLs} = ct:remaining_test_procs(),
+    ct:pal("Remaining test processes = ~p", [pi(Procs++GLs)]),
+    [pkill(P, kill) || {P,GL} <- Procs, GL == ProcGL],
+    SharedGL.
+
+pi([{P,_GL}|Ps]) ->
+    pi([P|Ps]);
+pi([P|Ps]) ->
+    case node() == node(P) of
+        true ->
+            {_,GL} = process_info(P,group_leader),
+            {_,CF} = process_info(P,current_function),
+            {_,IC} = process_info(P,initial_call),
+            {_,D} = process_info(P,dictionary),
+            Shared = test_server_io:get_gl(true),
+            User = whereis(user),
+            if (GL /= P) and (GL /= Shared) and (GL /= User) ->
+                    [{P,GL,CF,IC,D} | pi([GL|Ps])];
+               true ->
+                    [{P,GL,CF,IC,D} | pi(Ps)]
+            end;
+        false ->
+            pi(Ps)
+    end;
+pi([]) ->
+    [].
+
+do_until(Fun, Until) ->
+    io:format("Will do until ~p~n", [Until]),
+    do_until(Fun, Until, 1000).
+
+do_until(_, Until, 0) ->
+    io:format("Couldn't get ~p~n", [Until]),
+    exit({not_reached,Until});
+
+do_until(Fun, Until, N) ->
+    case Fun() of
+        Until ->
+            ok;
+        _Tmp ->
+            do_until(Fun, Until, N-1)
+    end.
+
+pkill(P, How) ->
+    ct:pal("KILLING ~w NOW!", [P]),
+    exit(P, How).
+
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
index 63bf9be134..975f6cafcb 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -231,8 +231,7 @@ data_for_channel(CM, Ch, Data, State) ->
 		    {ok, NewState}
 	    end
     catch
-	Class:Reason ->
-	    Stacktrace = erlang:get_stacktrace(),
+	Class:Reason:Stacktrace ->
 	    error_logger:error_report([{?MODULE, data_for_channel},
 				       {request, Data},
 				       {buffer, State#session.buffer},
diff --git a/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl b/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl
index 993452500e..041c13cdbd 100644
--- a/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl
+++ b/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl
@@ -77,7 +77,7 @@ all() ->
 
 'fail_αβ_4'(_Config) ->
     ct:log("This is test case ~tw",[?FUNCTION_NAME]),
-    S = try throw(ok) catch throw:ok -> erlang:get_stacktrace() end,
+    S = try throw(ok) catch throw:ok:Stacktrace -> Stacktrace end,
     erlang:raise(error,{error,testcase,?FUNCTION_NAME},S),
     ok.
 
diff --git a/lib/common_test/test/test_server_test_lib.erl b/lib/common_test/test/test_server_test_lib.erl
index e3d987a2ea..9ee946af0b 100644
--- a/lib/common_test/test/test_server_test_lib.erl
+++ b/lib/common_test/test/test_server_test_lib.erl
@@ -121,7 +121,7 @@ parse_suite(FileName) ->
     end.
 
 fline(Fd) ->
-    case prim_file:read_line(Fd) of
+    case file:read_line(Fd) of
 	eof -> eof;
 	{ok, Line} -> Line
     end.
diff --git a/lib/common_test/test_server/ts_install_cth.erl b/lib/common_test/test_server/ts_install_cth.erl
index 5d325b1115..35a5ec916c 100644
--- a/lib/common_test/test_server/ts_install_cth.erl
+++ b/lib/common_test/test_server/ts_install_cth.erl
@@ -108,8 +108,7 @@ pre_init_per_suite(_Suite,Config,State) ->
 	{add_node_name(Config, State), State}
     catch error:{badmatch,{error,enoent}} ->
 	{add_node_name(Config, State), State};
-	  Error:Reason ->
-	    Stack = erlang:get_stacktrace(),
+	  Error:Reason:Stack ->
 	    ct:pal("~p failed! ~p:{~p,~p}",[?MODULE,Error,Reason,Stack]),
 	    {{fail,{?MODULE,{Error,Reason, Stack}}},State}
     end.
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index 7b959ebfe3..96fdc89853 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.15.2
+COMMON_TEST_VSN = 1.15.3
diff --git a/lib/compiler/doc/src/Makefile b/lib/compiler/doc/src/Makefile
index 254445c111..13210de040 100644
--- a/lib/compiler/doc/src/Makefile
+++ b/lib/compiler/doc/src/Makefile
@@ -39,7 +39,7 @@ XML_APPLICATION_FILES = ref_man.xml
 XML_REF3_FILES = compile.xml
 
 XML_PART_FILES =
-XML_CHAPTER_FILES = notes.xml notes_history.xml
+XML_CHAPTER_FILES = notes.xml
 
 BOOK_FILES = book.xml
 
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index b398871ddf..06afc55c07 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -233,6 +233,15 @@ module.beam: module.erl \
   header.hrl</code>
           </item>
 
+          <tag><c>makedep_side_effect</c></tag>
+          <item>
+	    <p>The dependecies are created as a side effect to the
+	    normal compilation process. This means that the object
+	    file will also be produced. This option override the
+	    <c>makedep</c> option.
+	    </p>
+	  </item>
+
           <tag><c>{makedep_output, Output}</c></tag>
           <item>
             <p>Writes generated rules to <c>Output</c> instead of the
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 433fc3b86e..f4a3f9875b 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,22 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 7.1.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The '<c>deterministic</c>' option was not recognized
+	    when given in a <c>-compile()</c> attribute in the source
+	    code.</p>
+          <p>
+	    Own Id: OTP-14773 Aux Id: ERL-498 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 7.1.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -510,6 +526,22 @@
 
 </section>
 
+
+<section><title>Compiler 6.0.3.1</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fail labels on guard BIFs weren't taken into account
+	    during an optimization pass, and a bug in the validation
+	    pass sometimes prevented this from being noticed when a
+	    fault occurred.</p>
+          <p>
+	    Own Id: OTP-14522 Aux Id: ERIERL-48 </p>
+        </item>
+      </list>
+    </section>
+</section>
+
 <section><title>Compiler 6.0.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/internal_doc/cerl-notes.md b/lib/compiler/internal_doc/cerl-notes.md
new file mode 100644
index 0000000000..705fe8f42d
--- /dev/null
+++ b/lib/compiler/internal_doc/cerl-notes.md
@@ -0,0 +1,75 @@
+Some notes on the cerl modules
+==============================
+
+Maps in cerl_clauses:match/3
+----------------------------
+
+Not much optimization is done for maps in `cerl_clauses:match/3`.
+
+The reason is that the inliner (`cerl_inline`) was not designed for
+data types that depend on variables bound in the enclosing environment
+(for example, the keys for maps).  If we attempt to extend the
+optimizations for maps similar to the optimizations for the other data
+types, the inliner will crash for certain code.  Here is an example of
+code that would crash the inliner:
+
+     t() ->
+        f(key).
+
+     f(K) ->
+        case #{K => value} of
+          #{key := V} -> V
+        end.
+
+The reason for the crash is that the inliner works in several
+passes and calls `cerl_clauses:match/3` twice.  The inliner will
+assume that the same result will be returned both times, but
+for this example different bindings will be returned.
+
+Here is the rough outline of what happens:
+
+* The first time `cerl_clauses:match/3` will be asked to match the
+pattern `#{K := V}` against `#{key => value}`. It cannot say more
+than that the pattern *may* match.
+
+* Now the inliner will add the bindings to body of the clause (which
+is simply `V`).  In this case, the bindings are still empty, so
+nothing is added.
+
+* The inliner will now do some substitutions and renaming.  The
+variable `K` will be replaced with `key`.
+
+* The next time `cerl_clauses:match/3` is called, it will be asked to
+match the pattern `#{key := V}` against `#{key => value#}`.  In this
+case, there will be a match and the bindings can be extended with
+`{V,value}`.
+
+* The inliner will see that the entire case can be removed.  Only
+the body for the clause needs to be kept.
+
+Thus, after inlining the function `t/0` will look like this:
+
+     t() ->
+        V.
+
+The problem here is that the inliner assumed that the bindings from
+the first and second call to `cer_clauses:match/3` would be the same.
+It used the empty bindings from the first call for the body.
+
+The correct way would be to add the bindings from the second call:
+
+     t() ->
+        let V = value in V.
+
+### How to fix this ###
+
+The inliner will need to call `cerl_clauses:match/3` after doing
+all substitutions and renaming.  It is not clear to me how difficult
+that would be.  I assume that the inliner is written the way it is
+for a good reason.  That means that switching the order things are
+done would lead to correctness and/or performance problems.
+
+### What must also be done to fix this ###
+
+`cerl_inline:make_template/3` must be extended to create a template
+for maps.  That is relatively straightforward.
diff --git a/lib/compiler/src/beam_a.erl b/lib/compiler/src/beam_a.erl
index cdb32d5d55..91acb19971 100644
--- a/lib/compiler/src/beam_a.erl
+++ b/lib/compiler/src/beam_a.erl
@@ -42,8 +42,7 @@ function({function,Name,Arity,CLabel,Is0}) ->
 	Is = beam_jump:remove_unused_labels(Is1),
 	{function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -59,8 +58,17 @@ rename_instrs([{call_only,A,F}|Is]) ->
 rename_instrs([{call_ext_only,A,F}|Is]) ->
     [{call_ext,A,F},return|rename_instrs(Is)];
 rename_instrs([{'%live',_}|Is]) ->
-    %% When compiling from old .S files.
+    %% Ignore old type of live annotation. Only happens when compiling
+    %% from very old .S files.
     rename_instrs(Is);
+rename_instrs([{get_list,S,D1,D2}|Is]) ->
+    %% Only happens when compiling from old .S files.
+    if
+        D1 =:= S ->
+            [{get_tl,S,D2},{get_hd,S,D1}|rename_instrs(Is)];
+        true ->
+            [{get_hd,S,D1},{get_tl,S,D2}|rename_instrs(Is)]
+    end;
 rename_instrs([I|Is]) ->
     [rename_instr(I)|rename_instrs(Is)];
 rename_instrs([]) -> [].
diff --git a/lib/compiler/src/beam_asm.erl b/lib/compiler/src/beam_asm.erl
index 9ecbb7884c..5ef340c831 100644
--- a/lib/compiler/src/beam_asm.erl
+++ b/lib/compiler/src/beam_asm.erl
@@ -24,7 +24,7 @@
 -export([module/4]).
 -export([encode/2]).
 
--export_type([fail/0,label/0,reg/0,src/0,module_code/0,function_name/0]).
+-export_type([fail/0,label/0,reg/0,reg_num/0,src/0,module_code/0,function_name/0]).
 
 -import(lists, [map/2,member/2,keymember/3,duplicate/2,splitwith/2]).
 -include("beam_opcodes.hrl").
@@ -240,9 +240,7 @@ build_form(Id, Chunks0) when byte_size(Id) =:= 4, is_list(Chunks0) ->
 
 chunk(Id, Contents) when byte_size(Id) =:= 4, is_binary(Contents) ->
     Size = byte_size(Contents),
-    [<<Id/binary,Size:32>>,Contents|pad(Size)];
-chunk(Id, Contents) when is_list(Contents) ->
-    chunk(Id, list_to_binary(Contents)).
+    [<<Id/binary,Size:32>>,Contents|pad(Size)].
 
 %% Build a correctly padded chunk (with a sub-header).
 
@@ -409,7 +407,17 @@ encode_arg({atom, Atom}, Dict0) when is_atom(Atom) ->
     {Index, Dict} = beam_dict:atom(Atom, Dict0),
     {encode(?tag_a, Index), Dict};
 encode_arg({integer, N}, Dict) ->
-    {encode(?tag_i, N), Dict};
+    %% Conservatily assume that all integers whose absolute
+    %% value is greater than 1 bsl 128 will be bignums in
+    %% the runtime system.
+    if
+        N >= 1 bsl 128 ->
+            encode_arg({literal, N}, Dict);
+        N =< -(1 bsl 128) ->
+            encode_arg({literal, N}, Dict);
+        true ->
+            {encode(?tag_i, N), Dict}
+    end;
 encode_arg(nil, Dict) ->
     {encode(?tag_a, 0), Dict};
 encode_arg({f, W}, Dict) ->
@@ -467,7 +475,7 @@ encode_alloc_list_1([{floats,Floats}|T], Dict, Acc0) ->
 encode_alloc_list_1([], Dict, Acc) ->
     {iolist_to_binary(Acc),Dict}.
 
--spec encode(non_neg_integer(), pos_integer()) -> iodata().
+-spec encode(non_neg_integer(), integer()) -> iodata().
 
 encode(Tag, N) when N < 0 ->
     encode1(Tag, negative_to_bytes(N));
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index 6543e05e20..8cd271e1dc 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -23,30 +23,36 @@
 -module(beam_block).
 
 -export([module/2]).
--import(lists, [reverse/1,reverse/2,foldl/3,member/2]).
+-import(lists, [reverse/1,reverse/2,member/2]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_utils:module_code()}.
 
-module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
-    Fs = [function(F) || F <- Fs0],
+module({Mod,Exp,Attr,Fs0,Lc}, Opts) ->
+    Blockify = not member(no_blockify, Opts),
+    Fs = [function(F, Blockify) || F <- Fs0],
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
-function({function,Name,Arity,CLabel,Is0}) ->
+function({function,Name,Arity,CLabel,Is0}, Blockify) ->
     try
 	%% Collect basic blocks and optimize them.
-	Is1 = blockify(Is0),
-	Is2 = embed_lines(Is1),
-	Is3 = move_allocates(Is2),
-	Is4 = beam_utils:live_opt(Is3),
-	Is5 = opt_blocks(Is4),
-	Is6 = beam_utils:delete_live_annos(Is5),
-
-	%% Done.
-	{function,Name,Arity,CLabel,Is6}
+        Is1 = case Blockify of
+                  false -> Is0;
+                  true -> blockify(Is0)
+              end,
+        Is2 = embed_lines(Is1),
+        Is3 = local_cse(Is2),
+        Is4 = beam_utils:anno_defs(Is3),
+        Is5 = move_allocates(Is4),
+        Is6 = beam_utils:live_opt(Is5),
+        Is7 = opt_blocks(Is6),
+        Is8 = beam_utils:delete_annos(Is7),
+        Is = opt_allocs(Is8),
+
+        %% Done.
+        {function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -102,7 +108,8 @@ collect({put_tuple,A,D})     -> {set,[D],[],{put_tuple,A}};
 collect({put,S})             -> {set,[],[S],put};
 collect({get_tuple_element,S,I,D}) -> {set,[D],[S],{get_tuple_element,I}};
 collect({set_tuple_element,S,D,I}) -> {set,[],[S,D],{set_tuple_element,I}};
-collect({get_list,S,D1,D2})  -> {set,[D1,D2],[S],get_list};
+collect({get_hd,S,D})  ->       {set,[D],[S],get_hd};
+collect({get_tl,S,D})  ->       {set,[D],[S],get_tl};
 collect(remove_message)      -> {set,[],[],remove_message};
 collect({put_map,F,Op,S,D,R,{list,Puts}}) ->
     {set,[D],[S|Puts],{alloc,R,{put_map,Op,F}}};
@@ -130,23 +137,27 @@ embed_lines([{block,B2},{line,_}=Line,{block,B1}|T], Acc) ->
 embed_lines([{block,B1},{line,_}=Line|T], Acc) ->
     B = {block,[{set,[],[],Line}|B1]},
     embed_lines([B|T], Acc);
+embed_lines([{block,B2},{block,B1}|T], Acc) ->
+    %% This can only happen when beam_block is run for
+    %% the second time.
+    B = {block,B1++B2},
+    embed_lines([B|T], Acc);
 embed_lines([I|Is], Acc) ->
     embed_lines(Is, [I|Acc]);
 embed_lines([], Acc) -> Acc.
 
 opt_blocks([{block,Bl0}|Is]) ->
     %% The live annotation at the beginning is not useful.
-    [{'%live',_,_}|Bl] = Bl0,
+    [{'%anno',_}|Bl] = Bl0,
     [{block,opt_block(Bl)}|opt_blocks(Is)];
 opt_blocks([I|Is]) ->
     [I|opt_blocks(Is)];
 opt_blocks([]) -> [].
 
 opt_block(Is0) ->
-    Is = find_fixpoint(fun(Is) ->
-			       opt_tuple_element(opt(Is))
-		       end, Is0),
-    opt_alloc(Is).
+    find_fixpoint(fun(Is) ->
+                          opt_tuple_element(opt(Is))
+                  end, Is0).
 
 find_fixpoint(OptFun, Is0) ->
     case OptFun(Is0) of
@@ -173,7 +184,7 @@ find_fixpoint(OptFun, Is0) ->
 %%  safe to assume that if x(N) is initialized, then all lower-numbered
 %%  x registers are also initialized.
 %%
-%%  For example, in general it is not safe to transform the following
+%%  For example, we must be careful when transforming the following
 %%  instructions:
 %%
 %%     get_tuple_element x(0) Element => x(1)
@@ -185,13 +196,9 @@ find_fixpoint(OptFun, Is0) ->
 %%     get_tuple_element x(0) Element => x(1)
 %%
 %%  The transformation is safe if and only if x(1) has been
-%%  initialized previously. Unfortunately, beam_reorder may have moved
-%%  a get_tuple_element instruction so that x(1) is not always
-%%  initialized when this code is reached. To find whether or not x(1)
-%%  is initialized, we would need to analyze all code preceding these
-%%  two instructions (across branches). Since we currently don't have
-%%  any practical mechanism for doing that, we will have to
-%%  conservatively assume that the transformation is unsafe.
+%%  initialized previously.  We will use the annotations added by
+%%  beam_utils:anno_defs/1 to determine whether x(a) has been
+%%  initialized.
 
 move_allocates([{block,Bl0}|Is]) ->
     Bl = move_allocates_1(reverse(Bl0), []),
@@ -200,40 +207,77 @@ move_allocates([I|Is]) ->
     [I|move_allocates(Is)];
 move_allocates([]) -> [].
 
-move_allocates_1([I|Is], [{set,[],[],{alloc,Live0,Info}}|Acc]=Acc0) ->
-    case {alloc_may_pass(I),alloc_live_regs(I, Live0)} of
-	{false,_} ->
-	    move_allocates_1(Is, [I|Acc0]);
-	{true,not_possible} ->
-	    move_allocates_1(Is, [I|Acc0]);
-	{true,Live} when is_integer(Live) ->
-	    A = {set,[],[],{alloc,Live,Info}},
-	    move_allocates_1(Is, [A,I|Acc])
+move_allocates_1([{'%anno',_}|Is], Acc) ->
+    move_allocates_1(Is, Acc);
+move_allocates_1([I|Is], [{set,[],[],{alloc,Live0,Info0}}|Acc]=Acc0) ->
+    case alloc_may_pass(I) of
+        false ->
+            move_allocates_1(Is, [I|Acc0]);
+        true ->
+            case alloc_live_regs(I, Is, Live0) of
+                not_possible ->
+                    move_allocates_1(Is, [I|Acc0]);
+                Live when is_integer(Live) ->
+                    Info = safe_info(Info0),
+                    A = {set,[],[],{alloc,Live,Info}},
+                    move_allocates_1(Is, [A,I|Acc])
+            end
     end;
 move_allocates_1([I|Is], Acc) ->
     move_allocates_1(Is, [I|Acc]);
 move_allocates_1([], Acc) -> Acc.
 
+alloc_may_pass({set,_,[{fr,_}],fmove}) -> false;
 alloc_may_pass({set,_,_,{alloc,_,_}}) -> false;
 alloc_may_pass({set,_,_,{set_tuple_element,_}}) -> false;
 alloc_may_pass({set,_,_,put_list}) -> false;
 alloc_may_pass({set,_,_,put}) -> false;
 alloc_may_pass({set,_,_,_}) -> true.
-    
+
+safe_info({nozero,Stack,Heap,_}) ->
+    %% nozero is not safe if the allocation instruction is moved
+    %% upwards past an instruction that may throw an exception
+    %% (such as element/2).
+    {zero,Stack,Heap,[]};
+safe_info(Info) -> Info.
+
 %% opt([Instruction]) -> [Instruction]
 %%  Optimize the instruction stream inside a basic block.
 
 opt([{set,[X],[X],move}|Is]) -> opt(Is);
+opt([{set,[Dst],_,move},{set,[Dst],[Src],move}=I|Is]) when Dst =/= Src ->
+    opt([I|Is]);
+opt([{set,[{x,0}],[S1],move}=I1,{set,[D2],[{x,0}],move}|Is]) ->
+    opt([I1,{set,[D2],[S1],move}|Is]);
+opt([{set,[{x,0}],[S1],move}=I1,{set,[D2],[S2],move}|Is0]) when S1 =/= D2 ->
+    %% Place move S x0 at the end of move sequences so that
+    %% loader can merge with the following instruction
+    {Ds,Is} = opt_moves([D2], Is0),
+    [{set,Ds,[S2],move}|opt([I1|Is])];
 opt([{set,_,_,{line,_}}=Line1,
      {set,[D1],[{integer,Idx1},Reg],{bif,element,{f,0}}}=I1,
      {set,_,_,{line,_}}=Line2,
      {set,[D2],[{integer,Idx2},Reg],{bif,element,{f,0}}}=I2|Is])
   when Idx1 < Idx2, D1 =/= D2, D1 =/= Reg, D2 =/= Reg ->
     opt([Line2,I2,Line1,I1|Is]);
+opt([{set,[D1],[{integer,Idx1},Reg],{bif,element,{f,L}}}=I1,
+     {set,[D2],[{integer,Idx2},Reg],{bif,element,{f,L}}}=I2|Is])
+  when Idx1 < Idx2, D1 =/= D2, D1 =/= Reg, D2 =/= Reg ->
+    opt([I2,I1|Is]);
+opt([{set,Hd0,Cons,get_hd}=GetHd,
+     {set,Tl0,Cons,get_tl}=GetTl|Is0]) ->
+    case {opt_moves(Hd0, [GetTl|Is0]),opt_moves(Tl0, [GetHd|Is0])} of
+        {{Hd0,Is},{Tl0,_}} ->
+            [GetHd|opt(Is)];
+        {{Hd,Is},{Tl0,_}} ->
+            [{set,Hd,Cons,get_hd}|opt(Is)];
+        {{_,_},{Tl,Is}} ->
+            [{set,Tl,Cons,get_tl}|opt(Is)]
+    end;
 opt([{set,Ds0,Ss,Op}|Is0]) ->
     {Ds,Is} = opt_moves(Ds0, Is0),
     [{set,Ds,Ss,Op}|opt(Is)];
-opt([{'%live',_,_}=I|Is]) ->
+opt([{'%anno',_}=I|Is]) ->
     [I|opt(Is)];
 opt([]) -> [].
 
@@ -245,17 +289,6 @@ opt_moves([D0]=Ds, Is0) ->
     case opt_move(D0, Is0) of
 	not_possible -> {Ds,Is0};
 	{D1,Is} -> {[D1],Is}
-    end;
-opt_moves([X0,Y0], Is0) ->
-    {X,Is2} = case opt_move(X0, Is0) of
-		  not_possible -> {X0,Is0};
-		  {Y0,_} -> {X0,Is0};
-		  {_X1,_Is1} = XIs1 -> XIs1
-	      end,
-    case opt_move(Y0, Is2) of
-	not_possible -> {[X,Y0],Is2};
-	{X,_} -> {[X,Y0],Is2};
-	{Y,Is} -> {[X,Y],Is}
     end.
 
 %% opt_move(Dest, [Instruction]) -> {UpdatedDest,[Instruction]} | not_possible
@@ -269,7 +302,7 @@ opt_move(Dest, Is) ->
 opt_move_1(R, [{set,[D],[R],move}|Is0], Acc) ->
     %% Provided that the source register is killed by instructions
     %% that follow, the optimization is safe.
-    case eliminate_use_of_from_reg(Is0, R, D, []) of
+    case eliminate_use_of_from_reg(Is0, R, D) of
 	{yes,Is} -> opt_move_rev(D, Acc, Is);
 	no -> not_possible
     end;
@@ -327,13 +360,21 @@ opt_tuple_element_1([{set,_,_,{alloc,_,_}}|_], _, _, _) ->
 opt_tuple_element_1([{set,_,_,{try_catch,_,_}}|_], _, _, _) ->
     no;
 opt_tuple_element_1([{set,[D],[S],move}|Is0], I0, {_,S}, Acc) ->
-    case eliminate_use_of_from_reg(Is0, S, D, []) of
+    case eliminate_use_of_from_reg(Is0, S, D) of
 	no ->
 	    no;
-	{yes,Is} ->
+	{yes,Is1} ->
 	    {set,[S],Ss,Op} = I0,
 	    I = {set,[D],Ss,Op},
-	    {yes,reverse(Acc, [I|Is])}
+            case opt_move_rev(S, Acc, [I|Is1]) of
+                not_possible ->
+                    %% Not safe because the move of the
+                    %% get_tuple_element instruction would cause the
+                    %% result of a previous instruction to be ignored.
+                    no;
+                {_,Is} ->
+                    {yes,Is}
+            end
     end;
 opt_tuple_element_1([{set,Ds,Ss,_}=I|Is], MovedI, {S,D}=Regs, Acc) ->
     case member(S, Ds) orelse member(D, Ss) of
@@ -369,6 +410,14 @@ is_killed_or_used(R, {set,Ss,Ds,_}) ->
 %%  that FromRegister is still used and that the optimization is not
 %%  possible.
 
+eliminate_use_of_from_reg(Is, From, To) ->
+    try
+        eliminate_use_of_from_reg(Is, From, To, [])
+    catch
+        throw:not_possible ->
+            no
+    end.
+
 eliminate_use_of_from_reg([{set,_,_,{alloc,Live,_}}|_]=Is0, {x,X}, _, Acc) ->
     if
 	X < Live ->
@@ -377,21 +426,32 @@ eliminate_use_of_from_reg([{set,_,_,{alloc,Live,_}}|_]=Is0, {x,X}, _, Acc) ->
 	    {yes,reverse(Acc, Is0)}
     end;
 eliminate_use_of_from_reg([{set,Ds,Ss0,Op}=I0|Is], From, To, Acc) ->
+    ensure_safe_tuple(I0, To),
     I = case member(From, Ss0) of
-	    true ->
-		Ss = [case S of
-			  From -> To;
-			  _ -> S
-		      end || S <- Ss0],
-		{set,Ds,Ss,Op};
-	    false ->
-		I0
-	end,
+            true ->
+                Ss = [case S of
+                          From -> To;
+                          _ -> S
+                      end || S <- Ss0],
+                {set,Ds,Ss,Op};
+            false ->
+                I0
+        end,
     case member(From, Ds) of
-	true ->
-	    {yes,reverse(Acc, [I|Is])};
-	false ->
-	    eliminate_use_of_from_reg(Is, From, To, [I|Acc])
+        true ->
+            {yes,reverse(Acc, [I|Is])};
+        false ->
+            case member(To, Ds) of
+                true ->
+                    case beam_utils:is_killed_block(From, Is) of
+                        true ->
+                            {yes,reverse(Acc, [I|Is])};
+                        false ->
+                            no
+                    end;
+                false ->
+                    eliminate_use_of_from_reg(Is, From, To, [I|Acc])
+            end
     end;
 eliminate_use_of_from_reg([I]=Is, From, _To, Acc) ->
     case beam_utils:is_killed_block(From, [I]) of
@@ -401,31 +461,51 @@ eliminate_use_of_from_reg([I]=Is, From, _To, Acc) ->
 	    no
     end.
 
+ensure_safe_tuple({set,[To],[],{put_tuple,_}}, To) ->
+    throw(not_possible);
+ensure_safe_tuple(_, _) -> ok.
+
+%% opt_allocs(Instructions) -> Instructions.  Optimize allocate
+%%  instructions inside blocks. If safe, replace an allocate_zero
+%%  instruction with the slightly cheaper allocate instruction.
+
+opt_allocs(Is) ->
+    D = beam_utils:index_labels(Is),
+    opt_allocs_1(Is, D).
+
+opt_allocs_1([{block,Bl0}|Is], D) ->
+    Bl = opt_alloc(Bl0, {D,Is}),
+    [{block,Bl}|opt_allocs_1(Is, D)];
+opt_allocs_1([I|Is], D) ->
+    [I|opt_allocs_1(Is, D)];
+opt_allocs_1([], _) -> [].
+
 %% opt_alloc(Instructions) -> Instructions'
 %%  Optimises all allocate instructions.
 
 opt_alloc([{set,[],[],{alloc,Live0,Info0}},
-	   {set,[],[],{alloc,Live,Info}}|Is]) ->
+           {set,[],[],{alloc,Live,Info}}|Is], D) ->
     Live = Live0,				%Assertion.
     Alloc = combine_alloc(Info0, Info),
     I = {set,[],[],{alloc,Live,Alloc}},
-    opt_alloc([I|Is]);
-opt_alloc([{set,[],[],{alloc,R,{_,Ns,Nh,[]}}}|Is]) ->
-    [{set,[],[],opt_alloc(Is, Ns, Nh, R)}|Is];
-opt_alloc([I|Is]) -> [I|opt_alloc(Is)];
-opt_alloc([]) -> [].
+    opt_alloc([I|Is], D);
+opt_alloc([{set,[],[],{alloc,R,{_,Ns,Nh,[]}}}|Is], D) ->
+    [{set,[],[],opt_alloc(Is, D, Ns, Nh, R)}|Is];
+opt_alloc([I|Is], D) -> [I|opt_alloc(Is, D)];
+opt_alloc([], _) -> [].
 
 combine_alloc({_,Ns,Nh1,Init}, {_,nostack,Nh2,[]})  ->
     {zero,Ns,beam_utils:combine_heap_needs(Nh1, Nh2),Init}.
-	
+
 %% opt_alloc(Instructions, FrameSize, HeapNeed, LivingRegs) -> [Instr]
 %%  Generates the optimal sequence of instructions for
 %%  allocating and initalizing the stack frame and needed heap.
 
-opt_alloc(_Is, nostack, Nh, LivingRegs) ->
+opt_alloc(_Is, _D, nostack, Nh, LivingRegs) ->
     {alloc,LivingRegs,{nozero,nostack,Nh,[]}};
-opt_alloc(Is, Ns, Nh, LivingRegs) ->
-    InitRegs = init_yreg(Is, 0),
+opt_alloc(Bl, {D,OuterIs}, Ns, Nh, LivingRegs) ->
+    Is = [{block,Bl}|OuterIs],
+    InitRegs = init_yregs(Ns, Is, D),
     case count_ones(InitRegs) of
 	N when N*2 > Ns ->
 	    {alloc,LivingRegs,{nozero,Ns,Nh,gen_init(Ns, InitRegs)}};
@@ -441,19 +521,14 @@ gen_init(Fs, Regs, Y, Acc) when Regs band 1 =:= 0 ->
 gen_init(Fs, Regs, Y, Acc) ->
     gen_init(Fs, Regs bsr 1, Y+1, Acc).
 
-%% init_yreg(Instructions, RegSet) -> RegSetInitialized
-%%  Calculate the set of initialized y registers.
-
-init_yreg([{set,_,_,{bif,_,_}}|_], Reg) -> Reg;
-init_yreg([{set,_,_,{alloc,_,{gc_bif,_,_}}}|_], Reg) -> Reg;
-init_yreg([{set,_,_,{alloc,_,{put_map,_,_}}}|_], Reg) -> Reg;
-init_yreg([{set,Ds,_,_}|Is], Reg) -> init_yreg(Is, add_yregs(Ds, Reg));
-init_yreg(_Is, Reg) -> Reg.
-
-add_yregs(Ys, Reg) -> foldl(fun(Y, R0) -> add_yreg(Y, R0) end, Reg, Ys).
-    
-add_yreg({y,Y}, Reg) -> Reg bor (1 bsl Y);
-add_yreg(_, Reg)     -> Reg.
+init_yregs(Y, Is, D) when Y >= 0 ->
+    case beam_utils:is_killed({y,Y}, Is, D) of
+        true ->
+            (1 bsl Y) bor init_yregs(Y-1, Is, D);
+        false ->
+            init_yregs(Y-1, Is, D)
+    end;
+init_yregs(_, _, _) -> 0.
 
 count_ones(Bits) -> count_ones(Bits, 0).
 count_ones(0, Acc) -> Acc;
@@ -463,16 +538,34 @@ count_ones(Bits, Acc) ->
 %% Calculate the new number of live registers when we move an allocate
 %% instruction upwards, passing a 'set' instruction.
 
-alloc_live_regs({set,Ds,Ss,_}, Regs0) ->
+alloc_live_regs({set,Ds,Ss,_}, Is, Regs0) ->
     Rset = x_live(Ss, x_dead(Ds, (1 bsl Regs0)-1)),
-    live_regs(0, Rset).
+    Live = live_regs(0, Rset),
+    case ensure_contiguous(Rset, Live) of
+        not_possible ->
+            %% Liveness information (looking forward in the
+            %% instruction stream) can't prove that moving this
+            %% allocation instruction is safe. Now use the annotation
+            %% of defined registers at the beginning of the current
+            %% block to see whether moving would be safe.
+            Def0 = defined_regs(Is, 0),
+            Def = Def0 band ((1 bsl Live) - 1),
+            ensure_contiguous(Rset bor Def, Live);
+        Live ->
+            %% Safe based on liveness information.
+            Live
+    end.
 
 live_regs(N, 0) ->
     N;
-live_regs(N, Regs) when Regs band 1 =:= 1 ->
-    live_regs(N+1, Regs bsr 1);
-live_regs(_, _) ->
-    not_possible.
+live_regs(N, Regs) ->
+    live_regs(N+1, Regs bsr 1).
+
+ensure_contiguous(Regs, Live) ->
+    case (1 bsl Live) - 1 of
+        Regs -> Live;
+        _ -> not_possible
+    end.
 
 x_dead([{x,N}|Rs], Regs) -> x_dead(Rs, Regs band (bnot (1 bsl N)));
 x_dead([_|Rs], Regs) -> x_dead(Rs, Regs);
@@ -481,3 +574,120 @@ x_dead([], Regs) -> Regs.
 x_live([{x,N}|Rs], Regs) -> x_live(Rs, Regs bor (1 bsl N));
 x_live([_|Rs], Regs) -> x_live(Rs, Regs);
 x_live([], Regs) -> Regs.
+
+%% defined_regs(ReversedInstructions) -> RegBitmap.
+%%  Given a reversed instruction stream, determine the
+%%  the registers that are defined.
+
+defined_regs([{'%anno',{def,Def}}|_], Regs) ->
+    Def bor Regs;
+defined_regs([{set,Ds,_,{alloc,Live,_}}|_], Regs) ->
+    x_live(Ds, Regs bor ((1 bsl Live) - 1));
+defined_regs([{set,Ds,_,_}|Is], Regs) ->
+    defined_regs(Is, x_live(Ds, Regs)).
+
+%%%
+%%% Do local common sub expression elimination (CSE) in each block.
+%%%
+
+local_cse([{block,Bl0}|Is]) ->
+    Bl = cse_block(Bl0, orddict:new(), []),
+    [{block,Bl}|local_cse(Is)];
+local_cse([I|Is]) ->
+    [I|local_cse(Is)];
+local_cse([]) -> [].
+
+cse_block([I|Is], Es0, Acc0) ->
+    Es1 = cse_clear(I, Es0),
+    case cse_expr(I) of
+        none ->
+            %% Instruction is not suitable for CSE.
+            cse_block(Is, Es1, [I|Acc0]);
+        {ok,D,Expr} ->
+            %% Suitable instruction. First update the dictionary of
+            %% suitable expressions for the next iteration.
+            Es = cse_add(D, Expr, Es1),
+
+            %% Search for a previous identical expression.
+            case cse_find(Expr, Es0) of
+                error ->
+                    %% Nothing found
+                    cse_block(Is, Es, [I|Acc0]);
+                Src ->
+                    %% Use the previously calculated result.
+                    %% Also eliminate any line instruction.
+                    Move = {set,[D],[Src],move},
+                    case Acc0 of
+                        [{set,_,_,{line,_}}|Acc] ->
+                            cse_block(Is, Es, [Move|Acc]);
+                        [_|_] ->
+                            cse_block(Is, Es, [Move|Acc0])
+                    end
+            end
+    end;
+cse_block([], _, Acc) ->
+    reverse(Acc).
+
+%% cse_find(Expr, Expressions) -> error | Register.
+%%  Find a previously evaluated expression whose result can be reused,
+%%  or return 'error' if no such expression is found.
+
+cse_find(Expr, Es) ->
+    case orddict:find(Expr, Es) of
+        {ok,{Src,_}} -> Src;
+        error -> error
+    end.
+
+cse_expr({set,[D],Ss,{bif,N,_}}) ->
+    case D of
+        {fr,_} ->
+            %% There are too many things that can go wrong.
+            none;
+        _ ->
+            {ok,D,{{bif,N},Ss}}
+    end;
+cse_expr({set,[D],Ss,{alloc,_,{gc_bif,N,_}}}) ->
+    {ok,D,{{gc_bif,N},Ss}};
+cse_expr({set,[D],Ss,put_list}) ->
+    {ok,D,{put_list,Ss}};
+cse_expr(_) -> none.
+
+%% cse_clear(Instr, Expressions0) -> Expressions.
+%%  Remove all previous expressions that will become
+%%  invalid when this instruction is executed. Basically,
+%%  an expression is no longer safe to reuse when the
+%%  register it has been stored to has been modified, killed,
+%%  or if any of the source operands have changed.
+
+cse_clear({set,Ds,_,{alloc,Live,_}}, Es) ->
+    cse_clear_1(Es, Live, Ds);
+cse_clear({set,Ds,_,_}, Es) ->
+    cse_clear_1(Es, all, Ds).
+
+cse_clear_1(Es, Live, Ds0) ->
+    Ds = ordsets:from_list(Ds0),
+    [E || E <- Es, cse_is_safe(E, Live, Ds)].
+
+cse_is_safe({_,{Dst,Interfering}}, Live, Ds) ->
+    ordsets:is_disjoint(Interfering, Ds) andalso
+        case Dst of
+            {x,X} ->
+                X < Live;
+            _ ->
+                true
+        end.
+
+%% cse_add(Dest, Expr, Expressions0) -> Expressions.
+%%  Provided that it is safe, add a new expression to the dictionary
+%%  of already evaluated expressions.
+
+cse_add(D, {_,Ss}=Expr, Es) ->
+    case member(D, Ss) of
+        false ->
+            Interfering = ordsets:from_list([D|Ss]),
+            orddict:store(Expr, {D,Interfering}, Es);
+        true ->
+            %% Unsafe because the instruction overwrites one of
+            %% source operands.
+            Es
+    end.
diff --git a/lib/compiler/src/beam_bs.erl b/lib/compiler/src/beam_bs.erl
index beb055b23d..14cedbb582 100644
--- a/lib/compiler/src/beam_bs.erl
+++ b/lib/compiler/src/beam_bs.erl
@@ -38,8 +38,7 @@ function({function,Name,Arity,CLabel,Is0}, Lc0) ->
 	{Is,Lc} = bsm_opt(Is1, Lc0),
 	{{function,Name,Arity,CLabel,Is},Lc}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl
index 9a4e7fb133..9f3b9d788f 100644
--- a/lib/compiler/src/beam_bsm.erl
+++ b/lib/compiler/src/beam_bsm.erl
@@ -105,8 +105,7 @@ function({function,Name,Arity,Entry,Is}, FIndex) ->
 	D = #btb{f=FIndex,index=Index},
 	{function,Name,Arity,Entry,btb_opt_1(Is, D, [])}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -125,20 +124,21 @@ btb_opt_1([{test,bs_get_binary2,F,_,[Reg,{atom,all},U,Fs],Reg}=I0|Is], D, Acc0)
 		  end,
 	    btb_opt_1(Is, D, Acc)
     end;
-btb_opt_1([{test,bs_get_binary2,F,_,[Ctx,{atom,all},U,Fs],Dst}=I0|Is], D, Acc0) ->
-    case btb_reaches_match(Is, [Ctx,Dst], D) of
+btb_opt_1([{test,bs_get_binary2,F,_,[Ctx,{atom,all},U,Fs],Dst}=I0|Is0], D, Acc0) ->
+    case btb_reaches_match(Is0, [Ctx,Dst], D) of
 	{error,Reason} ->
 	    Comment = btb_comment_no_opt(Reason, Fs),
-	    btb_opt_1(Is, D, [Comment,I0|Acc0]);
+	    btb_opt_1(Is0, D, [Comment,I0|Acc0]);
 	{ok,MustSave} when U =:= 1 ->
 	    Comment = btb_comment_opt(Fs),
-	    Acc1 = btb_gen_save(MustSave, Ctx, [Comment|Acc0]),
-	    Acc = [{move,Ctx,Dst}|Acc1],
+            Acc = btb_gen_save(MustSave, Ctx, [Comment|Acc0]),
+            Is = prepend_move(Ctx, Dst, Is0),
 	    btb_opt_1(Is, D, Acc);
 	{ok,MustSave} ->
 	    Comment = btb_comment_opt(Fs),
 	    Acc1 = btb_gen_save(MustSave, Ctx, [Comment|Acc0]),
-	    Acc = [{move,Ctx,Dst},{test,bs_test_unit,F,[Ctx,U]}|Acc1],
+            Acc = [{test,bs_test_unit,F,[Ctx,U]}|Acc1],
+            Is = prepend_move(Ctx, Dst, Is0),
 	    btb_opt_1(Is, D, Acc)
     end;
 btb_opt_1([I|Is], D, Acc) ->
@@ -151,6 +151,12 @@ btb_gen_save(true, Reg, Acc) ->
     [{bs_save2,Reg,{atom,start}}|Acc];
 btb_gen_save(false, _, Acc) -> Acc.
 
+prepend_move(Ctx, Dst, [{block,Bl0}|Is]) ->
+    Bl = [{set,[Dst],[Ctx],move}|Bl0],
+    [{block,Bl}|Is];
+prepend_move(Ctx, Dst, Is) ->
+    [{move,Ctx,Dst}|Is].
+
 %% btb_reaches_match([Instruction], [Register], D) ->
 %%   {ok,MustSave}|{error,Reason}
 %%
diff --git a/lib/compiler/src/beam_clean.erl b/lib/compiler/src/beam_clean.erl
index e094c2c320..7ddf9fa2e2 100644
--- a/lib/compiler/src/beam_clean.erl
+++ b/lib/compiler/src/beam_clean.erl
@@ -24,7 +24,7 @@
 -export([module/2]).
 -export([bs_clean_saves/1]).
 -export([clean_labels/1]).
--import(lists, [foldl/3,reverse/1,filter/2]).
+-import(lists, [foldl/3,reverse/1]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_utils:module_code()}.
@@ -303,8 +303,21 @@ maybe_remove_lines(Fs, Opts) ->
     end.
 
 remove_lines([{function,N,A,Lbl,Is0}|T]) ->
-    Is = filter(fun({line,_}) -> false;
-		   (_)  -> true
-		end, Is0),
+    Is = remove_lines_fun(Is0),
     [{function,N,A,Lbl,Is}|remove_lines(T)];
 remove_lines([]) -> [].
+
+remove_lines_fun([{line,_}|Is]) ->
+    remove_lines_fun(Is);
+remove_lines_fun([{block,Bl0}|Is]) ->
+    Bl = remove_lines_block(Bl0),
+    [{block,Bl}|remove_lines_fun(Is)];
+remove_lines_fun([I|Is]) ->
+    [I|remove_lines_fun(Is)];
+remove_lines_fun([]) -> [].
+
+remove_lines_block([{set,_,_,{line,_}}|Is]) ->
+    remove_lines_block(Is);
+remove_lines_block([I|Is]) ->
+    [I|remove_lines_block(Is)];
+remove_lines_block([]) -> [].
diff --git a/lib/compiler/src/beam_dead.erl b/lib/compiler/src/beam_dead.erl
index d379fdc4eb..dbbaae05eb 100644
--- a/lib/compiler/src/beam_dead.erl
+++ b/lib/compiler/src/beam_dead.erl
@@ -56,8 +56,7 @@ function({function,Name,Arity,CLabel,Is0}, Lc0) ->
 	Is = move_move_into_block(Is3, []),
 	{{function,Name,Arity,CLabel,Is},Lc}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -272,7 +271,8 @@ backward([{jump,{f,To0}},{move,Src,Reg}=Move|Is], D, Acc) ->
     end;
 backward([{jump,{f,To}}=J|[{bif,Op,{f,BifFail},Ops,Reg}|Is]=Is0], D, Acc) ->
     try replace_comp_op(To, Reg, Op, Ops, D) of
-	I -> backward(Is, D, I++Acc)
+	{Test,Jump} ->
+            backward([Jump,Test|Is], D, Acc)
     catch
 	throw:not_possible ->
 	    case To =:= BifFail of
@@ -294,24 +294,25 @@ backward([{jump,{f,To}}=J|[{gc_bif,_,{f,To},_,_,_Dst}|Is]], D, Acc) ->
     %% register is initialized, and it is therefore no need to test
     %% for liveness of the destination register at label To.
     backward([J|Is], D, Acc);
-backward([{test,bs_start_match2,F,Live,[R,_]=Args,Ctxt}|Is], D,
-	 [{test,bs_match_string,F,[Ctxt,Bs]},
-	  {test,bs_test_tail2,F,[Ctxt,0]}|Acc0]=Acc) ->
+backward([{test,bs_start_match2,F,Live,[Src,_]=Args,Ctxt}|Is], D, Acc0) ->
     {f,To0} = F,
-    case beam_utils:is_killed(Ctxt, Acc0, D) of
-	true ->
-	    To = shortcut_bs_context_to_binary(To0, R, D),
-	    Eq = {test,is_eq_exact,{f,To},[R,{literal,Bs}]},
-	    backward(Is, D, [Eq|Acc0]);
-	false ->
-	    To = shortcut_bs_start_match(To0, R, D),
-	    I = {test,bs_start_match2,{f,To},Live,Args,Ctxt},
-	    backward(Is, D, [I|Acc])
+    case test_bs_literal(F, Ctxt, D, Acc0) of
+        {none,Acc} ->
+            %% Ctxt killed immediately after bs_start_match2.
+            To = shortcut_bs_context_to_binary(To0, Src, D),
+            I = {test,is_bitstr,{f,To},[Src]},
+            backward(Is, D, [I|Acc]);
+        {Literal,Acc} ->
+            %% Ctxt killed after matching a literal.
+            To = shortcut_bs_context_to_binary(To0, Src, D),
+            Eq = {test,is_eq_exact,{f,To},[Src,{literal,Literal}]},
+            backward(Is, D, [Eq|Acc]);
+        not_killed ->
+            %% Ctxt not killed. Not much to do.
+            To = shortcut_bs_start_match(To0, Src, D),
+            I = {test,bs_start_match2,{f,To},Live,Args,Ctxt},
+            backward(Is, D, [I|Acc0])
     end;
-backward([{test,bs_start_match2,{f,To0},Live,[Src|_]=Info,Dst}|Is], D, Acc) ->
-    To = shortcut_bs_start_match(To0, Src, D),
-    I = {test,bs_start_match2,{f,To},Live,Info,Dst},
-    backward(Is, D, [I|Acc]);
 backward([{test,Op,{f,To0},Ops0}|Is], D, Acc) ->
     To1 = shortcut_bs_test(To0, Is, D),
     To2 = shortcut_label(To1, D),
@@ -446,7 +447,7 @@ prune_redundant([], _) -> [].
 replace_comp_op(To, Reg, Op, Ops, D) ->
     False = comp_op_find_shortcut(To, Reg, {atom,false}, D),
     True = comp_op_find_shortcut(To, Reg, {atom,true}, D),
-    [bif_to_test(Op, Ops, False),{jump,{f,True}}].
+    {bif_to_test(Op, Ops, False),{jump,{f,True}}}.
 
 comp_op_find_shortcut(To0, Reg, Val, D) ->
     case shortcut_select_label(To0, Reg, Val, D) of
@@ -483,15 +484,22 @@ not_possible() -> throw(not_possible).
 %%   F1:  is_eq_exact F2 Reg Lit2          F1: is_eq_exact F2 Reg Lit2
 %%   L2:  ....				   L2:
 %%
-combine_eqs(To, [Reg,{Type,_}=Lit1]=Ops, D, [{label,L1}|_])
-  when Type =:= atom; Type =:= integer ->
+combine_eqs(To, [Reg,{Type,_}=Lit1]=Ops, D, Acc)
+    when Type =:= atom; Type =:= integer ->
+    Next = case Acc of
+               [{label,Lbl}|_] -> Lbl;
+               [{jump,{f,Lbl}}|_] -> Lbl
+           end,
     case beam_utils:code_at(To, D) of
 	[{test,is_eq_exact,{f,F2},[Reg,{Type,_}=Lit2]},
 	 {label,L2}|_] when Lit1 =/= Lit2 ->
-	    {select,select_val,Reg,{f,F2},[Lit1,{f,L1},Lit2,{f,L2}]};
+	    {select,select_val,Reg,{f,F2},[Lit1,{f,Next},Lit2,{f,L2}]};
+	[{test,is_eq_exact,{f,F2},[Reg,{Type,_}=Lit2]},
+	 {jump,{f,L2}}|_] when Lit1 =/= Lit2 ->
+	    {select,select_val,Reg,{f,F2},[Lit1,{f,Next},Lit2,{f,L2}]};
 	[{select,select_val,Reg,{f,F2},[{Type,_}|_]=List0}|_] ->
 	    List = remove_from_list(Lit1, List0),
-	    {select,select_val,Reg,{f,F2},[Lit1,{f,L1}|List]};
+	    {select,select_val,Reg,{f,F2},[Lit1,{f,Next}|List]};
 	_Is ->
 	    {test,is_eq_exact,{f,To},Ops}
 	end;
@@ -504,6 +512,22 @@ remove_from_list(Lit, [Val,{f,_}=Fail|T]) ->
     [Val,Fail|remove_from_list(Lit, T)];
 remove_from_list(_, []) -> [].
 
+
+test_bs_literal(F, Ctxt, D,
+                [{test,bs_match_string,F,[Ctxt,Bs]},
+                 {test,bs_test_tail2,F,[Ctxt,0]}|Acc]) ->
+    test_bs_literal_1(Ctxt, Acc, D, Bs);
+test_bs_literal(F, Ctxt, D, [{test,bs_test_tail2,F,[Ctxt,0]}|Acc]) ->
+    test_bs_literal_1(Ctxt, Acc, D, <<>>);
+test_bs_literal(_, Ctxt, D, Acc) ->
+    test_bs_literal_1(Ctxt, Acc, D, none).
+
+test_bs_literal_1(Ctxt, Is, D, Literal) ->
+    case beam_utils:is_killed(Ctxt, Is, D) of
+        true -> {Literal,Is};
+        false -> not_killed
+    end.
+
 %% shortcut_bs_test(TargetLabel, ReversedInstructions, D) -> TargetLabel'
 %%  Try to shortcut the failure label for bit syntax matching.
 
diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl
index 8fd0b36d05..a68c4b5367 100644
--- a/lib/compiler/src/beam_disasm.erl
+++ b/lib/compiler/src/beam_disasm.erl
@@ -163,8 +163,8 @@ pp_instr(I) ->
 
 file(File) ->
     try process_chunks(File)
-    catch error:Reason ->
-	    {error,?MODULE,{internal,{Reason,erlang:get_stacktrace()}}}
+    catch error:Reason:Stack ->
+            {error,?MODULE,{internal,{Reason,Stack}}}
     end.
 
 %%-----------------------------------------------------------------------
@@ -719,42 +719,6 @@ resolve_inst({wait,[Lbl]},_,_,_) ->
     {wait,Lbl};
 resolve_inst({wait_timeout,[Lbl,Int]},_,_,_) ->
     {wait_timeout,Lbl,resolve_arg(Int)};
-resolve_inst({m_plus,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'+',W,[SrcR1,SrcR2],DstR};
-resolve_inst({m_minus,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'-',W,[SrcR1,SrcR2],DstR};
-resolve_inst({m_times,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'*',W,[SrcR1,SrcR2],DstR};
-resolve_inst({m_div,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'/',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_div,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'div',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_rem,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'rem',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_band,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'band',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bor,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bor',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bxor,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bxor',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bsl,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bsl',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bsr,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bsr',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bnot,Args},_,_,_) ->
-    [W,SrcR,DstR] = resolve_args(Args),
-    {arithbif,'bnot',W,[SrcR],DstR};
 resolve_inst({is_lt=I,Args0},_,_,_) ->
     [L|Args] = resolve_args(Args0),
     {test,I,L,Args};
@@ -800,9 +764,6 @@ resolve_inst({is_nil=I,Args0},_,_,_) ->
 resolve_inst({is_binary=I,Args0},_,_,_) ->
     [L|Args] = resolve_args(Args0),
     {test,I,L,Args};
-resolve_inst({is_constant=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
 resolve_inst({is_list=I,Args0},_,_,_) ->
     [L|Args] = resolve_args(Args0),
     {test,I,L,Args};
@@ -840,11 +801,6 @@ resolve_inst({get_tuple_element,[Src,{u,Off},Dst]},_,_,_) ->
     {get_tuple_element,resolve_arg(Src),Off,resolve_arg(Dst)};
 resolve_inst({set_tuple_element,[Src,Dst,{u,Off}]},_,_,_) ->
     {set_tuple_element,resolve_arg(Src),resolve_arg(Dst),Off};
-resolve_inst({put_string,[{u,Len},{u,Off},Dst]},_,Strings,_) ->
-    String = if Len > 0 -> binary_to_list(Strings, Off+1, Off+Len);
-		true -> ""
-	     end,
-    {put_string,Len,{string,String},Dst};
 resolve_inst({put_list,[Src1,Src2,Dst]},_,_,_) ->
     {put_list,resolve_arg(Src1),resolve_arg(Src2),Dst};
 resolve_inst({put_tuple,[{u,Arity},Dst]},_,_,_) ->
@@ -859,9 +815,6 @@ resolve_inst({case_end,[X]},_,_,_) ->
     {case_end,resolve_arg(X)};
 resolve_inst({call_fun,[{u,N}]},_,_,_) ->
     {call_fun,N};
-resolve_inst({make_fun,Args},_,_,Lbls) ->
-    [{f,L},Magic,FreeVars] = resolve_args(Args),
-    {make_fun,lookup(L,Lbls),Magic,FreeVars};
 resolve_inst({is_function=I,Args0},_,_,_) ->
     [L|Args] = resolve_args(Args0),
     {test,I,L,Args};
@@ -870,30 +823,6 @@ resolve_inst({call_ext_only,[{u,N},{u,MFAix}]},Imports,_,_) ->
 %%
 %% Instructions for handling binaries added in R7A & R7B
 %%
-resolve_inst({bs_start_match,[F,Reg]},_,_,_) ->
-    {bs_start_match,F,Reg};
-resolve_inst({bs_get_integer=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
-resolve_inst({bs_get_float=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
-resolve_inst({bs_get_binary=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
-resolve_inst({bs_skip_bits,[Lbl,Arg2,{u,N},{u,U}]},_,_,_) ->
-    A2 = resolve_arg(Arg2),
-    {test,bs_skip_bits,Lbl,[A2,N,decode_field_flags(U)]};
-resolve_inst({bs_test_tail,[F,{u,N}]},_,_,_) ->
-    {test,bs_test_tail,F,[N]};
-resolve_inst({bs_save,[{u,N}]},_,_,_) ->
-    {bs_save,N};
-resolve_inst({bs_restore,[{u,N}]},_,_,_) ->
-    {bs_restore,N};
-resolve_inst({bs_init,[{u,N},{u,U}]},_,_,_) ->
-    {bs_init,N,decode_field_flags(U)};
-resolve_inst({bs_final,[F,X]},_,_,_) ->
-    {bs_final,F,X};
 resolve_inst({bs_put_integer,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
     [A2,A5] = resolve_args([Arg2,Arg5]),
     {bs_put_integer,Lbl,A2,N,decode_field_flags(U),A5};
@@ -908,8 +837,6 @@ resolve_inst({bs_put_string,[{u,Len},{u,Off}]},_,Strings,_) ->
 		true -> ""
 	     end,
     {bs_put_string,Len,{string,String}};
-resolve_inst({bs_need_buf,[{u,N}]},_,_,_) ->
-    {bs_need_buf,N};
 
 %%
 %% Instructions for handling floating point numbers added in June 2001 (R8).
@@ -961,9 +888,6 @@ resolve_inst({raise,[_Reg1,_Reg2]=Regs},_,_,_) ->
 resolve_inst({bs_init2,[Lbl,Arg2,{u,W},{u,R},{u,F},Arg6]},_,_,_) ->
     [A2,A6] = resolve_args([Arg2,Arg6]),
     {bs_init2,Lbl,A2,W,R,decode_field_flags(F),A6};
-resolve_inst({bs_bits_to_bytes,[Lbl,Arg2,Arg3]},_,_,_) ->
-    [A2,A3] = resolve_args([Arg2,Arg3]),
-    {bs_bits_to_bytes,Lbl,A2,A3};
 resolve_inst({bs_add=I,[Lbl,Arg2,Arg3,Arg4,Arg5]},_,_,_) ->
     [A2,A3,A4,A5] = resolve_args([Arg2,Arg3,Arg4,Arg5]),
     {I,Lbl,[A2,A3,A4],A5};
@@ -1041,12 +965,6 @@ resolve_inst({gc_bif3,Args},Imports,_,_) ->
     {gc_bif,BifName,F,Live,[A1,A2,A3],Reg};
 
 %%
-%% New instructions for creating non-byte aligned binaries.
-%%
-resolve_inst({bs_final2,[X,Y]},_,_,_) ->
-    {bs_final2,X,Y};
-
-%%
 %% R11B-5.
 %% 
 resolve_inst({is_bitstr=I,Args0},_,_,_) ->
@@ -1165,6 +1083,19 @@ resolve_inst({get_map_elements,Args0},_,_,_) ->
     {get_map_elements,FLbl,Src,{list,List}};
 
 %%
+%% OTP 21.
+%%
+
+resolve_inst({build_stacktrace,[]},_,_,_) ->
+    build_stacktrace;
+resolve_inst({raw_raise,[]},_,_,_) ->
+    raw_raise;
+resolve_inst({get_hd,[Src,Dst]},_,_,_) ->
+    {get_hd,Src,Dst};
+resolve_inst({get_tl,[Src,Dst]},_,_,_) ->
+    {get_tl,Src,Dst};
+
+%%
 %% Catches instructions that are not yet handled.
 %%
 resolve_inst(X,_,_,_) -> ?exit({resolve_inst,X}).
diff --git a/lib/compiler/src/beam_disasm.hrl b/lib/compiler/src/beam_disasm.hrl
index d968cd9587..c3326c15a0 100644
--- a/lib/compiler/src/beam_disasm.hrl
+++ b/lib/compiler/src/beam_disasm.hrl
@@ -26,7 +26,8 @@
 %%      IT SHOULD BE MOVED TO A FILE THAT DEFINES (AND EXPORTS)
 %%      PROPER TYPES FOR THE SET OF BEAM INSTRUCTIONS.
 %%
--type beam_instr() :: 'bs_init_writable' | 'fclearerror' | 'if_end'
+-type beam_instr() :: 'bs_init_writable' | 'build_stacktrace'
+                    | 'fclearerror' | 'if_end' | 'raw_raise'
                     | 'remove_message' | 'return' | 'send' | 'timeout'
                     | tuple().  %% XXX: Very underspecified - FIX THIS
 
diff --git a/lib/compiler/src/beam_except.erl b/lib/compiler/src/beam_except.erl
index 9801c68ee2..abd39c661d 100644
--- a/lib/compiler/src/beam_except.erl
+++ b/lib/compiler/src/beam_except.erl
@@ -45,8 +45,7 @@ function({function,Name,Arity,CLabel,Is0}) ->
 	Is = function_1(Is0),
 	{function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
diff --git a/lib/compiler/src/beam_flatten.erl b/lib/compiler/src/beam_flatten.erl
index a4d45a4ca6..c60211f516 100644
--- a/lib/compiler/src/beam_flatten.erl
+++ b/lib/compiler/src/beam_flatten.erl
@@ -50,6 +50,9 @@ norm_block([{set,[],[],{alloc,R,Alloc}}|Is], Acc0) ->
 	Acc ->
 	    norm_block(Is, Acc)
     end;
+norm_block([{set,[D1],[S],get_hd},{set,[D2],[S],get_tl}|Is], Acc) ->
+    I = {get_list,S,D1,D2},
+    norm_block(Is, [I|Acc]);
 norm_block([I|Is], Acc) -> norm_block(Is, [norm(I)|Acc]);
 norm_block([], Acc) -> Acc.
     
@@ -64,12 +67,14 @@ norm({set,[D],[],{put_tuple,A}})  -> {put_tuple,A,D};
 norm({set,[],[S],put})            -> {put,S};
 norm({set,[D],[S],{get_tuple_element,I}}) -> {get_tuple_element,S,I,D};
 norm({set,[],[S,D],{set_tuple_element,I}}) -> {set_tuple_element,S,D,I};
-norm({set,[D1,D2],[S],get_list})          -> {get_list,S,D1,D2};
+norm({set,[D],[S],get_hd})        -> {get_hd,S,D};
+norm({set,[D],[S],get_tl})        -> {get_tl,S,D};
 norm({set,[D],[S|Puts],{alloc,R,{put_map,Op,F}}}) ->
     {put_map,F,Op,S,D,R,{list,Puts}};
 norm({set,[],[],remove_message})   -> remove_message;
 norm({set,[],[],fclearerror}) -> fclearerror;
-norm({set,[],[],fcheckerror}) -> {fcheckerror,{f,0}}.
+norm({set,[],[],fcheckerror}) -> {fcheckerror,{f,0}};
+norm({set,[],[],{line,_}=Line}) -> Line.
 
 norm_allocate({_Zero,nostack,Nh,[]}, Regs) ->
     [{test_heap,Nh,Regs}];
diff --git a/lib/compiler/src/beam_jump.erl b/lib/compiler/src/beam_jump.erl
index 0bcec9ce19..c33de217bd 100644
--- a/lib/compiler/src/beam_jump.erl
+++ b/lib/compiler/src/beam_jump.erl
@@ -336,17 +336,6 @@ opt([{test,_,{f,L}=Lbl,_}=I|[{label,L}|_]=Is], Acc0, St0) ->
             {Acc,St} = opt_useless_loads(Acc0, L, St0),
 	    opt(Is, Acc, St)
     end;
-opt([{test,_,{f,L}=Lbl,_}=I|[{label,L}|_]=Is], Acc0, St0) ->
-    %% Similar to the above, except we have a fall-through rather than jump
-    %%    Test Label Ops
-    %%    label Label
-    case beam_utils:is_pure_test(I) of
-	false ->
-	    opt(Is, [I|Acc0], label_used(Lbl, St0));
-	true ->
-            {Acc,St} = opt_useless_loads(Acc0, L, St0),
-	    opt(Is, Acc, St)
-    end;
 opt([{test,Test0,{f,L}=Lbl,Ops}=I|[{jump,To}|Is]=Is0], Acc, St) ->
     case is_label_defined(Is, L) of
 	false ->
diff --git a/lib/compiler/src/beam_listing.erl b/lib/compiler/src/beam_listing.erl
index 9422f9a78a..73c6501fe5 100644
--- a/lib/compiler/src/beam_listing.erl
+++ b/lib/compiler/src/beam_listing.erl
@@ -23,6 +23,7 @@
 
 -include("core_parse.hrl").
 -include("v3_kernel.hrl").
+-include("beam_disasm.hrl").
 
 -import(lists, [foreach/2]).
 
diff --git a/lib/compiler/src/beam_peep.erl b/lib/compiler/src/beam_peep.erl
index 9436c20b36..eb3192fe8f 100644
--- a/lib/compiler/src/beam_peep.erl
+++ b/lib/compiler/src/beam_peep.erl
@@ -41,8 +41,7 @@ function({function,Name,Arity,CLabel,Is0}) ->
 	Is = beam_jump:remove_unused_labels(Is1),
 	{function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
diff --git a/lib/compiler/src/beam_receive.erl b/lib/compiler/src/beam_receive.erl
index 468460eedf..3c8efa577c 100644
--- a/lib/compiler/src/beam_receive.erl
+++ b/lib/compiler/src/beam_receive.erl
@@ -82,8 +82,7 @@ function({function,Name,Arity,Entry,Is}) ->
 	D = beam_utils:index_labels(Is),
 	{function,Name,Arity,Entry,opt(Is, D, [])}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
diff --git a/lib/compiler/src/beam_record.erl b/lib/compiler/src/beam_record.erl
index 419089b1bc..58a6de6775 100644
--- a/lib/compiler/src/beam_record.erl
+++ b/lib/compiler/src/beam_record.erl
@@ -15,19 +15,12 @@
 %%
 %% %CopyrightEnd%
 %%
-%% File:    beam_record.erl
-%% Author:  Björn-Egil Dahlberg
-%% Created: 2014-09-03
-%%
-
--module(beam_record).
--export([module/2]).
 
 %% Rewrite the instruction stream on tagged tuple tests.
-%% Tagged tuples means a tuple of any arity with an atom as its first element.
-%% Typically records, ok-tuples and error-tuples.
-%% 
-%% from:
+%% Tagged tuples means a tuple of any arity with an atom as its
+%% first element, such as records and error tuples.
+%%
+%% From:
 %%     ...
 %%     {test,is_tuple,Fail,[Src]}.
 %%     {test,test_arity,Fail,[Src,Sz]}.
@@ -36,13 +29,16 @@
 %%     ...
 %%     {test,is_eq_exact,Fail,[Dst,Atom]}.
 %%     ...
-%% to:
+%% To:
 %%     ...
 %%     {test,is_tagged_tuple,Fail,[Src,Sz,Atom]}.
 %%     ...
+%%
 
+-module(beam_record).
+-export([module/2]).
 
--import(lists, [reverse/1]).
+-import(lists, [reverse/1,reverse/2]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_utils:module_code()}.
@@ -51,56 +47,85 @@ module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
     Fs = [function(F) || F <- Fs0],
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
-function({function,Name,Arity,CLabel,Is}) ->
+function({function,Name,Arity,CLabel,Is0}) ->
     try
-        Idx = beam_utils:index_labels(Is),
-        {function,Name,Arity,CLabel,rewrite(Is,Idx)}
+        Is1 = beam_utils:anno_defs(Is0),
+        Idx = beam_utils:index_labels(Is1),
+        Is = rewrite(reverse(Is1), Idx),
+        {function,Name,Arity,CLabel,Is}
     catch
-        Class:Error ->
-            Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
             io:fwrite("Function: ~w/~w\n", [Name,Arity]),
             erlang:raise(Class, Error, Stack)
     end.
 
-rewrite(Is,Idx) ->
-    rewrite(Is,Idx,[]).
+rewrite(Is, Idx) ->
+    rewrite(Is, Idx, 0, []).
 
-rewrite([{test,is_tuple,Fail,[Src]}=I1,
-         {test,test_arity,Fail,[Src,N]}=I2|Is],Idx,Acc) ->
-    case is_tagged_tuple(Is,Fail,Src,Idx) of
+rewrite([{test,test_arity,Fail,[Src,N]}=TA,
+         {test,is_tuple,Fail,[Src]}=TT|Is], Idx, Def, Acc0) ->
+    case is_tagged_tuple(Acc0, Def, Fail, Src, Idx) of
         no ->
-            rewrite(Is,Idx,[I2,I1|Acc]);
-        {Atom,[{block,[]}|Is1]} ->
-            rewrite(Is1,Idx,[{test,is_tagged_tuple,Fail,[Src,N,Atom]}|Acc]);
-        {Atom,Is1} ->
-            rewrite(Is1,Idx,[{test,is_tagged_tuple,Fail,[Src,N,Atom]}|Acc])
+            rewrite(Is, Idx, 0, [TT,TA|Acc0]);
+        {yes,Atom,Acc} ->
+            I = {test,is_tagged_tuple,Fail,[Src,N,Atom]},
+            rewrite(Is, Idx, Def, [I|Acc])
     end;
-rewrite([I|Is],Idx,Acc) ->
-    rewrite(Is,Idx,[I|Acc]);
-rewrite([],_,Acc) -> reverse(Acc).
-
-is_tagged_tuple([{block,[{set,[Dst],[Src],{get_tuple_element,0}}=B|Bs]},
-                 {test,is_eq_exact,Fail,[Dst,{atom,_}=Atom]}|Is],Fail,Src,Idx) ->
+rewrite([{block,[{'%anno',{def,Def}}|Bl]}|Is], Idx, _Def, Acc) ->
+    rewrite(Is, Idx, Def, [{block,Bl}|Acc]);
+rewrite([{label,L}=I|Is], Idx0, Def, Acc) ->
+    Idx = beam_utils:index_label(L, Acc, Idx0),
+    rewrite(Is, Idx, Def, [I|Acc]);
+rewrite([I|Is], Idx, Def, Acc) ->
+    rewrite(Is, Idx, Def, [I|Acc]);
+rewrite([], _, _, Acc) -> Acc.
 
-    %% if Dst is killed in the instruction stream and at fail label,
-    %% we can safely remove get_tuple_element.
-    %%
-    %% if Dst is not killed in the stream, we cannot remove get_tuple_element
-    %% since it is referenced.
-
-    case is_killed(Dst,Is,Fail,Idx) of
-        true  -> {Atom,[{block,Bs}|Is]};
-        false -> {Atom,[{block,[B|Bs]}|Is]}
+is_tagged_tuple([{block,Bl},
+                 {test,is_eq_exact,Fail,[Dst,{atom,_}=Atom]}|Is],
+                Def, Fail, Src, Idx) ->
+    case is_tagged_tuple_1(Bl, Is, Fail, Src, Dst, Idx, Def, []) of
+        no ->
+            no;
+        {yes,[]} ->
+            {yes,Atom,Is};
+        {yes,[_|_]=Block} ->
+            {yes,Atom,[{block,Block}|Is]}
     end;
-is_tagged_tuple([{block,[{set,_,_,_}=B|Bs]},
-                 {test,is_eq_exact,_,_}=I|Is],Fail,Src,Idx) ->
-    case is_tagged_tuple([{block,Bs},I|Is],Fail,Src,Idx) of
-        {Atom,[{block,Bsr}|Isr]} -> {Atom,[{block,[B|Bsr]}|Isr]};
-        no                       -> no
+is_tagged_tuple(_, _, _, _, _) ->
+    no.
+
+is_tagged_tuple_1([{set,[Dst],[Src],{get_tuple_element,0}}=I|Bl],
+                  Is, Fail, Src, Dst, Idx, Def, Acc) ->
+    %% Check usage of Dst to find out whether the get_tuple_element
+    %% is needed.
+    case usage(Dst, Is, Fail, Idx) of
+        killed ->
+            %% Safe to remove the get_tuple_element instruction.
+            {yes,reverse(Acc, Bl)};
+        used ->
+            %% Actively used. Must keep instruction.
+            {yes,reverse(Acc, [I|Bl])};
+        not_used ->
+            %% Not actually used (but must be initialized).
+            case is_defined(Dst, Def) of
+                false ->
+                    %% Dst must be initialized, but the
+                    %% actual value does not matter.
+                    Kill = {set,[Dst],[nil],move},
+                    {yes,reverse(Acc, [Kill|Bl])};
+                true ->
+                    %% The register is previously initialized.
+                    %% We can remove the instruction.
+                    {yes,reverse(Acc, Bl)}
+            end
     end;
-is_tagged_tuple(_Is,_Fail,_Src,_Idx) ->
+is_tagged_tuple_1([I|Bl], Is, Fail, Src, Dst, Idx, Def, Acc) ->
+    is_tagged_tuple_1(Bl, Is, Fail, Src, Dst, Idx, Def, [I|Acc]);
+is_tagged_tuple_1(_, _, _, _, _, _, _, _) ->
     no.
 
-is_killed(Dst,Is,{_,Lbl},Idx) ->
-    beam_utils:is_killed(Dst,Is,Idx) andalso
-        beam_utils:is_killed_at(Dst,Lbl,Idx).
+usage(Dst, Is, Fail, Idx) ->
+    beam_utils:usage(Dst, [{test,is_number,Fail,[nil]}|Is], Idx).
+
+is_defined({x,X}, Def) ->
+    (Def bsr X) band 1 =:= 1.
diff --git a/lib/compiler/src/beam_reorder.erl b/lib/compiler/src/beam_reorder.erl
index 910b7f6b0a..63bb57a1ac 100644
--- a/lib/compiler/src/beam_reorder.erl
+++ b/lib/compiler/src/beam_reorder.erl
@@ -35,8 +35,7 @@ function({function,Name,Arity,CLabel,Is0}) ->
 	Is = reorder(Is0),
 	{function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
diff --git a/lib/compiler/src/beam_split.erl b/lib/compiler/src/beam_split.erl
index d041f18806..52dd89b5bb 100644
--- a/lib/compiler/src/beam_split.erl
+++ b/lib/compiler/src/beam_split.erl
@@ -50,8 +50,9 @@ split_block([{set,[R],[_,_,_]=As,{bif,is_record,{f,Lbl}}}|Is], Bl, Acc) ->
     split_block(Is, [], [{bif,is_record,{f,Lbl},As,R}|make_block(Bl, Acc)]);
 split_block([{set,[R],As,{bif,N,{f,Lbl}=Fail}}|Is], Bl, Acc) when Lbl =/= 0 ->
     split_block(Is, [], [{bif,N,Fail,As,R}|make_block(Bl, Acc)]);
-split_block([{set,[R],As,{bif,raise,{f,_}=Fail}}|Is], Bl, Acc) ->
-    split_block(Is, [], [{bif,raise,Fail,As,R}|make_block(Bl, Acc)]);
+split_block([{set,[],[],{line,_}=Line},
+             {set,[R],As,{bif,raise,{f,_}=Fail}}|Is], Bl, Acc) ->
+    split_block(Is, [], [{bif,raise,Fail,As,R},Line|make_block(Bl, Acc)]);
 split_block([{set,[R],As,{alloc,Live,{gc_bif,N,{f,Lbl}=Fail}}}|Is], Bl, Acc)
   when Lbl =/= 0 ->
     split_block(Is, [], [{gc_bif,N,Fail,Live,As,R}|make_block(Bl, Acc)]);
@@ -61,8 +62,6 @@ split_block([{set,[D],[S|Puts],{alloc,R,{put_map,Op,{f,Lbl}=Fail}}}|Is],
 			 make_block(Bl, Acc)]);
 split_block([{set,[R],[],{try_catch,Op,L}}|Is], Bl, Acc) ->
     split_block(Is, [], [{Op,R,L}|make_block(Bl, Acc)]);
-split_block([{set,[],[],{line,_}=Line}|Is], Bl, Acc) ->
-    split_block(Is, [], [Line|make_block(Bl, Acc)]);
 split_block([I|Is], Bl, Acc) ->
     split_block(Is, [I|Bl], Acc);
 split_block([], Bl, Acc) -> make_block(Bl, Acc).
diff --git a/lib/compiler/src/beam_type.erl b/lib/compiler/src/beam_type.erl
index 3d842a6fd3..28f36db399 100644
--- a/lib/compiler/src/beam_type.erl
+++ b/lib/compiler/src/beam_type.erl
@@ -17,14 +17,15 @@
 %%
 %% %CopyrightEnd%
 %%
-%% Purpose : Type-based optimisations.
+%% Purpose: Type-based optimisations. See the comment for verified_type/1
+%% the very end of this file for a description of the types in the
+%% type database.
 
 -module(beam_type).
 
 -export([module/2]).
 
--import(lists, [filter/2,foldl/3,keyfind/3,member/2,
-		reverse/1,reverse/2,sort/1]).
+-import(lists, [foldl/3,member/2,reverse/1,reverse/2,sort/1]).
 
 -define(UNICODE_INT, {integer,{0,16#10FFFF}}).
 
@@ -40,11 +41,10 @@ function({function,Name,Arity,CLabel,Asm0}) ->
 	Asm1 = beam_utils:live_opt(Asm0),
 	Asm2 = opt(Asm1, [], tdb_new()),
 	Asm3 = beam_utils:live_opt(Asm2),
-	Asm = beam_utils:delete_live_annos(Asm3),
+	Asm = beam_utils:delete_annos(Asm3),
 	{function,Name,Arity,CLabel,Asm}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -81,96 +81,81 @@ simplify(Is0, TypeDb0) ->
 %%  Basic simplification, mostly tuples, no floating point optimizations.
 
 simplify_basic(Is, Ts) ->
-    simplify_basic_1(Is, Ts, []).
-    
-simplify_basic_1([{set,[D],[{integer,Index},Reg],{bif,element,_}}=I0|Is], Ts0, Acc) ->
-    I = case max_tuple_size(Reg, Ts0) of
-	    Sz when 0 < Index, Index =< Sz ->
-		{set,[D],[Reg],{get_tuple_element,Index-1}};
-	    _Other -> I0
-    end,
-    Ts = update(I, Ts0),
-    simplify_basic_1(Is, Ts, [I|Acc]);
-simplify_basic_1([{set,[D],[TupleReg],{get_tuple_element,0}}=I|Is0], Ts0, Acc) ->
-    case tdb_find(TupleReg, Ts0) of
-	{tuple,_,[Contents]} ->
-	    simplify_basic_1([{set,[D],[Contents],move}|Is0], Ts0, Acc);
-	_ ->
-	    Ts = update(I, Ts0),
-	    simplify_basic_1(Is0, Ts, [I|Acc])
+    simplify_basic(Is, Ts, []).
+
+simplify_basic([I0|Is], Ts0, Acc) ->
+    case simplify_instr(I0, Ts0) of
+        [] ->
+            simplify_basic(Is, Ts0, Acc);
+        [I] ->
+            Ts = update(I, Ts0),
+            simplify_basic(Is, Ts, [I|Acc])
+    end;
+simplify_basic([], Ts, Acc) ->
+    {reverse(Acc),Ts}.
+
+%% simplify_instr(Instruction, Ts) -> [Instruction].
+
+%%  Simplify a simple instruction using type information. Return an
+%%  empty list if the instruction should be removed, or a list with
+%%  the original or modified instruction.
+
+simplify_instr({set,[D],[{integer,Index},Reg],{bif,element,_}}=I, Ts) ->
+    case max_tuple_size(Reg, Ts) of
+        Sz when 0 < Index, Index =< Sz ->
+            [{set,[D],[Reg],{get_tuple_element,Index-1}}];
+        _ -> [I]
     end;
-simplify_basic_1([{set,_,_,{try_catch,_,_}}=I|Is], _Ts, Acc) ->
-    simplify_basic_1(Is, tdb_new(), [I|Acc]);
-simplify_basic_1([{test,is_atom,_,[R]}=I|Is], Ts, Acc) ->
+simplify_instr({test,Test,Fail,[R]}=I, Ts) ->
     case tdb_find(R, Ts) of
-	boolean -> simplify_basic_1(Is, Ts, Acc);
-	_ -> simplify_basic_1(Is, Ts, [I|Acc])
+        any ->
+            [I];
+        Type ->
+            case will_succeed(Test, Type) of
+                yes -> [];
+                no -> [{jump,Fail}];
+                maybe -> [I]
+            end
+    end;
+simplify_instr({set,[D],[TupleReg],{get_tuple_element,0}}=I, Ts) ->
+    case tdb_find(TupleReg, Ts) of
+        {tuple,_,_,[Contents]} ->
+            [{set,[D],[Contents],move}];
+        _ ->
+            [I]
     end;
-simplify_basic_1([{test,is_integer,_,[R]}=I|Is], Ts, Acc) ->
+simplify_instr({test,test_arity,_,[R,Arity]}=I, Ts) ->
     case tdb_find(R, Ts) of
-	integer -> simplify_basic_1(Is, Ts, Acc);
-	{integer,_} -> simplify_basic_1(Is, Ts, Acc);
-	_ -> simplify_basic_1(Is, Ts, [I|Acc])
+        {tuple,exact_size,Arity,_} -> [];
+        _ -> [I]
     end;
-simplify_basic_1([{test,is_tuple,_,[R]}=I|Is], Ts, Acc) ->
+simplify_instr({test,is_eq_exact,Fail,[R,{atom,A}=Atom]}=I, Ts) ->
     case tdb_find(R, Ts) of
-	{tuple,_,_} -> simplify_basic_1(Is, Ts, Acc);
-	_ -> simplify_basic_1(Is, Ts, [I|Acc])
+        {atom,_}=Atom -> [];
+        boolean when is_boolean(A) -> [I];
+        any -> [I];
+        _ -> [{jump,Fail}]
     end;
-simplify_basic_1([{test,test_arity,_,[R,Arity]}=I|Is], Ts0, Acc) ->
-    case tdb_find(R, Ts0) of
-	{tuple,Arity,_} ->
-	    simplify_basic_1(Is, Ts0, Acc);
-	_Other ->
-	    Ts = update(I, Ts0),
-	    simplify_basic_1(Is, Ts, [I|Acc])
+simplify_instr({test,is_record,_,[R,{atom,_}=Tag,{integer,Arity}]}=I, Ts) ->
+    case tdb_find(R, Ts) of
+        {tuple,exact_size,Arity,[Tag]} -> [];
+        _ -> [I]
     end;
-simplify_basic_1([{test,is_map,_,[R]}=I|Is], Ts0, Acc) ->
-    case tdb_find(R, Ts0) of
-	map -> simplify_basic_1(Is, Ts0, Acc);
-	_Other ->
-	    Ts = update(I, Ts0),
-	    simplify_basic_1(Is, Ts, [I|Acc])
+simplify_instr({select,select_val,Reg,_,_}=I, Ts) ->
+    [case tdb_find(Reg, Ts) of
+         {integer,Range} ->
+             simplify_select_val_int(I, Range);
+         boolean ->
+             simplify_select_val_bool(I);
+         _ ->
+             I
+     end];
+simplify_instr({test,bs_test_unit,_,[Src,Unit]}=I, Ts) ->
+    case tdb_find(Src, Ts) of
+        {binary,U} when U rem Unit =:= 0 -> [];
+        _ -> [I]
     end;
-simplify_basic_1([{test,is_nonempty_list,_,[R]}=I|Is], Ts0, Acc) ->
-    case tdb_find(R, Ts0) of
-	nonempty_list -> simplify_basic_1(Is, Ts0, Acc);
-	_Other ->
-	    Ts = update(I, Ts0),
-	    simplify_basic_1(Is, Ts, [I|Acc])
-    end;
-simplify_basic_1([{test,is_eq_exact,Fail,[R,{atom,_}=Atom]}=I|Is0], Ts0, Acc0) ->
-    Acc = case tdb_find(R, Ts0) of
-	      {atom,_}=Atom -> Acc0;
-	      {atom,_} -> [{jump,Fail}|Acc0];
-	      _ -> [I|Acc0]
-	  end,
-    Ts = update(I, Ts0),
-    simplify_basic_1(Is0, Ts, Acc);
-simplify_basic_1([{test,is_record,_,[R,{atom,_}=Tag,{integer,Arity}]}=I|Is], Ts0, Acc) ->
-    case tdb_find(R, Ts0) of
-	{tuple,Arity,[Tag]} ->
-	    simplify_basic_1(Is, Ts0, Acc);
-	_Other ->
-	    Ts = update(I, Ts0),
-	    simplify_basic_1(Is, Ts, [I|Acc])
-    end;
-simplify_basic_1([{select,select_val,Reg,_,_}=I0|Is], Ts, Acc) ->
-    I = case tdb_find(Reg, Ts) of
-	    {integer,Range} ->
-		simplify_select_val_int(I0, Range);
-	    boolean ->
-		simplify_select_val_bool(I0);
-	    _ ->
-		I0
-	end,
-    simplify_basic_1(Is, tdb_new(), [I|Acc]);
-simplify_basic_1([I|Is], Ts0, Acc) ->
-    Ts = update(I, Ts0),
-    simplify_basic_1(Is, Ts, [I|Acc]);
-simplify_basic_1([], Ts, Acc) ->
-    Is = reverse(Acc),
-    {Is,Ts}.
+simplify_instr(I, _) -> [I].
 
 simplify_select_val_int({select,select_val,R,_,L0}=I, {Min,Max}) ->
     Vs = sort([V || {integer,V} <- L0]),
@@ -198,6 +183,53 @@ eq_ranges([H], H, H) -> true;
 eq_ranges([H|T], H, Max) -> eq_ranges(T, H+1, Max);
 eq_ranges(_, _, _) -> false.
 
+%% will_succeed(TestOperation, Type) -> yes|no|maybe.
+%%  Test whether TestOperation applied to an argument of type Type
+%%  will succeed.  Return yes, no, or maybe.
+%%
+%%  Type is a type as described in the comment for verified_type/1 at
+%%  the very end of this file, but it will *never* be 'any'.
+
+will_succeed(is_atom, Type) ->
+    case Type of
+        {atom,_} -> yes;
+        boolean -> yes;
+        _ -> no
+    end;
+will_succeed(is_binary, Type) ->
+    case Type of
+        {binary,U} when U rem 8 =:= 0 -> yes;
+        {binary,_} -> maybe;
+        _ -> no
+    end;
+will_succeed(is_bitstr, Type) ->
+    case Type of
+        {binary,_} -> yes;
+        _ -> no
+    end;
+will_succeed(is_integer, Type) ->
+    case Type of
+        integer -> yes;
+        {integer,_} -> yes;
+        _ -> no
+    end;
+will_succeed(is_map, Type) ->
+    case Type of
+        map -> yes;
+        _ -> no
+    end;
+will_succeed(is_nonempty_list, Type) ->
+    case Type of
+        nonempty_list -> yes;
+        _ -> no
+    end;
+will_succeed(is_tuple, Type) ->
+    case Type of
+        {tuple,_,_,_} -> yes;
+        _ -> no
+    end;
+will_succeed(_, _) -> maybe.
+
 %% simplify_float([Instruction], TypeDatabase) ->
 %%                 {[Instruction],TypeDatabase'} | not_possible
 %%  Simplify floating point operations in blocks.
@@ -227,7 +259,7 @@ simplify_float_1([{set,[D0],[A0],{alloc,_,{gc_bif,'-',{f,0}}}}=I|Is]=Is0,
 	    {D,Rs} = find_dest(D0, Rs1),
 	    Areg = fetch_reg(A, Rs),
 	    Acc = [{set,[D],[Areg],{bif,fnegate,{f,0}}}|clearerror(Acc1)],
-	    Ts = tdb_update([{D0,float}], Ts0),
+	    Ts = tdb_store(D0, float, Ts0),
 	    simplify_float_1(Is, Ts, Rs, Acc);
 	_Other ->
 	    Ts = update(I, Ts0),
@@ -250,7 +282,7 @@ simplify_float_1([{set,[D0],[A0,B0],{alloc,_,{gc_bif,Op0,{f,0}}}}=I|Is]=Is0,
 	    Areg = fetch_reg(A, Rs),
 	    Breg = fetch_reg(B, Rs),
 	    Acc = [{set,[D],[Areg,Breg],{bif,Op,{f,0}}}|clearerror(Acc2)],
-	    Ts = tdb_update([{D0,float}], Ts0),
+	    Ts = tdb_store(D0, float, Ts0),
 	    simplify_float_1(Is, Ts, Rs, Acc)
     end;
 simplify_float_1([{set,_,_,{try_catch,_,_}}=I|Is]=Is0, _Ts, Rs0, Acc0) ->
@@ -301,7 +333,7 @@ clearerror([], OrigIs) -> [{set,[],[],fclearerror}|OrigIs].
 %%  Combine two blocks and eliminate any move instructions that assign
 %%  to registers that are killed later in the block.
 %%
-merge_blocks(B1, [{'%live',_,_}|B2]) ->
+merge_blocks(B1, [{'%anno',_}|B2]) ->
     merge_blocks_1(B1++[{set,[],[],stop_here}|B2]).
 
 merge_blocks_1([{set,[],_,stop_here}|Is]) -> Is;
@@ -350,27 +382,17 @@ flt_need_heap_2({set,_,_,{put_tuple,_}}, H, Fl) ->
     {[],H+1,Fl};
 flt_need_heap_2({set,_,_,put}, H, Fl) ->
     {[],H+1,Fl};
-%% Then the "neutral" instructions. We just pass them.
-flt_need_heap_2({set,[{fr,_}],_,_}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,[],[],fclearerror}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,[],[],fcheckerror}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,_,_,{bif,_,_}}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,_,_,move}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,_,_,{get_tuple_element,_}}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,_,_,get_list}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,_,_,{try_catch,_,_}}, H, Fl) ->
-    {[],H,Fl};
-%% All other instructions should cause the insertion of an allocation
+%% The following instructions cause the insertion of an allocation
 %% instruction if needed.
+flt_need_heap_2({set,_,_,{alloc,_,_}}, H, Fl) ->
+    {flt_alloc(H, Fl),0,0};
+flt_need_heap_2({set,_,_,{set_tuple_element,_}}, H, Fl) ->
+    {flt_alloc(H, Fl),0,0};
+flt_need_heap_2({'%anno',_}, H, Fl) ->
+    {flt_alloc(H, Fl),0,0};
+%% All other instructions are "neutral". We just pass them.
 flt_need_heap_2(_, H, Fl) ->
-    {flt_alloc(H, Fl),0,0}.
+    {[],H,Fl}.
 
 flt_alloc(0, 0) ->
     [];
@@ -393,7 +415,7 @@ build_alloc(Words, Floats) -> {alloc,[{words,Words},{floats,Floats}]}.
 %%  is not continous at an allocation function (e.g. if {x,0} and {x,2}
 %%  are live, but not {x,1}).
 
-flt_liveness([{'%live',_Live,Regs}=LiveInstr|Is]) ->
+flt_liveness([{'%anno',{used,Regs}}=LiveInstr|Is]) ->
     flt_liveness_1(Is, Regs, [LiveInstr]).
 
 flt_liveness_1([{set,Ds,Ss,{alloc,Live0,Alloc}}|Is], Regs0, Acc) ->
@@ -405,7 +427,7 @@ flt_liveness_1([{set,Ds,Ss,{alloc,Live0,Alloc}}|Is], Regs0, Acc) ->
 flt_liveness_1([{set,Ds,_,_}=I|Is], Regs0, Acc) ->
     Regs = x_live(Ds, Regs0),
     flt_liveness_1(Is, Regs, [I|Acc]);
-flt_liveness_1([{'%live',_,_}], _Regs, Acc) ->
+flt_liveness_1([{'%anno',_}], _Regs, Acc) ->
     reverse(Acc).
 
 init_regs(Live) ->
@@ -429,103 +451,104 @@ x_live([], Regs) -> Regs.
 %%  Update the type database to account for executing an instruction.
 %%
 %%  First the cases for instructions inside basic blocks.
-update({'%live',_,_}, Ts) -> Ts;
+update({'%anno',_}, Ts) ->
+    Ts;
 update({set,[D],[S],move}, Ts) ->
     tdb_copy(S, D, Ts);
-update({set,[D],[{integer,I},Reg],{bif,element,_}}, Ts0) ->
-    tdb_update([{Reg,{tuple,I,[]}},{D,kill}], Ts0);
-update({set,[D],[_Index,Reg],{bif,element,_}}, Ts0) ->
-    tdb_update([{Reg,{tuple,0,[]}},{D,kill}], Ts0);
-update({set,[D],Args,{bif,N,_}}, Ts0) ->
+update({set,[D],[Index,Reg],{bif,element,_}}, Ts0) ->
+    MinSize = case Index of
+                  {integer,I} -> I;
+                  _ -> 0
+              end,
+    Ts = tdb_meet(Reg, {tuple,min_size,MinSize,[]}, Ts0),
+    tdb_store(D, any, Ts);
+update({set,[D],Args,{bif,N,_}}, Ts) ->
     Ar = length(Args),
     BoolOp = erl_internal:new_type_test(N, Ar) orelse
 	erl_internal:comp_op(N, Ar) orelse
 	erl_internal:bool_op(N, Ar),
-    case BoolOp of
-	true ->
-	    tdb_update([{D,boolean}], Ts0);
-	false ->
-	    tdb_update([{D,kill}], Ts0)
+    Type = case BoolOp of
+               true -> boolean;
+               false -> unary_op_type(N)
+           end,
+    tdb_store(D, Type, Ts);
+update({set,[D],[S],{get_tuple_element,0}}, Ts0) ->
+    if
+        D =:= S ->
+            tdb_store(D, any, Ts0);
+        true ->
+            Ts = tdb_store(D, {tuple_element,S,0}, Ts0),
+            tdb_store(S, {tuple,min_size,1,[]}, Ts)
     end;
-update({set,[D],[S],{get_tuple_element,0}}, Ts) ->
-    tdb_update([{D,{tuple_element,S,0}}], Ts);
 update({set,[D],[S],{alloc,_,{gc_bif,float,{f,0}}}}, Ts0) ->
     %% Make sure we reject non-numeric literal argument.
     case possibly_numeric(S) of
-	true ->  tdb_update([{D,float}], Ts0);
-	false -> Ts0
+        true ->  tdb_store(D, float, Ts0);
+        false -> Ts0
     end;
 update({set,[D],[S1,S2],{alloc,_,{gc_bif,'band',{f,0}}}}, Ts) ->
-    case keyfind(integer, 1, [S1,S2]) of
-	{integer,N} ->
-	    update_band(N, D, Ts);
-	false ->
-	    tdb_update([{D,integer}], Ts)
-    end;
-update({set,[D],[S1,S2],{alloc,_,{gc_bif,'/',{f,0}}}}, Ts0) ->
+    Type = band_type(S1, S2, Ts),
+    tdb_store(D, Type, Ts);
+update({set,[D],[S1,S2],{alloc,_,{gc_bif,'/',{f,0}}}}, Ts) ->
     %% Make sure we reject non-numeric literals.
     case possibly_numeric(S1) andalso possibly_numeric(S2) of
-	true ->  tdb_update([{D,float}], Ts0);
-	false -> Ts0
+        true -> tdb_store(D, float, Ts);
+        false -> Ts
     end;
 update({set,[D],[S1,S2],{alloc,_,{gc_bif,Op,{f,0}}}}, Ts0) ->
     case op_type(Op) of
 	integer ->
-	    tdb_update([{D,integer}], Ts0);
-	{float,_} ->
-	    case {tdb_find(S1, Ts0),tdb_find(S2, Ts0)} of
-		{float,_} -> tdb_update([{D,float}], Ts0);
-		{_,float} -> tdb_update([{D,float}], Ts0);
-		{_,_} -> tdb_update([{D,kill}], Ts0)
-	    end;
-	unknown ->
-	    tdb_update([{D,kill}], Ts0)
-    end;
-update({set,[],_Src,_Op}, Ts0) -> Ts0;
-update({set,[D],_Src,_Op}, Ts0) ->
-    tdb_update([{D,kill}], Ts0);
-update({set,[D1,D2],_Src,_Op}, Ts0) ->
-    tdb_update([{D1,kill},{D2,kill}], Ts0);
+	    tdb_store(D, integer, Ts0);
+        {float,_} ->
+            case {tdb_find(S1, Ts0),tdb_find(S2, Ts0)} of
+                {float,_} -> tdb_store(D, float, Ts0);
+                {_,float} -> tdb_store(D, float, Ts0);
+                {_,_} -> tdb_store(D, any, Ts0)
+            end;
+        Type ->
+            tdb_store(D, Type, Ts0)
+    end;
+update({set,[D],[_],{alloc,_,{gc_bif,Op,{f,0}}}}, Ts) ->
+    tdb_store(D, unary_op_type(Op), Ts);
+update({set,[],_Src,_Op}, Ts) ->
+    Ts;
+update({set,[D],_Src,_Op}, Ts) ->
+    tdb_store(D, any, Ts);
 update({kill,D}, Ts) ->
-    tdb_update([{D,kill}], Ts);
+    tdb_store(D, any, Ts);
 
 %% Instructions outside of blocks.
-update({test,is_float,_Fail,[Src]}, Ts0) ->
-    tdb_update([{Src,float}], Ts0);
-update({test,test_arity,_Fail,[Src,Arity]}, Ts0) ->
-    tdb_update([{Src,{tuple,Arity,[]}}], Ts0);
-update({test,is_map,_Fail,[Src]}, Ts0) ->
-    tdb_update([{Src,map}], Ts0);
+update({test,test_arity,_Fail,[Src,Arity]}, Ts) ->
+    tdb_meet(Src, {tuple,exact_size,Arity,[]}, Ts);
 update({get_map_elements,_,Src,{list,Elems0}}, Ts0) ->
+    Ts1 = tdb_meet(Src, map, Ts0),
     {_Ss,Ds} = beam_utils:split_even(Elems0),
-    Elems = [{Dst,kill} || Dst <- Ds],
-    tdb_update([{Src,map}|Elems], Ts0);
-update({test,is_nonempty_list,_Fail,[Src]}, Ts0) ->
-    tdb_update([{Src,nonempty_list}], Ts0);
-update({test,is_eq_exact,_,[Reg,{atom,_}=Atom]}, Ts) ->
-    case tdb_find(Reg, Ts) of
-	error ->
-	    Ts;
-	{tuple_element,TupleReg,0} ->
-	    tdb_update([{TupleReg,{tuple,1,[Atom]}}], Ts);
-	_ ->
-	    Ts
-    end;
+    foldl(fun(Dst, A) -> tdb_store(Dst, any, A) end, Ts1, Ds);
+update({test,is_eq_exact,_,[Reg,{atom,_}=Atom]}, Ts0) ->
+    Ts = case tdb_find_source_tuple(Reg, Ts0) of
+             {source_tuple,TupleReg} ->
+                 tdb_meet(TupleReg, {tuple,min_size,1,[Atom]}, Ts0);
+             none ->
+                 Ts0
+         end,
+    tdb_meet(Reg, Atom, Ts);
 update({test,is_record,_Fail,[Src,Tag,{integer,Arity}]}, Ts) ->
-    tdb_update([{Src,{tuple,Arity,[Tag]}}], Ts);
+    tdb_meet(Src, {tuple,exact_size,Arity,[Tag]}, Ts);
 
-%% Binary matching
+%% Binaries and binary matching.
 
 update({test,bs_get_integer2,_,_,Args,Dst}, Ts) ->
-    tdb_update([{Dst,get_bs_integer_type(Args)}], Ts);
+    tdb_store(Dst, get_bs_integer_type(Args), Ts);
 update({test,bs_get_utf8,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,?UNICODE_INT}], Ts);
+    tdb_store(Dst, ?UNICODE_INT, Ts);
 update({test,bs_get_utf16,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,?UNICODE_INT}], Ts);
+    tdb_store(Dst, ?UNICODE_INT, Ts);
 update({test,bs_get_utf32,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,?UNICODE_INT}], Ts);
+    tdb_store(Dst, ?UNICODE_INT, Ts);
+update({bs_init,_,{bs_init2,_,_},_,_,Dst}, Ts) ->
+    tdb_store(Dst, {binary,8}, Ts);
 update({bs_init,_,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,kill}], Ts);
+    tdb_store(Dst, {binary,1}, Ts);
 update({bs_put,_,_,_}, Ts) ->
     Ts;
 update({bs_save2,_,_}, Ts) ->
@@ -533,14 +556,31 @@ update({bs_save2,_,_}, Ts) ->
 update({bs_restore2,_,_}, Ts) ->
     Ts;
 update({bs_context_to_binary,Dst}, Ts) ->
-    tdb_update([{Dst,kill}], Ts);
-update({test,bs_start_match2,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,kill}], Ts);
-update({test,bs_get_binary2,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,kill}], Ts);
+    tdb_store(Dst, {binary,1}, Ts);
+update({test,bs_start_match2,_,_,[Src,_],Dst}, Ts0) ->
+    Ts = tdb_meet(Src, {binary,1}, Ts0),
+    tdb_copy(Src, Dst, Ts);
+update({test,bs_get_binary2,_,_,[_,_,Unit,_],Dst}, Ts) ->
+    true = is_integer(Unit),                    %Assertion.
+    tdb_store(Dst, {binary,Unit}, Ts);
 update({test,bs_get_float2,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,float}], Ts);
-
+    tdb_store(Dst, float, Ts);
+update({test,bs_test_unit,_,[Src,Unit]}, Ts) ->
+    tdb_meet(Src, {binary,Unit}, Ts);
+
+%% Other test instructions
+update({test,Test,_Fail,[Src]}, Ts) ->
+    Type = case Test of
+               is_binary -> {binary,8};
+               is_bitstr -> {binary,1};
+               is_boolean -> boolean;
+               is_float -> float;
+               is_integer -> integer;
+               is_map -> map;
+               is_nonempty_list -> nonempty_list;
+               _ -> any
+           end,
+    tdb_meet(Src, Type, Ts);
 update({test,_Test,_Fail,_Other}, Ts) ->
     Ts;
 
@@ -548,13 +588,13 @@ update({test,_Test,_Fail,_Other}, Ts) ->
 
 update({call_ext,Ar,{extfunc,math,Math,Ar}}, Ts) ->
     case is_math_bif(Math, Ar) of
-	true -> tdb_update([{{x,0},float}], Ts);
+	true -> tdb_store({x,0}, float, Ts);
 	false -> tdb_kill_xregs(Ts)
     end;
 update({call_ext,3,{extfunc,erlang,setelement,3}}, Ts0) ->
     Ts = tdb_kill_xregs(Ts0),
     case tdb_find({x,1}, Ts0) of
-	{tuple,Sz,_}=T0 ->
+	{tuple,SzKind,Sz,_}=T0 ->
 	    T = case tdb_find({x,0}, Ts0) of
 		    {integer,{I,I}} when I > 1 ->
 			%% First element is not changed. The result
@@ -563,9 +603,9 @@ update({call_ext,3,{extfunc,erlang,setelement,3}}, Ts0) ->
 		    _ ->
 			%% Position is 1 or unknown. May change the
 			%% first element of the tuple.
-			{tuple,Sz,[]}
+			{tuple,SzKind,Sz,[]}
 		end,
-	    tdb_update([{{x,0},T}], Ts);
+            tdb_store({x,0}, T, Ts);
 	_ ->
 	    Ts
     end;
@@ -576,24 +616,32 @@ update({call_fun, _}, Ts) -> tdb_kill_xregs(Ts);
 update({apply, _}, Ts) -> tdb_kill_xregs(Ts);
 
 update({line,_}, Ts) -> Ts;
+update({'%',_}, Ts) -> Ts;
 
 %% The instruction is unknown.  Kill all information.
 update(_I, _Ts) -> tdb_new().
 
-update_band(N, Reg, Ts) ->
-    Type = update_band_1(N, 0),
-    tdb_update([{Reg,Type}], Ts).
+band_type({integer,Int}, Other, Ts) ->
+    band_type_1(Int, Other, Ts);
+band_type(Other, {integer,Int}, Ts) ->
+    band_type_1(Int, Other, Ts);
+band_type(_, _, _) -> integer.
 
-update_band_1(N, Bits) when Bits < 64 ->
+band_type_1(Int, OtherSrc, Ts) ->
+    Type = band_type_2(Int, 0),
+    OtherType = tdb_find(OtherSrc, Ts),
+    meet(Type, OtherType).
+
+band_type_2(N, Bits) when Bits < 64 ->
     case 1 bsl Bits of
 	P when P =:= N + 1 ->
 	    {integer,{0,N}};
 	P when P > N + 1 ->
 	    integer;
 	_ ->
-	    update_band_1(N, Bits+1)
+	    band_type_2(N, Bits+1)
     end;
-update_band_1(_, _) ->
+band_type_2(_, _) ->
     %% Negative or large positive number. Give up.
     integer.
 
@@ -647,7 +695,7 @@ possibly_numeric(_) -> false.
 
 max_tuple_size(Reg, Ts) ->
     case tdb_find(Reg, Ts) of
-	{tuple,Sz,_} -> Sz;
+	{tuple,_,Sz,_} -> Sz;
 	_Other -> 0
     end.
 
@@ -717,7 +765,15 @@ op_type('bxor') -> integer;
 op_type('bsl') -> integer;
 op_type('bsr') -> integer;
 op_type('div') -> integer;
-op_type(_) -> unknown.
+op_type(_) -> any.
+
+unary_op_type(bit_size) -> integer;
+unary_op_type(byte_size) -> integer;
+unary_op_type(length) -> integer;
+unary_op_type(map_size) -> integer;
+unary_op_type(size) -> integer;
+unary_op_type(tuple_size) -> integer;
+unary_op_type(_) -> any.
 
 flush(Rs, [{set,[_],[_,_,_],{bif,is_record,_}}|_]=Is0, Acc0) ->
     Acc = flush_all(Rs, Is0, Acc0),
@@ -800,37 +856,39 @@ checkerror_1([], OrigIs) -> OrigIs.
 checkerror_2(OrigIs) -> [{set,[],[],fcheckerror}|OrigIs].
 
 
-%%% Routines for maintaining a type database.  The type database 
+%%% Routines for maintaining a type database.  The type database
 %%% associates type information with registers.
 %%%
-%%% {tuple,Size,First} means that the corresponding register contains a
-%%% tuple with *at least* Size elements.  An tuple with unknown
-%%% size is represented as {tuple,0,[]}. First is either [] (meaning that
-%%% the tuple's first element is unknown) or [FirstElement] (the contents
-%%% of the first element).
-%%%
-%%% 'float' means that the register contains a float.
-%%%
-%%% 'integer' or {integer,{Min,Max}} that the register contains an
-%%% integer.
+%%% See the comment for verified_type/1 at the end of module for
+%%% a description of the possible types.
 
 %% tdb_new() -> EmptyDataBase
 %%  Creates a new, empty type database.
 
 tdb_new() -> [].
 
-%% tdb_find(Register, Db) -> Information|error
+%% tdb_find(Register, Db) -> Type
 %%  Returns type information or the atom error if there is no type
 %%  information available for Register.
+%%
+%%  See the comment for verified_type/1 at the end of module for
+%%  a description of the possible types.
 
-tdb_find({x,_}=K, Ts) -> tdb_find_1(K, Ts);
-tdb_find({y,_}=K, Ts) -> tdb_find_1(K, Ts);
-tdb_find(_, _) -> error.
+tdb_find(Reg, Ts) ->
+    case tdb_find_raw(Reg, Ts) of
+        {tuple_element,_,_} -> any;
+        Type -> Type
+    end.
 
-tdb_find_1(K, Ts) ->
-    case orddict:find(K, Ts) of
-	{ok,Val} -> Val;
-	error -> error
+%% tdb_find_source_tuple(Register, Ts) -> {source_tuple,Register} | 'none'.
+%%  Find the tuple whose first element was fetched to the register Register.
+
+tdb_find_source_tuple(Reg, Ts) ->
+    case tdb_find_raw(Reg, Ts) of
+        {tuple_element,Src,0} ->
+            {source_tuple,Src};
+        _ ->
+            none
     end.
 
 %% tdb_copy(Source, Dest, Db) -> Db'
@@ -838,9 +896,9 @@ tdb_find_1(K, Ts) ->
 %%  as the Source.
 
 tdb_copy({Tag,_}=S, D, Ts) when Tag =:= x; Tag =:= y ->
-    case tdb_find(S, Ts) of
-	error -> orddict:erase(D, Ts);
-	Type -> orddict:store(D, Type, Ts)
+    case tdb_find_raw(S, Ts) of
+        any -> orddict:erase(D, Ts);
+        Type -> orddict:store(D, Type, Ts)
     end;
 tdb_copy(Literal, D, Ts) ->
     Type = case Literal of
@@ -851,15 +909,90 @@ tdb_copy(Literal, D, Ts) ->
 	       {literal,#{}} -> map;
 	       {literal,Tuple} when tuple_size(Tuple) >= 1 ->
 		   Lit = tag_literal(element(1, Tuple)),
-		   {tuple,tuple_size(Tuple),[Lit]};
-	       _ -> term
+		   {tuple,exact_size,tuple_size(Tuple),[Lit]};
+	       _ -> any
 	   end,
-    if
-	Type =:= term ->
-	    orddict:erase(D, Ts);
-	true ->
-	    verify_type(Type),
-	    orddict:store(D, Type, Ts)
+    tdb_store(D, verified_type(Type), Ts).
+
+%% tdb_store(Register, Type, Ts0) -> Ts.
+%%  Store a new type for register Register. Return the update type
+%%  database. Use this function when a new value is assigned to
+%%  a register.
+%%
+%%  See the comment for verified_type/1 at the end of module for
+%%  a description of the possible types.
+
+tdb_store(Reg, any, Ts) ->
+    erase(Reg, Ts);
+tdb_store(Reg, Type, Ts) ->
+    store(Reg, verified_type(Type), Ts).
+
+store(Key, New, [{K,_}|_]=Dict) when Key < K ->
+    [{Key,New}|Dict];
+store(Key, New, [{K,Val}=E|Dict]) when Key > K ->
+    case Val of
+        {tuple_element,Key,_} -> store(Key, New, Dict);
+        _ -> [E|store(Key, New, Dict)]
+    end;
+store(Key, New, [{_K,Old}|Dict]) ->		%Key == K
+    case Old of
+        {tuple,_,_,_} ->
+            [{Key,New}|erase_tuple_element(Key, Dict)];
+        _ ->
+            [{Key,New}|Dict]
+    end;
+store(Key, New, []) -> [{Key,New}].
+
+erase(Key, [{K,_}=E|Dict]) when Key < K ->
+    [E|Dict];
+erase(Key, [{K,Val}=E|Dict]) when Key > K ->
+    case Val of
+        {tuple_element,Key,_} -> erase(Key, Dict);
+        _ -> [E|erase(Key, Dict)]
+    end;
+erase(Key, [{_K,Val}|Dict]) ->                 %Key == K
+    case Val of
+        {tuple,_,_,_} -> erase_tuple_element(Key, Dict);
+        _ -> Dict
+    end;
+erase(_, []) -> [].
+
+erase_tuple_element(Key, [{_,{tuple_element,Key,_}}|Dict]) ->
+    erase_tuple_element(Key, Dict);
+erase_tuple_element(Key, [E|Dict]) ->
+    [E|erase_tuple_element(Key, Dict)];
+erase_tuple_element(_Key, []) -> [].
+
+%% tdb_meet(Register, Type, Ts0) -> Ts.
+%%  Update information of a register that is used as the source for an
+%%  instruction. The type Type will be combined using the meet operation
+%%  with the previous type information for the register, resulting in
+%%  narrower (more specific) type.
+%%
+%%  For example, if the previous type is {tuple,min_size,2,[]} and the
+%%  the new type is {tuple,exact_size,5,[]}, the meet of the types will
+%%  be {tuple,exact_size,5,[]}.
+%%
+%%  See the comment for verified_type/1 at the end of module for
+%%  a description of the possible types.
+
+tdb_meet(Reg, NewType, Ts) ->
+    Update = fun(Type0) -> meet(Type0, NewType) end,
+    orddict:update(Reg, Update, NewType, Ts).
+
+%%%
+%%% Here follows internal helper functions for accessing and
+%%% updating the type database.
+%%%
+
+tdb_find_raw({x,_}=K, Ts) -> tdb_find_raw_1(K, Ts);
+tdb_find_raw({y,_}=K, Ts) -> tdb_find_raw_1(K, Ts);
+tdb_find_raw(_, _) -> any.
+
+tdb_find_raw_1(K, Ts) ->
+    case orddict:find(K, Ts) of
+	{ok,Val} -> Val;
+	error -> any
     end.
 
 tag_literal(A) when is_atom(A) -> {atom,A};
@@ -868,45 +1001,6 @@ tag_literal(I) when is_integer(I) -> {integer,I};
 tag_literal([]) -> nil;
 tag_literal(Lit) -> {literal,Lit}.
 
-%% tdb_update([UpdateOp], Db) -> NewDb
-%%        UpdateOp = {Register,kill}|{Register,NewInfo}
-%%  Updates a type database.  If a 'kill' operation is given, the type
-%%  information for that register will be removed from the database.
-%%  A kill operation takes precedence over other operations for the same
-%%  register (i.e. [{{x,0},kill},{{x,0},{tuple,5,[]}}] means that the
-%%  the existing type information, if any, will be discarded, and the
-%%  the '{tuple,5,[]}' information ignored.
-%%
-%%  If NewInfo information is given and there exists information about
-%%  the register, the old and new type information will be merged.
-%%  For instance, {tuple,5,_} and {tuple,10,_} will be merged to produce
-%%  {tuple,10,_}.
-
-tdb_update(Uis0, Ts0) ->
-    Uis1 = filter(fun ({{x,_},_Op}) -> true;
-		      ({{y,_},_Op}) -> true;
-		      (_) -> false
-		  end, Uis0),
-    tdb_update1(lists:sort(Uis1), Ts0).
-
-tdb_update1([{Key,kill}|Ops], [{K,_Old}|_]=Db) when Key < K ->
-    tdb_update1(remove_key(Key, Ops), Db);
-tdb_update1([{Key,Type}=New|Ops], [{K,_Old}|_]=Db) when Key < K ->
-    verify_type(Type),
-    [New|tdb_update1(Ops, Db)];
-tdb_update1([{Key,kill}|Ops], [{Key,_}|Db]) ->
-    tdb_update1(remove_key(Key, Ops), Db);
-tdb_update1([{Key,NewInfo}|Ops], [{Key,OldInfo}|Db]) ->
-    [{Key,merge_type_info(NewInfo, OldInfo)}|tdb_update1(Ops, Db)];
-tdb_update1([{_,_}|_]=Ops, [Old|Db]) ->
-    [Old|tdb_update1(Ops, Db)];
-tdb_update1([{Key,kill}|Ops], []) ->
-    tdb_update1(remove_key(Key, Ops), []);
-tdb_update1([{_,Type}=New|Ops], []) ->
-    verify_type(Type),
-    [New|tdb_update1(Ops, [])];
-tdb_update1([], Db) -> Db.
-
 %% tdb_kill_xregs(Db) -> NewDb
 %%  Kill all information about x registers. Also kill all tuple_element
 %%  dependencies from y registers to x registers.
@@ -915,37 +1009,106 @@ tdb_kill_xregs([{{x,_},_Type}|Db]) -> tdb_kill_xregs(Db);
 tdb_kill_xregs([{{y,_},{tuple_element,{x,_},_}}|Db]) -> tdb_kill_xregs(Db);
 tdb_kill_xregs([Any|Db]) -> [Any|tdb_kill_xregs(Db)];
 tdb_kill_xregs([]) -> [].
-    
-remove_key(Key, [{Key,_Op}|Ops]) -> remove_key(Key, Ops);
-remove_key(_, Ops) -> Ops.
-    
-merge_type_info(I, I) -> I;
-merge_type_info({tuple,Sz1,Same}, {tuple,Sz2,Same}=Max) when Sz1 < Sz2 ->
+
+%% meet(Type1, Type2) -> Type
+%%  Returns the "meet" of Type1 and Type2. The meet is a narrower
+%%  type than Type1 and Type2. For example:
+%%
+%%     meet(integer, {integer,{0,3}}) -> {integer,{0,3}}
+%%
+%%  The meet for two different types result in 'none', which is
+%%  the bottom element for our type lattice:
+%%
+%%     meet(integer, map) -> none
+
+meet(T, T) ->
+    T;
+meet({integer,_}=T, integer) ->
+    T;
+meet(integer, {integer,_}=T) ->
+    T;
+meet({integer,{Min1,Max1}}, {integer,{Min2,Max2}}) ->
+    {integer,{max(Min1, Min2),min(Max1, Max2)}};
+meet({tuple,min_size,Sz1,Same}, {tuple,min_size,Sz2,Same}=Max) when Sz1 < Sz2 ->
     Max;
-merge_type_info({tuple,Sz1,Same}=Max, {tuple,Sz2,Same}) when Sz1 > Sz2 ->
+meet({tuple,min_size,Sz1,Same}=Max, {tuple,min_size,Sz2,Same}) when Sz1 > Sz2 ->
     Max;
-merge_type_info({tuple,Sz1,[]}, {tuple,_Sz2,First}=Tuple2) ->
-    merge_type_info({tuple,Sz1,First}, Tuple2);
-merge_type_info({tuple,_Sz1,First}=Tuple1, {tuple,Sz2,_}) ->
-    merge_type_info(Tuple1, {tuple,Sz2,First});
-merge_type_info(integer, {integer,_}=Int) ->
-    Int;
-merge_type_info({integer,_}=Int, integer) ->
-    Int;
-merge_type_info({integer,{Min1,Max1}}, {integer,{Min2,Max2}}) ->
-    {integer,{max(Min1, Min2),min(Max1, Max2)}};
-merge_type_info(NewType, _) ->
-    verify_type(NewType),
-    NewType.
-
-verify_type({atom,_}) -> ok;
-verify_type(boolean) -> ok;
-verify_type(integer) -> ok;
-verify_type({integer,{Min,Max}})
-  when is_integer(Min), is_integer(Max) -> ok;
-verify_type(map) -> ok;
-verify_type(nonempty_list) -> ok;
-verify_type({tuple,Sz,[]}) when is_integer(Sz) -> ok;
-verify_type({tuple,Sz,[_]}) when is_integer(Sz) -> ok;
-verify_type({tuple_element,_,_}) -> ok;
-verify_type(float) -> ok.
+meet({tuple,exact_size,_,Same}=Exact, {tuple,_,_,Same}) ->
+    Exact;
+meet({tuple,_,_,Same},{tuple,exact_size,_,Same}=Exact) ->
+    Exact;
+meet({tuple,SzKind1,Sz1,[]}, {tuple,_SzKind2,_Sz2,First}=Tuple2) ->
+    meet({tuple,SzKind1,Sz1,First}, Tuple2);
+meet({tuple,_SzKind1,_Sz1,First}=Tuple1, {tuple,SzKind2,Sz2,_}) ->
+    meet(Tuple1, {tuple,SzKind2,Sz2,First});
+meet({binary,U1}, {binary,U2}) ->
+    {binary,max(U1, U2)};
+meet(T1, T2) ->
+    case is_any(T1) of
+        true ->
+            verified_type(T2);
+        false ->
+            case is_any(T2) of
+                true ->
+                    verified_type(T1);
+                false ->
+                    none                        %The bottom element.
+            end
+    end.
+
+is_any(any) -> true;
+is_any({tuple_element,_,_}) -> true;
+is_any(_) -> false.
+
+%% verified_type(Type) -> Type
+%%  Returns the passed in type if it is one of the defined types.
+%%  Crashes if there is anything wrong with the type.
+%%
+%%  Here are all possible types:
+%%
+%%  any                  Any Erlang term (top element for the type lattice).
+%%
+%%  {atom,Atom}          The specific atom Atom.
+%%  {binary,Unit}        Binary/bitstring aligned to unit Unit.
+%%  boolean              'true' | 'false'
+%%  float                Floating point number.
+%%  integer              Integer.
+%%  {integer,{Min,Max}}  Integer in the inclusive range Min through Max.
+%%  map                  Map.
+%%  nonempty_list        Nonempty list.
+%%  {tuple,_,_,_}        Tuple (see below).
+%%
+%%  none                 No type (bottom element for the type lattice).
+%%
+%%  {tuple,min_size,Size,First} means that the corresponding register
+%%  contains a tuple with *at least* Size elements (conversely,
+%%  {tuple,exact_size,Size,First} means that it contains a tuple with
+%%  *exactly* Size elements). An tuple with unknown size is
+%%  represented as {tuple,min_size,0,[]}. First is either [] (meaning
+%%  that the tuple's first element is unknown) or [FirstElement] (the
+%%  contents of the first element).
+%%
+%%  There is also a pseudo-type called {tuple_element,_,_}:
+%%
+%%    {tuple_element,SrcTuple,ElementNumber}
+%%
+%%  that does not provide any information about the type of the
+%%  register itself, but provides a link back to the source tuple that
+%%  the register got its value from.
+%%
+%%  Note that {tuple_element,_,_} will *never* be returned by tdb_find/2.
+%%  Use tdb_find_source_tuple/2 to locate the source tuple for a register.
+
+verified_type(any=T) -> T;
+verified_type({atom,_}=T) -> T;
+verified_type({binary,U}=T) when is_integer(U) -> T;
+verified_type(boolean=T) -> T;
+verified_type(integer=T) -> T;
+verified_type({integer,{Min,Max}}=T)
+  when is_integer(Min), is_integer(Max) -> T;
+verified_type(map=T) -> T;
+verified_type(nonempty_list=T) -> T;
+verified_type({tuple,_,Sz,[]}=T) when is_integer(Sz) -> T;
+verified_type({tuple,_,Sz,[_]}=T) when is_integer(Sz) -> T;
+verified_type({tuple_element,_,_}=T) -> T;
+verified_type(float=T) -> T.
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index 00f396c246..814cfb8265 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -22,17 +22,20 @@
 
 -module(beam_utils).
 -export([is_killed_block/2,is_killed/3,is_killed_at/3,
-	 is_not_used/3,
+	 is_not_used/3,usage/3,
 	 empty_label_index/0,index_label/3,index_labels/1,replace_labels/4,
 	 code_at/2,bif_to_test/3,is_pure_test/1,
-	 live_opt/1,delete_live_annos/1,combine_heap_needs/2,
-	 split_even/1]).
+	 live_opt/1,delete_annos/1,combine_heap_needs/2,
+         anno_defs/1,
+	 split_even/1
+        ]).
 
 -export_type([code_index/0,module_code/0,instruction/0]).
 
--import(lists, [map/2,member/2,sort/1,reverse/1,splitwith/2]).
+-import(lists, [flatmap/2,map/2,member/2,sort/1,reverse/1,splitwith/2]).
 
--define(is_const(Val), (element(1, Val) =:= integer orelse
+-define(is_const(Val), (Val =:= nil orelse
+                        element(1, Val) =:= integer orelse
                         element(1, Val) =:= float orelse
                         element(1, Val) =:= atom orelse
                         element(1, Val) =:= literal)).
@@ -59,6 +62,23 @@
 	{lbl :: code_index(),            %Label to code index.
 	 res :: result_cache()}).        %Result cache for each label.
 
+%% usage(Register, [Instruction], State) -> killed|not_used|used.
+%%  Determine the usage of Register in the instruction sequence.
+%%  The return value is one of:
+%%
+%%  killed   - The register is not used in any way.
+%%  not_used - The register is referenced only by an allocating instruction
+%%             (the actual value does not matter).
+%%  used     - The register is used (its value do matter).
+
+-spec usage(beam_asm:reg(), [instruction()], code_index()) ->
+  'killed' | 'not_used' | 'used'.
+
+usage(R, Is, D) ->
+    St = #live{lbl=D,res=gb_trees:empty()},
+    {Usage,_} = check_liveness(R, Is, St),
+    Usage.
+
 
 %% is_killed_block(Register, [Instruction]) -> true|false
 %%  Determine whether a register is killed by the instruction sequence inside
@@ -75,7 +95,7 @@ is_killed_block({x,X}, [{set,_,_,{alloc,Live,_}}|_]) ->
     X >= Live;
 is_killed_block(R, [{set,Ds,Ss,_Op}|Is]) ->
     not member(R, Ss) andalso (member(R, Ds) orelse is_killed_block(R, Is));
-is_killed_block(R, [{'%live',_,Regs}|Is]) ->
+is_killed_block(R, [{'%anno',{used,Regs}}|Is]) ->
     case R of
 	{x,X} when (Regs bsr X) band 1 =:= 0 -> true;
 	_ -> is_killed_block(R, Is)
@@ -98,6 +118,7 @@ is_killed(R, Is, D) ->
     St = #live{lbl=D,res=gb_trees:empty()},
     case check_liveness(R, Is, St) of
 	{killed,_} -> true;
+	{exit_not_used,_} -> false;
 	{_,_} -> false
     end.
 
@@ -110,6 +131,7 @@ is_killed_at(R, Lbl, D) when is_integer(Lbl) ->
     St0 = #live{lbl=D,res=gb_trees:empty()},
     case check_liveness_at(R, Lbl, St0) of
 	{killed,_} -> true;
+	{exit_not_used,_} -> false;
 	{_,_} -> false
     end.
 
@@ -126,6 +148,7 @@ is_not_used(R, Is, D) ->
     St = #live{lbl=D,res=gb_trees:empty()},
     case check_liveness(R, Is, St) of
 	{used,_} -> false;
+	{exit_not_used,_} -> true;
 	{_,_} -> true
     end.
 
@@ -247,7 +270,7 @@ is_pure_test({test,Op,_,Ops}) ->
 %%  Go through the instruction sequence in reverse execution
 %%  order, keep track of liveness and remove 'move' instructions
 %%  whose destination is a register that will not be used.
-%%  Also insert {'%live',Live,Regs} annotations at the beginning
+%%  Also insert {used,Regs} annotations at the beginning
 %%  and end of each block.
 
 -spec live_opt([instruction()]) -> [instruction()].
@@ -262,35 +285,52 @@ live_opt(Is0) ->
     Bef ++ [Fi|live_opt(reverse(Is), 0, D, [])].
 
 
-%% delete_live_annos([Instruction]) -> [Instruction].
-%%  Delete all live annotations.
+%% delete_annos([Instruction]) -> [Instruction].
+%%  Delete all annotations.
 
--spec delete_live_annos([instruction()]) -> [instruction()].
+-spec delete_annos([instruction()]) -> [instruction()].
 
-delete_live_annos([{block,Bl0}|Is]) ->
-    case delete_live_annos(Bl0) of
-	[] -> delete_live_annos(Is);
-	[_|_]=Bl -> [{block,Bl}|delete_live_annos(Is)]
+delete_annos([{block,Bl0}|Is]) ->
+    case delete_annos(Bl0) of
+	[] -> delete_annos(Is);
+	[_|_]=Bl -> [{block,Bl}|delete_annos(Is)]
     end;
-delete_live_annos([{'%live',_,_}|Is]) ->
-    delete_live_annos(Is);
-delete_live_annos([I|Is]) ->
-    [I|delete_live_annos(Is)];
-delete_live_annos([]) -> [].
-    
+delete_annos([{'%anno',_}|Is]) ->
+    delete_annos(Is);
+delete_annos([I|Is]) ->
+    [I|delete_annos(Is)];
+delete_annos([]) -> [].
+
 %% combine_heap_needs(HeapNeed1, HeapNeed2) -> HeapNeed
 %%  Combine the heap need for two allocation instructions.
 
--spec combine_heap_needs(term(), term()) -> term().
+-type heap_need_tag() :: 'floats' | 'words'.
+-type heap_need() :: non_neg_integer() |
+                     {'alloc',[{heap_need_tag(),non_neg_integer()}]}.
+-spec combine_heap_needs(heap_need(), heap_need()) -> heap_need().
 
-combine_heap_needs({alloc,Alloc1}, {alloc,Alloc2}) ->
-    {alloc,combine_alloc_lists(Alloc1, Alloc2)};
-combine_heap_needs({alloc,Alloc}, Words) when is_integer(Words) ->
-    {alloc,combine_alloc_lists(Alloc, [{words,Words}])};
-combine_heap_needs(Words, {alloc,Alloc}) when is_integer(Words) ->
-    {alloc,combine_alloc_lists(Alloc, [{words,Words}])};
 combine_heap_needs(H1, H2) when is_integer(H1), is_integer(H2) ->
-    H1+H2.
+    H1 + H2;
+combine_heap_needs(H1, H2) ->
+    {alloc,combine_alloc_lists([H1,H2])}.
+
+
+%% anno_defs(Instructions) -> Instructions'
+%%  Add {def,RegisterBitmap} annotations to the beginning of
+%%  each block.  Iff bit X is set in the the bitmap, it means
+%%  that {x,X} is defined when the block is entered.
+
+-spec anno_defs([instruction()]) -> [instruction()].
+
+anno_defs(Is0) ->
+    {Bef,[Fi|Is1]} =
+	splitwith(fun({func_info,_,_,_}) -> false;
+		     (_) -> true
+		  end, Is0),
+    {func_info,_,_,Arity} = Fi,
+    Regs = init_def_regs(Arity),
+    Is = defs(Is1, Regs, #{}),
+    Bef ++ [Fi|Is].
 
 %% split_even/1
 %% [1,2,3,4,5,6] -> {[1,3,5],[2,4,6]}
@@ -299,7 +339,6 @@ combine_heap_needs(H1, H2) when is_integer(H1), is_integer(H2) ->
 
 split_even(Rs) -> split_even(Rs, [], []).
 
-
 %%%
 %%% Local functions.
 %%%
@@ -311,12 +350,19 @@ split_even(Rs) -> split_even(Rs, [], []).
 %%
 %%    killed - Reg is assigned or killed by an allocation instruction.
 %%    not_used - the value of Reg is not used, but Reg must not be garbage
+%%    exit_not_used - the value of Reg is not used, but must not be garbage
+%%                    because the stack will be scanned because an
+%%                    exit BIF will raise an exception
 %%    used - Reg is used
 
 check_liveness(R, [{block,Blk}|Is], St0) ->
     case check_liveness_block(R, Blk, St0) of
 	{transparent,St1} ->
 	    check_liveness(R, Is, St1);
+	{alloc_used,St1} ->
+            %% Used by an allocating instruction, but value not referenced.
+            %% Must check the rest of the instructions.
+	    not_used(check_liveness(R, Is, St1));
 	{Other,_}=Res when is_atom(Other) ->
 	    Res
     end;
@@ -330,6 +376,8 @@ check_liveness(R, [{test,_,{f,Fail},As}|Is], St0) ->
 	    case check_liveness_at(R, Fail, St0) of
 		{killed,St1} ->
 		    check_liveness(R, Is, St1);
+		{exit_not_used,St1} ->
+		    check_liveness(R, Is, St1);
 		{not_used,St1} ->
 		    not_used(check_liveness(R, Is, St1));
 		{used,_}=Used ->
@@ -349,6 +397,8 @@ check_liveness(R, [{jump,{f,F}}|_], St) ->
     check_liveness_at(R, F, St);
 check_liveness(R, [{case_end,Used}|_], St) -> 
     check_liveness_ret(R, Used, St);
+check_liveness(R, [{try_case_end,Used}|_], St) ->
+    check_liveness_ret(R, Used, St);
 check_liveness(R, [{badmatch,Used}|_], St) ->
     check_liveness_ret(R, Used, St);
 check_liveness(_, [if_end|_], St) ->
@@ -375,17 +425,27 @@ check_liveness(R, [{bs_init,_,_,none,Ss,Dst}|Is], St) ->
 check_liveness(R, [{bs_init,_,_,Live,Ss,Dst}|Is], St) ->
     case R of
 	{x,X} ->
-	    case X < Live orelse member(R, Ss) of
-		true -> {used,St};
-		false -> {killed,St}
+            case member(R, Ss) of
+                true ->
+                    {used,St};
+                false ->
+                    if
+                        X < Live ->
+                            not_used(check_liveness(R, Is, St));
+                        true ->
+                            {killed,St}
+                    end
 	    end;
 	{y,_} ->
 	    case member(R, Ss) of
 		true -> {used,St};
 		false ->
+                    %% If the exception is taken, the stack may
+                    %% be scanned. Therefore the register is not
+                    %% guaranteed to be killed.
 		    if
-			R =:= Dst -> {killed,St};
-			true -> check_liveness(R, Is, St)
+                        R =:= Dst -> {not_used,St};
+			true -> not_used(check_liveness(R, Is, St))
 		    end
 	    end
     end;
@@ -419,7 +479,7 @@ check_liveness(R, [{call_ext,Live,_}=I|Is], St) ->
 		    %% We must make sure we don't check beyond this
 		    %% instruction or we will fall through into random
 		    %% unrelated code and get stuck in a loop.
-		    {killed,St}
+		    {exit_not_used,St}
 	    end
     end;
 check_liveness(R, [{call_fun,Live}|Is], St) ->
@@ -467,16 +527,12 @@ check_liveness(R, [{make_fun2,_,_,_,NumFree}|Is], St) ->
 	{x,_} -> {killed,St};
 	{y,_} -> not_used(check_liveness(R, Is, St))
     end;
-check_liveness({x,_}=R, [{'catch',_,_}|Is], St) ->
-    %% All x registers will be killed if an exception occurs.
-    %% Therefore we only need to check the liveness for the
-    %% instructions following the catch instruction.
-    check_liveness(R, Is, St);
-check_liveness({x,_}=R, [{'try',_,_}|Is], St) ->
-    %% All x registers will be killed if an exception occurs.
-    %% Therefore we only need to check the liveness for the
-    %% instructions inside the 'try' block.
-    check_liveness(R, Is, St);
+check_liveness(R, [{'catch'=Op,Y,Fail}|Is], St) ->
+    Set = {set,[Y],[],{try_catch,Op,Fail}},
+    check_liveness(R, [{block,[Set]}|Is], St);
+check_liveness(R, [{'try'=Op,Y,Fail}|Is], St) ->
+    Set = {set,[Y],[],{try_catch,Op,Fail}},
+    check_liveness(R, [{block,[Set]}|Is], St);
 check_liveness(R, [{try_end,Y}|Is], St) ->
     case R of
 	Y ->
@@ -537,15 +593,34 @@ check_liveness(R, [{get_map_elements,{f,Fail},S,{list,L}}|Is], St0) ->
 check_liveness(R, [{put_map,F,Op,S,D,Live,{list,Puts}}|Is], St) ->
     Set = {set,[D],[S|Puts],{alloc,Live,{put_map,Op,F}}},
     check_liveness(R, [{block,[Set]}||Is], St);
+check_liveness(R, [{put_tuple,Ar,D}|Is], St) ->
+    Set = {set,[D],[],{put_tuple,Ar}},
+    check_liveness(R, [{block,[Set]}||Is], St);
+check_liveness(R, [{put_list,S1,S2,D}|Is], St) ->
+    Set = {set,[D],[S1,S2],put_list},
+    check_liveness(R, [{block,[Set]}||Is], St);
 check_liveness(R, [{test_heap,N,Live}|Is], St) ->
     I = {block,[{set,[],[],{alloc,Live,{nozero,nostack,N,[]}}}]},
     check_liveness(R, [I|Is], St);
 check_liveness(R, [{allocate_zero,N,Live}|Is], St) ->
     I = {block,[{set,[],[],{alloc,Live,{zero,N,0,[]}}}]},
     check_liveness(R, [I|Is], St);
-check_liveness(R, [{get_list,S,D1,D2}|Is], St) ->
-    I = {block,[{set,[D1,D2],[S],get_list}]},
+check_liveness(R, [{get_hd,S,D}|Is], St) ->
+    I = {block,[{set,[D],[S],get_hd}]},
+    check_liveness(R, [I|Is], St);
+check_liveness(R, [{get_tl,S,D}|Is], St) ->
+    I = {block,[{set,[D],[S],get_tl}]},
     check_liveness(R, [I|Is], St);
+check_liveness(R, [remove_message|Is], St) ->
+    check_liveness(R, Is, St);
+check_liveness({x,X}, [build_stacktrace|_], St) when X > 0 ->
+    {killed,St};
+check_liveness(R, [{recv_mark,_}|Is], St) ->
+    check_liveness(R, Is, St);
+check_liveness(R, [{recv_set,_}|Is], St) ->
+    check_liveness(R, Is, St);
+check_liveness(R, [{'%',_}|Is], St) ->
+    check_liveness(R, Is, St);
 check_liveness(_R, Is, St) when is_list(Is) ->
     %% Not implemented. Conservatively assume that the register is used.
     {used,St}.
@@ -580,6 +655,7 @@ check_liveness_at(R, Lbl, #live{lbl=Ll,res=ResMemorized}=St0) ->
 	    {Res,St#live{res=gb_trees:insert(Lbl, Res, St#live.res)}}
     end.
 
+not_used({exit_not_used,St}) -> {not_used,St};
 not_used({killed,St}) -> {not_used,St};
 not_used({_,_}=Res) -> Res.
 
@@ -587,7 +663,7 @@ check_liveness_ret(R, R, St) -> {used,St};
 check_liveness_ret(_, _, St) -> {killed,St}.
 
 %% check_liveness_block(Reg, [Instruction], State) ->
-%%     {killed | not_used | used | transparent,State'}
+%%     {killed | not_used | used | alloc_used | transparent,State'}
 %%  Finds out how Reg is used in the instruction sequence inside a block.
 %%  Returns one of:
 %%    killed - Reg is assigned a new value or killed by an
@@ -595,9 +671,10 @@ check_liveness_ret(_, _, St) -> {killed,St}.
 %%    not_used - The value is not used, but the register is referenced
 %%       e.g. by an allocation instruction
 %%    transparent - Reg is neither used nor killed
+%%    alloc_used - Used only in an allocate instruction
 %%    used - Reg is explicitly used by an instruction
 %%
-%%  '%live' annotations are not allowed.
+%%  Annotations are not allowed.
 %%
 %%  (Unknown instructions will cause an exception.)
 
@@ -607,13 +684,30 @@ check_liveness_block({x,X}=R, [{set,Ds,Ss,{alloc,Live,Op}}|Is], St0) ->
 	    {killed,St0};
 	true ->
 	    case check_liveness_block_1(R, Ss, Ds, Op, Is, St0) of
-		{killed,St} -> {not_used,St};
-		{transparent,St} -> {not_used,St};
-		{_,_}=Res -> Res
+                {transparent,St} -> {alloc_used,St};
+		{_,_}=Res -> not_used(Res)
 	    end
     end;
-check_liveness_block({y,_}=R, [{set,Ds,Ss,{alloc,_Live,Op}}|Is], St) ->
-    check_liveness_block_1(R, Ss, Ds, Op, Is, St);
+check_liveness_block({y,_}=R, [{set,Ds,Ss,{alloc,_Live,Op}}|Is], St0) ->
+    case check_liveness_block_1(R, Ss, Ds, Op, Is, St0) of
+        {transparent,St} -> {alloc_used,St};
+        {_,_}=Res -> not_used(Res)
+    end;
+check_liveness_block({y,_}=R, [{set,Ds,Ss,{try_catch,_,Op}}|Is], St0) ->
+    case Ds of
+        [R] ->
+            {killed,St0};
+        _ ->
+            case check_liveness_block_1(R, Ss, Ds, Op, Is, St0) of
+                {exit_not_used,St} ->
+                    {used,St};
+                {transparent,St} ->
+                    %% Conservatively assumed that it is used.
+                    {used,St};
+                {_,_}=Res ->
+                    Res
+            end
+    end;
 check_liveness_block(R, [{set,Ds,Ss,Op}|Is], St) ->
     check_liveness_block_1(R, Ss, Ds, Op, Is, St);
 check_liveness_block(_, [], St) -> {transparent,St}.
@@ -629,6 +723,11 @@ check_liveness_block_1(R, Ss, Ds, Op, Is, St0) ->
 			true -> {killed,St};
 			false -> check_liveness_block(R, Is, St)
 		    end;
+		{exit_not_used,St} ->
+		    case member(R, Ds) of
+			true -> {exit_not_used,St};
+			false -> check_liveness_block(R, Is, St)
+		    end;
 		{not_used,St} ->
 		    not_used(case member(R, Ds) of
 				 true -> {killed,St};
@@ -639,8 +738,8 @@ check_liveness_block_1(R, Ss, Ds, Op, Is, St0) ->
 	    end
     end.
 
-check_liveness_block_2(R, {gc_bif,_Op,{f,Lbl}}, _Ss, St) ->
-    check_liveness_block_3(R, Lbl, St);
+check_liveness_block_2(R, {gc_bif,Op,{f,Lbl}}, Ss, St) ->
+    check_liveness_block_3(R, Lbl, {Op,length(Ss)}, St);
 check_liveness_block_2(R, {bif,Op,{f,Lbl}}, Ss, St) ->
     Arity = length(Ss),
     case erl_internal:comp_op(Op, Arity) orelse
@@ -648,16 +747,23 @@ check_liveness_block_2(R, {bif,Op,{f,Lbl}}, Ss, St) ->
 	true ->
 	    {killed,St};
 	false ->
-	    check_liveness_block_3(R, Lbl, St)
+	    check_liveness_block_3(R, Lbl, {Op,length(Ss)}, St)
     end;
 check_liveness_block_2(R, {put_map,_Op,{f,Lbl}}, _Ss, St) ->
-    check_liveness_block_3(R, Lbl, St);
+    check_liveness_block_3(R, Lbl, {unsafe,0}, St);
 check_liveness_block_2(_, _, _, St) ->
     {killed,St}.
 
-check_liveness_block_3(_, 0, St) ->
+check_liveness_block_3({x,_}, 0, _FA, St) ->
     {killed,St};
-check_liveness_block_3(R, Lbl, St0) ->
+check_liveness_block_3({y,_}, 0, {F,A}, St) ->
+    %% If the exception is thrown, the stack may be scanned,
+    %% thus implicitly using the y register.
+    case erl_bifs:is_safe(erlang, F, A) of
+        true -> {killed,St};
+        false -> {used,St}
+    end;
+check_liveness_block_3(R, Lbl, _FA, St0) ->
     check_liveness_at(R, Lbl, St0).
 
 index_labels_1([{label,Lbl}|Is0], Acc) ->
@@ -722,22 +828,18 @@ label(Old, D, Fb) ->
         _ -> Fb(Old)
     end.
 
-%% Help functions for combine_heap_needs.
+%% Help function for combine_heap_needs.
 
-combine_alloc_lists(Al1, Al2) ->
-    combine_alloc_lists_1(sort(Al1++Al2)).
-
-combine_alloc_lists_1([{words,W1},{words,W2}|T])
-  when is_integer(W1), is_integer(W2) ->
-    [{words,W1+W2}|combine_alloc_lists_1(T)];
-combine_alloc_lists_1([{floats,F1},{floats,F2}|T])
-  when is_integer(F1), is_integer(F2) ->
-    [{floats,F1+F2}|combine_alloc_lists_1(T)];
-combine_alloc_lists_1([{words,_}=W|T]) ->
-    [W|combine_alloc_lists_1(T)];
-combine_alloc_lists_1([{floats,_}=F|T]) ->
-    [F|combine_alloc_lists_1(T)];
-combine_alloc_lists_1([]) -> [].
+combine_alloc_lists(Al0) ->
+    Al1 = flatmap(fun(Words) when is_integer(Words) ->
+                         [{words,Words}];
+                    ({alloc,List}) ->
+                         List
+                 end, Al0),
+    Al2 = sofs:relation(Al1),
+    Al3 = sofs:relation_to_family(Al2),
+    Al4 = sofs:to_external(Al3),
+    [{Tag,lists:sum(L)} || {Tag,L} <- Al4].
 
 %% live_opt/4.
 
@@ -776,10 +878,14 @@ live_opt([{test,bs_start_match2,Fail,Live,[Src,_],_}=I|Is], _, D, Acc) ->
 
 %% Other instructions.
 live_opt([{block,Bl0}|Is], Regs0, D, Acc) ->
-    Live0 = {'%live',live_regs(Regs0),Regs0},
+    Live0 = make_anno({used,Regs0}),
     {Bl,Regs} = live_opt_block(reverse(Bl0), Regs0, D, [Live0]),
-    Live = {'%live',live_regs(Regs),Regs},
+    Live = make_anno({used,Regs}),
     live_opt(Is, Regs, D, [{block,[Live|Bl]}|Acc]);
+live_opt([build_stacktrace=I|Is], _, D, Acc) ->
+    live_opt(Is, live_call(1), D, [I|Acc]);
+live_opt([raw_raise=I|Is], _, D, Acc) ->
+    live_opt(Is, live_call(3), D, [I|Acc]);
 live_opt([{label,L}=I|Is], Regs, D0, Acc) ->
     D = gb_trees:insert(L, Regs, D0),
     live_opt(Is, Regs, D, [I|Acc]);
@@ -821,7 +927,8 @@ live_opt([{test,_,Fail,Live,Ss,_}=I|Is], _, D, Acc) ->
     Regs1 = x_live(Ss, Regs0),
     Regs = live_join_label(Fail, D, Regs1),
     live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{select,_,Src,Fail,List}=I|Is], Regs0, D, Acc) ->
+live_opt([{select,_,Src,Fail,List}=I|Is], _, D, Acc) ->
+    Regs0 = 0,
     Regs1 = x_live([Src], Regs0),
     Regs = live_join_labels([Fail|List], D, Regs1),
     live_opt(Is, Regs, D, [I|Acc]);
@@ -844,6 +951,25 @@ live_opt([{get_map_elements,Fail,Src,{list,List}}=I|Is], Regs0, D, Acc) ->
     Regs1 = x_live([Src|Ss], x_dead(Ds, Regs0)),
     Regs = live_join_label(Fail, D, Regs1),
     live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{gc_bif,N,F,R,As,Dst}=I|Is], Regs0, D, Acc) ->
+    Bl = [{set,[Dst],As,{alloc,R,{gc_bif,N,F}}}],
+    {_,Regs} = live_opt_block(Bl, Regs0, D, []),
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{bif,N,F,As,Dst}=I|Is], Regs0, D, Acc) ->
+    Bl = [{set,[Dst],As,{bif,N,F}}],
+    {_,Regs} = live_opt_block(Bl, Regs0, D, []),
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{get_tuple_element,Src,Idx,Dst}=I|Is], Regs0, D, Acc) ->
+    Bl = [{set,[Dst],[Src],{get_tuple_element,Idx}}],
+    {_,Regs} = live_opt_block(Bl, Regs0, D, []),
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{move,Src,Dst}=I|Is], Regs0, D, Acc) ->
+    Regs = x_live([Src], x_dead([Dst], Regs0)),
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{put_map,F,Op,S,Dst,R,{list,Puts}}=I|Is], Regs0, D, Acc) ->
+    Bl = [{set,[Dst],[S|Puts],{alloc,R,{put_map,Op,F}}}],
+    {_,Regs} = live_opt_block(Bl, Regs0, D, []),
+    live_opt(Is, Regs, D, [I|Acc]);
 
 %% Transparent instructions - they neither use nor modify x registers.
 live_opt([{deallocate,_}=I|Is], Regs, D, Acc) ->
@@ -860,6 +986,10 @@ live_opt([{wait_timeout,_,{Tag,_}}=I|Is], Regs, D, Acc) when Tag =/= x ->
     live_opt(Is, Regs, D, [I|Acc]);
 live_opt([{line,_}=I|Is], Regs, D, Acc) ->
     live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{'catch',_,_}=I|Is], Regs, D, Acc) ->
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{'try',_,_}=I|Is], Regs, D, Acc) ->
+    live_opt(Is, Regs, D, [I|Acc]);
 
 %% The following instructions can occur if the "compilation" has been
 %% started from a .S file using the 'from_asm' option.
@@ -874,47 +1004,52 @@ live_opt([{recv_mark,_}=I|Is], Regs, D, Acc) ->
 
 live_opt([], _, _, Acc) -> Acc.
 
-live_opt_block([{set,Ds,Ss,Op0}|Is], Regs0, D, Acc) ->
-    Regs1 = x_live(Ss, x_dead(Ds, Regs0)),
-    {Op, Regs} = live_opt_block_op(Op0, Regs1, D),
-    I = {set, Ds, Ss, Op},
-
-    case Ds of
-        [{x,X}] ->
-            case (not is_live(X, Regs0)) andalso Op =:= move of
-                true ->
-                    live_opt_block(Is, Regs0, D, Acc);
-                false ->
-                    live_opt_block(Is, Regs, D, [I|Acc])
-            end;
-        _ ->
-            live_opt_block(Is, Regs, D, [I|Acc])
+live_opt_block([{set,[{x,X}]=Ds,Ss,move}=I|Is], Regs0, D, Acc) ->
+    Regs = x_live(Ss, x_dead(Ds, Regs0)),
+    case is_live(X, Regs0) of
+        true ->
+            live_opt_block(Is, Regs, D, [I|Acc]);
+        false ->
+            %% Useless move, will never be used.
+            live_opt_block(Is, Regs, D, Acc)
     end;
-live_opt_block([{'%live',_,_}|Is], Regs, D, Acc) ->
-    live_opt_block(Is, Regs, D, Acc);
-live_opt_block([], Regs, _, Acc) -> {Acc,Regs}.
-
-live_opt_block_op({alloc,Live0,AllocOp}, Regs0, D) ->
-    Regs =
-        case AllocOp of
-            {Kind, _N, Fail} when Kind =:= gc_bif; Kind =:= put_map ->
-                live_join_label(Fail, D, Regs0);
-            _ ->
-                Regs0
-        end,
+live_opt_block([{set,Ds,Ss,{alloc,Live0,AllocOp}}|Is], Regs0, D, Acc) ->
+    %% Calculate liveness from the point of view of the GC.
+    %% There will never be a GC if the instruction fails, so we should
+    %% ignore the failure branch.
+    GcRegs1 = x_dead(Ds, Regs0),
+    GcRegs = x_live(Ss, GcRegs1),
+    Live = live_regs(GcRegs),
 
     %% The life-time analysis used by the code generator is sometimes too
     %% conservative, so it may be possible to lower the number of live
     %% registers based on the exact liveness information. The main benefit is
     %% that more optimizations that depend on liveness information (such as the
-    %% beam_bool and beam_dead passes) may be applied.
-    Live = live_regs(Regs),
-    true = Live =< Live0,
-    {{alloc,Live,AllocOp}, live_call(Live)};
-live_opt_block_op({bif,_N,Fail} = Op, Regs, D) ->
-    {Op, live_join_label(Fail, D, Regs)};
-live_opt_block_op(Op, Regs, _D) ->
-    {Op, Regs}.
+    %% beam_dead pass) may be applied.
+    true = Live =< Live0,                       %Assertion.
+    I = {set,Ds,Ss,{alloc,Live,AllocOp}},
+
+    %% Calculate liveness from the point of view of the preceding instruction.
+    %% The liveness is the union of live registers in the GC and the live
+    %% registers at the failure label.
+    Regs1 = live_call(Live),
+    Regs = live_join_alloc(AllocOp, D, Regs1),
+    live_opt_block(Is, Regs, D, [I|Acc]);
+live_opt_block([{set,Ds,Ss,{bif,_,Fail}}=I|Is], Regs0, D, Acc) ->
+    Regs1 = x_dead(Ds, Regs0),
+    Regs2 = x_live(Ss, Regs1),
+    Regs = live_join_label(Fail, D, Regs2),
+    live_opt_block(Is, Regs, D, [I|Acc]);
+live_opt_block([{set,Ds,Ss,_}=I|Is], Regs0, D, Acc) ->
+    Regs = x_live(Ss, x_dead(Ds, Regs0)),
+    live_opt_block(Is, Regs, D, [I|Acc]);
+live_opt_block([{'%anno',_}|Is], Regs, D, Acc) ->
+    live_opt_block(Is, Regs, D, Acc);
+live_opt_block([], Regs, _, Acc) -> {Acc,Regs}.
+
+live_join_alloc({Kind,_Name,Fail}, D, Regs) when Kind =:= gc_bif; Kind =:= put_map ->
+    live_join_label(Fail, D, Regs);
+live_join_alloc(_, _, Regs) -> Regs.
 
 live_join_labels([{f,L}|T], D, Regs0) when L =/= 0 ->
     Regs = gb_trees:get(L, D) bor Regs0,
@@ -950,3 +1085,220 @@ split_even([], Ss, Ds) ->
     {reverse(Ss),reverse(Ds)};
 split_even([S,D|Rs], Ss, Ds) ->
     split_even(Rs, [S|Ss], [D|Ds]).
+
+%%%
+%%% Add annotations for defined registers.
+%%%
+%%% This analysis is done by scanning the instructions in
+%%% execution order.
+%%%
+
+defs([{apply,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{bif,_,{f,Fail},_Src,Dst}=I|Is], Regs0, D) ->
+    Regs = def_regs([Dst], Regs0),
+    [I|defs(Is, Regs, update_regs(Fail, Regs0, D))];
+defs([{block,Block0}|Is], Regs0, D0) ->
+    {Block,Regs,D} = defs_list(Block0, Regs0, D0),
+    [{block,[make_anno({def,Regs0})|Block]}|defs(Is, Regs, D)];
+defs([{bs_init,{f,L},_,_,_,Dst}=I|Is], Regs0, D) ->
+    Regs = def_regs([Dst], Regs0),
+    [I|defs(Is, Regs, update_regs(L, Regs, D))];
+defs([{bs_put,{f,L},_,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, update_regs(L, Regs, D))];
+defs([build_stacktrace=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{call,_,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{call_ext,_,{extfunc,M,F,A}}=I|Is], _Regs, D) ->
+    case erl_bifs:is_exit_bif(M, F, A) of
+        false ->
+            [I|defs(Is, 1, D)];
+        true ->
+            [I|defs_unreachable(Is, D)]
+    end;
+defs([{call_ext,_,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{call_fun,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{'catch',_,{f,L}}=I|Is], Regs, D) ->
+    RegsAtLabel = init_def_regs(1),
+    [I|defs(Is, Regs, update_regs(L, RegsAtLabel, D))];
+defs([{catch_end,_}=I|Is], _Regs, D) ->
+    Regs = init_def_regs(1),
+    [I|defs(Is, Regs, D)];
+defs([{gc_bif,_,{f,Fail},Live,_Src,Dst}=I|Is], Regs0, D) ->
+    true = all_defined(Live, Regs0),            %Assertion.
+    Regs = def_regs([Dst], init_def_regs(Live)),
+    [I|defs(Is, Regs, update_regs(Fail, Regs0, D))];
+defs([{get_map_elements,{f,L},_Src,{list,DstList}}=I|Is], Regs0, D) ->
+    {_,Ds} = beam_utils:split_even(DstList),
+    Regs = def_regs(Ds, Regs0),
+    [I|defs(Is, Regs, update_regs(L, Regs0, D))];
+defs([{get_tuple_element,_,_,Dst}=I|Is], Regs0, D) ->
+    Regs = def_regs([Dst], Regs0),
+    [I|defs(Is, Regs, D)];
+defs([{jump,{f,L}}=I|Is], Regs, D) ->
+    [I|defs_unreachable(Is, update_regs(L, Regs, D))];
+defs([{label,L}=I|Is], Regs0, D) ->
+    case D of
+        #{L:=Regs1} ->
+            Regs = Regs0 band Regs1,
+            [I|defs(Is, Regs, D)];
+        #{} ->
+            [I|defs(Is, Regs0, D)]
+    end;
+defs([{loop_rec,{f,L},{x,0}}=I|Is], _Regs, D0) ->
+    RegsAtLabel = init_def_regs(0),
+    D = update_regs(L, RegsAtLabel, D0),
+    [I|defs(Is, init_def_regs(1), D)];
+defs([{loop_rec_end,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 0, D)];
+defs([{make_fun2,_,_,_,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{move,_,Dst}=I|Is], Regs0, D) ->
+    Regs = def_regs([Dst], Regs0),
+    [I|defs(Is, Regs, D)];
+defs([{put_map,{f,Fail},_,_,Dst,_,_}=I|Is], Regs0, D) ->
+    Regs = def_regs([Dst], Regs0),
+    [I|defs(Is, Regs, update_regs(Fail, Regs0, D))];
+defs([raw_raise=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([return=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+defs([{select,_,_Src,Fail,List}=I|Is], Regs, D0) ->
+    D = update_list([Fail|List], Regs, D0),
+    [I|defs_unreachable(Is, D)];
+defs([{test,_,{f,L},_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, update_regs(L, Regs, D))];
+defs([{test,_,{f,L},Live,_,Dst}=I|Is], Regs0, D) ->
+    true = all_defined(Live, Regs0),             %Assertion.
+    Regs = def_regs([Dst], init_def_regs(Live)),
+    [I|defs(Is, Regs, update_regs(L, Regs0, D))];
+defs([{'try',_,{f,L}}=I|Is], Regs, D) ->
+    RegsAtLabel = init_def_regs(3),
+    [I|defs(Is, Regs, update_regs(L, RegsAtLabel, D))];
+defs([{try_case,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, init_def_regs(3), D)];
+defs([{wait,_}=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+defs([{wait_timeout,_,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 0, D)];
+
+%% Exceptions.
+defs([{badmatch,_}=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+defs([{case_end,_}=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+defs([if_end=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+defs([{try_case_end,_}=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+
+%% Neutral instructions
+defs([{bs_context_to_binary,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{bs_restore2,_,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{bs_save2,_,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{deallocate,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{kill,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{line,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{recv_mark,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{recv_set,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([timeout=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{trim,_,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{try_end,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{'%',_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([], _, _) -> [].
+
+defs_unreachable([{label,L}=I|Is], D) ->
+    case D of
+        #{L:=Regs} ->
+            [I|defs(Is, Regs, D)];
+        #{} ->
+            defs_unreachable(Is, D)
+    end;
+defs_unreachable([_|Is], D) ->
+    defs_unreachable(Is, D);
+defs_unreachable([], _D) -> [].
+
+defs_list(Is, Regs, D) ->
+    defs_list(Is, Regs, D, []).
+
+defs_list([{set,Ds,_,{alloc,Live,Info}}=I|Is], Regs0, D0, Acc) ->
+    true = all_defined(Live, Regs0),             %Assertion.
+    D = case Info of
+            {gc_bif,_,{f,Fail}} ->
+                update_regs(Fail, Regs0, D0);
+            {put_map,_,{f,Fail}} ->
+                update_regs(Fail, Regs0, D0);
+            _ ->
+                D0
+        end,
+    Regs = def_regs(Ds, init_def_regs(Live)),
+    defs_list(Is, Regs, D, [I|Acc]);
+defs_list([{set,Ds,_,Info}=I|Is], Regs0, D0, Acc) ->
+    D = case Info of
+            {bif,_,{f,Fail}} ->
+                update_regs(Fail, Regs0, D0);
+            {try_catch,'catch',{f,Fail}} ->
+                update_regs(Fail, init_def_regs(1), D0);
+            {try_catch,'try',{f,Fail}} ->
+                update_regs(Fail, init_def_regs(3), D0);
+            _ ->
+                D0
+        end,
+    Regs = def_regs(Ds, Regs0),
+    defs_list(Is, Regs, D, [I|Acc]);
+defs_list([], Regs, D, Acc) ->
+    {reverse(Acc),Regs,D}.
+
+init_def_regs(Arity) ->
+    (1 bsl Arity) - 1.
+
+def_regs([{x,X}|T], Regs) ->
+    def_regs(T, Regs bor (1 bsl X));
+def_regs([_|T], Regs) ->
+    def_regs(T, Regs);
+def_regs([], Regs) -> Regs.
+
+update_list([{f,L}|T], Regs, D0) ->
+    D = update_regs(L, Regs, D0),
+    update_list(T, Regs, D);
+update_list([_|T], Regs, D) ->
+    update_list(T, Regs, D);
+update_list([], _Regs, D) -> D.
+
+update_regs(L, Regs0, D) ->
+    case D of
+        #{L:=Regs1} ->
+            Regs = Regs0 band Regs1,
+            D#{L:=Regs};
+        #{} ->
+            D#{L=>Regs0}
+    end.
+
+all_defined(Live, Regs) ->
+    All = (1 bsl Live) - 1,
+    Regs band All =:= All.
+
+%%%
+%%% Utilities.
+%%%
+
+%% make_anno(Anno) -> WrappedAnno.
+%%  Wrap an annotation term.
+
+make_anno(Anno) ->
+    {'%anno',Anno}.
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index be8908dd6b..c30ab34ac7 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -85,8 +85,6 @@ format_error(Error) ->
 %%% Things currently not checked. XXX
 %%%
 %%% - Heap allocation for binaries.
-%%% - That put_tuple is followed by the correct number of
-%%%   put instructions.
 %%%
 
 %% validate(Module, [Function]) -> [] | [Error]
@@ -130,9 +128,8 @@ validate_0(Module, [{function,Name,Ar,Entry,Code}|Fs], Ft) ->
 	throw:Error ->
 	    %% Controlled error.
 	    [Error|validate_0(Module, Fs, Ft)];
-	Class:Error ->
+        Class:Error:Stack ->
 	    %% Crash.
-	    Stack = erlang:get_stacktrace(),
 	    io:fwrite("Function: ~w/~w\n", [Name,Ar]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -149,7 +146,8 @@ validate_0(Module, [{function,Name,Ar,Entry,Code}|Fs], Ft) ->
 	 hf=0,				%Available heap size for floats.
 	 fls=undefined,			%Floating point state.
 	 ct=[],				%List of hot catch/try labels
-	 setelem=false			%Previous instruction was setelement/3.
+         setelem=false,                 %Previous instruction was setelement/3.
+         puts_left=none                 %put/1 instructions left.
 	}).
 
 -type label()        :: integer().
@@ -294,6 +292,8 @@ valfun_1({bs_context_to_binary,Ctx}, #vst{current=#st{x=Xs}}=Vst) ->
     end;
 valfun_1(bs_init_writable=I, Vst) ->
     call(I, 1, Vst);
+valfun_1(build_stacktrace=I, Vst) ->
+    call(I, 1, Vst);
 valfun_1({move,{y,_}=Src,{y,_}=Dst}, Vst) ->
     %% The stack trimming optimization may generate a move from an initialized
     %% but unassigned Y register to another Y register.
@@ -339,11 +339,25 @@ valfun_1({put_list,A,B,Dst}, Vst0) ->
     Vst = eat_heap(2, Vst0),
     set_type_reg(cons, Dst, Vst);
 valfun_1({put_tuple,Sz,Dst}, Vst0) when is_integer(Sz) ->
+    Vst1 = eat_heap(1, Vst0),
+    Vst = set_type_reg(tuple_in_progress, Dst, Vst1),
+    #vst{current=St0} = Vst,
+    St = St0#st{puts_left={Sz,{Dst,{tuple,Sz}}}},
+    Vst#vst{current=St};
+valfun_1({put,Src}, Vst0) ->
+    assert_term(Src, Vst0),
     Vst = eat_heap(1, Vst0),
-    set_type_reg({tuple,Sz}, Dst, Vst);
-valfun_1({put,Src}, Vst) ->
-    assert_term(Src, Vst),
-    eat_heap(1, Vst);
+    #vst{current=St0} = Vst,
+    case St0 of
+        #st{puts_left=none} ->
+            error(not_building_a_tuple);
+        #st{puts_left={1,{Dst,Type}}} ->
+            St = St0#st{puts_left=none},
+            set_type_reg(Type, Dst, Vst#vst{current=St});
+        #st{puts_left={PutsLeft,Info}} when is_integer(PutsLeft) ->
+            St = St0#st{puts_left={PutsLeft-1,Info}},
+            Vst#vst{current=St}
+    end;
 %% Instructions for optimization of selective receives.
 valfun_1({recv_mark,{f,Fail}}, Vst) when is_integer(Fail) ->
     Vst;
@@ -523,15 +537,18 @@ valfun_4({bif,element,{f,Fail},[Pos,Tuple],Dst}, Vst0) ->
 valfun_4({bif,raise,{f,0},Src,_Dst}, Vst) ->
     validate_src(Src, Vst),
     kill_state(Vst);
+valfun_4(raw_raise=I, Vst) ->
+    call(I, 3, Vst);
 valfun_4({bif,Op,{f,Fail},Src,Dst}, Vst0) ->
     validate_src(Src, Vst0),
     Vst = branch_state(Fail, Vst0),
     Type = bif_type(Op, Src, Vst),
     set_type_reg(Type, Dst, Vst);
 valfun_4({gc_bif,Op,{f,Fail},Live,Src,Dst}, #vst{current=St0}=Vst0) ->
+    verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     St = kill_heap_allocation(St0),
     Vst1 = Vst0#vst{current=St},
-    verify_live(Live, Vst1),
     Vst2 = branch_state(Fail, Vst1),
     Vst = prune_x_regs(Live, Vst2),
     validate_src(Src, Vst),
@@ -574,6 +591,12 @@ valfun_4({get_list,Src,D1,D2}, Vst0) ->
     assert_type(cons, Src, Vst0),
     Vst = set_type_reg(term, D1, Vst0),
     set_type_reg(term, D2, Vst);
+valfun_4({get_hd,Src,Dst}, Vst) ->
+    assert_type(cons, Src, Vst),
+    set_type_reg(term, Dst, Vst);
+valfun_4({get_tl,Src,Dst}, Vst) ->
+    assert_type(cons, Src, Vst),
+    set_type_reg(term, Dst, Vst);
 valfun_4({get_tuple_element,Src,I,Dst}, Vst) ->
     assert_type({tuple_element,I+1}, Src, Vst),
     set_type_reg(term, Dst, Vst);
@@ -685,6 +708,7 @@ valfun_4({bs_utf16_size,{f,Fail},A,Dst}, Vst) ->
     set_type_reg({integer,[]}, Dst, branch_state(Fail, Vst));
 valfun_4({bs_init2,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     if
 	is_integer(Sz) ->
 	    ok;
@@ -697,6 +721,7 @@ valfun_4({bs_init2,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     set_type_reg(binary, Dst, Vst);
 valfun_4({bs_init_bits,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     if
 	is_integer(Sz) ->
 	    ok;
@@ -709,6 +734,7 @@ valfun_4({bs_init_bits,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     set_type_reg(binary, Dst, Vst);
 valfun_4({bs_append,{f,Fail},Bits,Heap,Live,_Unit,Bin,_Flags,Dst}, Vst0) ->
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     assert_term(Bits, Vst0),
     assert_term(Bin, Vst0),
     Vst1 = heap_alloc(Heap, Vst0),
@@ -944,6 +970,7 @@ deallocate(#vst{current=St}=Vst) ->
 
 test_heap(Heap, Live, Vst0) ->
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     Vst = prune_x_regs(Live, Vst0),
     heap_alloc(Heap, Vst).
 
@@ -1126,6 +1153,7 @@ set_type_y(Type, {y,Y}=Reg, #vst{current=#st{y=Ys0}=St}=Vst)
 	     {value,_} ->
 		 gb_trees:update(Y, Type, Ys0)
 	 end,
+    check_try_catch_tags(Type, Y, Ys0),
     Vst#vst{current=St#st{y=Ys}};
 set_type_y(Type, Reg, #vst{}) -> error({invalid_store,Reg,Type}).
 
@@ -1133,6 +1161,29 @@ set_catch_end({y,Y}, #vst{current=#st{y=Ys0}=St}=Vst) ->
     Ys = gb_trees:update(Y, initialized, Ys0),
     Vst#vst{current=St#st{y=Ys}}.
 
+check_try_catch_tags(Type, LastY, Ys) ->
+    case is_try_catch_tag(Type) of
+        false ->
+            ok;
+        true ->
+            %% Every catch or try/catch must use a lower Y register
+            %% number than any enclosing catch or try/catch. That will
+            %% ensure that when the stack is scanned when an
+            %% exception occurs, the innermost try/catch tag is found
+            %% first.
+            Bad = [{{y,Y},Tag} || {Y,Tag} <- gb_trees:to_list(Ys),
+                                  Y < LastY, is_try_catch_tag(Tag)],
+            case Bad of
+                [] ->
+                    ok;
+                [_|_] ->
+                    error({bad_try_catch_nesting,{y,LastY},Bad})
+            end
+    end.
+
+is_try_catch_tag({catchtag,_}) -> true;
+is_try_catch_tag({trytag,_}) -> true;
+is_try_catch_tag(_) -> false.
 
 is_reg_defined({x,_}=Reg, Vst) -> is_type_defined_x(Reg, Vst);
 is_reg_defined({y,_}=Reg, Vst) -> is_type_defined_y(Reg, Vst);
@@ -1266,6 +1317,7 @@ get_move_term_type(Src, Vst) ->
 	initialized -> error({unassigned,Src});
 	{catchtag,_} -> error({catchtag,Src});
 	{trytag,_} -> error({trytag,Src});
+        tuple_in_progress -> error({tuple_in_progress,Src});
 	Type -> Type
     end.
 
@@ -1274,10 +1326,7 @@ get_move_term_type(Src, Vst) ->
 %%  a standard Erlang type (no catch/try tags or match contexts).
 
 get_term_type(Src, Vst) ->
-    case get_term_type_1(Src, Vst) of
-	initialized -> error({unassigned,Src});
-	{catchtag,_} -> error({catchtag,Src});
-	{trytag,_} -> error({trytag,Src});
+    case get_move_term_type(Src, Vst) of
 	#ms{} -> error({match_context,Src});
 	Type -> Type
     end.
@@ -1324,7 +1373,12 @@ branch_arities([Sz,{f,L}|T], Tuple, #vst{current=St}=Vst0)
     Vst = branch_state(L, Vst1),
     branch_arities(T, Tuple, Vst#vst{current=St}).
 
-branch_state(0, #vst{}=Vst) -> Vst;
+branch_state(0, #vst{}=Vst) ->
+    %% If the instruction fails, the stack may be scanned
+    %% looking for a catch tag. Therefore the Y registers
+    %% must be initialized at this point.
+    verify_y_init(Vst),
+    Vst;
 branch_state(L, #vst{current=St,branched=B}=Vst) ->
     Vst#vst{
       branched=case gb_trees:is_defined(L, B) of
diff --git a/lib/compiler/src/beam_z.erl b/lib/compiler/src/beam_z.erl
index 787e33c142..6c3a6995d7 100644
--- a/lib/compiler/src/beam_z.erl
+++ b/lib/compiler/src/beam_z.erl
@@ -24,22 +24,23 @@
 
 -export([module/2]).
 
--import(lists, [dropwhile/2]).
+-import(lists, [dropwhile/2,map/2]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_asm:module_code()}.
 
-module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
-    Fs = [function(F) || F <- Fs0],
+module({Mod,Exp,Attr,Fs0,Lc}, Opts) ->
+    NoGetHdTl = proplists:get_bool(no_get_hd_tl, Opts),
+    Fs = [function(F, NoGetHdTl) || F <- Fs0],
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
-function({function,Name,Arity,CLabel,Is0}) ->
+function({function,Name,Arity,CLabel,Is0}, NoGetHdTl) ->
     try
-	Is = undo_renames(Is0),
+	Is1 = undo_renames(Is0),
+        Is = maybe_eliminate_get_hd_tl(Is1, NoGetHdTl),
 	{function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -66,6 +67,10 @@ undo_renames([{bif,raise,_,_,_}=I|Is0]) ->
 		      (_) -> true
 		   end, Is0),
     [I|undo_renames(Is)];
+undo_renames([{get_hd,Src,Dst1},{get_tl,Src,Dst2}|Is]) ->
+    [{get_list,Src,Dst1,Dst2}|undo_renames(Is)];
+undo_renames([{get_tl,Src,Dst2},{get_hd,Src,Dst1}|Is]) ->
+    [{get_list,Src,Dst1,Dst2}|undo_renames(Is)];
 undo_renames([I|Is]) ->
     [undo_rename(I)|undo_renames(Is)];
 undo_renames([]) -> [].
@@ -108,3 +113,17 @@ undo_rename({get_map_elements,Fail,Src,{list,List}}) ->
 undo_rename({select,I,Reg,Fail,List}) ->
     {I,Reg,Fail,{list,List}};
 undo_rename(I) -> I.
+
+%%%
+%%% Eliminate get_hd/get_tl instructions if requested by
+%%% the no_get_hd_tl option.
+%%%
+
+maybe_eliminate_get_hd_tl(Is, true) ->
+    map(fun({get_hd,Cons,Hd}) ->
+                {get_list,Cons,Hd,{x,1022}};
+           ({get_tl,Cons,Tl}) ->
+                {get_list,Cons,{x,1022},Tl};
+           (I) -> I
+        end, Is);
+maybe_eliminate_get_hd_tl(Is, false) -> Is.
diff --git a/lib/compiler/src/cerl_clauses.erl b/lib/compiler/src/cerl_clauses.erl
index 7d6518c3c6..fa5104c01b 100644
--- a/lib/compiler/src/cerl_clauses.erl
+++ b/lib/compiler/src/cerl_clauses.erl
@@ -353,6 +353,8 @@ match(P, E, Bs) ->
 	map ->
 	    %% The most we can do is to say "definitely no match" if a
 	    %% map pattern is matched against non-map data.
+            %% (Note: See the document internal_doc/cerl-notes.md for
+            %% information why we don't try to do more here.)
 	    case E of
 		any ->
 		    {false, Bs};
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index bc519264fc..c6a0056a70 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -203,7 +203,12 @@ expand_opts(Opts0) ->
 	       {_,_,undefined} -> [debug_info|Opts0];
 	       {_,_,_} -> Opts0
 	   end,
-    foldr(fun expand_opt/2, [], Opts).
+    %% iff,unless processing is to complex...
+    Opts1 = case proplists:is_defined(makedep_side_effect,Opts) of
+                true -> proplists:delete(makedep,Opts);
+                false -> Opts
+            end,
+    foldr(fun expand_opt/2, [], Opts1).
 
 expand_opt(basic_validation, Os) ->
     [no_code_generation,to_pp,binary|Os];
@@ -214,13 +219,15 @@ expand_opt(report, Os) ->
 expand_opt(return, Os) ->
     [return_errors,return_warnings|Os];
 expand_opt(r16, Os) ->
-    [no_record_opt,no_utf8_atoms|Os];
+    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
 expand_opt(r17, Os) ->
-    [no_record_opt,no_utf8_atoms|Os];
+    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
 expand_opt(r18, Os) ->
-    [no_record_opt,no_utf8_atoms|Os];
+    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
 expand_opt(r19, Os) ->
-    [no_record_opt,no_utf8_atoms|Os];
+    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
+expand_opt(r20, Os) ->
+    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
 expand_opt({debug_info_key,_}=O, Os) ->
     [encrypt_debug_info,O|Os];
 expand_opt(no_float_opt, Os) ->
@@ -674,6 +681,7 @@ select_list_passes_1([], _, Acc) ->
 standard_passes() ->
     [?pass(transform_module),
 
+     {iff,makedep_side_effect,?pass(makedep_and_output)},
      {iff,makedep,[
 	 ?pass(makedep),
 	 {unless,binary,?pass(makedep_output)}
@@ -769,6 +777,8 @@ asm_passes() ->
 	 {iff,drecv,{listing,"recv"}},
 	 {unless,no_record_opt,{pass,beam_record}},
 	 {iff,drecord,{listing,"record"}},
+         {unless,no_blk2,?pass(block2)},
+	 {iff,dblk2,{listing,"block2"}},
 	 {unless,no_stack_trimming,{pass,beam_trim}},
 	 {iff,dtrim,{listing,"trim"}},
 	 {pass,beam_flatten}]},
@@ -787,8 +797,10 @@ asm_passes() ->
      | binary_passes()].
 
 binary_passes() ->
-    [{native_compile,fun test_native/1,fun native_compile/2},
-     {unless,binary,?pass(save_binary,not_werror)}].
+    [{iff,'to_dis',?pass(to_dis)},
+     {native_compile,fun test_native/1,fun native_compile/2},
+     {unless,binary,?pass(save_binary,not_werror)}
+    ].
 
 %%%
 %%% Compiler passes.
@@ -1126,6 +1138,16 @@ core_lint_module(Code, St) ->
 			      errors=St#compile.errors ++ Es}}
     end.
 
+%% makedep + output and continue
+makedep_and_output(Code0, St) ->
+    {ok,DepCode,St1} = makedep(Code0,St),
+    case makedep_output(DepCode, St1) of
+        {ok,_IgnoreCode,St2} ->
+            {ok,Code0,St2};
+        {error,St2} ->
+            {error,St2}
+    end.
+
 makedep(Code0, #compile{ifile=Ifile,ofile=Ofile,options=Opts}=St) ->
 
     %% Get the target of the Makefile rule.
@@ -1332,6 +1354,10 @@ v3_kernel(Code0, #compile{options=Opts,warnings=Ws0}=St) ->
 	    {ok,Code,St}
     end.
 
+block2(Code0, #compile{options=Opts}=St) ->
+    {ok,Code} = beam_block:module(Code0, [no_blockify|Opts]),
+    {ok,Code,St}.
+
 test_old_inliner(#compile{options=Opts}) ->
     %% The point of this test is to avoid loading the old inliner
     %% if we know that it will not be used.
@@ -1448,16 +1474,16 @@ beam_asm(Code0, #compile{ifile=File,extra_chunks=ExtraChunks,options=CompilerOpt
 	{ok,DebugInfo,Opts0} ->
 	    Opts1 = [O || O <- Opts0, effects_code_generation(O)],
 	    Chunks = [{<<"Dbgi">>, DebugInfo} | ExtraChunks],
-	    CompileInfo = compile_info(File, Opts1),
+	    CompileInfo = compile_info(File, CompilerOpts, Opts1),
 	    {ok,Code} = beam_asm:module(Code0, Chunks, CompileInfo, CompilerOpts),
 	    {ok,Code,St#compile{abstract_code=[]}};
 	{error,Es} ->
 	    {error,St#compile{errors=St#compile.errors ++ [{File,Es}]}}
     end.
 
-compile_info(File, Opts) ->
-    IsSlim = member(slim, Opts),
-    IsDeterministic = member(deterministic, Opts),
+compile_info(File, CompilerOpts, Opts) ->
+    IsSlim = member(slim, CompilerOpts),
+    IsDeterministic = member(deterministic, CompilerOpts),
     Info0 = proplists:get_value(compile_info, Opts, []),
     Info1 =
 	case paranoid_absname(File) of
@@ -1528,15 +1554,14 @@ native_compile_1(Code, St) ->
 		    {error,St#compile{errors=St#compile.errors ++ Es}}
 	    end
     catch
-	Class:R ->
-	    Stk = erlang:get_stacktrace(),
+	Class:R:Stack ->
 	    case IgnoreErrors of
 		true ->
 		    Ws = [{St#compile.ifile,
-			   [{none,?MODULE,{native_crash,R,Stk}}]}],
+			   [{none,?MODULE,{native_crash,R,Stack}}]}],
 		    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
 		false ->
-		    erlang:raise(Class, R, Stk)
+		    erlang:raise(Class, R, Stack)
 	    end
     end.
 
@@ -1764,6 +1789,21 @@ listing(LFun, Ext, Code, St) ->
 	    {error,St#compile{errors=St#compile.errors ++ Es}}
     end.
 
+to_dis(Code, #compile{module=Module,ofile=Outfile}=St) ->
+    Loaded = code:is_loaded(Module),
+    Sticky = code:is_sticky(Module),
+    _ = [code:unstick_mod(Module) || Sticky],
+
+    {module,Module} = code:load_binary(Module, "", Code),
+    DestDir = filename:dirname(Outfile),
+    DisFile = filename:join(DestDir, atom_to_list(Module) ++ ".dis"),
+    ok = erts_debug:dis_to_file(Module, DisFile),
+
+    %% Restore loaded module
+    _ = [{module, Module} = code:load_file(Module) || Loaded =/= false],
+    [code:stick_mod(Module) || Sticky],
+    {ok,Code,St}.
+
 output_encoding(F, #compile{encoding = none}) ->
     ok = io:setopts(F, [{encoding, epp:default_encoding()}]);
 output_encoding(F, #compile{encoding = Encoding}) ->
diff --git a/lib/compiler/src/core_lint.erl b/lib/compiler/src/core_lint.erl
index 7d3513c0ba..6e2114be56 100644
--- a/lib/compiler/src/core_lint.erl
+++ b/lib/compiler/src/core_lint.erl
@@ -353,12 +353,6 @@ expr(#c_case{arg=Arg,clauses=Cs}, Def, Rt, St0) ->
     Pc = case_patcount(Cs),
     St1 = body(Arg, Def, Pc, St0),
     clauses(Cs, Def, Pc, Rt, St1);
-expr(#c_receive{clauses=Cs,timeout=#c_literal{val=infinity},
-		action=#c_literal{}},
-     Def, Rt, St) ->
-    %% If the timeout is 'infinity', the after code can never
-    %% be reached. We don't care if the return count is wrong.
-    clauses(Cs, Def, 1, Rt, St);
 expr(#c_receive{clauses=Cs,timeout=T,action=A}, Def, Rt, St0) ->
     St1 = expr(T, Def, 1, St0),
     St2 = body(A, Def, Rt, St1),
diff --git a/lib/compiler/src/genop.tab b/lib/compiler/src/genop.tab
index b5688de339..a47d4e8cf7 100755
--- a/lib/compiler/src/genop.tab
+++ b/lib/compiler/src/genop.tab
@@ -545,3 +545,32 @@ BEAM_FORMAT_NUMBER=0
 ##      Test the arity of Reg and jumps to Lbl if it is not N.
 ##      Test the first element of the tuple and jumps to Lbl if it is not Atom.
 159: is_tagged_tuple/4
+
+# OTP 21
+
+## @spec build_stacktrace
+## @doc  Given the raw stacktrace in x(0), build a cooked stacktrace suitable
+##       for human consumption. Store it in x(0). Destroys all other registers.
+##       Do a garbage collection if necessary to allocate space on the heap
+##       for the result.
+160: build_stacktrace/0
+
+## @spec raw_raise
+## @doc  This instruction works like the erlang:raise/3 BIF, except that the
+##       stacktrace in x(2) must be a raw stacktrace.
+##       x(0) is the class of the exception (error, exit, or throw),
+##       x(1) is the exception term, and x(2) is the raw stackframe.
+##       If x(0) is not a valid class, the instruction will not throw an
+##       exception, but store the atom 'badarg' in x(0) and execute the
+##       next instruction.
+161: raw_raise/0
+
+## @spec get_hd  Source Head
+## @doc  Get the head (or car) part of a list (a cons cell) from Source and
+##       put it into the register Head.
+162: get_hd/2
+
+## @spec get_tl  Source Tail
+## @doc  Get the tail (or cdr) part of a list (a cons cell) from Source and
+##       put it into the register Tail.
+163: get_tl/2
diff --git a/lib/compiler/src/sys_core_alias.erl b/lib/compiler/src/sys_core_alias.erl
index 63e2f7488e..1bce1577d1 100644
--- a/lib/compiler/src/sys_core_alias.erl
+++ b/lib/compiler/src/sys_core_alias.erl
@@ -64,8 +64,7 @@ def({#c_var{name={F,Arity}}=Name,B0}) ->
         erase(new_var_num),
         {Name,B1}
     catch
-        Class:Error ->
-            Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
             io:fwrite("Function: ~w/~w\n", [F,Arity]),
             erlang:raise(Class, Error, Stack)
     end.
diff --git a/lib/compiler/src/sys_core_bsm.erl b/lib/compiler/src/sys_core_bsm.erl
index 3e04cc33df..65580f79e3 100644
--- a/lib/compiler/src/sys_core_bsm.erl
+++ b/lib/compiler/src/sys_core_bsm.erl
@@ -24,7 +24,7 @@
 -export([module/2,format_error/1]).
 
 -include("core_parse.hrl").
--import(lists, [member/2,nth/2,reverse/1,usort/1]).
+-import(lists, [member/2,reverse/1,usort/1]).
 
 -spec module(cerl:c_module(), [compile:option()]) -> {'ok', cerl:c_module()}.
 
@@ -44,8 +44,7 @@ function([{#c_var{name={F,Arity}}=Name,B0}|Fs], FsAcc, Ws0) ->
         {B,Ws} ->
             function(Fs, [{Name,B}|FsAcc], Ws)
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [F,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end;
@@ -60,13 +59,6 @@ format_error(bin_opt_alias) ->
 format_error(bin_partition) ->
     "INFO: matching non-variables after a previous clause matching a variable "
 	"will prevent delayed sub binary optimization";
-format_error(bin_left_var_used_in_guard) ->
-    "INFO: a variable to the left of the binary pattern is used in a guard; "
-	"will prevent delayed sub binary optimization";
-format_error(bin_argument_order) ->
-    "INFO: matching anything else but a plain variable to the left of "
-	"binary pattern will prevent delayed sub binary optimization; "
-	"SUGGEST changing argument order";
 format_error(bin_var_used) ->
     "INFO: using a matched out sub binary will prevent "
 	"delayed sub binary optimization";
@@ -97,46 +89,41 @@ bsm_an(#c_case{arg=#c_values{es=Es}}=Case) ->
 bsm_an(Other) ->
     {ok,Other}.
 
-bsm_an_1(Vs, #c_case{clauses=Cs}=Case) ->
-    case bsm_leftmost(Cs) of
-	none -> {ok,Case};
-	Pos -> bsm_an_2(Vs, Cs, Case, Pos)
-    end.
-
-bsm_an_2(Vs, Cs, Case, Pos) ->
-    case bsm_nonempty(Cs, Pos) of
-	true -> bsm_an_3(Vs, Cs, Case, Pos);
-	false -> {ok,Case}
+bsm_an_1(Vs0, #c_case{clauses=Cs0}=Case) ->
+    case bsm_leftmost(Cs0) of
+	none ->
+            {ok,Case};
+        1 ->
+            bsm_an_2(Vs0, Cs0, Case);
+        Pos ->
+            Vs = move_from_col(Pos, Vs0),
+            Cs = [C#c_clause{pats=move_from_col(Pos, Ps)} ||
+                     #c_clause{pats=Ps}=C <- Cs0],
+            bsm_an_2(Vs, Cs, Case)
     end.
 
-bsm_an_3(Vs, Cs, Case, Pos) ->
+bsm_an_2(Vs, Cs, Case) ->
     try
-	bsm_ensure_no_partition(Cs, Pos),
-	{ok,bsm_do_an(Vs, Pos, Cs, Case)}
+        bsm_ensure_no_partition(Cs),
+        {ok,bsm_do_an(Vs, Cs, Case)}
     catch
-	throw:{problem,Where,What} ->
-	    {ok,Case,{Where,What}}
+        throw:{problem,Where,What} ->
+            {ok,Case,{Where,What}}
     end.
 
-bsm_do_an(Vs0, Pos, Cs0, Case) ->
-    case nth(Pos, Vs0) of
-	#c_var{name=Vname}=V0 ->
-	    Cs = bsm_do_an_var(Vname, Pos, Cs0, []),
-	    V = bsm_annotate_for_reuse(V0),
-	    Bef = lists:sublist(Vs0, Pos-1),
-	    Aft = lists:nthtail(Pos, Vs0),
-	    case Bef ++ [V|Aft] of
-		[_] ->
-		    Case#c_case{arg=V,clauses=Cs};
-		Vs ->
-		    Case#c_case{arg=#c_values{es=Vs},clauses=Cs}
-	    end;
-	_ ->
-	    Case
-    end.
+move_from_col(Pos, L) ->
+    {First,[Col|Rest]} = lists:split(Pos - 1, L),
+    [Col|First] ++ Rest.
 
-bsm_do_an_var(V, S, [#c_clause{pats=Ps,guard=G,body=B0}=C0|Cs], Acc) ->
-    case nth(S, Ps) of
+bsm_do_an([#c_var{name=Vname}=V0|Vs0], Cs0, Case) ->
+    Cs = bsm_do_an_var(Vname, Cs0),
+    V = bsm_annotate_for_reuse(V0),
+    Vs = core_lib:make_values([V|Vs0]),
+    Case#c_case{arg=Vs,clauses=Cs};
+bsm_do_an(_Vs, _Cs, Case) -> Case.
+
+bsm_do_an_var(V, [#c_clause{pats=[P|_],guard=G,body=B0}=C0|Cs]) ->
+    case P of
 	#c_var{name=VarName} ->
 	    case core_lib:is_var_used(V, G) of
 		true -> bsm_problem(C0, orig_bin_var_used_in_guard);
@@ -149,23 +136,23 @@ bsm_do_an_var(V, S, [#c_clause{pats=Ps,guard=G,body=B0}=C0|Cs], Acc) ->
 	    B1 = bsm_maybe_ctx_to_binary(VarName, B0),
 	    B = bsm_maybe_ctx_to_binary(V, B1),
 	    C = C0#c_clause{body=B},
-	    bsm_do_an_var(V, S, Cs, [C|Acc]);
-	#c_alias{}=P ->
+            [C|bsm_do_an_var(V, Cs)];
+        #c_alias{} ->
 	    case bsm_could_match_binary(P) of
 		false ->
-		    bsm_do_an_var(V, S, Cs, [C0|Acc]);
+		    [C0|bsm_do_an_var(V, Cs)];
 		true ->
 		    bsm_problem(C0, bin_opt_alias)
 	    end;
-	P ->
+        _ ->
 	    case bsm_could_match_binary(P) andalso bsm_is_var_used(V, G, B0) of
 		false ->
-		    bsm_do_an_var(V, S, Cs, [C0|Acc]);
+		    [C0|bsm_do_an_var(V, Cs)];
 		true ->
 		    bsm_problem(C0, bin_var_used)
 	    end
     end;
-bsm_do_an_var(_, _, [], Acc) -> reverse(Acc).
+bsm_do_an_var(_, []) -> [].
 
 bsm_annotate_for_reuse(#c_var{anno=Anno}=Var) ->
     Var#c_var{anno=[reuse_for_context|Anno]}.
@@ -193,131 +180,82 @@ previous_ctx_to_binary(V, Core) ->
     end.
 
 %% bsm_leftmost(Cs) -> none | ArgumentNumber
-%%  Find the leftmost argument that does binary matching. Return
-%%  the number of the argument (1-N).
+%%  Find the leftmost argument that matches a nonempty binary.
+%%  Return either 'none' or the argument number (1-N).
 
 bsm_leftmost(Cs) ->
     bsm_leftmost_1(Cs, none).
 
+bsm_leftmost_1([_|_], 1) ->
+    1;
 bsm_leftmost_1([#c_clause{pats=Ps}|Cs], Pos) ->
     bsm_leftmost_2(Ps, Cs, 1, Pos);
 bsm_leftmost_1([], Pos) -> Pos.
 
 bsm_leftmost_2(_, Cs, Pos, Pos) ->
     bsm_leftmost_1(Cs, Pos);
-bsm_leftmost_2([#c_binary{}|_], Cs, N, _) ->
+bsm_leftmost_2([#c_binary{segments=[_|_]}|_], Cs, N, _) ->
     bsm_leftmost_1(Cs, N);
 bsm_leftmost_2([_|Ps], Cs, N, Pos) ->
     bsm_leftmost_2(Ps, Cs, N+1, Pos);
 bsm_leftmost_2([], Cs, _, Pos) ->
     bsm_leftmost_1(Cs, Pos).
 
-%% bsm_nonempty(Cs, Pos) -> true|false
-%%  Check if at least one of the clauses matches a non-empty
-%%  binary in the given argument position.
+%% bsm_ensure_no_partition(Cs) -> ok     (exception if problem)
+%%  There must only be a single bs_start_match2 instruction if we
+%%  are to reuse the binary variable for the match context.
+%%
+%%  To make sure that there is only a single bs_start_match2
+%%  instruction, we will check for partitions such as:
 %%
-bsm_nonempty([#c_clause{pats=Ps}|Cs], Pos) ->
-    case nth(Pos, Ps) of
-	#c_binary{segments=[_|_]} ->
-	    true;
-	_ ->
-	    bsm_nonempty(Cs, Pos)
-    end;
-bsm_nonempty([], _ ) -> false.
-
-%% bsm_ensure_no_partition(Cs, Pos) -> ok     (exception if problem)
-%%  We must make sure that matching is not partitioned between
-%%  variables like this:
 %%             foo(<<...>>) -> ...
 %%             foo(<Variable>) when ... -> ...
-%%             foo(<Any non-variable pattern>) ->
-%%  If there is such partition, we are not allowed to reuse the binary variable
-%%  for the match context.
+%%             foo(<Non-variable pattern>) ->
 %%
-%%  Also, arguments to the left of the argument that is matched
-%%  against a binary, are only allowed to be simple variables, not
-%%  used in guards. The reason is that we must know that the binary is
-%%  only matched in one place (i.e. there must be only one bs_start_match2
-%%  instruction emitted).
+%%  If there is such partition, we reject the optimization.
 
-bsm_ensure_no_partition(Cs, Pos) ->
-    bsm_ensure_no_partition_1(Cs, Pos, before).
+bsm_ensure_no_partition(Cs) ->
+    bsm_ensure_no_partition_1(Cs, before).
 
 %% Loop through each clause.
-bsm_ensure_no_partition_1([#c_clause{pats=Ps,guard=G}|Cs], Pos, State0) ->
-    State = bsm_ensure_no_partition_2(Ps, Pos, G, simple_vars, State0),
+bsm_ensure_no_partition_1([#c_clause{pats=Ps,guard=G}|Cs], State0) ->
+    State = bsm_ensure_no_partition_2(Ps, G, State0),
     case State of
 	'after' ->
-	    bsm_ensure_no_partition_after(Cs, Pos);
+	    bsm_ensure_no_partition_after(Cs);
 	_ ->
 	    ok
     end,
-    bsm_ensure_no_partition_1(Cs, Pos, State);
-bsm_ensure_no_partition_1([], _, _) -> ok.
+    bsm_ensure_no_partition_1(Cs, State);
+bsm_ensure_no_partition_1([], _) -> ok.
 
-%% Loop through each pattern for this clause.
-bsm_ensure_no_partition_2([#c_binary{}=Where|_], 1, _, Vstate, State) ->
-    case State of
-	before when Vstate =:= simple_vars -> within;
-	before -> bsm_problem(Where, Vstate);
-	within when Vstate =:= simple_vars -> within;
-	within -> bsm_problem(Where, Vstate)
-    end;
-bsm_ensure_no_partition_2([#c_alias{}=Alias|_], 1, N, Vstate, State) ->
+bsm_ensure_no_partition_2([#c_binary{}|_], _, _State) ->
+    within;
+bsm_ensure_no_partition_2([#c_alias{}=Alias|_], N, State) ->
     %% Retrieve the real pattern that the alias refers to and check that.
     P = bsm_real_pattern(Alias),
-    bsm_ensure_no_partition_2([P], 1, N, Vstate, State);
-bsm_ensure_no_partition_2([_|_], 1, _, _Vstate, before=State) ->
+    bsm_ensure_no_partition_2([P], N, State);
+bsm_ensure_no_partition_2([_|_], _, before=State) ->
     %% No binary matching yet - therefore no partition.
     State;
-bsm_ensure_no_partition_2([P|_], 1, _, Vstate, State) ->
+bsm_ensure_no_partition_2([P|_], _, State) ->
     case bsm_could_match_binary(P) of
 	false ->
-	    %% If clauses can be freely arranged (Vstate =:= simple_vars),
-	    %% a clause that cannot match a binary will not partition the clause.
-	    %% Example:
-	    %%
-	    %% a(Var, <<>>) -> ...
-	    %% a(Var, []) -> ...
-	    %% a(Var, <<B>>) -> ...
-	    %%
-	    %% But if the clauses can't be freely rearranged, as in
-	    %%
-	    %% b(Var, <<X>>) -> ...
-	    %% b(1, 2) -> ...
-	    %%
-	    %% we do have a problem.
-	    %%
-	    case Vstate of
-		simple_vars -> State;
-		_ -> bsm_problem(P, Vstate)
-	    end;
+            State;
 	true ->
 	    %% The pattern P *may* match a binary, so we must update the state.
 	    %% (P must be a variable.)
-	    case State of
-		within -> 'after';
-		'after' -> 'after'
-	    end
-    end;
-bsm_ensure_no_partition_2([#c_var{name=V}|Ps], N, G, Vstate, S) ->
-    case core_lib:is_var_used(V, G) of
-	false ->
-	    bsm_ensure_no_partition_2(Ps, N-1, G, Vstate, S);
-	true ->
-	    bsm_ensure_no_partition_2(Ps, N-1, G, bin_left_var_used_in_guard, S)
-    end;
-bsm_ensure_no_partition_2([_|Ps], N, G, _, S) ->
-    bsm_ensure_no_partition_2(Ps, N-1, G, bin_argument_order, S).
+            'after'
+    end.
 
-bsm_ensure_no_partition_after([#c_clause{pats=Ps}=C|Cs], Pos) ->
-    case nth(Pos, Ps) of
-	#c_var{} ->
-	    bsm_ensure_no_partition_after(Cs, Pos);
-	_ ->
-	    bsm_problem(C, bin_partition)
+bsm_ensure_no_partition_after([#c_clause{pats=Ps}=C|Cs]) ->
+    case Ps of
+        [#c_var{}|_] ->
+            bsm_ensure_no_partition_after(Cs);
+        _ ->
+            bsm_problem(C, bin_partition)
     end;
-bsm_ensure_no_partition_after([], _) -> ok.
+bsm_ensure_no_partition_after([]) -> ok.
 
 bsm_could_match_binary(#c_alias{pat=P}) -> bsm_could_match_binary(P);
 bsm_could_match_binary(#c_cons{}) -> false;
diff --git a/lib/compiler/src/sys_core_dsetel.erl b/lib/compiler/src/sys_core_dsetel.erl
index bd3eeae238..9e2df69b33 100644
--- a/lib/compiler/src/sys_core_dsetel.erl
+++ b/lib/compiler/src/sys_core_dsetel.erl
@@ -81,8 +81,7 @@ visit_module_1([{Name,F0}|Fs], Env, Acc) ->
 	{F,_} ->
 	    visit_module_1(Fs, Env, [{Name,F}|Acc])
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    #c_var{name={Func,Arity}} = Name,
 	    io:fwrite("Function: ~w/~w\n", [Func,Arity]),
 	    erlang:raise(Class, Error, Stack)
diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index df880ff784..a9bd363ee1 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -125,8 +125,7 @@ function_1({#c_var{name={F,Arity}}=Name,B0}) ->
 			  end, B0, 20),
 	{Name,B}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [F,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -146,14 +145,9 @@ find_fixpoint(OptFun, Core0, Max) ->
 body(Body, Sub) ->
     body(Body, value, Sub).
 
-body(#c_values{anno=A,es=Es0}, Ctxt, Sub) ->
-    Es1 = expr_list(Es0, Ctxt, Sub),
-    case Ctxt of
-	value ->
-	    #c_values{anno=A,es=Es1};
-	effect ->
-	    make_effect_seq(Es1, Sub)
-    end;
+body(#c_values{anno=A,es=Es0}, value, Sub) ->
+    Es1 = expr_list(Es0, value, Sub),
+    #c_values{anno=A,es=Es1};
 body(E, Ctxt, Sub) ->
     ?ASSERT(verify_scope(E, Sub)),
     expr(E, Ctxt, Sub).
@@ -314,9 +308,15 @@ expr(#c_seq{arg=Arg0,body=B0}=Seq0, Ctxt, Sub) ->
 	false ->
 	    %% Arg cannot be "values" here - only a single value
 	    %% make sense here.
-	    case is_safe_simple(Arg, Sub) of
-		true -> B1;
-		false -> Seq0#c_seq{arg=Arg,body=B1}
+            case {Ctxt,is_safe_simple(Arg, Sub)} of
+                {effect,true} -> B1;
+                {effect,false} ->
+                    case is_safe_simple(B1, Sub) of
+                        true -> Arg;
+                        false -> Seq0#c_seq{arg=Arg,body=B1}
+                    end;
+                {value,true} -> B1;
+                {value,false} -> Seq0#c_seq{arg=Arg,body=B1}
 	    end
     end;
 expr(#c_let{}=Let0, Ctxt, Sub) ->
@@ -380,10 +380,7 @@ expr(#c_case{}=Case0, Ctxt, Sub) ->
 	    Case = Case1#c_case{arg=Arg2,clauses=Cs2},
 	    warn_no_clause_match(Case1, Case),
 	    Expr = eval_case(Case, Sub),
-            case move_case_into_arg(Case, Sub) of
-                impossible -> Expr;
-                Other -> Other
-            end;
+            move_case_into_arg(Expr, Sub);
 	Other ->
 	    expr(Other, Ctxt, Sub)
     end;
@@ -415,6 +412,8 @@ expr(#c_call{module=M0,name=N0}=Call0, Ctxt, Sub) ->
 	no -> call(Call, M1, N1, Sub);
 	{yes,Seq} -> expr(Seq, Ctxt, Sub)
     end;
+expr(#c_primop{name=#c_literal{val=build_stacktrace}}, effect, _Sub) ->
+    void();
 expr(#c_primop{args=As0}=Prim, _, Sub) ->
     As1 = expr_list(As0, value, Sub),
     Prim#c_primop{args=As1};
@@ -2508,6 +2507,72 @@ are_all_failing_clauses(Cs) ->
 is_failing_clause(#c_clause{body=B}) ->
     will_fail(B).
 
+%% opt_build_stacktrace(Let) -> Core.
+%%  If the stacktrace is *only* used in a call to erlang:raise/3,
+%%  there is no need to build a cooked stackframe using build_stacktrace/1.
+
+opt_build_stacktrace(#c_let{vars=[#c_var{name=Cooked}],
+                            arg=#c_primop{name=#c_literal{val=build_stacktrace},
+                                          args=[RawStk]},
+                            body=Body}=Let) ->
+    case Body of
+        #c_call{module=#c_literal{val=erlang},
+                name=#c_literal{val=raise},
+                args=[Class,Exp,#c_var{name=Cooked}]} ->
+            %% The stacktrace is only used in a call to erlang:raise/3.
+            %% There is no need to build the stacktrace. Replace the
+            %% call to erlang:raise/3 with the the raw_raise/3 instruction,
+            %% which will use a raw stacktrace.
+            #c_primop{name=#c_literal{val=raw_raise},
+                      args=[Class,Exp,RawStk]};
+        #c_let{vars=[#c_var{name=V}],arg=Arg,body=B0} when V =/= Cooked ->
+            case core_lib:is_var_used(Cooked, Arg) of
+                false ->
+                    %% The built stacktrace is not used in the argument,
+                    %% so we can sink the building of the stacktrace into
+                    %% the body of the let.
+                    B = opt_build_stacktrace(Let#c_let{body=B0}),
+                    Body#c_let{body=B};
+                true ->
+                    Let
+            end;
+        #c_seq{arg=Arg,body=B0} ->
+            case core_lib:is_var_used(Cooked, Arg) of
+                false ->
+                    %% The built stacktrace is not used in the argument,
+                    %% so we can sink the building of the stacktrace into
+                    %% the body of the sequence.
+                    B = opt_build_stacktrace(Let#c_let{body=B0}),
+                    Body#c_seq{body=B};
+                true ->
+                    Let
+            end;
+        #c_case{arg=Arg,clauses=Cs0} ->
+            case core_lib:is_var_used(Cooked, Arg) orelse
+                is_used_in_any_guard(Cooked, Cs0) of
+                false ->
+                    %% The built stacktrace is not used in the argument,
+                    %% so we can sink the building of the stacktrace into
+                    %% each arm of the case.
+                    Cs = [begin
+                              B = opt_build_stacktrace(Let#c_let{body=B0}),
+                              C#c_clause{body=B}
+                          end || #c_clause{body=B0}=C <- Cs0],
+                    Body#c_case{clauses=Cs};
+                true ->
+                    Let
+            end;
+        _ ->
+            Let
+    end;
+opt_build_stacktrace(Expr) ->
+    Expr.
+
+is_used_in_any_guard(V, Cs) ->
+    any(fun(#c_clause{guard=G}) ->
+                core_lib:is_var_used(V, G)
+        end, Cs).
+
 %% opt_case_in_let(Let) -> Let'
 %%  Try to avoid building tuples that are immediately matched.
 %%  A common pattern is:
@@ -2622,9 +2687,13 @@ delay_build_expr_1(#c_receive{clauses=Cs0,
 			      timeout=Timeout,
 			      action=A0}=Rec, TypeSig) ->
     Cs = delay_build_cs(Cs0, TypeSig),
-    A = case Timeout of
-	    #c_literal{val=infinity} -> A0;
-	    _ -> delay_build_expr(A0, TypeSig)
+    A = case {Timeout,A0} of
+	    {#c_literal{val=infinity},#c_literal{}} ->
+                {_Type,Arity} = TypeSig,
+                Es = lists:duplicate(Arity, A0),
+                core_lib:make_values(Es);
+	    _ ->
+                delay_build_expr(A0, TypeSig)
 	end,
     Rec#c_receive{clauses=Cs,action=A};
 delay_build_expr_1(#c_seq{body=B0}=Seq, TypeSig) ->
@@ -2659,53 +2728,94 @@ opt_simple_let_1(#c_let{vars=Vs0,body=B0}=Let, Arg0, Ctxt, Sub0) ->
     %% Optimise let and add new substitutions.
     {Vs,Args,Sub1} = let_substs(Vs0, Arg0, Sub0),
     BodySub = update_let_types(Vs, Args, Sub1),
+    Sub = Sub1#sub{v=[],s=cerl_sets:new()},
     B = body(B0, Ctxt, BodySub),
     Arg = core_lib:make_values(Args),
-    opt_simple_let_2(Let, Vs, Arg, B, B0, Ctxt, Sub1).
+    opt_simple_let_2(Let, Vs, Arg, B, B0, Sub).
+
 
-opt_simple_let_2(Let0, Vs0, Arg0, Body, PrevBody, Ctxt, Sub) ->
+%% opt_simple_let_2(Let0, Vs0, Arg0, Body, PrevBody, Ctxt, Sub) -> Core.
+%%  Do final simplifications of the let.
+%%
+%%  Note that the substitutions and scope in Sub have been cleared
+%%  and should not be used.
+
+opt_simple_let_2(Let0, Vs0, Arg0, Body, PrevBody, Sub) ->
     case {Vs0,Arg0,Body} of
-	{[#c_var{name=N1}],Arg1,#c_var{name=N2}} ->
-	    case N1 =:= N2 of
-		true ->
-		    %% let <Var> = Arg in <Var>  ==>  Arg
-		    Arg1;
-		false ->
-		    %% let <Var> = Arg in <OtherVar>  ==>  seq Arg OtherVar
-		    Arg = maybe_suppress_warnings(Arg1, Vs0, PrevBody),
-		    #c_seq{arg=Arg,body=Body}
-	    end;
+	{[#c_var{name=V}],Arg1,#c_var{name=V}} ->
+            %% let <Var> = Arg in <Var>  ==>  Arg
+            Arg1;
 	{[],#c_values{es=[]},_} ->
 	    %% No variables left.
 	    Body;
-	{Vs,Arg1,#c_literal{}} ->
-	    Arg = maybe_suppress_warnings(Arg1, Vs, PrevBody),
-	    case Ctxt of
-		effect ->
-		    %% Throw away the literal body.
-		    Arg;
-		value ->
-		    %% Since the variable is not used in the body, we
-		    %% can rewrite the let to a sequence.
-		    %%  let <Var> = Arg in Literal ==> seq Arg Literal
-		    #c_seq{arg=Arg,body=Body}
-	    end;
-	{Vs,Arg1,Body} ->
-	    %% If none of the variables are used in the body, we can
-	    %% rewrite the let to a sequence:
-	    %%    let <Var> = Arg in BodyWithoutVar ==>
-	    %%        seq Arg BodyWithoutVar
-	    case is_any_var_used(Vs, Body) of
-		false ->
-		    Arg = maybe_suppress_warnings(Arg1, Vs, PrevBody),
-		    #c_seq{arg=Arg,body=Body};
-		true ->
-		    Let1 = Let0#c_let{vars=Vs,arg=Arg1,body=Body},
-		    opt_bool_case_in_let(Let1, Sub)
+	{[#c_var{name=V}=Var|Vars]=Vars0,Arg1,Body} ->
+            case core_lib:is_var_used(V, Body) of
+                false when Vars =:= [] ->
+                    %% If the variable is not used in the body, we can
+                    %% rewrite the let to a sequence:
+                    %%    let <Var> = Arg in BodyWithoutVar ==>
+                    %%        seq Arg BodyWithoutVar
+                    Arg = maybe_suppress_warnings(Arg1, Var, PrevBody),
+                    #c_seq{arg=Arg,body=Body};
+                false ->
+                    %% There are multiple values returned by the argument
+                    %% and the first value is not used (this is a 'case'
+                    %% with exported variables, but the return value is
+                    %% ignored). We can remove the first variable and the
+                    %% the first value returned from the 'let' argument.
+                    Arg2 = remove_first_value(Arg1, Sub),
+                    Let1 = Let0#c_let{vars=Vars,arg=Arg2,body=Body},
+                    post_opt_let(Let1, Sub);
+                true ->
+                    Let1 = Let0#c_let{vars=Vars0,arg=Arg1,body=Body},
+                    post_opt_let(Let1, Sub)
 	    end
     end.
 
-%% maybe_suppress_warnings(Arg, [#c_var{}], PreviousBody) -> Arg'
+%% post_opt_let(Let, Sub)
+%%  Final optimizations of the let.
+%%
+%%  Note that the substitutions and scope in Sub have been cleared
+%%  and should not be used.
+
+post_opt_let(Let0, Sub) ->
+    Let1 = opt_bool_case_in_let(Let0, Sub),
+    opt_build_stacktrace(Let1).
+
+
+%% remove_first_value(Core0, Sub) -> Core.
+%%  Core0 is an expression that returns at least two values.
+%%  Remove the first value returned from Core0.
+
+remove_first_value(#c_values{es=[V|Vs]}, Sub) ->
+    Values = core_lib:make_values(Vs),
+    case is_safe_simple(V, Sub) of
+        false ->
+            #c_seq{arg=V,body=Values};
+        true ->
+            Values
+    end;
+remove_first_value(#c_case{clauses=Cs0}=Core, Sub) ->
+    Cs = remove_first_value_cs(Cs0, Sub),
+    Core#c_case{clauses=Cs};
+remove_first_value(#c_receive{clauses=Cs0,action=Act0}=Core, Sub) ->
+    Cs = remove_first_value_cs(Cs0, Sub),
+    Act = remove_first_value(Act0, Sub),
+    Core#c_receive{clauses=Cs,action=Act};
+remove_first_value(#c_let{body=B}=Core, Sub) ->
+    Core#c_let{body=remove_first_value(B, Sub)};
+remove_first_value(#c_seq{body=B}=Core, Sub) ->
+    Core#c_seq{body=remove_first_value(B, Sub)};
+remove_first_value(#c_primop{}=Core, _Sub) ->
+    Core;
+remove_first_value(#c_call{}=Core, _Sub) ->
+    Core.
+
+remove_first_value_cs(Cs, Sub) ->
+    [C#c_clause{body=remove_first_value(B, Sub)} ||
+        #c_clause{body=B}=C <- Cs].
+
+%% maybe_suppress_warnings(Arg, #c_var{}, PreviousBody) -> Arg'
 %%  Try to suppress false warnings when a variable is not used.
 %%  For instance, we don't expect a warning for useless building in:
 %%
@@ -2716,12 +2826,12 @@ opt_simple_let_2(Let0, Vs0, Arg0, Body, PrevBody, Ctxt, Sub) ->
 %%  referenced in the original unoptimized code. If they were, we will
 %%  consider the warning false and suppress it.
 
-maybe_suppress_warnings(Arg, Vs, PrevBody) ->
+maybe_suppress_warnings(Arg, #c_var{name=V}, PrevBody) ->
     case should_suppress_warning(Arg) of
 	true ->
 	    Arg;				%Already suppressed.
 	false ->
-	    case is_any_var_used(Vs, PrevBody) of
+	    case core_lib:is_var_used(V, PrevBody) of
 		true ->
 		    suppress_warning([Arg]);
 		false ->
@@ -2810,7 +2920,7 @@ move_case_into_arg(#c_case{arg=#c_case{arg=OuterArg,
 	    Outer#c_case{arg=OuterArg,
 			 clauses=[OuterCa,OuterCb]};
         false ->
-            impossible
+            Inner0
     end;
 move_case_into_arg(#c_case{arg=#c_seq{arg=OuterArg,body=InnerArg}=Outer,
                            clauses=InnerClauses}=Inner, _Sub) ->
@@ -2826,15 +2936,8 @@ move_case_into_arg(#c_case{arg=#c_seq{arg=OuterArg,body=InnerArg}=Outer,
     %%
     Outer#c_seq{arg=OuterArg,
                 body=Inner#c_case{arg=InnerArg,clauses=InnerClauses}};
-move_case_into_arg(_, _) ->
-    impossible.
-
-is_any_var_used([#c_var{name=V}|Vs], Expr) ->
-    case core_lib:is_var_used(V, Expr) of
-	false -> is_any_var_used(Vs, Expr);
-	true -> true
-    end;
-is_any_var_used([], _) -> false.
+move_case_into_arg(Expr, _) ->
+    Expr.
 
 %%%
 %%% Retrieving information about types.
diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl
index 006a6a82d2..a8f4926e55 100644
--- a/lib/compiler/src/v3_codegen.erl
+++ b/lib/compiler/src/v3_codegen.erl
@@ -51,7 +51,7 @@ set_kanno(Kthing, Anno) -> setelement(2, Kthing, Anno).
 %% Stack/register state record.
 -record(sr, {reg=[],				%Register table
 	     stk=[],				%Stack table
-	     res=[]}).				%Reserved regs: [{reserved,I,V}]
+	     res=[]}).				%Registers to reserve
 
 %% Internal records.
 -record(cg_need_heap, {anno=[] :: term(),
@@ -77,10 +77,15 @@ functions(Forms, AtomMod) ->
 function(#k_fdef{anno=#k{a=Anno},func=Name,arity=Arity,
                  vars=As,body=Kb}, AtomMod, St0) ->
     try
-        %% Annotate kernel records with variable usage.
         #k_match{} = Kb,                   %Assertion.
+
+        %% Try to suppress the stack frame unless it is
+        %% really needed.
+        Body0 = avoid_stack_frame(Kb),
+
+        %% Annotate kernel records with variable usage.
         Vdb0 = init_vars(As),
-        {Body,_,Vdb} = body(Kb, 1, Vdb0),
+        {Body,_,Vdb} = body(Body0, 1, Vdb0),
 
         %% Generate the BEAM assembly code.
         {Asm,EntryLabel,St} = cg_fun(Body, As, Vdb, AtomMod,
@@ -88,12 +93,141 @@ function(#k_fdef{anno=#k{a=Anno},func=Name,arity=Arity,
         Func = {function,Name,Arity,EntryLabel,Asm},
         {Func,St}
     catch
-        Class:Error ->
-            Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
             io:fwrite("Function: ~w/~w\n", [Name,Arity]),
             erlang:raise(Class, Error, Stack)
     end.
 
+
+%% avoid_stack_frame(Kernel) -> Kernel'
+%%  If possible, avoid setting up a stack frame. Functions
+%%  that only do matching, calls to guard BIFs, and tail-recursive
+%%  calls don't need a stack frame.
+
+avoid_stack_frame(#k_match{body=Body}=M) ->
+    try
+        M#k_match{body=avoid_stack_frame_1(Body)}
+    catch
+        impossible ->
+            M
+    end.
+
+avoid_stack_frame_1(#k_alt{first=First0,then=Then0}=Alt) ->
+    First = avoid_stack_frame_1(First0),
+    Then = avoid_stack_frame_1(Then0),
+    Alt#k_alt{first=First,then=Then};
+avoid_stack_frame_1(#k_bif{op=Op}=Bif) ->
+    case Op of
+        #k_internal{} ->
+            %% Most internal BIFs clobber the X registers.
+            throw(impossible);
+        _ ->
+            Bif
+    end;
+avoid_stack_frame_1(#k_break{anno=Anno,args=Args}) ->
+    #k_guard_break{anno=Anno,args=Args};
+avoid_stack_frame_1(#k_guard_break{}=Break) ->
+    Break;
+avoid_stack_frame_1(#k_enter{}=Enter) ->
+    %% Tail-recursive calls don't need a stack frame.
+    Enter;
+avoid_stack_frame_1(#k_guard{clauses=Cs0}=Guard) ->
+    Cs = avoid_stack_frame_list(Cs0),
+    Guard#k_guard{clauses=Cs};
+avoid_stack_frame_1(#k_guard_clause{guard=G0,body=B0}=C) ->
+    G = avoid_stack_frame_1(G0),
+    B = avoid_stack_frame_1(B0),
+    C#k_guard_clause{guard=G,body=B};
+avoid_stack_frame_1(#k_match{anno=A,vars=Vs,body=B0,ret=Ret}) ->
+    %% Use #k_guard_match{} instead to avoid saving the X registers
+    %% to the stack before matching.
+    B = avoid_stack_frame_1(B0),
+    #k_guard_match{anno=A,vars=Vs,body=B,ret=Ret};
+avoid_stack_frame_1(#k_guard_match{body=B0}=M) ->
+    B = avoid_stack_frame_1(B0),
+    M#k_guard_match{body=B};
+avoid_stack_frame_1(#k_protected{arg=Arg0}=Prot) ->
+    Arg = avoid_stack_frame_1(Arg0),
+    Prot#k_protected{arg=Arg};
+avoid_stack_frame_1(#k_put{}=Put) ->
+    Put;
+avoid_stack_frame_1(#k_return{}=Ret) ->
+    Ret;
+avoid_stack_frame_1(#k_select{var=#k_var{anno=Vanno},types=Types0}=Select) ->
+    case member(reuse_for_context, Vanno) of
+        false ->
+            Types = avoid_stack_frame_list(Types0),
+            Select#k_select{types=Types};
+        true ->
+            %% Including binary patterns that overwrite the register containing
+            %% the binary with the match context may not be safe. For example,
+            %% bs_match_SUITE:bin_tail_e/1 with inlining will be rejected by
+            %% beam_validator.
+            %%
+            %% Essentially the following code is produced:
+            %%
+            %% bs_match {x,0} => {x,0}
+            %% ...
+            %% bs_match {x,0} => {x,1}  %% ILLEGAL
+            %%
+            %% A bs_match instruction will only accept a match context as the
+            %% source operand if the source and destination registers are the
+            %% the same (as in the first bs_match instruction above).
+            %% The second bs_match instruction is therefore illegal.
+            %%
+            %% This situation is avoided if there is a stack frame:
+            %%
+            %% move {x,0} => {y,0}
+            %% bs_match {x,0} => {x,0}
+            %% ...
+            %% bs_match {y,0} => {x,1}  %% LEGAL
+            %%
+            throw(impossible)
+    end;
+avoid_stack_frame_1(#k_seq{arg=#k_call{anno=Anno,op=Op}=Call,
+                           body=#k_break{args=BrArgs0}}=Seq) ->
+    case Op of
+        #k_remote{mod=#k_atom{val=Mod},
+                  name=#k_atom{val=Name},
+                  arity=Arity} ->
+            case erl_bifs:is_exit_bif(Mod, Name, Arity) of
+                false ->
+                    %% Will clobber X registers. Must have a stack frame.
+                    throw(impossible);
+                true ->
+                    %% The call to this BIF will never return. It is safe
+                    %% to suppress the stack frame.
+                    Bif = #k_bif{anno=Anno,
+                                 op=#k_internal{name=guard_error,arity=1},
+                                 args=[Call],ret=[]},
+                    BrArgs = lists:duplicate(length(BrArgs0), #k_nil{}),
+                    GB = #k_guard_break{anno=#k{us=[],ns=[],a=[]},args=BrArgs},
+                    Seq#k_seq{arg=Bif,body=GB}
+            end;
+        _ ->
+            %% Will clobber X registers. Must have a stack frame.
+            throw(impossible)
+    end;
+avoid_stack_frame_1(#k_seq{arg=A0,body=B0}=Seq) ->
+    A = avoid_stack_frame_1(A0),
+    B = avoid_stack_frame_1(B0),
+    Seq#k_seq{arg=A,body=B};
+avoid_stack_frame_1(#k_test{}=Test) ->
+    Test;
+avoid_stack_frame_1(#k_type_clause{values=Values0}=TC) ->
+    Values = avoid_stack_frame_list(Values0),
+    TC#k_type_clause{values=Values};
+avoid_stack_frame_1(#k_val_clause{body=B0}=VC) ->
+    B = avoid_stack_frame_1(B0),
+    VC#k_val_clause{body=B};
+avoid_stack_frame_1(_Body) ->
+    throw(impossible).
+
+avoid_stack_frame_list([H|T]) ->
+    [avoid_stack_frame_1(H)|avoid_stack_frame_list(T)];
+avoid_stack_frame_list([]) -> [].
+
+
 %% This pass creates beam format annotated with variable lifetime
 %% information.  Each thing is given an index and for each variable we
 %% store the first and last index for its occurrence.  The variable
@@ -219,10 +353,8 @@ expr(#k_put{anno=A}=Put, I, _Vdb) ->
     Put#k_put{anno=#l{i=I,a=A#k.a}};
 expr(#k_break{anno=A}=Break, I, _Vdb) ->
     Break#k_break{anno=#l{i=I,a=A#k.a}};
-expr(#k_guard_break{anno=A}=Break, I, Vdb) ->
-    Locked = [V || {V,_,_} <- Vdb],
-    L = #l{i=I,a=A#k.a},
-    Break#k_guard_break{anno=L,locked=Locked};
+expr(#k_guard_break{anno=A}=Break, I, _Vdb) ->
+    Break#k_guard_break{anno=#l{i=I,a=A#k.a}};
 expr(#k_return{anno=A}=Ret, I, _Vdb) ->
     Ret#k_return{anno=#l{i=I,a=A#k.a}}.
 
@@ -246,14 +378,9 @@ match(#k_alt{anno=A,first=Kf,then=Kt}, Ls, I, Vdb0) ->
     F = match(Kf, Ls, I+1, Vdb1),
     T = match(Kt, Ls, I+1, Vdb1),
     #k_alt{anno=[],first=F,then=T};
-match(#k_select{anno=A,var=V,types=Kts}=Select, Ls0, I, Vdb0) ->
-    Vanno = get_kanno(V),
-    Ls1 = case member(no_usage, Vanno) of
-              false -> add_element(V#k_var.name, Ls0);
-              true -> Ls0
-          end,
-    Vdb1 = use_vars(union(A#k.us, Ls1), I, Vdb0),
-    Ts = [type_clause(Tc, Ls1, I+1, Vdb1) || Tc <- Kts],
+match(#k_select{anno=A,types=Kts}=Select, Ls, I, Vdb0) ->
+    Vdb1 = use_vars(union(A#k.us, Ls), I, Vdb0),
+    Ts = [type_clause(Tc, Ls, I+1, Vdb1) || Tc <- Kts],
     Select#k_select{anno=[],types=Ts};
 match(#k_guard{anno=A,clauses=Kcs}, Ls, I, Vdb0) ->
     Vdb1 = use_vars(union(A#k.us, Ls), I, Vdb0),
@@ -343,7 +470,7 @@ cg_fun(Les, Hvs, Vdb, AtomMod, NameArity, Anno, St0) ->
 					   put_reg(V, Reg)
 				   end, [], Hvs),
 			 stk=[]}, 0, Vdb),
-    {B,_Aft,St} = cg_list(Les, 0, Vdb, Bef,
+    {B,_Aft,St} = cg_list(Les, Vdb, Bef,
 			  St3#cg{bfail=0,
 				 ultimate_failure=UltimateMatchFail,
 				 is_top_block=true}),
@@ -388,26 +515,26 @@ cg(#k_return{anno=Le,args=Rs}, Vdb, Bef, St) ->
     return_cg(Rs, Le, Vdb, Bef, St);
 cg(#k_break{anno=Le,args=Bs}, Vdb, Bef, St) ->
     break_cg(Bs, Le, Vdb, Bef, St);
-cg(#k_guard_break{anno=Le,args=Bs,locked=N}, Vdb, Bef, St) ->
-    guard_break_cg(Bs, N, Le, Vdb, Bef, St);
+cg(#k_guard_break{anno=Le,args=Bs}, Vdb, Bef, St) ->
+    guard_break_cg(Bs, Le, Vdb, Bef, St);
 cg(#cg_need_heap{h=H}, _Vdb, Bef, St) ->
     {[{test_heap,H,max_reg(Bef#sr.reg)}],Bef,St}.
 
 %% cg_list([Kexpr], FirstI, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
 
-cg_list(Kes, I, Vdb, Bef, St0) ->
+cg_list(Kes, Vdb, Bef, St0) ->
     {Keis,{Aft,St1}} =
 	flatmapfoldl(fun (Ke, {Inta,Sta}) ->
 			     {Keis,Intb,Stb} = cg(Ke, Vdb, Inta, Sta),
 			     {Keis,{Intb,Stb}}
-		     end, {Bef,St0}, need_heap(Kes, I)),
+		     end, {Bef,St0}, need_heap(Kes)),
     {Keis,Aft,St1}.
 
 %% need_heap([Lkexpr], I, St) -> [Lkexpr].
 %%  Insert need_heap instructions in Kexpr list.  Try to be smart and
 %%  collect them together as much as possible.
 
-need_heap(Kes0, _I) ->
+need_heap(Kes0) ->
     {Kes,H} = need_heap_0(reverse(Kes0), 0, []),
 
     %% Prepend need_heap if necessary.
@@ -487,7 +614,10 @@ match_cg(M, Rs, Le, Vdb, Bef, St0) ->
 guard_match_cg(M, Rs, Le, Vdb, Bef, St0) ->
     I = Le#l.i,
     {B,St1} = new_label(St0),
-    #cg{bfail=Fail} = St1,
+    Fail = case St0 of
+               #cg{bfail=0,ultimate_failure=Fail0} -> Fail0;
+               #cg{bfail=Fail0} -> Fail0
+           end,
     {Mis,Aft,St2} = match_cg(M, Fail, Bef, St1#cg{break=B}),
     %% Update the register descriptors for the return registers.
     Reg = guard_match_regs(Aft#sr.reg, Rs),
@@ -593,9 +723,6 @@ bsm_rename_ctx(#k_protected{arg=Ts0}=Prot, Old, New, _InProt) ->
     InProt = true,
     Ts = bsm_rename_ctx_list(Ts0, Old, New, InProt),
     bsm_forget_var(Prot#k_protected{arg=Ts}, Old);
-bsm_rename_ctx(#k_match{body=Ms0}=Match, Old, New, InProt) ->
-    Ms = bsm_rename_ctx(Ms0, Old, New, InProt),
-    Match#k_match{body=Ms};
 bsm_rename_ctx(#k_guard_match{body=Ms0}=Match, Old, New, InProt) ->
     Ms = bsm_rename_ctx(Ms0, Old, New, InProt),
     Match#k_guard_match{body=Ms};
@@ -612,9 +739,8 @@ bsm_rename_ctx(#cg_block{es=Es0}=Block, Old, New, true) ->
     %% inside the block.
     Es = bsm_rename_ctx_list(Es0, Old, New, true),
     bsm_forget_var(Block#cg_block{es=Es}, Old);
-bsm_rename_ctx(#k_guard_break{locked=Locked0}=Break, Old, _New, _InProt) ->
-    Locked = Locked0 -- [Old],
-    bsm_forget_var(Break#k_guard_break{locked=Locked}, Old).
+bsm_rename_ctx(#k_guard_break{}=Break, Old, _New, _InProt) ->
+    bsm_forget_var(Break, Old).
 
 bsm_rename_ctx_list([C|Cs], Old, New, InProt) ->
     [bsm_rename_ctx(C, Old, New, InProt)|
@@ -639,26 +765,55 @@ block_cg(Es, Le, _Vdb, Bef, St) ->
     block_cg(Es, Le, Bef, St).
 
 block_cg(Es, Le, Bef, #cg{is_top_block=false}=St) ->
-    cg_block(Es, Le#l.i, Le#l.vdb, Bef, St);
-block_cg(Es, Le, Bef, St0) ->
-    {Is0,Aft,St} = cg_block(Es, Le#l.i, Le#l.vdb, Bef,
-			    St0#cg{is_top_block=false,need_frame=false}),
-    Is = top_level_block(Is0, Aft, max_reg(Bef#sr.reg), St),
-    {Is,Aft,St#cg{is_top_block=true}}.
-
-cg_block([], _I, _Vdb, Bef, St0) ->
+    cg_block(Es, Le#l.vdb, Bef, St);
+block_cg(Es, Le, Bef, #cg{is_top_block=true}=St0) ->
+    %% No stack frame has been established yet. Do we need one?
+    case need_stackframe(Es) of
+        true ->
+            %% We need a stack frame. Generate the code and add the
+            %% code for creating and deallocating the stack frame.
+            {Is0,Aft,St} = cg_block(Es, Le#l.vdb, Bef,
+                                    St0#cg{is_top_block=false,need_frame=false}),
+            Is = top_level_block(Is0, Aft, max_reg(Bef#sr.reg), St),
+            {Is,Aft,St#cg{is_top_block=true}};
+        false ->
+            %% This sequence of instructions ending in a #k_match{} (a
+            %% 'case' or 'if') in the Erlang code does not need a
+            %% stack frame yet. Delay the creation (if a stack frame
+            %% is needed at all, it will be created inside the
+            %% #k_match{}).
+            cg_list(Es, Le#l.vdb, Bef, St0)
+    end.
+
+%% need_stackframe([Kexpr]) -> true|false.
+%%  Does this list of instructions need a stack frame?
+%%
+%%  A sequence of instructions that don't clobber the X registers
+%%  followed by a single #k_match{} doesn't need a stack frame.
+
+need_stackframe([H|T]) ->
+    case H of
+        #k_bif{op=#k_internal{}} -> true;
+        #k_put{arg=#k_binary{}} -> true;
+        #k_bif{} -> need_stackframe(T);
+        #k_put{} -> need_stackframe(T);
+        #k_guard_match{} -> need_stackframe(T);
+        #k_match{} when T =:= [] -> false;
+        _ -> true
+    end;
+need_stackframe([]) -> false.
+
+cg_block([], _Vdb, Bef, St0) ->
     {[],Bef,St0};
-cg_block(Kes0, I, Vdb, Bef, St0) ->
+cg_block(Kes0, Vdb, Bef, St0) ->
     {Kes2,Int1,St1} =
 	case basic_block(Kes0) of
 	    {Kes1,LastI,Args,Rest} ->
-		Ke = hd(Kes1),
-                #l{i=Fb} = get_kanno(Ke),
-		cg_basic_block(Kes1, Fb, LastI, Args, Vdb, Bef, St0);
+		cg_basic_block(Kes1, LastI, Args, Vdb, Bef, St0);
 	    {Kes1,Rest} ->
-		cg_list(Kes1, I, Vdb, Bef, St0)
+		cg_list(Kes1, Vdb, Bef, St0)
 	end,
-    {Kes3,Int2,St2} = cg_block(Rest, I, Vdb, Int1, St1),
+    {Kes3,Int2,St2} = cg_block(Rest, Vdb, Int1, St1),
     {Kes2 ++ Kes3,Int2,St2}.
 
 basic_block(Kes) -> basic_block(Kes, []).
@@ -679,129 +834,158 @@ basic_block([Ke|Kes], Acc) ->
 	no_block -> {reverse(Acc, [Ke]),Kes}
     end.
 
-%% #k_put{} instructions that may garbage collect are not allowed in basic blocks.
-
-collect_block(#k_put{arg=#k_binary{}}) ->
-    no_block;
-collect_block(#k_put{arg=#k_map{}}) ->
-    no_block;
-collect_block(#k_put{}) ->
-    include;
-collect_block(#k_call{op=#k_var{}=Var,args=As}) ->
-    {block_end,As++[Var]};
+collect_block(#k_put{arg=Arg}) ->
+    %% #k_put{} instructions that may garbage collect are not allowed
+    %% in basic blocks.
+    case Arg of
+        #k_binary{} -> no_block;
+        #k_map{} -> no_block;
+        _ -> include
+    end;
 collect_block(#k_call{op=Func,args=As}) ->
     {block_end,As++func_vars(Func)};
-collect_block(#k_enter{op=#k_var{}=Var,args=As}) ->
-    {block_end,As++[Var]};
 collect_block(#k_enter{op=Func,args=As}) ->
     {block_end,As++func_vars(Func)};
 collect_block(#k_return{args=Rs}) ->
     {block_end,Rs};
 collect_block(#k_break{args=Bs}) ->
     {block_end,Bs};
-collect_block(_)                     -> no_block.
+collect_block(_) -> no_block.
 
+func_vars(#k_var{}=Var) ->
+    [Var];
 func_vars(#k_remote{mod=M,name=F})
   when is_record(M, k_var); is_record(F, k_var) ->
     [M,F];
 func_vars(_) -> [].
 
-%% cg_basic_block([Kexpr], FirstI, LastI, As, Vdb, StackReg, State) ->
+%% cg_basic_block([Kexpr], FirstI, LastI, Arguments, Vdb, StackReg, State) ->
 %%      {[Ainstr],StackReg,State}.
-
-cg_basic_block(Kes, Fb, Lf, As, Vdb, Bef, St0) ->
-    Res = make_reservation(As, 0),
-    Regs0 = reserve(Res, Bef#sr.reg, Bef#sr.stk),
-    Stk = extend_stack(Bef, Lf, Lf+1, Vdb),
-    Int0 = Bef#sr{reg=Regs0,stk=Stk,res=Res},
-    X0_v0 = x0_vars(As, Fb, Lf, Vdb),
-    {Keis,{Aft,_,St1}} =
+%%
+%%  Do a specialized code generation for a basic block of #put{}
+%%  instructions (that don't do any garbage collection) followed by a
+%%  call, break, or return.
+%%
+%%  'Arguments' is a list of the variables that must be loaded into
+%%  consecutive X registers before the last instruction in the block.
+%%  The point of this specialized code generation is to try put the
+%%  all of the variables in 'Arguments' into the correct X register
+%%  to begin with, instead of putting them into the first available
+%%  X register and having to move them to the correct X register
+%%  later.
+%%
+%%  To achieve that, we attempt to reserve the X registers that the
+%%  variables in 'Arguments' will need to be in when the block ends.
+%%
+%%  To make it more likely that reservations will be successful, we
+%%  will try to save variables that need to be saved to the stack as
+%%  early as possible (if an X register needed by a variable in
+%%  Arguments is occupied by another variable, the value in the
+%%  X register can be evicted if it is saved on the stack).
+%%
+%%  We will take care not to increase the size of stack frame compared
+%%  to what the standard code generator would have done (that is, to
+%%  save all X registers at the last possible moment). We will do that
+%%  by extending the stack frame to the minimal size needed to save
+%%  all that needs to be saved using extend_stack/4, and use
+%%  save_carefully/4 during code generation to only save the variables
+%%  that can be saved without growing the stack frame.
+
+cg_basic_block(Kes, Lf, As, Vdb, Bef, St0) ->
+    Int0 = reserve_arg_regs(As, Bef),
+    Int = extend_stack(Int0, Lf, Lf+1, Vdb),
+    {Keis,{Aft,St1}} =
 	flatmapfoldl(fun(Ke, St) -> cg_basic_block(Ke, St, Lf, Vdb) end,
-		     {Int0,X0_v0,St0}, need_heap(Kes, Fb)),
+		     {Int,St0}, need_heap(Kes)),
     {Keis,Aft,St1}.
 
-cg_basic_block(#cg_need_heap{}=Ke, {Inta,X0v,Sta}, _Lf, Vdb) ->
-    {Keis,Intb,Stb} = cg(Ke, Vdb, Inta, Sta),
-    {Keis, {Intb,X0v,Stb}};
-cg_basic_block(Ke, {Inta,X0_v1,Sta}, Lf, Vdb) ->
+cg_basic_block(#cg_need_heap{}=Ke, {Bef,St0}, _Lf, Vdb) ->
+    {Keis,Aft,St1} = cg(Ke, Vdb, Bef, St0),
+    {Keis,{Aft,St1}};
+cg_basic_block(Ke, {Bef,St0}, Lf, Vdb) ->
     #l{i=I} = get_kanno(Ke),
-    {Sis,Intb} = save_carefully(Inta, I, Lf+1, Vdb),
-    {X0_v2,Intc} = allocate_x0(X0_v1, I, Intb),
-    Intd = reserve(Intc),
-    {Keis,Inte,Stb} = cg(Ke, Vdb, Intd, Sta),
-    {Sis ++ Keis, {Inte,X0_v2,Stb}}.
-
-make_reservation([], _) -> [];
-make_reservation([#k_var{name=V}|As], I) -> [{I,V}|make_reservation(As, I+1)];
-make_reservation([A|As], I) -> [{I,A}|make_reservation(As, I+1)].
-
-reserve(Sr) -> Sr#sr{reg=reserve(Sr#sr.res, Sr#sr.reg, Sr#sr.stk)}.
 
-reserve([{I,V}|Rs], [free|Regs], Stk) -> [{reserved,I,V}|reserve(Rs, Regs, Stk)];
-reserve([{I,V}|Rs], [{I,V}|Regs], Stk) -> [{I,V}|reserve(Rs, Regs, Stk)];
-reserve([{I,V}|Rs], [{I,Var}|Regs], Stk) ->
+    %% Save all we can to increase the possibility that reserving
+    %% registers will succeed.
+    {Sis,Int0} = save_carefully(Bef, I, Lf+1, Vdb),
+    Int1 = reserve(Int0),
+    {Keis,Aft,St1} = cg(Ke, Vdb, Int1, St0),
+    {Sis ++ Keis,{Aft,St1}}.
+
+%% reserve_arg_regs([Argument], Bef) -> Aft.
+%%  Try to reserve the X registers for all arguments. All registers
+%%  that we wish to reserve will be saved in Bef#sr.res.
+
+reserve_arg_regs(As, Bef) ->
+    Res = reserve_arg_regs_1(As, 0),
+    reserve(Bef#sr{res=Res}).
+
+reserve_arg_regs_1([#k_var{name=V}|As], I) ->
+    [{I,V}|reserve_arg_regs_1(As, I+1)];
+reserve_arg_regs_1([A|As], I) ->
+    [{I,A}|reserve_arg_regs_1(As, I+1)];
+reserve_arg_regs_1([], _) -> [].
+
+%% reserve(Bef) -> Aft.
+%%  Try to reserve more registers. The registers we wish to reserve
+%%  are found in Bef#sr.res.
+
+reserve(#sr{reg=Regs,stk=Stk,res=Res}=Sr) ->
+    Sr#sr{reg=reserve_1(Res, Regs, Stk)}.
+
+reserve_1([{I,V}|Rs], [free|Regs], Stk) ->
+    [{reserved,I,V}|reserve_1(Rs, Regs, Stk)];
+reserve_1([{I,V}|Rs], [{I,V}|Regs], Stk) ->
+    [{I,V}|reserve_1(Rs, Regs, Stk)];
+reserve_1([{I,V}|Rs], [{I,Var}|Regs], Stk) ->
     case on_stack(Var, Stk) of
-	true -> [{reserved,I,V}|reserve(Rs, Regs, Stk)];
-	false -> [{I,Var}|reserve(Rs, Regs, Stk)]
+	true -> [{reserved,I,V}|reserve_1(Rs, Regs, Stk)];
+	false -> [{I,Var}|reserve_1(Rs, Regs, Stk)]
     end;
-reserve([{I,V}|Rs], [{reserved,I,_}|Regs], Stk) ->
-    [{reserved,I,V}|reserve(Rs, Regs, Stk)];
-%reserve([{I,V}|Rs], [Other|Regs], Stk) -> [Other|reserve(Rs, Regs, Stk)];
-reserve([{I,V}|Rs], [], Stk) -> [{reserved,I,V}|reserve(Rs, [], Stk)];
-reserve([], Regs, _) -> Regs.
-
-extend_stack(Bef, Fb, Lf, Vdb) ->
-    Stk0 = clear_dead_stk(Bef#sr.stk, Fb, Vdb),
-    Saves = [V || {V,F,L} <- Vdb,
-		  F < Fb,
-		  L >= Lf,
-		  not on_stack(V, Stk0)],
-    Stk1 = foldl(fun (V, Stk) -> put_stack(V, Stk) end, Stk0, Saves),
-    Bef#sr.stk ++ lists:duplicate(length(Stk1) - length(Bef#sr.stk), free).
-
-save_carefully(Bef, Fb, Lf, Vdb) ->
-    Stk = Bef#sr.stk,
-    %% New variables that are in use but not on stack.
-    New = [VFL || {V,F,L} = VFL <- Vdb,
-		  F < Fb,
-		  L >= Lf,
-		  not on_stack(V, Stk)],
-    Saves = [V || {V,_,_} <- keysort(2, New)],
-    save_carefully(Saves, Bef, []).
-
-save_carefully([], Bef, Acc) -> {reverse(Acc),Bef};
-save_carefully([V|Vs], Bef, Acc) ->
-    case put_stack_carefully(V, Bef#sr.stk) of
-	error -> {reverse(Acc),Bef};
+reserve_1([{I,V}|Rs], [{reserved,I,_}|Regs], Stk) ->
+    [{reserved,I,V}|reserve_1(Rs, Regs, Stk)];
+reserve_1([{I,V}|Rs], [], Stk) ->
+    [{reserved,I,V}|reserve_1(Rs, [], Stk)];
+reserve_1([], Regs, _) -> Regs.
+
+%% extend_stack(Bef, FirstBefore, LastFrom, Vdb) -> Aft.
+%%  Extend the stack enough to fit all variables alive past LastFrom
+%%  and not already on the stack.
+
+extend_stack(#sr{stk=Stk0}=Bef, Fb, Lf, Vdb) ->
+    Stk1 = clear_dead_stk(Stk0, Fb, Vdb),
+    New = new_not_on_stack(Stk1, Fb, Lf, Vdb),
+    Stk2 = foldl(fun ({V,_,_}, Stk) -> put_stack(V, Stk) end, Stk1, New),
+    Stk = Stk0 ++ lists:duplicate(length(Stk2) - length(Stk0), free),
+    Bef#sr{stk=Stk}.
+
+%% save_carefully(Bef, FirstBefore, LastFrom, Vdb) -> {[SaveVar],Aft}.
+%%  Save variables which are used past current point and which are not
+%%  already on the stack, but only if the variables can be saved without
+%%  growing the stack frame.
+
+save_carefully(#sr{stk=Stk}=Bef, Fb, Lf, Vdb) ->
+    New0 = new_not_on_stack(Stk, Fb, Lf, Vdb),
+    New = keysort(2, New0),
+    save_carefully_1(New, Bef, []).
+
+save_carefully_1([{V,_,_}|Vs], #sr{reg=Regs,stk=Stk0}=Bef, Acc) ->
+    case put_stack_carefully(V, Stk0) of
+	error ->
+            {reverse(Acc),Bef};
 	Stk1 ->
-	    SrcReg = fetch_reg(V, Bef#sr.reg),
+	    SrcReg = fetch_reg(V, Regs),
 	    Move = {move,SrcReg,fetch_stack(V, Stk1)},
 	    {x,_} = SrcReg,			%Assertion - must be X register.
-	    save_carefully(Vs, Bef#sr{stk=Stk1}, [Move|Acc])
-    end.
+	    save_carefully_1(Vs, Bef#sr{stk=Stk1}, [Move|Acc])
+    end;
+save_carefully_1([], Bef, Acc) ->
+    {reverse(Acc),Bef}.
 
-x0_vars([], _Fb, _Lf, _Vdb) -> [];
-x0_vars([#k_var{name=V}|_], Fb, _Lf, Vdb) ->
-    {V,F,_L} = VFL = vdb_find(V, Vdb),
-    x0_vars1([VFL], Fb, F, Vdb);
-x0_vars([X0|_], Fb, Lf, Vdb) ->
-    x0_vars1([{X0,Lf,Lf}], Fb, Lf, Vdb).
-
-x0_vars1(X0, Fb, Xf, Vdb) ->
-    Vs0 = [VFL || {_V,F,L}=VFL <- Vdb,
-		  F >= Fb,
-		  L < Xf],
-    Vs1 = keysort(3, Vs0),
-    keysort(2, X0++Vs1).
-
-allocate_x0([], _, Bef) -> {[],Bef#sr{res=[]}};
-allocate_x0([{_,_,L}|Vs], I, Bef) when L =< I ->
-    allocate_x0(Vs, I, Bef);
-allocate_x0([{V,_F,_L}=VFL|Vs], _, Bef) ->
-    {[VFL|Vs],Bef#sr{res=reserve_x0(V, Bef#sr.res)}}.
-
-reserve_x0(V, [_|Res]) -> [{0,V}|Res];
-reserve_x0(V, []) -> [{0,V}].
+%% top_level_block([Instruction], Bef, MaxRegs, St) -> [Instruction].
+%%  For the top-level block, allocate a stack frame a necessary,
+%%  adjust Y register numbering and instructions that return
+%%  from the function.
 
 top_level_block(Keis, #sr{stk=[]}, _MaxRegs, #cg{need_frame=false}) ->
     Keis;
@@ -1311,28 +1495,34 @@ select_extract_map(Src, Vs, Fail, I, Vdb, Bef, St) ->
     {Code, Aft, St}.
 
 
-select_extract_cons(Src, [#k_var{name=Hd}, #k_var{name=Tl}], I, Vdb, Bef, St) ->
-    {Es,Aft} = case {vdb_find(Hd, Vdb), vdb_find(Tl, Vdb)} of
-		   {{_,_,Lhd}, {_,_,Ltl}} when Lhd =< I, Ltl =< I ->
-		       %% Both head and tail are dead.  No need to generate
-		       %% any instruction.
-		       {[], Bef};
-		   _ ->
-		       %% At least one of head and tail will be used,
-		       %% but we must always fetch both.  We will call
-		       %% clear_dead/2 to allow reuse of the register
-		       %% in case only of them is used.
-
-		       Reg0 = put_reg(Tl, put_reg(Hd, Bef#sr.reg)),
-		       Int0 = Bef#sr{reg=Reg0},
-		       Rsrc = fetch_var(Src, Int0),
-		       Rhd = fetch_reg(Hd, Reg0),
-		       Rtl = fetch_reg(Tl, Reg0),
-		       Int1 = clear_dead(Int0, I, Vdb),
-		       {[{get_list,Rsrc,Rhd,Rtl}], Int1}
-	       end,
-    {Es,Aft,St}.
-    
+select_extract_cons(Src, [#k_var{name=Hd},#k_var{name=Tl}], I, Vdb, Bef, St) ->
+    Rsrc = fetch_var(Src, Bef),
+    Int = clear_dead(Bef, I, Vdb),
+    {{_,_,Lhd},{_,_,Ltl}} = {vdb_find(Hd, Vdb),vdb_find(Tl, Vdb)},
+    case {Lhd =< I, Ltl =< I} of
+        {true,true} ->
+            %% Both dead.
+            {[],Bef,St};
+        {true,false} ->
+            %% Head dead.
+            Reg0 = put_reg(Tl, Bef#sr.reg),
+            Aft = Int#sr{reg=Reg0},
+            Rtl = fetch_reg(Tl, Reg0),
+            {[{get_tl,Rsrc,Rtl}],Aft,St};
+        {false,true} ->
+            %% Tail dead.
+            Reg0 = put_reg(Hd, Bef#sr.reg),
+            Aft = Int#sr{reg=Reg0},
+            Rhd = fetch_reg(Hd, Reg0),
+            {[{get_hd,Rsrc,Rhd}],Aft,St};
+        {false,false} ->
+            %% Both used.
+            Reg0 = put_reg(Tl, put_reg(Hd, Bef#sr.reg)),
+            Aft = Bef#sr{reg=Reg0},
+            Rhd = fetch_reg(Hd, Reg0),
+            Rtl = fetch_reg(Tl, Reg0),
+            {[{get_hd,Rsrc,Rhd},{get_tl,Rsrc,Rtl}],Aft,St}
+    end.
 
 guard_clause_cg(#k_guard_clause{anno=#l{vdb=Vdb},guard=G,body=B}, Fail, Bef, St0) ->
     {Gis,Int,St1} = guard_cg(G, Fail, Vdb, Bef, St0),
@@ -1347,10 +1537,8 @@ guard_clause_cg(#k_guard_clause{anno=#l{vdb=Vdb},guard=G,body=B}, Fail, Bef, St0
 %%  the correct exit point.  Primops and tests all go to the next
 %%  instruction on success or jump to a failure label.
 
-guard_cg(#k_protected{arg=Ts,ret=Rs,anno=#l{i=I,vdb=Pdb}}, Fail, _Vdb, Bef, St) ->
-    protected_cg(Ts, Rs, Fail, I, Pdb, Bef, St);
-guard_cg(#cg_block{es=Ts,anno=#l{i=I,vdb=Bdb}}, Fail, _Vdb, Bef, St) ->
-    guard_cg_list(Ts, Fail, I, Bdb, Bef, St);
+guard_cg(#k_protected{arg=Ts,ret=Rs,anno=#l{vdb=Pdb}}, Fail, _Vdb, Bef, St) ->
+    protected_cg(Ts, Rs, Fail, Pdb, Bef, St);
 guard_cg(#k_test{anno=#l{i=I},op=Test0,args=As,inverted=Inverted},
          Fail, Vdb, Bef, St0) ->
     #k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=Test}} = Test0,
@@ -1368,6 +1556,18 @@ guard_cg(G, _Fail, Vdb, Bef, St) ->
     %%ok = io:fwrite("cg ~w: ~p~n", [?LINE,{Aft}]),
     {Gis,Aft,St1}.
 
+%% guard_cg_list([Kexpr], Fail, I, Vdb, StackReg, St) ->
+%%      {[Ainstr],StackReg,St}.
+
+guard_cg_list(Kes, Fail, Vdb, Bef, St0) ->
+    {Keis,{Aft,St1}} =
+	flatmapfoldl(fun (Ke, {Inta,Sta}) ->
+			     {Keis,Intb,Stb} =
+				 guard_cg(Ke, Fail, Vdb, Inta, Sta),
+			     {Keis,{Intb,Stb}}
+		     end, {Bef,St0}, need_heap(Kes)),
+    {Keis,Aft,St1}.
+
 %% protected_cg([Kexpr], [Ret], Fail, I, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
 %%  Do a protected.  Protecteds without return values are just done
 %%  for effect, the return value is not checked, success passes on to
@@ -1375,15 +1575,14 @@ guard_cg(G, _Fail, Vdb, Bef, St) ->
 %%  return values then these must be set to 'false' on failure,
 %%  control always passes to the next instruction.
 
-protected_cg(Ts, [], Fail, I, Vdb, Bef, St0) ->
+protected_cg(Ts, [], Fail, Vdb, Bef, St0) ->
     %% Protect these calls, revert when done.
-    {Tis,Aft,St1} = guard_cg_list(Ts, Fail, I, Vdb, Bef,
-				  St0#cg{bfail=Fail}),
+    {Tis,Aft,St1} = guard_cg_list(Ts, Fail, Vdb, Bef, St0#cg{bfail=Fail}),
     {Tis,Aft,St1#cg{bfail=St0#cg.bfail}};
-protected_cg(Ts, Rs, _Fail, I, Vdb, Bef, St0) ->
+protected_cg(Ts, Rs, _Fail, Vdb, Bef, St0) ->
     {Pfail,St1} = new_label(St0),
     {Psucc,St2} = new_label(St1),
-    {Tis,Aft,St3} = guard_cg_list(Ts, Pfail, I, Vdb, Bef,
+    {Tis,Aft,St3} = guard_cg_list(Ts, Pfail, Vdb, Bef,
 				  St2#cg{bfail=Pfail}),
     %%ok = io:fwrite("cg ~w: ~p~n", [?LINE,{Rs,I,Vdb,Aft}]),
     %% Set return values to false.
@@ -1424,18 +1623,6 @@ test_cg(Test, As, Fail, I, Vdb, Bef, St) ->
     Aft = clear_dead(Bef, I, Vdb),
     {[beam_utils:bif_to_test(Test, Args, {f,Fail})],Aft,St}.
 
-%% guard_cg_list([Kexpr], Fail, I, Vdb, StackReg, St) ->
-%%      {[Ainstr],StackReg,St}.
-
-guard_cg_list(Kes, Fail, I, Vdb, Bef, St0) ->
-    {Keis,{Aft,St1}} =
-	flatmapfoldl(fun (Ke, {Inta,Sta}) ->
-			     {Keis,Intb,Stb} =
-				 guard_cg(Ke, Fail, Vdb, Inta, Sta),
-			     {Keis,{Intb,Stb}}
-		     end, {Bef,St0}, need_heap(Kes, I)),
-    {Keis,Aft,St1}.
-
 %% match_fmf(Fun, LastFail, State, [Clause]) -> {Is,Aft,State}.
 %%  This is a special flatmapfoldl for match code gen where we
 %%  generate a "failure" label for each clause. The last clause uses
@@ -1634,12 +1821,7 @@ bif_cg(#k_bif{op=#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=Name}},
 
 internal_cg(bs_context_to_binary=Instr, [Src0], [], Le, Vdb, Bef, St0) ->
     [Src] = cg_reg_args([Src0], Bef),
-    case is_register(Src) of
-	false ->
-	    {[],clear_dead(Bef, Le#l.i, Vdb), St0};
-	true ->
-	    {[{Instr,Src}],clear_dead(Bef, Le#l.i, Vdb), St0}
-    end;
+    {[{Instr,Src}],clear_dead(Bef, Le#l.i, Vdb), St0};
 internal_cg(dsetelement, [Index0,Tuple0,New0], _Rs, Le, Vdb, Bef, St0) ->
     [New,Tuple,{integer,Index1}] = cg_reg_args([New0,Tuple0,Index0], Bef),
     Index = Index1-1,
@@ -1661,9 +1843,30 @@ internal_cg(bs_init_writable=I, As, Rs, Le, Vdb, Bef, St) ->
     {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
     Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
     {Sis++[I],clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb),St};
+internal_cg(build_stacktrace=I, As, Rs, Le, Vdb, Bef, St) ->
+    %% This behaves like a function call.
+    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
+    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
+    {Sis++[I],clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb),St};
 internal_cg(raise, As, Rs, Le, Vdb, Bef, St) ->
     %% raise can be treated like a guard BIF.
-    bif_cg(raise, As, Rs, Le, Vdb, Bef, St).
+    bif_cg(raise, As, Rs, Le, Vdb, Bef, St);
+internal_cg(guard_error, [ExitCall], _Rs, Le, Vdb, Bef, St) ->
+    %% A call an exit BIF from inside a #k_guard_match{}.
+    %% Generate a standard call, but leave the register descriptors
+    %% alone, effectively pretending that there was no call.
+    #k_call{op=#k_remote{mod=#k_atom{val=Mod},name=#k_atom{val=Name}},
+            args=As} = ExitCall,
+    Arity = length(As),
+    {Ms,_} = cg_call_args(As, Bef, Le#l.i, Vdb),
+    Call = {call_ext,Arity,{extfunc,Mod,Name,Arity}},
+    Is = Ms++[line(Le),Call],
+    {Is,Bef,St};
+internal_cg(raw_raise=I, As, Rs, Le, Vdb, Bef, St) ->
+    %% This behaves like a function call.
+    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
+    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
+    {Sis++[I],clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb),St}.
 
 %% bif_cg(Bif, [Arg], [Ret], Le, Vdb, StackReg, State) ->
 %%      {[Ainstr],StackReg,State}.
@@ -1767,17 +1970,17 @@ cg_recv_wait(#k_atom{val=infinity}, #cg_block{anno=Le,es=Tes}, I, Bef, St0) ->
     %% But to keep the stack and register information up to date,
     %% we will generate the code for the 'after' body, and then discard it.
     Int1 = clear_dead(Bef, I, Le#l.vdb),
-    {_,Int2,St1} = cg_block(Tes, Le#l.i, Le#l.vdb,
+    {_,Int2,St1} = cg_block(Tes, Le#l.vdb,
                             Int1#sr{reg=clear_regs(Int1#sr.reg)}, St0),
     {[{wait,{f,St1#cg.recv}}],Int2,St1};
 cg_recv_wait(#k_int{val=0}, #cg_block{anno=Le,es=Tes}, _I, Bef, St0) ->
-    {Tis,Int,St1} = cg_block(Tes, Le#l.i, Le#l.vdb, Bef, St0),
+    {Tis,Int,St1} = cg_block(Tes, Le#l.vdb, Bef, St0),
     {[timeout|Tis],Int,St1};
 cg_recv_wait(Te, #cg_block{anno=Le,es=Tes}, I, Bef, St0) ->
     Reg = cg_reg_arg(Te, Bef),
     %% Must have empty registers here!  Bug if anything in registers.
     Int0 = clear_dead(Bef, I, Le#l.vdb),
-    {Tis,Int,St1} = cg_block(Tes, Le#l.i, Le#l.vdb,
+    {Tis,Int,St1} = cg_block(Tes, Le#l.vdb,
 			     Int0#sr{reg=clear_regs(Int0#sr.reg)}, St0),
     {[{wait_timeout,{f,St1#cg.recv},Reg},timeout] ++ Tis,Int,St1}.
 
@@ -1838,7 +2041,7 @@ catch_cg(#cg_block{es=C}, #k_var{name=R}, Le, Vdb, Bef, St0) ->
     CatchTag = Le#l.i,
     Int1 = Bef#sr{stk=put_catch(CatchTag, Bef#sr.stk)},
     CatchReg = fetch_stack({catch_tag,CatchTag}, Int1#sr.stk),
-    {Cis,Int2,St2} = cg_block(C, Le#l.i, Le#l.vdb, Int1,
+    {Cis,Int2,St2} = cg_block(C, Le#l.vdb, Int1,
 			      St1#cg{break=B,in_catch=true}),
     [] = Int2#sr.reg,				%Assertion.
     Aft = Int2#sr{reg=[{0,R}],stk=drop_catch(CatchTag, Int2#sr.stk)},
@@ -2202,13 +2405,12 @@ break_cg(Bs, Le, Vdb, Bef, St) ->
     {Ms ++ [{jump,{f,St#cg.break}}],
      Int#sr{reg=clear_regs(Int#sr.reg)},St}.
 
-guard_break_cg(Bs, Locked, #l{i=I}, Vdb, #sr{reg=Reg0}=Bef, St) ->
-    RegLocked = get_locked_regs(Reg0, Locked),
-    #sr{reg=Reg1} = Int = clear_dead(Bef#sr{reg=RegLocked}, I, Vdb),
+guard_break_cg(Bs, #l{i=I}, Vdb, #sr{reg=Reg0}=Bef, St) ->
+    #sr{reg=Reg1} = Int = clear_dead(Bef, I, Vdb),
     Reg2 = trim_free(Reg1),
     NumLocked = length(Reg2),
     Moves0 = gen_moves(Bs, Bef, NumLocked, []),
-    Moves = order_moves(Moves0, find_scratch_reg(RegLocked)),
+    Moves = order_moves(Moves0, find_scratch_reg(Reg0)),
     {BreakVars,_} = mapfoldl(fun(_, RegNum) ->
 				     {{RegNum,gbreakvar},RegNum+1}
 			     end, length(Reg2), Bs),
@@ -2216,20 +2418,6 @@ guard_break_cg(Bs, Locked, #l{i=I}, Vdb, #sr{reg=Reg0}=Bef, St) ->
     Aft = Int#sr{reg=Reg},
     {Moves ++ [{jump,{f,St#cg.break}}],Aft,St}.
 
-get_locked_regs([R|Rs0], Preserve) ->
-    case {get_locked_regs(Rs0, Preserve),R} of
-	{[],{_,V}} ->
-	    case lists:member(V, Preserve) of
-		true -> [R];
-		false -> []
-	    end;
-	{[],_} ->
-	    [];
-	{Rs,_} ->
-	    [R|Rs]
-    end;
-get_locked_regs([], _) -> [].
-
 %% cg_reg_arg(Arg0, Info) -> Arg
 %% cg_reg_args([Arg0], Info) -> [Arg]
 %%  Convert argument[s] into registers. Literal values are returned unchanged.
@@ -2370,21 +2558,21 @@ break_up_cycle1(Dst, [M|Path], LastMove) ->
 %% clear_dead(Sr, Until, Vdb) -> Aft.
 %%  Remove all variables in Sr which have died AT ALL so far.
 
-clear_dead(Sr, Until, Vdb) ->
-    Sr#sr{reg=clear_dead_reg(Sr, Until, Vdb),
-	  stk=clear_dead_stk(Sr#sr.stk, Until, Vdb)}.
+clear_dead(#sr{stk=Stk}=Sr0, Until, Vdb) ->
+    Sr = Sr0#sr{reg=clear_dead_reg(Sr0, Until, Vdb),
+                stk=clear_dead_stk(Stk, Until, Vdb)},
+    reserve(Sr).
 
 clear_dead_reg(Sr, Until, Vdb) ->
-    Reg = [case R of
-            {_I,V} = IV ->
-                case vdb_find(V, Vdb) of
-                    {V,_,L} when L > Until -> IV;
-                    _ -> free		%Remove anything else
-                end;
-            {reserved,_I,_V} = Reserved -> Reserved;
-            free -> free
-        end || R <- Sr#sr.reg],
-    reserve(Sr#sr.res, Reg, Sr#sr.stk).
+    [case R of
+         {_I,V} = IV ->
+             case vdb_find(V, Vdb) of
+                 {V,_,L} when L > Until -> IV;
+                 _ -> free                      %Remove anything else
+             end;
+         {reserved,_I,_V}=Reserved -> Reserved;
+         free -> free
+     end || R <- Sr#sr.reg].
 
 clear_dead_stk(Stk, Until, Vdb) ->
     [case S of
@@ -2456,16 +2644,25 @@ adjust_stack(Bef, Fb, Lf, Vdb) ->
 
 save_stack(Stk0, Fb, Lf, Vdb) ->
     %% New variables that are in use but not on stack.
-    New = [VFL || {V,F,L} = VFL <- Vdb,
-		  F < Fb,
-		  L >= Lf,
-		  not on_stack(V, Stk0)],
+    New = new_not_on_stack(Stk0, Fb, Lf, Vdb),
+
     %% Add new variables that are not just dropped immediately.
     %% N.B. foldr works backwards from the end!!
     Saves = [V || {V,_,_} <- keysort(3, New)],
     Stk1 = foldr(fun (V, Stk) -> put_stack(V, Stk) end, Stk0, Saves),
     {Stk1,Saves}.
 
+%% new_not_on_stack(Stack, FirstBefore, LastFrom, Vdb) ->
+%%                 [{Variable,First,Last}]
+%%  Return information about all variables that are used past current
+%%  point and that are not already on the stack.
+
+new_not_on_stack(Stk, Fb, Lf, Vdb) ->
+    [VFL || {V,F,L} = VFL <- Vdb,
+            F < Fb,
+            L >= Lf,
+            not on_stack(V, Stk)].
+
 %% saves([SaveVar], Reg, Stk) -> [{move,Reg,Stk}].
 %%  Generate move instructions to save variables onto stack.  The
 %%  stack/reg info used is that after the new stack has been made.
@@ -2571,10 +2768,6 @@ find_stack(_, [], _) -> error.
 
 on_stack(V, Stk) -> keymember(V, 1, Stk).
 
-is_register({x,_}) -> true;
-is_register({yy,_}) -> true;
-is_register(_) -> false.
-
 %% put_catch(CatchTag, Stack) -> Stack'
 %% drop_catch(CatchTag, Stack) -> Stack'
 %%  Special interface for putting and removing catch tags, to ensure that
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index 20cb3343fb..6029b91cdc 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -920,8 +920,9 @@ try_exception(Ecs0, St0) ->
     %% Note that Tag is not needed for rethrow - it is already in Info.
     {Evs,St1} = new_vars(3, St0), % Tag, Value, Info
     {Ecs1,Ceps,St2} = clauses(Ecs0, St1),
+    Ecs2 = try_build_stacktrace(Ecs1, hd(Evs)),
     [_,Value,Info] = Evs,
-    LA = case Ecs1 of
+    LA = case Ecs2 of
 	     [] -> [];
 	     [C|_] -> get_lineno_anno(C)
 	 end,
@@ -930,7 +931,7 @@ try_exception(Ecs0, St0) ->
 		  body=[#iprimop{anno=#a{},       %Must have an #a{}
 				 name=#c_literal{val=raise},
 				 args=[Info,Value]}]},
-    Hs = [#icase{anno=#a{anno=LA},args=[c_tuple(Evs)],clauses=Ecs1,fc=Ec}],
+    Hs = [#icase{anno=#a{anno=LA},args=[c_tuple(Evs)],clauses=Ecs2,fc=Ec}],
     {Evs,Ceps++Hs,St2}.
 
 try_after(As, St0) ->
@@ -946,6 +947,25 @@ try_after(As, St0) ->
     Hs = [#icase{anno=#a{},args=[c_tuple(Evs)],clauses=[],fc=Ec}],
     {Evs,Hs,St1}.
 
+try_build_stacktrace([#iclause{pats=Ps0,body=B0}=C0|Cs], RawStk) ->
+    [#c_tuple{es=[Class,Exc,Stk]}=Tup] = Ps0,
+    case Stk of
+        #c_var{name='_'} ->
+            %% Stacktrace variable is not used. Nothing to do.
+            [C0|try_build_stacktrace(Cs, RawStk)];
+        _ ->
+            %% Add code to build the stacktrace.
+            Ps = [Tup#c_tuple{es=[Class,Exc,RawStk]}],
+            Call = #iprimop{anno=#a{},
+                            name=#c_literal{val=build_stacktrace},
+                            args=[RawStk]},
+            Iset = #iset{var=Stk,arg=Call},
+            B = [Iset|B0],
+            C = C0#iclause{pats=Ps,body=B},
+            [C|try_build_stacktrace(Cs, RawStk)]
+    end;
+try_build_stacktrace([], _) -> [].
+
 %% expr_bin([ArgExpr], St) -> {[Arg],[PreExpr],St}.
 %%  Flatten the arguments of a bin. Do this straight left to right!
 %%  Note that ibinary needs to have its annotation wrapped in a #a{}
@@ -2462,9 +2482,11 @@ cexpr(#icase{anno=A,args=Largs,clauses=Lcs,fc=Lfc}, As, St0) ->
 cexpr(#ireceive1{anno=A,clauses=Lcs}, As, St0) ->
     Exp = intersection(A#a.ns, As),		%Exports
     {Ccs,St1} = cclauses(Lcs, Exp, St0),
+    True = #c_literal{val=true},
+    Action = core_lib:make_values(lists:duplicate(1+length(Exp), True)),
     {#c_receive{anno=A#a.anno,
 		clauses=Ccs,
-		timeout=#c_literal{val=infinity},action=#c_literal{val=true}},
+		timeout=#c_literal{val=infinity},action=Action},
      Exp,A#a.us,St1};
 cexpr(#ireceive2{anno=A,clauses=Lcs,timeout=Lto,action=Les}, As, St0) ->
     Exp = intersection(A#a.ns, As),		%Exports
diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl
index 3eea058153..fd73e5a7dc 100644
--- a/lib/compiler/src/v3_kernel.erl
+++ b/lib/compiler/src/v3_kernel.erl
@@ -108,6 +108,7 @@ copy_anno(Kdst, Ksrc) ->
 -record(iclause, {anno=[],isub,osub,pats,guard,body}).
 -record(ireceive_accept, {anno=[],arg}).
 -record(ireceive_next, {anno=[],arg}).
+-record(ignored, {anno=[]}).
 
 -type warning() :: term().	% XXX: REFINE
 
@@ -162,8 +163,7 @@ function({#c_var{name={F,Arity}=FA},Body}, St0) ->
 	%%B1 = B0, St3 = St2,				%Null second pass
         {make_fdef(#k{us=[],ns=[],a=Ab}, F, Arity, Kvs, B1),St3}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [F,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -489,7 +489,7 @@ make_alt(First0, Then0) ->
     Then1 = pre_seq(droplast(Then0), last(Then0)),
     First2 = make_protected(First1),
     Then2 = make_protected(Then1),
-    Body = #k_atom{val=ignored},
+    Body = #ignored{},
     First3 = #k_guard_clause{guard=First2,body=Body},
     Then3 = #k_guard_clause{guard=Then2,body=Body},
     First = #k_guard{clauses=[First3]},
@@ -2225,7 +2225,9 @@ ubody(E, return, St0) ->
 	    {Ea,Pa,St1} = force_atomic(E, St0),
 	    ubody(pre_seq(Pa, #ivalues{args=[Ea]}), return, St1)
     end;
-ubody(E, {break,_Rs} = Break, St0) ->
+ubody(#ignored{}, {break,_} = Break, St) ->
+    ubody(#ivalues{args=[]}, Break, St);
+ubody(E, {break,[_]} = Break, St0) ->
     %%ok = io:fwrite("ubody ~w:~p~n", [?LINE,{E,Br}]),
     %% Exiting expressions need no trailing break.
     case is_exit_expr(E) of
@@ -2233,6 +2235,16 @@ ubody(E, {break,_Rs} = Break, St0) ->
 	false ->
 	    {Ea,Pa,St1} = force_atomic(E, St0),
 	    ubody(pre_seq(Pa, #ivalues{args=[Ea]}), Break, St1)
+    end;
+ubody(E, {break,Rs}=Break, St0) ->
+    case is_exit_expr(E) of
+        true ->
+            uexpr(E, return, St0);
+        false ->
+            {Vs,St1} = new_vars(length(Rs), St0),
+            Iset = #iset{vars=Vs,arg=E},
+            PreSeq = pre_seq([Iset], #ivalues{args=Vs}),
+            ubody(PreSeq, Break, St1)
     end.
 
 iletrec_funs(#iletrec{defs=Fs}, St0) ->
diff --git a/lib/compiler/src/v3_kernel.hrl b/lib/compiler/src/v3_kernel.hrl
index 87011b7680..7cd30b25a8 100644
--- a/lib/compiler/src/v3_kernel.hrl
+++ b/lib/compiler/src/v3_kernel.hrl
@@ -79,7 +79,7 @@
 -record(k_guard_clause, {anno=[],guard,body}).
 
 -record(k_break, {anno=[],args=[]}).
--record(k_guard_break, {anno=[],args=[],locked=[]}).
+-record(k_guard_break, {anno=[],args=[]}).
 -record(k_return, {anno=[],args=[]}).
 
 %%k_get_anno(Thing) -> element(2, Thing).
diff --git a/lib/compiler/test/beam_block_SUITE.erl b/lib/compiler/test/beam_block_SUITE.erl
index 55d5f2dbe8..38ead96cc8 100644
--- a/lib/compiler/test/beam_block_SUITE.erl
+++ b/lib/compiler/test/beam_block_SUITE.erl
@@ -22,7 +22,7 @@
 -export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
 	 get_map_elements/1,otp_7345/1,move_opt_across_gc_bif/1,
-	 erl_202/1,repro/1]).
+	 erl_202/1,repro/1,local_cse/1,second_block_pass/1]).
 
 %% The only test for the following functions is that
 %% the code compiles and is accepted by beam_validator.
@@ -40,7 +40,9 @@ groups() ->
        otp_7345,
        move_opt_across_gc_bif,
        erl_202,
-       repro
+       repro,
+       local_cse,
+       second_block_pass
       ]}].
 
 init_per_suite(Config) ->
@@ -237,6 +239,72 @@ find_operands(Cfg,XsiGraph,ActiveList,Count) ->
     [Count+1, length(NewActiveList), length(digraph:vertices(XsiGraph))],
     find_operands(NewCfg,XsiGraph,NewActiveList,Count+1).
 
+%% Some tests of local common subexpression elimination (CSE).
+
+local_cse(_Config) ->
+    {Self,{ok,Self}} = local_cse_1(),
+
+    local_cse_2([]),
+    local_cse_2(lists:seq(1, 512)),
+    local_cse_2(?MODULE:module_info()),
+
+    {[b],[a,b]} = local_cse_3(a, b),
+
+    {2000,Self,{Self,write_cache}} = local_cse_4(),
+
+    ok.
+
+local_cse_1() ->
+    %% Cover handling of unsafe tuple construction in
+    %% eliminate_use_of_from_reg/4. It became necessary to handle
+    %% unsafe tuples when local CSE was introduced.
+
+    {self(),{ok,self()}}.
+
+local_cse_2(Term) ->
+    case cse_make_binary(Term) of
+        <<Size:8,BinTerm:Size/binary>> ->
+            Term = binary_to_term(BinTerm);
+        <<Size:8,SizeTerm:Size/binary,BinTerm/binary>> ->
+            {'$size',TermSize} = binary_to_term(SizeTerm),
+            TermSize = byte_size(BinTerm),
+            Term = binary_to_term(BinTerm)
+    end.
+
+%% Copy of observer_backend:ttb_make_binary/1. During development of
+%% the local CSE optimization this function was incorrectly optimized.
+
+cse_make_binary(Term) ->
+    B = term_to_binary(Term),
+    SizeB = byte_size(B),
+    if SizeB > 255 ->
+            SB = term_to_binary({'$size',SizeB}),
+            <<(byte_size(SB)):8, SB/binary, B/binary>>;
+       true ->
+            <<SizeB:8, B/binary>>
+    end.
+
+local_cse_3(X, Y) ->
+    %% The following expression was incorrectly transformed to {[X,Y],[X,Y]}
+    %% during development of the local CSE optimization.
+
+    {[Y],[X,Y]}.
+
+local_cse_4() ->
+    do_local_cse_4(2000, self(), {self(), write_cache}).
+
+do_local_cse_4(X, Y, Z) ->
+    {X,Y,Z}.
+
+%% Tests previously found bugs when running beam_block the second time.
+
+second_block_pass(_Config) ->
+    [#{dts:=5.0}] = second_1([#{dts => 10.0}], 2.0),
+    ok.
+
+second_1(Fs, TS) ->
+    [F#{dts=>DTS / TS} || #{dts:=DTS} = F <- Fs].
+
 %%%
 %%% Common functions.
 %%%
diff --git a/lib/compiler/test/beam_type_SUITE.erl b/lib/compiler/test/beam_type_SUITE.erl
index 86146c614f..541075af2a 100644
--- a/lib/compiler/test/beam_type_SUITE.erl
+++ b/lib/compiler/test/beam_type_SUITE.erl
@@ -22,7 +22,8 @@
 -export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
 	 integers/1,coverage/1,booleans/1,setelement/1,cons/1,
-	 tuple/1,record_float/1,binary_float/1,float_compare/1]).
+	 tuple/1,record_float/1,binary_float/1,float_compare/1,
+	 arity_checks/1,elixir_binaries/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -40,7 +41,9 @@ groups() ->
        tuple,
        record_float,
        binary_float,
-       float_compare
+       float_compare,
+       arity_checks,
+       elixir_binaries
       ]}].
 
 init_per_suite(Config) ->
@@ -64,6 +67,15 @@ integers(_Config) ->
 
     college = do_integers_3(),
 
+    zero = do_integers_4(<<0:1>>, 0),
+    one = do_integers_4(<<1:1>>, 0),
+    other = do_integers_4(<<1:1>>, 2),
+
+    zero = do_integers_5(0, 0),
+    one = do_integers_5(0, 1),
+    two = do_integers_5(0, 2),
+    three = do_integers_5(0, 3),
+
     ok.
 
 do_integers_1(B0) ->
@@ -86,7 +98,31 @@ do_integers_3() ->
 	1 -> 0
     end.
 
-coverage(_Config) ->
+do_integers_4(<<X:1,T/bits>>, C) ->
+    %% Binary matching gives the range 0-1 for X.
+    %% The range for `X bor C` is unknown. It must not be inherited
+    %% from X. (`X bor C` will reuse the register used for X.)
+    case X bor C of
+        0 -> do_integers_4(T, C, zero);
+        1 -> do_integers_4(T, C, one);
+        _ -> do_integers_4(T, C, other)
+    end.
+
+do_integers_4(_, _, Res) ->
+    Res.
+
+do_integers_5(X0, Y0) ->
+    %% X and Y will use the same register.
+    X = X0 band 1,
+    Y = Y0 band 3,
+    case Y of
+        0 -> zero;
+        1 -> one;
+        2 -> two;
+        3 -> three
+    end.
+
+coverage(Config) ->
     {'EXIT',{badarith,_}} = (catch id(1) bsl 0.5),
     {'EXIT',{badarith,_}} = (catch id(2.0) bsl 2),
     {'EXIT',{badarith,_}} = (catch a + 0.5),
@@ -97,6 +133,29 @@ coverage(_Config) ->
     id(id(42) band 387439739874298734983787934283479243879),
     id(-1 band id(13)),
 
+    error = if
+                is_map(Config), is_integer(Config) -> ok;
+                true -> error
+            end,
+    error = if
+                is_map(Config), is_atom(Config) -> ok;
+                true -> error
+            end,
+    error = if
+                is_map(Config), is_tuple(Config) -> ok;
+                true -> error
+            end,
+    error = if
+                is_integer(Config), is_bitstring(Config) -> ok;
+                true -> error
+            end,
+
+    ok = case Config of
+             <<_>> when is_binary(Config) ->
+                 impossible;
+             [_|_] ->
+                 ok
+         end,
     ok.
 
 booleans(_Config) ->
@@ -171,6 +230,68 @@ do_float_compare(X) ->
         _T -> Y > 0
     end.
 
+arity_checks(_Config) ->
+    %% ERL-549: an unsafe optimization removed a test_arity instruction,
+    %% causing the following to return 'broken' instead of 'ok'.
+    ok = do_record_arity_check({rgb, 255, 255, 255, 1}),
+    ok = do_tuple_arity_check({255, 255, 255, 1}).
+ 
+-record(rgb, {r = 255, g = 255, b = 255}).
+
+do_record_arity_check(RGB) when
+        (element(2, RGB) >= 0), (element(2, RGB) =< 255),
+        (element(3, RGB) >= 0), (element(3, RGB) =< 255),
+        (element(4, RGB) >= 0), (element(4, RGB) =< 255) ->
+    if
+        element(1, RGB) =:= rgb, is_record(RGB, rgb) -> broken;
+        true -> ok
+    end.
+
+do_tuple_arity_check(RGB) when is_tuple(RGB),
+        (element(1, RGB) >= 0), (element(1, RGB) =< 255),
+        (element(2, RGB) >= 0), (element(2, RGB) =< 255),
+        (element(3, RGB) >= 0), (element(3, RGB) =< 255) ->
+    case RGB of
+        {255, _, _} -> broken;
+        _ -> ok
+    end.
+
+elixir_binaries(_Config) ->
+    <<"foo blitzky baz">> = elixir_binary_1(<<"blitzky">>),
+    <<"foo * baz">> = elixir_binary_2($*),
+    <<7:4,755:10>> = elixir_bitstring_3(<<755:10>>),
+    ok.
+
+elixir_binary_1(Bar) when is_binary(Bar) ->
+    <<"foo ",
+      case Bar of
+          Rewrite when is_binary(Rewrite) ->
+              Rewrite;
+          Rewrite ->
+              list_to_binary(Rewrite)
+      end/binary,
+      " baz">>.
+
+elixir_binary_2(Arg) ->
+    Bin = <<Arg>>,
+    <<"foo ",
+      case Bin of
+          Rewrite when is_binary(Rewrite) ->
+              Rewrite;
+          Rewrite ->
+              list_to_binary:to_string(Rewrite)
+      end/binary,
+      " baz">>.
+
+elixir_bitstring_3(Bar) when is_bitstring(Bar) ->
+    <<7:4,
+      case Bar of
+          Rewrite when is_bitstring(Rewrite) ->
+              Rewrite;
+          Rewrite ->
+              list_to_bitstring(Rewrite)
+      end/bitstring>>.
+
 
 id(I) ->
     I.
diff --git a/lib/compiler/test/beam_utils_SUITE.erl b/lib/compiler/test/beam_utils_SUITE.erl
index 710cb050d4..7686e69b63 100644
--- a/lib/compiler/test/beam_utils_SUITE.erl
+++ b/lib/compiler/test/beam_utils_SUITE.erl
@@ -24,7 +24,8 @@
 	 apply_fun/1,apply_mf/1,bs_init/1,bs_save/1,
 	 is_not_killed/1,is_not_used_at/1,
 	 select/1,y_catch/1,otp_8949_b/1,liveopt/1,coverage/1,
-	 y_registers/1]).
+         y_registers/1,user_predef/1,scan_f/1,cafu/1,
+         receive_label/1,read_size_file_version/1]).
 -export([id/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -46,7 +47,11 @@ groups() ->
        otp_8949_b,
        liveopt,
        coverage,
-       y_registers
+       y_registers,
+       user_predef,
+       scan_f,
+       cafu,
+       read_size_file_version
       ]}].
 
 init_per_suite(Config) ->
@@ -117,6 +122,15 @@ bs_init(_Config) ->
     {'EXIT',{badarg,_}} = (catch do_bs_init_2([0.5])),
     {'EXIT',{badarg,_}} = (catch do_bs_init_2([-1])),
     {'EXIT',{badarg,_}} = (catch do_bs_init_2([1 bsl 32])),
+
+    <<>> = do_bs_init_3({tag,0}, 0, 0),
+    <<0>> = do_bs_init_3({tag,0}, 2, 1),
+
+    <<"_build/shared">> = do_bs_init_4([], false),
+    <<"abc/shared">> = do_bs_init_4(<<"abc">>, false),
+    <<"foo/foo">> = do_bs_init_4(<<"foo">>, true),
+    error = do_bs_init_4([], not_boolean),
+
     ok.
 
 do_bs_init_1([?MODULE], Sz) ->
@@ -134,6 +148,45 @@ do_bs_init_2(SigNos) ->
 	    erlang:error(badarg)
     >>.
 
+do_bs_init_3({tag,Pos}, Offset, Len) ->
+    N0 = Offset - Pos,
+    N = if N0 > Len -> Len;
+           true -> N0
+        end,
+    <<0:N/unit:8>>.
+
+do_bs_init_4(Arg1, Arg2) ->
+    Build =
+        case id(Arg1) of
+            X when X =:= [] orelse X =:= false -> <<"_build">>;
+            X -> X
+        end,
+    case id(Arg2) of
+        true ->
+            id(<<case Build of
+                     Rewrite when is_binary(Rewrite) ->
+                         Rewrite;
+                     Rewrite ->
+                         id(Rewrite)
+                 end/binary,
+                 "/",
+                 case id(<<"foo">>) of
+                     Rewrite when is_binary(Rewrite) ->
+                         Rewrite;
+                     Rewrite ->
+                         id(Rewrite)
+                 end/binary>>);
+        false ->
+            id(<<case Build of
+                     Rewrite when is_binary(Rewrite) ->
+                         Rewrite;
+                     Rewrite ->
+                         id(Rewrite)
+                 end/binary,
+                 "/shared">>);
+        Other ->
+            error
+    end.
 
 bs_save(_Config) ->
     {a,30,<<>>} = do_bs_save(<<1:1,30:5>>),
@@ -376,5 +429,83 @@ do(A, B) -> {A,B}.
 appointment(#{"resolution" := Url}) ->
     do(receive _ -> Url end, #{true => Url}).
 
+%% From epp.erl.
+user_predef(_Config) ->
+    #{key:="value"} = user_predef({key,"value"}, #{}),
+    #{key:="value"} = user_predef({key,"value"}, #{key=>defined}),
+    error = user_predef({key,"value"}, #{key=>[defined]}),
+    ok.
+
+user_predef({M,Val}, Ms) ->
+    case Ms of
+	#{M:=Defs} when is_list(Defs) ->
+	    error;
+	_ ->
+	    Ms#{M=>Val}
+    end.
+
+%% From disk_log_1.erl.
+scan_f(_Config) ->
+    {1,<<>>,[]} = scan_f(<<1:32>>, 1, []),
+    {1,<<>>,[<<156>>]} = scan_f(<<1:32,156,1:32>>, 1, []),
+    ok.
+
+scan_f(<<Size:32,Tail/binary>>, FSz, Acc) when Size =< FSz ->
+    case Tail of
+        <<BinTerm:Size/binary,Tail2/binary>> ->
+            scan_f(Tail2, FSz, [BinTerm | Acc]);
+        _ ->
+            {Size,Tail,Acc}
+    end.
+
+%% From file_io_server.erl.
+cafu(_Config) ->
+    error = cafu(<<42:32>>, -1, 0, {utf32,big}),
+    error = cafu(<<42:32>>, 10, 0, {utf32,big}),
+    error = cafu(<<42:32>>, -1, 0, {utf32,little}),
+    ok.
+
+cafu(<<_/big-utf32,Rest/binary>>, N, Count, {utf32,big}) when N < 0 ->
+    cafu(Rest, -1, Count+1, {utf32,big});
+cafu(<<_/big-utf32,Rest/binary>>, N, Count, {utf32,big}) ->
+    cafu(Rest, N-1, Count+1, {utf32,big});
+cafu(<<_/little-utf32,Rest/binary>>, N, Count, {utf32,little}) when N < 0 ->
+    cafu(Rest, -1, Count+1, {utf32,little});
+cafu(_, _, _, _) ->
+    error.
+
+-record(rec_label, {bool}).
+
+receive_label(_Config) ->
+    Pid = spawn_link(fun() -> do_receive_label(#rec_label{bool=true}) end),
+    Msg = {a,b,c},
+    Pid ! {self(),Msg},
+    receive
+        {ok,Msg} ->
+            unlink(Pid),
+            exit(Pid, die),
+            ok
+    end.
+
+do_receive_label(Rec) ->
+    receive
+        {From,Message} when Rec#rec_label.bool ->
+            From ! {ok,Message},
+            do_receive_label(Rec)
+    end.
+
+read_size_file_version(_Config) ->
+    ok = do_read_size_file_version({ok,<<42>>}),
+    {ok,7777} = do_read_size_file_version({ok,<<7777:32>>}),
+    ok.
+
+do_read_size_file_version(E) ->
+    case E of
+	{ok,<<Version>>} when Version =:= 42 ->
+            ok;
+	{ok,<<MaxFiles:32>>} ->
+            {ok,MaxFiles}
+    end.
+
 %% The identity function.
 id(I) -> I.
diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index c23514b36b..b8fff7b100 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -33,8 +33,8 @@
 	 state_after_fault_in_catch/1,no_exception_in_catch/1,
 	 undef_label/1,illegal_instruction/1,failing_gc_guard_bif/1,
 	 map_field_lists/1,cover_bin_opt/1,
-	 val_dsetel/1]).
-	 
+	 val_dsetel/1,bad_tuples/1,bad_try_catch_nesting/1]).
+
 -include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
@@ -61,7 +61,8 @@ groups() ->
        freg_state,bad_bin_match,bad_dsetel,
        state_after_fault_in_catch,no_exception_in_catch,
        undef_label,illegal_instruction,failing_gc_guard_bif,
-       map_field_lists,cover_bin_opt,val_dsetel]}].
+       map_field_lists,cover_bin_opt,val_dsetel,
+       bad_tuples,bad_try_catch_nesting]}].
 
 init_per_suite(Config) ->
     Config.
@@ -421,9 +422,9 @@ try_bin_opt(Mod) ->
     try
 	do_bin_opt(Mod)
     catch
-	Class:Error ->
+	Class:Error:Stk ->
 	    io:format("~p: ~p ~p\n~p\n",
-		      [Mod,Class,Error,erlang:get_stacktrace()]),
+		      [Mod,Class,Error,Stk]),
 	    error
     end.
 
@@ -509,6 +510,27 @@ destroy_reg({Tag,N}) ->
 	    {y,N+1}
     end.
 
+bad_tuples(Config) ->
+    Errors = do_val(bad_tuples, Config),
+    [{{bad_tuples,heap_overflow,1},
+      {{put,{x,0}},8,{heap_overflow,{left,0},{wanted,1}}}},
+     {{bad_tuples,long,2},
+      {{put,{atom,too_long}},8,not_building_a_tuple}},
+     {{bad_tuples,self_referential,1},
+      {{put,{x,1}},7,{tuple_in_progress,{x,1}}}},
+     {{bad_tuples,short,1},
+      {{move,{x,1},{x,0}},7,{tuple_in_progress,{x,1}}}}] = Errors,
+
+    ok.
+
+bad_try_catch_nesting(Config) ->
+    Errors = do_val(bad_try_catch_nesting, Config),
+    [{{bad_try_catch_nesting,main,2},
+      {{'try',{y,2},{f,3}},
+       7,
+       {bad_try_catch_nesting,{y,2},[{{y,1},{trytag,[5]}}]}}}] = Errors,
+    ok.
+
 %%%-------------------------------------------------------------------------
 
 transform_remove(Remove, Module) ->
diff --git a/lib/compiler/test/beam_validator_SUITE_data/bad_try_catch_nesting.S b/lib/compiler/test/beam_validator_SUITE_data/bad_try_catch_nesting.S
new file mode 100644
index 0000000000..9f1b21a17b
--- /dev/null
+++ b/lib/compiler/test/beam_validator_SUITE_data/bad_try_catch_nesting.S
@@ -0,0 +1,64 @@
+{module, bad_try_catch_nesting}.  %% version = 0
+
+{exports, [{main,2},{module_info,0},{module_info,1}]}.
+
+{attributes, []}.
+
+{labels, 11}.
+
+
+{function, main, 2, 2}.
+  {label,1}.
+    {line,[{location,"bad_try_catch_nesting.erl",4}]}.
+    {func_info,{atom,bad_try_catch_nesting},{atom,main},2}.
+  {label,2}.
+    {allocate_zero,3,2}.
+    {'try',{y,1},{f,5}}.
+    {move,{x,1},{y,0}}.
+    {'try',{y,2},{f,3}}.
+    {line,[{location,"bad_try_catch_nesting.erl",7}]}.
+    {call_fun,0}.
+    {try_end,{y,2}}.
+    {jump,{f,4}}.
+  {label,3}.
+    {try_case,{y,2}}.
+    {test,is_ne_exact,{f,4},[{x,0},{atom,error}]}.
+    {line,[]}.
+    {bif,raise,{f,0},[{x,2},{x,1}],{x,0}}.
+  {label,4}.
+    {move,{y,0},{x,0}}.
+    {kill,{y,0}}.
+    {line,[{location,"bad_try_catch_nesting.erl",12}]}.
+    {call_fun,0}.
+    {try_end,{y,1}}.
+    {deallocate,3}.
+    return.
+  {label,5}.
+    {try_case,{y,1}}.
+    {test,is_eq_exact,{f,6},[{x,0},{atom,throw}]}.
+    {deallocate,3}.
+    return.
+  {label,6}.
+    {line,[]}.
+    {bif,raise,{f,0},[{x,2},{x,1}],{x,0}}.
+
+
+{function, module_info, 0, 8}.
+  {label,7}.
+    {line,[]}.
+    {func_info,{atom,bad_try_catch_nesting},{atom,module_info},0}.
+  {label,8}.
+    {move,{atom,bad_try_catch_nesting},{x,0}}.
+    {line,[]}.
+    {call_ext_only,1,{extfunc,erlang,get_module_info,1}}.
+
+
+{function, module_info, 1, 10}.
+  {label,9}.
+    {line,[]}.
+    {func_info,{atom,bad_try_catch_nesting},{atom,module_info},1}.
+  {label,10}.
+    {move,{x,0},{x,1}}.
+    {move,{atom,bad_try_catch_nesting},{x,0}}.
+    {line,[]}.
+    {call_ext_only,2,{extfunc,erlang,get_module_info,2}}.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/bad_tuples.S b/lib/compiler/test/beam_validator_SUITE_data/bad_tuples.S
new file mode 100644
index 0000000000..7980241c37
--- /dev/null
+++ b/lib/compiler/test/beam_validator_SUITE_data/bad_tuples.S
@@ -0,0 +1,88 @@
+{module, bad_tuples}.  %% version = 0
+
+{exports, [{heap_overflow,1},
+           {long,2},
+           {module_info,0},
+           {module_info,1},
+           {self_referential,1},
+           {short,1}]}.
+
+{attributes, []}.
+
+{labels, 13}.
+
+
+{function, short, 1, 2}.
+  {label,1}.
+    {line,[{location,"bad_tuples.erl",4}]}.
+    {func_info,{atom,bad_tuples},{atom,short},1}.
+  {label,2}.
+    {test_heap,3,1}.
+    {put_tuple,2,{x,1}}.
+    {put,{atom,ok}}.
+    {move,{x,1},{x,0}}.
+    return.
+
+
+{function, long, 2, 4}.
+  {label,3}.
+    {line,[{location,"bad_tuples.erl",7}]}.
+    {func_info,{atom,bad_tuples},{atom,long},2}.
+  {label,4}.
+    {test_heap,6,2}.
+    {put_tuple,2,{x,2}}.
+    {put,{x,0}}.
+    {put,{x,1}}.
+    {put,{atom,too_long}}.
+    {put_tuple,2,{x,0}}.
+    {put,{atom,ok}}.
+    {put,{x,2}}.
+    return.
+
+
+{function, heap_overflow, 1, 6}.
+  {label,5}.
+    {line,[{location,"bad_tuples.erl",10}]}.
+    {func_info,{atom,bad_tuples},{atom,heap_overflow},1}.
+  {label,6}.
+    {test_heap,3,1}.
+    {put_tuple,2,{x,1}}.
+    {put,{atom,ok}}.
+    {put,{x,0}}.
+    {put,{x,0}}.
+    {move,{x,1},{x,0}}.
+    return.
+
+
+{function, self_referential, 1, 8}.
+  {label,7}.
+    {line,[{location,"bad_tuples.erl",13}]}.
+    {func_info,{atom,bad_tuples},{atom,self_referential},1}.
+  {label,8}.
+    {test_heap,3,1}.
+    {put_tuple,2,{x,1}}.
+    {put,{atom,ok}}.
+    {put,{x,1}}.
+    {move,{x,1},{x,0}}.
+    return.
+
+
+{function, module_info, 0, 10}.
+  {label,9}.
+    {line,[]}.
+    {func_info,{atom,bad_tuples},{atom,module_info},0}.
+  {label,10}.
+    {move,{atom,bad_tuples},{x,0}}.
+    {line,[]}.
+    {call_ext_only,1,{extfunc,erlang,get_module_info,1}}.
+
+
+{function, module_info, 1, 12}.
+  {label,11}.
+    {line,[]}.
+    {func_info,{atom,bad_tuples},{atom,module_info},1}.
+  {label,12}.
+    {move,{x,0},{x,1}}.
+    {move,{atom,bad_tuples},{x,0}}.
+    {line,[]}.
+    {call_ext_only,2,{extfunc,erlang,get_module_info,2}}.
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index ad48d4c0b7..235956a714 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -39,7 +39,8 @@
 	 match_string_opt/1,select_on_integer/1,
 	 map_and_binary/1,unsafe_branch_caching/1,
 	 bad_literals/1,good_literals/1,constant_propagation/1,
-	 parse_xml/1,get_payload/1,escape/1,num_slots_different/1]).
+	 parse_xml/1,get_payload/1,escape/1,num_slots_different/1,
+         beam_bsm/1,guard/1,is_ascii/1,non_opt_eq/1]).
 
 -export([coverage_id/1,coverage_external_ignore/2]).
 
@@ -71,7 +72,8 @@ groups() ->
        match_string_opt,select_on_integer,
        map_and_binary,unsafe_branch_caching,
        bad_literals,good_literals,constant_propagation,parse_xml,
-       get_payload,escape,num_slots_different]}].
+       get_payload,escape,num_slots_different,
+       beam_bsm,guard,is_ascii,non_opt_eq]}].
 
 
 init_per_suite(Config) ->
@@ -676,6 +678,10 @@ coverage(Config) when is_list(Config) ->
     <<>> = coverage_per_key(<<4:32>>),
     <<$a,$b,$c>> = coverage_per_key(<<7:32,"abc">>),
 
+    binary = coverage_bitstring(<<>>),
+    binary = coverage_bitstring(<<7>>),
+    bitstring = coverage_bitstring(<<7:4>>),
+    other = coverage_bitstring([a]),
     ok.
 
 coverage_fold(Fun, Acc, <<H,T/binary>>) ->
@@ -766,6 +772,10 @@ coverage_per_key(<<BinSize:32,Bin/binary>> = B) ->
     true = (byte_size(B) =:= BinSize),
     Bin.
 
+coverage_bitstring(Bin) when is_binary(Bin) -> binary;
+coverage_bitstring(<<_/bitstring>>) -> bitstring;
+coverage_bitstring(_) -> other.
+
 multiple_uses(Config) when is_list(Config) ->
     {344,62879,345,<<245,159,1,89>>} = multiple_uses_1(<<1,88,245,159,1,89>>),
     true = multiple_uses_2(<<0,0,197,18>>),
@@ -799,7 +809,7 @@ multiple_uses_cmp(<<_:16>>, <<_:16>>) -> false.
 first_after(Data, Offset) ->
     case byte_size(Data) > Offset of
 	false ->
-	    {First, Rest} = {ok, ok},
+	    {_First, _Rest} = {ok, ok},
 	    ok;
 	true ->
 	    <<_:Offset/binary, Rest/binary>> = Data,
@@ -1513,7 +1523,7 @@ is_next_char_whitespace(<<C/utf8,_/binary>>) ->
         {this_hdr = 17,
          ext_hdr_opts}).
 
-get_payload(Config) ->
+get_payload(_Config) ->
     <<3445:48>> = do_get_payload(#ext_header{ext_hdr_opts = <<3445:48>>}),
     {'EXIT',_} = (catch do_get_payload(#ext_header{})),
     ok.
@@ -1572,6 +1582,101 @@ lgettext(<<"de">>, <<"navigation">>, <<"Results">>) ->
 lgettext(<<"de">>, <<"navigation">>, <<"Resources">>) ->
     {ok, <<"Ressourcen">>}.
 
+%% Test more code in beam_bsm.
+beam_bsm(_Config) ->
+    true = check_bitstring_list(<<1:1,0:1,1:1,1:1>>, [1,0,1,1]),
+    false = check_bitstring_list(<<1:1,0:1,1:1,1:1>>, [0]),
+
+    true = bsm_validate_scheme(<<>>),
+    true = bsm_validate_scheme(<<5,10>>),
+    false = bsm_validate_scheme(<<5,10,11,12>>),
+    true = bsm_validate_scheme([]),
+    true = bsm_validate_scheme([5,10]),
+    false = bsm_validate_scheme([5,6,7]),
+
+    <<1,2,3>> = bsm_must_save_and_not_save(<<1,2,3>>, []),
+    D = fun(N) -> 2*N end,
+    [2,4|<<3>>] = bsm_must_save_and_not_save(<<1,2,3>>, [D,D]),
+
+    ok.
+
+check_bitstring_list(<<H:1,T1/bitstring>>, [H|T2]) ->
+    check_bitstring_list(T1, T2);
+check_bitstring_list(<<>>, []) ->
+    true;
+check_bitstring_list(_, _) ->
+    false.
+
+bsm_validate_scheme([]) -> true;
+bsm_validate_scheme([H|T]) ->
+    case bsm_is_scheme(H) of
+        true -> bsm_validate_scheme(T);
+        false -> false
+    end;
+bsm_validate_scheme(<<>>) -> true;
+bsm_validate_scheme(<<H, Rest/binary>>) ->
+    case bsm_is_scheme(H) of
+        true -> bsm_validate_scheme(Rest);
+        false -> false
+    end.
+
+bsm_is_scheme(Int) ->
+    Int rem 5 =:= 0.
+
+%% NOT OPTIMIZED: different control paths use different positions in the binary
+bsm_must_save_and_not_save(Bin, []) ->
+    Bin;
+bsm_must_save_and_not_save(<<H,T/binary>>, [F|Fs]) ->
+    [F(H)|bsm_must_save_and_not_save(T, Fs)];
+bsm_must_save_and_not_save(<<>>, []) ->
+    [].
+
+guard(_Config) ->
+    _Tuple = id({a,b}),
+    ok = guard_1(<<1,2,3>>, {1,2,3}),
+    ok = guard_2(<<42>>, #{}),
+    ok.
+
+%% Cover handling of #k_put{} in v3_codegen:bsm_rename_ctx/4.
+guard_1(<<A,B,C>>, Tuple) when Tuple =:= {A,B,C} ->
+    ok.
+
+%% Cover handling of #k_call{} in v3_codegen:bsm_rename_ctx/4.
+guard_2(<<_>>, Healing) when Healing#{[] => Healing} =:= #{[] => #{}} ->
+    ok.
+
+is_ascii(_Config) ->
+    true = do_is_ascii(<<>>),
+    true = do_is_ascii(<<"string">>),
+    false = do_is_ascii(<<1024/utf8>>),
+    {'EXIT',{function_clause,_}} = (catch do_is_ascii(<<$A,0:3>>)),
+    {'EXIT',{function_clause,_}} = (catch do_is_ascii(<<16#80,0:3>>)),
+    ok.
+
+do_is_ascii(<<>>) ->
+    true;
+do_is_ascii(<<C,_/binary>>) when C >= 16#80 ->
+    %% This clause must fail to match if the size of the argument in
+    %% bits is not divisible by 8. Beware of unsafe optimizations.
+    false;
+do_is_ascii(<<_, T/binary>>) ->
+    do_is_ascii(T).
+
+non_opt_eq(_Config) ->
+    true = non_opt_eq([], <<>>),
+    true = non_opt_eq([$a], <<$a>>),
+    false = non_opt_eq([$a], <<$b>>),
+    ok.
+
+%% An example from the Efficiency Guide. It used to be not optimized,
+%% but now it can be optimized.
+
+non_opt_eq([H|T1], <<H,T2/binary>>) ->
+    non_opt_eq(T1, T2);
+non_opt_eq([_|_], <<_,_/binary>>) ->
+    false;
+non_opt_eq([], <<>>) ->
+    true.
 
 check(F, R) ->
     R = F().
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index e88a132d59..eee5bc733f 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -120,9 +120,19 @@ file_1(Config) when is_list(Config) ->
     true = exists(Target),
     passed = run(Target, test, []),
 
+    %% Test option 'deterministic' as a compiler attribute.
+    Det = deterministic_module,
+    {DetPath, DetTarget} = get_files(Config, Det, "det_target"),
+    {ok,Det,DetCode} = compile:file(DetPath, [binary]),
+    {module,Det} = code:load_binary(Det, "", DetCode),
+    [{version,_}] = Det:module_info(compile),
+    true = code:delete(Det),
+    false = code:purge(Det),
+
     %% Cleanup.
     ok = file:delete(Target),
     ok = file:del_dir(filename:dirname(Target)),
+    ok = file:del_dir(filename:dirname(DetTarget)),
 
     %% There should not be any messages in the messages.
     receive
@@ -398,6 +408,7 @@ do_file_listings(DataDir, PrivDir, [File|Files]) ->
     ok = file:delete(filename:join(Listings, File ++ ".core")),
     do_listing(Simple, TargetDir, to_core, ".core"),
     do_listing(Simple, TargetDir, to_kernel, ".kernel"),
+    do_listing(Simple, TargetDir, to_dis, ".dis"),
 
     %% Final clean up.
     lists:foreach(fun(F) -> ok = file:delete(F) end,
@@ -413,6 +424,7 @@ listings_big(Config) when is_list(Config) ->
     do_listing(Big, TargetDir, 'E'),
     do_listing(Big, TargetDir, 'P'),
     do_listing(Big, TargetDir, dkern, ".kernel"),
+    do_listing(Big, TargetDir, to_dis, ".dis"),
 
     TargetNoext = filename:rootname(Target, code:objfile_extension()),
     {ok,big} = compile:file(TargetNoext, [from_asm,{outdir,TargetDir}]),
@@ -488,9 +500,8 @@ do_kernel_listing({M,A}) ->
 	    io:format("*** compilation failure '~p' for module ~s\n",
 		      [Error,M]),
 	    error;
-	Class:Error ->
-	    io:format("~p: ~p ~p\n~p\n",
-		      [M,Class,Error,erlang:get_stacktrace()]),
+	Class:Error:Stk ->
+	    io:format("~p: ~p ~p\n~p\n", [M,Class,Error,Stk]),
 	    error
     end.
 
@@ -890,9 +901,8 @@ do_core_pp({M,A}, Outdir) ->
 	    io:format("*** compilation failure '~p' for module ~s\n",
 		      [Error,M]),
 	    error;
-	Class:Error ->
-	    io:format("~p: ~p ~p\n~p\n",
-		      [M,Class,Error,erlang:get_stacktrace()]),
+	Class:Error:Stk ->
+	    io:format("~p: ~p ~p\n~p\n", [M,Class,Error,Stk]),
 	    error
     end.
 
@@ -949,9 +959,8 @@ do_core_roundtrip(Beam, Outdir) ->
 	    io:format("*** compilation failure '~p' for file ~s\n",
 		      [Error,Beam]),
 	    error;
-	Class:Error ->
-	    io:format("~p: ~p ~p\n~p\n",
-		      [Beam,Class,Error,erlang:get_stacktrace()]),
+	Class:Error:Stk ->
+	    io:format("~p: ~p ~p\n~p\n", [Beam,Class,Error,Stk]),
 	    error
     end.
 
@@ -1136,9 +1145,8 @@ do_asm(Beam, Outdir) ->
 			  [Other,AsmFile]),
 		error
 	end
-    catch Class:Error ->
-	    io:format("~p: ~p ~p\n~p\n",
-		      [M,Class,Error,erlang:get_stacktrace()]),
+    catch Class:Error:Stk ->
+	    io:format("~p: ~p ~p\n~p\n", [M,Class,Error,Stk]),
 	    error
     end.
 
@@ -1155,9 +1163,8 @@ do_opt_guards(Beam) ->
     try
 	{ok,M,Asm} = compile:forms(A, ['S']),
 	do_opt_guards_mod(Asm)
-    catch Class:Error ->
-	    io:format("~p: ~p ~p\n~p\n",
-		      [M,Class,Error,erlang:get_stacktrace()]),
+    catch Class:Error:Stk ->
+	    io:format("~p: ~p ~p\n~p\n", [M,Class,Error,Stk]),
 	    error
     end.
 
@@ -1318,10 +1325,13 @@ do_warnings_2([], Next, F) ->
 %% pre-loads the modules that are used by a typical compilation.
 
 pre_load_check(Config) ->
-    case test_server:is_cover() of
-	true ->
+    case {test_server:is_cover(),code:module_info(native)} of
+	{true,_} ->
 	    {skip,"Cover is running"};
-	false ->
+        {false,true} ->
+            %% Tracing won't work.
+            {skip,"'code' is native-compiled"};
+	{false,false} ->
 	    try
 		do_pre_load_check(Config)
 	    after
@@ -1445,19 +1455,21 @@ env_compiler_options(_Config) ->
 bc_options(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
 
-    101 = highest_opcode(DataDir, small_float, [no_line_info]),
+    101 = highest_opcode(DataDir, small_float, [no_get_hd_tl,no_line_info]),
 
     103 = highest_opcode(DataDir, big,
-                         [no_record_opt,no_line_info,no_stack_trimming]),
+                         [no_get_hd_tl,no_record_opt,
+                          no_line_info,no_stack_trimming]),
 
-    125 = highest_opcode(DataDir, small_float, [no_line_info,no_float_opt]),
+    125 = highest_opcode(DataDir, small_float,
+                         [no_get_hd_tl,no_line_info,no_float_opt]),
 
     132 = highest_opcode(DataDir, small,
-                         [no_record_opt,no_float_opt,no_line_info]),
+                         [no_get_hd_tl,no_record_opt,no_float_opt,no_line_info]),
 
-    136 = highest_opcode(DataDir, big, [no_record_opt,no_line_info]),
+    136 = highest_opcode(DataDir, big, [no_get_hd_tl,no_record_opt,no_line_info]),
 
-    153 = highest_opcode(DataDir, big, [no_record_opt]),
+    153 = highest_opcode(DataDir, big, [no_get_hd_tl,no_record_opt]),
     153 = highest_opcode(DataDir, big, [r16]),
     153 = highest_opcode(DataDir, big, [r17]),
     153 = highest_opcode(DataDir, big, [r18]),
@@ -1468,9 +1480,10 @@ bc_options(Config) ->
     158 = highest_opcode(DataDir, small_maps, [r17]),
     158 = highest_opcode(DataDir, small_maps, [r18]),
     158 = highest_opcode(DataDir, small_maps, [r19]),
+    158 = highest_opcode(DataDir, small_maps, [r20]),
     158 = highest_opcode(DataDir, small_maps, []),
 
-    159 = highest_opcode(DataDir, big, []),
+    163 = highest_opcode(DataDir, big, []),
 
     ok.
 
diff --git a/lib/compiler/test/compile_SUITE_data/big.erl b/lib/compiler/test/compile_SUITE_data/big.erl
index 2e54ee8660..1db07755a1 100644
--- a/lib/compiler/test/compile_SUITE_data/big.erl
+++ b/lib/compiler/test/compile_SUITE_data/big.erl
@@ -741,3 +741,7 @@ snmp_access(suite) ->
 debug_support(suite) ->
     [  info, schema, schema, kill, lkill ].
 
+%% Cover translation of get_hd/2 to get_list/3 when option no_get_hd_tl
+%% is given.
+cover_get_hd([Hd|_]) ->
+    Hd.
diff --git a/lib/compiler/test/compile_SUITE_data/deterministic_module.erl b/lib/compiler/test/compile_SUITE_data/deterministic_module.erl
new file mode 100644
index 0000000000..5e0e29c25e
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/deterministic_module.erl
@@ -0,0 +1,21 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(deterministic_module).
+-compile([deterministic]).
diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index 262967d03d..4fd1f84569 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -27,7 +27,7 @@
 	 multiple_aliases/1,redundant_boolean_clauses/1,
 	 mixed_matching_clauses/1,unnecessary_building/1,
 	 no_no_file/1,configuration/1,supplies/1,
-         redundant_stack_frame/1]).
+         redundant_stack_frame/1,export_from_case/1]).
 
 -export([foo/0,foo/1,foo/2,foo/3]).
 
@@ -47,7 +47,7 @@ groups() ->
        multiple_aliases,redundant_boolean_clauses,
        mixed_matching_clauses,unnecessary_building,
        no_no_file,configuration,supplies,
-       redundant_stack_frame]}].
+       redundant_stack_frame,export_from_case]}].
 
 
 init_per_suite(Config) ->
@@ -551,4 +551,38 @@ do_redundant_stack_frame(Map) ->
         end,
     {X, Y}.
 
+%% Cover some clauses in sys_core_fold:remove_first_value/2.
+
+-record(export_from_case, {val}).
+
+export_from_case(_Config) ->
+    a = export_from_case_1(true),
+    b = export_from_case_1(false),
+
+    R = #export_from_case{val=0},
+    {ok,R} = export_from_case_2(false, R),
+    {ok,#export_from_case{val=42}} = export_from_case_2(true, R),
+
+    ok.
+
+export_from_case_1(Bool) ->
+    case Bool of
+        true ->
+            id(42),
+            Result = a;
+        false ->
+            Result = b
+    end,
+    id(Result).
+
+export_from_case_2(Bool, Rec) ->
+    case Bool of
+        false ->
+            Result = Rec;
+        true ->
+            Result = Rec#export_from_case{val=42}
+    end,
+    {ok,Result}.
+
+
 id(I) -> I.
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index d96cfdb7ac..0d6f8c6f98 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -35,7 +35,8 @@
 	 basic_andalso_orelse/1,traverse_dcd/1,
 	 check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1,
 	 bad_constants/1,bad_guards/1,
-	 guard_in_catch/1,beam_bool_SUITE/1]).
+         guard_in_catch/1,beam_bool_SUITE/1,
+         cover_beam_dead/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -54,7 +55,8 @@ groups() ->
        rel_ops,rel_op_combinations,
        literal_type_tests,basic_andalso_orelse,traverse_dcd,
        check_qlc_hrl,andalso_semi,t_tuple_size,binary_part,
-       bad_constants,bad_guards,guard_in_catch,beam_bool_SUITE]}].
+       bad_constants,bad_guards,guard_in_catch,beam_bool_SUITE,
+       cover_beam_dead]}].
 
 init_per_suite(Config) ->
     Config.
@@ -1619,7 +1621,9 @@ type_tests() ->
      is_reference,
      is_port,
      is_binary,
-     is_function].
+     is_bitstring,
+     is_function,
+     is_map].
 
 basic_andalso_orelse(Config) when is_list(Config) ->
     T = id({type,integers,23,42}),
@@ -2202,7 +2206,31 @@ maps() ->
 evidence(#{0 := Charge}) when 0; #{[] => Charge} == #{[] => 42} ->
     ok.
 
+cover_beam_dead(_Config) ->
+    Mod = ?FUNCTION_NAME,
+    Attr = [],
+    Fs = [{function,test,1,2,
+           [{label,1},
+            {line,[]},
+            {func_info,{atom,Mod},{atom,test},1},
+            {label,2},
+            %% Cover beam_dead:turn_op/1 using swapped operand order.
+            {test,is_ne_exact,{f,3},[{integer,1},{x,0}]},
+            {test,is_eq_exact,{f,1},[{atom,a},{x,0}]},
+            {label,3},
+            {move,{atom,ok},{x,0}},
+            return]}],
+    Exp = [{test,1}],
+    Asm = {Mod,Exp,Attr,Fs,3},
+    {ok,Mod,Beam} = compile:forms(Asm, [from_asm,binary,report]),
+    {module,Mod} = code:load_binary(Mod, Mod, Beam),
+    ok = Mod:test(1),
+    ok = Mod:test(a),
+    {'EXIT',_} = (catch Mod:test(other)),
+    true = code:delete(Mod),
+    _ = code:purge(Mod),
 
+    ok.
 
 %% Call this function to turn off constant propagation.
 id(I) -> I.
diff --git a/lib/compiler/test/map_SUITE.erl b/lib/compiler/test/map_SUITE.erl
index 5e90b79aa2..f15917e3cb 100644
--- a/lib/compiler/test/map_SUITE.erl
+++ b/lib/compiler/test/map_SUITE.erl
@@ -695,8 +695,28 @@ t_is_map(Config) when is_list(Config) ->
     if is_map(#{b=>1}) -> ok end,
     if not is_map([1,2,3]) -> ok end,
     if not is_map(x) -> ok end,
+
+    ok = do_t_is_map(map, #{}),
+    error = do_t_is_map(map, {a,b,c}),
+    ok = do_t_is_map(number, 42),
+    ok = do_t_is_map(number, 42.0),
+    error = do_t_is_map(number, {a,b,c}),
     ok.
 
+do_t_is_map(What, X) ->
+    B = case What of
+            map ->
+                %% Cover conversion of is_map/1 BIF to test instruction
+                %% in beam_utils:bif_to_test/3.
+                is_map(X);
+            number ->
+                is_number(X)
+        end,
+    case B of
+        true -> ok;
+        false -> error
+    end.
+
 % test map updates without matching
 t_update_literals(Config) when is_list(Config) ->
     Map = #{x=>1,y=>2,z=>3,q=>4},
diff --git a/lib/compiler/test/match_SUITE.erl b/lib/compiler/test/match_SUITE.erl
index c31695be24..4b26a8dcdc 100644
--- a/lib/compiler/test/match_SUITE.erl
+++ b/lib/compiler/test/match_SUITE.erl
@@ -24,7 +24,8 @@
 	 pmatch/1,mixed/1,aliases/1,non_matching_aliases/1,
 	 match_in_call/1,untuplify/1,shortcut_boolean/1,letify_guard/1,
 	 selectify/1,deselectify/1,underscore/1,match_map/1,map_vars_used/1,
-	 coverage/1,grab_bag/1,literal_binary/1]).
+	 coverage/1,grab_bag/1,literal_binary/1,
+         unary_op/1]).
 	 
 -include_lib("common_test/include/ct.hrl").
 
@@ -40,7 +41,7 @@ groups() ->
        match_in_call,untuplify,
        shortcut_boolean,letify_guard,selectify,deselectify,
        underscore,match_map,map_vars_used,coverage,
-       grab_bag,literal_binary]}].
+       grab_bag,literal_binary,unary_op]}].
 
 
 init_per_suite(Config) ->
@@ -617,6 +618,10 @@ grab_bag(_Config) ->
 	 {bad,16#555555555555555555555555555555555555555555555555555}],
     ok = grab_bag_remove_failure(L, unit, 0),
 
+    {42,<<43,44>>} = grab_bag_single_valued(<<42,43,44>>),
+    empty_list = grab_bag_single_valued([]),
+    empty_tuple = grab_bag_single_valued({}),
+
     ok.
 
 grab_bag_remove_failure([], _Unit, _MaxFailure) ->
@@ -634,6 +639,12 @@ grab_bag_remove_failure([{stretch,_,Mi}=Stretch | Specs], Unit, _MaxFailure) ->
 	    ok
     end.
 
+%% Cover a line v3_kernel that places binary matching first.
+grab_bag_single_valued(<<H,T/bytes>>) -> {H,T};
+grab_bag_single_valued([]) -> empty_list;
+grab_bag_single_valued({}) -> empty_tuple.
+
+
 %% Regression in 19.0, reported by Alexei Sholik
 literal_binary(_Config) ->
     3 = literal_binary_match(bar, <<"y">>),
@@ -652,5 +663,74 @@ literal_binary_match(_, <<"x">>) -> 2;
 literal_binary_match(_, <<"y">>) -> 3;
 literal_binary_match(_, _) -> fail.
 
+unary_op(Config) ->
+    %% ERL-514. This test case only verifies that the code
+    %% calculates the correct result, not that the generated
+    %% code is optimial.
+
+    {non_associative,30} = unary_op_1('&'),
+    {non_associative,300} = unary_op_1('^'),
+    {non_associative,300} = unary_op_1('not'),
+    {non_associative,300} = unary_op_1('+'),
+    {non_associative,300} = unary_op_1('-'),
+    {non_associative,300} = unary_op_1('~~~'),
+    {non_associative,300} = unary_op_1('!'),
+    {non_associative,320} = unary_op_1('@'),
+
+    error = unary_op_1(Config),
+    error = unary_op_1(abc),
+    error = unary_op_1(42),
+
+    ok.
+
+unary_op_1(Vop@1) ->
+    %% If all optimizations are working as they should, there should
+    %% be no stack frame and all '=:=' tests should be coalesced into
+    %% a single select_val instruction.
+
+    case Vop@1 =:= '&' of
+        true ->
+            {non_associative,30};
+        false ->
+            case
+                case Vop@1 =:= '^' of
+                    true ->
+                        true;
+                    false ->
+                        case Vop@1 =:= 'not' of
+                            true ->
+                                true;
+                            false ->
+                                case Vop@1 =:= '+' of
+                                    true ->
+                                        true;
+                                    false ->
+                                        case Vop@1 =:= '-' of
+                                            true ->
+                                                true;
+                                            false ->
+                                                case Vop@1 =:= '~~~' of
+                                                    true ->
+                                                        true;
+                                                    false ->
+                                                        Vop@1 =:= '!'
+                                                end
+                                        end
+                                end
+                        end
+                end
+            of
+                true ->
+                    {non_associative,300};
+                false ->
+                    case Vop@1 =:= '@' of
+                        true ->
+                            {non_associative,320};
+                        false ->
+                            error
+                    end
+            end
+    end.
+
 
 id(I) -> I.
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index b12bcbeeab..4e39f4663e 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -318,8 +318,7 @@ expect_error(Fun) ->
 	    io:format("~p", [Any]),
 	    ct:fail(call_was_supposed_to_fail)
     catch
-	Class:Reason ->
-	    Stk = erlang:get_stacktrace(),
+	Class:Reason:Stk ->
 	    io:format("~p:~p\n~p\n", [Class,Reason,Stk]),
 	    case {Class,Reason} of
 		{error,undef} ->
@@ -360,9 +359,7 @@ integer_encoding_1(Config) ->
     io:put_chars(Src, "t(Last) ->[\n"),
     io:put_chars(Data, "[\n"),
 
-    do_integer_encoding(-(id(1) bsl 10000), Src, Data),
-    do_integer_encoding(id(1) bsl 10000, Src, Data),
-    do_integer_encoding(1024, 0, Src, Data),
+    do_integer_encoding(137, 0, Src, Data),
     _ = [begin
 	     B = 1 bsl I,
 	     do_integer_encoding(-B-1, Src, Data),
@@ -371,7 +368,7 @@ integer_encoding_1(Config) ->
 	     do_integer_encoding(B-1, Src, Data),
 	     do_integer_encoding(B, Src, Data),
 	     do_integer_encoding(B+1, Src, Data)
-	 end || I <- lists:seq(1, 128)],
+	 end || I <- lists:seq(1, 130)],
     io:put_chars(Src, "Last].\n\n"),
     ok = file:close(Src),
     io:put_chars(Data, "0].\n\n"),
@@ -385,8 +382,6 @@ integer_encoding_1(Config) ->
     %% Compare lists.
     List = Mod:t(0),
     {ok,[List]} = file:consult(DataFile),
-    OneBsl10000 = id(1) bsl 10000,
-    [-(1 bsl 10000),OneBsl10000|_] = List,
 
     %% Cleanup.
     file:delete(SrcFile),
@@ -405,7 +400,3 @@ do_integer_encoding(I, Src, Data) ->
     Str = integer_to_list(I),
     io:put_chars(Src, [Str,",\n"]),
     io:put_chars(Data, [Str,",\n"]).
-
-    
-id(I) -> I.
-    
diff --git a/lib/compiler/test/receive_SUITE.erl b/lib/compiler/test/receive_SUITE.erl
index 8304672558..5e386790c0 100644
--- a/lib/compiler/test/receive_SUITE.erl
+++ b/lib/compiler/test/receive_SUITE.erl
@@ -222,9 +222,8 @@ do_ref_opt(Source, PrivDir) ->
 		    collect_recv_opt_instrs(Code)
 	end,
 	ok
-    catch Class:Error ->
-	    io:format("~s: ~p ~p\n~p\n",
-		      [Source,Class,Error,erlang:get_stacktrace()]),
+    catch Class:Error:Stk ->
+	    io:format("~s: ~p ~p\n~p\n", [Source,Class,Error,Stk]),
 	    error
     end.
 
@@ -265,6 +264,10 @@ export(Config) when is_list(Config) ->
     self() ! {result,Ref,42},
     42 = export_1(Ref),
     {error,timeout} = export_1(Ref),
+
+    self() ! {result,Ref},
+    {ok,Ref} = export_2(),
+
     ok.
 
 export_1(Reference) ->
@@ -281,6 +284,10 @@ export_1(Reference) ->
     id({build,self()}),
     Result.
 
+export_2() ->
+    receive {result,Result} -> ok end,
+    {ok,Result}.
+
 wait(Config) when is_list(Config) ->
     self() ! <<42>>,
     <<42>> = wait_1(r, 1, 2),
diff --git a/lib/compiler/test/trycatch_SUITE.erl b/lib/compiler/test/trycatch_SUITE.erl
index 42dbf7d5f0..d5a1dc642f 100644
--- a/lib/compiler/test/trycatch_SUITE.erl
+++ b/lib/compiler/test/trycatch_SUITE.erl
@@ -26,7 +26,8 @@
 	 nested_of/1,nested_catch/1,nested_after/1,
 	 nested_horrid/1,last_call_optimization/1,bool/1,
 	 plain_catch_coverage/1,andalso_orelse/1,get_in_try/1,
-	 hockey/1,handle_info/1,catch_in_catch/1,grab_bag/1]).
+	 hockey/1,handle_info/1,catch_in_catch/1,grab_bag/1,
+         stacktrace/1,nested_stacktrace/1,raise/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -42,7 +43,8 @@ groups() ->
        after_oops,eclectic,rethrow,nested_of,nested_catch,
        nested_after,nested_horrid,last_call_optimization,
        bool,plain_catch_coverage,andalso_orelse,get_in_try,
-       hockey,handle_info,catch_in_catch,grab_bag]}].
+       hockey,handle_info,catch_in_catch,grab_bag,
+       stacktrace,nested_stacktrace,raise]}].
 
 
 init_per_suite(Config) ->
@@ -115,6 +117,16 @@ basic(Conf) when is_list(Conf) ->
 	 catch nisse -> erro
 	 end,
 
+    %% Unmatchable clauses.
+    try
+        throw(thrown)
+    catch
+        {a,b}={a,b,c} ->                        %Intentionally no match.
+            ok;
+        thrown ->
+            ok
+    end,
+
     ok.
 
 after_call() ->
@@ -1039,5 +1051,217 @@ grab_bag(_Config) ->
 
     ok.
 
+stacktrace(_Config) ->
+    V = [make_ref()|self()],
+    case ?MODULE:module_info(native) of
+        false ->
+            {value2,{caught1,badarg,[{erlang,abs,[V],_}|_]}} =
+                stacktrace_1({'abs',V}, error, {value,V}),
+            {caught2,{error,badarith},[{erlang,'+',[0,a],_},
+                                       {?MODULE,my_add,2,_}|_]} =
+                stacktrace_1({'div',{1,0}}, error, {'add',{0,a}});
+        true ->
+            {value2,{caught1,badarg,[{?MODULE,my_abs,1,_}|_]}} =
+                stacktrace_1({'abs',V}, error, {value,V}),
+            {caught2,{error,badarith},[{?MODULE,my_add,2,_}|_]} =
+                stacktrace_1({'div',{1,0}}, error, {'add',{0,a}})
+    end,
+    {caught2,{error,{try_clause,V}},[{?MODULE,stacktrace_1,3,_}|_]} =
+        stacktrace_1({value,V}, error, {value,V}),
+    {caught2,{throw,V},[{?MODULE,foo,1,_}|_]} =
+        stacktrace_1({value,V}, error, {throw,V}),
+
+    try
+        stacktrace_2()
+    catch
+        error:{badmatch,_}:Stk2 ->
+            [{?MODULE,stacktrace_2,0,_},
+             {?MODULE,stacktrace,1,_}|_] = Stk2,
+            Stk2 = erlang:get_stacktrace(),
+            ok
+    end,
+
+    try
+        stacktrace_3(a, b)
+    catch
+        error:function_clause:Stk3 ->
+            Stk3 = erlang:get_stacktrace(),
+            case lists:module_info(native) of
+                false ->
+                    [{lists,prefix,[a,b],_}|_] = Stk3;
+                true ->
+                    [{lists,prefix,2,_}|_] = Stk3
+            end
+    end,
+
+    try
+        throw(x)
+    catch
+        throw:x:IntentionallyUnused ->
+            ok
+    end.
+
+stacktrace_1(X, C1, Y) ->
+    try try foo(X) of
+            C1 -> value1
+        catch
+            C1:D1:Stk1 ->
+                Stk1 = erlang:get_stacktrace(),
+                {caught1,D1,Stk1}
+        after
+            foo(Y)
+        end of
+        V2 -> {value2,V2}
+    catch
+        C2:D2:Stk2 -> {caught2,{C2,D2},Stk2=erlang:get_stacktrace()}
+    end.
+
+stacktrace_2() ->
+    ok = erlang:process_info(self(), current_function),
+    ok.
+
+stacktrace_3(A, B) ->
+    {ok,lists:prefix(A, B)}.
+
+nested_stacktrace(_Config) ->
+    V = [{make_ref()}|[self()]],
+    value1 = nested_stacktrace_1({{value,{V,x1}},void,{V,x1}},
+                                 {void,void,void}),
+    case ?MODULE:module_info(native) of
+        false ->
+            {caught1,
+             [{erlang,'+',[V,x1],_},{?MODULE,my_add,2,_}|_],
+             value2} =
+                nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+                                    {{value,{V,x2}},void,{V,x2}}),
+            {caught1,
+             [{erlang,'+',[V,x1],_},{?MODULE,my_add,2,_}|_],
+             {caught2,[{erlang,abs,[V],_}|_]}} =
+                nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+                                    {{'abs',V},error,badarg});
+        true ->
+            {caught1,
+             [{?MODULE,my_add,2,_}|_],
+             value2} =
+                nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+                                    {{value,{V,x2}},void,{V,x2}}),
+            {caught1,
+             [{?MODULE,my_add,2,_}|_],
+             {caught2,[{?MODULE,my_abs,1,_}|_]}} =
+                nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+                                    {{'abs',V},error,badarg})
+    end,
+    ok.
+
+nested_stacktrace_1({X1,C1,V1}, {X2,C2,V2}) ->
+    try foo(X1) of
+        V1 -> value1
+    catch
+        C1:V1:S1 ->
+            S1 = erlang:get_stacktrace(),
+            T2 = try foo(X2) of
+                     V2 -> value2
+                 catch
+                     C2:V2:S2 ->
+                         S2 = erlang:get_stacktrace(),
+                         {caught2,S2}
+                 end,
+            {caught1,S1,T2}
+    end.
+
+raise(_Config) ->
+    test_raise(fun() -> exit({exit,tuple}) end),
+    test_raise(fun() -> abs(id(x)) end),
+    test_raise(fun() -> throw({was,thrown}) end),
+
+    badarg = bad_raise(fun() -> abs(id(x)) end),
+
+    ok.
+
+bad_raise(Expr) ->
+    try
+        Expr()
+    catch
+        _:E:Stk ->
+            erlang:raise(bad_class, E, Stk)
+    end.
+
+test_raise(Expr) ->
+    test_raise_1(Expr),
+    test_raise_2(Expr),
+    test_raise_3(Expr).
+
+test_raise_1(Expr) ->
+    erase(exception),
+    try
+        do_test_raise_1(Expr)
+    catch
+        C:E:Stk ->
+            {C,E,Stk} = erase(exception)
+    end.
+
+do_test_raise_1(Expr) ->
+    try
+        Expr()
+    catch
+        C:E:Stk ->
+            %% Here the stacktrace must be built.
+            put(exception, {C,E,Stk}),
+            erlang:raise(C, E, Stk)
+    end.
+
+test_raise_2(Expr) ->
+    erase(exception),
+    try
+        do_test_raise_2(Expr)
+    catch
+        C:E:Stk ->
+            {C,E} = erase(exception),
+            try
+                Expr()
+            catch
+                _:_:S ->
+                    [StkTop|_] = S,
+                    [StkTop|_] = Stk
+            end
+    end.
+
+do_test_raise_2(Expr) ->
+    try
+        Expr()
+    catch
+        C:E:Stk ->
+            %% Here it is possible to replace erlang:raise/3 with
+            %% the raw_raise/3 instruction since the stacktrace is
+            %% not actually used.
+            put(exception, {C,E}),
+            erlang:raise(C, E, Stk)
+    end.
+
+test_raise_3(Expr) ->
+    try
+        do_test_raise_3(Expr)
+    catch
+        exit:{exception,C,E}:Stk ->
+            try
+                Expr()
+            catch
+                C:E:S ->
+                    [StkTop|_] = S,
+                    [StkTop|_] = Stk
+            end
+    end.
+
+do_test_raise_3(Expr) ->
+    try
+        Expr()
+    catch
+        C:E:Stk ->
+            %% Here it is possible to replace erlang:raise/3 with
+            %% the raw_raise/3 instruction since the stacktrace is
+            %% not actually used.
+            erlang:raise(exit, {exception,C,E}, Stk)
+    end.
+
 
 id(I) -> I.
diff --git a/lib/compiler/test/z_SUITE.erl b/lib/compiler/test/z_SUITE.erl
index d864184f4c..cd95d0e733 100644
--- a/lib/compiler/test/z_SUITE.erl
+++ b/lib/compiler/test/z_SUITE.erl
@@ -54,8 +54,7 @@ do_loaded([{M,_}|Ms], E0) ->
 	    _ = M:module_info(functions),
 	    E0
 	catch
-	    C:Error ->
-		Stk = erlang:get_stacktrace(),
+	    C:Error:Stk ->
 		io:format("~p:~p\n~p\n", [C,Error,Stk]),
 		E0 + 1
 	end,
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index 435a57aac2..082786c7d8 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.1.3
+COMPILER_VSN = 7.1.4
diff --git a/lib/cosEvent/doc/src/notes.xml b/lib/cosEvent/doc/src/notes.xml
index fe94cb64d3..ba0b0d88db 100644
--- a/lib/cosEvent/doc/src/notes.xml
+++ b/lib/cosEvent/doc/src/notes.xml
@@ -33,7 +33,22 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosEvent 2.2.1</title>
+  <section><title>cosEvent 2.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>cosEvent 2.2.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosEvent/vsn.mk b/lib/cosEvent/vsn.mk
index c39bed9fe4..578950294a 100644
--- a/lib/cosEvent/vsn.mk
+++ b/lib/cosEvent/vsn.mk
@@ -1,2 +1,2 @@
-COSEVENT_VSN = 2.2.1
+COSEVENT_VSN = 2.2.2
 
diff --git a/lib/cosEventDomain/doc/src/notes.xml b/lib/cosEventDomain/doc/src/notes.xml
index 5e5bb2c33e..bd0a119ad2 100644
--- a/lib/cosEventDomain/doc/src/notes.xml
+++ b/lib/cosEventDomain/doc/src/notes.xml
@@ -32,7 +32,22 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosEventDomain 1.2.1</title>
+  <section><title>cosEventDomain 1.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>cosEventDomain 1.2.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosEventDomain/vsn.mk b/lib/cosEventDomain/vsn.mk
index 4e10d6ac60..0c063a00f9 100644
--- a/lib/cosEventDomain/vsn.mk
+++ b/lib/cosEventDomain/vsn.mk
@@ -1,2 +1,2 @@
-COSEVENTDOMAIN_VSN = 1.2.1
+COSEVENTDOMAIN_VSN = 1.2.2
 
diff --git a/lib/cosFileTransfer/doc/src/notes.xml b/lib/cosFileTransfer/doc/src/notes.xml
index 58ab087014..e0b4bdf64b 100644
--- a/lib/cosFileTransfer/doc/src/notes.xml
+++ b/lib/cosFileTransfer/doc/src/notes.xml
@@ -31,7 +31,22 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosFileTransfer 1.2.1</title>
+  <section><title>cosFileTransfer 1.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>cosFileTransfer 1.2.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosFileTransfer/vsn.mk b/lib/cosFileTransfer/vsn.mk
index e271c05242..561f11fbb2 100644
--- a/lib/cosFileTransfer/vsn.mk
+++ b/lib/cosFileTransfer/vsn.mk
@@ -1 +1 @@
-COSFILETRANSFER_VSN = 1.2.1
+COSFILETRANSFER_VSN = 1.2.2
diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml
index 1237000153..bf0fc73548 100644
--- a/lib/cosNotification/doc/src/notes.xml
+++ b/lib/cosNotification/doc/src/notes.xml
@@ -32,7 +32,22 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosNotification 1.2.2</title>
+  <section><title>cosNotification 1.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>cosNotification 1.2.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosNotification/vsn.mk b/lib/cosNotification/vsn.mk
index 0d95ab4853..1677057670 100644
--- a/lib/cosNotification/vsn.mk
+++ b/lib/cosNotification/vsn.mk
@@ -1,2 +1,2 @@
-COSNOTIFICATION_VSN = 1.2.2
+COSNOTIFICATION_VSN = 1.2.3
 
diff --git a/lib/cosProperty/doc/src/notes.xml b/lib/cosProperty/doc/src/notes.xml
index e5d22982c5..4de246de67 100644
--- a/lib/cosProperty/doc/src/notes.xml
+++ b/lib/cosProperty/doc/src/notes.xml
@@ -33,7 +33,22 @@
   </header>
 
 
-  <section><title>cosProperty 1.2.2</title>
+  <section><title>cosProperty 1.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>cosProperty 1.2.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosProperty/vsn.mk b/lib/cosProperty/vsn.mk
index 78ba88445d..a3a952346e 100644
--- a/lib/cosProperty/vsn.mk
+++ b/lib/cosProperty/vsn.mk
@@ -1,2 +1,2 @@
-COSPROPERTY_VSN = 1.2.2
+COSPROPERTY_VSN = 1.2.3
 
diff --git a/lib/cosTime/doc/src/notes.xml b/lib/cosTime/doc/src/notes.xml
index 686d9e6add..16e02f8b1f 100644
--- a/lib/cosTime/doc/src/notes.xml
+++ b/lib/cosTime/doc/src/notes.xml
@@ -33,7 +33,22 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosTime 1.2.2</title>
+  <section><title>cosTime 1.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>cosTime 1.2.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosTime/vsn.mk b/lib/cosTime/vsn.mk
index 7c9cae2d2f..7d6fcbebcd 100644
--- a/lib/cosTime/vsn.mk
+++ b/lib/cosTime/vsn.mk
@@ -1,2 +1,2 @@
-COSTIME_VSN = 1.2.2
+COSTIME_VSN = 1.2.3
 
diff --git a/lib/cosTransactions/doc/src/notes.xml b/lib/cosTransactions/doc/src/notes.xml
index 85ace1208b..2401c04c3f 100644
--- a/lib/cosTransactions/doc/src/notes.xml
+++ b/lib/cosTransactions/doc/src/notes.xml
@@ -33,7 +33,22 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosTransactions 1.3.2</title>
+  <section><title>cosTransactions 1.3.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>cosTransactions 1.3.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosTransactions/vsn.mk b/lib/cosTransactions/vsn.mk
index ab163d83c2..bba2058231 100644
--- a/lib/cosTransactions/vsn.mk
+++ b/lib/cosTransactions/vsn.mk
@@ -1 +1 @@
-COSTRANSACTIONS_VSN = 1.3.2
+COSTRANSACTIONS_VSN = 1.3.3
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index af7c209c75..31124ba477 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
+# Copyright Ericsson AB 1999-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.
@@ -78,12 +78,16 @@ CRYPTO_STATIC_OBJS = $(OBJDIR)/crypto_static$(TYPEMARKER).o\
 
 NIF_ARCHIVE = $(LIBDIR)/crypto$(TYPEMARKER).a
 
+TEST_ENGINE_OBJS = $(OBJDIR)/otp_test_engine$(TYPEMARKER).o
+
 ifeq ($(findstring win32,$(TARGET)), win32)
 NIF_LIB = $(LIBDIR)/crypto$(TYPEMARKER).dll
 CALLBACK_LIB = $(LIBDIR)/crypto_callback$(TYPEMARKER).dll
+TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).dll
 else
 NIF_LIB = $(LIBDIR)/crypto$(TYPEMARKER).so
 CALLBACK_LIB = $(LIBDIR)/crypto_callback$(TYPEMARKER).so
+TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).so
 endif
 
 ifeq ($(HOST_OS),)
@@ -129,10 +133,22 @@ ALL_STATIC_CFLAGS = $(DED_STATIC_CFLAGS) $(INCLUDES)
 
 _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
-debug opt valgrind: $(NIF_LIB) $(CALLBACK_LIB)
+debug opt valgrind: $(NIF_LIB) $(CALLBACK_LIB) $(TEST_ENGINE_LIB) 
 
 static_lib: $(NIF_ARCHIVE)
 
+$(OBJDIR)/otp_test_engine$(TYPEMARKER).o: otp_test_engine.c
+	$(V_at)$(INSTALL_DIR) $(OBJDIR)
+	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
+
+$(LIBDIR)/otp_test_engine$(TYPEMARKER).so: $(TEST_ENGINE_OBJS)
+	$(V_at)$(INSTALL_DIR) $(LIBDIR)
+	$(V_LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(CRYPTO_LINK_LIB)
+
+$(LIBDIR)/otp_test_engine$(TYPEMARKER).dll: $(TEST_ENGINE_OBJS)
+	$(V_at)$(INSTALL_DIR) $(LIBDIR)
+	$(V_LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(TEST_ENGINE_OBJS) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
+
 $(OBJDIR)/%$(TYPEMARKER).o: %.c
 	$(V_at)$(INSTALL_DIR) $(OBJDIR)
 	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
@@ -170,6 +186,7 @@ ifeq ($(findstring win32,$(TARGET)), win32)
 	rm -f $(LIBDIR)/crypto.debug.dll
 	rm -f $(LIBDIR)/crypto_callback.dll
 	rm -f $(LIBDIR)/crypto_callback.debug.dll
+	rm -f $(LIBDIR)/otp_test_engine.dll
 else
 	rm -f $(LIBDIR)/crypto.so
 	rm -f $(LIBDIR)/crypto.debug.so
@@ -177,6 +194,7 @@ else
 	rm -f $(LIBDIR)/crypto_callback.so
 	rm -f $(LIBDIR)/crypto_callback.debug.so
 	rm -f $(LIBDIR)/crypto_callback.valgrind.so
+	rm -f $(LIBDIR)/otp_test_engine.so
 endif
 	rm -f $(OBJDIR)/crypto.o
 	rm -f $(OBJDIR)/crypto_static.o
@@ -187,6 +205,7 @@ endif
 	rm -f $(OBJDIR)/crypto_callback.o
 	rm -f $(OBJDIR)/crypto_callback.debug.o
 	rm -f $(OBJDIR)/crypto_callback.valgrind.o
+	rm -f $(OBJDIR)/otp_test_engine.o
 	rm -f core *~
 
 docs:
@@ -206,6 +225,8 @@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
 	$(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
 endif
+	$(INSTALL_PROGRAM) $(TEST_ENGINE_OBJS) "$(RELSYSDIR)/priv/obj"
+	$(INSTALL_PROGRAM) $(TEST_ENGINE_LIB) "$(RELSYSDIR)/priv/lib"
 
 release_docs_spec:
 
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index c4e80e3153..149387bcee 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * %CopyrightBegin%
  *
  * Copyright Ericsson AB 2010-2017. All Rights Reserved.
@@ -19,8 +19,8 @@
  */
 
 /*
- * Purpose:  Dynamically loadable NIF library for cryptography. 
- * Based on OpenSSL. 
+ * Purpose:  Dynamically loadable NIF library for cryptography.
+ * Based on OpenSSL.
  */
 
 #ifdef __WIN32__
@@ -60,6 +60,8 @@
 #include <openssl/rand.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
+#include <openssl/engine.h>
+#include <openssl/err.h>
 
 /* Helper macro to construct a OPENSSL_VERSION_NUMBER.
  * See openssl/opensslv.h
@@ -79,9 +81,9 @@
  *
  * Therefor works tests like this as intendend:
  *     OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
- * (The test is for example "2.4.2" >= "1.0.0" although the test 
+ * (The test is for example "2.4.2" >= "1.0.0" although the test
  *  with the cloned OpenSSL test would be "1.0.1" >= "1.0.0")
- *     
+ *
  * But tests like this gives wrong result:
  *     OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
  * (The test is false since "2.4.2" < "1.1.0".  It should have been
@@ -119,6 +121,10 @@
 #include <openssl/modes.h>
 #endif
 
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'h')
+#define HAS_ENGINE_SUPPORT
+#endif
+
 #include "crypto_callback.h"
 
 #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(0,9,8)	\
@@ -173,6 +179,12 @@
 # define HAVE_ECB_IVEC_BUG
 #endif
 
+#define HAVE_RSA_SSLV23_PADDING
+#if defined(HAS_LIBRESSL)                                             \
+    && LIBRESSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(2,6,1)
+# undef HAVE_RSA_SSLV23_PADDING
+#endif
+
 #if defined(HAVE_CMAC)
 #include <openssl/cmac.h>
 #endif
@@ -240,7 +252,7 @@
 
 /* This shall correspond to the similar macro in crypto.erl */
 /* Current value is: erlang:system_info(context_reductions) * 10 */
-#define MAX_BYTES_TO_NIF 20000 
+#define MAX_BYTES_TO_NIF 20000
 
 #define CONSUME_REDS(NifEnv, Ibin)			\
 do {							\
@@ -342,6 +354,10 @@ static INLINE void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const
 
 static INLINE int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key);
 static INLINE int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g);
+static INLINE void DSA_get0_pqg(const DSA *dsa,
+			       const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
+static INLINE void DSA_get0_key(const DSA *dsa,
+			       const BIGNUM **pub_key, const BIGNUM **priv_key);
 
 static INLINE int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key)
 {
@@ -358,6 +374,23 @@ static INLINE int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g)
     return 1;
 }
 
+static INLINE void
+DSA_get0_pqg(const DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
+{
+    *p = dsa->p;
+    *q = dsa->q;
+    *g = dsa->g;
+}
+
+static INLINE void
+DSA_get0_key(const DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key)
+{
+    if (pub_key) *pub_key = dsa->pub_key;
+    if (priv_key) *priv_key = dsa->priv_key;
+}
+
+
+
 static INLINE int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key);
 static INLINE int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
 static INLINE int DH_set_length(DH *dh, long length);
@@ -387,6 +420,8 @@ static INLINE int DH_set_length(DH *dh, long length)
     return 1;
 }
 
+
+
 static INLINE void
 DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
 {
@@ -398,8 +433,8 @@ DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
 static INLINE void
 DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key)
 {
-    *pub_key = dh->pub_key;
-    *priv_key = dh->priv_key;
+    if (pub_key) *pub_key = dh->pub_key;
+    if (priv_key) *priv_key = dh->priv_key;
 }
 
 #else /* End of compatibility definitions. */
@@ -444,10 +479,9 @@ static ERL_NIF_TERM pkey_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
 static ERL_NIF_TERM pkey_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rsa_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM dh_generate_parameters_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM dh_check(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM dh_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM privkey_to_pubkey_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM srp_value_B_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM srp_user_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM srp_host_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -466,6 +500,22 @@ static ERL_NIF_TERM aes_gcm_decrypt_NO_EVP(ErlNifEnv* env, int argc, const ERL_N
 static ERL_NIF_TERM chacha20_poly1305_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM chacha20_poly1305_decrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 
+static int get_engine_load_cmd_list(ErlNifEnv* env, const ERL_NIF_TERM term, char **cmds, int i);
+static ERL_NIF_TERM engine_by_id_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_finish_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_free_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_load_dynamic_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_ctrl_cmd_strings_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_register_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_unregister_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_add_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_remove_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_get_first_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_get_next_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_get_id_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM engine_get_all_methods_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
 /* helpers */
 static void init_algorithms_types(ErlNifEnv*);
 static void init_digest_types(ErlNifEnv* env);
@@ -477,6 +527,10 @@ static int term2point(ErlNifEnv* env, ERL_NIF_TERM term,
 #endif
 static ERL_NIF_TERM bin_from_bn(ErlNifEnv* env, const BIGNUM *bn);
 
+#ifdef HAS_ENGINE_SUPPORT
+static int zero_terminate(ErlNifBinary bin, char **buf);
+#endif
+
 static int library_refc = 0; /* number of users of this dynamic library */
 
 static ErlNifFunc nif_funcs[] = {
@@ -512,10 +566,9 @@ static ErlNifFunc nif_funcs[] = {
     {"pkey_verify_nif", 6, pkey_verify_nif},
     {"pkey_crypt_nif", 6, pkey_crypt_nif},
     {"rsa_generate_key_nif", 2, rsa_generate_key_nif},
-    {"dh_generate_parameters_nif", 2, dh_generate_parameters_nif},
-    {"dh_check", 1, dh_check},
     {"dh_generate_key_nif", 4, dh_generate_key_nif},
     {"dh_compute_key_nif", 3, dh_compute_key_nif},
+    {"privkey_to_pubkey_nif", 2, privkey_to_pubkey_nif},
     {"srp_value_B_nif", 5, srp_value_B_nif},
     {"srp_user_secret_nif", 7, srp_user_secret_nif},
     {"srp_host_secret_nif", 5, srp_host_secret_nif},
@@ -529,12 +582,27 @@ static ErlNifFunc nif_funcs[] = {
     {"aes_gcm_decrypt", 5, aes_gcm_decrypt},
 
     {"chacha20_poly1305_encrypt", 4, chacha20_poly1305_encrypt},
-    {"chacha20_poly1305_decrypt", 5, chacha20_poly1305_decrypt}
+    {"chacha20_poly1305_decrypt", 5, chacha20_poly1305_decrypt},
+
+    {"engine_by_id_nif", 1, engine_by_id_nif},
+    {"engine_init_nif", 1, engine_init_nif},
+    {"engine_finish_nif", 1, engine_finish_nif},
+    {"engine_free_nif", 1, engine_free_nif},
+    {"engine_load_dynamic_nif", 0, engine_load_dynamic_nif},
+    {"engine_ctrl_cmd_strings_nif", 3, engine_ctrl_cmd_strings_nif},
+    {"engine_register_nif", 2, engine_register_nif},
+    {"engine_unregister_nif", 2, engine_unregister_nif},
+    {"engine_add_nif", 1, engine_add_nif},
+    {"engine_remove_nif", 1, engine_remove_nif},
+    {"engine_get_first_nif", 0, engine_get_first_nif},
+    {"engine_get_next_nif", 1, engine_get_next_nif},
+    {"engine_get_id_nif", 1, engine_get_id_nif},
+    {"engine_get_all_methods_nif", 0, engine_get_all_methods_nif}
+
 };
 
 ERL_NIF_INIT(crypto,nif_funcs,load,NULL,upgrade,unload)
 
-
 #define MD5_CTX_LEN       (sizeof(MD5_CTX))
 #define MD4_CTX_LEN       (sizeof(MD4_CTX))
 #define RIPEMD160_CTX_LEN (sizeof(RIPEMD160_CTX))
@@ -593,7 +661,9 @@ static ERL_NIF_TERM atom_rsa_oaep_md;
 static ERL_NIF_TERM atom_rsa_pad; /* backwards compatibility */
 static ERL_NIF_TERM atom_rsa_padding;
 static ERL_NIF_TERM atom_rsa_pkcs1_pss_padding;
+#ifdef HAVE_RSA_SSLV23_PADDING
 static ERL_NIF_TERM atom_rsa_sslv23_padding;
+#endif
 static ERL_NIF_TERM atom_rsa_x931_padding;
 static ERL_NIF_TERM atom_rsa_pss_saltlen;
 static ERL_NIF_TERM atom_sha224;
@@ -603,7 +673,33 @@ static ERL_NIF_TERM atom_sha512;
 static ERL_NIF_TERM atom_md5;
 static ERL_NIF_TERM atom_ripemd160;
 
-
+#ifdef HAS_ENGINE_SUPPORT
+static ERL_NIF_TERM atom_bad_engine_method;
+static ERL_NIF_TERM atom_bad_engine_id;
+static ERL_NIF_TERM atom_ctrl_cmd_failed;
+static ERL_NIF_TERM atom_engine_init_failed;
+static ERL_NIF_TERM atom_register_engine_failed;
+static ERL_NIF_TERM atom_add_engine_failed;
+static ERL_NIF_TERM atom_remove_engine_failed;
+static ERL_NIF_TERM atom_engine_method_not_supported;
+
+static ERL_NIF_TERM atom_engine_method_rsa;
+static ERL_NIF_TERM atom_engine_method_dsa;
+static ERL_NIF_TERM atom_engine_method_dh;
+static ERL_NIF_TERM atom_engine_method_rand;
+static ERL_NIF_TERM atom_engine_method_ecdh;
+static ERL_NIF_TERM atom_engine_method_ecdsa;
+static ERL_NIF_TERM atom_engine_method_ciphers;
+static ERL_NIF_TERM atom_engine_method_digests;
+static ERL_NIF_TERM atom_engine_method_store;
+static ERL_NIF_TERM atom_engine_method_pkey_meths;
+static ERL_NIF_TERM atom_engine_method_pkey_asn1_meths;
+static ERL_NIF_TERM atom_engine_method_ec;
+
+static ERL_NIF_TERM atom_engine;
+static ERL_NIF_TERM atom_key_id;
+static ERL_NIF_TERM atom_password;
+#endif
 
 static ErlNifResourceType* hmac_context_rtype;
 struct hmac_context
@@ -728,11 +824,13 @@ static struct cipher_type_t cipher_types[] =
 
 static struct cipher_type_t* get_cipher_type(ERL_NIF_TERM type, size_t key_len);
 
+
 /*
 #define PRINTF_ERR0(FMT) enif_fprintf(stderr, FMT "\n")
 #define PRINTF_ERR1(FMT, A1) enif_fprintf(stderr, FMT "\n", A1)
 #define PRINTF_ERR2(FMT, A1, A2) enif_fprintf(stderr, FMT "\n", A1, A2)
 */
+
 #define PRINTF_ERR0(FMT)
 #define PRINTF_ERR1(FMT,A1)
 #define PRINTF_ERR2(FMT,A1,A2)
@@ -758,6 +856,23 @@ static void evp_cipher_ctx_dtor(ErlNifEnv* env, struct evp_cipher_ctx* ctx) {
 }
 #endif
 
+// Engine
+#ifdef HAS_ENGINE_SUPPORT
+static ErlNifResourceType* engine_ctx_rtype;
+struct engine_ctx {
+    ENGINE *engine;
+    char *id;
+};
+static void engine_ctx_dtor(ErlNifEnv* env, struct engine_ctx* ctx) {
+    PRINTF_ERR0("engine_ctx_dtor");
+    if(ctx->id) {
+        PRINTF_ERR1("  non empty ctx->id=%s", ctx->id);
+        enif_free(ctx->id);
+    } else
+         PRINTF_ERR0("  empty ctx->id=NULL");
+}
+#endif
+
 static int verify_lib_version(void)
 {
     const unsigned long libv = SSLeay();
@@ -793,7 +908,7 @@ static char crypto_callback_name[] = "crypto_callback";
 static int change_basename(ErlNifBinary* bin, char* buf, int bufsz, const char* newfile)
 {
     int i;
-    
+
     for (i = bin->size; i > 0; i--) {
 	if (bin->data[i-1] == '/')
 	    break;
@@ -869,12 +984,23 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
         return __LINE__;
     }
 #endif
+#ifdef HAS_ENGINE_SUPPORT
+    engine_ctx_rtype = enif_open_resource_type(env, NULL, "ENGINE_CTX",
+                                                   (ErlNifResourceDtor*) engine_ctx_dtor,
+                                                   ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
+                                                   NULL);
+    if (!engine_ctx_rtype) {
+        PRINTF_ERR0("CRYPTO: Could not open resource type 'ENGINE_CTX'");
+        return __LINE__;
+    }
+
     if (library_refc > 0) {
 	/* Repeated loading of this library (module upgrade).
 	 * Atoms and callbacks are already set, we are done.
 	 */
 	return 0;
     }
+#endif 
 
     atom_true  = enif_make_atom(env,"true");
     atom_false = enif_make_atom(env,"false");
@@ -942,7 +1068,9 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
     atom_rsa_pad = enif_make_atom(env,"rsa_pad"); /* backwards compatibility */
     atom_rsa_padding = enif_make_atom(env,"rsa_padding");
     atom_rsa_pkcs1_pss_padding = enif_make_atom(env,"rsa_pkcs1_pss_padding");
+#ifdef HAVE_RSA_SSLV23_PADDING
     atom_rsa_sslv23_padding = enif_make_atom(env,"rsa_sslv23_padding");
+#endif
     atom_rsa_x931_padding = enif_make_atom(env,"rsa_x931_padding");
     atom_rsa_pss_saltlen = enif_make_atom(env,"rsa_pss_saltlen");
     atom_sha224 = enif_make_atom(env,"sha224");
@@ -952,6 +1080,33 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
     atom_md5 = enif_make_atom(env,"md5");
     atom_ripemd160 = enif_make_atom(env,"ripemd160");
 
+#ifdef HAS_ENGINE_SUPPORT
+    atom_bad_engine_method = enif_make_atom(env,"bad_engine_method");
+    atom_bad_engine_id = enif_make_atom(env,"bad_engine_id");
+    atom_ctrl_cmd_failed = enif_make_atom(env,"ctrl_cmd_failed");
+    atom_engine_init_failed = enif_make_atom(env,"engine_init_failed");
+    atom_engine_method_not_supported = enif_make_atom(env,"engine_method_not_supported");
+    atom_add_engine_failed = enif_make_atom(env,"add_engine_failed");
+    atom_remove_engine_failed = enif_make_atom(env,"remove_engine_failed");
+
+    atom_engine_method_rsa = enif_make_atom(env,"engine_method_rsa");
+    atom_engine_method_dsa = enif_make_atom(env,"engine_method_dsa");
+    atom_engine_method_dh = enif_make_atom(env,"engine_method_dh");
+    atom_engine_method_rand = enif_make_atom(env,"engine_method_rand");
+    atom_engine_method_ecdh = enif_make_atom(env,"engine_method_ecdh");
+    atom_engine_method_ecdsa = enif_make_atom(env,"engine_method_ecdsa");
+    atom_engine_method_store = enif_make_atom(env,"engine_method_store");
+    atom_engine_method_ciphers = enif_make_atom(env,"engine_method_ciphers");
+    atom_engine_method_digests = enif_make_atom(env,"engine_method_digests");
+    atom_engine_method_pkey_meths = enif_make_atom(env,"engine_method_pkey_meths");
+    atom_engine_method_pkey_asn1_meths = enif_make_atom(env,"engine_method_pkey_asn1_meths");
+    atom_engine_method_ec = enif_make_atom(env,"engine_method_ec");
+
+    atom_engine = enif_make_atom(env,"engine");
+    atom_key_id = enif_make_atom(env,"key_id");
+    atom_password = enif_make_atom(env,"password");
+#endif
+
     init_digest_types(env);
     init_cipher_types(env);
     init_algorithms_types(env);
@@ -973,24 +1128,24 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
 #else /* !HAVE_DYNAMIC_CRYPTO_LIB */
     funcp = &get_crypto_callbacks;
 #endif
-    
+
 #ifdef OPENSSL_THREADS
     enif_system_info(&sys_info, sizeof(sys_info));
     if (sys_info.scheduler_threads > 1) {
-	nlocks = CRYPTO_num_locks(); 
+	nlocks = CRYPTO_num_locks();
     }
     /* else no need for locks */
 #endif
-    
+
     ccb = (*funcp)(nlocks);
-    
+
     if (!ccb || ccb->sizeof_me != sizeof(*ccb)) {
 	PRINTF_ERR0("Invalid 'crypto_callbacks'");
 	return __LINE__;
     }
-    
+
     CRYPTO_set_mem_functions(ccb->crypto_alloc, ccb->crypto_realloc, ccb->crypto_free);
-    
+
 #ifdef OPENSSL_THREADS
     if (nlocks > 0) {
 	CRYPTO_set_locking_callback(ccb->locking_function);
@@ -1186,11 +1341,11 @@ static ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]
      * Version string is still from library though.
      */
 
-    memcpy(enif_make_new_binary(env, name_sz, &name_term), libname, name_sz);    
+    memcpy(enif_make_new_binary(env, name_sz, &name_term), libname, name_sz);
     memcpy(enif_make_new_binary(env, ver_sz, &ver_term), ver, ver_sz);
 
     return enif_make_list1(env, enif_make_tuple3(env, name_term,
-						 enif_make_int(env, ver_num),						 
+						 enif_make_int(env, ver_num),
 						 ver_term));
 }
 
@@ -1225,6 +1380,8 @@ static ERL_NIF_TERM enable_fips_mode(ErlNifEnv* env, int argc, const ERL_NIF_TER
     }
 }
 
+
+#if defined(HAVE_EC)
 static ERL_NIF_TERM make_badarg_maybe(ErlNifEnv* env)
 {
     ERL_NIF_TERM reason;
@@ -1233,6 +1390,7 @@ static ERL_NIF_TERM make_badarg_maybe(ErlNifEnv* env)
     else
 	return enif_make_badarg(env);
 }
+#endif
 
 static ERL_NIF_TERM hash_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Type, Data) */
@@ -1668,7 +1826,7 @@ static ERL_NIF_TERM hmac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 {/* (Context, Data) */
     ErlNifBinary data;
     struct hmac_context* obj;
-    
+
     if (!enif_get_resource(env, argv[0], hmac_context_rtype, (void**)&obj)
 	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)) {
 	return enif_make_badarg(env);
@@ -1704,13 +1862,13 @@ static ERL_NIF_TERM hmac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 	enif_mutex_unlock(obj->mtx);
 	return enif_make_badarg(env);
     }
-    
+
     HMAC_Final(obj->ctx, mac_buf, &mac_len);
     HMAC_CTX_free(obj->ctx);
     obj->alive = 0;
     enif_mutex_unlock(obj->mtx);
 
-    if (argc == 2 && req_len < mac_len) { 
+    if (argc == 2 && req_len < mac_len) {
         /* Only truncate to req_len bytes if asked. */
         mac_len = req_len;
     }
@@ -2021,7 +2179,7 @@ static ERL_NIF_TERM aes_ctr_stream_init(ErlNifEnv* env, int argc, const ERL_NIF_
 }
 
 static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* ({Key, IVec, ECount, Num}, Data) */    
+{/* ({Key, IVec, ECount, Num}, Data) */
     ErlNifBinary key_bin, ivec_bin, text_bin, ecount_bin;
     AES_KEY aes_key;
     unsigned int num;
@@ -2042,14 +2200,14 @@ static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_N
         return enif_make_badarg(env);
     }
 
-    ivec2_buf = enif_make_new_binary(env, ivec_bin.size, &ivec2_term); 
+    ivec2_buf = enif_make_new_binary(env, ivec_bin.size, &ivec2_term);
     ecount2_buf = enif_make_new_binary(env, ecount_bin.size, &ecount2_term);
-    
+
     memcpy(ivec2_buf, ivec_bin.data, 16);
     memcpy(ecount2_buf, ecount_bin.data, ecount_bin.size);
 
     AES_ctr128_encrypt((unsigned char *) text_bin.data,
-		       enif_make_new_binary(env, text_bin.size, &cipher_term), 
+		       enif_make_new_binary(env, text_bin.size, &cipher_term),
 		       text_bin.size, &aes_key, ivec2_buf, ecount2_buf, &num);
 
     num2_term = enif_make_uint(env, num);
@@ -2352,7 +2510,7 @@ out_err:
 }
 
 static ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Bytes) */     
+{/* (Bytes) */
     unsigned bytes;
     unsigned char* data;
     ERL_NIF_TERM ret;
@@ -2446,7 +2604,7 @@ static ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER
 
     bn_to = BN_new();
     BN_sub(bn_to, bn_rand, bn_from);
-    BN_pseudo_rand_range(bn_rand, bn_to);      
+    BN_pseudo_rand_range(bn_rand, bn_to);
     BN_add(bn_rand, bn_rand, bn_from);
     dlen = BN_num_bytes(bn_rand);
     data = enif_make_new_binary(env, dlen+4, &ret);
@@ -2464,7 +2622,7 @@ static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
     BIGNUM *bn_base=NULL, *bn_exponent=NULL, *bn_modulo=NULL, *bn_result;
     BN_CTX *bn_ctx;
     unsigned char* ptr;
-    unsigned dlen;      
+    unsigned dlen;
     unsigned bin_hdr; /* return type: 0=plain binary, 4: mpint */
     unsigned extra_byte;
     ERL_NIF_TERM ret;
@@ -2485,7 +2643,7 @@ static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
     dlen = BN_num_bytes(bn_result);
     extra_byte = bin_hdr && BN_is_bit_set(bn_result, dlen*8-1);
     ptr = enif_make_new_binary(env, bin_hdr+extra_byte+dlen, &ret);
-    if (bin_hdr) {	
+    if (bin_hdr) {
 	put_int32(ptr, extra_byte+dlen);
 	ptr[4] = 0; /* extra zeroed byte to ensure a positive mpint */
 	ptr += bin_hdr + extra_byte;
@@ -2545,6 +2703,7 @@ static struct cipher_type_t* get_cipher_type(ERL_NIF_TERM type, size_t key_len)
     return NULL;
 }
 
+
 static ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Data1, Data2) */
     ErlNifBinary d1, d2;
@@ -2578,7 +2737,7 @@ static ERL_NIF_TERM rc4_set_key(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
 	return enif_make_badarg(env);
     }
     RC4_set_key((RC4_KEY*)enif_make_new_binary(env, sizeof(RC4_KEY), &ret),
-		key.size, key.data);        
+		key.size, key.data);
     return ret;
 #else
     return enif_raise_exception(env, atom_notsup);
@@ -2843,70 +3002,6 @@ static ERL_NIF_TERM rsa_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF
 			     rsa_generate_key, argc, argv);
 }
 
-static ERL_NIF_TERM dh_generate_parameters_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (PrimeLen, Generator) */
-    int prime_len, generator;
-    DH* dh_params = NULL;
-    int p_len, g_len;
-    unsigned char *p_ptr, *g_ptr;
-    ERL_NIF_TERM ret_p, ret_g;
-    const BIGNUM *dh_p, *dh_q, *dh_g;
-
-    if (!enif_get_int(env, argv[0], &prime_len)
-	|| !enif_get_int(env, argv[1], &generator)) {
-
-	return enif_make_badarg(env);
-    }
-
-    if (DH_generate_parameters_ex(dh_params, prime_len, generator, NULL)) {
-	return atom_error;
-    }
-    DH_get0_pqg(dh_params, &dh_p, &dh_q, &dh_g);
-    DH_free(dh_params);
-    p_len = BN_num_bytes(dh_p);
-    g_len = BN_num_bytes(dh_g);
-    p_ptr = enif_make_new_binary(env, p_len, &ret_p);
-    g_ptr = enif_make_new_binary(env, g_len, &ret_g);
-    BN_bn2bin(dh_p, p_ptr);
-    BN_bn2bin(dh_g, g_ptr);
-    ERL_VALGRIND_MAKE_MEM_DEFINED(p_ptr, p_len);
-    ERL_VALGRIND_MAKE_MEM_DEFINED(g_ptr, g_len);
-    return enif_make_list2(env, ret_p, ret_g);    
-}
-
-static ERL_NIF_TERM dh_check(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* ([PrimeLen, Generator]) */
-    DH* dh_params;
-    int i;
-    ERL_NIF_TERM ret, head, tail;
-    BIGNUM *dh_p, *dh_g;
-
-    if (!enif_get_list_cell(env, argv[0], &head, &tail)   
-	|| !get_bn_from_bin(env, head, &dh_p)
-	|| !enif_get_list_cell(env, tail, &head, &tail)   
-	|| !get_bn_from_bin(env, head, &dh_g)
-	|| !enif_is_empty_list(env,tail)) {
-
-	return enif_make_badarg(env);
-    }
-
-    dh_params = DH_new();
-    DH_set0_pqg(dh_params, dh_p, NULL, dh_g);
-    if (DH_check(dh_params, &i)) {
-	if (i == 0) ret = atom_ok;
-	else if (i & DH_CHECK_P_NOT_PRIME) ret = atom_not_prime;
-	else if (i & DH_CHECK_P_NOT_SAFE_PRIME)	ret = atom_not_strong_prime;
-	else if (i & DH_UNABLE_TO_CHECK_GENERATOR) ret = atom_unable_to_check_generator;
-	else if (i & DH_NOT_SUITABLE_GENERATOR)	ret = atom_not_suitable_generator;
-	else ret = enif_make_tuple2(env, atom_unknown, enif_make_uint(env, i));
-    }
-    else { /* Check Failed */       
-	ret = enif_make_tuple2(env, atom_error, atom_check_failed);
-    }
-    DH_free(dh_params);
-    return ret;
-}   
-
 static ERL_NIF_TERM dh_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (PrivKey|undefined, DHParams=[P,G], Mpint, Len|0) */
     DH* dh_params;
@@ -3007,7 +3102,7 @@ static ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_T
 	i = DH_compute_key(ret_bin.data, other_pub_key, dh_params);
 	if (i > 0) {
 	    if (i != ret_bin.size) {
-		enif_realloc_binary(&ret_bin, i); 
+		enif_realloc_binary(&ret_bin, i);
 	    }
 	    ret = enif_make_binary(env, &ret_bin);
 	}
@@ -3803,9 +3898,69 @@ static int get_pkey_sign_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF
 }
 
 
+#ifdef HAS_ENGINE_SUPPORT
+static int get_engine_and_key_id(ErlNifEnv *env, ERL_NIF_TERM key, char ** id, ENGINE **e)
+{
+    ERL_NIF_TERM engine_res, key_id_term;
+    struct engine_ctx *ctx;
+    ErlNifBinary key_id_bin;
+
+    if (!enif_get_map_value(env, key, atom_engine, &engine_res) ||
+        !enif_get_resource(env, engine_res, engine_ctx_rtype, (void**)&ctx) ||
+        !enif_get_map_value(env, key, atom_key_id, &key_id_term) ||
+        !enif_inspect_binary(env, key_id_term, &key_id_bin)) {
+        return 0;
+    }
+    else {
+        *e = ctx->engine;
+        return zero_terminate(key_id_bin, id);
+    }
+}
+
+
+static char *get_key_password(ErlNifEnv *env, ERL_NIF_TERM key) {
+    ERL_NIF_TERM tmp_term;
+    ErlNifBinary pwd_bin;
+    char *pwd;
+    if (enif_get_map_value(env, key, atom_password, &tmp_term) &&
+        enif_inspect_binary(env, tmp_term, &pwd_bin) &&
+        zero_terminate(pwd_bin, &pwd)
+        ) return pwd;
+
+    return NULL;
+}
+
+static int zero_terminate(ErlNifBinary bin, char **buf) {
+    *buf = enif_alloc(bin.size+1);
+    if (!*buf)
+        return 0;
+    memcpy(*buf, bin.data, bin.size);
+    *(*buf+bin.size) = 0;
+    return 1;
+}
+#endif
+
 static int get_pkey_private_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM key, EVP_PKEY **pkey)
 {
-    if (algorithm == atom_rsa) {
+    if (enif_is_map(env, key)) {
+#ifdef HAS_ENGINE_SUPPORT
+        /* Use key stored in engine */
+        ENGINE *e;
+        char *id;
+        char *password;
+
+        if (!get_engine_and_key_id(env, key, &id, &e))
+            return PKEY_BADARG;
+        password = get_key_password(env, key);
+        *pkey = ENGINE_load_private_key(e, id, NULL, password);
+        if (!*pkey)
+            return PKEY_BADARG;
+        enif_free(id);
+#else
+        return PKEY_BADARG;
+#endif
+    }
+    else if (algorithm == atom_rsa) {
 	RSA *rsa = RSA_new();
 
 	if (!get_rsa_private_key(env, key, rsa)) {
@@ -3866,7 +4021,24 @@ static int get_pkey_private_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_
 static int get_pkey_public_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM key,
 			       EVP_PKEY **pkey)
 {
-    if (algorithm == atom_rsa) {
+    if (enif_is_map(env, key)) {
+#ifdef HAS_ENGINE_SUPPORT
+        /* Use key stored in engine */
+        ENGINE *e;
+        char *id;
+        char *password;
+
+        if (!get_engine_and_key_id(env, key, &id, &e))
+            return PKEY_BADARG;
+        password = get_key_password(env, key);
+        *pkey = ENGINE_load_public_key(e, id, NULL, password);
+        if (!pkey)
+            return PKEY_BADARG;
+        enif_free(id);
+#else
+        return PKEY_BADARG;
+#endif
+    } else  if (algorithm == atom_rsa) {
 	RSA *rsa = RSA_new();
 
 	if (!get_rsa_public_key(env, key, rsa)) {
@@ -3924,7 +4096,7 @@ static int get_pkey_public_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_T
 }
 
 static ERL_NIF_TERM pkey_sign_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
-{/* (Algorithm, Type, Data|{digest,Digest}, Key, Options) */
+{/* (Algorithm, Type, Data|{digest,Digest}, Key|#{}, Options) */
     int i;
     const EVP_MD *md = NULL;
     unsigned char md_value[EVP_MAX_MD_SIZE];
@@ -3944,6 +4116,13 @@ enif_get_atom(env,argv[0],buf,1024,ERL_NIF_LATIN1); printf("algo=%s ",buf);
 enif_get_atom(env,argv[1],buf,1024,ERL_NIF_LATIN1); printf("hash=%s ",buf);
 printf("\r\n");
 */
+
+#ifndef HAS_ENGINE_SUPPORT
+    if (enif_is_map(env, argv[3])) {
+        return atom_notsup;
+    }
+#endif
+
     i = get_pkey_sign_digest(env, argv[0], argv[1], argv[2], md_value, &md, &tbs, &tbslen);
     if (i != PKEY_OK) {
 	if (i == PKEY_NOTSUP)
@@ -3965,10 +4144,9 @@ printf("\r\n");
     }
 
 #ifdef HAS_EVP_PKEY_CTX
-/* printf("EVP interface\r\n"); 
- */
     ctx = EVP_PKEY_CTX_new(pkey, NULL);
     if (!ctx) goto badarg;
+
     if (EVP_PKEY_sign_init(ctx) <= 0) goto badarg;
     if (md != NULL && EVP_PKEY_CTX_set_signature_md(ctx, md) <= 0) goto badarg;
 
@@ -4070,6 +4248,12 @@ static ERL_NIF_TERM pkey_verify_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
     unsigned char *tbs; /* data to be signed */
     size_t tbslen;
 
+#ifndef HAS_ENGINE_SUPPORT
+    if (enif_is_map(env, argv[4])) {
+        return atom_notsup;
+    }
+#endif
+
     if (!enif_inspect_binary(env, argv[3], &sig_bin)) {
 	return enif_make_badarg(env);
     }
@@ -4095,7 +4279,7 @@ static ERL_NIF_TERM pkey_verify_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
     }
 
 #ifdef HAS_EVP_PKEY_CTX
-/* printf("EVP interface\r\n"); 
+/* printf("EVP interface\r\n");
  */
     ctx = EVP_PKEY_CTX_new(pkey, NULL);
     if (!ctx) goto badarg;
@@ -4207,8 +4391,10 @@ static int get_pkey_crypt_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NI
 			opt->rsa_padding = RSA_PKCS1_PADDING;
 		    } else if (tpl_terms[1] == atom_rsa_pkcs1_oaep_padding) {
 			opt->rsa_padding = RSA_PKCS1_OAEP_PADDING;
+#ifdef HAVE_RSA_SSLV23_PADDING
 		    } else if (tpl_terms[1] == atom_rsa_sslv23_padding) {
 			opt->rsa_padding = RSA_SSLV23_PADDING;
+#endif
 		    } else if (tpl_terms[1] == atom_rsa_x931_padding) {
 			opt->rsa_padding = RSA_X931_PADDING;
 		    } else if (tpl_terms[1] == atom_rsa_no_padding) {
@@ -4274,13 +4460,22 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 #endif
     PKeyCryptOptions crypt_opt;
     ErlNifBinary in_bin, out_bin, tmp_bin;
-    size_t outlen, tmplen;
+    size_t outlen;
+#ifdef HAVE_RSA_SSLV23_PADDING
+    size_t tmplen;
+#endif
     int is_private = (argv[4] == atom_true),
         is_encrypt = (argv[5] == atom_true);
     int algo_init = 0;
 
 /* char algo[1024]; */
-   
+
+#ifndef HAS_ENGINE_SUPPORT
+    if (enif_is_map(env, argv[2])) {
+        return atom_notsup;
+    }
+#endif
+
     if (!enif_inspect_binary(env, argv[1], &in_bin)) {
 	return enif_make_badarg(env);
     }
@@ -4348,6 +4543,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 	if (crypt_opt.signature_md != NULL
 	    && EVP_PKEY_CTX_set_signature_md(ctx, crypt_opt.signature_md) <= 0)
 		goto badarg;
+#ifdef HAVE_RSA_SSLV23_PADDING
 	if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
 	    if (is_encrypt) {
 		RSA *rsa = EVP_PKEY_get1_RSA(pkey);
@@ -4359,9 +4555,11 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 		in_bin = tmp_bin;
 	    }
 	    if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_NO_PADDING) <= 0) goto badarg;
-	} else {
+	} else
+#endif
+                {
 	    if (EVP_PKEY_CTX_set_rsa_padding(ctx, crypt_opt.rsa_padding) <= 0) goto badarg;
-	}
+        }
 #ifdef HAVE_RSA_OAEP_MD
 	if (crypt_opt.rsa_padding == RSA_PKCS1_OAEP_PADDING) {
 	    if (crypt_opt.rsa_oaep_md != NULL
@@ -4409,7 +4607,6 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 
     enif_alloc_binary(outlen, &out_bin);
 
-    ERL_VALGRIND_ASSERT_MEM_DEFINED(out_bin.data, out_bin.size);
     if (is_private) {
 	if (is_encrypt) {
 	    /* private_encrypt */
@@ -4481,6 +4678,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 #endif
 
     if ((i > 0) && argv[0] == atom_rsa && !is_encrypt) {
+#ifdef HAVE_RSA_SSLV23_PADDING
 	if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
 	    RSA *rsa = EVP_PKEY_get1_RSA(pkey);
 	    unsigned char *p;
@@ -4498,6 +4696,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 		i = 1;
 	    }
 	}
+#endif
     }
 
     if (tmp_bin.data != NULL) {
@@ -4542,6 +4741,80 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 
 
 /*--------------------------------*/
+static ERL_NIF_TERM privkey_to_pubkey_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{ /* (Algorithm, PrivKey | KeyMap) */
+    EVP_PKEY *pkey;
+    ERL_NIF_TERM alg = argv[0];
+    ERL_NIF_TERM result[8];
+    if (get_pkey_private_key(env, alg, argv[1], &pkey) != PKEY_OK) {
+	return enif_make_badarg(env);
+    }
+
+    if (alg == atom_rsa) {
+        const BIGNUM *n = NULL, *e = NULL, *d = NULL;
+        RSA *rsa = EVP_PKEY_get1_RSA(pkey);
+        if (rsa) {
+            RSA_get0_key(rsa, &n, &e, &d);
+            result[0] = bin_from_bn(env, e);  // Exponent E
+            result[1] = bin_from_bn(env, n);  // Modulus N = p*q
+            EVP_PKEY_free(pkey);
+            return enif_make_list_from_array(env, result, 2);
+        }
+
+    } else if (argv[0] == atom_dss) {
+        const BIGNUM *p = NULL, *q = NULL, *g = NULL, *pub_key = NULL;
+        DSA *dsa = EVP_PKEY_get1_DSA(pkey);
+        if (dsa) {
+            DSA_get0_pqg(dsa, &p, &q, &g);
+            DSA_get0_key(dsa, &pub_key, NULL);
+            result[0] = bin_from_bn(env, p);
+            result[1] = bin_from_bn(env, q);
+            result[2] = bin_from_bn(env, g);
+            result[3] = bin_from_bn(env, pub_key);
+            EVP_PKEY_free(pkey);
+            return enif_make_list_from_array(env, result, 4);
+        }
+
+    } else if (argv[0] == atom_ecdsa) {
+#if defined(HAVE_EC)
+        /* not yet implemented
+          EC_KEY *ec = EVP_PKEY_get1_EC_KEY(pkey);
+          if (ec) {
+          / * Example of result:
+               {
+                 Curve =  {Field, Prime, Point, Order, CoFactor} =
+                    { 
+                      Field =  {prime_field,<<255,...,255>>},
+                      Prime = {<<255,...,252>>,
+                               <<90,...,75>>,
+                               <<196,...,144>>
+                              },
+                      Point =    <<4,...,245>>,
+                      Order =    <<255,...,81>>,
+                      CoFactor = <<1>>
+                    },
+                Key = <<151,...,62>>
+                }
+              or
+              { 
+                Curve =
+                    {characteristic_two_field, 
+                     M,
+                     Basis = {tpbasis, _}
+                           | {ppbasis, k1, k2, k3}
+                    },
+                Key
+               }
+        * /
+            EVP_PKEY_free(pkey);
+            return enif_make_list_from_array(env, ..., ...);
+        */
+#endif
+    }
+    
+    if (pkey) EVP_PKEY_free(pkey);
+    return enif_make_badarg(env);
+}
 
 /*================================================================*/
 
@@ -4554,3 +4827,600 @@ static ERL_NIF_TERM rand_seed_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
     RAND_seed(seed_bin.data,seed_bin.size);
     return atom_ok;
 }
+
+/*================================================================*/
+/* Engine */
+/*================================================================*/
+static ERL_NIF_TERM engine_by_id_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (EngineId) */
+#ifdef HAS_ENGINE_SUPPORT
+    ERL_NIF_TERM ret;
+    ErlNifBinary engine_id_bin;
+    char *engine_id;
+    ENGINE *engine;
+    struct engine_ctx *ctx;
+
+    // Get Engine Id
+    if(!enif_inspect_binary(env, argv[0], &engine_id_bin)) {
+        PRINTF_ERR0("engine_by_id_nif Leaved: badarg");
+        return enif_make_badarg(env);
+    } else {
+        engine_id = enif_alloc(engine_id_bin.size+1);
+        (void) memcpy(engine_id, engine_id_bin.data, engine_id_bin.size);
+        engine_id[engine_id_bin.size] = '\0';
+    }
+
+    engine = ENGINE_by_id(engine_id);
+    if(!engine) {
+        enif_free(engine_id);
+        PRINTF_ERR0("engine_by_id_nif Leaved: {error, bad_engine_id}");
+        return enif_make_tuple2(env, atom_error, atom_bad_engine_id);
+    }
+
+    ctx = enif_alloc_resource(engine_ctx_rtype, sizeof(struct engine_ctx));
+    ctx->engine = engine;
+    ctx->id = engine_id;
+
+    ret = enif_make_resource(env, ctx);
+    enif_release_resource(ctx);
+
+    return enif_make_tuple2(env, atom_ok, ret);
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine) */
+#ifdef HAS_ENGINE_SUPPORT
+    ERL_NIF_TERM ret = atom_ok;
+    struct engine_ctx *ctx;
+
+    // Get Engine
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx)) {
+        PRINTF_ERR0("engine_init_nif Leaved: Parameter not an engine resource object");
+        return enif_make_badarg(env);
+    }
+    if (!ENGINE_init(ctx->engine)) {
+        //ERR_print_errors_fp(stderr);
+        PRINTF_ERR0("engine_init_nif Leaved: {error, engine_init_failed}");
+        return enif_make_tuple2(env, atom_error, atom_engine_init_failed);
+    }
+
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_free_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine) */
+#ifdef HAS_ENGINE_SUPPORT
+    struct engine_ctx *ctx;
+
+    // Get Engine
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx)) {
+        PRINTF_ERR0("engine_free_nif Leaved: Parameter not an engine resource object");
+        return enif_make_badarg(env);
+    }
+
+    ENGINE_free(ctx->engine);
+    return atom_ok;
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_finish_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine) */
+#ifdef HAS_ENGINE_SUPPORT
+    struct engine_ctx *ctx;
+
+    // Get Engine
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx)) {
+        PRINTF_ERR0("engine_finish_nif Leaved: Parameter not an engine resource object");
+        return enif_make_badarg(env);
+    }
+
+    ENGINE_finish(ctx->engine);
+    return atom_ok;
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_load_dynamic_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* () */
+#ifdef HAS_ENGINE_SUPPORT
+    ENGINE_load_dynamic();
+    return atom_ok;
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_ctrl_cmd_strings_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine, Commands) */
+#ifdef HAS_ENGINE_SUPPORT
+    ERL_NIF_TERM ret = atom_ok;
+    unsigned int cmds_len = 0;
+    char **cmds = NULL;
+    struct engine_ctx *ctx;
+    int i, optional = 0;
+
+    // Get Engine
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx)) {
+        PRINTF_ERR0("engine_ctrl_cmd_strings_nif Leaved: Parameter not an engine resource object");
+        return enif_make_badarg(env);
+    }
+
+    PRINTF_ERR1("Engine Id:  %s\r\n", ENGINE_get_id(ctx->engine));
+
+    // Get Command List
+    if(!enif_get_list_length(env, argv[1], &cmds_len)) {
+        PRINTF_ERR0("engine_ctrl_cmd_strings_nif Leaved: Bad Command List");
+        return enif_make_badarg(env);
+    } else {
+        cmds_len *= 2; // Key-Value list from erlang
+        cmds = enif_alloc((cmds_len+1)*sizeof(char*));
+        if(get_engine_load_cmd_list(env, argv[1], cmds, 0)) {
+            PRINTF_ERR0("engine_ctrl_cmd_strings_nif Leaved: Couldn't read Command List");
+            ret = enif_make_badarg(env);
+            goto error;
+        }
+    }
+
+    if(!enif_get_int(env, argv[2], &optional)) {
+        PRINTF_ERR0("engine_ctrl_cmd_strings_nif Leaved: Parameter optional not an integer");
+        return enif_make_badarg(env);
+    }
+
+    for(i = 0; i < cmds_len; i+=2) {
+        PRINTF_ERR2("Cmd:  %s:%s\r\n",
+                   cmds[i] ? cmds[i] : "(NULL)",
+                   cmds[i+1] ? cmds[i+1] : "(NULL)");
+        if(!ENGINE_ctrl_cmd_string(ctx->engine, cmds[i], cmds[i+1], optional)) {
+            PRINTF_ERR2("Command failed:  %s:%s\r\n",
+                        cmds[i] ? cmds[i] : "(NULL)",
+                        cmds[i+1] ? cmds[i+1] : "(NULL)");
+            //ENGINE_free(ctx->engine);
+            ret = enif_make_tuple2(env, atom_error, atom_ctrl_cmd_failed);
+            PRINTF_ERR0("engine_ctrl_cmd_strings_nif Leaved: {error, ctrl_cmd_failed}");
+            goto error;
+        }
+    }
+
+ error:
+    for(i = 0; cmds != NULL && cmds[i] != NULL; i++)
+        enif_free(cmds[i]);    
+    enif_free(cmds);
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_add_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine) */
+#ifdef HAS_ENGINE_SUPPORT
+    struct engine_ctx *ctx;
+
+    // Get Engine
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx)) {
+        PRINTF_ERR0("engine_add_nif Leaved: Parameter not an engine resource object");
+        return enif_make_badarg(env);
+    }
+
+    if (!ENGINE_add(ctx->engine)) {
+        PRINTF_ERR0("engine_add_nif Leaved: {error, add_engine_failed}");
+        return enif_make_tuple2(env, atom_error, atom_add_engine_failed);
+    }
+    return atom_ok;
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_remove_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine) */
+#ifdef HAS_ENGINE_SUPPORT
+    struct engine_ctx *ctx;
+
+    // Get Engine
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx)) {
+        PRINTF_ERR0("engine_remove_nif Leaved: Parameter not an engine resource object");
+        return enif_make_badarg(env);
+    }
+
+    if (!ENGINE_remove(ctx->engine)) {
+        PRINTF_ERR0("engine_remove_nif Leaved: {error, remove_engine_failed}");
+        return enif_make_tuple2(env, atom_error, atom_remove_engine_failed);
+    }
+    return atom_ok;
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_register_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine, EngineMethod) */
+#ifdef HAS_ENGINE_SUPPORT
+    struct engine_ctx *ctx;
+    unsigned int method;
+
+    // Get Engine
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx)) {
+        PRINTF_ERR0("engine_register_nif Leaved: Parameter not an engine resource object");
+        return enif_make_badarg(env);
+    }
+    // Get Method
+    if (!enif_get_uint(env, argv[1], &method)) {
+        PRINTF_ERR0("engine_register_nif Leaved: Parameter Method not an uint");
+        return enif_make_badarg(env);
+    }
+
+    switch(method)
+    {
+#ifdef ENGINE_METHOD_RSA
+    case ENGINE_METHOD_RSA:
+        if (!ENGINE_register_RSA(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+#ifdef ENGINE_METHOD_DSA
+    case ENGINE_METHOD_DSA:
+        if (!ENGINE_register_DSA(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+#ifdef ENGINE_METHOD_DH
+    case ENGINE_METHOD_DH:
+        if (!ENGINE_register_DH(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+#ifdef ENGINE_METHOD_RAND
+    case ENGINE_METHOD_RAND:
+        if (!ENGINE_register_RAND(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+#ifdef ENGINE_METHOD_ECDH
+    case ENGINE_METHOD_ECDH:
+        if (!ENGINE_register_ECDH(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+#ifdef ENGINE_METHOD_ECDSA
+    case ENGINE_METHOD_ECDSA:
+        if (!ENGINE_register_ECDSA(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+#ifdef ENGINE_METHOD_STORE
+    case ENGINE_METHOD_STORE:
+        if (!ENGINE_register_STORE(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+#ifdef ENGINE_METHOD_CIPHERS
+    case ENGINE_METHOD_CIPHERS:
+        if (!ENGINE_register_ciphers(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+#ifdef ENGINE_METHOD_DIGESTS
+    case ENGINE_METHOD_DIGESTS:
+        if (!ENGINE_register_digests(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+#ifdef ENGINE_METHOD_PKEY_METHS
+    case ENGINE_METHOD_PKEY_METHS:
+        if (!ENGINE_register_pkey_meths(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+#ifdef ENGINE_METHOD_PKEY_ASN1_METHS
+    case ENGINE_METHOD_PKEY_ASN1_METHS:
+        if (!ENGINE_register_pkey_asn1_meths(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+#ifdef ENGINE_METHOD_EC
+    case ENGINE_METHOD_EC:
+        if (!ENGINE_register_EC(ctx->engine))
+            return enif_make_tuple2(env, atom_error, atom_register_engine_failed);
+        break;
+#endif
+    default:
+        return  enif_make_tuple2(env, atom_error, atom_engine_method_not_supported);
+        break;
+    }
+    return atom_ok;
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_unregister_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine, EngineMethod) */
+#ifdef HAS_ENGINE_SUPPORT
+    struct engine_ctx *ctx;
+    unsigned int method;
+
+    // Get Engine
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx)) {
+        PRINTF_ERR0("engine_unregister_nif Leaved: Parameter not an engine resource object");
+        return enif_make_badarg(env);
+    }
+    // Get Method
+    if (!enif_get_uint(env, argv[1], &method)) {
+        PRINTF_ERR0("engine_unregister_nif Leaved: Parameter Method not an uint");
+        return enif_make_badarg(env);
+    }
+
+    switch(method)
+    {
+#ifdef ENGINE_METHOD_RSA
+    case ENGINE_METHOD_RSA:
+        ENGINE_unregister_RSA(ctx->engine);
+        break;
+#endif
+#ifdef ENGINE_METHOD_DSA
+    case ENGINE_METHOD_DSA:
+        ENGINE_unregister_DSA(ctx->engine);
+        break;
+#endif
+#ifdef ENGINE_METHOD_DH
+    case ENGINE_METHOD_DH:
+        ENGINE_unregister_DH(ctx->engine);
+        break;
+#endif
+#ifdef ENGINE_METHOD_RAND
+    case ENGINE_METHOD_RAND:
+        ENGINE_unregister_RAND(ctx->engine);
+        break;
+#endif
+#ifdef ENGINE_METHOD_ECDH
+    case ENGINE_METHOD_ECDH:
+        ENGINE_unregister_ECDH(ctx->engine);
+        break;
+#endif
+#ifdef ENGINE_METHOD_ECDSA
+    case ENGINE_METHOD_ECDSA:
+        ENGINE_unregister_ECDSA(ctx->engine);
+        break;
+#endif
+#ifdef ENGINE_METHOD_STORE
+    case ENGINE_METHOD_STORE:
+        ENGINE_unregister_STORE(ctx->engine);
+        break;
+#endif
+#ifdef ENGINE_METHOD_CIPHERS
+    case ENGINE_METHOD_CIPHERS:
+        ENGINE_unregister_ciphers(ctx->engine);
+        break;
+#endif
+#ifdef ENGINE_METHOD_DIGESTS
+    case ENGINE_METHOD_DIGESTS:
+        ENGINE_unregister_digests(ctx->engine);
+        break;
+#endif
+#ifdef ENGINE_METHOD_PKEY_METHS
+    case ENGINE_METHOD_PKEY_METHS:
+        ENGINE_unregister_pkey_meths(ctx->engine);
+        break;
+#endif
+#ifdef ENGINE_METHOD_PKEY_ASN1_METHS
+    case ENGINE_METHOD_PKEY_ASN1_METHS:
+        ENGINE_unregister_pkey_asn1_meths(ctx->engine);
+        break;
+#endif
+#ifdef ENGINE_METHOD_EC
+    case ENGINE_METHOD_EC:
+        ENGINE_unregister_EC(ctx->engine);
+        break;
+#endif
+    default:
+        break;
+    }
+    return atom_ok;
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_get_first_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine) */
+#ifdef HAS_ENGINE_SUPPORT
+    ERL_NIF_TERM ret;
+    ENGINE *engine;
+    ErlNifBinary engine_bin;
+    struct engine_ctx *ctx;
+
+    engine = ENGINE_get_first();
+    if(!engine) {
+        enif_alloc_binary(0, &engine_bin);
+        engine_bin.size = 0;
+        return enif_make_tuple2(env, atom_ok, enif_make_binary(env, &engine_bin));
+    }
+
+    ctx = enif_alloc_resource(engine_ctx_rtype, sizeof(struct engine_ctx));
+    ctx->engine = engine;
+    ctx->id = NULL;
+
+    ret = enif_make_resource(env, ctx);
+    enif_release_resource(ctx);
+
+    return enif_make_tuple2(env, atom_ok, ret);
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_get_next_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine) */
+#ifdef HAS_ENGINE_SUPPORT
+    ERL_NIF_TERM ret;
+    ENGINE *engine;
+    ErlNifBinary engine_bin;
+    struct engine_ctx *ctx, *next_ctx;
+
+    // Get Engine
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx)) {
+        PRINTF_ERR0("engine_get_next_nif Leaved: Parameter not an engine resource object");
+        return enif_make_badarg(env);
+    }
+    engine = ENGINE_get_next(ctx->engine);
+    if (!engine) {
+        enif_alloc_binary(0, &engine_bin);
+        engine_bin.size = 0;
+        return enif_make_tuple2(env, atom_ok, enif_make_binary(env, &engine_bin));
+    }
+
+    next_ctx = enif_alloc_resource(engine_ctx_rtype, sizeof(struct engine_ctx));
+    next_ctx->engine = engine;
+    next_ctx->id = NULL;
+
+    ret = enif_make_resource(env, next_ctx);
+    enif_release_resource(next_ctx);
+
+    return enif_make_tuple2(env, atom_ok, ret);
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_get_id_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine) */
+#ifdef HAS_ENGINE_SUPPORT
+    ErlNifBinary engine_id_bin;
+    const char *engine_id;
+    int size;
+    struct engine_ctx *ctx;
+
+    // Get Engine
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx)) {
+        PRINTF_ERR0("engine_get_id_nif Leaved: Parameter not an engine resource object");
+        return enif_make_badarg(env);
+    }
+
+    engine_id = ENGINE_get_id(ctx->engine);
+    if (!engine_id) {
+        enif_alloc_binary(0, &engine_id_bin);
+        engine_id_bin.size = 0;
+        return enif_make_tuple2(env, atom_ok, enif_make_binary(env, &engine_id_bin));
+    }
+
+    size = strlen(engine_id);
+    enif_alloc_binary(size, &engine_id_bin);
+    engine_id_bin.size = size;
+    memcpy(engine_id_bin.data, engine_id, size);
+
+    return enif_make_tuple2(env, atom_ok, enif_make_binary(env, &engine_id_bin));
+#else
+    return atom_notsup;
+#endif
+}
+
+static int get_engine_load_cmd_list(ErlNifEnv* env, const ERL_NIF_TERM term, char **cmds, int i)
+{
+#ifdef HAS_ENGINE_SUPPORT
+    ERL_NIF_TERM head, tail;
+    const ERL_NIF_TERM *tmp_tuple;
+    ErlNifBinary tmpbin;
+    int arity;
+    char* tmpstr;
+
+    if(!enif_is_empty_list(env, term)) {
+        if(!enif_get_list_cell(env, term, &head, &tail)) {
+            cmds[i] = NULL;
+            return -1;
+        } else {
+            if(!enif_get_tuple(env, head, &arity, &tmp_tuple)  || arity != 2) {
+                cmds[i] = NULL;
+                return -1;
+            } else {
+                if(!enif_inspect_binary(env, tmp_tuple[0], &tmpbin)) {
+                    cmds[i] = NULL;
+                    return -1;
+                } else {
+                    tmpstr = enif_alloc(tmpbin.size+1);
+                    (void) memcpy(tmpstr, tmpbin.data, tmpbin.size);
+                    tmpstr[tmpbin.size] = '\0';
+                    cmds[i++] = tmpstr;
+                }
+                if(!enif_inspect_binary(env, tmp_tuple[1], &tmpbin)) {
+                    cmds[i] = NULL;
+                    return -1;
+                } else {
+                    if(tmpbin.size == 0)
+                        cmds[i++] = NULL;
+                    else {
+                        tmpstr = enif_alloc(tmpbin.size+1);
+                        (void) memcpy(tmpstr, tmpbin.data, tmpbin.size);
+                        tmpstr[tmpbin.size] = '\0';
+                        cmds[i++] = tmpstr;
+                    }
+                }
+                return get_engine_load_cmd_list(env, tail, cmds, i);
+            }
+        }
+    } else {
+        cmds[i] = NULL;
+        return 0;
+    }
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM engine_get_all_methods_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* () */
+#ifdef HAS_ENGINE_SUPPORT
+    ERL_NIF_TERM method_array[12];
+    int i = 0;
+
+#ifdef ENGINE_METHOD_RSA
+    method_array[i++] = atom_engine_method_rsa;
+#endif
+#ifdef ENGINE_METHOD_DSA
+    method_array[i++] = atom_engine_method_dsa;
+#endif
+#ifdef ENGINE_METHOD_DH
+    method_array[i++] = atom_engine_method_dh;
+#endif
+#ifdef ENGINE_METHOD_RAND
+    method_array[i++] = atom_engine_method_rand;
+#endif
+#ifdef ENGINE_METHOD_ECDH
+    method_array[i++] = atom_engine_method_ecdh;
+#endif
+#ifdef ENGINE_METHOD_ECDSA
+    method_array[i++] = atom_engine_method_ecdsa;
+#endif
+#ifdef ENGINE_METHOD_STORE
+    method_array[i++] = atom_engine_method_store;
+#endif
+#ifdef ENGINE_METHOD_CIPHERS
+    method_array[i++] = atom_engine_method_ciphers;
+#endif
+#ifdef ENGINE_METHOD_DIGESTS
+    method_array[i++] = atom_engine_method_digests;
+#endif
+#ifdef ENGINE_METHOD_PKEY_METHS
+    method_array[i++] = atom_engine_method_pkey_meths;
+#endif
+#ifdef ENGINE_METHOD_PKEY_ASN1_METHS
+    method_array[i++] = atom_engine_method_pkey_asn1_meths;
+#endif
+#ifdef ENGINE_METHOD_EC
+    method_array[i++] = atom_engine_method_ec;
+#endif
+
+    return enif_make_list_from_array(env, method_array, i);
+#else
+    return atom_notsup;
+#endif
+}
diff --git a/lib/crypto/c_src/otp_test_engine.c b/lib/crypto/c_src/otp_test_engine.c
new file mode 100644
index 0000000000..5c6122c06a
--- /dev/null
+++ b/lib/crypto/c_src/otp_test_engine.c
@@ -0,0 +1,264 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2017-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.
+ * 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%
+ */
+
+#ifdef _WIN32
+#define OPENSSL_OPT_WINDLL
+#endif
+#include <stdio.h>
+#include <string.h>
+
+#include <openssl/engine.h>
+#include <openssl/md5.h>
+#include <openssl/rsa.h>
+#include <openssl/pem.h>
+
+#define PACKED_OPENSSL_VERSION(MAJ, MIN, FIX, P)	\
+    ((((((((MAJ << 8) | MIN) << 8 ) | FIX) << 8) | (P-'a'+1)) << 4) | 0xf)
+
+#define PACKED_OPENSSL_VERSION_PLAIN(MAJ, MIN, FIX) \
+    PACKED_OPENSSL_VERSION(MAJ,MIN,FIX,('a'-1))
+
+#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0) \
+    || defined(LIBRESSL_VERSION_NUMBER)
+#define OLD
+#endif
+
+static const char *test_engine_id = "MD5";
+static const char *test_engine_name = "MD5 test engine";
+
+/* The callback that does the job of fetching keys on demand by the Engine */
+EVP_PKEY* test_key_load(ENGINE *er, const char *id, UI_METHOD *ui_method, void *callback_data);
+
+
+static int test_init(ENGINE *e) {
+    printf("OTP Test Engine Initializatzion!\r\n");
+    
+    /* Load all digest and cipher algorithms. Needed for password protected private keys */
+    OpenSSL_add_all_algorithms();
+
+    return 111;
+}
+
+static void add_test_data(unsigned char *md, unsigned int len)
+{
+    unsigned int i;
+
+    for (i=0; i<len; i++) {
+        md[i] = (unsigned char)(i & 0xff);
+    }
+}
+
+/* MD5 part */
+#undef data
+#ifdef OLD
+#define data(ctx) ((MD5_CTX *)ctx->md_data)
+#endif
+
+static int test_engine_md5_init(EVP_MD_CTX *ctx) {
+    fprintf(stderr, "MD5 initialized\r\n");
+#ifdef OLD
+    return MD5_Init(data(ctx));
+#else
+    return 1;
+#endif
+}
+
+static int test_engine_md5_update(EVP_MD_CTX *ctx,const void *data, size_t count)
+{
+    fprintf(stderr, "MD5 update\r\n");
+#ifdef OLD
+    return MD5_Update(data(ctx), data, (size_t)count);
+#else
+    return 1;
+#endif
+}
+
+static int test_engine_md5_final(EVP_MD_CTX *ctx,unsigned char *md) {
+#ifdef OLD
+    int ret;
+
+    fprintf(stderr, "MD5 final size of EVP_MD: %lu\r\n", sizeof(EVP_MD));
+    ret = MD5_Final(md, data(ctx));
+
+    if (ret > 0) {
+         add_test_data(md, MD5_DIGEST_LENGTH);
+    }
+    return ret;
+#else
+    fprintf(stderr, "MD5 final\r\n");
+    add_test_data(md, MD5_DIGEST_LENGTH);
+    return 1;
+#endif
+}
+
+#ifdef OLD
+static EVP_MD test_engine_md5_method=  {
+        NID_md5,                      /* The name ID for MD5 */
+        NID_undef,                    /* IGNORED: MD5 with private key encryption NID */
+        MD5_DIGEST_LENGTH,            /* Size of MD5 result, in bytes */
+        0,                            /* Flags */
+        test_engine_md5_init,         /* digest init */
+        test_engine_md5_update,       /* digest update */
+        test_engine_md5_final,        /* digest final */
+        NULL,                         /* digest copy */
+        NULL,                         /* digest cleanup */
+        EVP_PKEY_NULL_method,         /* IGNORED: pkey methods */
+        MD5_CBLOCK,                   /* Internal blocksize, see rfc1321/md5.h */
+        sizeof(EVP_MD *) + sizeof(MD5_CTX),
+        NULL,                          /* IGNORED: control function */
+};
+#endif
+
+static int test_digest_ids[] = {NID_md5};
+
+static int test_engine_digest_selector(ENGINE *e, const EVP_MD **digest,
+        const int **nids, int nid) {
+    int ok = 1;
+    if (!digest) {
+        *nids = test_digest_ids;
+        fprintf(stderr, "Digest is empty! Nid:%d\r\n", nid);
+        return 2;
+    }
+    fprintf(stderr, "Digest no %d requested\r\n",nid);
+    if (nid == NID_md5) {
+#ifdef OLD
+        *digest = &test_engine_md5_method;
+#else
+        EVP_MD *md = EVP_MD_meth_new(NID_md5, NID_undef);
+        if (!md ||
+            !EVP_MD_meth_set_result_size(md, MD5_DIGEST_LENGTH) ||
+            !EVP_MD_meth_set_flags(md, 0) ||
+            !EVP_MD_meth_set_init(md,  test_engine_md5_init) ||
+            !EVP_MD_meth_set_update(md,  test_engine_md5_update) ||
+            !EVP_MD_meth_set_final(md,  test_engine_md5_final) ||
+            !EVP_MD_meth_set_copy(md,  NULL) ||
+            !EVP_MD_meth_set_cleanup(md,  NULL) ||
+            !EVP_MD_meth_set_input_blocksize(md, MD5_CBLOCK) ||
+            !EVP_MD_meth_set_app_datasize(md, sizeof(EVP_MD *) + sizeof(MD5_CTX)) ||
+            !EVP_MD_meth_set_ctrl(md, NULL))
+            {
+                ok = 0;
+                *digest = NULL;
+            } else
+            {
+                *digest = md;
+            }
+#endif
+    }
+    else {
+        ok = 0;
+        *digest = NULL;
+    }
+    
+    return ok;
+}
+
+
+static int bind_helper(ENGINE * e, const char *id)
+{
+    if (!ENGINE_set_id(e, test_engine_id) ||
+        !ENGINE_set_name(e, test_engine_name) ||
+        !ENGINE_set_init_function(e, test_init) ||
+        !ENGINE_set_digests(e, &test_engine_digest_selector) ||
+        /* For testing of key storage in an Engine: */
+        !ENGINE_set_load_privkey_function(e, &test_key_load) ||
+        !ENGINE_set_load_pubkey_function(e, &test_key_load)
+    )
+        return 0;
+
+    return 1;
+}
+
+IMPLEMENT_DYNAMIC_CHECK_FN();
+
+IMPLEMENT_DYNAMIC_BIND_FN(bind_helper);
+
+/********************************************************
+ *
+ * Engine storage simulation
+ *
+ */
+int pem_passwd_cb_fun(char *buf, int size, int rwflag, void *password);
+
+EVP_PKEY* test_key_load(ENGINE *er, const char *id, UI_METHOD *ui_method, void *callback_data)
+{
+    EVP_PKEY *pkey = NULL;
+    FILE *f = fopen(id, "r");
+
+    if (!f) {
+            fprintf(stderr, "%s:%d fopen(%s) failed\r\n", __FILE__,__LINE__,id);
+            return NULL;
+    }
+
+    /* First try to read as a private key. If that fails, try to read as a public key: */
+    pkey = PEM_read_PrivateKey(f, NULL, pem_passwd_cb_fun, callback_data);
+    if (!pkey) {
+        /* ERR_print_errors_fp (stderr); */
+        fclose(f);
+        f = fopen(id, "r");
+        pkey = PEM_read_PUBKEY(f, NULL, NULL, NULL);
+    }
+    fclose(f);
+    
+    if (!pkey) {
+        fprintf(stderr, "%s:%d Key read from file %s failed.\r\n", __FILE__,__LINE__,id);
+        if (callback_data) 
+            fprintf(stderr, "Pwd = \"%s\".\r\n", (char *)callback_data);
+        fprintf(stderr, "Contents of file \"%s\":\r\n",id);
+        f = fopen(id, "r");
+        { /* Print the contents of the key file */
+            char c;
+            while (!feof(f)) {
+                switch (c=fgetc(f)) {
+                case '\n':
+                case '\r': putc('\r',stderr); putc('\n',stderr); break;
+                default: putc(c, stderr);
+                }
+            }
+        }
+        fprintf(stderr, "File contents printed.\r\n");
+        fclose(f);
+        return NULL;
+    }
+    
+    return pkey;
+}
+
+
+int pem_passwd_cb_fun(char *buf, int size, int rwflag, void *password) 
+{ 
+    int i;
+
+    fprintf(stderr, "In pem_passwd_cb_fun\r\n");
+    if (!password)
+        return 0;
+
+    i = strlen(password);
+    if (i < size) {
+        /* whole pwd (incl terminating 0) fits */
+        fprintf(stderr, "Got FULL pwd %d(%d) chars\r\n", i, size);
+        memcpy(buf, (char*)password, i+1);
+        return i+1;
+    } else {
+        fprintf(stderr, "Got TO LONG pwd %d(%d) chars\r\n", i, size);
+        /* meaningless with a truncated password */
+        return 0;
+    }
+}
diff --git a/lib/crypto/doc/src/Makefile b/lib/crypto/doc/src/Makefile
index 9c503b8fe0..aa987d2b39 100644
--- a/lib/crypto/doc/src/Makefile
+++ b/lib/crypto/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
@@ -38,13 +38,13 @@ XML_APPLICATION_FILES = ref_man.xml
 XML_REF3_FILES = crypto.xml
 XML_REF6_FILES = crypto_app.xml
 
-XML_PART_FILES = release_notes.xml usersguide.xml
-XML_CHAPTER_FILES = notes.xml licenses.xml fips.xml
+XML_PART_FILES = usersguide.xml
+XML_CHAPTER_FILES = notes.xml licenses.xml fips.xml engine_load.xml engine_keys.xml
 
 BOOK_FILES = book.xml
 
 XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES)  $(XML_REF6_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES) 
+            $(XML_PART_FILES) $(XML_CHAPTER_FILES)
 
 GIF_FILES =
 
@@ -63,9 +63,9 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
 # ----------------------------------------------------
-# FLAGS 
+# FLAGS
 # ----------------------------------------------------
-XML_FLAGS += 
+XML_FLAGS +=
 
 # ----------------------------------------------------
 # Targets
@@ -73,7 +73,6 @@ XML_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -86,7 +85,7 @@ man: $(MAN3_FILES) $(MAN6_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
-debug opt valgrind: 
+debug opt valgrind:
 
 clean clean_docs clean_tex:
 	rm -rf $(HTMLDIR)/*
@@ -97,7 +96,7 @@ clean clean_docs clean_tex:
 
 # ----------------------------------------------------
 # Release Target
-# ---------------------------------------------------- 
+# ----------------------------------------------------
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
@@ -114,4 +113,3 @@ release_docs_spec: docs
 
 
 release_spec:
-
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 8c30d3d50c..3a5efd0bea 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -11,7 +11,7 @@
       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
@@ -19,7 +19,6 @@
       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>crypto</title>
@@ -68,11 +67,11 @@
 
  <section>
     <title>DATA TYPES </title>
-    
-    <code>key_value()  = integer() | binary() </code>
+
+    <code>key_value() = integer() | binary() </code>
     <p>Always <c>binary()</c> when used as return value</p>
 
-    <code>rsa_public()  = [key_value()] = [E, N]  </code>
+    <code>rsa_public() = [key_value()] = [E, N]  </code>
     <p> Where E is the public exponent and N is public modulus. </p>
 
     <code>rsa_private() = [key_value()] = [E, N, D] | [E, N, D, P1, P2, E1, E2, C] </code>
@@ -85,7 +84,7 @@
     <code>dss_public() = [key_value()] = [P, Q, G, Y] </code>
     <p>Where P, Q and G are the dss parameters and Y is the public key.</p>
 
-    <code>dss_private() =  [key_value()] = [P, Q, G, X] </code>
+    <code>dss_private() = [key_value()] = [P, Q, G, X] </code>
     <p>Where P, Q and G are the dss parameters and X is the private key.</p>
 
     <code>srp_public() = key_value() </code>
@@ -109,15 +108,16 @@
 
     <code>ecdh_private() = key_value() </code>
 
-    <code>ecdh_params() =  ec_named_curve() | ec_explicit_curve()</code>
+    <code>ecdh_params() = ec_named_curve() | ec_explicit_curve()</code>
 
     <code>ec_explicit_curve() =
-    {ec_field(), Prime :: key_value(), Point :: key_value(), Order :: integer(), CoFactor :: none | integer()} </code>
+    {ec_field(), Prime :: key_value(), Point :: key_value(), Order :: integer(),
+     CoFactor :: none | integer()} </code>
 
     <code>ec_field() = {prime_field, Prime :: integer()} |
     {characteristic_two_field, M :: integer(), Basis :: ec_basis()}</code>
 
-    <code>ec_basis() =  {tpbasis, K :: non_neg_integer()} |
+    <code>ec_basis() = {tpbasis, K :: non_neg_integer()} |
     {ppbasis, K1 :: non_neg_integer(), K2 :: non_neg_integer(), K3 :: non_neg_integer()} |
     onbasis</code>
 
@@ -136,16 +136,34 @@
     See also <seealso marker="#supports-0">crypto:supports/0</seealso>
     </p>
 
+    <marker id="engine_key_ref_type"/>
+    <code>engine_key_ref() = #{engine   := engine_ref(),
+                               key_id   := key_id(),
+                               password => password()}</code>
+
+    <code>engine_ref() = term()</code>
+    <p>The result of a call to <seealso marker="#engine_load-3">engine_load/3</seealso>.
+    </p>
+
+    <code>key_id() = string() | binary()</code>
+    <p>Identifies the key to be used. The format depends on the loaded engine. It is passed to
+    the <c>ENGINE_load_(private|public)_key</c> functions in libcrypto.
+    </p>
+
+    <code>password() = string() | binary()</code>
+    <p>The key's password
+    </p>
+
      <code>stream_cipher() = rc4 | aes_ctr </code>
 
-     <code>block_cipher() =  aes_cbc | aes_cfb8 | aes_cfb128 | aes_ige256 | blowfish_cbc |
+     <code>block_cipher() = aes_cbc | aes_cfb8 | aes_cfb128 | aes_ige256 | blowfish_cbc |
      blowfish_cfb64 | des_cbc | des_cfb | des3_cbc | des3_cfb | des_ede3 | rc2_cbc </code>
 
-     <code>aead_cipher() =  aes_gcm | chacha20_poly1305 </code>
+     <code>aead_cipher() = aes_gcm | chacha20_poly1305 </code>
 
-     <code>stream_key() =  aes_key() | rc4_key() </code>
+     <code>stream_key() = aes_key() | rc4_key() </code>
 
-     <code>block_key() =  aes_key() |  blowfish_key() | des_key()| des3_key() </code>
+     <code>block_key() = aes_key() |  blowfish_key() | des_key()| des3_key() </code>
 
      <code>aes_key() = iodata() </code> <p>Key length is 128, 192 or 256 bits</p>
 
@@ -174,13 +192,17 @@
      Note that both md4 and md5 are recommended only for compatibility with existing applications.
      </p>
      <code> cipher_algorithms() = aes_cbc | aes_cfb8 | aes_cfb128 | aes_ctr | aes_gcm |
-     aes_ige256 | blowfish_cbc | blowfish_cfb64 | chacha20_poly1305 | des_cbc | des_cfb |
-     des3_cbc | des3_cfb | des_ede3 | rc2_cbc | rc4 </code>
-     <code> mac_algorithms() =   hmac | cmac</code>
-     <code> public_key_algorithms() =   rsa |dss | ecdsa | dh | ecdh | ec_gf2m</code>
+     aes_ige256 | blowfish_cbc | blowfish_cfb64 | chacha20_poly1305 | des_cbc |
+     des_cfb | des3_cbc | des3_cfb | des_ede3 | rc2_cbc | rc4 </code>
+     <code> mac_algorithms() = hmac | cmac</code>
+     <code> public_key_algorithms() = rsa |dss | ecdsa | dh | ecdh | ec_gf2m</code>
      <p>Note that ec_gf2m is not strictly a public key algorithm, but a restriction on what curves are supported
      with ecdsa and ecdh.
      </p>
+     <code>engine_method_type() = engine_method_rsa | engine_method_dsa | engine_method_dh |
+     engine_method_rand | engine_method_ecdh | engine_method_ecdsa |
+     engine_method_ciphers | engine_method_digests | engine_method_store |
+     engine_method_pkey_meths | engine_method_pkey_asn1_meths</code>
 
  </section>
 
@@ -261,13 +283,13 @@
 	is not supported by the underlying OpenSSL implementation.</p>
       </desc>
     </func>
-    
+
      <func>
       <name>bytes_to_integer(Bin) -> Integer </name>
       <fsummary>Convert binary representation, of an integer, to an Erlang integer.</fsummary>
       <type>
 	<v>Bin = binary() - as returned by crypto functions</v>
-	
+
         <v>Integer = integer() </v>
       </type>
       <desc>
@@ -439,7 +461,7 @@
       </type>
       <desc>
         <p>Updates the HMAC represented by <c>Context</c> using the given <c>Data</c>. <c>Context</c>
-        must have been generated using an HMAC init function (such as 
+        must have been generated using an HMAC init function (such as
         <seealso marker="#hmac_init-2">hmac_init</seealso>). <c>Data</c> can be any length. <c>NewContext</c>
         must be passed into the next call to <c>hmac_update</c>
 	or to one of the functions <seealso marker="#hmac_final-1">hmac_final</seealso> and
@@ -580,7 +602,7 @@
       <type>
 	<v>Type = rsa</v>
 	<v>CipherText = binary()</v>
-	<v>PrivateKey = rsa_private()</v>
+	<v>PrivateKey = rsa_private() | engine_key_ref()</v>
 	<v>Padding = rsa_pkcs1_padding | rsa_pkcs1_oaep_padding | rsa_no_padding</v>
         <v>PlainText = binary()</v>
       </type>
@@ -594,7 +616,22 @@
 	</p>
       </desc>
     </func>
-    
+
+    <func>
+      <name>privkey_to_pubkey(Type, EnginePrivateKeyRef) -> PublicKey</name>
+      <fsummary>Fetches a public key from an Engine stored private key.</fsummary>
+      <type>
+	<v>Type = rsa | dss</v>
+	<v>EnginePrivateKeyRef = engine_key_ref()</v>
+	<v>PublicKey =  rsa_public() | dss_public()</v>
+      </type>
+      <desc>
+	<p>Fetches the corresponding public key from a private key stored in an Engine.
+	The key must be of the type indicated by the Type parameter.
+	</p>	
+      </desc>
+    </func>
+
     <func>
       <name>private_encrypt(Type, PlainText, PrivateKey, Padding) -> CipherText</name>
       <fsummary>Encrypts PlainText using the private Key.</fsummary>
@@ -605,7 +642,7 @@
 	than <c>byte_size(N)-11</c> if <c>rsa_pkcs1_padding</c> is
 	used, and <c>byte_size(N)</c> if <c>rsa_no_padding</c> is
 	used, where N is public modulus of the RSA key.</d>
-	<v>PrivateKey = rsa_private()</v>
+	<v>PrivateKey = rsa_private() | engine_key_ref()</v>
 	<v>Padding = rsa_pkcs1_padding | rsa_no_padding</v>
         <v>CipherText = binary()</v>
       </type>
@@ -624,7 +661,7 @@
       <type>
 	<v>Type = rsa</v>
 	<v>CipherText = binary()</v>
-	<v>PublicKey =  rsa_public() </v>
+	<v>PublicKey =  rsa_public() | engine_key_ref()</v>
 	<v>Padding = rsa_pkcs1_padding | rsa_no_padding</v>
         <v>PlainText = binary()</v>
       </type>
@@ -649,7 +686,7 @@
 	than <c>byte_size(N)-11</c> if <c>rsa_pkcs1_padding</c> is
 	used, and <c>byte_size(N)</c> if <c>rsa_no_padding</c> is
 	used, where N is public modulus of the RSA key.</d>
-	<v>PublicKey = rsa_public()</v>
+	<v>PublicKey = rsa_public() | engine_key_ref()</v>
 	<v>Padding = rsa_pkcs1_padding | rsa_pkcs1_oaep_padding | rsa_no_padding</v>
         <v>CipherText = binary()</v>
       </type>
@@ -702,7 +739,7 @@
 	signed or it is the hashed value of "cleartext" i.e. the
 	digest (plaintext).</d>
 	<v>DigestType = rsa_digest_type() | dss_digest_type() | ecdsa_digest_type()</v>
-	<v>Key = rsa_private() | dss_private() | [ecdh_private(),ecdh_params()]</v>
+	<v>Key = rsa_private() | dss_private() | [ecdh_private(),ecdh_params()] | engine_key_ref()</v>
 	<v>Options = sign_options()</v>
       </type>
       <desc>
@@ -1014,7 +1051,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
         or it is the hashed value of "cleartext" i.e. the digest (plaintext).</d>
 	<v>DigestType = rsa_digest_type() | dss_digest_type() | ecdsa_digest_type()</v>
 	<v>Signature = binary()</v>
-	<v>Key = rsa_public() | dss_public() | [ecdh_public(),ecdh_params()]</v>
+	<v>Key = rsa_public() | dss_public() | [ecdh_public(),ecdh_params()] | engine_key_ref()</v>
 	<v>Options = sign_options()</v>
       </type>
       <desc>
@@ -1026,6 +1063,175 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
       </desc>
     </func>
 
+    <!-- Engine functions -->
+    <func>
+      <name>engine_get_all_methods() -> Result</name>
+      <fsummary>Return list of all possible engine methods</fsummary>
+      <type>
+	<v>Result = [EngineMethod::atom()]</v>
+      </type>
+      <desc>
+	<p>
+	  Returns a list of all possible engine methods.
+	</p>
+	<p>	  
+	  May throw exception notsup in case there is 
+	  no engine support in the underlying OpenSSL implementation.
+	</p>
+	<p>
+	  See also the chapter <seealso marker="crypto:engine_load#engine_load">Engine Load</seealso>
+	  in the User's Guide.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>engine_load(EngineId, PreCmds, PostCmds) -> Result</name>
+      <fsummary>Dynamical load an encryption engine</fsummary>
+      <type>
+	<v>EngineId = unicode:chardata()</v>
+	<v>PreCmds, PostCmds = [{unicode:chardata(), unicode:chardata()}]</v>
+	<v>Result = {ok, Engine::term()} | {error, Reason::term()}</v>
+      </type>
+      <desc>
+	<p>
+	  Loads the OpenSSL engine given by <c>EngineId</c> if it is available and then returns ok and
+	  an engine handle. This function is the same as calling <c>engine_load/4</c> with 
+	  <c>EngineMethods</c> set to a list of all the possible methods.  An error tuple is 
+	  returned if the engine can't be loaded.
+	</p>
+	<p>
+	  The function throws a badarg if the parameters are in wrong format.
+	  It may also throw the exception notsup in case there is 
+	  no engine support in the underlying OpenSSL implementation.
+	</p>
+	<p>
+	  See also the chapter <seealso marker="crypto:engine_load#engine_load">Engine Load</seealso>
+	  in the User's Guide.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>engine_load(EngineId, PreCmds, PostCmds, EngineMethods) -> Result</name>
+      <fsummary>Dynamical load an encryption engine</fsummary>
+      <type>
+	<v>EngineId = unicode:chardata()</v>
+	<v>PreCmds, PostCmds = [{unicode:chardata(), unicode:chardata()}]</v>
+	<v>EngineMethods = [engine_method_type()]</v>
+	<v>Result = {ok, Engine::term()} | {error, Reason::term()}</v>
+      </type>
+      <desc>
+	<p>
+	  Loads the OpenSSL engine given by <c>EngineId</c> if it is available and then returns ok and
+	  an engine handle. An error tuple is returned if the engine can't be loaded.
+	</p>
+	<p>
+	  The function throws a badarg if the parameters are in wrong format.
+	  It may also throw the exception notsup in case there is 
+	  no engine support in the underlying OpenSSL implementation.
+	</p>
+	<p>
+	  See also the chapter <seealso marker="crypto:engine_load#engine_load">Engine Load</seealso>
+	  in the User's Guide.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>engine_unload(Engine) -> Result</name>
+      <fsummary>Dynamical load an encryption engine</fsummary>
+      <type>
+	<v>Engine = term()</v>
+	<v>Result = ok | {error, Reason::term()}</v>
+      </type>
+      <desc>
+	<p>
+	  Unloads the OpenSSL engine given by <c>EngineId</c>.
+	  An error tuple is returned if the engine can't be unloaded.
+	</p>
+	<p>
+	  The function throws a badarg if the parameter is in wrong format.
+	  It may also throw the exception notsup in case there is 
+	  no engine support in the underlying OpenSSL implementation.
+	</p>
+	<p>
+	  See also the chapter <seealso marker="crypto:engine_load#engine_load">Engine Load</seealso>
+	  in the User's Guide.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>engine_list() -> Result</name>
+      <fsummary>List the known engine ids</fsummary>
+      <type>
+	<v>Result = [EngineId::unicode:chardata()]</v>
+      </type>
+      <desc>
+	<p>List the id's of all engines in OpenSSL's internal list.</p>
+	<p>
+	  It may also throw the exception notsup in case there is 
+	  no engine support in the underlying OpenSSL implementation.
+	</p>
+	<p>
+	  See also the chapter <seealso marker="crypto:engine_load#engine_load">Engine Load</seealso> 
+	  in the User's Guide.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>engine_ctrl_cmd_string(Engine, CmdName, CmdArg) -> Result</name>
+      <fsummary>Sends ctrl commands to an OpenSSL engine</fsummary>
+      <type>
+	<v>Engine = term()</v>
+	<v>CmdName = unicode:chardata()</v>
+	<v>CmdArg = unicode:chardata()</v>
+	<v>Result = ok | {error, Reason::term()}</v>
+      </type>
+      <desc>
+	<p>
+	  Sends ctrl commands to the OpenSSL engine given by <c>Engine</c>.
+	  This function is the same as calling <c>engine_ctrl_cmd_string/4</c> with 
+	  <c>Optional</c> set to <c>false</c>.
+	</p>
+	<p>
+	  The function throws a badarg if the parameters are in wrong format.
+	  It may also throw the exception notsup in case there is 
+	  no engine support in the underlying OpenSSL implementation.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>engine_ctrl_cmd_string(Engine, CmdName, CmdArg, Optional) -> Result</name>
+      <fsummary>Sends ctrl commands to an OpenSSL engine</fsummary>
+      <type>
+	<v>Engine = term()</v>
+	<v>CmdName = unicode:chardata()</v>
+	<v>CmdArg = unicode:chardata()</v>
+	<v>Optional = boolean()</v>
+	<v>Result = ok | {error, Reason::term()}</v>
+      </type>
+      <desc>
+	<p>
+	  Sends ctrl commands to the OpenSSL engine given by <c>Engine</c>.
+	  <c>Optional</c> is a boolean argument that can relax the semantics of the function. 
+	  If set to <c>true</c> it will only return failure if the ENGINE supported the given 
+	  command name but failed while executing it, if the ENGINE doesn't support the command 
+	  name it will simply return success without doing anything. In this case we assume 
+	  the user is only supplying commands specific to the given ENGINE so we set this to
+	  <c>false</c>.
+	</p>
+	<p>
+	  The function throws a badarg if the parameters are in wrong format.
+	  It may also throw the exception notsup in case there is 
+	  no engine support in the underlying OpenSSL implementation.
+	</p>
+      </desc>
+    </func>
+
  </funcs>
 
   <!-- Maybe put this in the users guide -->
@@ -1100,4 +1306,3 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
   <!--   </p> -->
   <!-- </section> -->
 </erlref>
-
diff --git a/lib/crypto/doc/src/engine_keys.xml b/lib/crypto/doc/src/engine_keys.xml
new file mode 100644
index 0000000000..38714fed8a
--- /dev/null
+++ b/lib/crypto/doc/src/engine_keys.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2017</year><year>2017</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      The contents of this file are subject to the Erlang Public License,
+      Version 1.1, (the "License"); you may not use this file except in
+      compliance with the License. You should have received a copy of the
+      Erlang Public License along with this software. If not, it can be
+      retrieved online at http://www.erlang.org/.
+
+      Software distributed under the License is distributed on an "AS IS"
+      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+      the License for the specific language governing rights and limitations
+      under the License.
+    </legalnotice>
+    <title>Engine Stored Keys</title>
+    <prepared>Hans Nilsson</prepared>
+    <date>2017-11-10</date>
+    <file>engine_keys.xml</file>
+  </header>
+  <p>
+    <marker id="engine_key"></marker>
+    This chapter describes the support in the crypto application for using public and private keys stored in encryption engines.
+  </p>
+
+  <section>
+    <title>Background</title>
+    <p>
+      <url href="https://www.openssl.org/">OpenSSL</url> exposes an Engine API, which makes 
+      it possible to plug in alternative implementations for some of the cryptographic
+      operations implemented by OpenSSL.
+      See the chapter <seealso marker="crypto:engine_load#engine_load">Engine Load</seealso>
+      for details and how to load an Engine.
+    </p>
+    <p>
+      An engine could among other tasks provide a storage for
+      private or public keys. Such a storage could be made safer than the normal file system. Thoose techniques are not 
+      described in this User's Guide.  Here we concentrate on how to use private or public keys stored in
+      such an engine.
+    </p>
+    <p>
+      The storage engine must call <c>ENGINE_set_load_privkey_function</c> and <c>ENGINE_set_load_pubkey_function</c>.
+      See the OpenSSL cryptolib's <url href="https://www.openssl.org/docs/manpages.html">manpages</url>.
+    </p>
+    <p>
+      OTP/Crypto requires that the user provides two or three items of information about the key. The application used
+      by the user is usually on a higher level, for example in
+      <seealso marker="ssl:ssl#key_option_def">SSL</seealso>. If using
+      the crypto application directly, it is required that:
+    </p>
+    <list>
+      <item>an Engine is loaded, see the chapter on <seealso marker="crypto:engine_load#engine_load">Engine Load</seealso>
+      or the <seealso marker="crypto:crypto#engine_load-3">Reference Manual</seealso>
+      </item>
+      <item>a reference to a key in the Engine is available. This should be an Erlang string or binary and depends
+      on the Engine loaded
+      </item>
+      <item>an Erlang map is constructed with the Engine reference, the key reference and possibly a key passphrase if
+      needed by the Engine. See the <seealso marker="crypto:crypto#engine_key_ref_type">Reference Manual</seealso> for
+      details of the map.
+      </item>
+    </list>
+  </section>
+
+  <section>
+    <title>Use Cases</title>
+    <section>
+      <title>Sign with an engine stored private key</title>
+      <p>
+	This example shows how to construct a key reference that is used in a sign operation.
+	The actual key is stored in the engine that is loaded at prompt 1.
+      </p>
+      <code>
+1> {ok, EngineRef} = crypto:engine_load(....).
+...
+{ok,#Ref&lt;0.2399045421.3028942852.173962>}
+2> PrivKey = #{engine => EngineRef,
+               key_id => "id of the private key in Engine"}.
+...
+3> Signature = crypto:sign(rsa, sha, &lt;&lt;"The message">>, PrivKey).
+&lt;&lt;65,6,125,254,54,233,84,77,83,63,168,28,169,214,121,76,
+  207,177,124,183,156,185,160,243,36,79,125,230,231,...>>
+      </code>
+    </section>
+
+    <section>
+      <title>Verify with an engine stored public key</title>
+      <p>
+	Here the signature and message in the last example is verifyed using the public key.
+	The public key is stored in an engine, only to exemplify that it is possible. The public
+	key could of course be handled openly as usual.
+      </p>
+      <code>
+4> PublicKey = #{engine => EngineRef,
+                 key_id => "id of the public key in Engine"}.
+...
+5> crypto:verify(rsa, sha, &lt;&lt;"The message">>, Signature, PublicKey).
+true
+6> 
+      </code>
+    </section>
+
+    <section>
+      <title>Using a password protected private key</title>
+      <p>
+	The same example as the first sign example, except that a password protects the key down in the Engine.
+      </p>
+      <code>
+6> PrivKeyPwd = #{engine => EngineRef,
+                  key_id => "id of the pwd protected private key in Engine",
+		  password => "password"}.
+...
+7> crypto:sign(rsa, sha, &lt;&lt;"The message">>, PrivKeyPwd).
+&lt;&lt;140,80,168,101,234,211,146,183,231,190,160,82,85,163,
+  175,106,77,241,141,120,72,149,181,181,194,154,175,76,
+  223,...>>
+8> 
+      </code>
+
+    </section>
+
+  </section>
+</chapter>
diff --git a/lib/crypto/doc/src/engine_load.xml b/lib/crypto/doc/src/engine_load.xml
new file mode 100644
index 0000000000..e5c3f5d561
--- /dev/null
+++ b/lib/crypto/doc/src/engine_load.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2017</year><year>2017</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      The contents of this file are subject to the Erlang Public License,
+      Version 1.1, (the "License"); you may not use this file except in
+      compliance with the License. You should have received a copy of the
+      Erlang Public License along with this software. If not, it can be
+      retrieved online at http://www.erlang.org/.
+
+      Software distributed under the License is distributed on an "AS IS"
+      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+      the License for the specific language governing rights and limitations
+      under the License.
+    </legalnotice>
+    <title>Engine Load</title>
+    <prepared>Lars Thorsén</prepared>
+    <date>2017-08-22</date>
+    <file>engine_load.xml</file>
+  </header>
+  <p>
+    <marker id="engine_load"></marker>
+    This chapter describes the support for loading encryption engines in the crypto application.
+  </p>
+
+  <section>
+    <title>Background</title>
+    <p>
+      OpenSSL exposes an Engine API, which makes it possible to plug in alternative
+      implementations for some or all of the cryptographic operations implemented by OpenSSL.
+      When configured appropriately, OpenSSL calls the engine's implementation of these
+      operations instead of its own.
+    </p>
+    <p>
+      Typically, OpenSSL engines provide a hardware implementation of specific cryptographic
+      operations. The hardware implementation usually offers improved performance over its
+      software-based counterpart, which is known as cryptographic acceleration.
+    </p>
+  </section>
+
+  <section>
+    <title>Use Cases</title>
+    <section>
+      <title>Dynamically load an engine from default directory</title>
+      <p>
+	If the engine is located in the OpenSSL/LibreSSL installation <c>engines</c> directory.
+      </p>
+      <code>
+1> {ok, Engine} = crypto:engine_load(&lt;&lt;"otp_test_engine">>, [], []).
+ {ok, #Ref}</code>
+       <note>
+	<p>The file name requirement on the engine dynamic library can differ between SSL versions.</p>
+      </note>
+    </section>
+
+    <section>
+      <title>Load an engine with the dynamic engine</title>
+      <p>
+	Load an engine with the help of the dynamic engine by giving the path to the library.
+      </p>
+      <code>
+ 2> {ok, Engine} = crypto:engine_load(&lt;&lt;"dynamic">>,
+                                      [{&lt;&lt;"SO_PATH">>,
+                                        &lt;&lt;"/some/path/otp_test_engine.so">>},
+                                       {&lt;&lt;"ID">>, &lt;&lt;"MD5">>},
+                                       &lt;&lt;"LOAD">>],
+                                      []).
+ {ok, #Ref}</code>
+      <note>
+	<p>The dynamic engine is not supported in LibreSSL from version 2.2.1</p>
+      </note>
+    </section>
+
+    <section>
+      <title>Load an engine and replace some methods</title>
+      <p>
+	Load an engine with the help of the dynamic engine and just
+	replace some engine methods.
+      </p>
+      <code>
+ 3> Methods = crypto:engine_get_all_methods() -- [engine_method_dh,engine_method_rand,
+engine_method_ciphers,engine_method_digests, engine_method_store,
+engine_method_pkey_meths, engine_method_pkey_asn1_meths].
+[engine_method_rsa,engine_method_dsa,
+ engine_method_ecdh,engine_method_ecdsa]
+ 4> {ok, Engine} = crypto:engine_load(&lt;&lt;"dynamic">>,
+                                      [{&lt;&lt;"SO_PATH">>,
+                                        &lt;&lt;"/some/path/otp_test_engine.so">>},
+                                       {&lt;&lt;"ID">>, &lt;&lt;"MD5">>},
+                                       &lt;&lt;"LOAD">>],
+                                      [],
+		                      Methods).
+ {ok, #Ref}</code>
+    </section>
+
+    <section>
+      <title>List all engines currently loaded</title>
+      <code>
+ 5> crypto:engine_list().
+[&lt;&lt;"dynamic">>, &lt;&lt;"MD5">>]</code>
+    </section>
+
+  </section>
+</chapter>
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 9376e6f649..dbeb886d7b 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,76 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The compatibility function <c>void HMAC_CTX_free</c> in
+	    <c>crypto.c</c> erroneously tried to return a value.</p>
+          <p>
+	    Own Id: OTP-14720</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Rewrite public and private key encode/decode with EVP
+	    api. New RSA padding options added. This is a modified
+	    half of PR-838.</p>
+          <p>
+	    Own Id: OTP-14446</p>
+        </item>
+        <item>
+          <p>
+	    The crypto API is extended to use private/public keys
+	    stored in an Engine for sign/verify or encrypt/decrypt
+	    operations.</p>
+          <p>
+	    The ssl application provides an API to use this new
+	    engine concept in TLS.</p>
+          <p>
+	    Own Id: OTP-14448</p>
+        </item>
+        <item>
+	    <p> Add support to plug in alternative implementations
+	    for some or all of the cryptographic operations supported
+	    by the OpenSSL Engine API. When configured appropriately,
+	    OpenSSL calls the engine's implementation of these
+	    operations instead of its own. </p>
+          <p>
+	    Own Id: OTP-14567</p>
+        </item>
+        <item>
+          <p>
+	    Replaced a call of the OpenSSL deprecated function
+	    <c>DH_generate_parameters</c> in <c>crypto.c</c>.</p>
+          <p>
+	    Own Id: OTP-14639</p>
+        </item>
+        <item>
+          <p>
+	    Documentation added about how to use keys stored in an
+	    Engine.</p>
+          <p>
+	    Own Id: OTP-14735 Aux Id: OTP-14448 </p>
+        </item>
+        <item>
+	    <p> Add engine_ ctrl_cmd_string/3,4 the OpenSSL Engine
+	    support in crypto. </p>
+          <p>
+	    Own Id: OTP-14801</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 4.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/doc/src/usersguide.xml b/lib/crypto/doc/src/usersguide.xml
index 7971aefff4..e2ba1fe160 100644
--- a/lib/crypto/doc/src/usersguide.xml
+++ b/lib/crypto/doc/src/usersguide.xml
@@ -11,7 +11,7 @@
       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
@@ -19,7 +19,7 @@
       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>Crypto User's Guide</title>
@@ -48,5 +48,6 @@
   </description>
   <xi:include href="licenses.xml"/>
   <xi:include href="fips.xml"/>
+  <xi:include href="engine_load.xml"/>
+  <xi:include href="engine_keys.xml"/>
 </part>
-
diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
index aea8a5a71c..edad0e6b61 100644
--- a/lib/crypto/src/Makefile
+++ b/lib/crypto/src/Makefile
@@ -39,8 +39,7 @@ MODULES= \
 	crypto \
 	crypto_ec_curves
 
-HRL_FILES= 
-
+HRL_FILES=
 ERL_FILES= $(MODULES:%=%.erl)
 
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
@@ -56,16 +55,16 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += -DCRYPTO_VSN=\"$(VSN)\" -Werror
+ERL_COMPILE_FLAGS += -DCRYPTO_VSN=\"$(VSN)\" -Werror -I../include
 
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
 
-debug opt valgrind: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) 
+debug opt valgrind: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
 clean:
-	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) 
+	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
@@ -78,7 +77,7 @@ docs:
 
 # ----------------------------------------------------
 # Release Target
-# ---------------------------------------------------- 
+# ----------------------------------------------------
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -89,10 +88,3 @@ release_spec: opt
 		$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
-
-
-
-
-
-
-
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 6b4f3a256d..ec2a1dba0a 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -42,13 +42,28 @@
 -export([stream_init/2, stream_init/3, stream_encrypt/2, stream_decrypt/2]).
 -export([public_encrypt/4, private_decrypt/4]).
 -export([private_encrypt/4, public_decrypt/4]).
--export([dh_generate_parameters/2, dh_check/1]). %% Testing see
+-export([privkey_to_pubkey/2]).
 -export([ec_curve/1, ec_curves/0]).
 -export([rand_seed/1]).
+%% Engine
+-export([
+         engine_get_all_methods/0,
+         engine_load/3,
+         engine_load/4,
+         engine_unload/1,
+         engine_list/0,
+         engine_ctrl_cmd_string/3,
+         engine_ctrl_cmd_string/4
+        ]).
+
+-export_type([engine_ref/0,
+              key_id/0,
+              password/0
+             ]).
 
-%% Private. For tests.
--export([packed_openssl_version/4]).
 
+%% Private. For tests.
+-export([packed_openssl_version/4, engine_methods_convert_to_bitmask/2, get_test_engine/0]).
 
 -deprecated({rand_uniform, 2, next_major_release}).
 
@@ -460,13 +475,24 @@ sign(Algorithm, Type, Data, Key, Options) ->
     end.
 
 
+
+-type key_id()   :: string() | binary() .
+-type password() :: string() | binary() .
+
+-type engine_key_ref() :: #{engine :=   engine_ref(),
+                            key_id :=   key_id(),
+                            password => password(),
+                            term() => term() 
+                           }.
+
 -type pk_algs() :: rsa | ecdsa | dss .
--type pk_opt() :: list() | rsa_padding() .
+-type pk_key()  :: engine_key_ref() | [integer() | binary()] .
+-type pk_opt()  :: list() | rsa_padding() .
 
--spec public_encrypt(pk_algs(),  binary(), [binary()],             pk_opt()) -> binary().
--spec public_decrypt(pk_algs(),  binary(), [integer() | binary()], pk_opt()) -> binary().
--spec private_encrypt(pk_algs(), binary(), [integer() | binary()], pk_opt()) -> binary().
--spec private_decrypt(pk_algs(), binary(), [integer() | binary()], pk_opt()) -> binary().
+-spec public_encrypt(pk_algs(),  binary(), pk_key(), pk_opt()) -> binary().
+-spec public_decrypt(pk_algs(),  binary(), pk_key(), pk_opt()) -> binary().
+-spec private_encrypt(pk_algs(), binary(), pk_key(), pk_opt()) -> binary().
+-spec private_decrypt(pk_algs(), binary(), pk_key(), pk_opt()) -> binary().
 
 public_encrypt(Algorithm, In, Key, Options) when is_list(Options) ->
     case pkey_crypt_nif(Algorithm, In, format_pkey(Algorithm, Key), Options, false, true) of
@@ -607,10 +633,174 @@ compute_key(ecdh, Others, My, Curve) ->
 			 nif_curve_params(Curve),
 			 ensure_int_as_bin(My)).
 
+%%======================================================================
+%% Engine functions
+%%======================================================================
+%%----------------------------------------------------------------------
+%% Function: engine_get_all_methods/0
+%%----------------------------------------------------------------------
+-type engine_method_type() :: engine_method_rsa | engine_method_dsa | engine_method_dh |
+                              engine_method_rand | engine_method_ecdh | engine_method_ecdsa |
+                              engine_method_ciphers | engine_method_digests | engine_method_store |
+                              engine_method_pkey_meths | engine_method_pkey_asn1_meths | 
+                              engine_method_ec.
+
+-type engine_ref() :: term().
+
+-spec engine_get_all_methods() ->
+    [engine_method_type()].
+engine_get_all_methods() ->
+     notsup_to_error(engine_get_all_methods_nif()).
+
+%%----------------------------------------------------------------------
+%% Function: engine_load/3
+%%----------------------------------------------------------------------
+-spec engine_load(EngineId::unicode:chardata(),
+                  PreCmds::[{unicode:chardata(), unicode:chardata()}],
+                  PostCmds::[{unicode:chardata(), unicode:chardata()}]) ->
+    {ok, Engine::engine_ref()} | {error, Reason::term()}.
+engine_load(EngineId, PreCmds, PostCmds) when is_list(PreCmds), is_list(PostCmds) ->
+    engine_load(EngineId, PreCmds, PostCmds, engine_get_all_methods()).
+
+%%----------------------------------------------------------------------
+%% Function: engine_load/4
+%%----------------------------------------------------------------------
+-spec engine_load(EngineId::unicode:chardata(),
+                  PreCmds::[{unicode:chardata(), unicode:chardata()}],
+                  PostCmds::[{unicode:chardata(), unicode:chardata()}],
+                  EngineMethods::[engine_method_type()]) ->
+    {ok, Engine::term()} | {error, Reason::term()}.
+engine_load(EngineId, PreCmds, PostCmds, EngineMethods) when is_list(PreCmds),
+                                                             is_list(PostCmds) ->
+    try
+        ok = notsup_to_error(engine_load_dynamic_nif()),
+        case notsup_to_error(engine_by_id_nif(ensure_bin_chardata(EngineId))) of
+            {ok, Engine} ->
+                ok = engine_load_1(Engine, PreCmds, PostCmds, EngineMethods),
+                {ok, Engine};
+            {error, Error1} ->
+                {error, Error1}
+        end
+    catch
+       throw:Error2 ->
+          Error2
+    end.
+
+engine_load_1(Engine, PreCmds, PostCmds, EngineMethods) ->
+    try
+        ok = engine_nif_wrapper(engine_ctrl_cmd_strings_nif(Engine, ensure_bin_cmds(PreCmds), 0)),
+        ok = engine_nif_wrapper(engine_add_nif(Engine)),
+        ok = engine_nif_wrapper(engine_init_nif(Engine)),
+        engine_load_2(Engine, PostCmds, EngineMethods),
+        ok
+    catch
+       throw:Error ->
+          %% The engine couldn't initialise, release the structural reference
+          ok = engine_free_nif(Engine),
+          throw(Error)
+    end.
+
+engine_load_2(Engine, PostCmds, EngineMethods) ->
+    try
+        ok = engine_nif_wrapper(engine_ctrl_cmd_strings_nif(Engine, ensure_bin_cmds(PostCmds), 0)),
+        [ok = engine_nif_wrapper(engine_register_nif(Engine, engine_method_atom_to_int(Method))) ||
+            Method <- EngineMethods],
+        ok
+    catch
+       throw:Error ->
+          %% The engine registration failed, release the functional reference
+          ok = engine_finish_nif(Engine),
+          throw(Error)
+    end.
+
+%%----------------------------------------------------------------------
+%% Function: engine_unload/1
+%%----------------------------------------------------------------------
+-spec engine_unload(Engine::term()) ->
+    ok | {error, Reason::term()}.
+engine_unload(Engine) ->
+    engine_unload(Engine, engine_get_all_methods()).
+
+-spec engine_unload(Engine::term(), EngineMethods::[engine_method_type()]) ->
+    ok | {error, Reason::term()}.
+engine_unload(Engine, EngineMethods) ->
+    try
+        [ok = engine_nif_wrapper(engine_unregister_nif(Engine, engine_method_atom_to_int(Method))) ||
+            Method <- EngineMethods],
+        ok = engine_nif_wrapper(engine_remove_nif(Engine)),
+        %% Release the functional reference from engine_init_nif
+        ok = engine_nif_wrapper(engine_finish_nif(Engine)),
+        %% Release the structural reference from engine_by_id_nif
+        ok = engine_nif_wrapper(engine_free_nif(Engine))
+    catch
+       throw:Error ->
+          Error
+    end.
+
+%%----------------------------------------------------------------------
+%% Function: engine_list/0
+%%----------------------------------------------------------------------
+-spec engine_list() ->
+    [EngineId::binary()].
+engine_list() ->
+    case notsup_to_error(engine_get_first_nif()) of
+        {ok, <<>>} ->
+            [];
+        {ok, Engine} ->
+            case notsup_to_error(engine_get_id_nif(Engine)) of
+                {ok, <<>>} ->
+                    engine_list(Engine, []);
+                {ok, EngineId} ->
+                    engine_list(Engine, [EngineId])
+            end
+    end.
+
+engine_list(Engine0, IdList) ->
+    case notsup_to_error(engine_get_next_nif(Engine0)) of
+        {ok, <<>>} ->
+            lists:reverse(IdList);
+        {ok, Engine1} ->
+            case notsup_to_error(engine_get_id_nif(Engine1)) of
+                {ok, <<>>} ->
+                    engine_list(Engine1, IdList);
+                {ok, EngineId} ->
+                    engine_list(Engine1, [EngineId |IdList])
+            end
+    end.
+
+%%----------------------------------------------------------------------
+%% Function: engine_ctrl_cmd_string/3
+%%----------------------------------------------------------------------
+-spec engine_ctrl_cmd_string(Engine::term(),
+                      CmdName::unicode:chardata(), 
+                      CmdArg::unicode:chardata()) ->
+    ok | {error, Reason::term()}.
+engine_ctrl_cmd_string(Engine, CmdName, CmdArg) ->
+    engine_ctrl_cmd_string(Engine, CmdName, CmdArg, false).
+
+%%----------------------------------------------------------------------
+%% Function: engine_ctrl_cmd_string/4
+%%----------------------------------------------------------------------
+-spec engine_ctrl_cmd_string(Engine::term(),
+                      CmdName::unicode:chardata(), 
+                      CmdArg::unicode:chardata(),
+                      Optional::boolean()) ->
+    ok | {error, Reason::term()}.
+engine_ctrl_cmd_string(Engine, CmdName, CmdArg, Optional) ->
+    case engine_ctrl_cmd_strings_nif(Engine, 
+                                     ensure_bin_cmds([{CmdName, CmdArg}]), 
+                                     bool_to_int(Optional)) of
+        ok ->
+            ok;
+        notsup ->
+            erlang:error(notsup);
+        {error, Error} ->
+            {error, Error}
+    end.
+
 %%--------------------------------------------------------------------
 %%% On load
 %%--------------------------------------------------------------------
-
 on_load() ->
     LibBaseName = "crypto",
     PrivDir = code:priv_dir(crypto),
@@ -670,12 +860,12 @@ path2bin(Path) when is_list(Path) ->
     end.
 
 %%--------------------------------------------------------------------
-%%% Internal functions 
+%%% Internal functions
 %%--------------------------------------------------------------------
 max_bytes() ->
     ?MAX_BYTES_TO_NIF.
 
-notsup_to_error(notsup) ->
+notsup_to_error(notsup) -> 
     erlang:error(notsup);
 notsup_to_error(Other) ->
     Other.
@@ -799,7 +989,7 @@ do_stream_decrypt({rc4, State0}, Data) ->
 
 
 %%
-%% AES - in counter mode (CTR) with state maintained for multi-call streaming 
+%% AES - in counter mode (CTR) with state maintained for multi-call streaming
 %%
 -type ctr_state() :: { iodata(), binary(), binary(), integer() } | binary().
 
@@ -808,11 +998,11 @@ do_stream_decrypt({rc4, State0}, Data) ->
 				 { ctr_state(), binary() }.
 -spec aes_ctr_stream_decrypt(ctr_state(), binary()) ->
 				 { ctr_state(), binary() }.
- 
+
 aes_ctr_stream_init(_Key, _IVec) -> ?nif_stub.
 aes_ctr_stream_encrypt(_State, _Data) -> ?nif_stub.
 aes_ctr_stream_decrypt(_State, _Cipher) -> ?nif_stub.
-     
+
 %%
 %% RC4 - symmetric stream cipher
 %%
@@ -897,28 +1087,7 @@ pkey_verify_nif(_Algorithm, _Type, _Data, _Signature, _Key, _Options) -> ?nif_st
 rsa_generate_key_nif(_Bits, _Exp) -> ?nif_stub.
 
 %% DH Diffie-Hellman functions
-%% 
-
-%% Generate (and check) Parameters is not documented because they are implemented
-%% for testing (and offline parameter generation) only.
-%% From the openssl doc: 
-%%  DH_generate_parameters() may run for several hours before finding a suitable prime.
-%% Thus dh_generate_parameters may in this implementation block 
-%% the emulator for several hours.
 %%
-%% usage: dh_generate_parameters(1024, 2 or 5) -> 
-%%    [Prime=mpint(), SharedGenerator=mpint()]
-dh_generate_parameters(PrimeLen, Generator) ->
-    case dh_generate_parameters_nif(PrimeLen, Generator) of
-	error -> erlang:error(generation_failed, [PrimeLen,Generator]);
-	Ret -> Ret
-    end.  
-
-dh_generate_parameters_nif(_PrimeLen, _Generator) -> ?nif_stub.
-
-%% Checks that the DHParameters are ok.
-%% DHParameters = [P (Prime)= mpint(), G(Generator) = mpint()]
-dh_check([_Prime,_Gen]) -> ?nif_stub.
 
 %% DHParameters = [P (Prime)= mpint(), G(Generator) = mpint()]
 %% PrivKey = mpint()
@@ -938,6 +1107,24 @@ ec_curves() ->
 ec_curve(X) ->
     crypto_ec_curves:curve(X).
 
+
+privkey_to_pubkey(Alg, EngineMap) when Alg == rsa; Alg == dss; Alg == ecdsa ->
+    try privkey_to_pubkey_nif(Alg, format_pkey(Alg,EngineMap))
+    of
+        [_|_]=L -> map_ensure_bin_as_int(L);
+        X -> X
+    catch
+        error:badarg when Alg==ecdsa ->
+            {error, notsup};
+        error:badarg ->
+            {error, not_found};
+        error:notsup ->
+            {error, notsup}
+    end.
+            
+privkey_to_pubkey_nif(_Alg, _EngineMap) -> ?nif_stub.
+
+
 %%
 %% EC
 %%
@@ -1005,6 +1192,19 @@ ensure_int_as_bin(Int) when is_integer(Int) ->
 ensure_int_as_bin(Bin) ->
     Bin.
 
+map_ensure_bin_as_int(List) when is_list(List) ->
+    lists:map(fun ensure_bin_as_int/1, List).
+
+ensure_bin_as_int(Bin) when is_binary(Bin) ->
+    bin_to_int(Bin);
+ensure_bin_as_int(E) ->
+    E.
+
+format_pkey(_Alg, #{engine:=_, key_id:=T}=M) when is_binary(T) -> format_pwd(M);
+format_pkey(_Alg, #{engine:=_, key_id:=T}=M) when is_list(T) -> format_pwd(M#{key_id:=list_to_binary(T)});
+format_pkey(_Alg, #{engine:=_           }=M) -> error({bad_key_id, M});
+format_pkey(_Alg, #{}=M) -> error({bad_engine_map, M});
+%%%
 format_pkey(rsa, Key) ->
     map_ensure_int_as_bin(Key);
 format_pkey(ecdsa, [Key, Curve]) ->
@@ -1014,6 +1214,9 @@ format_pkey(dss, Key) ->
 format_pkey(_, Key) ->
     Key.
 
+format_pwd(#{password := Pwd}=M) when is_list(Pwd) -> M#{password := list_to_binary(Pwd)};
+format_pwd(M) -> M.
+
 %%--------------------------------------------------------------------
 %%
 -type rsa_padding() :: 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' | 'rsa_no_padding'.
@@ -1024,7 +1227,7 @@ pkey_crypt_nif(_Algorithm, _In, _Key, _Options, _IsPrivate, _IsEncrypt) -> ?nif_
 %% MP representaion  (SSH2)
 mpint(X) when X < 0 -> mpint_neg(X);
 mpint(X) -> mpint_pos(X).
- 
+
 -define(UINT32(X),   X:32/unsigned-big-integer).
 
 
@@ -1032,7 +1235,7 @@ mpint_neg(X) ->
     Bin = int_to_bin_neg(X, []),
     Sz = byte_size(Bin),
     <<?UINT32(Sz), Bin/binary>>.
-    
+
 mpint_pos(X) ->
     Bin = int_to_bin_pos(X, []),
     <<MSB,_/binary>> = Bin,
@@ -1054,7 +1257,6 @@ erlint(<<MPIntSize:32/integer,MPIntValue/binary>>) ->
 %%
 mod_exp_nif(_Base,_Exp,_Mod,_bin_hdr) -> ?nif_stub.
 
-
 %%%----------------------------------------------------------------
 %% 9470495 == V(0,9,8,zh).
 %% 268435615 == V(1,0,0,i).
@@ -1065,3 +1267,95 @@ packed_openssl_version(MAJ, MIN, FIX, P0) ->
     P1 = atom_to_list(P0),
     P = lists:sum([C-$a||C<-P1]),
     ((((((((MAJ bsl 8) bor MIN) bsl 8 ) bor FIX) bsl 8) bor (P+1)) bsl 4) bor 16#f).
+
+%%--------------------------------------------------------------------
+%% Engine nifs
+engine_by_id_nif(_EngineId) -> ?nif_stub.
+engine_init_nif(_Engine) -> ?nif_stub.
+engine_finish_nif(_Engine) -> ?nif_stub.
+engine_free_nif(_Engine) -> ?nif_stub.
+engine_load_dynamic_nif() -> ?nif_stub.
+engine_ctrl_cmd_strings_nif(_Engine, _Cmds, _Optional) -> ?nif_stub.
+engine_add_nif(_Engine)  -> ?nif_stub.
+engine_remove_nif(_Engine)  -> ?nif_stub.
+engine_register_nif(_Engine, _EngineMethod) -> ?nif_stub.
+engine_unregister_nif(_Engine, _EngineMethod) -> ?nif_stub.
+engine_get_first_nif() -> ?nif_stub.
+engine_get_next_nif(_Engine) -> ?nif_stub.
+engine_get_id_nif(_Engine) -> ?nif_stub.
+engine_get_all_methods_nif() -> ?nif_stub.
+
+%%--------------------------------------------------------------------
+%% Engine internals
+engine_nif_wrapper(ok) ->
+    ok;
+engine_nif_wrapper(notsup) ->
+    erlang:error(notsup);
+engine_nif_wrapper({error, Error}) ->
+    throw({error, Error}).
+
+ensure_bin_chardata(CharData) when is_binary(CharData) ->
+    CharData;
+ensure_bin_chardata(CharData) ->
+    unicode:characters_to_binary(CharData).
+
+ensure_bin_cmds(CMDs) ->
+    ensure_bin_cmds(CMDs, []).
+
+ensure_bin_cmds([], Acc) ->
+    lists:reverse(Acc);
+ensure_bin_cmds([{Key, Value} |CMDs], Acc) ->
+    ensure_bin_cmds(CMDs, [{ensure_bin_chardata(Key), ensure_bin_chardata(Value)} | Acc]);
+ensure_bin_cmds([Key | CMDs], Acc) ->
+    ensure_bin_cmds(CMDs, [{ensure_bin_chardata(Key), <<"">>} | Acc]).
+
+engine_methods_convert_to_bitmask([], BitMask) ->
+    BitMask;
+engine_methods_convert_to_bitmask(engine_method_all, _BitMask) ->
+    16#FFFF;
+engine_methods_convert_to_bitmask(engine_method_none, _BitMask) ->
+    16#0000;
+engine_methods_convert_to_bitmask([M |Ms], BitMask) ->
+    engine_methods_convert_to_bitmask(Ms, BitMask bor engine_method_atom_to_int(M)).
+
+bool_to_int(true) -> 1;
+bool_to_int(false) -> 0.
+
+engine_method_atom_to_int(engine_method_rsa) -> 16#0001;
+engine_method_atom_to_int(engine_method_dsa) -> 16#0002;
+engine_method_atom_to_int(engine_method_dh) -> 16#0004;
+engine_method_atom_to_int(engine_method_rand) -> 16#0008;
+engine_method_atom_to_int(engine_method_ecdh) -> 16#0010;
+engine_method_atom_to_int(engine_method_ecdsa) -> 16#0020;
+engine_method_atom_to_int(engine_method_ciphers) -> 16#0040;
+engine_method_atom_to_int(engine_method_digests) -> 16#0080;
+engine_method_atom_to_int(engine_method_store) -> 16#0100;
+engine_method_atom_to_int(engine_method_pkey_meths) -> 16#0200;
+engine_method_atom_to_int(engine_method_pkey_asn1_meths) -> 16#0400;
+engine_method_atom_to_int(engine_method_ec) -> 16#0800;
+engine_method_atom_to_int(X) ->
+    erlang:error(badarg, [X]).
+
+get_test_engine() ->
+    Type = erlang:system_info(system_architecture),
+    LibDir = filename:join([code:priv_dir(crypto), "lib"]),
+    ArchDir = filename:join([LibDir, Type]),
+    case filelib:is_dir(ArchDir) of        
+	true  -> check_otp_test_engine(ArchDir);
+	false -> check_otp_test_engine(LibDir)
+    end.
+
+check_otp_test_engine(LibDir) ->
+    case filelib:wildcard("otp_test_engine*", LibDir) of
+        [] ->
+            {error, notexist};
+        [LibName] ->
+            LibPath = filename:join(LibDir,LibName),
+            case filelib:is_file(LibPath) of
+                true ->
+                    {ok, unicode:characters_to_binary(LibPath)};
+                false ->
+                    {error, notexist}
+            end
+    end.
+            
diff --git a/lib/crypto/test/Makefile b/lib/crypto/test/Makefile
index 138081d386..e046a25338 100644
--- a/lib/crypto/test/Makefile
+++ b/lib/crypto/test/Makefile
@@ -7,7 +7,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 MODULES = \
 	blowfish_SUITE \
-	crypto_SUITE
+	crypto_SUITE \
+	engine_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -27,7 +28,7 @@ RELSYSDIR = $(RELEASE_PATH)/crypto_test
 # FLAGS
 # ----------------------------------------------------
 ERL_MAKE_FLAGS += 
-ERL_COMPILE_FLAGS +=
+ERL_COMPILE_FLAGS += +nowarn_export_all
 
 EBIN = .
 MAKE_EMAKE = $(wildcard $(ERL_TOP)/make/make_emakefile)
@@ -77,7 +78,7 @@ release_spec:
 release_tests_spec: $(TEST_TARGET)
 	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) crypto.spec crypto.cover $(RELTEST_FILES) "$(RELSYSDIR)"
-	@tar cfh - crypto_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	@tar cfh - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 	chmod -R u+w "$(RELSYSDIR)"
 
 release_docs_spec:
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 69f02d3da6..6dab459df6 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -198,7 +198,7 @@ init_per_suite(Config) ->
 		    %% This is NOT how you want to do seeding, it is just here
 		    %% to make the tests pass. Check your OS manual for how you
 		    %% really want to seed.
-		    {H,M,L} = erlang:now(),
+		    {H,M,L} = erlang:timestamp(),
 		    Bin = <<H:24,M:20,L:20>>,
 		    crypto:rand_seed(<< <<Bin/binary>> || _ <- lists:seq(1,16) >>),
 		    Config
diff --git a/lib/crypto/test/engine_SUITE.erl b/lib/crypto/test/engine_SUITE.erl
new file mode 100644
index 0000000000..f410542f72
--- /dev/null
+++ b/lib/crypto/test/engine_SUITE.erl
@@ -0,0 +1,665 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-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.
+%% 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(engine_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds, 10}}
+    ].
+
+all() ->
+    [
+     get_all_possible_methods,
+     engine_load_all_methods,
+     engine_load_some_methods,
+     bad_arguments,
+     unknown_engine,
+     pre_command_fail_bad_value,
+     pre_command_fail_bad_key,
+     failed_engine_init,
+     ctrl_cmd_string,
+     ctrl_cmd_string_optional,
+     {group, engine_stored_key}
+    ].
+
+groups() ->
+    [{engine_stored_key, [],
+      [sign_verify_rsa,
+       sign_verify_dsa,
+       sign_verify_ecdsa,
+       sign_verify_rsa_pwd,
+       sign_verify_rsa_pwd_bad_pwd,
+       priv_encrypt_pub_decrypt_rsa,
+       priv_encrypt_pub_decrypt_rsa_pwd,
+       pub_encrypt_priv_decrypt_rsa,
+       pub_encrypt_priv_decrypt_rsa_pwd,
+       get_pub_from_priv_key_rsa,
+       get_pub_from_priv_key_rsa_pwd,
+       get_pub_from_priv_key_rsa_pwd_no_pwd,
+       get_pub_from_priv_key_rsa_pwd_bad_pwd,
+       get_pub_from_priv_key_dsa,
+       get_pub_from_priv_key_ecdsa
+      ]}].
+
+
+init_per_suite(Config) ->
+    try crypto:start() of
+	ok ->
+            case crypto:info_lib() of
+                [{_,_, <<"OpenSSL 1.0.1s-freebsd  1 Mar 2016">>}] ->
+                    {skip, "Problem with engine on OpenSSL 1.0.1s-freebsd"};
+                _ ->
+                    Config
+            end;
+        {error,{already_started,crypto}} ->
+            Config
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+init_per_group(engine_stored_key, Config) ->
+    case load_storage_engine(Config) of
+        {ok, E} ->
+            KeyDir = key_dir(Config),
+            [{storage_engine,E}, {storage_dir,KeyDir} | Config];
+        {error, notexist} ->
+            {skip, "OTP Test engine not found"};
+        {error, notsup} ->
+            {skip, "Engine not supported on this OpenSSL version"};
+        {error, bad_engine_id} ->
+            {skip, "Dynamic Engine not supported"};
+        Other ->
+            ct:log("Engine load failed: ~p",[Other]),
+            {fail, "Engine load failed"}
+    end;
+init_per_group(_Group, Config0) ->
+    Config0.
+
+end_per_group(engine_stored_key, Config) ->
+    case proplists:get_value(storage_engine, Config) of
+        undefined ->
+            ok;
+        E ->
+            ok = crypto:engine_unload(E)
+    end;
+end_per_group(_, _) ->
+    ok.
+
+%%--------------------------------------------------------------------
+init_per_testcase(_Case, Config) ->
+    Config.
+end_per_testcase(_Case, _Config) ->
+    ok.
+
+%%-------------------------------------------------------------------------
+%% Test cases starts here.
+%%-------------------------------------------------------------------------
+get_all_possible_methods() ->
+    [{doc, "Just fetch all possible engine methods supported."}].
+
+get_all_possible_methods(Config) when is_list(Config) ->
+    try
+        List = crypto:engine_get_all_methods(),
+        ct:log("crypto:engine_get_all_methods() -> ~p\n", [List]),
+        ok
+    catch
+        error:notsup ->
+            {skip, "Engine not supported on this OpenSSL version"}
+    end.
+
+engine_load_all_methods()->
+    [{doc, "Use a dummy md5 engine that does not implement md5"
+      "but rather returns a static binary to test that crypto:engine_load "
+      "functions works."}].
+
+engine_load_all_methods(Config) when is_list(Config) ->
+    case crypto:get_test_engine() of
+        {error, notexist} ->
+            {skip, "OTP Test engine not found"};
+        {ok, Engine} ->
+            try 
+                Md5Hash1 =  <<106,30,3,246,166,222,229,158,244,217,241,179,50,232,107,109>>,
+                Md5Hash1 = crypto:hash(md5, "Don't panic"),
+                Md5Hash2 =  <<0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15>>,
+                case crypto:engine_load(<<"dynamic">>,
+                                        [{<<"SO_PATH">>, Engine},
+                                         {<<"ID">>, <<"MD5">>},
+                                         <<"LOAD">>],
+                                        []) of
+                    {ok, E} ->
+                        case crypto:hash(md5, "Don't panic") of
+                            Md5Hash1 ->
+                                ct:fail(fail_to_load_still_original_engine);
+                            Md5Hash2 ->
+                                ok;
+                            _ ->
+                                ct:fail(fail_to_load_engine)
+                        end,
+                        ok = crypto:engine_unload(E),
+                        case crypto:hash(md5, "Don't panic") of
+                            Md5Hash2 ->
+                                ct:fail(fail_to_unload_still_test_engine);
+                            Md5Hash1 ->
+                                ok;
+                            _ ->
+                                ct:fail(fail_to_unload_engine)
+                        end;
+                    {error, bad_engine_id} ->
+                        {skip, "Dynamic Engine not supported"}
+                end
+           catch
+               error:notsup ->
+                  {skip, "Engine not supported on this OpenSSL version"}
+           end
+    end.
+
+engine_load_some_methods()->
+    [{doc, "Use a dummy md5 engine that does not implement md5"
+      "but rather returns a static binary to test that crypto:engine_load "
+      "functions works."}].
+
+engine_load_some_methods(Config) when is_list(Config) ->
+    case crypto:get_test_engine() of
+        {error, notexist} ->
+            {skip, "OTP Test engine not found"};
+        {ok, Engine} ->
+            try 
+                Md5Hash1 =  <<106,30,3,246,166,222,229,158,244,217,241,179,50,232,107,109>>,
+                Md5Hash1 = crypto:hash(md5, "Don't panic"),
+                Md5Hash2 =  <<0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15>>,
+                EngineMethods = crypto:engine_get_all_methods() --
+                    [engine_method_dh,engine_method_rand,
+                     engine_method_ciphers, engine_method_store,
+                     engine_method_pkey_meths, engine_method_pkey_asn1_meths],
+                case crypto:engine_load(<<"dynamic">>,
+                                        [{<<"SO_PATH">>, Engine},
+                                         {<<"ID">>, <<"MD5">>},
+                                         <<"LOAD">>],
+                                        [],
+                                        EngineMethods) of
+                    {ok, E} ->        
+                        case crypto:hash(md5, "Don't panic") of
+                            Md5Hash1 ->
+                                ct:fail(fail_to_load_engine_still_original);
+                            Md5Hash2 ->
+                                ok;
+                            _ ->
+                                ct:fail(fail_to_load_engine)
+                        end,
+                        ok = crypto:engine_unload(E),
+                        case crypto:hash(md5, "Don't panic") of
+                            Md5Hash2 ->
+                                ct:fail(fail_to_unload_still_test_engine);
+                            Md5Hash1 ->
+                                ok;
+                            _ ->
+                                ct:fail(fail_to_unload_engine)
+                        end;
+                    {error, bad_engine_id} ->
+                    {skip, "Dynamic Engine not supported"}
+                end
+           catch
+               error:notsup ->
+                  {skip, "Engine not supported on this OpenSSL version"}
+           end
+    end.
+
+%%-------------------------------------------------------------------------
+%% Error cases
+bad_arguments()->
+    [{doc, "Test different arguments in bad format."}].
+
+bad_arguments(Config) when is_list(Config) ->
+    case crypto:get_test_engine() of
+        {error, notexist} ->
+            {skip, "OTP Test engine not found"};
+        {ok, Engine} ->
+            try 
+                try
+                    crypto:engine_load(fail_engine, [], [])
+                catch
+                    error:badarg ->
+                       ok
+                end,
+                try
+                    crypto:engine_load(<<"dynamic">>,
+                                       [{<<"SO_PATH">>, Engine},
+                                        1,
+                                        {<<"ID">>, <<"MD5">>},
+                                        <<"LOAD">>],
+                                       [])
+                catch
+                    error:badarg ->
+                       ok
+                end,
+                try
+                    crypto:engine_load(<<"dynamic">>,
+                                       [{<<"SO_PATH">>, Engine},
+                                        {'ID', <<"MD5">>},
+                                        <<"LOAD">>],
+                                       [])
+                catch
+                    error:badarg ->
+                       ok
+                end
+          catch
+              error:notsup ->
+                 {skip, "Engine not supported on this OpenSSL version"}
+          end
+    end.
+
+unknown_engine() ->
+    [{doc, "Try to load a non existent engine."}].
+
+unknown_engine(Config) when is_list(Config) ->
+    try
+        {error, bad_engine_id} = crypto:engine_load(<<"fail_engine">>, [], []),
+        ok
+    catch
+        error:notsup ->
+           {skip, "Engine not supported on this OpenSSL version"}
+    end.
+
+pre_command_fail_bad_value() ->
+    [{doc, "Test pre command due to bad value"}].
+
+pre_command_fail_bad_value(Config) when is_list(Config) ->
+    DataDir = unicode:characters_to_binary(code:priv_dir(crypto)),
+    try
+        case crypto:engine_load(<<"dynamic">>,
+                                [{<<"SO_PATH">>,
+                                  <<DataDir/binary, <<"/libfail_engine.so">>/binary >>},
+                                 {<<"ID">>, <<"MD5">>},
+                                 <<"LOAD">>],
+                                []) of
+            {error, ctrl_cmd_failed} ->
+                ok;
+            {error, bad_engine_id} ->
+                {skip, "Dynamic Engine not supported"}
+        end
+    catch
+        error:notsup ->
+           {skip, "Engine not supported on this OpenSSL version"}
+    end.
+
+pre_command_fail_bad_key() ->
+    [{doc, "Test pre command due to bad key"}].
+
+pre_command_fail_bad_key(Config) when is_list(Config) ->
+    try
+        case crypto:get_test_engine() of
+            {error, notexist} ->
+                {skip, "OTP Test engine not found"};
+            {ok, Engine} ->
+                case crypto:engine_load(<<"dynamic">>,
+                                        [{<<"SO_WRONG_PATH">>, Engine},
+                                         {<<"ID">>, <<"MD5">>},
+                                         <<"LOAD">>],
+                                        []) of
+                    {error, ctrl_cmd_failed} ->
+                        ok;
+                    {error, bad_engine_id} ->
+                        {skip, "Dynamic Engine not supported"}
+                end
+        end
+   catch 
+       error:notsup ->
+          {skip, "Engine not supported on this OpenSSL version"}
+   end.
+
+failed_engine_init()->
+    [{doc, "Test failing engine init due to missed pre command"}].
+
+failed_engine_init(Config) when is_list(Config) ->
+    try
+        case crypto:get_test_engine() of
+            {error, notexist} ->
+                {skip, "OTP Test engine not found"};
+            {ok, Engine} ->
+                case crypto:engine_load(<<"dynamic">>,
+                                        [{<<"SO_PATH">>, Engine},
+                                         {<<"ID">>, <<"MD5">>}],
+                                        []) of
+                    {error, add_engine_failed} ->
+                        ok;
+                    {error, bad_engine_id} ->
+                        {skip, "Dynamic Engine not supported"}
+                end
+        end
+   catch 
+       error:notsup ->
+          {skip, "Engine not supported on this OpenSSL version"}
+   end.
+
+
+ctrl_cmd_string()->
+    [{doc, "Test that a not known optional ctrl comand do not fail"}].
+ctrl_cmd_string(Config) when is_list(Config) ->
+    try
+        case crypto:get_test_engine() of
+            {error, notexist} ->
+                {skip, "OTP Test engine not found"};
+            {ok, Engine} ->
+                case crypto:engine_load(<<"dynamic">>,
+                                        [{<<"SO_PATH">>, Engine},
+                                         {<<"ID">>, <<"MD5">>},
+                                         <<"LOAD">>],
+                                        []) of
+                    {ok, E} ->        
+                        case crypto:engine_ctrl_cmd_string(E, <<"TEST">>, <<"17">>) of
+                            ok ->
+                                ct:fail(fail_ctrl_cmd_should_fail);
+                            {error,ctrl_cmd_failed} -> 
+                                ok
+                        end,
+                        ok = crypto:engine_unload(E);              
+                    {error, bad_engine_id} ->
+                        {skip, "Dynamic Engine not supported"}
+                end
+        end
+   catch 
+       error:notsup ->
+          {skip, "Engine not supported on this OpenSSL version"}
+   end.        
+
+ctrl_cmd_string_optional()->
+    [{doc, "Test that a not known optional ctrl comand do not fail"}].
+ctrl_cmd_string_optional(Config) when is_list(Config) ->
+    try
+        case crypto:get_test_engine() of
+            {error, notexist} ->
+                {skip, "OTP Test engine not found"};
+            {ok, Engine} ->
+                case crypto:engine_load(<<"dynamic">>,
+                                        [{<<"SO_PATH">>, Engine},
+                                         {<<"ID">>, <<"MD5">>},
+                                         <<"LOAD">>],
+                                        []) of
+                    {ok, E} ->        
+                        case crypto:engine_ctrl_cmd_string(E, <<"TEST">>, <<"17">>, true) of
+                            ok ->
+                                ok;
+                            _ -> 
+                                ct:fail(fail_ctrl_cmd_string)
+                        end,
+                        ok = crypto:engine_unload(E);              
+                    {error, bad_engine_id} ->
+                        {skip, "Dynamic Engine not supported"}
+                end
+        end
+   catch 
+       error:notsup ->
+          {skip, "Engine not supported on this OpenSSL version"}
+   end.        
+
+%%%----------------------------------------------------------------
+%%% Pub/priv key storage tests.  Thoose are for testing the crypto.erl
+%%% support for using priv/pub keys stored in an engine.
+
+sign_verify_rsa(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key.pem")},
+    Pub  = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_public_key.pem")},
+    sign_verify(rsa, sha, Priv, Pub).
+
+sign_verify_dsa(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "dsa_private_key.pem")},
+    Pub  = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "dsa_public_key.pem")},
+    sign_verify(dss, sha, Priv, Pub).
+
+sign_verify_ecdsa(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "ecdsa_private_key.pem")},
+    Pub  = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "ecdsa_public_key.pem")},
+    sign_verify(ecdsa, sha, Priv, Pub).
+
+sign_verify_rsa_pwd(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key_pwd.pem"),
+             password => "password"},
+    Pub  = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_public_key_pwd.pem")},
+    sign_verify(rsa, sha, Priv, Pub).
+
+sign_verify_rsa_pwd_bad_pwd(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key_pwd.pem"),
+             password => "Bad password"},
+    Pub  = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_public_key_pwd.pem")},
+    try sign_verify(rsa, sha, Priv, Pub) of
+        _ -> {fail, "PWD prot pubkey sign succeded with no pwd!"}
+    catch
+        error:badarg -> ok
+    end.  
+
+priv_encrypt_pub_decrypt_rsa(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key.pem")},
+    Pub  = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_public_key.pem")},
+    priv_enc_pub_dec(rsa, Priv, Pub,  rsa_pkcs1_padding).
+
+priv_encrypt_pub_decrypt_rsa_pwd(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key_pwd.pem"),
+             password => "password"},
+    Pub  = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_public_key_pwd.pem")},
+    priv_enc_pub_dec(rsa, Priv, Pub,  rsa_pkcs1_padding).
+
+pub_encrypt_priv_decrypt_rsa(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key.pem")},
+    Pub  = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_public_key.pem")},
+    pub_enc_priv_dec(rsa, Pub, Priv,  rsa_pkcs1_padding).
+
+pub_encrypt_priv_decrypt_rsa_pwd(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key_pwd.pem"),
+             password => "password"},
+    Pub  = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_public_key_pwd.pem")},
+    pub_enc_priv_dec(rsa, Pub, Priv,  rsa_pkcs1_padding).
+
+get_pub_from_priv_key_rsa(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key.pem")},
+    case crypto:privkey_to_pubkey(rsa, Priv) of
+        {error, not_found} ->
+            {fail, "Key not found"};
+        {error, notsup} ->
+            {skip, "RSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
+        Pub ->
+            ct:log("rsa Pub = ~p",[Pub]),
+            sign_verify(rsa, sha, Priv, Pub)
+    end.
+
+get_pub_from_priv_key_rsa_pwd(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key_pwd.pem"),
+             password => "password"},
+    case crypto:privkey_to_pubkey(rsa, Priv) of
+        {error, not_found} ->
+            {fail, "Key not found"};
+        {error, notsup} ->
+            {skip, "RSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
+        Pub ->
+            ct:log("rsa Pub = ~p",[Pub]),
+            sign_verify(rsa, sha, Priv, Pub)
+    end.
+
+get_pub_from_priv_key_rsa_pwd_no_pwd(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key_pwd.pem")},
+    case crypto:privkey_to_pubkey(rsa, Priv) of
+        {error, not_found} ->
+            ok;
+        {error, notsup} ->
+            {skip, "RSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
+        Pub -> 
+            ct:log("rsa Pub = ~p",[Pub]),
+            {fail, "PWD prot pubkey fetch succeded although no pwd!"}
+    end.
+
+get_pub_from_priv_key_rsa_pwd_bad_pwd(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key_pwd.pem"),
+             password => "Bad password"},
+    case crypto:privkey_to_pubkey(rsa, Priv) of
+        {error, not_found} ->
+            ok;
+        {error, notsup} ->
+            {skip, "RSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
+        Pub -> 
+            ct:log("rsa Pub = ~p",[Pub]),
+            {fail, "PWD prot pubkey fetch succeded with bad pwd!"}
+    end.
+
+get_pub_from_priv_key_dsa(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "dsa_private_key.pem")},
+    case crypto:privkey_to_pubkey(dss, Priv) of
+        {error, not_found} ->
+            {fail, "Key not found"};
+        {error, notsup} ->
+            {skip, "DSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
+        Pub ->
+            ct:log("dsa Pub = ~p",[Pub]),
+            sign_verify(dss, sha, Priv, Pub)
+    end.
+
+get_pub_from_priv_key_ecdsa(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "ecdsa_private_key.pem")},
+    case crypto:privkey_to_pubkey(ecdsa, Priv) of
+        {error, not_found} ->
+            {fail, "Key not found"};
+        {error, notsup} ->
+            {skip, "ECDSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
+        Pub ->
+            ct:log("ecdsa Pub = ~p",[Pub]),
+            sign_verify(ecdsa, sha, Priv, Pub)
+    end.
+    
+%%%================================================================
+%%% Help for engine_stored_pub_priv_keys* test cases
+%%%
+load_storage_engine(_Config) ->
+    case crypto:get_test_engine() of
+        {ok, Engine} ->
+            try crypto:engine_load(<<"dynamic">>,
+                                   [{<<"SO_PATH">>, Engine},
+                                    <<"LOAD">>],
+                                   [])
+            catch
+                error:notsup ->
+                    {error, notsup}
+            end;
+
+        {error, Error} ->
+            {error, Error}
+    end.
+
+
+key_dir(Config) ->
+    DataDir = unicode:characters_to_binary(proplists:get_value(data_dir, Config)),
+    filename:join(DataDir, "pkcs8").
+
+
+engine_ref(Config) ->
+    proplists:get_value(storage_engine, Config).
+
+key_id(Config, File) ->
+    filename:join(proplists:get_value(storage_dir,Config), File).
+
+pubkey_alg_supported(Alg) ->
+    lists:member(Alg,
+                 proplists:get_value(public_keys, crypto:supports())).
+
+
+pub_enc_priv_dec(Alg, KeyEnc, KeyDec, Padding) ->
+    case pubkey_alg_supported(Alg) of
+        true ->
+            PlainText = <<"Hej på dig">>,
+            CryptoText = crypto:public_encrypt(Alg, PlainText, KeyEnc, Padding),
+            case crypto:private_decrypt(Alg, CryptoText, KeyDec, Padding) of
+                PlainText -> ok;
+                _ -> {fail, "Encrypt-decrypt error"}
+            end;
+        false ->
+            {skip, lists:concat([Alg," is not supported by cryptolib"])}
+    end.
+
+priv_enc_pub_dec(Alg, KeyEnc, KeyDec, Padding) ->
+    case pubkey_alg_supported(Alg) of
+        true ->
+            PlainText = <<"Hej på dig">>,
+            CryptoText = crypto:private_encrypt(Alg, PlainText, KeyEnc, Padding),
+            case crypto:public_decrypt(Alg, CryptoText, KeyDec, Padding) of
+                PlainText -> ok;
+                _ -> {fail, "Encrypt-decrypt error"}
+            end;
+        false ->
+            {skip, lists:concat([Alg," is not supported by cryptolib"])}
+    end.
+
+sign_verify(Alg, Sha, KeySign, KeyVerify) ->
+    case pubkey_alg_supported(Alg) of
+        true ->
+            PlainText = <<"Hej på dig">>,
+            Signature = crypto:sign(Alg, Sha, PlainText, KeySign),
+            case crypto:verify(Alg, Sha, PlainText, Signature, KeyVerify) of
+                true -> ok;
+                _ -> {fail, "Sign-verify error"}
+            end;
+        false ->
+            {skip, lists:concat([Alg," is not supported by cryptolib"])}
+    end.
diff --git a/lib/crypto/test/engine_SUITE_data/pkcs8/dsa_private_key.pem b/lib/crypto/test/engine_SUITE_data/pkcs8/dsa_private_key.pem
new file mode 100644
index 0000000000..778ffac675
--- /dev/null
+++ b/lib/crypto/test/engine_SUITE_data/pkcs8/dsa_private_key.pem
@@ -0,0 +1,9 @@
+-----BEGIN PRIVATE KEY-----
+MIIBSwIBADCCASwGByqGSM44BAEwggEfAoGBAMyitTMR7vPbpqyAXJpqnB0AhFwQ
+F87IE+JKFl5bD/MSkhhRV5sM73HUU1ooXY0FjhZ+cdLUCATuZR5ta4ydANqWIcAB
+gX3IwF1B4zf5SXEKTWkUYneL9dOKtiZLtoG28swrk8xMxwX+0fLHkltCEj6FiTW9
+PFrv8GmIfV6DjcI9AhUAqXWbb3RtoN9Ld28fVMhGZrj3LJUCgYEAwnxGHGBMpJaF
+2w7zAw3jHjL8PMYlV6vnufGHQlwF0ZUXJxRsvagMb/X1qACTu2VPYEVoLQGM3cfH
+EhHoQmvSXGAyTfR7Bmn3gf1n/s/DcFbdZduUCZ/rAyIrfd0eSbc1I+kZk85UCsKK
+w/IYdlqcuYa4Cgm2TapT5uEMqH4jhzEEFgIULh8swEUWmU8aJNWsrWl4eCiuUUg=
+-----END PRIVATE KEY-----
diff --git a/lib/crypto/test/engine_SUITE_data/pkcs8/dsa_public_key.pem b/lib/crypto/test/engine_SUITE_data/pkcs8/dsa_public_key.pem
new file mode 100644
index 0000000000..0fa5428828
--- /dev/null
+++ b/lib/crypto/test/engine_SUITE_data/pkcs8/dsa_public_key.pem
@@ -0,0 +1,12 @@
+-----BEGIN PUBLIC KEY-----
+MIIBtzCCASwGByqGSM44BAEwggEfAoGBAMyitTMR7vPbpqyAXJpqnB0AhFwQF87I
+E+JKFl5bD/MSkhhRV5sM73HUU1ooXY0FjhZ+cdLUCATuZR5ta4ydANqWIcABgX3I
+wF1B4zf5SXEKTWkUYneL9dOKtiZLtoG28swrk8xMxwX+0fLHkltCEj6FiTW9PFrv
+8GmIfV6DjcI9AhUAqXWbb3RtoN9Ld28fVMhGZrj3LJUCgYEAwnxGHGBMpJaF2w7z
+Aw3jHjL8PMYlV6vnufGHQlwF0ZUXJxRsvagMb/X1qACTu2VPYEVoLQGM3cfHEhHo
+QmvSXGAyTfR7Bmn3gf1n/s/DcFbdZduUCZ/rAyIrfd0eSbc1I+kZk85UCsKKw/IY
+dlqcuYa4Cgm2TapT5uEMqH4jhzEDgYQAAoGAXPygOFYdeKgfLmuIC303cESYXvic
+e2GNJomv8vaWLZmbLVVDfwA1fNsuF1hZkWw8f7aYaN9iZ3yl9u4Yk4TbJKkqfJqd
+dgVt288SUqvi+NMHODUzYi9KAOXxupXffZSvdu54gKRaDuFTZ5XNcRqIJWGYlJYg
+NVHF5FPZ4Bk2FYA=
+-----END PUBLIC KEY-----
diff --git a/lib/crypto/test/engine_SUITE_data/pkcs8/ecdsa_private_key.pem b/lib/crypto/test/engine_SUITE_data/pkcs8/ecdsa_private_key.pem
new file mode 100644
index 0000000000..a45522064f
--- /dev/null
+++ b/lib/crypto/test/engine_SUITE_data/pkcs8/ecdsa_private_key.pem
@@ -0,0 +1,8 @@
+-----BEGIN PRIVATE KEY-----
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIBparGjr0KcdNrVM2J
+G0mW5ltP1QyvxDqBMyWLWo3fruRZv6Qoohl5skd1u4O+KJoM/UrrSTOXI/MDR7NN
+i1yl7O+hgYkDgYYABAG8K2XVsK0ahG9+HIIPwCO0pJY8ulwSTXwIjkCGyB2lpglh
+8qJmRzuyGcfRTslv8wfv0sPlT9H9PKDvgrTUL7rvQQDdOODNgVPXSecUoXoPn+X+
+eqxs77bjx+A5x0t/i3m5PfkaNPh5MZ1H/bWuOOdj2ZXZw0R4rlVc0zVrgnPU8L8S
+BQ==
+-----END PRIVATE KEY-----
diff --git a/lib/crypto/test/engine_SUITE_data/pkcs8/ecdsa_public_key.pem b/lib/crypto/test/engine_SUITE_data/pkcs8/ecdsa_public_key.pem
new file mode 100644
index 0000000000..6d22fe43fe
--- /dev/null
+++ b/lib/crypto/test/engine_SUITE_data/pkcs8/ecdsa_public_key.pem
@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBvCtl1bCtGoRvfhyCD8AjtKSWPLpc
+Ek18CI5AhsgdpaYJYfKiZkc7shnH0U7Jb/MH79LD5U/R/Tyg74K01C+670EA3Tjg
+zYFT10nnFKF6D5/l/nqsbO+248fgOcdLf4t5uT35GjT4eTGdR/21rjjnY9mV2cNE
+eK5VXNM1a4Jz1PC/EgU=
+-----END PUBLIC KEY-----
diff --git a/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_private_key.pem b/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_private_key.pem
new file mode 100644
index 0000000000..ea0e3d3958
--- /dev/null
+++ b/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_private_key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCwwb0/ddXGXTFK
+4FLxXdV6a/WJMSoPPS55RvZIAHFsiTtvPLbJ8LxDsZ6wSVZLN0/UQ4wdWn9jftyj
+U5/IxBVG8XOtKimTMvm3/ZOzVLueGHBbrLYscRv9oL85ulTKHWgrZDu0lBX5JJTI
+v5UTCErzJRQbka9DG1GaBgDb1PlXfkzBWMwfsBZmwoC77KvCcIGCgbW/XCY03TP2
+3Tg8drvpByMStddP2FQ4fZ91qFUzPu8uhZEsqSQTFlmhgGEx7dLlky0xvu62RuAD
+RTpINpcWZtWDHTdssOqu653LwwqBY8lBopCZ/4Af8QR3ZYkQhen1YLEbVheXRuzI
+LSCZIiJNAgMBAAECggEBAJH4/fxpqQkvr2Shy33Pu1xlyhnpw01gfn/jrcKasxEq
+aC4eWup86E2TY3U8q4pkfIXU3uLi+O9HNpmflwargNLc1mY8uqb44ygiv5bLNEKE
+9k2PXcdoBfC4jxPyoNFl5cBn/7LK1TazEjiTl15na9ZPWcLG1pG5/vMPYCgsQ1sP
+8J3c4E3aaXIj9QceYxBprl490OCzieGyZlRipncz3g4UShRc/b4cycvDZOJpmAy4
+zbWTcBcSMPVPi5coF0K8UcimiqZkotfb/2RLc433i34IdsIXMM+brdq+g8rmjg5a
++oQPy02M6tFApBruEhAz8DGgaLtDY6MLtyZAt3SjXnUCgYEA1zLgamdTHOqrrmIi
+eIQBnAJiyIfcY8B9SX1OsLGYFCHiPVwgUY35B2c7MavMsGcExJhtE+uxU7o5djtM
+R6r9cRHOXJ6EQwa8OwzzPqbM17/YqNDeK39bc9WOFUqRWrhDhVMPy6z8rmZr73mG
+IUC7mBNx/1GBdVYXIlsXzC96dI8CgYEA0kUAhz6I5nyPa70NDEUYHLHf3IW1BCmE
+UoVbraSePJtIEY/IqFx7oDuFo30d4n5z+8ICCtyid1h/Cp3mf3akOiqltYUfgV1G
+JgcEjKKYWEnO7cfFyO7LB7Y3GYYDJNy6EzVWPiwTGk9ZTfFJEESmHC45Unxgd17m
+Dx/R58rFgWMCgYBQXQWFdtSI5fH7C1bIHrPjKNju/h2FeurOuObcAVZDnmu4cmD3
+U8d9xkVKxVeJQM99A1coq0nrdI3k4zwXP3mp8fZYjDHkPe2pN6rW6L9yiohEcsuk
+/siON1/5/4DMmidM8LnjW9R45HLGWWGHpX7oyco2iJ+Jy/6Tq+T1MX3PbQKBgQCm
+hdsbQJ0u3CrBSmFQ/E9SOlRt0r4+45pVuCOY6yweF2QF9HcXTtbhWQJHLclDHJ5C
+Ha18aKuKFN3XzKFFBPKe1jOSBDGlQ/dQGnKx5fr8wMdObM3oiaTlIJuWbRmEUgJT
+QARjDIi8Z2b0YUhZx+Q9oSXoe3PyVYehJrQX+/BavQKBgQCIr7Zp0rQPbfqcTL+M
+OYHUoNcb14f9f8hXeXHQOqVpsGwxGdRQAU9wbx/4+obKB5xIkzBsVNcJwavisNja
+hegnGjTB/9Hc4m+5bMGwH0bhS2eQO4o+YYM2ypDmFQqDLRfFUlZ5PVHffm/aA9+g
+GanNBCsmtoHtV6CJ1UZ7NmBuIA==
+-----END PRIVATE KEY-----
diff --git a/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_private_key_pwd.pem b/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_private_key_pwd.pem
new file mode 100644
index 0000000000..501662fc35
--- /dev/null
+++ b/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_private_key_pwd.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIh888Iq6gxuMCAggA
+MBQGCCqGSIb3DQMHBAic/11YZ8Nt5gSCBMjG/Jb4qiMoBS50iQvHXqcETPE+0NBr
+jhsn9w94LkdRBstMPAsoKmY98Er96Rnde/NfmqlU9CupKTkd7Ce5poBf72Y6KMED
+cPURyjbGRFsu6x9skXB2obhyKYEqAEF2oQAg4Qbe5v1qXBIgDuC/NgiJnM+w2zCZ
+LkHSZB2/NmcnvDzcgPF7TM8pTO23xCJ33m37qjfWvHsgocVqZmL9wQ4+wr/NMYjJ
+pJvX1OHW1vBsZsXh40WchalYRSB1VeO368QfsE8coRJztqbMzdce9EQdMB6Q6jlO
+cetd3moLIoMP4I7HW0/SgokbycTbRiYSvRyU1TGc2WbW6BrFZV24IckcnnVUFatf
+6HKUcaYLG68dJcRgs5QMGkcmgVvlddENHFmHZlo0eym/xSiUl/AT8/5odscm6ML8
+wW5sneax+TF4J2eYmiN7yjAUCodXVTNYNDVKo6uUhntlymbM0o4UitVIbPIfTDHl
+sxJAEZ7vpuPqeNMxUk6G6zipuEjqsVbnuFSBSZmgKiGYcifRPUmqqINa3DdS4WVx
+xaPWdHbHVRD//ze3h/FsA+1lIE5q2kUE0xXseJA1ISog++kJp14XeaaL2j/tx3Ob
+OsbcaOAD/IUw/ItDt9kn0qzfnar7sS0Wov8AmJQxHmH7Lm93jHTLM05yE0AR/eBr
+Mig2ZdC+9OqVC+GPuBkRjSs8NpltQIDroz6EV9IMwPwXm0szSYoyoPLmlHJUdnLs
+ZUef+au6hYkEJBrvuisagnq5eT/fCV3hsjD7yODebNU2CmBTo6X2PRx/xsBHRMWl
+QkoM9PBdSCnKv6HpHl4pchuoqU2NpFjN0BCaad6aHfZSTnqgzK4bEh1oO6dI8/rB
+/eh71JyFFG5J4xbpaqz5Su01V1iwU5leK5bDwqals4M4+ZGHGciou7qnXUmX2fJl
+r6DlMUa/xy+A2ZG0NuZR05yk2oB3+KVNMgp6zFty3XaxwoNtc8GTLtLnBnIh2rlP
+mE1+I65LRWwrNQalPeOAUrYuEzhyp2Df7a8Ykas5PUH7MGR/S0Ge/dLxtE2bJuK4
+znbLAsGhvo/SbNxYqIp6D4iDtd3va6yUGncy41paA/vTKFVvXZDrXcwJQYYCVOGT
+OwdzNuozU8Dc7oxsd8oakfC46kvmVaOrGvZbm56PFfprcaL/Hslska5xxEni/eZe
+WRxZbCBhAVqS1pn5zkDQVUe9uFlR/x39Qi01HIlKLBsjpSs6qQsFArMe8hgXmXLG
+xP+dyVuOE18NzSewdEjeqSRKIM7Qi8EOjZsI4HdSRBY7bh9VhmaVXDZiCSf33TTE
+3y8nimzQAeuGoYg6WqHmWWC2Qnpki2HlaIH/ayXEyQWkP/qvg61e8ovdg9Fy8JOO
+0AacXVt5zj0q00AW5bKx7usi4NIjZedi86hUm6H19aBm7r86BKjwYTEI/GOcdrbV
+9HC/8ayOimgwiAG3gq+aLioWym+Z6KnsbVd7XReVbvM/InQx54WA2y5im0A+/c67
+oQFFPV84XGX9waeqv/K4Wzkm6HW+qVAEM67482VGOf0PVrlQMno6dOotT/Y7ljoZ
+2iz0LmN9yylJnLPDrr1i6gzbs5OhhUgbF5LI2YP2wWdCZTl/DrKSIvQZWl8U+tw3
+ciA=
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_public_key.pem b/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_public_key.pem
new file mode 100644
index 0000000000..d3fb5a2cc9
--- /dev/null
+++ b/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_public_key.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMG9P3XVxl0xSuBS8V3V
+emv1iTEqDz0ueUb2SABxbIk7bzy2yfC8Q7GesElWSzdP1EOMHVp/Y37co1OfyMQV
+RvFzrSopkzL5t/2Ts1S7nhhwW6y2LHEb/aC/ObpUyh1oK2Q7tJQV+SSUyL+VEwhK
+8yUUG5GvQxtRmgYA29T5V35MwVjMH7AWZsKAu+yrwnCBgoG1v1wmNN0z9t04PHa7
+6QcjErXXT9hUOH2fdahVMz7vLoWRLKkkExZZoYBhMe3S5ZMtMb7utkbgA0U6SDaX
+FmbVgx03bLDqruudy8MKgWPJQaKQmf+AH/EEd2WJEIXp9WCxG1YXl0bsyC0gmSIi
+TQIDAQAB
+-----END PUBLIC KEY-----
diff --git a/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_public_key_pwd.pem b/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_public_key_pwd.pem
new file mode 100644
index 0000000000..f74361cead
--- /dev/null
+++ b/lib/crypto/test/engine_SUITE_data/pkcs8/rsa_public_key_pwd.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxquo1Na8C+kjeW0YESGm
+vE1bgNW9xh+SQjU1fv/97ePK8mQW2zO1h/vUNz23pfZAKjQu3rlFW/VgGJQ0LgCs
+8Gr/HbMwNcCJzuFMePUrnWn/qBeR7OKUZCJ3E1pp4kwsTdGDDO7jPtNzKf0bdKlg
+G2GHfZWhUediRX8NsRg12X1odVPuRGVRsyJ952YODk9PFjK7pro7Ynf3Icx7di9d
+PXL5vEcKSRdomXvt1rgM8XVHES94RQqoz60ZhfV2JnPfa9V8qu0KaGntpEr7p4rQ
+5BSiLFPjPOArjsD5tKyo8ldKCdQjLfisEp7AetfMjLPVVPw9o/SmCjDxsYWTVRQ2
+tQIDAQAB
+-----END PUBLIC KEY-----
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 1dceebb4e4..da3915a4fc 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 4.1
+CRYPTO_VSN = 4.2
diff --git a/lib/debugger/doc/src/Makefile b/lib/debugger/doc/src/Makefile
index 0f724b6f17..cc0b8861d3 100644
--- a/lib/debugger/doc/src/Makefile
+++ b/lib/debugger/doc/src/Makefile
@@ -41,7 +41,7 @@ XML_APPLICATION_FILES = ref_man.xml
 XML_REF3_FILES = debugger.xml i.xml int.xml
 
 XML_PART_FILES = part.xml
-XML_CHAPTER_FILES = debugger_chapter.xml notes.xml
+XML_CHAPTER_FILES = introduction.xml debugger_chapter.xml notes.xml
 
 BOOK_FILES = book.xml
 
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 21fe7d449d..e71746e30d 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -33,6 +33,21 @@
   <p>This document describes the changes made to the Debugger
     application.</p>
 
+<section><title>Debugger 4.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Do not quote variables and button names in Debugger
+	    windows. The bug was introduced in Erlang/OTP 20.1. </p>
+          <p>
+	    Own Id: OTP-14802</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Debugger 4.2.3</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/debugger/src/dbg_debugged.erl b/lib/debugger/src/dbg_debugged.erl
index e142af4ae0..8b64a60a9c 100644
--- a/lib/debugger/src/dbg_debugged.erl
+++ b/lib/debugger/src/dbg_debugged.erl
@@ -31,32 +31,25 @@
 %% Called via the error handler.
 %%--------------------------------------------------------------------
 eval(Mod, Func, Args) ->
-    SaveStacktrace = erlang:get_stacktrace(),
     Meta = dbg_ieval:eval(Mod, Func, Args),
     Mref = erlang:monitor(process, Meta),
-    msg_loop(Meta, Mref, SaveStacktrace).
+    msg_loop(Meta, Mref).
 
 %%====================================================================
 %% Internal functions
 %%====================================================================
 
-msg_loop(Meta, Mref, SaveStacktrace) ->
+msg_loop(Meta, Mref) ->
     receive
 
 	%% Evaluated function has returned a value
 	{sys, Meta, {ready, Val}} ->
 	    erlang:demonitor(Mref, [flush]),
-
-	    %% Restore original stacktrace and return the value
-	    try erlang:raise(throw, stack, SaveStacktrace)
-	    catch
-		throw:stack ->
-		    case Val of
-			{dbg_apply,M,F,A} ->
-			    apply(M, F, A);
-			_ ->
-			    Val
-		    end
+            case Val of
+                {dbg_apply,M,F,A} ->
+                    apply(M, F, A);
+                _ ->
+                    Val
 	    end;
 
 	%% Evaluated function raised an (uncaught) exception
@@ -74,32 +67,25 @@ msg_loop(Meta, Mref, SaveStacktrace) ->
 		Meta ! {self(), rec_acked},
 		ok
 	    end,
-	    msg_loop(Meta, Mref, SaveStacktrace);
+	    msg_loop(Meta, Mref);
 
 	%% Meta needs something evaluated within context of real process
 	{sys, Meta, {command,Command}} ->
 	    Reply = handle_command(Command),
 	    Meta ! {sys, self(), Reply},
-	    msg_loop(Meta, Mref, SaveStacktrace);
+	    msg_loop(Meta, Mref);
 
 	%% Meta has terminated
 	%% Must be due to int:stop() (or -heaven forbid- a debugger bug)
 	{'DOWN', Mref, _, _, Reason} ->
-
-	    %% Restore original stacktrace and return a dummy value
-	    try erlang:raise(throw, stack, SaveStacktrace)
-	    catch
-		throw:stack ->
-		    {interpreter_terminated, Reason}
-	    end
+            {interpreter_terminated, Reason}
     end.
 
 handle_command(Command) ->
     try
 	reply(Command)
-    catch Class:Reason ->
-	    Stacktrace = stacktrace_f(erlang:get_stacktrace()),
-	    {exception,{Class,Reason,Stacktrace}}
+    catch Class:Reason:Stacktrace ->
+	    {exception,{Class,Reason,stacktrace_f(Stacktrace)}}
     end.
 
 reply({apply,M,F,As}) ->
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl
index 8009d62629..9840cebc1a 100644
--- a/lib/debugger/src/dbg_ieval.erl
+++ b/lib/debugger/src/dbg_ieval.erl
@@ -924,8 +924,7 @@ expr({dbg,Line,raise,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
 	trace(return, {Le,Error}),
 	{value,Error,Bs}
     catch
-	_:_ ->
-	    Stk = erlang:get_stacktrace(),	%Possibly truncated.
+	_:_:Stk ->                              %Possibly truncated.
 	    StkFun = fun(_) -> Stk end,
 	    do_exception(Class, Reason, StkFun, Bs, Ieval)
     end;
@@ -1034,7 +1033,7 @@ expr({send,Line,To0,Msg0}, Bs0, Ieval0) ->
 
 %% Binary
 expr({bin,Line,Fs}, Bs0, Ieval0) ->
-    Ieval = Ieval0#ieval{line=Line},
+    Ieval = Ieval0#ieval{line=Line,top=false},
     try
 	eval_bits:expr_grp(Fs, Bs0,
 			   fun (E, B) -> expr(E, B, Ieval) end,
diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
index a32a6894b8..00aee62a87 100644
--- a/lib/debugger/src/dbg_wx_mon.erl
+++ b/lib/debugger/src/dbg_wx_mon.erl
@@ -119,9 +119,9 @@ init(CallingPid, Mode, SFile) ->
 		init2(CallingPid, Mode, SFile, GS)
 	    catch 
 		exit:stop -> stop;
-		Error:Reason ->
+		Error:Reason:Stacktrace ->
 		    io:format("~p: Crashed {~p,~p} in~n  ~p",
-			      [?MODULE, Error, Reason, erlang:get_stacktrace()])
+			      [?MODULE, Error, Reason, Stacktrace])
 	    end
     end.
 
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl
index b1e0e03b4c..505d53005f 100644
--- a/lib/debugger/src/dbg_wx_trace.erl
+++ b/lib/debugger/src/dbg_wx_trace.erl
@@ -95,9 +95,9 @@ start(Pid, Env, Parent, TraceWin, BackTrace, Strings) ->
 	    catch 
 		_:stop ->
 		    exit(stop);
-		E:R ->
+		E:R:S ->
 		    io:format("TraceWin Crashed ~p~n",[E]),
-		    io:format(" ~p in ~p~n",[R, erlang:get_stacktrace()]),
+		    io:format(" ~p in ~p~n",[R, S]),
 		    exit(R)
 	    end;
 	error ->
diff --git a/lib/debugger/src/dbg_wx_win.erl b/lib/debugger/src/dbg_wx_win.erl
index 9f59915476..f1298154ab 100644
--- a/lib/debugger/src/dbg_wx_win.erl
+++ b/lib/debugger/src/dbg_wx_win.erl
@@ -299,7 +299,7 @@ open_help(_Parent, HelpHtmlFile) ->
 %%--------------------------------------------------------------------
     
 to_string(Atom) when is_atom(Atom) ->
-    io_lib:format("~tw", [Atom]);
+    atom_to_list(Atom);
 to_string(Integer) when is_integer(Integer) ->
     integer_to_list(Integer);
 to_string([]) -> "";
diff --git a/lib/debugger/test/guard_SUITE.erl b/lib/debugger/test/guard_SUITE.erl
index f7874f79df..e781ea932f 100644
--- a/lib/debugger/test/guard_SUITE.erl
+++ b/lib/debugger/test/guard_SUITE.erl
@@ -390,7 +390,7 @@ all_types() ->
      {atom, xxxx},
      {ref, make_ref()},
      {pid, self()},
-     {port, open_port({spawn, efile}, [])},
+     {port, make_port()},
      {function, fun(X) -> X+1, "" end},
      {binary, list_to_binary([])}].
 
@@ -435,6 +435,9 @@ type_test(binary, X) when binary(X) ->
 type_test(function, X) when function(X) ->
     function.
 
+make_port() ->
+    hd(erlang:ports()).
+
 const_guard(Config) when is_list(Config) ->
     if
 	(0 == 0) and ((0 == 0) or (0 == 0)) ->
diff --git a/lib/debugger/test/int_eval_SUITE.erl b/lib/debugger/test/int_eval_SUITE.erl
index 27ca4852b5..da1d6734f8 100644
--- a/lib/debugger/test/int_eval_SUITE.erl
+++ b/lib/debugger/test/int_eval_SUITE.erl
@@ -29,7 +29,8 @@
 	 bifs_outside_erlang/1, spawning/1, applying/1,
 	 catch_and_throw/1, external_call/1, test_module_info/1,
 	 apply_interpreted_fun/1, apply_uninterpreted_fun/1,
-	 interpreted_exit/1, otp_8310/1, stacktrace/1, maps/1]).
+	 interpreted_exit/1, otp_8310/1, stacktrace/1, maps/1,
+	 call_inside_binary/1]).
 
 %% Helpers.
 -export([applier/3]).
@@ -45,7 +46,8 @@ all() ->
     [bifs_outside_erlang, spawning, applying,
      catch_and_throw, external_call, test_module_info,
      apply_interpreted_fun, apply_uninterpreted_fun,
-     interpreted_exit, otp_8310, stacktrace, maps].
+     interpreted_exit, otp_8310, stacktrace, maps,
+     call_inside_binary].
 
 groups() -> 
     [].
@@ -275,6 +277,9 @@ maps(Config) when is_list(Config) ->
     [#{hello := 0, price := 0}] = spawn_eval(fun () -> ?IM:update_in_fun() end),
     ok.
 
+call_inside_binary(Config) when is_list(Config) ->
+    <<"1">> = ?IM:call_inside_binary(fun erlang:integer_to_binary/1),
+    ok.
 
 do_eval(Config, Mod) ->
     DataDir = proplists:get_value(data_dir, Config),
diff --git a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
index ca7929c10b..384d61f051 100644
--- a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
+++ b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
@@ -31,6 +31,7 @@
 -export([f/1, f_try/1, f_catch/1]).
 -export([otp_5837/1, otp_8310/0]).
 -export([empty_map_update/1, update_in_fun/0]).
+-export([call_inside_binary/1]).
 
 %% Internal exports.
 -export([echo/2,my_subtract/2,catch_a_ball/0,throw_a_ball/0]).
@@ -248,3 +249,6 @@ empty_map_update(Map) -> Map#{}.
 
 update_in_fun() ->
     lists:map(fun (X) -> X#{price := 0} end, [#{hello => 0, price => nil}]).
+
+call_inside_binary(Fun) ->
+    <<(Fun(1))/binary>>.
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index 72cedb2240..57da7e5618 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 4.2.3
+DEBUGGER_VSN = 4.2.4
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 6a6e65cb94..a1eecfb3fe 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,6 +32,29 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 3.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> The error message returned from Dialyzer when, for
+	    example, a modified record field type is not a subtype of
+	    the declared type, no longer includes a call stack. The
+	    bug was introduced in Erlang/OTP 19.3. </p>
+          <p>
+	    Own Id: OTP-14742</p>
+        </item>
+        <item>
+	    <p> A bug relating to maps and never returning functions
+	    has been fixed. </p>
+          <p>
+	    Own Id: OTP-14743</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 3.2.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
index a4b42c9367..9993c68fed 100644
--- a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
+++ b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
@@ -165,7 +165,11 @@ analysis_start(Parent, Analysis, LegalWarnings) ->
 
 remote_type_postprocessing(TmpCServer, Args) ->
   Fun = fun() ->
-            exit(remote_type_postproc(TmpCServer, Args))
+            exit(try remote_type_postproc(TmpCServer, Args) of
+                     R -> R
+                 catch
+                   throw:{error,_}=Error -> Error
+                 end)
         end,
   {Pid, Ref} = erlang:spawn_monitor(Fun),
   dialyzer_codeserver:give_away(TmpCServer, Pid),
diff --git a/lib/dialyzer/src/dialyzer_cl_parse.erl b/lib/dialyzer/src/dialyzer_cl_parse.erl
index 80c10183cf..f21eaed087 100644
--- a/lib/dialyzer/src/dialyzer_cl_parse.erl
+++ b/lib/dialyzer/src/dialyzer_cl_parse.erl
@@ -41,8 +41,8 @@ start() ->
     Ret
   catch
     throw:{dialyzer_cl_parse_error, Msg} -> {error, Msg};
-    _:R ->
-      Msg = io_lib:format("~tp\n~tp\n", [R, erlang:get_stacktrace()]),
+    _:R:S ->
+      Msg = io_lib:format("~tp\n~tp\n", [R, S]),
       {error, lists:flatten(Msg)}
   end.
 
diff --git a/lib/dialyzer/src/dialyzer_contracts.erl b/lib/dialyzer/src/dialyzer_contracts.erl
index e72c1aecfc..0df15e55f9 100644
--- a/lib/dialyzer/src/dialyzer_contracts.erl
+++ b/lib/dialyzer/src/dialyzer_contracts.erl
@@ -197,6 +197,10 @@ check_contracts(Contracts, Callgraph, FunTypes, ModOpaques) ->
 		      false ->
 			[{MFA, Contract}|NewContracts]
 		    end;
+                  {error, {extra_range, _, _}} ->
+                    %% do not treat extra range as an error in this check
+                    %% since that prevents discovering other actual errors
+                    [{MFA, Contract}|NewContracts];
 		  {error, _Error} -> NewContracts
 		end;
 	      error -> NewContracts
diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index 8367432ac5..c5f93a3392 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -299,6 +299,7 @@ traverse(Tree, Map, State) ->
 	  match_fail -> t_none();
 	  raise -> t_none();
 	  bs_init_writable -> t_from_term(<<>>);
+          build_stacktrace -> erl_bif_types:type(erlang, build_stacktrace, 0);
 	  Other -> erlang:error({'Unsupported primop', Other})
 	end,
       {State, Map, Type};
@@ -1235,6 +1236,13 @@ handle_tuple(Tree, Map, State) ->
                           State2 = state__add_warning(State1, ?WARN_OPAQUE,
                                                       Tree, Msg),
                           {State2, Map1, t_none()};
+                        {error, record, ErrorPat, ErrorType, _} ->
+                          Msg = {record_match,
+                                 [format_patterns(ErrorPat),
+                                  format_type(ErrorType, State1)]},
+                          State2 = state__add_warning(State1, ?WARN_MATCHING,
+                                                      Tree, Msg),
+                          {State2, Map1, t_none()};
                         {Map2, ETypes} ->
                           {State1, Map2, t_tuple(ETypes)}
                       end
@@ -3116,7 +3124,10 @@ state__add_warning(#state{warnings = Warnings, warning_mode = true} = State,
 state__remove_added_warnings(OldState, NewState) ->
   #state{warnings = OldWarnings} = OldState,
   #state{warnings = NewWarnings} = NewState,
-  {NewWarnings -- OldWarnings, NewState#state{warnings = OldWarnings}}.
+  case NewWarnings =:= OldWarnings of
+    true -> {[], NewState};
+    false -> {NewWarnings -- OldWarnings, NewState#state{warnings = OldWarnings}}
+  end.
 
 state__add_warnings(Warns, #state{warnings = Warnings} = State) ->
   State#state{warnings = Warns ++ Warnings}.
@@ -3433,19 +3444,19 @@ state__fun_info(Fun, #state{callgraph = CG, fun_tab = FunTab, plt = PLT}) ->
   {Fun, Sig, Contract, LocalRet}.
 
 forward_args(Fun, ArgTypes, #state{work = Work, fun_tab = FunTab} = State) ->
-  {OldArgTypes, OldOut, Fixpoint} =
+  {NewArgTypes, OldOut, Fixpoint} =
     case dict:find(Fun, FunTab) of
-      {ok, {not_handled, {OldArgTypes0, OldOut0}}} ->
-	{OldArgTypes0, OldOut0, false};
+      {ok, {not_handled, {_OldArgTypesAreNone, OldOut0}}} ->
+	{ArgTypes, OldOut0, false};
       {ok, {OldArgTypes0, OldOut0}} ->
-	{OldArgTypes0, OldOut0,
-	 t_is_subtype(t_product(ArgTypes), t_product(OldArgTypes0))}
+        NewArgTypes0 = [t_sup(X, Y) ||
+                         {X, Y} <- lists:zip(ArgTypes, OldArgTypes0)],
+	{NewArgTypes0, OldOut0,
+         t_is_equal(t_product(NewArgTypes0), t_product(OldArgTypes0))}
     end,
   case Fixpoint of
     true -> State;
     false ->
-      NewArgTypes = [t_sup(X, Y) ||
-                      {X, Y} <- lists:zip(ArgTypes, OldArgTypes)],
       NewWork = add_work(Fun, Work),
       ?debug("~tw: forwarding args ~ts\n",
 	     [state__lookup_name(Fun, State),
diff --git a/lib/dialyzer/src/dialyzer_plt.erl b/lib/dialyzer/src/dialyzer_plt.erl
index 95c8b5ebce..2af4534396 100644
--- a/lib/dialyzer/src/dialyzer_plt.erl
+++ b/lib/dialyzer/src/dialyzer_plt.erl
@@ -531,17 +531,19 @@ compute_md5_from_files(Files) ->
   lists:keysort(1, [{F, compute_md5_from_file(F)} || F <- Files]).
 
 compute_md5_from_file(File) ->
-  case filelib:is_regular(File) of
-    false ->
+  case beam_lib:all_chunks(File) of
+    {ok, _, Chunks} ->
+      %% We cannot use beam_lib:md5 because it does not consider
+      %% the debug_info chunk, where typespecs are likely stored.
+      %% So we consider almost all chunks except the useless ones.
+      Filtered = [[ID, Chunk] || {ID, Chunk} <- Chunks, ID =/= "CInf", ID =/= "Docs"],
+      erlang:md5(lists:sort(Filtered));
+    {error, beam_lib, {file_error, _, enoent}} ->
       Msg = io_lib:format("Not a regular file: ~ts\n", [File]),
       throw({dialyzer_error, Msg});
-    true ->
-      case dialyzer_utils:get_core_from_beam(File) of
-	{error, Error} ->
-	  throw({dialyzer_error, Error});
-	{ok, Core} ->
-	  erlang:md5(term_to_binary(Core))
-      end
+    {error, beam_lib, _} ->
+      Msg = io_lib:format("Could not compute MD5 for .beam: ~ts\n", [File]),
+      throw({dialyzer_error, Msg})
   end.
 
 init_diff_list(RemoveFiles, AddFiles) ->
diff --git a/lib/dialyzer/src/dialyzer_typesig.erl b/lib/dialyzer/src/dialyzer_typesig.erl
index c4d8f45447..dede475f98 100644
--- a/lib/dialyzer/src/dialyzer_typesig.erl
+++ b/lib/dialyzer/src/dialyzer_typesig.erl
@@ -41,7 +41,7 @@
 	 t_is_float/1, t_is_fun/1,
 	 t_is_integer/1, t_non_neg_integer/0,
 	 t_is_list/1, t_is_nil/1, t_is_none/1, t_is_number/1,
-	 t_is_singleton/1,
+	 t_is_singleton/1, t_is_none_or_unit/1,
 
          t_limit/2, t_list/0, t_list/1,
 	 t_list_elements/1, t_nonempty_list/1, t_maybe_improper_list/0,
@@ -418,6 +418,11 @@ traverse(Tree, DefinedVars, State) ->
 	match_fail -> throw(error);
 	raise -> throw(error);
 	bs_init_writable -> {State, t_from_term(<<>>)};
+	build_stacktrace ->
+          V = mk_var(Tree),
+          Type = erl_bif_types:type(erlang, build_stacktrace, 0),
+          State1 = state__store_conj(V, sub, Type, State),
+          {State1, V};
 	Other -> erlang:error({'Unsupported primop', Other})
       end;
     'receive' ->
@@ -528,13 +533,14 @@ traverse(Tree, DefinedVars, State) ->
 		    false -> t_any();
 		    true ->
 		      MT = t_inf(lookup_type(MapVar, Map), t_map()),
-		      case t_is_none(MT) of
+		      case t_is_none_or_unit(MT) of
 			true -> t_none();
 			false ->
 			  DisjointFromKeyType =
 			    fun(ShadowKey) ->
-				t_is_none(t_inf(lookup_type(ShadowKey, Map),
-						KeyType))
+                                ST = t_inf(lookup_type(ShadowKey, Map),
+                                           KeyType),
+				t_is_none_or_unit(ST)
 			    end,
 			  case lists:all(DisjointFromKeyType, ShadowKeys) of
 			    true -> t_map_get(KeyType, MT);
@@ -567,7 +573,8 @@ traverse(Tree, DefinedVars, State) ->
 			  case cerl:is_literal(OpTree) andalso
 			    cerl:concrete(OpTree) =:= exact of
 			    true ->
-			      case t_is_none(t_inf(ShadowedKeys, KeyType)) of
+                              ST = t_inf(ShadowedKeys, KeyType),
+                              case t_is_none_or_unit(ST) of
 				true ->
 				  t_map_put({KeyType, t_any()}, AccType);
 				false ->
@@ -1893,9 +1900,8 @@ solver(Solver, SolveFun) ->
       ?debug("Solver ~w returned unexpected result:\n  ~P\n",
              [Solver, _R, 60]),
       throw(error)
-  catch E:R ->
-      io:format("Solver ~w failed: ~w:~p\n ~tp\n",
-                [Solver, E, R, erlang:get_stacktrace()]),
+  catch E:R:S ->
+      io:format("Solver ~w failed: ~w:~p\n ~tp\n", [Solver, E, R, S]),
       throw(error)
   end.
 
diff --git a/lib/dialyzer/src/typer.erl b/lib/dialyzer/src/typer.erl
index 16b9c8a94a..9d3d9ce438 100644
--- a/lib/dialyzer/src/typer.erl
+++ b/lib/dialyzer/src/typer.erl
@@ -164,9 +164,9 @@ get_type_info(#analysis{callgraph = CallGraph,
                                                      CodeServer),
     Analysis#analysis{callgraph = StrippedCallGraph, trust_plt = NewPlt}
   catch
-    error:What ->
+    error:What:Stacktrace ->
       fatal_error(io_lib:format("Analysis failed with message: ~tp",
-				[{What, erlang:get_stacktrace()}]));
+				[{What, Stacktrace}]));
     throw:{dialyzer_succ_typing_error, Msg} ->
       fatal_error(io_lib:format("Analysis failed with message: ~ts", [Msg]))
   end.
diff --git a/lib/dialyzer/test/behaviour_SUITE_data/src/proper/proper_typeserver.erl b/lib/dialyzer/test/behaviour_SUITE_data/src/proper/proper_typeserver.erl
index b16075763f..12f6532c0c 100644
--- a/lib/dialyzer/test/behaviour_SUITE_data/src/proper/proper_typeserver.erl
+++ b/lib/dialyzer/test/behaviour_SUITE_data/src/proper/proper_typeserver.erl
@@ -539,7 +539,7 @@ apply_spec_test({Mod,Fun,_Arity}=MFA, {_Domain,Range}, SpecTimeout, FalsePositiv
                      try apply(Mod, Fun, Args) of
                          X -> {ok, X}
                      catch
-                         X:Y -> {X, Y}
+                         X:Y:S -> {{X, Y}, S}
                      end,
                  case Result of
                      {ok, Z} ->
@@ -551,15 +551,15 @@ apply_spec_test({Mod,Fun,_Arity}=MFA, {_Domain,Range}, SpecTimeout, FalsePositiv
                              false ->
                                  false
                          end;
-                     Exception when is_function(FalsePositiveMFAs) ->
+                     {Exception, S2} when is_function(FalsePositiveMFAs) ->
                          case FalsePositiveMFAs(MFA, Args, Exception) of
                              true ->
                                  true;
                              false ->
-                                 error(Exception, erlang:get_stacktrace())
+                                 error(Exception, S2)
                          end;
-                     Exception ->
-                         error(Exception, erlang:get_stacktrace())
+                     {Exception, S3} ->
+                         error(Exception, S3)
                  end
              end).
 
diff --git a/lib/dialyzer/test/map_SUITE_data/results/map_anon_fun b/lib/dialyzer/test/map_SUITE_data/results/map_anon_fun
new file mode 100644
index 0000000000..cfca5b1407
--- /dev/null
+++ b/lib/dialyzer/test/map_SUITE_data/results/map_anon_fun
@@ -0,0 +1,2 @@
+
+map_anon_fun.erl:4: Function g/1 will never be called
diff --git a/lib/dialyzer/test/map_SUITE_data/src/map_anon_fun.erl b/lib/dialyzer/test/map_SUITE_data/src/map_anon_fun.erl
new file mode 100644
index 0000000000..e77016d68a
--- /dev/null
+++ b/lib/dialyzer/test/map_SUITE_data/src/map_anon_fun.erl
@@ -0,0 +1,9 @@
+-module(map_anon_fun).
+
+%% Not exported.
+g(A) ->
+    maps:map(fun F(K, {V, _C}) ->
+                    F(K, V);
+                 F(_K, _V) ->
+                    #{ system => {A} }
+            end, #{}).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same.erl
new file mode 100644
index 0000000000..44149f4199
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same.erl
@@ -0,0 +1,15 @@
+-module(same).
+
+-export([baz/1]).
+
+-record(bar, {
+          a :: same_type:st(integer()),
+          b :: same_type:st(atom())
+         }).
+
+baz(Bar) ->
+    _ = wrap_find(0, Bar#bar.a),
+    wrap_find(0, Bar#bar.b).
+
+wrap_find(K, D) ->
+  same_type:t(K, D).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same_type.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same_type.erl
new file mode 100644
index 0000000000..855a5d30be
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same_type.erl
@@ -0,0 +1,13 @@
+-module(same_type).
+
+-export([t/2]).
+
+-export_type([st/1]).
+
+%% When unopaqued all specializations of st/1 are equal.
+-opaque st(_A) :: {st, tuple()}.
+
+-spec t(_, st(_)) -> _.
+
+t(K, V) ->
+    {K, V}.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl b/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl
index 1677b4efb8..529f9fba72 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl
@@ -533,7 +533,7 @@ apply_spec_test({Mod,Fun,_Arity}=MFA, {_Domain,Range}, SpecTimeout, FalsePositiv
                      try apply(Mod,Fun,Args) of
                          X -> {ok, X}
                      catch
-                         X:Y -> {X, Y}
+                         X:Y:S -> {{X, Y}, S}
                      end,
                  case Result of
                      {ok, Z} ->
@@ -545,15 +545,15 @@ apply_spec_test({Mod,Fun,_Arity}=MFA, {_Domain,Range}, SpecTimeout, FalsePositiv
                              false ->
                                  false
                          end;
-                     Exception when is_function(FalsePositiveMFAs) ->
+                     {Exception, S2} when is_function(FalsePositiveMFAs) ->
                          case FalsePositiveMFAs(MFA, Args, Exception) of
                              true ->
                                  true;
                              false ->
-                                 error(Exception, erlang:get_stacktrace())
+                                 error(Exception, S2)
                          end;
-                     Exception ->
-                         error(Exception, erlang:get_stacktrace())
+                     {Exception, S3} ->
+                         error(Exception, S3)
                  end
              end).
 
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_validator.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_validator.erl
index 8fe43163f6..ea92613781 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_validator.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_validator.erl
@@ -174,7 +174,7 @@ validate_error(Error, Name, Ar) ->
 -endif.
 validate_error_1(Error, Name, Ar) ->
     {{'_',Name,Ar},
-     {internal_error,'_',{Error,erlang:get_stacktrace()}}}.
+     {internal_error,'_',{Error,[]}}}.
 
 -record(st,				%Emulation state
 	{x=init_regs(0, term),		%x register info.
diff --git a/lib/dialyzer/test/plt_SUITE.erl b/lib/dialyzer/test/plt_SUITE.erl
index ebe79b2a6d..680f5b5088 100644
--- a/lib/dialyzer/test/plt_SUITE.erl
+++ b/lib/dialyzer/test/plt_SUITE.erl
@@ -9,14 +9,14 @@
 -export([suite/0, all/0, build_plt/1, beam_tests/1, update_plt/1,
          local_fun_same_as_callback/1,
          remove_plt/1, run_plt_check/1, run_succ_typings/1,
-         bad_dialyzer_attr/1, merge_plts/1]).
+         bad_dialyzer_attr/1, merge_plts/1, bad_record_type/1]).
 
 suite() ->
   [{timetrap, ?plt_timeout}].
 
 all() -> [build_plt, beam_tests, update_plt, run_plt_check,
           remove_plt, run_succ_typings, local_fun_same_as_callback,
-          bad_dialyzer_attr, merge_plts].
+          bad_dialyzer_attr, merge_plts, bad_record_type].
 
 build_plt(Config) ->
   OutDir = ?config(priv_dir, Config),
@@ -283,8 +283,8 @@ bad_dialyzer_attr(Config) ->
     {dialyzer_error,
      "Analysis failed with error:\n" ++ Str1} =
         (catch dialyzer:run(Opts)),
-    P1 = string:str(Str1, "dial.erl:2: function undef/0 undefined"),
-    true = P1 > 0,
+    S1 = string:find(Str1, "dial.erl:2: function undef/0 undefined"),
+    true = is_list(S1),
 
     Prog2 = <<"-module(dial).
                -dialyzer({no_return, [{undef,1,2}]}).">>,
@@ -292,9 +292,9 @@ bad_dialyzer_attr(Config) ->
     {dialyzer_error,
      "Analysis failed with error:\n" ++ Str2} =
         (catch dialyzer:run(Opts)),
-    P2 = string:str(Str2, "dial.erl:2: badly formed dialyzer "
-                          "attribute: {no_return,{undef,1,2}}"),
-    true = P2 > 0,
+    S2 = string:find(Str2, "dial.erl:2: badly formed dialyzer "
+                           "attribute: {no_return,{undef,1,2}}"),
+    true = is_list(S2),
 
     ok.
 
@@ -369,6 +369,32 @@ create_plts(Mod1, Mod2, Config) ->
 
 %% End of merge_plts().
 
+bad_record_type(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    Source = lists:concat([bad_record_type, ".erl"]),
+    Filename = filename:join(PrivDir, Source),
+    PltFilename = dialyzer_common:plt_file(PrivDir),
+
+    Opts = [{files, [Filename]},
+            {check_plt, false},
+            {from, src_code},
+            {init_plt, PltFilename}],
+
+    Prog = <<"-module(bad_record_type).
+              -export([r/0]).
+              -record(r, {f = 3 :: integer()}).
+              -spec r() -> #r{f :: atom()}.
+              r() ->
+                  #r{}.">>,
+    ok = file:write_file(Filename, Prog),
+    {dialyzer_error,
+     "Analysis failed with error:\n" ++ Str} =
+        (catch dialyzer:run(Opts)),
+    P = string:str(Str,
+                    "bad_record_type.erl:4: Illegal declaration of #r{f}"),
+    true = P > 0,
+    ok.
+
 erlang_beam() ->
     case code:where_is_file("erlang.beam") of
         non_existing ->
diff --git a/lib/dialyzer/test/small_SUITE_data/results/chars b/lib/dialyzer/test/small_SUITE_data/results/chars
index 2c1f8f8d17..72fbdb4528 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/chars
+++ b/lib/dialyzer/test/small_SUITE_data/results/chars
@@ -1,4 +1,4 @@
 
-chars.erl:29: Invalid type specification for function chars:f/1. The success typing is (#{'b':=50}) -> 'ok'
-chars.erl:32: Function t1/0 has no local return
-chars.erl:32: The call chars:f(#{'b':=50}) breaks the contract (#{'a':=49,'b'=>50,'c'=>51}) -> 'ok'
+chars.erl:37: Invalid type specification for function chars:f/1. The success typing is (#{'b':=50}) -> 'ok'
+chars.erl:40: Function t1/0 has no local return
+chars.erl:40: The call chars:f(#{'b':=50}) breaks the contract (#{'a':=49,'b'=>50,'c'=>51}) -> 'ok'
diff --git a/lib/dialyzer/test/small_SUITE_data/results/extra_range b/lib/dialyzer/test/small_SUITE_data/results/extra_range
new file mode 100644
index 0000000000..ec50c95c4e
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/extra_range
@@ -0,0 +1,4 @@
+
+extra_range.erl:29: The pattern 'ok' can never match the type 'error'
+extra_range.erl:43: The pattern 'no' can never match the type 'maybe' | 'yes'
+extra_range.erl:58: The pattern 'maybe' can never match the type 'no' | 'yes'
diff --git a/lib/dialyzer/test/small_SUITE_data/results/maps_sum b/lib/dialyzer/test/small_SUITE_data/results/maps_sum
index bd192bdb93..b29ac77d88 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/maps_sum
+++ b/lib/dialyzer/test/small_SUITE_data/results/maps_sum
@@ -1,4 +1,4 @@
 
-maps_sum.erl:15: Invalid type specification for function maps_sum:wrong1/1. The success typing is (map()) -> any()
+maps_sum.erl:15: Invalid type specification for function maps_sum:wrong1/1. The success typing is (maps:iterator() | map()) -> any()
 maps_sum.erl:26: Function wrong2/1 has no local return
 maps_sum.erl:27: The call lists:foldl(fun((_,_,_) -> any()),0,Data::any()) will never return since it differs in the 1st argument from the success typing arguments: (fun((_,_) -> any()),any(),[any()])
diff --git a/lib/dialyzer/test/small_SUITE_data/results/record_match b/lib/dialyzer/test/small_SUITE_data/results/record_match
new file mode 100644
index 0000000000..a0dd6f560a
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/record_match
@@ -0,0 +1,3 @@
+
+record_match.erl:16: Function select/0 has no local return
+record_match.erl:17: Matching of pattern {'b_literal', 'undefined'} tagged with a record name violates the declared type of #b_local{} | #b_remote{}
diff --git a/lib/dialyzer/test/small_SUITE_data/results/stacktrace b/lib/dialyzer/test/small_SUITE_data/results/stacktrace
new file mode 100644
index 0000000000..fd60881953
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/stacktrace
@@ -0,0 +1,5 @@
+
+stacktrace.erl:11: The pattern {'a', 'b'} can never match the type [{atom(),atom(),[any()] | byte(),[{'file',string()} | {'line',pos_integer()}]}]
+stacktrace.erl:19: The pattern ['a', 'b'] can never match the type [{atom(),atom(),[any()] | byte(),[{'file',string()} | {'line',pos_integer()}]}]
+stacktrace.erl:44: The pattern {'a', 'b'} can never match the type [{atom(),atom(),[any()] | byte(),[{'file',string()} | {'line',pos_integer()}]}]
+stacktrace.erl:53: The pattern ['a', 'b'] can never match the type [{atom(),atom(),[any()] | byte(),[{'file',string()} | {'line',pos_integer()}]}]
diff --git a/lib/dialyzer/test/small_SUITE_data/src/abs.erl b/lib/dialyzer/test/small_SUITE_data/src/abs.erl
index 251e24cdfc..0e38c3dbb7 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/abs.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/abs.erl
@@ -5,7 +5,7 @@
 -export([t/0]).
 
 t() ->
-    Fs = [fun i1/0, fun i2/0, fun i3/0, fun i4/0, fun f1/0],
+    Fs = [fun i1/0, fun i2/0, fun i3/0, fun i4/0, fun f1/0, fun erl_551/0],
     _ = [catch F() || F <- Fs],
     ok.
 
@@ -60,6 +60,13 @@ f1() ->
 f1(A) ->
     abs(A).
 
+erl_551() ->
+    accept(9),
+    accept(-3).
+
+accept(Number) when abs(Number) >= 8 -> first;
+accept(_Number) -> second.
+
 -spec int() -> integer().
 
 int() ->
diff --git a/lib/dialyzer/test/small_SUITE_data/src/bsL.erl b/lib/dialyzer/test/small_SUITE_data/src/bsL.erl
new file mode 100644
index 0000000000..b2fdc16324
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/bsL.erl
@@ -0,0 +1,13 @@
+-module(bsL).
+
+-export([t/0]).
+
+%% Found in lib/observer/test/crashdump_helper.erl.
+
+t() ->
+    Size = 60,
+    <<H:16/unit:8>> = erlang:md5(<<Size:32>>),
+    true = H < 20,
+    true = H > 2,
+    Data = ((H bsl (8*150)) div (H+7919)),
+    <<Data:Size/unit:8>>.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/chars.erl b/lib/dialyzer/test/small_SUITE_data/src/chars.erl
index 1e9c8ab6b9..62b90cf54d 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/chars.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/chars.erl
@@ -12,17 +12,25 @@
 -spec t() -> $0-$0..$9-$0| $?.
 
 t() ->
-    c(#r{f = $z - 3}),
+    r(#r{f = $z - 3}),
+    r(#r{f = 97}),
+    c($/),
     c($z - 3),
     c($B).
 
 -spec c(cs()) -> $3-$0..$9-$0.
-
-c($A + 1) -> 2;
+c($A + 1) -> $9-$0;
 c(C) ->
     case C of
-        $z - 3 -> 3;
-        #r{f = $z - 3} -> 7
+        $z - 3 -> $3-$0;
+        _ -> $7-$0
+    end.
+
+-spec r(#r{f :: $a..$z}) -> ok | error.
+r(R) ->
+    case R of
+        #r{f = $z - 3} -> error;
+        _ -> ok
     end.
 
 %% Display contract with character in warning:
diff --git a/lib/dialyzer/test/small_SUITE_data/src/erl_tar_table.erl b/lib/dialyzer/test/small_SUITE_data/src/erl_tar_table.erl
new file mode 100644
index 0000000000..2dc00d272a
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/erl_tar_table.erl
@@ -0,0 +1,14 @@
+-module(erl_tar_table).
+
+%% OTP-14860, PR 1670.
+
+-export([t/0, v/0, x/0]).
+
+t() ->
+    {ok, ["file"]} = erl_tar:table("table.tar").
+
+v() ->
+    {ok, [{_,_,_,_,_,_,_}]} = erl_tar:table("table.tar", [verbose]).
+
+x() ->
+    {ok, ["file"]} = erl_tar:table("table.tar", []).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/extra_range.erl b/lib/dialyzer/test/small_SUITE_data/src/extra_range.erl
new file mode 100644
index 0000000000..9d6ba89c95
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/extra_range.erl
@@ -0,0 +1,59 @@
+%% Test that a spec containing more items than actually returned
+%% (whether by accident or by benign overspeccing) does not prevent
+%% detection of impossible matches.
+
+-module(extra_range).
+
+-export([t1/2, t2/2, t3/2, t4/2]).
+
+-dialyzer([no_return]).
+
+%% this spec matches the behaviour of the code
+-spec normal(integer()) -> ok | error.
+normal(1) -> ok;
+normal(2) -> error.
+
+t1(X, Y) when is_integer(X), is_integer(Y) ->
+    ok = normal(X),
+    error = normal(Y),
+    ok.
+
+
+%% this spec has a typo, which should cause anyone trying to match on
+%% `ok = typo(X)' to get a warning, because `ok' is not in the spec
+-spec typo(integer()) -> ook | error.
+typo(1) -> ok;
+typo(2) -> error.
+
+t2(X, Y) when is_integer(X), is_integer(Y) ->
+    ok = typo(X),  % warning expected - not allowed according to spec
+    error = typo(Y),
+    ok.
+
+
+%% this is overspecified, and should cause a warning for trying
+%% to match on `no = over(X)', because it cannot succeed and either
+%% the spec should be updated or the code should be extended
+-spec over(integer()) -> yes | no | maybe.
+over(1) -> yes;
+over(_) -> maybe.
+
+t3(X, Y) when is_integer(X), is_integer(Y) ->
+    yes = over(X),
+    no = over(Y),  % warning expected - spec or code needs fixing
+    maybe = over(X + Y),
+    ok.
+
+
+%% this is underspecified, which should cause anyone trying to match on
+%% `maybe = under(X)' to get a warning, because `maybe' is not in the spec
+-spec under(integer()) -> yes | no.
+under(1) -> yes;
+under(2) -> no;
+under(_) -> maybe.
+
+t4(X, Y) when is_integer(X), is_integer(Y) ->
+    yes = under(X),
+    no = under(Y),
+    maybe = under(X + Y), % warning expected - not in spec
+    ok.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/record_match.erl b/lib/dialyzer/test/small_SUITE_data/src/record_match.erl
new file mode 100644
index 0000000000..8e9b91937f
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/record_match.erl
@@ -0,0 +1,17 @@
+-module(record_match).
+
+-export([select/0]).
+
+-record(b_literal, {val}).
+-record(b_remote, {mod,name,arity}).
+-record(b_local, {name,arity}).
+
+-type b_remote()   :: #b_remote{}.
+-type b_local()    :: #b_local{}.
+
+-type argument()   :: b_remote() | b_local().
+
+-record(b_set, {args=[] :: [argument()]}).
+
+select() ->
+    #b_set{args=[#b_remote{},#b_literal{}]}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/stacktrace.erl b/lib/dialyzer/test/small_SUITE_data/src/stacktrace.erl
new file mode 100644
index 0000000000..de79e710e9
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/stacktrace.erl
@@ -0,0 +1,73 @@
+-module(stacktrace).
+
+%% Check the stacktrace variable introduced in Erlang/OTP 21.0
+
+-export([t1/0, t2/0, t3/0, t4/0, s1/0, s2/0, s3/0, s4/0]).
+
+t1() ->
+    try foo:bar()
+    catch
+        E:P:S ->
+            {a,b} = S, % can never match
+            {E, P}
+    end.
+
+t2() ->
+    try foo:bar()
+    catch
+        E:P:S ->
+            [a,b] = S, % can never match
+            {E, P}
+    end.
+
+t3() ->
+    try foo:bar()
+    catch
+        E:P:S ->
+            [{m,f,[],[]}] = S,
+            {E, P}
+    end.
+
+t4() ->
+    try foo:bar()
+    catch
+        E:P:S ->
+            [{m,f,1,[{file,"tjo"},{line,95}]}] = S,
+            {E, P}
+    end.
+
+s1() ->
+    try foo:bar()
+    catch
+        E:P ->
+            S = erlang:get_stacktrace(),
+            {a,b} = S, % can never match
+            {E, P}
+    end.
+
+s2() ->
+    try foo:bar()
+    catch
+        E:P ->
+            S = erlang:get_stacktrace(),
+            [a,b] = S, % can never match
+            {E, P}
+    end.
+
+s3() ->
+    try foo:bar()
+    catch
+        E:P ->
+            S = erlang:get_stacktrace(),
+            [{m,f,[],[]}] = S,
+            {E, P}
+    end.
+
+s4() ->
+    try foo:bar()
+    catch
+        E:P ->
+            S = erlang:get_stacktrace(),
+            [{m,f,1,[{file,"tjo"},{line,95}]}] = S,
+            {E, P}
+    end.
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index d130b14fec..1b46f66602 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 3.2.2
+DIALYZER_VSN = 3.2.3
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 6b84b22eb5..6bc7d147c0 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -1865,8 +1865,8 @@ An example return value with for a client service with Origin-Host
                                {raddr,{127,0,0,1}},
                                {rport,3868},
                                {reuseaddr,true}]}]},
-  {watchdog,{&lt;0.66.0>,{1346,171491,996448},okay}},
-  {peer,{&lt;0.67.0>,{1346,171491,999906}}},
+  {watchdog,{&lt;0.66.0>,-576460736368485571,okay}},
+  {peer,{&lt;0.67.0>,-576460736357885808}},
   {apps,[{0,common}]},
   {caps,[{origin_host,{"client.example.com","server.example.com"}},
          {origin_realm,{"example.com","example.com"}},
@@ -1946,8 +1946,8 @@ connection might look as follows.</p>
             {transport_config,[{reuseaddr,true},
                                {ip,{127,0,0,1}},
                                {port,3868}]}]},
-  {accept,[[{watchdog,{&lt;0.56.0>,{1346,171481,226895},okay}},
-            {peer,{&lt;0.58.0>,{1346,171491,999511}}},
+  {accept,[[{watchdog,{&lt;0.56.0>,-576460739249514012,okay}},
+            {peer,{&lt;0.58.0>,-576460638229179167}},
             {apps,[{0,common}]},
             {caps,[{origin_host,{"server.example.com","client.example.com"}},
                    {origin_realm,{"example.com","example.com"}},
@@ -1976,7 +1976,7 @@ connection might look as follows.</p>
                                 {send_max,148},
                                 {send_avg,87},
                                 {send_pend,0}]}]}],
-           [{watchdog,{&lt;0.72.0>,{1346,171491,998404},initial}}]]},
+           [{watchdog,{&lt;0.72.0>,-576460638229717546,initial}}]]},
   {statistics,[{{{0,280,0},recv},7},
                {{{0,280,1},send},7},
                {{{0,280,0},recv,{'Result-Code',2001}},7},
@@ -2024,8 +2024,8 @@ A return value for the server above might look as follows.</p>
             {transport_config,[{reuseaddr,true},
                                {ip,{127,0,0,1}},
                                {port,3868}]}]},
-  {watchdog,{&lt;0.56.0>,{1346,171481,226895},okay}},
-  {peer,{&lt;0.58.0>,{1346,171491,999511}}},
+  {watchdog,{&lt;0.56.0>,-576460739249514012,okay}},
+  {peer,{&lt;0.58.0>,-576460638229179167}},
   {apps,[{0,common}]},
   {caps,[{origin_host,{"server.example.com","client.example.com"}},
          {origin_realm,{"example.com","example.com"}},
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index eded788419..ba4525fd20 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -43,6 +43,22 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>diameter 2.1.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix documentation typo: peer_down/3 was written where
+	    peer_down/3 was intended.</p>
+          <p>
+	    Own Id: OTP-14805</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>diameter 2.1.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/diameter/doc/src/seealso.ent b/lib/diameter/doc/src/seealso.ent
index c5a53670d0..72d74c103c 100644
--- a/lib/diameter/doc/src/seealso.ent
+++ b/lib/diameter/doc/src/seealso.ent
@@ -79,7 +79,7 @@ significant.
 <!ENTITY app_handle_answer '<seealso marker="diameter_app#Mod:handle_answer-4">handle_answer/4</seealso>'>
 <!ENTITY app_handle_request '<seealso marker="diameter_app#Mod:handle_request-3">handle_request/3</seealso>'>
 <!ENTITY app_handle_error '<seealso marker="diameter_app#Mod:handle_error-4">handle_error/4</seealso>'>
-<!ENTITY app_peer_down '<seealso marker="diameter_app#Mod:peer_down-3">peer_up/3</seealso>'>
+<!ENTITY app_peer_down '<seealso marker="diameter_app#Mod:peer_down-3">peer_down/3</seealso>'>
 <!ENTITY app_peer_up '<seealso marker="diameter_app#Mod:peer_up-3">peer_up/3</seealso>'>
 <!ENTITY app_pick_peer '<seealso marker="diameter_app#Mod:pick_peer-4">pick_peer/4</seealso>'>
 <!ENTITY app_prepare_retransmit '<seealso marker="diameter_app#Mod:prepare_retransmit-3">prepare_retransmit/3</seealso>'>
diff --git a/lib/diameter/src/base/diameter_reg.erl b/lib/diameter/src/base/diameter_reg.erl
index 5b7cfab31a..c1762a07e3 100644
--- a/lib/diameter/src/base/diameter_reg.erl
+++ b/lib/diameter/src/base/diameter_reg.erl
@@ -246,8 +246,11 @@ handle_call({add, Uniq, Key}, {Pid, _}, S) ->
 
 handle_call({remove, Key}, {Pid, _}, S) ->
     Rec = {Key, Pid},
-    ets:delete_object(?TABLE, Rec),
-    {reply, true, notify(remove, Rec, S)};
+    {reply, true, try
+                      notify(remove, Rec, S)
+                  after
+                      ets:delete_object(?TABLE, Rec)
+                  end};
 
 handle_call({wait, Pat}, {Pid, _} = From, S) ->
     NS = add_monitor(Pid, S),
@@ -370,10 +373,12 @@ send({_,_} = From, add, Rec) ->
 
 down(Pid, #state{monitors = Ps} = S) ->
     Recs = match('_', Pid),
-    ets:match_delete(?TABLE, {'_', Pid}),
-    lists:foldl(fun(R,NS) -> notify(remove, R, NS) end,
-                flush(Pid, S#state{monitors = sets:del_element(Pid, Ps)}),
-                Recs).
+    Acc0 = flush(Pid, S#state{monitors = sets:del_element(Pid, Ps)}),
+    try
+        lists:foldl(fun(R,NS) -> notify(remove, R, NS) end, Acc0, Recs)
+    after
+        ets:match_delete(?TABLE, {'_', Pid})
+    end.
 
 %% flush/3
 
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 31dd92f878..cbe66ef27a 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -151,7 +151,7 @@
          apps :: match([{0..16#FFFFFFFF, diameter:app_alias()}] %% {Id, Alias}
                        | [diameter:app_alias()]),               %% remote
          caps :: match(#diameter_caps{}),
-         started = diameter_lib:now(),     %% at process start or sharing
+         started = diameter_lib:now(),     %% at connection_up
          watchdog :: match(pid()           %% key into watchdogT
                            | undefined)}). %% undefined if remote
 
@@ -554,15 +554,25 @@ terminate(Reason, #state{service_name = Name, local = {PeerT, _, _}} = S) ->
     %% wait for watchdog state changes to take care of if. That this
     %% takes place after deleting the state entry ensures that the
     %% resulting failover by request processes accomplishes nothing.
-    ets:foldl(fun(#peer{pid = TPid}, _) ->
-                      diameter_traffic:peer_down(TPid)
-              end,
-              ok,
-              PeerT),
+    ets:foldl(fun peer_down/2, ok, PeerT),
 
     shutdown == Reason  %% application shutdown
         andalso shutdown(application, S).
 
+%% peer_down/1
+%%
+%% Entries with watchdog state SUSPECT are already down: ignore the
+%% expected failure. This assumes the current implementation, but
+%% double the number of lookups (in the typical case) could be the
+%% greater evil if there are many peer connections.
+
+peer_down(#peer{pid = TPid}, _) ->
+    try
+        diameter_traffic:peer_down(TPid)
+    catch
+        error: {badmatch, []} -> ok
+    end.
+
 %% ---------------------------------------------------------------------------
 %% # code_change/3
 %% ---------------------------------------------------------------------------
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index d0e58e8410..05a8c9378e 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. 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.
@@ -54,9 +54,10 @@
   {"1.12.1",  [{restart_application, diameter}]},  %% 19.1
   {"1.12.2",  [{restart_application, diameter}]},  %% 19.3
   {"2.0",     [{restart_application, diameter}]},  %% 20.0
-  {"2.1",     [{load_module, diameter_gen},        %% 20.1
-               {update, diameter_reg, {advanced, "2.1"}}]},
-  {"2.1.1",   [{load_module, diameter_gen}]}
+  {"2.1",     [{restart_application, diameter}]},  %% 20.1
+  {"2.1.1",   [{restart_application, diameter}]},  %% 20.1.2
+  {"2.1.2",   [{restart_application, diameter}]},  %% 20.1.3
+  {"2.1.3",   [{restart_application, diameter}]}   %% 20.2
  ],
  [
   {"0.9",     [{restart_application, diameter}]},
@@ -93,6 +94,8 @@
   {"1.12.2",  [{restart_application, diameter}]},
   {"2.0",     [{restart_application, diameter}]},
   {"2.1",     [{restart_application, diameter}]},
-  {"2.1.1",   [{load_module, diameter_gen}]}
+  {"2.1.1",   [{restart_application, diameter}]},
+  {"2.1.2",   [{restart_application, diameter}]},
+  {"2.1.3",   [{restart_application, diameter}]}
  ]
 }.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index bfb260ed8f..b0fb4ada28 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -1,6 +1,6 @@
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2017. 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.
@@ -17,5 +17,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 2.1.2
+DIAMETER_VSN = 2.1.4
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index 96d7597d83..240789e876 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the EDoc
     application.</p>
 
+<section><title>Edoc 0.9.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> The map type is correctly denoted as <c>map()</c> in
+	    function specifications and types. </p>
+          <p>
+	    Own Id: OTP-14777</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Edoc 0.9.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/edoc/src/edoc_specs.erl b/lib/edoc/src/edoc_specs.erl
index 26b7202462..7b451c43f8 100644
--- a/lib/edoc/src/edoc_specs.erl
+++ b/lib/edoc/src/edoc_specs.erl
@@ -372,7 +372,7 @@ d2e({type,_,binary,[Base,Unit]}, _Prec) ->
     {integer,_,U} = erl_eval:partial_eval(Unit),
     #t_binary{base_size = B, unit_size = U};
 d2e({type,_,map,any}, _Prec) ->
-    #t_map{types = []};
+    #t_type{name = #t_name{name = map}, args = []};
 d2e({type,_,map,Es}, _Prec) ->
     #t_map{types = d2e(Es) };
 d2e({type,_,map_field_assoc,[K,V]}, Prec) ->
diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk
index 065944ccef..2f6d469536 100644
--- a/lib/edoc/vsn.mk
+++ b/lib/edoc/vsn.mk
@@ -1 +1 @@
-EDOC_VSN = 0.9.1
+EDOC_VSN = 0.9.2
diff --git a/lib/eldap/doc/src/Makefile b/lib/eldap/doc/src/Makefile
index ac869e446f..aff1da4a9a 100644
--- a/lib/eldap/doc/src/Makefile
+++ b/lib/eldap/doc/src/Makefile
@@ -37,7 +37,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 XML_APPLICATION_FILES = ref_man.xml
 XML_REF3_FILES = eldap.xml
 
-XML_PART_FILES = release_notes.xml usersguide.xml
+XML_PART_FILES = usersguide.xml
 XML_CHAPTER_FILES = notes.xml
 
 BOOK_FILES = book.xml
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index 7aad745f67..8b066671ee 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the Eldap application.</p>
 
+<section><title>Eldap 1.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eldap 1.2.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index 721387d97d..1636b6bb6d 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.2.2
+ELDAP_VSN = 1.2.3
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index 59c65665d4..2652b4b0c8 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -31,7 +31,26 @@
   </header>
   <p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
 
-  <section><title>Erl_Docgen 0.7.1</title>
+  <section><title>Erl_Docgen 0.7.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> The style for code, warning and note tags in the pdf
+	    have been changed so they look like the html version.
+	    <br/> The spacing around code blocks have been changed
+	    for both html and pdf so it's the same regardless if the
+	    user have a newline after the start tag (or before the
+	    end tag) or not. </p>
+          <p>
+	    Own Id: OTP-14674</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.7.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/erl_docgen/priv/dtd/erlref.dtd b/lib/erl_docgen/priv/dtd/erlref.dtd
index 615b88b61a..78d6771f52 100644
--- a/lib/erl_docgen/priv/dtd/erlref.dtd
+++ b/lib/erl_docgen/priv/dtd/erlref.dtd
@@ -33,4 +33,5 @@
 <!ATTLIST name                 name CDATA #IMPLIED
                                arity CDATA #IMPLIED
 	                       clause_i CDATA #IMPLIED
+                               anchor CDATA #IMPLIED
                                n_vars CDATA #IMPLIED>
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index 75614392fb..5b7eae4f73 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -172,6 +172,7 @@
   <xsl:template name="spec_name">
     <xsl:variable name="name" select="@name"/>
     <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="anchor" select="@anchor"/>
     <xsl:variable name="spec0">
       <xsl:call-template name="find_spec"/>
     </xsl:variable>
@@ -198,6 +199,11 @@
 	  </xsl:otherwise>
         </xsl:choose>
 
+	<!-- Insert an anchor for "anchor" attribute -->
+	<xsl:if test="string-length($anchor) > 0">
+	      <a name="{$anchor}"></a>
+	</xsl:if>
+
         <xsl:variable name="global_types" select="ancestor::erlref/datatypes"/>
 	<xsl:variable name="local_types"
 		      select="../type[string-length(@name) > 0]"/>
diff --git a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
index 67e6e33c93..b065c18cda 100644
--- a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
@@ -489,6 +489,8 @@ otp_xmlify_a_href("#"++_ = Marker, Es0) -> % <seealso marker="#what">
     {Marker, Es0};
 otp_xmlify_a_href("http:"++_ = URL, Es0) -> % external URL
     {URL, Es0};
+otp_xmlify_a_href("https:"++_ = URL, Es0) -> % external URL
+    {URL, Es0};
 otp_xmlify_a_href("OTPROOT"++AppRef, Es0) -> % <.. marker="App:FileRef
     [AppS, "doc", FileRef1] = split(AppRef, "/"),
     FileRef = AppS++":"++otp_xmlify_a_fileref(FileRef1, AppS),
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 17a7c483f4..95b2329ac5 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 0.7.1
+ERL_DOCGEN_VSN = 0.7.2
diff --git a/lib/erl_interface/doc/src/Makefile b/lib/erl_interface/doc/src/Makefile
index a96ef62786..8ef7e9648c 100644
--- a/lib/erl_interface/doc/src/Makefile
+++ b/lib/erl_interface/doc/src/Makefile
@@ -53,7 +53,7 @@ XML_APPLICATION_FILES = ref_man.xml
 #ref_man_ei.xml ref_man_erl_interface.xml
 XML_PART_FILES = \
 	part.xml
-XML_CHAPTER_FILES = ei_users_guide.xml notes.xml notes_history.xml
+XML_CHAPTER_FILES = ei_users_guide.xml notes.xml
 
 XML_FILES = $(XML_REF1_FILES) $(XML_REF3_FILES) $(BOOK_FILES) \
 	 $(XML_APPLICATION_FILES) $(XML_PART_FILES) $(XML_CHAPTER_FILES)
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index ec20f3c67f..641a3de13f 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.10.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.10</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/src/Makefile b/lib/erl_interface/src/Makefile
index 31f34d4bba..135522397b 100644
--- a/lib/erl_interface/src/Makefile
+++ b/lib/erl_interface/src/Makefile
@@ -29,5 +29,5 @@ include $(ERL_TOP)/make/target.mk
 debug opt shared purify quantify purecov gcov:
 	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile TYPE=$@
 
-clean depend docs release release_docs tests release_tests check:
+clean depend docs release release_docs tests release_tests check xmllint:
 	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile $@
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
index 4f393e952c..69b5b6003d 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -854,3 +854,5 @@ endif
 release_docs:
 
 release_tests:
+
+xmllint:
diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl
index e06ee762d7..6676e73e21 100644
--- a/lib/erl_interface/test/ei_accept_SUITE.erl
+++ b/lib/erl_interface/test/ei_accept_SUITE.erl
@@ -25,7 +25,8 @@
 -include("ei_accept_SUITE_data/ei_accept_test_cases.hrl").
 
 -export([all/0, suite/0,
-         ei_accept/1, ei_threaded_accept/1]).
+         ei_accept/1, ei_threaded_accept/1,
+         monitor_ei_process/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
@@ -34,7 +35,8 @@ suite() ->
      {timetrap, {seconds, 30}}].
 
 all() -> 
-    [ei_accept, ei_threaded_accept].
+    [ei_accept, ei_threaded_accept,
+     monitor_ei_process].
 
 ei_accept(Config) when is_list(Config) ->
     P = runner:start(?interpret),
@@ -44,33 +46,32 @@ ei_accept(Config) when is_list(Config) ->
     io:format("Myname ~p ~n",  [Myname]),
     EINode = list_to_atom("c42@"++Myname),
     io:format("EINode ~p ~n",  [EINode]),
+
+    %% We take this opportunity to also test export-funs and bit-strings
+    %% with (ugly) tuple fallbacks.
+    %% Test both toward pending connection and established connection.
+    RealTerms = [<<1:1>>,     fun lists:map/2],
+    Fallbacks = [{<<128>>,1}, {lists,map}],
+
     Self = self(),
-    TermToSend= {call, Self, "Test"},
-    F= fun() ->
-               case waitfornode("c42",20) of
-                   true ->
-                       {any, EINode} ! TermToSend,
-                       Self ! sent_ok;
-                   false ->
-                       Self ! never_published
-               end,
-               ok
-       end,
-
-    spawn(F),
+    Funny = fun() -> hello end,
+    TermToSend = {call, Self, "Test", Funny, RealTerms},
+    TermToGet  = {call, Self, "Test", Funny, Fallbacks},
     Port = 6543,
-    {ok, Fd, _Node} = ei_accept(P, Port),
-    TermReceived= ei_receive(P, Fd),
-    io:format("Sent ~p received ~p ~n", [TermToSend, TermReceived]),
-    TermToSend= TermReceived,
-    receive
-        sent_ok ->
-            ok;
-        Unknown ->
-            io:format("~p ~n", [Unknown])
-    after 1000 ->
-              io:format("timeout ~n")
-    end,
+    {ok, ListenFd} = ei_publish(P, Port),
+    {any, EINode} ! TermToSend,
+
+    {ok, Fd, _Node} = ei_accept(P, ListenFd),
+    Got1 = ei_receive(P, Fd),
+
+    %% Send again, now without auto-connect
+    {any, EINode} ! TermToSend,
+    Got2 = ei_receive(P, Fd),
+
+    io:format("Sent ~p~nExp. ~p~nGot1 ~p~nGot2 ~p~n", [TermToSend, TermToGet, Got1, Got2]),
+    TermToGet = Got1,
+    TermToGet = Got2,
+
     runner:finish(P),
     ok.
 
@@ -87,6 +88,41 @@ ei_threaded_accept(Config) when is_list(Config) ->
     [receive I -> ok end || I <- lists:seq(0, N-1) ],
     ok.
 
+
+%% Test erlang:monitor toward erl_interface "processes"
+monitor_ei_process(Config) when is_list(Config) ->
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+
+    Myname = hd(tl(string:tokens(atom_to_list(node()), "@"))),
+    io:format("Myname ~p ~n",  [Myname]),
+    EINode = list_to_atom("c42@"++Myname),
+    io:format("EINode ~p ~n",  [EINode]),
+
+    Self = self(),
+    Port = 6543,
+    {ok, ListenFd} = ei_publish(P, Port),
+    MRef1 = erlang:monitor(process, {any, EINode}),
+    {any, EINode} ! hello,
+
+    {ok, Fd, _Node} = ei_accept(P, ListenFd),
+    hello = ei_receive(P, Fd),
+
+    %% Again, now on an established connection.
+    MRef2 = erlang:monitor(process, {any, EINode}),
+    {any, EINode} ! hello,
+    hello = ei_receive(P, Fd),
+
+    ok = receive M -> M after 0 -> ok end,
+
+    runner:finish(P),
+
+    [{'DOWN', MRef1, process, {any, EINode}, noconnection},
+     {'DOWN', MRef2, process, {any, EINode}, noconnection}
+    ] = lists:sort(flush(2, 1000)),
+
+    ok.
+
 waitfornode(String,0) ->
     io:format("~s never published itself.~n",[String]),
     false;
@@ -137,8 +173,15 @@ ei_connect_init(P, Num, Cookie, Creation) ->
         {term,Int} when is_integer(Int) -> Int
     end.
 
-ei_accept(P, PortNo) ->
-    send_command(P, ei_accept, [PortNo]),
+ei_publish(P, PortNo) ->
+    send_command(P, ei_publish, [PortNo]),
+    case get_term(P) of
+        {term,{ListenFd, EpmdFd, _}} when ListenFd >= 0, EpmdFd >= 0 -> {ok, ListenFd};
+        {term,{_, _, Errno}} -> {error,Errno}
+    end.
+
+ei_accept(P, ListenFd) ->
+    send_command(P, ei_accept, [ListenFd]),
     case get_term(P) of
         {term,{Fd, _, Node}} when Fd >= 0 -> {ok, Fd, Node};
         {term,{_Fd, Errno, _Node}} -> {error,Errno}
@@ -151,3 +194,12 @@ ei_receive(P, Fd) ->
 
 send_command(P, Name, Args) ->
     runner:send_term(P, {Name,list_to_tuple(Args)}).
+
+flush(0, Timeout) ->
+    flush(1, Timeout div 10);
+flush(Expected, Timeout) ->
+    receive M ->
+            [M | flush(Expected-1, Timeout)]
+    after Timeout ->
+            []
+    end.
diff --git a/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c b/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
index 7b81ee5491..2b62d7c3a4 100644
--- a/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
+++ b/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
@@ -43,6 +43,7 @@
 #include "ei_runner.h"
 
 static void cmd_ei_connect_init(char* buf, int len);
+static void cmd_ei_publish(char* buf, int len);
 static void cmd_ei_accept(char* buf, int len);
 static void cmd_ei_receive(char* buf, int len);
 static void cmd_ei_unpublish(char* buf, int len);
@@ -58,6 +59,7 @@ static struct {
     void (*func)(char* buf, int len);
 } commands[] = {
     "ei_connect_init",  3, cmd_ei_connect_init,
+    "ei_publish", 	1, cmd_ei_publish,
     "ei_accept", 	1, cmd_ei_accept,
     "ei_receive",  	1, cmd_ei_receive,
     "ei_unpublish",     0, cmd_ei_unpublish
@@ -149,11 +151,10 @@ static int my_listen(int port)
     return listen_fd;
 }
 
-static void cmd_ei_accept(char* buf, int len)
+static void cmd_ei_publish(char* buf, int len)
 {
     int index = 0;
     int listen, r;
-    ErlConnect conn;
     long port;
     ei_x_buff x;
     int i;
@@ -170,6 +171,29 @@ static void cmd_ei_accept(char* buf, int len)
 #ifdef VXWORKS
     save_fd(i);
 #endif
+    /* send listen-fd, result and errno */
+    ei_x_new_with_version(&x);
+    ei_x_encode_tuple_header(&x, 3);
+    ei_x_encode_long(&x, listen);
+    ei_x_encode_long(&x, i);
+    ei_x_encode_long(&x, erl_errno);
+    send_bin_term(&x);
+    ei_x_free(&x);
+}
+
+static void cmd_ei_accept(char* buf, int len)
+{
+    int index = 0;
+    int r;
+    ErlConnect conn;
+    long listen;
+    ei_x_buff x;
+    int i;
+
+    /* get port */
+    if (ei_decode_long(buf, &index, &listen) < 0)
+	fail("expected int (listen fd)");
+
     r = ei_accept(&ec, listen, &conn);
 #ifdef VXWORKS
     save_fd(r);
@@ -200,7 +224,7 @@ static void cmd_ei_receive(char* buf, int len)
 	if (got == ERL_TICK)
 	    continue;
 	if (got == ERL_ERROR)
-	    fail("ei_xreceive_msg");
+	    fail1("ei_xreceive_msg, got==%d", got);
 	break;
     }
     index = 1;
diff --git a/lib/erl_interface/test/runner.erl b/lib/erl_interface/test/runner.erl
index 1084eec2a3..cbdeb3c8a9 100644
--- a/lib/erl_interface/test/runner.erl
+++ b/lib/erl_interface/test/runner.erl
@@ -67,7 +67,12 @@ start({Prog, Tc}) when is_list(Prog), is_integer(Tc) ->
 
 finish(Port) when is_port(Port) ->
     send_eot(Port),
-    recv_eot(Port).
+    ok = recv_eot(Port),
+    0 = receive
+            {Port,{exit_status,Status}} ->
+                Status
+        end,
+    ok.
 
 %% Sends an Erlang term to a C program.
 
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 01fcee86dd..d76d110afd 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 3.10
+EI_VSN = 3.10.1
 ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/et/src/et_wx_contents_viewer.erl b/lib/et/src/et_wx_contents_viewer.erl
index bca517317e..7ca41da3e8 100644
--- a/lib/et/src/et_wx_contents_viewer.erl
+++ b/lib/et/src/et_wx_contents_viewer.erl
@@ -93,8 +93,8 @@ start_link(Options) ->
 		end,
 		{ok, Pid}
 	    catch
-		error:Reason ->
-		    {error, {'EXIT', Reason, erlang:get_stacktrace()}}
+		error:Reason:Stacktrace ->
+		    {error, {'EXIT', Reason, Stacktrace}}
 	    end;
 	{error, Reason} ->
 	    {error, Reason}
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml
index 7133befe37..b38cb2e70e 100644
--- a/lib/eunit/doc/src/notes.xml
+++ b/lib/eunit/doc/src/notes.xml
@@ -33,6 +33,21 @@
   </header>
   <p>This document describes the changes made to the EUnit application.</p>
 
+<section><title>Eunit 2.3.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eunit 2.3.4</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl
index d1bd160ea1..771541354c 100644
--- a/lib/eunit/src/eunit_lib.erl
+++ b/lib/eunit/src/eunit_lib.erl
@@ -202,13 +202,13 @@ format_exception_test_() ->
         "\nymmud:rorre"++_,
         lists:reverse(lists:flatten(
           format_exception(try erlang:error(dummy)
-                           catch C:R -> {C, R, erlang:get_stacktrace()}
+                           catch C:R:S -> {C, R, S}
                            end)))),
      ?_assertMatch(
         "\nymmud:rorre"++_,
         lists:reverse(lists:flatten(
           format_exception(try erlang:error(dummy, [a])
-                           catch C:R -> {C, R, erlang:get_stacktrace()}
+                           catch C:R:S -> {C, R, S}
                            end))))].
 -endif.
 
diff --git a/lib/eunit/src/eunit_listener.erl b/lib/eunit/src/eunit_listener.erl
index e652c5b2f6..75aa05c543 100644
--- a/lib/eunit/src/eunit_listener.erl
+++ b/lib/eunit/src/eunit_listener.erl
@@ -137,8 +137,7 @@ call(F, As, St) when is_atom(F) ->
     try apply(St#state.callback, F, As) of
 	Substate -> St#state{state = Substate}
     catch
-	Class:Term ->
-	    Trace = erlang:get_stacktrace(),
+	Class:Term:Trace ->
 	    if F =/= terminate ->
 		    call(terminate, [{error, {Class, Term, Trace}},
 				     St#state.state], St);
diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl
index e075005238..96bdcf88b6 100644
--- a/lib/eunit/src/eunit_proc.erl
+++ b/lib/eunit/src/eunit_proc.erl
@@ -628,7 +628,7 @@ io_request({put_chars, M, F, As}, Buf) ->
     try apply(M, F, As) of
 	Chars -> {ok, [Chars | Buf]}
     catch
-	C:T -> {{error, {C,T,erlang:get_stacktrace()}}, Buf}
+	C:T:S -> {{error, {C,T,S}}, Buf}
     end;
 io_request({put_chars, _Enc, Chars}, Buf) ->
     io_request({put_chars, Chars}, Buf);
diff --git a/lib/eunit/src/eunit_test.erl b/lib/eunit/src/eunit_test.erl
index 6036537178..6fe85ae70a 100644
--- a/lib/eunit/src/eunit_test.erl
+++ b/lib/eunit/src/eunit_test.erl
@@ -39,11 +39,11 @@
 %% somewhat, but you can't have everything.) Note that we assume that
 %% this particular module is the boundary between eunit and user code.
 
-get_stacktrace() ->
-    get_stacktrace([]).
+get_stacktrace(Trace) ->
+    get_stacktrace(Trace, []).
 
-get_stacktrace(Ts) ->
-    eunit_lib:uniq(prune_trace(erlang:get_stacktrace(), Ts)).
+get_stacktrace(Trace, Ts) ->
+    eunit_lib:uniq(prune_trace(Trace, Ts)).
 
 -dialyzer({no_match, prune_trace/2}).
 prune_trace([{eunit_data, _, _} | Rest], Tail) ->
@@ -75,8 +75,8 @@ run_testfun(F) ->
 	{eunit_internal, Term} ->
 	    %% Internally generated: re-throw Term (lose the trace)
 	    throw(Term);
-	Class:Reason ->
-	    {error, {Class, Reason, get_stacktrace()}}
+	Class:Reason:Trace ->
+	    {error, {Class, Reason, Trace}}
     end.
 
 
@@ -272,7 +272,7 @@ mf_wrapper(M, F) ->
     fun () ->
  	    try M:F()
  	    catch
- 		error:undef ->
+ 		error:undef:Trace ->
  		    %% Check if it was M:F/0 that was undefined
  		    case erlang:module_loaded(M) of
  			false ->
@@ -282,14 +282,14 @@ mf_wrapper(M, F) ->
  				false ->
  				    fail({no_such_function, {M,F,0}});
  				true ->
- 				    rethrow(error, undef, [{M,F,0}])
+ 				    rethrow(error, undef, Trace, [{M,F,0}])
  			    end
  		    end
  	    end
     end.
 
-rethrow(Class, Reason, Trace) ->
-    erlang:raise(Class, Reason, get_stacktrace(Trace)).
+rethrow(Class, Reason, Trace, Ts) ->
+    erlang:raise(Class, Reason, get_stacktrace(Trace, Ts)).
 
 fail(Term) ->
     throw({eunit_internal, Term}).				   
@@ -332,12 +332,14 @@ enter_context(Setup, Cleanup, Instantiate, Callback) ->
 		T ->
                     case eunit_lib:is_not_test(T) of
                         true ->
-                            catch throw(error),  % generate a stack trace
+                            {_, Stacktrace} =
+                                erlang:process_info(self(),
+                                                    current_stacktrace),
                             {module,M} = erlang:fun_info(Instantiate, module),
                             {name,N} = erlang:fun_info(Instantiate, name),
                             {arity,A} = erlang:fun_info(Instantiate, arity),
                             context_error({bad_instantiator, {{M,N,A},T}},
-                                          error, badarg);
+                                          error, Stacktrace, badarg);
                         false ->
                             ok
                     end,
@@ -346,21 +348,22 @@ enter_context(Setup, Cleanup, Instantiate, Callback) ->
 			%% Always run cleanup; client may be an idiot
 			try Cleanup(R)
 			catch
-			    Class:Term ->
-				context_error(cleanup_failed, Class, Term)
+			    Class:Term:Trace ->
+				context_error(cleanup_failed,
+                                              Class, Trace, Term)
 			end
 		    end
 	    catch
-		Class:Term ->
-		    context_error(instantiation_failed, Class, Term)
+		Class:Term:Trace ->
+		    context_error(instantiation_failed, Class, Trace, Term)
 	    end
     catch
-	Class:Term ->
-	    context_error(setup_failed, Class, Term)
+	Class:Term:Trace ->
+	    context_error(setup_failed, Class, Trace, Term)
     end.
 
-context_error(Type, Class, Term) ->
-    throw({context_error, Type, {Class, Term, get_stacktrace()}}).
+context_error(Type, Class, Trace, Term) ->
+    throw({context_error, Type, {Class, Term, get_stacktrace(Trace)}}).
 
 %% This generates single setup/cleanup functions from a list of tuples
 %% on the form {Tag, Setup, Cleanup}, where the setup function always
@@ -378,8 +381,8 @@ multi_setup([{Tag, S, C} | Es], CleanupPrev) ->
 		      try C(R) of
 			  _ -> CleanupPrev(Rs)
 		      catch
-			  Class:Term ->
-			      throw({Tag, {Class, Term, get_stacktrace()}})
+			  Class:Term:Trace ->
+			      throw({Tag, {Class, Term, Trace}})
 		      end
 	      end,
     {SetupRest, CleanupAll} = multi_setup(Es, Cleanup),
@@ -388,9 +391,9 @@ multi_setup([{Tag, S, C} | Es], CleanupPrev) ->
 		 R ->
 		     SetupRest([R|Rs])
 	     catch
-		 Class:Term ->
+		 Class:Term:Trace ->
 		     CleanupPrev(Rs),
-		     throw({Tag, {Class, Term, get_stacktrace()}})
+		     throw({Tag, {Class, Term, Trace}})
 	     end
      end,
      CleanupAll};
diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk
index 25bb0dec17..2ed9eaac16 100644
--- a/lib/eunit/vsn.mk
+++ b/lib/eunit/vsn.mk
@@ -1 +1 @@
-EUNIT_VSN = 2.3.4
+EUNIT_VSN = 2.3.5
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index a3a936322a..bfffb8db41 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -585,6 +585,13 @@ type(erlang, float, 1, Xs, Opaques) ->
 %% Guard bif, needs to be here.
 type(erlang, floor, 1, Xs, Opaques) ->
   strict(erlang, floor, 1, Xs, fun (_) -> t_integer() end, Opaques);
+%% Primop, needs to be somewhere.
+type(erlang, build_stacktrace, 0, _, _Opaques) ->
+  t_list(t_tuple([t_module(),
+                  t_atom(),
+                  t_sup([t_arity(),t_list()]),
+                  t_list(t_sup([t_tuple([t_atom('file'),t_string()]),
+                                t_tuple([t_atom('line'),t_pos_integer()])]))]));
 %% Guard bif, needs to be here.
 type(erlang, hd, 1, Xs, Opaques) ->
   strict(erlang, hd, 1, Xs, fun ([X]) -> t_cons_hd(X) end, Opaques);
@@ -1701,24 +1708,6 @@ type(maps, size, 1, Xs, Opaques) ->
 		 t_from_range(LowerBound, UpperBound)
 	     end
 	 end, Opaques);
-type(maps, to_list, 1, Xs, Opaques) ->
-  strict(maps, to_list, 1, Xs,
-	 fun ([Map]) ->
-	     DefK = t_map_def_key(Map, Opaques),
-	     DefV = t_map_def_val(Map, Opaques),
-	     Pairs = t_map_entries(Map, Opaques),
-	     EType = lists:foldl(
-		       fun({K,_,V},EType0) ->
-			   case t_is_none(V) of
-			     true -> t_subtract(EType0, t_tuple([K,t_any()]));
-			     false -> t_sup(EType0, t_tuple([K,V]))
-			   end
-		       end, t_tuple([DefK, DefV]), Pairs),
-	     case t_is_none(EType) of
-	       true -> t_nil();
-	       false -> t_list(EType)
-	     end
-	 end, Opaques);
 type(maps, update, 3, Xs, Opaques) ->
   strict(maps, update, 3, Xs,
 	 fun ([Key, Value, Map]) ->
@@ -1903,7 +1892,8 @@ infinity_div(Number1, Number2) when is_integer(Number1), is_integer(Number2) ->
 
 infinity_bsl(pos_inf, _) -> pos_inf;
 infinity_bsl(neg_inf, _) -> neg_inf;
-infinity_bsl(Number, pos_inf) when is_integer(Number), Number >= 0 -> pos_inf;
+infinity_bsl(0, pos_inf) -> 0;
+infinity_bsl(Number, pos_inf) when is_integer(Number), Number > 0 -> pos_inf;
 infinity_bsl(Number, pos_inf) when is_integer(Number) -> neg_inf;
 infinity_bsl(Number, neg_inf) when is_integer(Number), Number >= 0 -> 0;
 infinity_bsl(Number, neg_inf) when is_integer(Number) -> -1;
@@ -1992,9 +1982,11 @@ arith_abs(X1, Opaques) ->
         case infinity_geq(Min1, 0) of
           true -> {Min1, Max1};
           false ->
+            NegMin1 = infinity_inv(Min1),
+            NegMax1 = infinity_inv(Max1),
             case infinity_geq(Max1, 0) of
-              true  -> {0, infinity_inv(Min1)};
-              false -> {infinity_inv(Max1), infinity_inv(Min1)}
+              true  -> {0, max(NegMin1, Max1)};
+              false -> {NegMax1, NegMin1}
             end
         end,
       t_from_range(NewMin, NewMax)
@@ -2351,6 +2343,9 @@ arg_types(erlang, float, 1) ->
 %% Guard bif, needs to be here.
 arg_types(erlang, floor, 1) ->
   [t_number()];
+%% Primop, needs to be somewhere.
+arg_types(erlang, build_stacktrace, 0) ->
+  [];
 %% Guard bif, needs to be here.
 arg_types(erlang, hd, 1) ->
   [t_cons()];
@@ -2648,8 +2643,6 @@ arg_types(maps, put, 3) ->
   [t_any(), t_any(), t_map()];
 arg_types(maps, size, 1) ->
   [t_map()];
-arg_types(maps, to_list, 1) ->
-  [t_map()];
 arg_types(maps, update, 3) ->
   [t_any(), t_any(), t_map()];
 arg_types(M, F, A) when is_atom(M), is_atom(F),
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index d8d707c05e..8a609ef911 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -1877,6 +1877,7 @@ t_map_put(KV, Map, Opaques) ->
 
 %% Key and Value are *not* unopaqued, but the map is
 map_put(_, ?none, _) -> ?none;
+map_put(_, ?unit, _) -> ?none;
 map_put({Key, Value}, ?map(Pairs,DefK,DefV), Opaques) ->
   case t_is_none_or_unit(Key) orelse t_is_none_or_unit(Value) of
     true -> ?none;
@@ -1902,6 +1903,7 @@ t_map_update(KV, Map) ->
 -spec t_map_update({erl_type(), erl_type()}, erl_type(), opaques()) -> erl_type().
 
 t_map_update(_, ?none, _) -> ?none;
+t_map_update(_, ?unit, _) -> ?none;
 t_map_update(KV={Key, _}, M, Opaques) ->
   case t_is_subtype(t_atom('true'), t_map_is_key(Key, M, Opaques)) of
     false -> ?none;
@@ -1922,6 +1924,7 @@ t_map_get(Key, Map, Opaques) ->
 	    end).
 
 map_get(_, ?none) -> ?none;
+map_get(_, ?unit) -> ?none;
 map_get(Key, ?map(Pairs, DefK, DefV)) ->
   DefRes =
     case t_do_overlap(DefK, Key) of
@@ -1957,6 +1960,7 @@ t_map_is_key(Key, Map, Opaques) ->
 	    end).
 
 map_is_key(_, ?none) -> ?none;
+map_is_key(_, ?unit) -> ?none;
 map_is_key(Key, ?map(Pairs, DefK, _DefV)) ->
   case is_singleton_type(Key) of
     true ->
@@ -2347,6 +2351,8 @@ t_from_range(X, Y) ->
 
 -else.
 
+t_from_range(pos_inf, pos_inf) -> ?integer_pos;
+t_from_range(neg_inf, neg_inf) -> ?integer_neg;
 t_from_range(neg_inf, pos_inf) -> t_integer();
 t_from_range(neg_inf, Y) when is_integer(Y), Y < 0  -> ?integer_neg;
 t_from_range(neg_inf, Y) when is_integer(Y), Y >= 0 -> t_integer();
@@ -2379,6 +2385,8 @@ t_from_range(pos_inf, neg_inf) -> t_none().
 
 -spec t_from_range_unsafe(rng_elem(), rng_elem()) -> erl_type().
 
+t_from_range_unsafe(pos_inf, pos_inf) -> ?integer_pos;
+t_from_range_unsafe(neg_inf, neg_inf) -> ?integer_neg;
 t_from_range_unsafe(neg_inf, pos_inf) -> t_integer();
 t_from_range_unsafe(neg_inf, Y) -> ?int_range(neg_inf, Y);
 t_from_range_unsafe(X, pos_inf) -> ?int_range(X, pos_inf);
diff --git a/lib/hipe/doc/src/Makefile b/lib/hipe/doc/src/Makefile
index 63154abd6a..1c774d3357 100644
--- a/lib/hipe/doc/src/Makefile
+++ b/lib/hipe/doc/src/Makefile
@@ -38,7 +38,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 XML_APPLICATION_FILES =  ref_man.xml
 XML_REF3_FILES =
 
-XML_PART_FILES =
+XML_PART_FILES = hipe_app.xml
 XML_CHAPTER_FILES = notes.xml
 
 BOOK_FILES = book.xml
diff --git a/lib/hipe/doc/src/hipe_app.xml b/lib/hipe/doc/src/hipe_app.xml
index e489d155c3..aaeb06193d 100644
--- a/lib/hipe/doc/src/hipe_app.xml
+++ b/lib/hipe/doc/src/hipe_app.xml
@@ -47,6 +47,61 @@
       Details on HiPE compiler options are given by <c>hipe:help_options()</c>.</p>
   </description>  
   <section>
+    <title>Feature Limitations</title>
+    <p>
+      The HiPE compiler is in general compliant with the normal BEAM compiler,
+      with respect to semantic behavior. There are however features in the BEAM compiler
+      and the runtime system that have limited or no support for HiPE compiled modules.
+    </p>
+    <taglist>
+      <tag>Stack traces</tag>
+      <item><p>Stack traces returned from <seealso marker="erts:erlang#get_stacktrace/0">
+      <c>erlang:get_stacktrace/0</c></seealso> or as part of <c>'EXIT'</c> terms
+      can look incomplete if HiPE compiled functions are involved. Typically a stack trace
+      will contain only BEAM compiled functions or only HiPE compiled functions, depending
+      on where the exception was raised.</p>
+      <p>Source code line numbers in stack traces are also not supported by HiPE compiled functions.</p>
+      </item>
+
+      <tag>Tracing</tag>
+      <item><p>Erlang call trace is not supported by HiPE. Calling
+      <seealso marker="erts:erlang#trace_pattern/3"><c>erlang:trace_pattern({M,F,A}, ...)</c></seealso>
+      does not have any effect on HiPE compiled modules.</p>
+      </item>
+
+      <tag>NIFs</tag>
+      <item><p>Modules compiled with HiPE can not call <seealso marker="erts:erlang#load_nif-2">
+      <c>erlang:load_nif/2</c></seealso> to load NIFs.</p>
+      </item>
+
+      <tag>-on_load</tag>
+      <item><p>Modules compiled with HiPE can not use
+      <seealso marker="doc/reference_manual:code_loading#on_load"><c>-on_load()</c></seealso>
+      directives.</p>
+      </item>
+    </taglist>
+
+  </section>
+  <section>
+    <title>Performance Limitations</title>
+    <p>
+      The HiPE compiler does in general produce faster code than the
+      BEAM compiler. There are however some situation when HiPE
+      compiled code will perform worse than BEAM code.
+    </p>
+    <taglist>
+      <tag>Mode switches</tag>
+      <item><p>Every time a process changes from executing code in a
+      HiPE compiled module to a BEAM compiled module (or vice versa),
+      it will do a mode switch. This involves a certain amount of
+      CPU overhead which can have a negative net impact if the
+      process is switching back and forth without getting enough done in
+      each mode.</p>
+      </item>
+
+    </taglist>
+  </section>
+  <section>
     <title>SEE ALSO</title>
     <p>
       <seealso marker="stdlib:c">c(3)</seealso>, 
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index eadaee50e2..bad0c254ce 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -31,6 +31,39 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
+<section><title>Hipe 3.17</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bug for hipe compiled code using
+	    <c>&lt;&lt;X/utf32&gt;&gt;</c> binary construction that
+	    could cause faulty result or even VM crash.</p>
+          <p>
+	    On architectures other than x86_64, code need to be
+	    recompiled to benefit from this fix.</p>
+          <p>
+	    Own Id: OTP-14740</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Added documentation about limitations of hipe compared to
+	    beam compiled code.</p>
+          <p>
+	    Own Id: OTP-14767</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Hipe 3.16.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/hipe/icode/hipe_beam_to_icode.erl b/lib/hipe/icode/hipe_beam_to_icode.erl
index 167f5c67bb..f429d40272 100644
--- a/lib/hipe/icode/hipe_beam_to_icode.erl
+++ b/lib/hipe/icode/hipe_beam_to_icode.erl
@@ -415,11 +415,13 @@ trans_fun([{wait_timeout,{_,Lbl},Reg}|Instructions], Env) ->
   SuspTmout = hipe_icode:mk_if(suspend_msg_timeout,[],
 			       map_label(Lbl),hipe_icode:label_name(DoneLbl)),
   Movs ++ [SetTmout, SuspTmout, DoneLbl | trans_fun(Instructions,Env1)];
-%%--- recv_mark/1 & recv_set/1 ---  XXX: Handle better??
+%%--- recv_mark/1 & recv_set/1 ---
 trans_fun([{recv_mark,{f,_}}|Instructions], Env) ->
-  trans_fun(Instructions,Env);
+  Mark = hipe_icode:mk_primop([],recv_mark,[]),
+  [Mark | trans_fun(Instructions,Env)];
 trans_fun([{recv_set,{f,_}}|Instructions], Env) ->
-  trans_fun(Instructions,Env);
+  Set = hipe_icode:mk_primop([],recv_set,[]),
+  [Set | trans_fun(Instructions,Env)];
 %%--------------------------------------------------------------------
 %%--- Translation of arithmetics {bif,ArithOp, ...} ---
 %%--------------------------------------------------------------------
@@ -603,6 +605,16 @@ trans_fun([{get_list,List,Head,Tail}|Instructions], Env) ->
       ?error_msg("hd and tl regs identical in get_list~n",[]),
       erlang:error(not_handled)
   end;
+%%--- get_hd ---
+trans_fun([{get_hd,List,Head}|Instructions], Env) ->
+  TransList = [trans_arg(List)],
+  I = hipe_icode:mk_primop([mk_var(Head)],unsafe_hd,TransList),
+  [I | trans_fun(Instructions,Env)];
+%%--- get_tl ---
+trans_fun([{get_tl,List,Tail}|Instructions], Env) ->
+  TransList = [trans_arg(List)],
+  I = hipe_icode:mk_primop([mk_var(Tail)],unsafe_tl,TransList),
+  [I | trans_fun(Instructions,Env)];
 %%--- get_tuple_element ---
 trans_fun([{get_tuple_element,Xreg,Index,Dst}|Instructions], Env) ->
   I = hipe_icode:mk_primop([mk_var(Dst)],
@@ -794,7 +806,7 @@ trans_fun([{bs_append,{f,Lbl},Size,W,R,U,Binary,{field_flags,F},Dst}|
   SizeArg = trans_arg(Size),
   BinArg = trans_arg(Binary),
   IcodeDst = mk_var(Dst),
-  Offset = mk_var(reg),
+  Offset = mk_var(reg_gcsafe),
   Base = mk_var(reg),
   trans_bin_call({hipe_bs_primop,{bs_append,W,R,U,F}},Lbl,[SizeArg,BinArg],
 		[IcodeDst,Base,Offset],
@@ -805,7 +817,7 @@ trans_fun([{bs_private_append,{f,Lbl},Size,U,Binary,{field_flags,F},Dst}|
   SizeArg = trans_arg(Size),
   BinArg = trans_arg(Binary),
   IcodeDst = mk_var(Dst),
-  Offset = mk_var(reg),
+  Offset = mk_var(reg_gcsafe),
   Base = mk_var(reg),
   trans_bin_call({hipe_bs_primop,{bs_private_append,U,F}},
 		 Lbl,[SizeArg,BinArg],
@@ -844,7 +856,7 @@ trans_fun([{bs_init2,{f,Lbl},Size,_Words,_LiveRegs,{field_flags,Flags0},X}|
 	   Instructions], Env) ->
   Dst = mk_var(X),
   Flags = resolve_native_endianess(Flags0),
-  Offset = mk_var(reg),
+  Offset = mk_var(reg_gcsafe),
   Base = mk_var(reg),
   {Name, Args} =
     case Size of
@@ -860,7 +872,7 @@ trans_fun([{bs_init_bits,{f,Lbl},Size,_Words,_LiveRegs,{field_flags,Flags0},X}|
 	   Instructions], Env) ->
   Dst = mk_var(X),
   Flags = resolve_native_endianess(Flags0),
-  Offset = mk_var(reg),
+  Offset = mk_var(reg_gcsafe),
   Base = mk_var(reg),
   {Name, Args} =
     case Size of
@@ -1157,6 +1169,17 @@ trans_fun([{put_map_exact,{f,Lbl},Map,Dst,_N,{list,Pairs}}|Instructions], Env) -
 	  gen_put_map_instrs(new, exact, TempMapVar, Dst, new, Pairs, Env1)
       end,
   [MapMove, TempMapMove, PutInstructions | trans_fun(Instructions, Env2)];
+%%--- build_stacktrace ---
+trans_fun([build_stacktrace|Instructions], Env) ->
+  Vars = [mk_var({x,0})], %{x,0} is implict arg and dst
+  [hipe_icode:mk_primop(Vars,build_stacktrace,Vars),
+   trans_fun(Instructions, Env)];
+%%--- raw_raise ---
+trans_fun([raw_raise|Instructions], Env) ->
+  Vars = [mk_var({x,0}),mk_var({x,1}),mk_var({x,2})],
+  Dst = [mk_var({x,0})],
+  [hipe_icode:mk_primop(Dst,raw_raise,Vars) |
+   trans_fun(Instructions, Env)];
 %%--------------------------------------------------------------------
 %%--- ERROR HANDLING ---
 %%--------------------------------------------------------------------
@@ -1505,7 +1528,10 @@ clone_dst(Dest) ->
   New = 
     case hipe_icode:is_reg(Dest) of
       true ->
-	mk_var(reg);
+	case hipe_icode:reg_is_gcsafe(Dest) of
+	  true -> mk_var(reg_gcsafe);
+	  false -> mk_var(reg)
+	end;
       false ->
 	true = hipe_icode:is_var(Dest),	      
 	mk_var(new)
@@ -2126,7 +2152,12 @@ mk_var(reg) ->
   T = hipe_gensym:new_var(icode),
   V = (5*T)+4,
   hipe_gensym:update_vrange(icode,V),
-  hipe_icode:mk_reg(V).
+  hipe_icode:mk_reg(V);
+mk_var(reg_gcsafe) ->
+  T = hipe_gensym:new_var(icode),
+  V = (5*T)+4, % same namespace as 'reg'
+  hipe_gensym:update_vrange(icode,V),
+  hipe_icode:mk_reg_gcsafe(V).
 
 %%-----------------------------------------------------------------------
 %% Make an icode label of proper type
diff --git a/lib/hipe/icode/hipe_icode.erl b/lib/hipe/icode/hipe_icode.erl
index 24b7ac4783..bc3403b0c5 100644
--- a/lib/hipe/icode/hipe_icode.erl
+++ b/lib/hipe/icode/hipe_icode.erl
@@ -515,10 +515,12 @@
 	 annotate_variable/2,  %% annotate_var_or_reg(VarOrReg, Type)
 	 unannotate_variable/1,%% unannotate_var_or_reg(VarOrReg)
 	 mk_reg/1,               %% mk_reg(Id)
+	 mk_reg_gcsafe/1,        %% mk_reg_gcsafe(Id)
 	 mk_fvar/1,              %% mk_fvar(Id)
 	 mk_new_var/0,           %% mk_new_var()
 	 mk_new_fvar/0,          %% mk_new_fvar()
 	 mk_new_reg/0,           %% mk_new_reg()
+	 mk_new_reg_gcsafe/0,    %% mk_new_reg_gcsafe()
 	 mk_phi/1,               %% mk_phi(Id)
 	 mk_phi/2                %% mk_phi(Id, ArgList)
 	]).
@@ -1260,14 +1262,22 @@ is_var(_) -> false.
 -spec mk_reg(non_neg_integer()) -> #icode_variable{kind::'reg'}.
 mk_reg(V) -> #icode_variable{name=V, kind=reg}.
 
--spec reg_name(#icode_variable{kind::'reg'}) -> non_neg_integer().
-reg_name(#icode_variable{name=Name, kind=reg}) -> Name.
+-spec mk_reg_gcsafe(non_neg_integer()) -> #icode_variable{kind::'reg_gcsafe'}.
+mk_reg_gcsafe(V) -> #icode_variable{name=V, kind=reg_gcsafe}.
 
--spec reg_is_gcsafe(#icode_variable{kind::'reg'}) -> 'false'.
-reg_is_gcsafe(#icode_variable{kind=reg}) -> false. % for now
+-spec reg_name(#icode_variable{kind::'reg'|'reg_gcsafe'})
+	      -> non_neg_integer().
+reg_name(#icode_variable{name=Name, kind=reg})        -> Name;
+reg_name(#icode_variable{name=Name, kind=reg_gcsafe}) -> Name.
+
+-spec reg_is_gcsafe(#icode_variable{kind::'reg'}) -> 'false';
+		   (#icode_variable{kind::'reg_gcsafe'}) -> 'true'.
+reg_is_gcsafe(#icode_variable{kind=reg})        -> false;
+reg_is_gcsafe(#icode_variable{kind=reg_gcsafe}) -> true.
 
 -spec is_reg(icode_argument()) -> boolean().
-is_reg(#icode_variable{kind=reg}) -> true;
+is_reg(#icode_variable{kind=reg})        -> true;
+is_reg(#icode_variable{kind=reg_gcsafe}) -> true;
 is_reg(_) -> false.
 
 -spec mk_fvar(non_neg_integer()) -> #icode_variable{kind::'fvar'}.
@@ -1676,6 +1686,16 @@ mk_new_reg() ->
   mk_reg(hipe_gensym:get_next_var(icode)).
 
 %%
+%% @doc Makes a new gcsafe register; that is, a register that is allowed to be
+%% live over calls and other operations that might cause GCs and thus move heap
+%% data around.
+%%
+
+-spec mk_new_reg_gcsafe() -> icode_reg().
+mk_new_reg_gcsafe() ->
+  mk_reg_gcsafe(hipe_gensym:get_next_var(icode)).
+
+%%
 %% @doc Makes a new label.
 %%
 
diff --git a/lib/hipe/icode/hipe_icode.hrl b/lib/hipe/icode/hipe_icode.hrl
index 380ddd8371..7ed80a9ed4 100644
--- a/lib/hipe/icode/hipe_icode.hrl
+++ b/lib/hipe/icode/hipe_icode.hrl
@@ -41,9 +41,9 @@
 
 -type variable_annotation() :: {atom(), any(), fun((any()) -> string())}.
 
--record(icode_variable, {name :: non_neg_integer(), 
-			 kind :: 'var' | 'reg' | 'fvar',
-			 annotation = [] :: [] | variable_annotation()}). 
+-record(icode_variable, {name :: non_neg_integer(),
+			 kind :: 'var' | 'reg' | 'reg_gcsafe' | 'fvar',
+			 annotation = [] :: [] | variable_annotation()}).
 
 %%---------------------------------------------------------------------
 %% Type declarations for Icode instructions
@@ -66,7 +66,7 @@
 -type icode_funcall()   :: mfa() | icode_primop().
 
 -type icode_var()	:: #icode_variable{kind::'var'}.
--type icode_reg()	:: #icode_variable{kind::'reg'}.
+-type icode_reg()	:: #icode_variable{kind::'reg'|'reg_gcsafe'}.
 -type icode_fvar()	:: #icode_variable{kind::'fvar'}.
 -type icode_argument()	:: #icode_const{} | #icode_variable{}.
 -type icode_term_arg()	:: icode_var() | #icode_const{}.
diff --git a/lib/hipe/icode/hipe_icode_inline_bifs.erl b/lib/hipe/icode/hipe_icode_inline_bifs.erl
index 7a6947f190..16a95991e7 100644
--- a/lib/hipe/icode/hipe_icode_inline_bifs.erl
+++ b/lib/hipe/icode/hipe_icode_inline_bifs.erl
@@ -24,8 +24,9 @@
 
 %% Currently inlined BIFs:
 %% and, or, xor, not, <, >, >=, =<, ==, /=, =/=, =:=
-%% is_atom, is_boolean, is_binary, is_float, is_function,
-%% is_integer, is_list, is_pid, is_port, is_reference, is_tuple
+%% is_atom, is_binary, is_bitstring, is_boolean, is_float,
+%% is_function, is_integer, is_list, is_map, is_number,
+%% is_pid, is_port, is_reference, is_tuple
 
 -module(hipe_icode_inline_bifs).
 
@@ -116,17 +117,20 @@ try_type_tests(I) -> I.
 
 is_type_test(Name) ->
   case Name of
-    is_integer -> {true, integer};
+    is_atom -> {true, atom};
+    is_binary -> {true, binary};
+    is_bitstring -> {true, bitstr};
+    is_boolean -> {true, boolean};
     is_float -> {true, float};
-    is_tuple -> {true, tuple};
-    is_binary -> {true, binary};	       
+    is_function -> {true, function};
+    is_integer -> {true, integer};
     is_list -> {true, list};
+    is_map -> {true, map};
+    is_number -> {true, number};
     is_pid -> {true, pid};
-    is_atom -> {true, atom};
-    is_boolean -> {true, boolean};
-    is_function -> {true, function};	       
-    is_reference -> {true, reference};
     is_port -> {true, port};
+    is_reference -> {true, reference};
+    is_tuple -> {true, tuple};
     _ -> false
   end.
  
diff --git a/lib/hipe/icode/hipe_icode_liveness.erl b/lib/hipe/icode/hipe_icode_liveness.erl
index 51e2855108..e61529a1bb 100644
--- a/lib/hipe/icode/hipe_icode_liveness.erl
+++ b/lib/hipe/icode/hipe_icode_liveness.erl
@@ -77,6 +77,7 @@ print_var(#icode_variable{name=V, kind=Kind, annotation=T}) ->
   case Kind of
     var -> io:format("v~p", [V]);
     reg -> io:format("r~p", [V]);
+    reg_gcsafe -> io:format("rs~p", [V]);
     fvar -> io:format("fv~p", [V])
   end,
   case T of
diff --git a/lib/hipe/icode/hipe_icode_pp.erl b/lib/hipe/icode/hipe_icode_pp.erl
index 5b017dca32..33d1e62884 100644
--- a/lib/hipe/icode/hipe_icode_pp.erl
+++ b/lib/hipe/icode/hipe_icode_pp.erl
@@ -230,7 +230,10 @@ pp_arg(Dev, Arg) ->
 	  case hipe_icode:is_reg(Arg) of
 	    true ->
 	      N = hipe_icode:reg_name(Arg),
-	      io:format(Dev, "r~p", [N]);
+	      case hipe_icode:reg_is_gcsafe(Arg) of
+		true  -> io:format(Dev, "rs~p", [N]);
+		false -> io:format(Dev, "r~p", [N])
+	      end;
 	    false ->
 	      N = hipe_icode:fvar_name(Arg),
 	      io:format(Dev, "fv~p", [N])
diff --git a/lib/hipe/icode/hipe_icode_primops.erl b/lib/hipe/icode/hipe_icode_primops.erl
index 50ece05259..a1f1128124 100644
--- a/lib/hipe/icode/hipe_icode_primops.erl
+++ b/lib/hipe/icode/hipe_icode_primops.erl
@@ -67,6 +67,8 @@ is_safe(fp_mul) -> false;
 is_safe(fp_sub) -> false;
 is_safe(mktuple) -> true;
 is_safe(next_msg) -> false;
+is_safe(recv_mark) -> false;
+is_safe(recv_set) -> false;
 is_safe(redtest) -> false;
 is_safe(select_msg) -> false;
 is_safe(self) -> true;
@@ -130,6 +132,7 @@ is_safe({hipe_bs_primop, {bs_match_string, _, _}}) -> false;
 is_safe({hipe_bs_primop, {bs_append, _, _, _, _}}) -> false;
 is_safe({hipe_bs_primop, {bs_private_append, _, _}}) -> false;
 is_safe({hipe_bs_primop, bs_init_writable}) -> true;
+is_safe(build_stacktrace) -> true;
 is_safe(#mkfun{}) -> true;
 is_safe(#unsafe_element{}) -> true;
 is_safe(#unsafe_update_element{}) -> true;
@@ -165,6 +168,8 @@ fails(fp_mul) -> false;
 fails(fp_sub) -> false;
 fails(mktuple) -> false;
 fails(next_msg) -> false;
+fails(recv_mark) -> false;
+fails(recv_set) -> false;
 fails(redtest) -> false;
 fails(select_msg) -> false;
 fails(self) -> false;
@@ -230,6 +235,8 @@ fails({hipe_bs_primop, bs_final}) -> false;
 fails({hipe_bs_primop, {bs_append, _, _, _, _}}) -> true;
 fails({hipe_bs_primop, {bs_private_append, _, _}}) -> true;
 fails({hipe_bs_primop, bs_init_writable}) -> true;
+fails(build_stacktrace) -> false;
+fails(raw_raise) -> true;
 fails(#mkfun{}) -> false;
 fails(#unsafe_element{}) -> false;
 fails(#unsafe_update_element{}) -> false;
@@ -709,6 +716,10 @@ type(Primop, Args) ->
       erl_types:t_any();
     next_msg ->
       erl_types:t_any();
+    recv_mark ->
+      erl_types:t_any();
+    recv_set ->
+      erl_types:t_any();
     select_msg ->
       erl_types:t_any();
     set_timeout ->
@@ -723,6 +734,10 @@ type(Primop, Args) ->
       erl_types:t_any();
     debug_native_called ->
       erl_types:t_any();
+    build_stacktrace ->
+      erl_types:t_list();
+    raw_raise ->
+      erl_types:t_atom();
     {M, F, A} ->
       erl_bif_types:type(M, F, A, Args)
   end.
@@ -883,6 +898,10 @@ type(Primop) ->
       erl_types:t_any();
     next_msg ->
       erl_types:t_any();
+    recv_mark ->
+      erl_types:t_any();
+    recv_set ->
+      erl_types:t_any();
     select_msg ->
       erl_types:t_any();
     set_timeout ->
@@ -891,6 +910,10 @@ type(Primop) ->
       erl_types:t_any();
 %%% -----------------------------------------------------
 %%% Other
+    build_stacktrace ->
+      erl_types:t_any();
+    raw_raise ->
+      erl_types:t_any();
     #closure_element{} ->
       erl_types:t_any();
     redtest ->
diff --git a/lib/hipe/icode/hipe_icode_range.erl b/lib/hipe/icode/hipe_icode_range.erl
index 287b1c80fe..34b18acccd 100644
--- a/lib/hipe/icode/hipe_icode_range.erl
+++ b/lib/hipe/icode/hipe_icode_range.erl
@@ -1160,6 +1160,8 @@ basic_type(#gc_test{}) -> not_analysed;
 %% Message handling
 basic_type(check_get_msg) -> not_analysed;
 basic_type(next_msg) -> not_analysed;
+basic_type(recv_mark) -> not_analysed;
+basic_type(recv_set) -> not_analysed;
 basic_type(select_msg) -> not_analysed;
 basic_type(suspend_msg) -> not_analysed;
 %% Functions
@@ -1184,7 +1186,9 @@ basic_type(unsafe_hd) -> not_analysed;
 basic_type(unsafe_tl) -> not_int;
 basic_type(#element{}) -> not_analysed;
 basic_type(#unsafe_element{}) -> not_analysed;
-basic_type(#unsafe_update_element{}) -> not_analysed.
+basic_type(#unsafe_update_element{}) -> not_analysed;
+basic_type(build_stacktrace) -> not_int;
+basic_type(raw_raise) -> not_int.
 
 -spec analyse_bs_get_integer(integer(), integer(), boolean()) -> range_tuple().
 
diff --git a/lib/hipe/llvm/hipe_llvm.erl b/lib/hipe/llvm/hipe_llvm.erl
index ccd40162cb..343ca94cb1 100644
--- a/lib/hipe/llvm/hipe_llvm.erl
+++ b/lib/hipe/llvm/hipe_llvm.erl
@@ -934,7 +934,7 @@ pp_ins(Dev, Ver, I) ->
       end,
       case call_is_tail(I) of
         true -> write(Dev, "tail ");
-        false -> ok
+        false -> write(Dev, "notail ")
       end,
       write(Dev, ["call ", call_cconv(I), " "]),
       pp_options(Dev, call_ret_attrs(I)),
diff --git a/lib/hipe/main/hipe.app.src b/lib/hipe/main/hipe.app.src
index 5b2280594f..1138d72dd2 100644
--- a/lib/hipe/main/hipe.app.src
+++ b/lib/hipe/main/hipe.app.src
@@ -179,6 +179,7 @@
 	     hipe_rtl_to_sparc,
 	     hipe_rtl_to_x86,
 	     hipe_rtl_varmap,
+	     hipe_rtl_verify_gcsafe,
 	     hipe_segment_trees,
 	     hipe_sdi,
 	     hipe_sparc,
@@ -236,4 +237,4 @@
   {applications, [kernel,stdlib]},
   {env, []},
   {runtime_dependencies, ["syntax_tools-1.6.14","stdlib-3.4","kernel-5.3",
-			  "erts-9.0","compiler-5.0"]}]}.
+			  "erts-9.3","compiler-5.0"]}]}.
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index f5f5bf5830..acb9b7b062 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -1414,6 +1414,7 @@ opt_keys() ->
      use_clusters,
      use_jumptable,
      verbose,
+     verify_gcsafe,
      %% verbose_spills,
      x87].
 
@@ -1510,7 +1511,8 @@ opt_negations() ->
    {no_use_callgraph, use_callgraph},
    {no_use_clusters, use_clusters},
    {no_use_inline_atom_search, use_inline_atom_search},
-   {no_use_indexing, use_indexing}].
+   {no_use_indexing, use_indexing},
+   {no_verify_gcsafe, verify_gcsafe}].
 
 %% Don't use negative forms in right-hand sides of aliases and expansions!
 %% We only expand negations once, before the other expansions are done.
diff --git a/lib/hipe/main/hipe_main.erl b/lib/hipe/main/hipe_main.erl
index dca6fddec3..6e48f0cffd 100644
--- a/lib/hipe/main/hipe_main.erl
+++ b/lib/hipe/main/hipe_main.erl
@@ -410,6 +410,11 @@ icode_to_rtl(MFA, Icode, Options, Servers) ->
         hipe_llvm_liveness:analyze(RtlCfg4)
     end,
   pp(RtlCfg5, MFA, rtl, pp_rtl, Options, Servers),
+  case proplists:get_bool(no_verify_gcsafe, Options) of
+    true -> ok;
+    false ->
+      ok = hipe_rtl_verify_gcsafe:check(RtlCfg5)
+  end,
   LinearRTL1 = hipe_rtl_cfg:linearize(RtlCfg5),
   LinearRTL2 = hipe_rtl_cleanup_const:cleanup(LinearRTL1),
   %% hipe_rtl:pp(standard_io, LinearRTL2),
diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
index 5abc9ec049..becdd0b7d8 100644
--- a/lib/hipe/rtl/Makefile
+++ b/lib/hipe/rtl/Makefile
@@ -50,7 +50,7 @@ HIPE_MODULES = hipe_rtl hipe_rtl_cfg \
 	  hipe_rtl_ssa hipe_rtl_ssa_const_prop \
 	  hipe_rtl_cleanup_const hipe_rtl_symbolic hipe_rtl_lcm \
 	  hipe_rtl_ssapre hipe_rtl_binary hipe_rtl_ssa_avail_expr \
-	  hipe_rtl_arch hipe_tagscheme
+	  hipe_rtl_arch hipe_tagscheme hipe_rtl_verify_gcsafe
 else
 HIPE_MODULES =
 endif
diff --git a/lib/hipe/rtl/hipe_rtl.erl b/lib/hipe/rtl/hipe_rtl.erl
index 04c9728d5c..33027f3259 100644
--- a/lib/hipe/rtl/hipe_rtl.erl
+++ b/lib/hipe/rtl/hipe_rtl.erl
@@ -1740,7 +1740,10 @@ pp_reg(Dev, Arg) ->
     true ->
       pp_hard_reg(Dev, reg_index(Arg));
     false ->
-      io:format(Dev, "r~w", [reg_index(Arg)])
+      case reg_is_gcsafe(Arg) of
+        true -> io:format(Dev, "rs~w", [reg_index(Arg)]);
+        false -> io:format(Dev, "r~w", [reg_index(Arg)])
+      end
   end.
 
 pp_var(Dev, Arg) ->
diff --git a/lib/hipe/rtl/hipe_rtl_binary_construct.erl b/lib/hipe/rtl/hipe_rtl_binary_construct.erl
index 52ea5db382..111dda3d82 100644
--- a/lib/hipe/rtl/hipe_rtl_binary_construct.erl
+++ b/lib/hipe/rtl/hipe_rtl_binary_construct.erl
@@ -168,9 +168,13 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 
 	  bs_put_utf8 ->
 	    [_Src, _Base, _Offset] = Args,
-	    NewDsts = get_real(Dst),
-	    [hipe_rtl:mk_call(NewDsts, bs_put_utf8, Args,
-			      TrueLblName, FalseLblName, not_remote)];
+	    [NewOffs] = get_real(Dst),
+            RetLbl = hipe_rtl:mk_new_label(),
+            [hipe_rtl:mk_call([NewOffs], bs_put_utf8, Args,
+                              hipe_rtl:label_name(RetLbl), [], not_remote),
+             RetLbl,
+             hipe_rtl:mk_branch(NewOffs, ne, hipe_rtl:mk_imm(0),
+                                TrueLblName, FalseLblName, 0.99)];
 
 	  bs_utf16_size ->
 	    case Dst of
@@ -195,8 +199,13 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 
 	  bs_validate_unicode ->
 	    [_Arg] = Args,
-	    [hipe_rtl:mk_call([], bs_validate_unicode, Args,
-			      TrueLblName, FalseLblName, not_remote)];
+            [IsUnicode] = create_regs(1),
+            RetLbl = hipe_rtl:mk_new_label(),
+            [hipe_rtl:mk_call([IsUnicode], is_unicode, Args,
+                              hipe_rtl:label_name(RetLbl), [], not_remote),
+             RetLbl,
+             hipe_rtl:mk_branch(IsUnicode, ne, hipe_rtl:mk_imm(0),
+                                TrueLblName, FalseLblName, 0.99)];
 
 	  bs_final ->
 	    Zero = hipe_rtl:mk_imm(0),
@@ -354,7 +363,8 @@ not_writable_code(Bin, SizeReg, Dst, Base, Offset, Unit,
 allocate_writable(Dst, Base, UsedBytes, TotBytes, TotSize) ->
   Zero = hipe_rtl:mk_imm(0),
   [NextLbl] = create_lbls(1),
-  [EndSubSize, EndSubBitSize, ProcBin] = create_regs(3),
+  [EndSubSize, EndSubBitSize] = create_regs(2),
+  [ProcBin] = create_unsafe_regs(1),
   [hipe_rtl:mk_call([Base], bs_allocate, [UsedBytes],
 		    hipe_rtl:label_name(NextLbl), [], not_remote),
    NextLbl,
@@ -581,12 +591,12 @@ const_init2(Size, Dst, Base, Offset, TrueLblName) ->
     false ->
       ByteSize = hipe_rtl:mk_new_reg(),
       [hipe_rtl:mk_gctest(?PROC_BIN_WORDSIZE+?SUB_BIN_WORDSIZE),
-       hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
        hipe_rtl:mk_move(ByteSize, hipe_rtl:mk_imm(Size)),
        hipe_rtl:mk_call([Base], bs_allocate, [ByteSize],
 			hipe_rtl:label_name(NextLbl), [], not_remote),
        NextLbl,
        hipe_tagscheme:create_refc_binary(Base, ByteSize, Dst),
+       hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
        hipe_rtl:mk_goto(TrueLblName)]
   end.
 
@@ -629,13 +639,12 @@ var_init2(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName
   Log2WordSize = hipe_rtl_arch:log2_word_size(),
   WordSize = hipe_rtl_arch:word_size(),
   [ContLbl, HeapLbl, REFCLbl, NextLbl] = create_lbls(4),
-  [USize, Tmp] = create_unsafe_regs(2),
+  [USize, Tmp] = create_regs(2),
   [get_word_integer(Size, USize, SystemLimitLblName, FalseLblName),
    hipe_rtl:mk_branch(USize, leu, hipe_rtl:mk_imm(?MAX_BINSIZE),
 		      hipe_rtl:label_name(ContLbl),
 		      SystemLimitLblName),
    ContLbl,
-   hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
    hipe_rtl:mk_branch(USize, leu, hipe_rtl:mk_imm(?MAX_HEAP_BIN_SIZE),
 		      hipe_rtl:label_name(HeapLbl),
 		      hipe_rtl:label_name(REFCLbl)),
@@ -645,6 +654,7 @@ var_init2(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName
    hipe_rtl:mk_alu(Tmp, Tmp, add, hipe_rtl:mk_imm(?SUB_BIN_WORDSIZE)),
    hipe_rtl:mk_gctest(Tmp),
    hipe_tagscheme:create_heap_binary(Base, USize, Dst),
+   hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
    hipe_rtl:mk_goto(TrueLblName),
    REFCLbl,
    hipe_rtl:mk_gctest(?PROC_BIN_WORDSIZE+?SUB_BIN_WORDSIZE),
@@ -652,6 +662,7 @@ var_init2(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName
 		    hipe_rtl:label_name(NextLbl), [], not_remote),
    NextLbl,
    hipe_tagscheme:create_refc_binary(Base, USize, Dst),
+   hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
    hipe_rtl:mk_goto(TrueLblName)].
 
 var_init_bits(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName) ->
@@ -858,7 +869,7 @@ get_base_offset_size(Binary, SrcBase, SrcOffset, SrcSize, FLName) ->
    JoinLbl,
    hipe_tagscheme:test_heap_binary(Orig, HeapLblName, REFCLblName),
    HeapLbl,
-   hipe_rtl:mk_alu(SrcBase, Orig, add, hipe_rtl:mk_imm(?HEAP_BIN_DATA-2)),
+   hipe_tagscheme:get_field_addr_from_term({heap_bin, {data, 0}}, Orig, SrcBase),
    hipe_rtl:mk_goto(EndLblName),
    REFCLbl,
    hipe_tagscheme:get_field_from_term({proc_bin,bytes}, Orig, SrcBase),
@@ -1205,6 +1216,12 @@ is_divisible(Dividend, Divisor, SuccLbl, FailLbl) ->
       [hipe_rtl:mk_branch(Dividend, 'and', Mask, eq, SuccLbl, FailLbl, 0.99)];
     false ->
       %% We need division, fall back to a primop
-      [hipe_rtl:mk_call([], is_divisible, [Dividend, hipe_rtl:mk_imm(Divisor)],
-			SuccLbl, FailLbl, not_remote)]
+      [Tmp] = create_regs(1),
+      RetLbl = hipe_rtl:mk_new_label(),
+      [hipe_rtl:mk_call([Tmp], is_divisible,
+                        [Dividend, hipe_rtl:mk_imm(Divisor)],
+                        hipe_rtl:label_name(RetLbl), [], not_remote),
+       RetLbl,
+       hipe_rtl:mk_branch(Tmp, ne, hipe_rtl:mk_imm(0),
+                          SuccLbl, FailLbl, 0.99)]
   end.
diff --git a/lib/hipe/rtl/hipe_rtl_binary_match.erl b/lib/hipe/rtl/hipe_rtl_binary_match.erl
index 362a52f8fe..4575213838 100644
--- a/lib/hipe/rtl/hipe_rtl_binary_match.erl
+++ b/lib/hipe/rtl/hipe_rtl_binary_match.erl
@@ -730,7 +730,7 @@ get_base(Orig,Base) ->
   [hipe_tagscheme:test_heap_binary(Orig, hipe_rtl:label_name(HeapLbl),
 				   hipe_rtl:label_name(REFCLbl)),
    HeapLbl,
-   hipe_rtl:mk_alu(Base, Orig, 'add', hipe_rtl:mk_imm(?HEAP_BIN_DATA-2)),
+   hipe_tagscheme:get_field_addr_from_term({heap_bin, {data, 0}}, Orig, Base),
    hipe_rtl:mk_goto(hipe_rtl:label_name(EndLbl)),
    REFCLbl,
    get_field_from_term({proc_bin, flags}, Orig, Flags),
@@ -740,7 +740,7 @@ get_base(Orig,Base) ->
    WritableLbl,
    hipe_rtl:mk_call([], emasculate_binary, [Orig], [], [], 'not_remote'),
    NotWritableLbl,
-   hipe_rtl:mk_load(Base, Orig, hipe_rtl:mk_imm(?PROC_BIN_BYTES-2)),
+   get_field_from_term({proc_bin, bytes}, Orig, Base),
    EndLbl].
 
 extract_matchstate_var(binsize, Ms) ->
@@ -842,12 +842,12 @@ make_dyn_prep(SizeReg, CCode) ->
 %%------------------------------------------------------------------------
 
 get_unaligned_int(Dst1, Size, Base, Offset, Shiftr, Type, TrueLblName) ->
-  [Reg] = create_regs(1),
+  [Reg] = create_gcsafe_regs(1),
   [get_maybe_unaligned_int_to_reg(Reg, Size, Base, Offset, Shiftr, Type),
    do_bignum_code(Size, Type, Reg, Dst1, TrueLblName)].
 
 get_maybe_unaligned_int_to_reg(Reg, Size, Base, Offset, Shiftr, Type) ->
-  [LowBits] = create_regs(1),
+  [LowBits] = create_gcsafe_regs(1),
   [AlignedLbl, UnAlignedLbl, EndLbl] = create_lbls(3),
   [hipe_rtl:mk_alub(LowBits, Offset, 'and', hipe_rtl:mk_imm(?LOW_BITS),
 		    eq, hipe_rtl:label_name(AlignedLbl), 
@@ -1001,7 +1001,7 @@ do_bignum_code(Size, {Signedness,_}, Src, Dst1, TrueLblName)
     end.
 
 signed_bignum(Dst1, Src, TrueLblName) ->
-  Tmp1 = hipe_rtl:mk_new_reg(),
+  Tmp1 = hipe_rtl:mk_new_reg_gcsafe(),
   BignumLabel = hipe_rtl:mk_new_label(),
   [hipe_tagscheme:realtag_fixnum(Dst1, Src),
    hipe_tagscheme:realuntag_fixnum(Tmp1, Dst1),
diff --git a/lib/hipe/rtl/hipe_rtl_cleanup_const.erl b/lib/hipe/rtl/hipe_rtl_cleanup_const.erl
index bfa6b9682e..00cc2bcb37 100644
--- a/lib/hipe/rtl/hipe_rtl_cleanup_const.erl
+++ b/lib/hipe/rtl/hipe_rtl_cleanup_const.erl
@@ -69,9 +69,9 @@ cleanup_instr([Const|Left], I, Acc) ->
   case I of
     X when is_record(X, fp_unop) orelse is_record(X, fp) ->
       Fdst = hipe_rtl:mk_new_fpreg(),
-      Fconv = hipe_tagscheme:unsafe_untag_float(Fdst, Dst),		  
+      Fconv = lists:flatten(hipe_tagscheme:unsafe_untag_float(Fdst, Dst)),
       NewI = hipe_rtl:subst_uses([{Const, Fdst}], I),
-      cleanup_instr(Left, NewI, Fconv ++ [Load|Acc]);
+      cleanup_instr(Left, NewI, lists:reverse(Fconv, [Load|Acc]));
     _ ->
       NewI = hipe_rtl:subst_uses([{Const, Dst}], I),
       cleanup_instr(Left, NewI, [Load|Acc])
diff --git a/lib/hipe/rtl/hipe_rtl_lcm.erl b/lib/hipe/rtl/hipe_rtl_lcm.erl
index 9dcdd05fb1..af39c9a0a4 100644
--- a/lib/hipe/rtl/hipe_rtl_lcm.erl
+++ b/lib/hipe/rtl/hipe_rtl_lcm.erl
@@ -182,42 +182,41 @@ delete_exprs(Code, _, _, []) ->
   Code;
 delete_exprs(Code, ExprMap, IdMap, [ExprId|Exprs]) ->
   Expr = expr_id_map_get_expr(IdMap, ExprId),
-  %% Perform a foldl that goes through the code and deletes all
-  %% occurences of the expression.
-  NewCode =
-    lists:reverse
-      (lists:foldl(fun(CodeExpr, Acc) ->
-                     case is_expr(CodeExpr) of
-                       true ->
-                         case expr_clear_dst(CodeExpr) =:= Expr of
-                           true ->
-                             pp_debug("  Deleting:         ", []),
-                             pp_debug_instr(CodeExpr),
-                             %% Lookup expression entry.
-                             Defines = 
-                               case expr_map_lookup(ExprMap, Expr) of
-                                 {value, {_, _, Defs}} -> 
-				   Defs;
-                                 none -> 
-                                   exit({?MODULE, expr_map_lookup,
-                                         "expression missing"})
-                               end,
-                             MoveCode = 
-                               mk_expr_move_instr(hipe_rtl:defines(CodeExpr),
-						  Defines),
-                             pp_debug("    Replacing with: ", []),
-                             pp_debug_instr(MoveCode),
-                             [MoveCode|Acc];
-                           false ->
-                             [CodeExpr|Acc]
-                         end;
-		       false ->
-                             [CodeExpr|Acc]
-                     end
-                   end, 
-		   [], Code)),
+  %% Lookup expression entry.
+  {value, {_, _, Defines}} = expr_map_lookup(ExprMap, Expr),
+  %% Go through the code and deletes all occurences of the expression.
+  NewCode = delete_expr(Code, Expr, Defines, []),
   delete_exprs(NewCode, ExprMap, IdMap, Exprs).
 
+delete_expr([], _Expr, _Defines, Acc) -> lists:reverse(Acc);
+delete_expr([CodeExpr|Code], Expr, Defines, Acc) ->
+  case exp_kill_expr(CodeExpr, [Expr]) of
+    [] -> % Expr was killed; deleting stops here
+      pp_debug("  Stopping before:  ", []),
+      pp_debug_instr(CodeExpr),
+      lists:reverse(Acc, [CodeExpr|Code]);
+    [Expr] ->
+      NewCodeExpr =
+        case is_expr(CodeExpr) of
+          true ->
+            case expr_clear_dst(CodeExpr) =:= Expr of
+              true ->
+                pp_debug("  Deleting:         ", []),
+                pp_debug_instr(CodeExpr),
+                MoveCode = mk_expr_move_instr(hipe_rtl:defines(CodeExpr),
+                                              Defines),
+                pp_debug("    Replacing with: ", []),
+                pp_debug_instr(MoveCode),
+                MoveCode;
+              false ->
+                CodeExpr
+            end;
+          false ->
+            CodeExpr
+        end,
+      delete_expr(Code, Expr, Defines, [NewCodeExpr|Acc])
+  end.
+
 %%=============================================================================
 %% Goes through the given list of expressions and inserts them at 
 %% appropriate places in the code.
@@ -226,13 +225,12 @@ insert_exprs(CFG, _, _, _, _, BetweenMap, []) ->
 insert_exprs(CFG, Pred, Succ, ExprMap, IdMap, BetweenMap, [ExprId|Exprs]) ->
   Expr = expr_id_map_get_expr(IdMap, ExprId),
   Instr = expr_map_get_instr(ExprMap, Expr),
-  case hipe_rtl_cfg:succ(CFG, Pred) of
-    [_] ->
+  case try_insert_expr_last(CFG, Pred, Instr) of
+    {ok, NewCFG} ->
       pp_debug("  Inserted last: ", []),
       pp_debug_instr(Instr),
-      NewCFG = insert_expr_last(CFG, Pred, Instr),
       insert_exprs(NewCFG, Pred, Succ, ExprMap, IdMap, BetweenMap, Exprs);
-    _ ->
+    not_safe ->
       case hipe_rtl_cfg:pred(CFG, Succ) of
         [_] ->
 	  pp_debug("  Inserted first: ", []),
@@ -252,25 +250,31 @@ insert_exprs(CFG, Pred, Succ, ExprMap, IdMap, BetweenMap, [ExprId|Exprs]) ->
 %% Recursively goes through the code in a block and returns a new block
 %% with the new code inserted second to last (assuming the last expression
 %% is a branch operation).
-insert_expr_last(CFG0, Label, Instr) ->
-  Code0 = hipe_bb:code(hipe_rtl_cfg:bb(CFG0, Label)),
-  %% FIXME: Use hipe_bb:butlast() instead?
-  Code1 = insert_expr_last_work(Label, Instr, Code0),
-  hipe_rtl_cfg:bb_add(CFG0, Label, hipe_bb:mk_bb(Code1)).
+try_insert_expr_last(CFG0, Label, Instr) ->
+  case hipe_rtl_cfg:succ(CFG0, Label) of
+    [_] ->
+      Code0 = hipe_bb:code(hipe_rtl_cfg:bb(CFG0, Label)),
+      case insert_expr_last_work(Instr, Code0) of
+        not_safe -> not_safe;
+        Code1 ->
+          {ok, hipe_rtl_cfg:bb_add(CFG0, Label, hipe_bb:mk_bb(Code1))}
+      end;
+    _ -> not_safe
+  end.
 
 %%=============================================================================
 %% Recursively goes through the code in a block and returns a new block
 %% with the new code inserted second to last (assuming the last expression
 %% is a branch operation).
-insert_expr_last_work(_, Instr, []) ->
-  %% This case should not happen since this means that block was completely 
-  %% empty when the function was called. For compatibility we insert it last.
-  [Instr];
-insert_expr_last_work(_, Instr, [Code1]) ->
+insert_expr_last_work(_Instr, [#call{}]) ->
+  %% Call instructions clobber all expressions; we musn't insert the expression
+  %% before it
+  not_safe;
+insert_expr_last_work(Instr, [Code1]) ->
   %% We insert the code next to last.
   [Instr, Code1];
-insert_expr_last_work(Label, Instr, [Code|Codes]) ->
-  [Code|insert_expr_last_work(Label, Instr, Codes)].
+insert_expr_last_work(Instr, [Code|Codes]) ->
+  [Code|insert_expr_last_work(Instr, Codes)].
 
 %%=============================================================================
 %% Inserts expression first in the block for the given label.
@@ -305,7 +309,8 @@ insert_expr_between(CFG0, BetweenMap, Pred, Succ, Instr) ->
     {value, Label} ->
       pp_debug("    Using existing new bb for edge (~w,~w) with label ~w~n", 
 	       [Pred, Succ, Label]),
-      {insert_expr_last(CFG0, Label, Instr), BetweenMap}
+      {ok, NewCfg} = try_insert_expr_last(CFG0, Label, Instr),
+      {NewCfg, BetweenMap}
   end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/hipe/rtl/hipe_rtl_primops.erl b/lib/hipe/rtl/hipe_rtl_primops.erl
index 850a75f71b..ce5433379e 100644
--- a/lib/hipe/rtl/hipe_rtl_primops.erl
+++ b/lib/hipe/rtl/hipe_rtl_primops.erl
@@ -291,6 +291,10 @@ gen_primop({Op,Dst,Args,Cont,Fail}, IsGuard, ConstTab) ->
 	    gen_select_msg(Dst, Cont);
 	  clear_timeout ->
 	    gen_clear_timeout(Dst, GotoCont);
+          recv_mark ->
+            gen_recv_mark(Dst, GotoCont);
+	  recv_set ->
+            gen_recv_set(Dst, Cont);
 	  set_timeout ->
 	    %% BIF call: am_set_timeout -> nbif_set_timeout -> hipe_set_timeout
 	    [hipe_rtl:mk_call(Dst, set_timeout, Args, Cont, Fail, not_remote)];
@@ -390,6 +394,10 @@ gen_primop({Op,Dst,Args,Cont,Fail}, IsGuard, ConstTab) ->
 	    end;
 	  debug_native_called -> 
 	    [hipe_rtl:mk_call(Dst, Op, Args, Cont, Fail, not_remote)];
+          build_stacktrace ->
+	    [hipe_rtl:mk_call(Dst, Op, Args, Cont, Fail, not_remote)];
+          raw_raise ->
+	    [hipe_rtl:mk_call(Dst, Op, Args, Cont, Fail, not_remote)];
 
 	  %% Only names listed above are accepted! MFA:s are not primops!
 	  _ ->
@@ -1064,6 +1072,27 @@ gen_tuple_header(Ptr, Arity) ->
 %%%
 %%% Receives
 
+%%% recv_mark is:
+%%%	p->msg.saved_last = p->msg.last;
+gen_recv_mark([], GotoCont) ->
+  TmpLast = hipe_rtl:mk_new_reg(),
+  [load_p_field(TmpLast, ?P_MSG_LAST),
+   store_p_field(TmpLast, ?P_MSG_SAVED_LAST),
+   GotoCont].
+
+%%% recv_set is:
+%%%	if (p->msg.saved_last)
+%%%	    p->msg.save = p->msg.saved_last;
+gen_recv_set([], Cont) ->
+  TmpSave = hipe_rtl:mk_new_reg(),
+  TrueLbl = hipe_rtl:mk_new_label(),
+  [load_p_field(TmpSave, ?P_MSG_SAVED_LAST),
+   hipe_rtl:mk_branch(TmpSave, ne, hipe_rtl:mk_imm(0),
+                      hipe_rtl:label_name(TrueLbl), Cont),
+   TrueLbl,
+   store_p_field(TmpSave, ?P_MSG_SAVE),
+   hipe_rtl:mk_goto(Cont)].
+
 gen_check_get_msg(Dsts, GotoCont, Fail) ->
   gen_check_get_msg_outofline(Dsts, GotoCont, Fail).
 
diff --git a/lib/hipe/rtl/hipe_rtl_varmap.erl b/lib/hipe/rtl/hipe_rtl_varmap.erl
index 375a8f85c0..f34c66ab85 100644
--- a/lib/hipe/rtl/hipe_rtl_varmap.erl
+++ b/lib/hipe/rtl/hipe_rtl_varmap.erl
@@ -105,7 +105,7 @@ icode_var2rtl_var(Var, Map) ->
 	{reg, IsGcSafe} ->
 	  NewVar =
 	    case IsGcSafe of
-	      %% true -> hipe_rtl:mk_new_reg_gcsafe();
+              true -> hipe_rtl:mk_new_reg_gcsafe();
 	      false -> hipe_rtl:mk_new_reg()
 	    end,
 	  {NewVar, insert(Var, NewVar, Map)}
diff --git a/lib/hipe/rtl/hipe_rtl_verify_gcsafe.erl b/lib/hipe/rtl/hipe_rtl_verify_gcsafe.erl
new file mode 100644
index 0000000000..01d7e89ccd
--- /dev/null
+++ b/lib/hipe/rtl/hipe_rtl_verify_gcsafe.erl
@@ -0,0 +1,89 @@
+%% -*- mode: erlang; erlang-indent-level: 2 -*-
+%%
+%% 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.
+%%
+-module(hipe_rtl_verify_gcsafe).
+
+-export([check/1]).
+
+-include("../flow/cfg.hrl").              %% needed for the specs
+-include("hipe_rtl.hrl").
+
+check(CFG) ->
+  Liveness = hipe_rtl_liveness:analyze(CFG),
+  put({?MODULE, 'fun'}, CFG#cfg.info#cfg_info.'fun'),
+  lists:foreach(
+    fun(Lb) ->
+        put({?MODULE, label}, Lb),
+        Liveout = hipe_rtl_liveness:liveout(Liveness, Lb),
+        BB = hipe_rtl_cfg:bb(CFG, Lb),
+        check_instrs(lists:reverse(hipe_bb:code(BB)), Liveout)
+    end, hipe_rtl_cfg:labels(CFG)),
+  erase({?MODULE, 'fun'}),
+  erase({?MODULE, label}),
+  erase({?MODULE, instr}),
+  ok.
+
+check_instrs([], _Livein) -> ok;
+check_instrs([I|Is], LiveOut) ->
+  Def = ordsets:from_list(hipe_rtl:defines(I)),
+  Use = ordsets:from_list(hipe_rtl:uses(I)),
+  LiveOver = ordsets:subtract(LiveOut, Def),
+  LiveIn = ordsets:union(LiveOver, Use),
+  case (hipe_rtl:is_call(I)
+        andalso not safe_primop(hipe_rtl:call_fun(I)))
+    orelse is_record(I, gctest)
+  of
+    false -> ok;
+    true ->
+      put({?MODULE, instr}, I),
+      lists:foreach(fun verify_live/1, LiveOver)
+  end,
+  check_instrs(Is, LiveIn).
+
+verify_live(T) ->
+  case hipe_rtl:is_reg(T) of
+    false -> ok;
+    true ->
+      case hipe_rtl:reg_is_gcsafe(T) of
+        true -> ok;
+        false ->
+          error({gcunsafe_live_over_call,
+                 get({?MODULE, 'fun'}),
+                 {label, get({?MODULE, label})},
+                 get({?MODULE, instr}),
+                 T})
+      end
+  end.
+
+%% Primops that can't gc
+%% Note: This information is essentially duplicated from hipe_bif_list.m4
+safe_primop(is_divisible) -> true;
+safe_primop(is_unicode) -> true;
+safe_primop(cmp_2) -> true;
+safe_primop(eq_2) -> true;
+safe_primop(bs_allocate) -> true;
+safe_primop(bs_reallocate) -> true;
+safe_primop(bs_utf8_size) -> true;
+safe_primop(bs_get_utf8) -> true;
+safe_primop(bs_put_utf8) -> true;
+safe_primop(bs_utf16_size) -> true;
+safe_primop(bs_get_utf16) -> true;
+safe_primop(bs_validate_unicode_retract) -> true;
+safe_primop(bs_put_small_float) -> true;
+safe_primop(bs_put_bits) -> true;
+safe_primop(emasculate_binary) -> true;
+safe_primop(atomic_inc) -> true;
+%% Not noproc but manually verified
+safe_primop(bs_put_big_integer) -> true;
+safe_primop(_) -> false.
diff --git a/lib/hipe/rtl/hipe_tagscheme.erl b/lib/hipe/rtl/hipe_tagscheme.erl
index 68cbe75e85..737f0ec5e3 100644
--- a/lib/hipe/rtl/hipe_tagscheme.erl
+++ b/lib/hipe/rtl/hipe_tagscheme.erl
@@ -53,7 +53,8 @@
 -export([test_subbinary/3, test_heap_binary/3]).
 -export([create_heap_binary/3, create_refc_binary/3, create_refc_binary/4]).
 -export([create_matchstate/6, convert_matchstate/1, compare_matchstate/4]).
--export([get_field_from_term/3, get_field_from_pointer/3,
+-export([get_field_addr_from_term/3,
+	 get_field_from_term/3, get_field_from_pointer/3,
 	 set_field_from_term/3, set_field_from_pointer/3,
 	 extract_matchbuffer/2, extract_binary_bytes/2]).
 
@@ -76,6 +77,10 @@
 -define(TAG_PRIMARY_BOXED,  16#2).
 -define(TAG_PRIMARY_IMMED1, 16#3).
 
+%% Only when ?ERTS_USE_LITERAL_TAG =:= 1
+-define(TAG_PTR_MASK__,   16#7).
+-define(TAG_LITERAL_PTR,  16#4).
+
 -define(TAG_IMMED1_SIZE,  4).
 -define(TAG_IMMED1_MASK,  16#F).
 -define(TAG_IMMED1_PID,   ((16#0 bsl ?TAG_PRIMARY_SIZE) bor ?TAG_PRIMARY_IMMED1)).
@@ -157,6 +162,38 @@ tag_cons(Res, X) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+ptr_val(Res, X) ->
+  hipe_rtl:mk_alu(Res, X, 'and', hipe_rtl:mk_imm(bnot ?TAG_PTR_MASK__)).
+
+%% Returns {Base, Offset, Untag}. To be used like, for example:
+%% {Base, Offset, Untag} = untag_ptr(X, ?TAG_PRIMARY_BOXED),
+%% ...
+%% [Untag, hipe_rtl:mk_load(Dst, Base, hipe_rtl:mk_imm(Offset))].
+%%
+%% NB: Base might either be X or a new temp. It must thus not be modified.
+untag_ptr(X, Tag) ->
+  case ?ERTS_USE_LITERAL_TAG of
+    0 ->
+      {X, -Tag, []};
+    1 ->
+      Base = hipe_rtl:mk_new_reg(),
+      Untag = ptr_val(Base, X),
+      {Base, 0, Untag}
+  end.
+
+untag_ptr_nooffset(Dst, X, Tag) ->
+  %% We could just use ptr_val in all cases, but subtraction can use LEA on x86
+  %% and can be inlined into effective address computations on several
+  %% architectures.
+  case ?ERTS_USE_LITERAL_TAG of
+    0 ->
+      hipe_rtl:mk_alu(Dst, X, 'sub', hipe_rtl:mk_imm(Tag));
+    1 ->
+      ptr_val(Dst, X)
+  end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 %%% Operations to test if an object has a known type T.
 
 test_nil(X, TrueLab, FalseLab, Pred) ->
@@ -171,7 +208,8 @@ test_is_boxed(X, TrueLab, FalseLab, Pred) ->
   hipe_rtl:mk_branch(X, 'and', Mask, 'eq', TrueLab, FalseLab, Pred).
 
 get_header(Res, X) ->
-  hipe_rtl:mk_load(Res, X, hipe_rtl:mk_imm(-(?TAG_PRIMARY_BOXED))).
+  {Base, Offset, Untag} = untag_ptr(X, ?TAG_PRIMARY_BOXED),
+  [Untag, hipe_rtl:mk_load(Res, Base, hipe_rtl:mk_imm(Offset))].
 
 mask_and_compare(X, Mask, Value, TrueLab, FalseLab, Pred) ->
   Tmp = hipe_rtl:mk_new_reg_gcsafe(),
@@ -617,21 +655,25 @@ test_either_immed(Arg1, Arg2, TrueLab, FalseLab) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 unsafe_car(Dst, Arg) ->
-  hipe_rtl:mk_load(Dst, Arg, hipe_rtl:mk_imm(-(?TAG_PRIMARY_LIST))).
+  {Base, Offset, Untag} = untag_ptr(Arg, ?TAG_PRIMARY_LIST),
+  [Untag, hipe_rtl:mk_load(Dst, Base, hipe_rtl:mk_imm(Offset))].
 
 unsafe_cdr(Dst, Arg) ->
+  {Base, Offset, Untag} = untag_ptr(Arg, ?TAG_PRIMARY_LIST),
   WordSize = hipe_rtl_arch:word_size(),
-  hipe_rtl:mk_load(Dst, Arg, hipe_rtl:mk_imm(-(?TAG_PRIMARY_LIST)+WordSize)).
+  [Untag, hipe_rtl:mk_load(Dst, Base, hipe_rtl:mk_imm(Offset+WordSize))].
 
 unsafe_constant_element(Dst, Index, Tuple) ->	% Index is an immediate
   WordSize = hipe_rtl_arch:word_size(),
-  Offset = -(?TAG_PRIMARY_BOXED) + WordSize * hipe_rtl:imm_value(Index),
-  hipe_rtl:mk_load(Dst, Tuple, hipe_rtl:mk_imm(Offset)).
+  {Base, Offset0, Untag} = untag_ptr(Tuple, ?TAG_PRIMARY_BOXED),
+  Offset = Offset0 + WordSize * hipe_rtl:imm_value(Index),
+  [Untag, hipe_rtl:mk_load(Dst, Base, hipe_rtl:mk_imm(Offset))].
 
 unsafe_update_element(Tuple, Index, Value) ->   % Index is an immediate
   WordSize = hipe_rtl_arch:word_size(),
-  Offset = -(?TAG_PRIMARY_BOXED) + WordSize * hipe_rtl:imm_value(Index),
-  hipe_rtl:mk_store(Tuple, hipe_rtl:mk_imm(Offset), Value).
+  {Base, Offset0, Untag} = untag_ptr(Tuple, ?TAG_PRIMARY_BOXED),
+  Offset = Offset0 + WordSize * hipe_rtl:imm_value(Index),
+  [Untag, hipe_rtl:mk_store(Base, hipe_rtl:mk_imm(Offset), Value)].
 
 %%% wrong semantics
 %% unsafe_variable_element(Dst, Index, Tuple) -> % Index is an unknown fixnum
@@ -644,10 +686,12 @@ unsafe_update_element(Tuple, Index, Value) ->   % Index is an immediate
 %%     Tmp1 = hipe_rtl:mk_new_reg_gcsafe(),
 %%     Tmp2 = hipe_rtl:mk_new_reg_gcsafe(),
 %%     Shift = ?TAG_IMMED1_SIZE - 2,
-%%     OffAdj = (?TAG_IMMED1_SMALL bsr Shift) + ?TAG_PRIMARY_BOXED,
+%%     {Base, Off0, Untag} = untag_ptr(Tuple, ?TAG_PRIMARY_BOXED),
+%%     OffAdj = (?TAG_IMMED1_SMALL bsr Shift) - Off0,
 %%     [hipe_rtl:mk_alu(Tmp1, Index, 'srl', hipe_rtl:mk_imm(Shift)),
 %%      hipe_rtl:mk_alu(Tmp2, Tmp1, 'sub', hipe_rtl:mk_imm(OffAdj)),
-%%      hipe_rtl:mk_load(Dst, Tuple, Tmp2)].
+%%      Untag,
+%%      hipe_rtl:mk_load(Base, Tuple, Tmp2)].
 
 element(Dst, Index, Tuple, FailLabName, {tuple, A}, IndexInfo) ->
   FixnumOkLab = hipe_rtl:mk_new_label(),
@@ -660,7 +704,7 @@ element(Dst, Index, Tuple, FailLabName, {tuple, A}, IndexInfo) ->
       Offset = hipe_rtl:mk_new_reg_gcsafe(),
       Ptr = hipe_rtl:mk_new_reg(), % offset from Tuple
       [untag_fixnum(UIndex, Index),
-       hipe_rtl:mk_alu(Ptr, Tuple, 'sub', hipe_rtl:mk_imm(?TAG_PRIMARY_BOXED)),
+       untag_ptr_nooffset(Ptr, Tuple, ?TAG_PRIMARY_BOXED),
        hipe_rtl:mk_alu(Offset, UIndex, 'sll', 
 		       hipe_rtl:mk_imm(hipe_rtl_arch:log2_word_size())),
        hipe_rtl:mk_load(Dst, Ptr, Offset)];
@@ -769,7 +813,7 @@ gen_element_tail(Dst, Tuple, Arity, UIndex, FailLabName, IndexOkLab) ->
    hipe_rtl:mk_branch(ZeroIndex, 'geu', Arity, FailLabName,
 		      hipe_rtl:label_name(IndexOkLab), 0.01),
    IndexOkLab,
-   hipe_rtl:mk_alu(Ptr, Tuple, 'sub', hipe_rtl:mk_imm(?TAG_PRIMARY_BOXED)),
+   untag_ptr_nooffset(Ptr, Tuple, ?TAG_PRIMARY_BOXED),
    hipe_rtl:mk_alu(Offset, UIndex, 'sll',
                    hipe_rtl:mk_imm(hipe_rtl_arch:log2_word_size())),
    hipe_rtl:mk_load(Dst, Ptr, Offset)].
@@ -777,11 +821,13 @@ gen_element_tail(Dst, Tuple, Arity, UIndex, FailLabName, IndexOkLab) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 unsafe_closure_element(Dst, Index, Closure) ->	% Index is an immediate
-  Offset = -(?TAG_PRIMARY_BOXED)    %% Untag
+  %% XXX: Can there even be closure literals?
+  {Base, Offset0, Untag} = untag_ptr(Closure, ?TAG_PRIMARY_BOXED),
+  Offset = Offset0                  %% Untag
     + ?EFT_ENV                      %% Field offset
                                     %% Index from 1 to N hence -1)
     + (hipe_rtl_arch:word_size() * (hipe_rtl:imm_value(Index)-1)),
-  hipe_rtl:mk_load(Dst, Closure, hipe_rtl:mk_imm(Offset)).
+  [Untag, hipe_rtl:mk_load(Dst, Base, hipe_rtl:mk_imm(Offset))].
 
 mk_fun_header() ->
   hipe_rtl:mk_imm(?HEADER_FUN).
@@ -790,7 +836,7 @@ tag_fun(Res, X) ->
   tag_boxed(Res, X).
 
 %% untag_fun(Res, X) ->
-%%   hipe_rtl:mk_alu(Res, X, 'sub', hipe_rtl:mk_imm(?TAG_PRIMARY_BOXED)).
+%%   untag_ptr_nooffset(Res, X, ?TAG_PRIMARY_BOXED).
 
 if_fun_get_arity_and_address(ArityReg, AddressReg, FunP, BadFunLab, Pred) ->
   %% EmuAddressPtrReg = hipe_rtl:mk_new_reg(),
@@ -801,15 +847,15 @@ if_fun_get_arity_and_address(ArityReg, AddressReg, FunP, BadFunLab, Pred) ->
   TrueLab0 = hipe_rtl:mk_new_label(),
   %% TrueLab1 = hipe_rtl:mk_new_label(),
   IsFunCode = test_closure(FunP, hipe_rtl:label_name(TrueLab0), BadFunLab, Pred),
+  {Base, Offset, Untag} = untag_ptr(FunP, ?TAG_PRIMARY_BOXED),
   GetArityCode =
     [TrueLab0,
      %% Funp->arity contains the arity
-     hipe_rtl:mk_load(ArityReg, FunP,
-		      hipe_rtl:mk_imm(-(?TAG_PRIMARY_BOXED)+
-				      ?EFT_ARITY)),
-     hipe_rtl:mk_load(FEPtrReg, FunP,
-		      hipe_rtl:mk_imm(-(?TAG_PRIMARY_BOXED)+
-				      ?EFT_FE)),
+     Untag,
+     hipe_rtl:mk_load(ArityReg, Base,
+		      hipe_rtl:mk_imm(Offset+?EFT_ARITY)),
+     hipe_rtl:mk_load(FEPtrReg, Base,
+		      hipe_rtl:mk_imm(Offset+?EFT_FE)),
      hipe_rtl:mk_load(AddressReg, FEPtrReg,
 		      hipe_rtl:mk_imm(?EFE_NATIVE_ADDRESS))],
   IsFunCode ++ GetArityCode.
@@ -927,20 +973,24 @@ test_subbinary(Binary, TrueLblName, FalseLblName) ->
 
 unsafe_load_float(DstLo, DstHi, Src) ->
   WordSize = hipe_rtl_arch:word_size(),
-  Offset1 = -(?TAG_PRIMARY_BOXED) + WordSize,
+  {Base, Offset0, Untag} = untag_ptr(Src, ?TAG_PRIMARY_BOXED),
+  Offset1 = Offset0 + WordSize,
   Offset2 = Offset1 + 4, %% This should really be 4 and not WordSize
   case hipe_rtl_arch:endianess() of
     little ->
-      [hipe_rtl:mk_load(DstLo, Src, hipe_rtl:mk_imm(Offset1), int32, unsigned),
-       hipe_rtl:mk_load(DstHi, Src, hipe_rtl:mk_imm(Offset2), int32, unsigned)];
+      [Untag,
+       hipe_rtl:mk_load(DstLo, Base, hipe_rtl:mk_imm(Offset1), int32, unsigned),
+       hipe_rtl:mk_load(DstHi, Base, hipe_rtl:mk_imm(Offset2), int32, unsigned)];
     big ->
-      [hipe_rtl:mk_load(DstHi, Src, hipe_rtl:mk_imm(Offset1), int32, unsigned),
-       hipe_rtl:mk_load(DstLo, Src, hipe_rtl:mk_imm(Offset2), int32, unsigned)]
+      [Untag,
+       hipe_rtl:mk_load(DstHi, Base, hipe_rtl:mk_imm(Offset1), int32, unsigned),
+       hipe_rtl:mk_load(DstLo, Base, hipe_rtl:mk_imm(Offset2), int32, unsigned)]
   end. 
 
 unsafe_untag_float(Dst, Src) ->
-  Offset = -(?TAG_PRIMARY_BOXED) + hipe_rtl_arch:word_size(),
-  [hipe_rtl:mk_fload(Dst, Src, hipe_rtl:mk_imm(Offset))].
+  {Base, Offset0, Untag} = untag_ptr(Src, ?TAG_PRIMARY_BOXED),
+  Offset = Offset0 + hipe_rtl_arch:word_size(),
+  [Untag, hipe_rtl:mk_fload(Dst, Base, hipe_rtl:mk_imm(Offset))].
 
 unsafe_tag_float(Dst, Src) ->
   {GetHPInsn, HP, PutHPInsn} = hipe_rtl_arch:heap_pointer(),
@@ -999,8 +1049,9 @@ get_one_word_pos_bignum(USize, Size, Fail) ->
 
 unsafe_get_one_word_pos_bignum(USize, Size) ->
   WordSize = hipe_rtl_arch:word_size(),
-  Imm = hipe_rtl:mk_imm(1*WordSize-?TAG_PRIMARY_BOXED),
-  [hipe_rtl:mk_load(USize, Size, Imm)].
+  {Base, Offset, Untag} = untag_ptr(Size, ?TAG_PRIMARY_BOXED),
+  Imm = hipe_rtl:mk_imm(1*WordSize+Offset),
+  [Untag, hipe_rtl:mk_load(USize, Base, Imm)].
 
 -spec bignum_sizeneed(non_neg_integer()) -> non_neg_integer().
 
@@ -1040,7 +1091,7 @@ create_matchstate(Max, BinSize, Base, Offset, Orig, Ms) ->
   SizeInWords = ((ByteSize div WordSize) - 1),
   Header = hipe_rtl:mk_imm(mk_header(SizeInWords, ?TAG_HEADER_BIN_MATCHSTATE)),
   [GetHPInsn,
-   hipe_rtl:mk_alu(Ms, HP, add, hipe_rtl:mk_imm(?TAG_PRIMARY_BOXED)),
+   tag_boxed(Ms, HP),
    set_field_from_term({matchstate,thing_word}, Ms, Header),
    set_field_from_term({matchstate,{matchbuffer,orig}}, Ms, Orig),
    set_field_from_term({matchstate,{matchbuffer,base}}, Ms, Base),
@@ -1078,7 +1129,10 @@ convert_matchstate(Ms) ->
    size_from_header(SizeInWords, Header),
    hipe_rtl:mk_alu(Hole, SizeInWords, sub, hipe_rtl:mk_imm(?SUB_BIN_WORDSIZE)),
    mk_var_header(BigIntHeader, Hole, ?TAG_HEADER_POS_BIG),
-   hipe_rtl:mk_store(Ms, hipe_rtl:mk_imm(?SUB_BIN_WORDSIZE*WordSize-?TAG_PRIMARY_BOXED),
+   %% Matchstates can't be literals; so untagging with ?TAG_PRIMARY_BOXED is
+   %% fine here
+   hipe_rtl:mk_store(Ms, hipe_rtl:mk_imm(?SUB_BIN_WORDSIZE*WordSize
+                                         -?TAG_PRIMARY_BOXED),
 		     BigIntHeader)].
 
 compare_matchstate(Max, Ms, LargeEnough, TooSmall) ->
@@ -1087,8 +1141,10 @@ compare_matchstate(Max, Ms, LargeEnough, TooSmall) ->
   SizeInWords = ((ByteSize div WordSize) - 1),
   Header = hipe_rtl:mk_imm(mk_header(SizeInWords, ?TAG_HEADER_BIN_MATCHSTATE)),
   RealHeader = hipe_rtl:mk_new_reg_gcsafe(),
-   [hipe_rtl:mk_load(RealHeader, Ms, hipe_rtl:mk_imm(-?TAG_PRIMARY_BOXED)),
-    hipe_rtl:mk_branch(RealHeader, ge, Header, LargeEnough, TooSmall)].
+  %% Matchstates can't be literals; so untagging with ?TAG_PRIMARY_BOXED is fine
+  %% here
+  [hipe_rtl:mk_load(RealHeader, Ms, hipe_rtl:mk_imm(-?TAG_PRIMARY_BOXED)),
+   hipe_rtl:mk_branch(RealHeader, ge, Header, LargeEnough, TooSmall)].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
@@ -1207,15 +1263,22 @@ get_field_size1({matchbuffer, base}) ->
 get_field_size1({matchbuffer, binsize}) ->  
   ?MB_SIZE_SIZE.
 
+get_field_addr_from_term(Struct, Term, Dst) ->
+  {Base, Offset0, Untag} = untag_ptr(Term, ?TAG_PRIMARY_BOXED),
+  Offset = hipe_rtl:mk_imm(get_field_offset(Struct) + Offset0),
+  [Untag, hipe_rtl:mk_alu(Dst, Base, add, Offset)].
+
 get_field_from_term(Struct, Term, Dst) ->
-  Offset = hipe_rtl:mk_imm(get_field_offset(Struct) - ?TAG_PRIMARY_BOXED),
+  {Base, Offset0, Untag} = untag_ptr(Term, ?TAG_PRIMARY_BOXED),
+  Offset = hipe_rtl:mk_imm(get_field_offset(Struct) + Offset0),
   Size = get_field_size(Struct),
-  hipe_rtl:mk_load(Dst, Term, Offset, Size, unsigned). 
+  [Untag, hipe_rtl:mk_load(Dst, Base, Offset, Size, unsigned)].
 
 set_field_from_term(Struct, Term, Value) ->
-  Offset = hipe_rtl:mk_imm(get_field_offset(Struct) - ?TAG_PRIMARY_BOXED),
+  {Base, Offset0, Untag} = untag_ptr(Term, ?TAG_PRIMARY_BOXED),
+  Offset = hipe_rtl:mk_imm(get_field_offset(Struct) + Offset0),
   Size = get_field_size(Struct),
-  hipe_rtl:mk_store(Term, Offset, Value, Size).
+  [Untag, hipe_rtl:mk_store(Base, Offset, Value, Size)].
 
 get_field_from_pointer(Struct, Term, Dst) ->
   Offset = hipe_rtl:mk_imm(get_field_offset(Struct)),
@@ -1229,6 +1292,8 @@ set_field_from_pointer(Struct, Term, Value) ->
   
 extract_matchbuffer(Mb, Ms) ->
   What = {matchstate, matchbuffer},
+  %% Matchstates can't be literals; so untagging with ?TAG_PRIMARY_BOXED is fine
+  %% here
   Offset = hipe_rtl:mk_imm(get_field_offset(What) - ?TAG_PRIMARY_BOXED),
   hipe_rtl:mk_alu(Mb, Ms, add, Offset).
 
diff --git a/lib/hipe/ssa/hipe_ssa.inc b/lib/hipe/ssa/hipe_ssa.inc
index c7c1a8e1d7..29e8b92266 100644
--- a/lib/hipe/ssa/hipe_ssa.inc
+++ b/lib/hipe/ssa/hipe_ssa.inc
@@ -463,20 +463,20 @@ updateStatementDefs([], Statement, Current, Acc) ->
 %%----------------------------------------------------------------------
 
 updateIndices(Current, Variable) ->
-  case ?CODE:is_var(Variable) of
-    true ->
-      NewVar = ?CODE:mk_new_var(),
-      {NewVar,gb_trees:enter(Variable, NewVar, Current)};
-    false ->
-      case is_fp_temp(Variable) of
-	true ->
-	  NewFVar = mk_new_fp_temp(),
-	  {NewFVar,gb_trees:enter(Variable, NewFVar, Current)};
-	false ->
-	  NewReg = ?CODE:mk_new_reg(),
-	  {NewReg,gb_trees:enter(Variable, NewReg, Current)}
-      end
-  end.
+  New =
+    case ?CODE:is_var(Variable) of
+      true -> ?CODE:mk_new_var();
+      false ->
+        case is_fp_temp(Variable) of
+          true -> mk_new_fp_temp();
+          false ->
+            case ?CODE:reg_is_gcsafe(Variable) of
+              true -> ?CODE:mk_new_reg_gcsafe();
+              false -> ?CODE:mk_new_reg()
+            end
+        end
+    end,
+  {New, gb_trees:enter(Variable, New, Current)}.
 
 %%----------------------------------------------------------------------
 %% Procedure : updateSuccPhi/4
diff --git a/lib/hipe/test/basic_SUITE_data/basic_exceptions.erl b/lib/hipe/test/basic_SUITE_data/basic_exceptions.erl
index d71b924d22..ba9c03d4ba 100644
--- a/lib/hipe/test/basic_SUITE_data/basic_exceptions.erl
+++ b/lib/hipe/test/basic_SUITE_data/basic_exceptions.erl
@@ -24,6 +24,7 @@ test() ->
   ok = test_bad_fun_call(),
   ok = test_guard_bif(),
   ok = test_eclectic(),
+  ok = test_raise(),
   ok.
 
 %%--------------------------------------------------------------------
@@ -579,3 +580,99 @@ my_add(A, B) ->
 
 my_abs(X) ->
   abs(X).
+
+test_raise() ->
+  test_raise(fun() -> exit({exit,tuple}) end),
+  test_raise(fun() -> abs(id(x)) end),
+  test_raise(fun() -> throw({was,thrown}) end),
+
+  badarg = bad_raise(fun() -> abs(id(x)) end),
+
+  ok.
+
+bad_raise(Expr) ->
+  try
+    Expr()
+  catch
+    _:E:Stk ->
+      erlang:raise(bad_class, E, Stk)
+  end.
+
+test_raise(Expr) ->
+  test_raise_1(Expr),
+  test_raise_2(Expr),
+  test_raise_3(Expr).
+
+test_raise_1(Expr) ->
+  erase(exception),
+  try
+    do_test_raise_1(Expr)
+  catch
+    C:E:Stk ->
+      {C,E,Stk} = erase(exception)
+  end.
+
+do_test_raise_1(Expr) ->
+  try
+    Expr()
+  catch
+    C:E:Stk ->
+      %% Here the stacktrace must be built.
+      put(exception, {C,E,Stk}),
+      erlang:raise(C, E, Stk)
+  end.
+
+test_raise_2(Expr) ->
+  erase(exception),
+  try
+    do_test_raise_2(Expr)
+  catch
+    C:E:Stk ->
+      {C,E} = erase(exception),
+      try
+        Expr()
+      catch
+        _:_:S ->
+          [StkTop|_] = S,
+          [StkTop|_] = Stk
+      end
+  end.
+
+do_test_raise_2(Expr) ->
+  try
+    Expr()
+  catch
+    C:E:Stk ->
+      %% Here it is possible to replace erlang:raise/3 with
+      %% the raw_raise/3 instruction since the stacktrace is
+      %% not actually used.
+      put(exception, {C,E}),
+      erlang:raise(C, E, Stk)
+  end.
+
+test_raise_3(Expr) ->
+  try
+    do_test_raise_3(Expr)
+  catch
+    exit:{exception,C,E}:Stk ->
+      try
+        Expr()
+      catch
+        C:E:S ->
+          [StkTop|_] = S,
+          [StkTop|_] = Stk
+      end
+  end.
+
+do_test_raise_3(Expr) ->
+  try
+    Expr()
+  catch
+    C:E:Stk ->
+      %% Here it is possible to replace erlang:raise/3 with
+      %% the raw_raise/3 instruction since the stacktrace is
+      %% not actually used.
+      erlang:raise(exit, {exception,C,E}, Stk)
+  end.
+
+id(I) -> I.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_receive.erl b/lib/hipe/test/basic_SUITE_data/basic_receive.erl
index 5f865d7b7a..20e3f350e8 100644
--- a/lib/hipe/test/basic_SUITE_data/basic_receive.erl
+++ b/lib/hipe/test/basic_SUITE_data/basic_receive.erl
@@ -12,6 +12,7 @@ test() ->
   ok = test_wait_timeout(),
   ok = test_double_timeout(),
   ok = test_reschedule(),
+  ok = test_recv_mark(),
   ok.
 
 %%--------------------------------------------------------------------
@@ -54,3 +55,91 @@ doit(First) ->
   erts_debug:set_internal_state(hipe_test_reschedule_suspend, 1).
 
 %%--------------------------------------------------------------------
+%% Check that we cannot cause a recv_mark,recv_set pair to misbehave and
+%% deadlock the process.
+
+test_recv_mark() ->
+  ok = test_recv_mark(fun disturber_nop/0),
+  ok = test_recv_mark(fun disturber_receive/0),
+  ok = test_recv_mark(fun disturber_other/0),
+  ok = test_recv_mark(fun disturber_recurse/0),
+  ok = test_recv_mark_after(self(), fun disturber_after_recurse/0, false),
+  ok = test_recv_mark(fun disturber_other_recurse/0),
+  ok = test_recv_mark(fun disturber_other_after/0),
+  ok = test_recv_mark_nested().
+
+test_recv_mark(Disturber) ->
+  Ref = make_ref(),
+  self() ! Ref,
+  Disturber(),
+  receive Ref -> ok
+  after 0 -> error(failure)
+  end.
+
+disturber_nop() -> ok.
+
+disturber_receive() ->
+  self() ! message,
+  receive message -> ok end.
+
+disturber_other() ->
+  Ref = make_ref(),
+  self() ! Ref,
+  receive Ref -> ok end.
+
+disturber_recurse() ->
+  aborted = (catch test_recv_mark(fun() -> throw(aborted) end)),
+  ok.
+
+test_recv_mark_after(Recipient, Disturber, IsInner) ->
+  Ref = make_ref(),
+  Recipient ! Ref,
+  Disturber(),
+  receive
+      Ref -> ok
+  after 0 ->
+          case IsInner of
+              true -> expected;
+              false -> error(failure)
+          end
+  end.
+
+disturber_after_recurse() ->
+  NoOp = fun() -> ok end,
+  BlackHole = spawn(NoOp),
+  expected = test_recv_mark_after(BlackHole, NoOp, true),
+  ok.
+
+disturber_other_recurse() ->
+  aborted = (catch disturber_other_recurse(fun() -> throw(aborted) end)),
+  ok.
+
+disturber_other_recurse(InnerD) ->
+  Ref = make_ref(),
+  self() ! Ref,
+  InnerD(),
+  receive Ref -> ok
+  after 0 -> error(failure)
+  end.
+
+disturber_other_after() ->
+  BlackHole = spawn(fun() -> ok end),
+  Ref = make_ref(),
+  BlackHole ! Ref,
+  receive Ref -> error(imposible)
+  after 0 -> ok
+  end.
+
+test_recv_mark_nested() ->
+  Ref1 = make_ref(),
+  self() ! Ref1,
+  begin
+    Ref2 = make_ref(),
+    self() ! Ref2,
+    receive Ref2 -> ok end
+  end,
+  receive Ref1 -> ok
+  after 0 -> error(failure)
+  end.
+
+%%--------------------------------------------------------------------
diff --git a/lib/hipe/test/bs_SUITE_data/bs_construct.erl b/lib/hipe/test/bs_SUITE_data/bs_construct.erl
index b9e7d93570..aa85626857 100644
--- a/lib/hipe/test/bs_SUITE_data/bs_construct.erl
+++ b/lib/hipe/test/bs_SUITE_data/bs_construct.erl
@@ -279,13 +279,22 @@ bad_floats() ->
 %% (incorrectly) signed.
 
 huge_binaries() ->
-  AlmostIllegal = id(<<0:(id((1 bsl 32)-8))>>),
   case erlang:system_info(wordsize) of
-    4 -> huge_binaries_32(AlmostIllegal);
+    4 ->
+      Old = erts_debug:set_internal_state(available_internal_state, true),
+      case erts_debug:set_internal_state(binary, (1 bsl 29)-1) of
+        false ->
+          io:format("\nNot enough memory to create 512Mb binary\n",[]);
+        Bin->
+          huge_binaries_32(Bin)
+      end,
+      erts_debug:set_internal_state(available_internal_state, Old);
+
     8 -> ok
   end,
   garbage_collect(),
   id(<<0:(id((1 bsl 31)-1))>>),
+  garbage_collect(),
   id(<<0:(id((1 bsl 30)-1))>>),
   garbage_collect(),
   ok.
diff --git a/lib/hipe/test/hipe_testsuite_driver.erl b/lib/hipe/test/hipe_testsuite_driver.erl
index ee9c57a908..8813af5dfc 100644
--- a/lib/hipe/test/hipe_testsuite_driver.erl
+++ b/lib/hipe/test/hipe_testsuite_driver.erl
@@ -161,7 +161,8 @@ run(TestCase, Dir, _OutDir) ->
     %% 		  end, DataFiles),
     %% try
     ok = TestCase:test(),
-    HiPEOpts = try TestCase:hipe_options() catch error:undef -> [] end,
+    HiPEOpts0 = try TestCase:hipe_options() catch error:undef -> [] end,
+    HiPEOpts = HiPEOpts0 ++ hipe_options(),
     {ok, TestCase} = hipe:c(TestCase, HiPEOpts),
     ok = TestCase:test(),
     {ok, TestCase} = hipe:c(TestCase, [o1|HiPEOpts]),
@@ -179,3 +180,6 @@ run(TestCase, Dir, _OutDir) ->
     %% 	lists:foreach(fun (DF) -> ok end, % = file:delete(DF) end,
     %% 		      [filename:join(OutDir, D) || D <- DataFiles])
     %% end.
+
+hipe_options() ->
+    [verify_gcsafe].
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index f88d9147b1..508ec00548 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.16.1
+HIPE_VSN = 3.17
diff --git a/lib/hipe/x86/hipe_rtl_to_x86.erl b/lib/hipe/x86/hipe_rtl_to_x86.erl
index 31e4f6e4ac..22947da148 100644
--- a/lib/hipe/x86/hipe_rtl_to_x86.erl
+++ b/lib/hipe/x86/hipe_rtl_to_x86.erl
@@ -646,7 +646,7 @@ conv_imm(Opnd, Map) ->
 is_imm64(Value) when is_integer(Value) ->
   (Value < -(1 bsl (32 - 1))) or (Value > (1 bsl (32 - 1)) - 1);
 is_imm64({_,atom})    -> false; % Atoms are 32 bits.
-is_imm64({_,c_const}) -> false; % c_consts are 32 bits.
+is_imm64({_,c_const}) -> true;  % c_consts are 64 bits.
 is_imm64({_,_})       -> true . % Other relocs are 64 bits.
 -else.
 conv_imm(Opnd, Map) ->
@@ -777,6 +777,18 @@ conv_fconv(Dst, Src) ->
 
 %%% Finalise the conversion of a 2-address FP operation.
 
+-ifdef(HIPE_AMD64).
+conv_fp_unary(Dst, Src, 'fchs') ->
+  Tmp = new_untagged_temp(),
+  case same_opnd(Dst, Src) of
+    true ->
+      [];
+    _ ->
+      [hipe_x86:mk_fmove(Src, Dst)]
+  end ++
+    mk_load_address(c_const, hipe_x86:mk_imm({sse2_fnegate_mask, c_const}), Tmp) ++
+    [hipe_x86:mk_fp_binop('xorpd', hipe_x86:mk_mem(Tmp, hipe_x86:mk_imm(0), double), Dst)].
+-else.
 conv_fp_unary(Dst, Src, FpUnOp) ->
   case same_opnd(Dst, Src) of
     true ->
@@ -785,6 +797,7 @@ conv_fp_unary(Dst, Src, FpUnOp) ->
       [hipe_x86:mk_fmove(Src, Dst),
        hipe_x86:mk_fp_unop(FpUnOp, Dst)]
   end.
+-endif.
 
 conv_fp_unop(RtlFpUnOp) ->
   case RtlFpUnOp of
@@ -854,13 +867,8 @@ mk_jmp_switch(Index, JTabLab, Labels) ->
 %%% Finalise the translation of a load_address instruction.
 
 -ifdef(HIPE_AMD64).
-mk_load_address(Type, Src, Dst) ->
-  case Type of
-    c_const -> % 32 bits
-      [hipe_x86:mk_move(Src, Dst)];
-    _ ->
-      [hipe_x86:mk_move64(Src, Dst)]
-  end.
+mk_load_address(_Type, Src, Dst) ->
+  [hipe_x86:mk_move64(Src, Dst)].
 -else.
 mk_load_address(_Type, Src, Dst) ->
   [hipe_x86:mk_move(Src, Dst)].
diff --git a/lib/hipe/x86/hipe_x86_assemble.erl b/lib/hipe/x86/hipe_x86_assemble.erl
index 50919bdf4e..9d2586a14d 100644
--- a/lib/hipe/x86/hipe_x86_assemble.erl
+++ b/lib/hipe/x86/hipe_x86_assemble.erl
@@ -735,6 +735,7 @@ resolve_sse2_op(Op) ->
     fdiv -> divsd;
     fmul -> mulsd;
     fsub -> subsd;
+    xorpd -> xorpd;
     _ -> exit({?MODULE, unknown_sse2_operator, Op})
   end.
 
diff --git a/lib/ic/doc/src/notes.xml b/lib/ic/doc/src/notes.xml
index ea8bf758cf..fc68ec386c 100644
--- a/lib/ic/doc/src/notes.xml
+++ b/lib/ic/doc/src/notes.xml
@@ -31,7 +31,22 @@
     <file>notes.xml</file>
   </header>
 
-   <section><title>IC 4.4.2</title>
+   <section><title>IC 4.4.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>IC 4.4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
index b3a18e03d4..446b46ad82 100644
--- a/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
+++ b/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
@@ -1365,8 +1365,8 @@ static int cmp_strRec(m_strRec *b1, m_strRec *b2)
 	    return 0;
     if (!cmp_str(b1->str6,b2->str6))
 	return 0;
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    if (b1->str7[i][j] != b2->str7[i][j])
 		return 0;
     for (j = 0; j < 3; j++)
@@ -1579,8 +1579,8 @@ static void print_strRec(m_strRec* sr)
     fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
     fprintf(stdout, "string str4 : %s\n",sr->str4);
     fprintf(stdout, "str7[2][3] :\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
     fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
     for (j = 0; j < sr->str5._length; j++)
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c
index 40c7328f03..d6a78d2481 100644
--- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c
@@ -1369,8 +1369,8 @@ static int cmp_strRec(m_strRec *b1, m_strRec *b2)
 	    return 0;
     if (!cmp_str(b1->str6,b2->str6))
 	return 0;
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    if (b1->str7[i][j] != b2->str7[i][j])
 		return 0;
     for (j = 0; j < 3; j++)
@@ -1583,8 +1583,8 @@ static void print_strRec(m_strRec* sr)
     fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
     fprintf(stdout, "string str4 : %s\n",sr->str4);
     fprintf(stdout, "str7[2][3] :\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
     fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
     for (j = 0; j < sr->str5._length; j++)
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
index 33cfe71322..17ef21f4f4 100644
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
@@ -1369,8 +1369,8 @@ static int cmp_strRec(m_strRec *b1, m_strRec *b2)
 	    return 0;
     if (!cmp_str(b1->str6,b2->str6))
 	return 0;
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    if (b1->str7[i][j] != b2->str7[i][j])
 		return 0;
     for (j = 0; j < 3; j++)
@@ -1583,8 +1583,8 @@ static void print_strRec(m_strRec* sr)
     fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
     fprintf(stdout, "string str4 : %s\n",sr->str4);
     fprintf(stdout, "str7[2][3] :\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
     fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
     for (j = 0; j < sr->str5._length; j++)
diff --git a/lib/ic/vsn.mk b/lib/ic/vsn.mk
index f0e5e7c266..b9f1ef7f20 100644
--- a/lib/ic/vsn.mk
+++ b/lib/ic/vsn.mk
@@ -1 +1 @@
-IC_VSN = 4.4.2
+IC_VSN = 4.4.3
diff --git a/lib/inets/doc/src/Makefile b/lib/inets/doc/src/Makefile
index 14f12ee949..cbfa5c9e30 100644
--- a/lib/inets/doc/src/Makefile
+++ b/lib/inets/doc/src/Makefile
@@ -39,6 +39,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 XML_APPLICATION_FILES = ref_man.xml
 
 XML_CHAPTER_FILES = \
+	introduction.xml \
 	inets_services.xml \
 	http_client.xml \
 	http_server.xml \
diff --git a/lib/inets/doc/src/http_client.xml b/lib/inets/doc/src/http_client.xml
index 212958f17f..15e383ec77 100644
--- a/lib/inets/doc/src/http_client.xml
+++ b/lib/inets/doc/src/http_client.xml
@@ -97,27 +97,32 @@
       7 > {ok, {{NewVersion, 200, NewReasonPhrase}, NewHeaders, NewBody}} =
       httpc:request(get, {"http://www.erlang.org", [{"connection", "close"}]},
       [], []).</code>
-
+    <p>This sends an HTTP request over a unix domain socket (experimental):</p>
+    <code type="erl">
+      8 > httpc:set_options([{ipfamily, local},
+      {unix_socket,"/tmp/unix_socket/consul_http.sock"}]).
+      9 > {ok, {{NewVersion, 200, NewReasonPhrase}, NewHeaders, NewBody}} =
+      httpc:request(put, {"http:///v1/kv/foo", [], [], "hello"}, [], []).</code>
     <p>Start an HTTP client profile:</p>
    
     <code><![CDATA[
-      8 > {ok, Pid} = inets:start(httpc, [{profile, foo}]).
+      10 > {ok, Pid} = inets:start(httpc, [{profile, foo}]).
       {ok, <0.45.0>}       
       ]]></code>
     
     <p>The new profile has no proxy settings, so the connection is refused:</p>
       <code type="erl">
-      9 > httpc:request("http://www.erlang.org", foo). 
+      11 > httpc:request("http://www.erlang.org", foo).
       {error, econnrefused}</code>
 
     <p>Stop the HTTP client profile:</p>
     <code type="erl">
-      10 > inets:stop(httpc, foo).
+      12 > inets:stop(httpc, foo).
       ok</code>
     
     <p>Alternative way to stop the HTTP client profile:</p>
     <code type="erl">
-      10 > inets:stop(httpc, Pid).
+      13 > inets:stop(httpc, Pid).
       ok</code>
     
   </section>
diff --git a/lib/inets/doc/src/http_uri.xml b/lib/inets/doc/src/http_uri.xml
index 20c042c202..f57214a7ce 100644
--- a/lib/inets/doc/src/http_uri.xml
+++ b/lib/inets/doc/src/http_uri.xml
@@ -45,7 +45,6 @@
       this module:</p>
     <p><c>boolean() = true | false</c></p>
     <p><c>string()</c> = list of ASCII characters</p>
-    <p><c>unicode_binary()</c> = binary() with characters encoded in the UTF-8 coding standard</p>
 
   </section>
   
@@ -54,22 +53,22 @@
     <p>Type definitions that are related to URI:</p>
     
 <taglist>
-       <tag><c>uri() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>uri() = string() | binary()</c></tag>
        <item><p>Syntax according to the URI definition in RFC 3986,
        for example, "http://www.erlang.org/"</p></item>
-       <tag><c>user_info() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>user_info() = string() | binary()</c></tag>
        <item><p></p></item>
        <tag><c>scheme() = atom()</c></tag>
        <item><p>Example: http, https</p></item>
-       <tag><c>host() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>host() = string() | binary()</c></tag>
        <item><p></p></item>
-       <tag><c>port() = pos_integer()</c></tag>
+       <tag><c>port() = inet:port_number()</c></tag>
        <item><p></p></item>
-       <tag><c>path() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>path() = string() | binary()</c></tag>
        <item><p>Represents a file path or directory path</p></item>
-       <tag><c>query() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>query() = string() | binary()</c></tag>
        <item><p></p></item>
-       <tag><c>fragment() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>fragment() = string() | binary()</c></tag>
        <item><p></p></item>
      </taglist>
    
@@ -84,7 +83,7 @@
       
       <fsummary>Decodes a hexadecimal encoded URI.</fsummary>
       <type>
-        <v>HexEncodedURI = string() | unicode:unicode_binary() - A possibly hexadecimal encoded URI</v>
+        <v>HexEncodedURI = string() | binary() - A possibly hexadecimal encoded URI</v>
         <v>URI = uri()</v>
       </type>
 
@@ -99,7 +98,7 @@
       <fsummary>Encodes a hexadecimal encoded URI.</fsummary>
       <type>
         <v>URI = uri()</v>
-        <v>HexEncodedURI = string() | unicode:unicode_binary() - Hexadecimal encoded URI</v>
+        <v>HexEncodedURI = string() | binary() - Hexadecimal encoded URI</v>
       </type>
 
       <desc>
@@ -119,12 +118,13 @@
         <v>Option = {ipv6_host_with_brackets, boolean()} | 
                     {scheme_defaults, scheme_defaults()} |
                     {fragment, boolean()} |
-                    {scheme_validation_fun, fun()}]</v>
+                    {scheme_validation_fun, fun()}</v>
         <v>Result = {Scheme, UserInfo, Host, Port, Path, Query} |
                     {Scheme, UserInfo, Host, Port, Path, Query, Fragment}</v>
+	<v>Scheme = scheme()</v>
 	<v>UserInfo = user_info()</v>
 	<v>Host = host()</v>
-	<v>Port = pos_integer()</v>
+	<v>Port = inet:port_number()</v>
 	<v>Path = path()</v>
 	<v>Query = query()</v>
         <v>Fragment = fragment()</v>
@@ -146,13 +146,20 @@
         <p>Scheme validation fun is to be defined as follows:</p>
 
 	<code>
-fun(SchemeStr :: string() | unicode:unicode_binary()) ->
+fun(SchemeStr :: string() | binary()) ->
 	valid |	{error, Reason :: term()}.
 	</code>
 
         <p>It is called before scheme string gets converted into scheme atom and
         thus possible atom leak could be prevented</p>
 
+        <warning>
+          <p>The scheme portion of the URI gets converted into atom,
+          meaning that atom leak may occur. Specifying a scheme
+          validation fun is recommended unless the URI is already
+          sanitized.</p>
+        </warning>
+
         <marker id="encode"></marker>
       </desc>
     </func>
@@ -162,7 +169,7 @@ fun(SchemeStr :: string() | unicode:unicode_binary()) ->
       <fsummary>A list of the scheme and their default ports.</fsummary>
       <type>
         <v>SchemeDefaults = [{scheme(), default_scheme_port_number()}] </v> 
-	<v>default_scheme_port_number() = pos_integer()</v>
+	<v>default_scheme_port_number() = inet:port_number()</v>
       </type>
       <desc>
         <p>Provides a list of the scheme and their default 
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index 29e4b22632..14662f257c 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -210,7 +210,8 @@
 			   ip | 
 			   port | 
 			   socket_opts | 
-	                   verbose</v>
+	                   verbose |
+	                   unix_socket</v>
 	<v>Profile = profile() | pid()</v>
 	<d>When started <c>stand_alone</c> only the pid can used.</d>
         <v>Values = [{option_item(), term()}]</v>
@@ -287,8 +288,7 @@
                            {autoredirect,    boolean()} | 
                            {proxy_auth, {userstring(), passwordstring()}} | 
                            {version,         http_version()} | 
-                           {relaxed,         boolean()} |
-	                   {url_encode,      boolean()}</v>
+                           {relaxed,         boolean()}</v>
         <v>timeout() = integer() >= 0 | infinity</v>
         <v>Options = options()</v>
         <v>options() = [option()]</v>
@@ -298,8 +298,8 @@
                       {full_result,             boolean()} | 
                       {headers_as_is,           boolean() |
                       {socket_opts,             socket_opts()} | 
-                      {receiver,                receiver()},
-	              {ipv6_host_with_brackets, boolean()}}</v>
+                      {receiver,                receiver()} |
+	              {ipv6_host_with_brackets, boolean()}</v>
         <v>stream_to() = none | self | {self, once} | filename()</v>
         <v>socket_opts() = [socket_opt()]</v>
         <v>receiver() = pid() | function()/1 | {Module, Function, Args}</v>
@@ -379,13 +379,6 @@
 	    from the HTTP-standard are enabled.</p>
             <p>Default is <c>false</c>.</p>
 	  </item>
-
-	  <tag><c><![CDATA[url_encode]]></c></tag>
-          <item>
-            <p>Applies Percent-encoding, also known as URL encoding on the 
-	    URL.</p>
-	    <p>Default is <c>false</c>.</p>
-	  </item>
         </taglist>
 
         <p>Option (<c>option()</c>) details:</p>
@@ -541,7 +534,8 @@
 	<v>| {ip, IpAddress}</v>
 	<v>| {port, Port}</v>
 	<v>| {socket_opts, socket_opts()}</v>
-	<v>| {verbose, VerboseMode}</v>	    
+	<v>| {verbose, VerboseMode}</v>
+	<v>| {unix_socket, UnixSocket}</v>
         <v>Proxy = {Hostname, Port}</v>
         <v>Hostname = string()</v>
         <d>Example: "localhost" or "foo.bar.se"</d>
@@ -584,7 +578,7 @@
 	If option <c>verify</c> is used, function <c>store_cookies/2</c>
 	has to be called for the cookies to be saved. 
 	Default is <c>disabled</c>.</d>
-	<v>IpFamily = inet | inet6 </v>
+	<v>IpFamily = inet | inet6 | local</v>
 	<d>Default is <c>inet</c>.</d>
 	<v>IpAddress = ip_address()</v>
 	<d>If the host has several network interfaces, this option specifies 
@@ -609,6 +603,12 @@
 	It is a debug feature.</d>
 	<v>Profile = profile() | pid()</v>
 	<d>When started <c>stand_alone</c> only the pid can be used.</d>
+	<v>UnixSocket = path()</v>
+	<d>
+	  Experimental option for sending HTTP requests over a unix domain socket. The value
+	  of <c>unix_socket</c> shall be the full path to a unix domain socket file with read/write
+	  permissions for the erlang process. Default is <c>undefined</c>.
+	</d>
       </type>
       <desc>
 	<p>Sets options to be used for subsequent requests.</p>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 1ff6aefaa7..70b2811c0e 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,56 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 6.4.3</title>
+  <section><title>Inets 6.4.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    CGI environment variable CONTENT_LENGTH shall be a string</p>
+          <p>
+	    Own Id: OTP-14679</p>
+        </item>
+        <item>
+          <p>
+	    In relaxed mode disregard Content-Length header if there
+	    is also a Transfer-Encoding header.</p>
+          <p>
+	    Own Id: OTP-14727</p>
+        </item>
+        <item>
+          <p>
+	    Eliminated race condition, that could cause http request
+	    to sporadically fail to complete successfully, when
+	    keep-alive connections are used.</p>
+          <p>
+	    Own Id: OTP-14783</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.4.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Correct the handling of location headers so that the
+	    status code is not hard coded. This should have been
+	    fixed by commit 2cc5ba70cbbc6b3ace81a2a0324417c3b65265bb
+	    but unfortunately was broken during a code refactoring
+	    and unnoticed due to a faulty placed test case.</p>
+          <p>
+	    Own Id: OTP-14761</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.4.3</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index bf2da82603..a73503a5ce 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -171,14 +171,15 @@ request(Method,
 	HTTPOptions, Options, Profile) 
   when (Method =:= options) orelse 
        (Method =:= get) orelse 
+       (Method =:= put) orelse
        (Method =:= head) orelse 
        (Method =:= delete) orelse 
        (Method =:= trace) andalso 
        (is_atom(Profile) orelse is_pid(Profile)) ->
-    case uri_parse(Url, Options) of
-	{error, Reason} ->
+    case uri_string:parse(uri_string:normalize(Url)) of
+	{error, Reason, _} ->
 	    {error, Reason};
-	{ok, ParsedUrl} ->
+	ParsedUrl ->
 	    case header_parse(Headers) of
 		{error, Reason} ->
 		    {error, Reason};
@@ -189,10 +190,10 @@ request(Method,
     end.
 
 do_request(Method, {Url, Headers, ContentType, Body}, HTTPOptions, Options, Profile) ->
-    case uri_parse(Url, Options) of
-	{error, Reason} ->
+    case uri_string:parse(uri_string:normalize(Url)) of
+	{error, Reason, _} ->
 	    {error, Reason};
-	{ok, ParsedUrl} ->
+	ParsedUrl ->
 	    handle_request(Method, Url, 
 			   ParsedUrl, Headers, ContentType, Body, 
 			   HTTPOptions, Options, Profile)
@@ -312,23 +313,28 @@ store_cookies(SetCookieHeaders, Url) ->
 
 store_cookies(SetCookieHeaders, Url, Profile) 
   when is_atom(Profile) orelse is_pid(Profile) ->
-    try 
-	begin
+    case uri_string:parse(uri_string:normalize(Url)) of
+        {error, Bad, _} ->
+            {error, {parse_failed, Bad}};
+        URI ->
+            Scheme = scheme_to_atom(maps:get(scheme, URI, '')),
+            Host = maps:get(host, URI, ""),
+            Port = maps:get(port, URI, default_port(Scheme)),
+            Path = uri_string:recompose(#{path => maps:get(path, URI, "")}),
 	    %% Since the Address part is not actually used
 	    %% by the manager when storing cookies, we dont
 	    %% care about ipv6-host-with-brackets.
-	    {ok, {_, _, Host, Port, Path, _}} = uri_parse(Url),
 	    Address     = {Host, Port}, 
 	    ProfileName = profile_name(Profile),
 	    Cookies     = httpc_cookie:cookies(SetCookieHeaders, Path, Host),
 	    httpc_manager:store_cookies(Cookies, Address, ProfileName), 
 	    ok
-	end
-    catch 
-	error:{badmatch, Bad} ->
-	    {error, {parse_failed, Bad}}
     end.
 
+default_port(http) ->
+    80;
+default_port(https) ->
+    443.
 
 %%--------------------------------------------------------------------------
 %% cookie_header(Url) -> Header | {error, Reason}
@@ -495,7 +501,7 @@ service_info(Pid) ->
 %%% Internal functions
 %%%========================================================================
 handle_request(Method, Url, 
-	       {Scheme, UserInfo, Host, Port, Path, Query}, 
+               URI,
 	       Headers0, ContentType, Body0,
 	       HTTPOptions0, Options0, Profile) ->
 
@@ -520,37 +526,42 @@ handle_request(Method, Url,
 			throw({error, {bad_body, Body0}})
 		end,
 
-	    HTTPOptions   = http_options(HTTPOptions0),
-	    Options       = request_options(Options0), 
-	    Sync          = proplists:get_value(sync,   Options),
-	    Stream        = proplists:get_value(stream, Options),
-	    Host2         = http_request:normalize_host(Scheme, Host, Port),
-	    HeadersRecord = header_record(NewHeaders, Host2, HTTPOptions),
-	    Receiver      = proplists:get_value(receiver, Options),
-	    SocketOpts    = proplists:get_value(socket_opts, Options),
-	    BracketedHost = proplists:get_value(ipv6_host_with_brackets, 
-						Options),
-	    MaybeEscPath  = maybe_encode_uri(HTTPOptions, Path),
-	    MaybeEscQuery = maybe_encode_uri(HTTPOptions, Query),
-	    AbsUri        = maybe_encode_uri(HTTPOptions, Url),
+            HTTPOptions   = http_options(HTTPOptions0),
+            Options       = request_options(Options0),
+            Sync          = proplists:get_value(sync,   Options),
+            Stream        = proplists:get_value(stream, Options),
+            Receiver      = proplists:get_value(receiver, Options),
+            SocketOpts    = proplists:get_value(socket_opts, Options),
+	    UnixSocket    = proplists:get_value(unix_socket, Options),
+            BracketedHost = proplists:get_value(ipv6_host_with_brackets,
+                                                Options),
+
+            Scheme        = scheme_to_atom(maps:get(scheme, URI, '')),
+            Userinfo      = maps:get(userinfo, URI, ""),
+            Host          = http_util:maybe_add_brackets(maps:get(host, URI, ""), BracketedHost),
+            Port          = maps:get(port, URI, default_port(Scheme)),
+            Host2         = http_request:normalize_host(Scheme, Host, Port),
+            Path          = uri_string:recompose(#{path => maps:get(path, URI, "")}),
+            Query         = add_question_mark(maps:get(query, URI, "")),
+            HeadersRecord = header_record(NewHeaders, Host2, HTTPOptions),
 
 	    Request = #request{from          = Receiver,
-			       scheme        = Scheme, 
-			       address       = {host_address(Host, BracketedHost), Port},
-			       path          = MaybeEscPath,
-			       pquery        = MaybeEscQuery,
+			       scheme        = Scheme,
+			       address       = {Host, Port},
+			       path          = Path,
+			       pquery        = Query,
 			       method        = Method,
 			       headers       = HeadersRecord, 
 			       content       = {ContentType, Body},
 			       settings      = HTTPOptions, 
-			       abs_uri       = AbsUri,
-			       userinfo      = UserInfo, 
+			       abs_uri       = Url,
+			       userinfo      = Userinfo,
 			       stream        = Stream, 
 			       headers_as_is = headers_as_is(Headers0, Options),
 			       socket_opts   = SocketOpts, 
 			       started       = Started,
+			       unix_socket   = UnixSocket,
 			       ipv6_host_with_brackets = BracketedHost},
-
 	    case httpc_manager:request(Request, profile_name(Profile)) of
 		{ok, RequestId} ->
 		    handle_answer(RequestId, Sync, Options);
@@ -565,14 +576,31 @@ handle_request(Method, Url,
 	    Error
     end.
 
+
+add_question_mark(<<>>) ->
+    <<>>;
+add_question_mark([]) ->
+    [];
+add_question_mark(Comp) when is_binary(Comp) ->
+    <<$?, Comp/binary>>;
+add_question_mark(Comp) when is_list(Comp) ->
+    [$?|Comp].
+
+
+scheme_to_atom("http") ->
+    http;
+scheme_to_atom("https") ->
+    https;
+scheme_to_atom('') ->
+    '';
+scheme_to_atom(Scheme) ->
+    throw({error, {bad_scheme, Scheme}}).
+
+
 ensure_chunked_encoding(Hdrs) ->
     Key = "transfer-encoding",
     lists:keystore(Key, 1, Hdrs, {Key, "chunked"}).
 
-maybe_encode_uri(#http_options{url_encode = true}, URI) ->
-    http_uri:encode(URI);
-maybe_encode_uri(_, URI) ->
-    URI.
 
 mk_chunkify_fun(ProcessBody) ->
     fun(eof_body) ->
@@ -798,7 +826,7 @@ request_options_defaults() ->
 		error
 	end,
 
-    VerifyBrackets = VerifyBoolean, 
+    VerifyBrackets = VerifyBoolean,
 
     [
      {sync,                    true,      VerifySync}, 
@@ -869,11 +897,36 @@ request_options_sanity_check(Opts) ->
     end,
     ok.
 
-validate_options(Options) ->
-    (catch validate_options(Options, [])).
-
-validate_options([], ValidateOptions) ->
-    {ok, lists:reverse(ValidateOptions)};
+validate_ipfamily_unix_socket(Options0) ->
+    IpFamily = proplists:get_value(ipfamily, Options0, inet),
+    UnixSocket = proplists:get_value(unix_socket, Options0, undefined),
+    Options1 = proplists:delete(ipfamily, Options0),
+    Options2 = proplists:delete(ipfamily, Options1),
+    validate_ipfamily_unix_socket(IpFamily, UnixSocket, Options2,
+                                  [{ipfamily, IpFamily}, {unix_socket, UnixSocket}]).
+%%
+validate_ipfamily_unix_socket(local, undefined, _Options, _Acc) ->
+    bad_option(unix_socket, undefined);
+validate_ipfamily_unix_socket(IpFamily, UnixSocket, _Options, _Acc)
+  when IpFamily =/= local, UnixSocket =/= undefined ->
+    bad_option(ipfamily, IpFamily);
+validate_ipfamily_unix_socket(IpFamily, UnixSocket, Options, Acc) ->
+    validate_ipfamily(IpFamily),
+    validate_unix_socket(UnixSocket),
+    {Options, Acc}.
+
+
+validate_options(Options0) ->
+    try
+        {Options, Acc} = validate_ipfamily_unix_socket(Options0),
+        validate_options(Options, Acc)
+    catch
+        error:Reason ->
+            {error, Reason}
+    end.
+%%
+validate_options([], ValidOptions) ->
+    {ok, lists:reverse(ValidOptions)};
 
 validate_options([{proxy, Proxy} = Opt| Tail], Acc) ->
     validate_proxy(Proxy),
@@ -933,6 +986,10 @@ validate_options([{verbose, Value} = Opt| Tail], Acc) ->
     validate_verbose(Value), 
     validate_options(Tail, [Opt | Acc]);
 
+validate_options([{unix_socket, Value} = Opt| Tail], Acc) ->
+    validate_unix_socket(Value),
+    validate_options(Tail, [Opt | Acc]);
+
 validate_options([{_, _} = Opt| _], _Acc) ->
     {error, {not_an_option, Opt}}.
 
@@ -1001,7 +1058,8 @@ validate_ipv6(BadValue) ->
     bad_option(ipv6, BadValue).
 
 validate_ipfamily(Value) 
-  when (Value =:= inet) orelse (Value =:= inet6) orelse (Value =:= inet6fb4) ->
+  when (Value =:= inet) orelse (Value =:= inet6) orelse
+       (Value =:= inet6fb4) orelse (Value =:= local) ->
     Value;
 validate_ipfamily(BadValue) ->
     bad_option(ipfamily, BadValue).
@@ -1031,6 +1089,15 @@ validate_verbose(Value)
 validate_verbose(BadValue) ->
     bad_option(verbose, BadValue).
 
+validate_unix_socket(Value)
+  when (Value =:= undefined) ->
+    Value;
+validate_unix_socket(Value)
+  when is_list(Value) andalso length(Value) > 0 ->
+    Value;
+validate_unix_socket(BadValue) ->
+    bad_option(unix_socket, BadValue).
+
 bad_option(Option, BadValue) ->
     throw({error, {bad_option, Option, BadValue}}).
 
@@ -1190,17 +1257,6 @@ validate_headers(RequestHeaders, _, _) ->
 %% These functions is just simple wrappers to parse specifically HTTP URIs
 %%--------------------------------------------------------------------------
 
-scheme_defaults() ->
-    [{http, 80}, {https, 443}].
-
-uri_parse(URI) ->
-    http_uri:parse(URI, [{scheme_defaults, scheme_defaults()}]).
-
-uri_parse(URI, Opts) ->
-    http_uri:parse(URI, [{scheme_defaults, scheme_defaults()} | Opts]).
-
-
-%%--------------------------------------------------------------------------
 header_parse([]) ->
     ok;
 header_parse([{Field, Value}|T]) when is_list(Field), is_list(Value) ->    
@@ -1221,10 +1277,6 @@ child_name(Pid, [{Name, Pid} | _]) ->
 child_name(Pid, [_ | Children]) ->
     child_name(Pid, Children).
 
-host_address(Host, false) ->
-    Host;
-host_address(Host, true) ->
-    string:strip(string:strip(Host, right, $]), left, $[).
 
 check_body_gen({Fun, _}) when is_function(Fun) -> 
     ok;
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 6907bf5262..9b09832eb8 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -109,7 +109,7 @@ start_link(Parent, Request, Options, ProfileName) ->
 %% to be called by the httpc manager process.
 %%--------------------------------------------------------------------
 send(Request, Pid) ->
-    call(Request, Pid, 5000).
+    call(Request, Pid).
 
 
 %%--------------------------------------------------------------------
@@ -711,13 +711,17 @@ do_handle_info({'EXIT', _, _}, State = #state{request = undefined}) ->
 %% can retry requests in the pipeline.
 do_handle_info({'EXIT', _, _}, State) ->
     {noreply, State#state{status = close}}.
-    
 
 call(Msg, Pid) ->
-    call(Msg, Pid, infinity).
-
-call(Msg, Pid, Timeout) ->
-    gen_server:call(Pid, Msg, Timeout).
+    try gen_server:call(Pid, Msg, infinity)
+    catch
+ 	exit:{noproc, _} ->
+ 	    {error, closed};
+	exit:{normal, _} ->
+	    {error, closed};
+	exit:{{shutdown, _},_} ->
+	    {error, closed}
+    end.
 
 cast(Msg, Pid) ->
     gen_server:cast(Pid, Msg).
@@ -750,6 +754,7 @@ connect(SocketType, ToAddress,
         #options{ipfamily    = IpFamily,
                  ip          = FromAddress,
                  port        = FromPort,
+                 unix_socket = UnixSocket,
                  socket_opts = Opts0}, Timeout) ->
     Opts1 = 
         case FromPort of
@@ -785,6 +790,16 @@ connect(SocketType, ToAddress,
                 OK ->
                     OK
             end;
+        local ->
+            Opts3 = [IpFamily | Opts2],
+            SocketAddr = {local, UnixSocket},
+            case http_transport:connect(SocketType, {SocketAddr, 0}, Opts3, Timeout) of
+                {error, Reason} ->
+                    {error, {failed_connect, [{to_address, SocketAddr},
+                                              {IpFamily, Opts3, Reason}]}};
+                Else ->
+                    Else
+            end;
         _ ->
             Opts3 = [IpFamily | Opts2], 
             case http_transport:connect(SocketType, ToAddress, Opts3, Timeout) of
@@ -796,9 +811,23 @@ connect(SocketType, ToAddress,
             end
     end.
 
-connect_and_send_first_request(Address, Request, #state{options = Options} = State) ->
+handle_unix_socket_options(#request{unix_socket = UnixSocket}, Options)
+  when UnixSocket =:= undefined ->
+    Options;
+
+handle_unix_socket_options(#request{unix_socket = UnixSocket},
+                           Options = #options{ipfamily = IpFamily}) ->
+    case IpFamily of
+        local ->
+            Options#options{unix_socket = UnixSocket};
+        Else ->
+            error({badarg, [{ipfamily, Else}, {unix_socket, UnixSocket}]})
+    end.
+
+connect_and_send_first_request(Address, Request, #state{options = Options0} = State) ->
     SocketType  = socket_type(Request),
     ConnTimeout = (Request#request.settings)#http_options.connect_timeout,
+    Options = handle_unix_socket_options(Request, Options0),
     case connect(SocketType, Address, Options, ConnTimeout) of
         {ok, Socket} ->
             ClientClose =
@@ -837,9 +866,10 @@ connect_and_send_first_request(Address, Request, #state{options = Options} = Sta
             {ok, State#state{request = Request}}
     end.
 
-connect_and_send_upgrade_request(Address, Request, #state{options = Options} = State) ->
+connect_and_send_upgrade_request(Address, Request, #state{options = Options0} = State) ->
     ConnTimeout = (Request#request.settings)#http_options.connect_timeout,
     SocketType = ip_comm,
+    Options = handle_unix_socket_options(Request, Options0),
     case connect(SocketType, Address, Options, ConnTimeout) of
         {ok, Socket} ->
 	    SessionType = httpc_manager:session_type(Options),
@@ -1681,9 +1711,8 @@ update_session(ProfileName, #session{id = SessionId} = Session, Pos, Value) ->
 	    insert_session(Session2, ProfileName);
 	error:badarg ->
 	    {stop, normal};
-	T:E -> 
+	T:E:Stacktrace -> 
 	    %% Unexpected this must be an error!  
-            Stacktrace = erlang:get_stacktrace(),
             error_logger:error_msg("Failed updating session: "
                                    "~n   ProfileName: ~p"
                                    "~n   SessionId:   ~p"
diff --git a/lib/inets/src/http_client/httpc_internal.hrl b/lib/inets/src/http_client/httpc_internal.hrl
index 5f8c70f28d..c5fe439722 100644
--- a/lib/inets/src/http_client/httpc_internal.hrl
+++ b/lib/inets/src/http_client/httpc_internal.hrl
@@ -83,10 +83,11 @@
 	 max_sessions          = ?HTTP_MAX_TCP_SESSIONS,
 	 cookies               = disabled, % enabled | disabled | verify
 	 verbose               = false,   % boolean(),
-	 ipfamily              = inet,    % inet | inet6 | inet6fb4
+	 ipfamily              = inet,    % inet | inet6 | inet6fb4 | local
 	 ip                    = default, % specify local interface
 	 port                  = default, % specify local port
-	 socket_opts           = []       % other socket options
+	 socket_opts           = [],      % other socket options
+	 unix_socket           = undefined % Local unix socket
 	}
        ).
 -type options() :: #options{}.
@@ -115,6 +116,7 @@
 			 % request
 	  timer         :: undefined | reference(),
 	  socket_opts,   % undefined | [socket_option()]
+	  unix_socket,   % undefined | string()
 	  ipv6_host_with_brackets % boolean()
 	}
        ).
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl
index a63864493f..7b8d7875de 100644
--- a/lib/inets/src/http_client/httpc_manager.erl
+++ b/lib/inets/src/http_client/httpc_manager.erl
@@ -553,7 +553,8 @@ handle_cast({set_options, Options}, State = #state{options = OldOptions}) ->
 		 ip                    = get_ip(Options, OldOptions),
 		 port                  = get_port(Options, OldOptions),
 		 verbose               = get_verbose(Options, OldOptions),
-		 socket_opts           = get_socket_opts(Options, OldOptions)
+		 socket_opts           = get_socket_opts(Options, OldOptions),
+		 unix_socket           = get_unix_socket_opts(Options, OldOptions)
 		}, 
     case {OldOptions#options.verbose, NewOptions#options.verbose} of
 	{Same, Same} ->
@@ -849,11 +850,11 @@ pipeline_or_keep_alive(#request{id   = Id,
 				from = From} = Request, 
 		       HandlerPid, 
 		       #state{handler_db = HandlerDb} = State) ->
-    case (catch httpc_handler:send(Request, HandlerPid)) of
+    case httpc_handler:send(Request, HandlerPid) of
 	ok ->
 	    HandlerInfo = {Id, HandlerPid, From}, 
 	    ets:insert(HandlerDb, HandlerInfo);
-	_  -> % timeout pipelining failed
+	{error, closed}  -> % timeout pipelining failed
 	    start_handler(Request, State)
     end.
 
@@ -963,7 +964,10 @@ get_option(ip, #options{ip = IP}) ->
 get_option(port, #options{port = Port}) ->
     Port;
 get_option(socket_opts, #options{socket_opts = SocketOpts}) ->
-    SocketOpts.
+    SocketOpts;
+get_option(unix_socket, #options{unix_socket = UnixSocket}) ->
+    UnixSocket.
+
 
 get_proxy(Opts, #options{proxy = Default}) ->
     proplists:get_value(proxy, Opts, Default).
@@ -1016,6 +1020,8 @@ get_verbose(Opts, #options{verbose = Default}) ->
 get_socket_opts(Opts, #options{socket_opts = Default}) ->
     proplists:get_value(socket_opts, Opts, Default).
 
+get_unix_socket_opts(Opts, #options{unix_socket = Default}) ->
+    proplists:get_value(unix_socket, Opts, Default).
 
 handle_verbose(debug) ->
     dbg:p(self(), [call]),
diff --git a/lib/inets/src/http_client/httpc_response.erl b/lib/inets/src/http_client/httpc_response.erl
index 91638f5d2e..58ab9144df 100644
--- a/lib/inets/src/http_client/httpc_response.erl
+++ b/lib/inets/src/http_client/httpc_response.erl
@@ -190,7 +190,7 @@ parse_status_code(<<?CR, ?LF, Rest/binary>>, StatusCodeStr,
 		  MaxHeaderSize, Result, true) ->
     parse_headers(Rest, [], [], MaxHeaderSize,
  		  [" ", list_to_integer(lists:reverse(
-				     string:strip(StatusCodeStr))) 
+                                          string:trim(StatusCodeStr)))
 		   | Result], true); 
 
 parse_status_code(<<?SP, Rest/binary>>, StatusCodeStr, 
@@ -377,58 +377,173 @@ status_server_error_50x(Response, Request) ->
     {stop, {Request#request.id, Msg}}.
 
 
-redirect(Response = {StatusLine, Headers, Body}, Request) ->
+redirect(Response = {_, Headers, _}, Request) ->
     {_, Data} =  format_response(Response),
     case Headers#http_response_h.location of
-	undefined ->
-	    transparent(Response, Request);
-	RedirUrl ->
-	    UrlParseOpts = [{ipv6_host_with_brackets, 
-			     Request#request.ipv6_host_with_brackets}], 
-	    case uri_parse(RedirUrl, UrlParseOpts) of
-		{error, no_scheme} when
-		(Request#request.settings)#http_options.relaxed ->
-		    NewLocation = fix_relative_uri(Request, RedirUrl),
-		    redirect({StatusLine, Headers#http_response_h{
-					    location = NewLocation},
-			      Body}, Request);
-		{error, Reason} ->
-		    {ok, error(Request, Reason), Data};
-		%% Automatic redirection
-		{ok, {Scheme, _, Host, Port, Path,  Query}} -> 
-		    HostPort = http_request:normalize_host(Scheme, Host, Port),
-		    NewHeaders = 
-			(Request#request.headers)#http_request_h{host = HostPort},
-		    NewRequest = 
-			Request#request{redircount = 
-					Request#request.redircount+1,
-					scheme = Scheme,
-					headers = NewHeaders,
-					address = {Host,Port},
-					path = Path,
-					pquery = Query,
-					abs_uri =
-					atom_to_list(Scheme) ++ "://" ++
-                                        Host ++ ":" ++ 
-					integer_to_list(Port) ++
-					Path ++ Query},
-		    {redirect, NewRequest, Data}
-	    end
+        undefined ->
+            transparent(Response, Request);
+        RedirUrl ->
+            Brackets = Request#request.ipv6_host_with_brackets,
+            case uri_string:parse(RedirUrl) of
+                {error, Reason, _} ->
+                    {ok, error(Request, Reason), Data};
+                %% Automatic redirection
+                URI ->
+                    {Host, Port0} = Request#request.address,
+                    Port = maybe_to_integer(Port0),
+                    Path = Request#request.path,
+                    Scheme = atom_to_list(Request#request.scheme),
+                    Query = Request#request.pquery,
+                    URIMap = resolve_uri(Scheme, Host, Port, Path, Query, URI),
+                    TScheme = list_to_atom(maps:get(scheme, URIMap)),
+                    THost = http_util:maybe_add_brackets(maps:get(host, URIMap), Brackets),
+                    TPort = maps:get(port, URIMap),
+                    TPath = maps:get(path, URIMap),
+                    TQuery = maps:get(query, URIMap, ""),
+                    NewURI = uri_string:normalize(
+                               uri_string:recompose(URIMap)),
+                    HostPort = http_request:normalize_host(TScheme, THost, TPort),
+                    NewHeaders =
+                        (Request#request.headers)#http_request_h{host = HostPort},
+                    NewRequest =
+                        Request#request{redircount =
+                                            Request#request.redircount+1,
+                                        scheme = TScheme,
+                                        headers = NewHeaders,
+                                        address = {THost,TPort},
+                                        path = TPath,
+                                        pquery = TQuery,
+                                        abs_uri = NewURI},
+                    {redirect, NewRequest, Data}
+            end
+    end.
+
+
+%% RFC3986 - 5.2.2.  Transform References
+resolve_uri(Scheme, Host, Port, Path, Query, URI) ->
+    resolve_uri(Scheme, Host, Port, Path, Query, URI, #{}).
+%%
+resolve_uri(Scheme, Host, Port, Path, Query, URI, Map0) ->
+    case maps:is_key(scheme, URI) of
+        true ->
+            Port = get_port(URI),
+            maybe_add_query(
+              Map0#{scheme => maps:get(scheme, URI),
+                   host => maps:get(host, URI),
+                   port => Port,
+                   path => maps:get(path, URI)},
+              URI);
+        false ->
+            Map = Map0#{scheme => Scheme},
+            resolve_authority(Host, Port, Path, Query, URI, Map)
+    end.
+
+
+get_port(URI) ->
+    Scheme = maps:get(scheme, URI),
+    case maps:get(port, URI, undefined) of
+        undefined ->
+            get_default_port(Scheme);
+        Port ->
+            Port
+    end.
+
+
+get_default_port("http") ->
+    80;
+get_default_port("https") ->
+    443.
+
+
+resolve_authority(Host, Port, Path, Query, RelURI, Map) ->
+    case maps:is_key(host, RelURI) of
+        true ->
+            Port = get_port(RelURI),
+            maybe_add_query(
+              Map#{host => maps:get(host, RelURI),
+                   port => Port,
+                   path => maps:get(path, RelURI)},
+              RelURI);
+        false ->
+            Map1 = Map#{host => Host,
+                    port => Port},
+            resolve_path(Path, Query, RelURI, Map1)
+    end.
+
+
+maybe_add_query(Map, RelURI) ->
+     case maps:is_key(query, RelURI) of
+         true ->
+             Map#{query => maps:get(query, RelURI)};
+         false ->
+             Map
+         end.
+
+
+resolve_path(Path, Query, RelURI, Map) ->
+    case maps:is_key(path, RelURI) of
+        true ->
+            Path1 = calculate_path(Path,  maps:get(path, RelURI)),
+            maybe_add_query(
+              Map#{path => Path1},
+              RelURI);
+        false ->
+            Map1 = Map#{path => Path},
+            resolve_query(Query, RelURI, Map1)
+    end.
+
+
+calculate_path(BaseP, RelP) ->
+    case starts_with_slash(RelP) of
+        true ->
+            RelP;
+        false ->
+            merge_paths(BaseP, RelP)
+    end.
+
+
+starts_with_slash([$/|_]) ->
+    true;
+starts_with_slash(<<$/,_/binary>>) ->
+    true;
+starts_with_slash(_) ->
+    false.
+
+
+%% RFC3986 - 5.2.3.  Merge Paths
+merge_paths("", RelP) ->
+    [$/|RelP];
+merge_paths(BaseP, RelP) when is_list(BaseP) ->
+    do_merge_paths(lists:reverse(BaseP), RelP);
+merge_paths(BaseP, RelP) when is_binary(BaseP) ->
+    B = binary_to_list(BaseP),
+    R = binary_to_list(RelP),
+    Res = merge_paths(B, R),
+    list_to_binary(Res).
+
+
+do_merge_paths([$/|_] = L, RelP) ->
+    lists:reverse(L) ++ RelP;
+do_merge_paths([_|T], RelP) ->
+    do_merge_paths(T, RelP).
+
+
+resolve_query(Query, RelURI, Map) ->
+    case maps:is_key(query, RelURI) of
+        true ->
+            Map#{query => maps:get(query, RelURI)};
+        false ->
+            Map#{query => Query}
     end.
 
-maybe_to_list(Port) when is_integer(Port) ->
-    integer_to_list(Port);
-maybe_to_list(Port) when is_list(Port) ->
+
+maybe_to_integer(Port) when is_list(Port) ->
+    {Port1, _} = string:to_integer(Port),
+    Port1;
+maybe_to_integer(Port) when is_integer(Port) ->
     Port.
 
-%%% Guessing that we received a relative URI, fix it to become an absoluteURI
-fix_relative_uri(Request, RedirUrl) ->
-    {Server, Port0} = Request#request.address,
-    Port = maybe_to_list(Port0),
-    Path = Request#request.path,
-    atom_to_list(Request#request.scheme) ++ "://" ++ Server ++ ":" ++ Port
-	++ Path ++ RedirUrl.
-    
+
 error(#request{id = Id}, Reason) ->
     {Id, {error, Reason}}.
 
@@ -478,18 +593,3 @@ format_response({StatusLine, Headers, Body}) ->
 		{Body, <<>>}
 	end,
     {{StatusLine, http_response:header_list(Headers), NewBody}, Data}.
-
-%%--------------------------------------------------------------------------
-%% These functions is just simple wrappers to parse specifically HTTP URIs
-%%--------------------------------------------------------------------------
-
-scheme_defaults() ->
-    [{http, 80}, {https, 443}].
-
-uri_parse(URI, Opts) ->
-    http_uri:parse(URI, [{scheme_defaults, scheme_defaults()} | Opts]).
-
-
-%%--------------------------------------------------------------------------
-
-
diff --git a/lib/inets/src/http_lib/http_uri.erl b/lib/inets/src/http_lib/http_uri.erl
index 7f1ca02014..d02913121c 100644
--- a/lib/inets/src/http_lib/http_uri.erl
+++ b/lib/inets/src/http_lib/http_uri.erl
@@ -61,19 +61,35 @@
 	 scheme_defaults/0, 
 	 encode/1, decode/1]).
 
--export_type([scheme/0, default_scheme_port_number/0]).
+-export_type([uri/0,
+              user_info/0,
+              scheme/0, default_scheme_port_number/0,
+              host/0,
+              path/0,
+              query/0,
+              fragment/0]).
 
+-type uri() :: string() | binary().
+-type user_info() :: string() | binary().
+-type scheme() :: atom().
+-type host() :: string() | binary().
+-type path() :: string() | binary().
+-type query() :: string() | binary().
+-type fragment() :: string() | binary().
+-type port_number() :: inet:port_number().
+-type default_scheme_port_number() :: port_number().
+-type hex_uri() :: string() | binary(). %% Hexadecimal encoded URI.
+-type maybe_hex_uri() :: string() | binary(). %% A possibly hexadecimal encoded URI.
+
+-type scheme_defaults() :: [{scheme(), default_scheme_port_number()}].
+-type scheme_validation_fun() :: fun((SchemeStr :: string() | binary()) ->
+                                            valid | {error, Reason :: term()}).
 
 %%%=========================================================================
 %%%  API
 %%%=========================================================================
 
--type scheme() :: atom().
--type default_scheme_port_number() :: pos_integer().
-
--spec scheme_defaults() ->
-    [{scheme(), default_scheme_port_number()}].
-
+-spec scheme_defaults() -> scheme_defaults().
 scheme_defaults() ->
     [{http,  80}, 
      {https, 443}, 
@@ -82,9 +98,20 @@ scheme_defaults() ->
      {sftp,  22}, 
      {tftp,  69}].
 
+-type parse_result() ::
+        {scheme(), user_info(), host(), port_number(), path(), query()} |
+        {scheme(), user_info(), host(), port_number(), path(), query(),
+         fragment()}.
+
+-spec parse(uri()) -> {ok, parse_result()} | {error, term()}.
 parse(AbsURI) ->
     parse(AbsURI, []).
 
+-spec parse(uri(), [Option]) -> {ok, parse_result()} | {error, term()} when
+      Option :: {ipv6_host_with_brackets, boolean()} |
+                {scheme_defaults, scheme_defaults()} |
+                {fragment, boolean()} |
+                {scheme_validation_fun, scheme_validation_fun() | none}.
 parse(AbsURI, Opts) ->
     case parse_scheme(AbsURI, Opts) of
 	{error, Reason} ->
@@ -105,6 +132,7 @@ reserved() ->
             $#, $[, $], $<, $>, $\", ${, $}, $|, %"
 			       $\\, $', $^, $%, $ ]).
 
+-spec encode(uri()) -> hex_uri().
 encode(URI) when is_list(URI) ->
     Reserved = reserved(), 
     lists:append([uri_encode(Char, Reserved) || Char <- URI]);
@@ -112,6 +140,7 @@ encode(URI) when is_binary(URI) ->
     Reserved = reserved(),
     << <<(uri_encode_binary(Char, Reserved))/binary>> || <<Char>> <= URI >>.
 
+-spec decode(maybe_hex_uri()) -> uri().
 decode(String) when is_list(String) ->
     do_decode(String);
 decode(String) when is_binary(String) ->
diff --git a/lib/inets/src/http_lib/http_util.erl b/lib/inets/src/http_lib/http_util.erl
index 487d04f7aa..5577b00cc8 100644
--- a/lib/inets/src/http_lib/http_util.erl
+++ b/lib/inets/src/http_lib/http_util.erl
@@ -27,7 +27,8 @@
 	 convert_month/1, 
 	 is_hostname/1,
 	 timestamp/0, timeout/2,
-	 html_encode/1
+	 html_encode/1,
+	 maybe_add_brackets/2
 	]).
 
 
@@ -194,6 +195,24 @@ html_encode(Chars) ->
     lists:append([char_to_html_entity(Char, Reserved) || Char <- Chars]).
 
 
+maybe_add_brackets(Addr, false) ->
+    Addr;
+maybe_add_brackets(Addr, true) when is_list(Addr) ->
+    case is_ipv6_address(Addr) of
+        true ->
+            [$[|Addr] ++ "]";
+        false ->
+            Addr
+    end;
+maybe_add_brackets(Addr, true) when is_binary(Addr) ->
+    case is_ipv6_address(Addr) of
+        true ->
+            <<$[,Addr/binary,$]>>;
+        false ->
+            Addr
+    end.
+
+
 %%%========================================================================
 %%% Internal functions
 %%%========================================================================
@@ -205,3 +224,14 @@ char_to_html_entity(Char, Reserved) ->
 	false ->
 	    [Char]
     end.
+
+is_ipv6_address(Addr) when is_binary(Addr) ->
+    B = binary_to_list(Addr),
+    is_ipv6_address(B);
+is_ipv6_address(Addr) when is_list(Addr) ->
+    case inet:parse_ipv6strict_address(Addr) of
+        {ok, _ } ->
+            true;
+        {error, _} ->
+            false
+    end.
diff --git a/lib/inets/src/http_server/httpd_esi.erl b/lib/inets/src/http_server/httpd_esi.erl
index fd50934d00..f5493f6fad 100644
--- a/lib/inets/src/http_server/httpd_esi.erl
+++ b/lib/inets/src/http_server/httpd_esi.erl
@@ -86,7 +86,7 @@ handle_headers([], NewHeaders, StatusCode, _) ->
 handle_headers([Header | Headers], NewHeaders, StatusCode, NoESIStatus) -> 
     {FieldName, FieldValue} = httpd_response:split_header(Header, []),
     case FieldName of
-	"location" ->
+	"location" when NoESIStatus == true ->
             handle_headers(Headers, 
                            [{FieldName, FieldValue} | NewHeaders], 
                            302, NoESIStatus);
diff --git a/lib/inets/src/http_server/httpd_example.erl b/lib/inets/src/http_server/httpd_example.erl
index adbbf64685..47a8c48d01 100644
--- a/lib/inets/src/http_server/httpd_example.erl
+++ b/lib/inets/src/http_server/httpd_example.erl
@@ -91,7 +91,7 @@ yahoo(_Env,_Input) ->
   "Location: http://www.yahoo.com\r\n\r\n".
 
 new_status_and_location(_Env,_Input) ->
-  "status:201\r\n Location: http://www.yahoo.com\r\n\r\n".
+  "status:201 Created\r\n Location: http://www.yahoo.com\r\n\r\n".
 
 default(Env,Input) ->
   [header(),
diff --git a/lib/inets/src/http_server/httpd_response.erl b/lib/inets/src/http_server/httpd_response.erl
index 6b9053fda6..57ce162922 100644
--- a/lib/inets/src/http_server/httpd_response.erl
+++ b/lib/inets/src/http_server/httpd_response.erl
@@ -84,14 +84,14 @@ traverse_modules(ModData,[Module|Rest]) ->
 	{proceed, NewData} ->
             traverse_modules(ModData#mod{data = NewData}, Rest)
     catch 
-	T:E ->
+	T:E:Stacktrace ->
 	    String = 
 		lists:flatten(
 		  io_lib:format("module traverse failed: ~p:do => "
 				"~n   Error Type:  ~p"
 				"~n   Error:       ~p"
 				"~n   Stack trace: ~p",
-				[Module, T, E, ?STACK()])),
+				[Module, T, E, Stacktrace])),
 	    httpd_util:error_log(ModData#mod.config_db, String),
 	    send_status(ModData, 500, none),
 	    done
diff --git a/lib/inets/src/inets_app/inets_internal.hrl b/lib/inets/src/inets_app/inets_internal.hrl
index 079b415b56..e0f59bba5f 100644
--- a/lib/inets/src/inets_app/inets_internal.hrl
+++ b/lib/inets/src/inets_app/inets_internal.hrl
@@ -22,8 +22,6 @@
 -ifndef(inets_internal_hrl).
 -define(inets_internal_hrl, true).
 
--define(STACK(), erlang:get_stacktrace()).
-
 %% Various trace macros
 
 -define(report(Severity, Label, Service, Content), 
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile
index ffc512050a..99a7e6a9db 100644
--- a/lib/inets/test/Makefile
+++ b/lib/inets/test/Makefile
@@ -150,6 +150,7 @@ INETS_ROOT = ../../inets
 MODULES =                 		\
 	inets_test_lib    		\
 	erl_make_certs                  \
+	make_certs                      \
 	ftp_SUITE 	  		\
 	ftp_format_SUITE  		\
 	http_format_SUITE 		\
@@ -157,10 +158,10 @@ MODULES =                 		\
 	httpc_cookie_SUITE		\
 	httpc_proxy_SUITE		\
 	httpd_SUITE       		\
-	old_httpd_SUITE       		\
+	httpd_bench_SUITE               \
+	http_test_lib    		\
 	httpd_basic_SUITE		\
 	httpd_mod 	  		\
-	httpd_block	  		\
 	httpd_load        		\
 	httpd_time_test	  		\
 	httpd_1_1         		\
@@ -189,7 +190,7 @@ SOURCE = $(ERL_FILES) $(HRL_FILES)
 
 TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
-INETS_SPECS = inets.spec
+INETS_SPECS = inets.spec inets_bench.spec
 COVER_FILE = inets.cover
 INETS_FILES = inets.config $(INETS_SPECS)
 
@@ -200,8 +201,10 @@ INETS_FILES = inets.config $(INETS_SPECS)
 # 	inets_ftp_suite \
 # 	inets_tftp_suite
 
+
 INETS_DATADIRS = inets_SUITE_data inets_socketwrap_SUITE_data
-HTTPD_DATADIRS = httpd_test_data httpd_SUITE_data httpd_basic_SUITE_data old_httpd_SUITE_data
+HTTPD_DATADIRS = httpd_test_data httpd_SUITE_data httpd_basic_SUITE_data old_httpd_SUITE_data httpd_bench_SUITE_data
+
 HTTPC_DATADIRS = httpc_SUITE_data httpc_proxy_SUITE_data
 FTP_DATADIRS   = ftp_SUITE_data  
 
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index 9a13ed3d17..647eff4f7c 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -536,7 +536,10 @@ esi_parse_headers(Config) when is_list(Config) ->
 	httpd_esi:handle_headers(Headers2),
     
    {ok,[{"location","/foo/bar.html"}], 302} = 
-	httpd_esi:handle_headers("location:/foo/bar.html\r\n").
+	httpd_esi:handle_headers("location:/foo/bar.html\r\n"),
+    
+    {ok,[{"location","http://foo/bar.html"}],201} =
+        httpd_esi:handle_headers("status:201 Created\r\nlocation:http://foo/bar.html\r\n").
 
 %%--------------------------------------------------------------------
 cgi_parse_headers() ->
diff --git a/lib/inets/test/http_test_lib.erl b/lib/inets/test/http_test_lib.erl
new file mode 100644
index 0000000000..4e119cce04
--- /dev/null
+++ b/lib/inets/test/http_test_lib.erl
@@ -0,0 +1,199 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% 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.
+%% 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(http_test_lib).
+
+-include_lib("common_test/include/ct.hrl").
+-include("inets_test_lib.hrl").
+-include("http_internal.hrl").
+-include("httpc_internal.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+dummy_server(SocketType, Inet, Extra) ->
+    dummy_server(self(), SocketType, Inet, Extra).
+
+dummy_server(Caller, SocketType, Inet, Extra) ->
+    Args = [Caller, SocketType, Inet, Extra],
+    Pid = spawn(?MODULE, dummy_server_init, Args),
+    receive
+	{port, Port} ->
+	    {Pid, Port}
+    end.
+
+dummy_server_init(Caller, ip_comm, Inet, Extra) ->
+    ContentCb = proplists:get_value(content_cb, Extra),
+    BaseOpts = [binary, {packet, 0}, {reuseaddr,true}, {active, false}, {nodelay, true}], 
+    Conf = proplists:get_value(conf, Extra),
+    {ok, ListenSocket} = gen_tcp:listen(0, [Inet | BaseOpts]),
+    {ok, Port} = inet:port(ListenSocket),
+    Caller ! {port, Port},
+    dummy_ipcomm_server_loop({httpd_request, parse, [[{max_uri,    ?HTTP_MAX_URI_SIZE},
+						      {max_header, ?HTTP_MAX_HEADER_SIZE},
+						      {max_version,?HTTP_MAX_VERSION_STRING}, 
+						      {max_method, ?HTTP_MAX_METHOD_STRING},
+						      {max_content_length, ?HTTP_MAX_CONTENT_LENGTH},
+						      {customize, httpd_custom}
+						     ]]},
+			     [], ContentCb, Conf, ListenSocket);
+
+dummy_server_init(Caller, unix_socket, Inet, Extra) ->
+    ContentCb = proplists:get_value(content_cb, Extra),
+    UnixSocket = proplists:get_value(unix_socket, Extra),
+    SocketAddr = {local, UnixSocket},
+    BaseOpts = [binary, {packet, 0}, {reuseaddr,true}, {active, false}, {nodelay, true},
+               {ifaddr, SocketAddr}],
+    Conf = proplists:get_value(conf, Extra),
+    {ok, ListenSocket} = gen_tcp:listen(0, [Inet | BaseOpts]),
+    {ok, Port} = inet:port(ListenSocket),
+    Caller ! {port, Port},
+    dummy_ipcomm_server_loop({httpd_request, parse, [[{max_uri,    ?HTTP_MAX_URI_SIZE},
+						      {max_header, ?HTTP_MAX_HEADER_SIZE},
+						      {max_version,?HTTP_MAX_VERSION_STRING},
+						      {max_method, ?HTTP_MAX_METHOD_STRING},
+						      {max_content_length, ?HTTP_MAX_CONTENT_LENGTH},
+						      {customize, httpd_custom}
+						     ]]},
+			     [], ContentCb, Conf, ListenSocket);
+
+dummy_server_init(Caller, ssl, Inet, Extra) ->
+    ContentCb = proplists:get_value(content_cb, Extra),
+    SSLOptions = proplists:get_value(ssl, Extra),
+    Conf = proplists:get_value(conf, Extra),
+    BaseOpts = [binary, {reuseaddr,true}, {active, false}, {nodelay, true} |
+	        SSLOptions], 
+    dummy_ssl_server_init(Caller, BaseOpts, Inet, ContentCb, Conf).
+
+dummy_ssl_server_init(Caller, BaseOpts, Inet, ContentCb, Conf) ->
+    {ok, ListenSocket} = ssl:listen(0, [Inet | BaseOpts]),
+    {ok, {_, Port}} = ssl:sockname(ListenSocket),
+    Caller ! {port, Port},
+    dummy_ssl_server_loop({httpd_request, parse, [[{max_uri,    ?HTTP_MAX_URI_SIZE},
+						   {max_method, ?HTTP_MAX_METHOD_STRING},
+						   {max_version,?HTTP_MAX_VERSION_STRING}, 
+						   {max_method, ?HTTP_MAX_METHOD_STRING},
+						   {max_content_length, ?HTTP_MAX_CONTENT_LENGTH},
+						   {customize, httpd_custom}
+						  ]]},
+			  [], ContentCb, Conf, ListenSocket).
+
+dummy_ipcomm_server_loop(MFA, Handlers, ContentCb, Conf, ListenSocket) ->
+    receive
+	stop ->
+	    lists:foreach(fun(Handler) -> Handler ! stop end, Handlers);
+	{stop, From} ->
+	    Stopper = fun(Handler) -> Handler ! stop end, 
+	    lists:foreach(Stopper, Handlers),
+	    From ! {stopped, self()}
+    after 0 ->
+	    {ok, Socket} = gen_tcp:accept(ListenSocket),
+	    HandlerPid  = dummy_request_handler(MFA, Socket, ContentCb, Conf),
+	    gen_tcp:controlling_process(Socket, HandlerPid),
+	    HandlerPid ! ipcomm_controller,
+	    dummy_ipcomm_server_loop(MFA, [HandlerPid | Handlers],
+				     ContentCb, Conf, ListenSocket)
+    end.
+
+dummy_ssl_server_loop(MFA, Handlers, ContentCb, Conf, ListenSocket) ->
+    receive
+	stop ->
+	    lists:foreach(fun(Handler) -> Handler ! stop end, Handlers);
+	{stop, From} ->
+	    Stopper = fun(Handler) -> Handler ! stop end, 
+	    lists:foreach(Stopper, Handlers),
+	    From ! {stopped, self()}
+    after 0 ->
+	    {ok, Socket} = ssl:transport_accept(ListenSocket),
+	    HandlerPid  = dummy_request_handler(MFA, Socket, ContentCb, Conf),
+	    ssl:controlling_process(Socket, HandlerPid),
+	    HandlerPid ! ssl_controller,
+	    dummy_ssl_server_loop(MFA, [HandlerPid | Handlers],
+				  ContentCb, Conf, ListenSocket)
+    end.
+
+dummy_request_handler(MFA, Socket, ContentCb, Conf) ->
+    spawn(?MODULE, dummy_request_handler_init, [MFA, Socket, ContentCb, Conf]).
+
+dummy_request_handler_init(MFA, Socket, ContentCb, Conf) ->
+    SockType = 
+	receive 
+	    ipcomm_controller ->
+		inet:setopts(Socket, [{active, true}]),
+		ip_comm;
+	    ssl_controller ->
+		ok = ssl:ssl_accept(Socket, infinity),
+		ssl:setopts(Socket, [{active, true}]),
+		ssl
+	end,
+    dummy_request_handler_loop(MFA, SockType, Socket, ContentCb, Conf).
+    
+dummy_request_handler_loop({Module, Function, Args}, SockType, Socket, ContentCb, Conf) ->
+    receive 
+	{Proto, _, Data} when (Proto =:= tcp) orelse (Proto =:= ssl) ->
+	    case handle_request(Module, Function, [Data | Args], Socket, ContentCb, Conf) of
+		stop when Proto =:= tcp ->
+		    gen_tcp:close(Socket);
+		stop when Proto =:= ssl ->
+		    ssl:close(Socket);
+		NewMFA ->
+		    dummy_request_handler_loop(NewMFA, SockType, Socket, ContentCb, Conf)
+	    end;
+	stop when SockType =:= ip_comm ->
+	    gen_tcp:close(Socket);
+	stop when SockType =:= ssl ->
+	    ssl:close(Socket)
+    end.
+
+handle_request(Module, Function, Args, Socket, ContentCb, Conf) ->
+    case Module:Function(Args) of
+	{ok, Result} ->
+	    case ContentCb:handle_http_msg(Result, Socket, Conf) of
+		stop ->
+		    stop;
+		<<>> ->
+		    {httpd_request, parse, [[{max_uri,?HTTP_MAX_URI_SIZE},
+					     {max_header, ?HTTP_MAX_HEADER_SIZE},
+					     {max_version,?HTTP_MAX_VERSION_STRING}, 
+					     {max_method, ?HTTP_MAX_METHOD_STRING},
+					     {max_content_length, ?HTTP_MAX_CONTENT_LENGTH},
+					     {customize, httpd_custom}
+					    ]]};
+		Data ->	
+		    handle_request(httpd_request, parse, 
+				   [Data, [{max_uri,    ?HTTP_MAX_URI_SIZE},
+					   {max_header, ?HTTP_MAX_HEADER_SIZE},
+					   {max_version,?HTTP_MAX_VERSION_STRING}, 
+					   {max_method, ?HTTP_MAX_METHOD_STRING},
+					   {max_content_length, ?HTTP_MAX_CONTENT_LENGTH},
+					   {customize, httpd_custom}
+					  ]], Socket, ContentCb, Conf)
+	    end;
+	NewMFA ->
+	    NewMFA
+    end.
+
+%% Perform a synchronous stop
+dummy_server_stop(Pid) ->
+    Pid ! {stop, self()},
+    receive 
+	{stopped, Pid} ->
+	    ok
+    end.
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index cc166d522e..38705372c9 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -37,6 +37,10 @@
 -define(TLS_URL_START, "https://").
 -define(NOT_IN_USE_PORT, 8997).
 
+%% Using hardcoded file path to keep it below 107 charaters
+%% (maximum length supported by erlang)
+-define(UNIX_SOCKET, "/tmp/inets_httpc_SUITE.sock").
+
 -record(sslsocket, {fd = nil, pid = nil}).
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
@@ -50,6 +54,8 @@ all() ->
     [
      {group, http},
      {group, sim_http},
+     {group, http_internal},
+     {group, http_unix_socket},
      {group, https},
      {group, sim_https},
      {group, misc}
@@ -58,7 +64,12 @@ all() ->
 groups() ->
     [
      {http, [], real_requests()},
-     {sim_http, [], only_simulated()},
+     %% process_leak_on_keepalive is depending on stream_fun_server_close
+     %% and it shall be the last test case in the suite otherwise cookie
+     %% will fail.
+     {sim_http, [], only_simulated() ++ [process_leak_on_keepalive]},
+     {http_internal, [], real_requests_esi()},
+     {http_unix_socket, [], simulated_unix_socket()},
      {https, [], real_requests()},
      {sim_https, [], only_simulated()},
      {misc, [], misc()}
@@ -68,6 +79,7 @@ real_requests()->
     [
      head,
      get,
+     get_query_string,
      post,
      delete,
      post_stream,
@@ -93,6 +105,12 @@ real_requests()->
      invalid_body
     ].
 
+real_requests_esi() ->
+    [slow_connection].
+
+simulated_unix_socket() ->
+    [unix_domain_socket].
+
 only_simulated() ->
     [
      cookie,
@@ -119,7 +137,6 @@ only_simulated() ->
      empty_response_header,
      remote_socket_close,
      remote_socket_close_async,
-     process_leak_on_keepalive,
      transfer_encoding,
      transfer_encoding_identity,
      redirect_loop,
@@ -128,10 +145,12 @@ only_simulated() ->
      redirect_found,
      redirect_see_other,
      redirect_temporary_redirect,
+     redirect_relative_uri,
      port_in_host_header,
      redirect_port_in_host_header,
      relaxed,
      multipart_chunks,
+     get_space,
      stream_fun_server_close
     ].
 
@@ -177,15 +196,29 @@ init_per_group(Group, Config0) when Group =:= sim_https; Group =:= https->
         _:_ ->
             {skip, "Crypto did not start"}
     end;
-
+init_per_group(http_unix_socket = Group, Config0) ->
+    case os:type() of
+        {win32,_} ->
+            {skip, "Unix Domain Sockets are not supported on Windows"};
+        _ ->
+            file:delete(?UNIX_SOCKET),
+            start_apps(Group),
+            Config = proplists:delete(port, Config0),
+            Port = server_start(Group, server_config(Group, Config)),
+            [{port, Port} | Config]
+    end;
 init_per_group(Group, Config0) ->
     start_apps(Group),
     Config = proplists:delete(port, Config0),
     Port = server_start(Group, server_config(Group, Config)),
     [{port, Port} | Config].
 
+end_per_group(http_unix_socket,_Config) ->
+    file:delete(?UNIX_SOCKET),
+    ok;
 end_per_group(_, _Config) ->
     ok.
+
 do_init_per_group(Group, Config0) ->
     Config = proplists:delete(port, Config0),
     Port = server_start(Group, server_config(Group, Config)),
@@ -244,6 +277,25 @@ get(Config) when is_list(Config) ->
 
     {ok, {{_,200,_}, [_ | _], BinBody}} =  httpc:request(get, Request, [], [{body_format, binary}]),
     true = is_binary(BinBody).
+
+
+get_query_string() ->
+    [{doc, "Test http get request with query string against local server"}].
+get_query_string(Config) when is_list(Config) ->
+    Request  = {url(group_name(Config), "/dummy.html?foo=bar", Config), []},
+    {ok, {{_,200,_}, [_ | _], Body = [_ | _]}} = httpc:request(get, Request, [], []),
+
+    inets_test_lib:check_body(Body).
+
+%%--------------------------------------------------------------------
+get_space() ->
+    [{"Test http get request with '%20' in the path of the URL."}].
+get_space(Config) when is_list(Config) ->
+    Request  = {url(group_name(Config), "/space%20.html", Config), []},
+    {ok, {{_,200,_}, [_ | _], Body = [_ | _]}} = httpc:request(get, Request, [], []),
+
+    inets_test_lib:check_body(Body).
+
 %%--------------------------------------------------------------------
 post() ->
     [{"Test http post request against local server. We do in this case "
@@ -577,7 +629,26 @@ redirect_temporary_redirect(Config) when is_list(Config) ->
     {ok, {{_,200,_}, [_ | _], [_|_]}}
 	= httpc:request(post, {URL307, [],"text/plain", "foobar"},
 			[], []).
+%%-------------------------------------------------------------------------
+redirect_relative_uri() ->
+    [{doc, "The server SHOULD generate a Location header field in the response "
+      "containing a preferred URI reference for the new permanent URI.  The user "
+      "agent MAY use the Location field value for automatic redirection.  The server's "
+      "response payload usually contains a short hypertext note with a "
+      "hyperlink to the new URI(s)."}].
+redirect_relative_uri(Config) when is_list(Config) ->
+
+    URL301 = url(group_name(Config), "/301_rel_uri.html", Config),
+
+    {ok, {{_,200,_}, [_ | _], [_|_]}}
+	= httpc:request(get, {URL301, []}, [], []),
 
+    {ok, {{_,200,_}, [_ | _], []}}
+	= httpc:request(head, {URL301, []}, [], []),
+
+    {ok, {{_,200,_}, [_ | _], [_|_]}}
+	= httpc:request(post, {URL301, [],"text/plain", "foobar"},
+			[], []).
 %%-------------------------------------------------------------------------
 redirect_loop() ->
     [{"doc, Test redirect loop detection"}].
@@ -1055,8 +1126,6 @@ remote_socket_close_async(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 
 process_leak_on_keepalive(Config) ->
-    {ok, ClosedSocket} = gen_tcp:listen(6666, [{active, false}]),
-    ok = gen_tcp:close(ClosedSocket),
     Request  = {url(group_name(Config), "/dummy.html", Config), []},
     HttpcHandlers0 = supervisor:which_children(httpc_handler_sup),
     {ok, {{_, 200, _}, _, Body}} = httpc:request(get, Request, [], []),
@@ -1068,11 +1137,10 @@ process_leak_on_keepalive(Config) ->
         ordsets:to_list(
           ordsets:subtract(ordsets:from_list(HttpcHandlers1),
                            ordsets:from_list(HttpcHandlers0))),
-    sys:replace_state(
-      Pid, fun (State) ->
-                   Session = element(3, State),
-                   setelement(3, State, Session#session{socket=ClosedSocket})
-           end),
+    State = sys:get_state(Pid),
+    #session{socket=Socket} = element(3, State),
+    gen_tcp:close(Socket),
+
     {ok, {{_, 200, _}, _, Body}} = httpc:request(get, Request, [], []),
     %% bad handler with the closed socket should get replaced by
     %% the new one, so children count should stay the same
@@ -1205,7 +1273,40 @@ stream_fun_server_close(Config) when is_list(Config) ->
     after 13000 ->
             ct:fail(did_not_receive_close)
     end. 
-                                             
+
+%%--------------------------------------------------------------------
+slow_connection() ->
+    [{doc, "Test that a request on a slow keep-alive connection won't crash the httpc_manager"}].
+slow_connection(Config) when is_list(Config) ->
+    BodyFun = fun(0) -> eof;
+                 (LenLeft) -> timer:sleep(1000),
+                              {ok, lists:duplicate(10, "1"), LenLeft - 10}
+              end,
+    Request  = {url(group_name(Config), "/httpc_SUITE:esi_post", Config),
+                [{"content-length", "100"}],
+                "text/plain",
+                {BodyFun, 100}},
+    {ok, _} = httpc:request(post, Request, [], []),
+    %% Second request causes a crash if gen_server timeout is not set to infinity
+    %% in httpc_handler.
+    {ok, _} = httpc:request(post, Request, [], []).
+
+%%-------------------------------------------------------------------------
+unix_domain_socket() ->
+    [{"doc, Test HTTP requests over unix domain sockets"}].
+unix_domain_socket(Config) when is_list(Config) ->
+
+    URL = "http:///v1/kv/foo",
+
+    {ok,[{unix_socket,?UNIX_SOCKET}]} =
+        httpc:get_options([unix_socket]),
+    {ok, {{_,200,_}, [_ | _], _}}
+	= httpc:request(put, {URL, [], [], ""}, [], []),
+    {ok, {{_,200,_}, [_ | _], _}}
+        = httpc:request(get, {URL, []}, [], []).
+
+
+
 %%--------------------------------------------------------------------
 %% Internal Functions ------------------------------------------------
 %%--------------------------------------------------------------------
@@ -1299,6 +1400,8 @@ url(https, End, Config) ->
     ?TLS_URL_START ++ Host ++ ":" ++ integer_to_list(Port) ++ End;
 url(sim_http, End, Config) ->
     url(http, End, Config);
+url(http_internal, End, Config) ->
+    url(http, End, Config);
 url(sim_https, End, Config) ->
     url(https, End, Config).
 url(http, UserInfo, End, Config) ->
@@ -1318,19 +1421,28 @@ group_name(Config) ->
 
 server_start(sim_http, _) ->
     Inet = inet_version(),
-    ok = httpc:set_options([{ipfamily, Inet}]),
-    {_Pid, Port} = dummy_server(Inet),
+    ok = httpc:set_options([{ipfamily, Inet},{unix_socket, undefined}]),
+    {_Pid, Port} = http_test_lib:dummy_server(ip_comm, Inet, [{content_cb, ?MODULE}]),
     Port;
 
 server_start(sim_https, SslConfig) ->
     Inet = inet_version(),
-    ok = httpc:set_options([{ipfamily, Inet}]),
-    {_Pid, Port} = dummy_server(ssl, Inet, SslConfig),
+    ok = httpc:set_options([{ipfamily, Inet},{unix_socket, undefined}]),
+    {_Pid, Port} = http_test_lib:dummy_server(ssl, Inet, [{ssl, SslConfig}, {content_cb, ?MODULE}]),
+    Port;
+
+server_start(http_unix_socket, Config) ->
+    Inet = local,
+    Socket = proplists:get_value(unix_socket, Config),
+    ok = httpc:set_options([{ipfamily, Inet},{unix_socket, Socket}]),
+    {_Pid, Port} = http_test_lib:dummy_server(unix_socket, Inet, [{content_cb, ?MODULE},
+                                                                  {unix_socket, Socket}]),
     Port;
 
 server_start(_, HttpdConfig) ->
     {ok, Pid} = inets:start(httpd, HttpdConfig),
     Serv = inets:services_info(),
+    ok = httpc:set_options([{ipfamily, inet_version()},{unix_socket, undefined}]),
     {value, {_, _, Info}} = lists:keysearch(Pid, 2, Serv),
     proplists:get_value(port, Info).
 
@@ -1345,14 +1457,31 @@ server_config(http, Config) ->
      {mime_type, "text/plain"},
      {script_alias, {"/cgi-bin/", filename:join(ServerRoot, "cgi-bin") ++ "/"}}
     ];
-
+server_config(http_internal, Config) ->
+    ServerRoot = proplists:get_value(server_root, Config),
+    [{port, 0},
+     {server_name,"httpc_test"},
+     {server_root, ServerRoot},
+     {document_root, proplists:get_value(doc_root, Config)},
+     {bind_address, any},
+     {ipfamily, inet_version()},
+     {mime_type, "text/plain"},
+     {erl_script_alias, {"", [httpc_SUITE]}}
+    ];
 server_config(https, Config) ->
     [{socket_type, {essl, ssl_config(Config)}} | server_config(http, Config)];
 server_config(sim_https, Config) ->
     ssl_config(Config);
+server_config(http_unix_socket, _Config) ->
+    Socket = ?UNIX_SOCKET,
+    [{unix_socket, Socket}];
+
 server_config(_, _) ->
     [].
 
+esi_post(Sid, _Env, _Input) ->
+    mod_esi:deliver(Sid, ["OK"]).
+
 start_apps(https) ->
     inets_test_lib:start_apps([crypto, public_key, ssl]);
 start_apps(sim_https) ->
@@ -1429,13 +1558,7 @@ receive_replys([ID|IDs]) ->
 	    ct:pal({recived_canceld_id, Other})
     end.
 
-%% Perform a synchronous stop
-dummy_server_stop(Pid) ->
-    Pid ! {stop, self()},
-    receive 
-	{stopped, Pid} ->
-	    ok
-    end.
+
 
 inet_version() ->
     inet. %% Just run inet for now
@@ -1563,7 +1686,7 @@ dummy_request_handler_loop({Module, Function, Args}, SockType, Socket) ->
 handle_request(Module, Function, Args, Socket) ->
     case Module:Function(Args) of
 	{ok, Result} ->
-	    case handle_http_msg(Result, Socket) of
+	    case handle_http_msg(Result, Socket, []) of
 		stop ->
 		    stop;
 		<<>> ->
@@ -1588,8 +1711,7 @@ handle_request(Module, Function, Args, Socket) ->
 	    NewMFA
     end.
 
-handle_http_msg({Method, RelUri, _, {_, Headers}, Body}, Socket) ->
-
+handle_http_msg({Method, RelUri, _, {_, Headers}, Body}, Socket, _) ->
     ct:print("Request: ~p ~p", [Method, RelUri]),
 
     NextRequest = 
@@ -1713,6 +1835,15 @@ content_length(["content-length:" ++ Value | _]) ->
 content_length([_Head | Tail]) ->
    content_length(Tail).
 
+handle_uri("GET","/dummy.html?foo=bar",_,_,_,_) ->
+    "HTTP/1.0 200 OK\r\n\r\nTEST";
+
+handle_uri("GET","/space%20.html",_,_,_,_) ->
+    Body = "<HTML><BODY>foobar</BODY></HTML>",
+    "HTTP/1.1 200 OK\r\n" ++
+        "Content-Length:" ++ integer_to_list(length(Body)) ++ "\r\n\r\n" ++
+        Body;
+
 handle_uri(_,"/just_close.html",_,_,_,_) ->
 		close;
 handle_uri(_,"/no_content.html",_,_,_,_) ->
@@ -1778,6 +1909,23 @@ handle_uri(_,"/301.html",Port,_,Socket,_) ->
 	"Content-Length:" ++ integer_to_list(length(Body))
 	++ "\r\n\r\n" ++ Body;
 
+
+handle_uri("HEAD","/301_rel_uri.html",_,_,_,_) ->
+    NewUri = "/dummy.html",
+    "HTTP/1.1 301 Moved Permanently\r\n" ++
+	"Location:" ++ NewUri ++  "\r\n" ++
+	"Content-Length:0\r\n\r\n";
+
+handle_uri(_,"/301_rel_uri.html",_,_,_,_) ->
+    NewUri = "/dummy.html",
+  Body = "<HTML><BODY><a href=" ++ NewUri ++
+	">New place</a></BODY></HTML>",
+    "HTTP/1.1 301 Moved Permanently\r\n" ++
+	"Location:" ++ NewUri ++  "\r\n" ++
+	"Content-Length:" ++ integer_to_list(length(Body))
+	++ "\r\n\r\n" ++ Body;
+
+
 handle_uri("HEAD","/302.html",Port,_,Socket,_) ->
     NewUri = url_start(Socket) ++
 	integer_to_list(Port) ++ "/dummy.html",
@@ -2072,6 +2220,19 @@ handle_uri(_,"/delay_close.html",_,_,Socket,_) ->
 handle_uri("HEAD",_,_,_,_,_) ->
     "HTTP/1.1 200 ok\r\n" ++
 	"Content-Length:0\r\n\r\n";
+handle_uri("PUT","/v1/kv/foo",_,_,_,_) ->
+    "HTTP/1.1 200 OK\r\n" ++
+        "Date: Tue, 20 Feb 2018 14:39:08 GMT\r\n" ++
+        "Content-Length: 5\r\n\r\n" ++
+        "Content-Type: application/json\r\n\r\n" ++
+        "true\n";
+handle_uri("GET","/v1/kv/foo",_,_,_,_) ->
+    "HTTP/1.1 200 OK\r\n" ++
+        "Date: Tue, 20 Feb 2018 14:39:08 GMT\r\n" ++
+        "Content-Length: 24\r\n" ++
+        "Content-Type: application/json\r\n\r\n" ++
+        "[{\"Value\": \"aGVsbG8=\"}]\n";
+
 handle_uri(_,_,_,_,_,DefaultResponse) ->
     DefaultResponse.
 
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 0c649d9abf..9a85c51d24 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -923,8 +923,11 @@ esi(Config) when is_list(Config) ->
 		      {no_header, "cache-control"}]),
     ok = http_status("GET /cgi-bin/erl/httpd_example:peer ",
 	  	     Config, [{statuscode, 200},
-	 	      {header, "peer-cert-exist", peer(Config)}]).
-
+                              {header, "peer-cert-exist", peer(Config)}]),
+    ok = http_status("GET /cgi-bin/erl/httpd_example:new_status_and_location ",
+                     Config, [{statuscode, 201},
+                              {header, "location"}]).
+    
 %%-------------------------------------------------------------------------
 esi_put() ->
     [{doc, "Test mod_esi PUT"}].
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index 931cd076cc..94d22ea76c 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -303,7 +303,10 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
     %% Ask for a non-existing page(1)
     Path            = "/<b>this_is_bold<b>",
     HTMLEncodedPath = http_util:html_encode(Path),
-    URL2            = URL1 ++ Path,
+    URL2 = uri_string:recompose(#{scheme => "http",
+                                  host => "localhost",
+                                  port => Port,
+                                  path => Path}),
     {ok, {404, Body3}} = httpc:request(get, {URL2, []},
 				       [{url_encode,  true}, 
 					{version,     "HTTP/1.0"}],
diff --git a/lib/inets/test/httpd_bench_SUITE.erl b/lib/inets/test/httpd_bench_SUITE.erl
new file mode 100644
index 0000000000..9d8cbf9ae2
--- /dev/null
+++ b/lib/inets/test/httpd_bench_SUITE.erl
@@ -0,0 +1,846 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. 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(httpd_bench_SUITE).
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+-include_lib("public_key/include/public_key.hrl").
+-include_lib("kernel/include/file.hrl").
+
+-define(remote_host, "NETMARKS_REMOTE_HOST").
+-define(LF, [10]).
+-define(CR, [13]).
+-define(CRLF, ?CR ++ ?LF).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+suite() -> 
+    [{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}].
+
+all() -> 
+    [
+     {group, http_dummy},
+     {group, http_inets},
+     {group, http_nginx},
+     {group, https_inets},
+     {group, https_dummy},
+     {group, https_nginx},
+     {group, http_dummy_keep_alive},
+     {group, http_inets_keep_alive},
+     {group, http_nginx_keep_alive},
+     {group, https_inets_keep_alive},
+     {group, https_dummy_keep_alive},
+     {group, https_nginx_keep_alive}
+    ].
+
+groups() -> 
+    [
+     {http_dummy, [],  client_tests()},
+     {http_inets, [],   client_tests()},
+     {http_nginx, [],   client_tests()},
+     {https_dummy, [],  client_tests()}, 
+     {https_inets, [],  client_tests()},
+     {https_nginx, [],  client_tests()},
+     {http_dummy_keep_alive, [],  client_tests()},
+     {http_inets_keep_alive, [],  client_tests()},
+     {http_nginx_keep_alive, [],  client_tests()},
+     {https_dummy_keep_alive, [], client_tests()},
+     {https_inets_keep_alive, [], client_tests()},
+     {https_nginx_keep_alive, [], client_tests()}
+    ].
+
+    
+client_tests() ->
+    [wget_small,
+     erl_dummy_small,
+     httpc_small,
+     wget_big,
+     erl_dummy_big, 
+     httpc_big
+    ].
+
+init_per_suite(Config) -> 
+    try	
+	{Node, Host} = setup(Config, node()),
+	init_ssl(Config),
+	[{iter, 10}, {server_node, Node}, {server_host, Host} | Config]
+    catch _:_ ->
+	    {skipped, "Benchmark machines only"}
+    end.
+
+end_per_suite(_Config) -> 
+    [application:stop(App) || App <- [asn1, crypto, public_key, ssl, inets]].
+
+init_per_group(Group, Config) when Group == http_dummy_keep_alive; 
+				   Group == https_dummy_keep_alive;
+				   Group == http_inets_keep_alive; 
+				   Group == https_inets_keep_alive;
+				   Group == http_nginx_keep_alive;
+				   Group == https_nginx_keep_alive ->
+    Version = http_version(Group),
+    start_web_server(Group,
+		     [{keep_alive, true}, 
+		      {reuse_sessions, false},
+		      {http_version, Version},
+		      {http_opts,[{version, Version}]},
+		      {http_headers, [{"connection", "keep-alive"}]},
+		      {httpc_opts, [{keep_alive_timeout, 1500}, 
+				    {max_keep_alive_length, ?config(iter, Config)}]}
+		      | Config]);
+init_per_group(Group, Config)  when Group == http_dummy; 
+				    Group == https_dummy;
+				    Group == http_inets; 
+				    Group == https_inets;
+				    Group == http_nginx;
+				    Group == https_nginx ->
+    Version = http_version(Group),
+    start_web_server(Group, 
+		     [{keep_alive, false}, 
+		      {reuse_sessions, false},
+		      {http_version, Version},
+		      {http_headers, [{"connection", "close"}]},
+		      {http_opts,[{version, Version}]},
+		      {httpc_opts, [{keep_alive_timeout, 0}, {max_keep_alive_length, 0}]}
+		      | Config]);
+
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(Group, Config) ->
+    stop_web_server(Group, Config).
+
+init_per_testcase(TestCase, Config) when TestCase == httpc_small;
+					 TestCase == httpc_big
+					 -> 
+    Opts = ?config(httpc_opts, Config),
+    inets:start(httpc, [{profile, TestCase}, {socket_opts, [{nodelay, true}]}]),
+    httpc:set_options(Opts, TestCase),
+    [{profile, TestCase} | proplists:delete(profile, Config)];
+
+init_per_testcase(_, Config) -> 
+    Config.
+end_per_testcase(TestCase, _Config) when TestCase == httpc_small;
+					 TestCase == httpc_big ->	
+    ok = inets:stop(httpc, TestCase);
+end_per_testcase(_TestCase, Config) ->	
+    Config.
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+erl_dummy_small(Config) when is_list(Config) -> 
+    {ok, Result} = run_test(httpd_lib_client, "1k_file", Config),
+    notify(Result, Config, "erl_1k_file"). 
+
+erl_dummy_big(Config)  when is_list(Config) -> 
+    {ok, Result} = run_test(httpd_lib_client, "1M_file", Config),
+    notify(Result, Config, "erl_1M_file"). 
+
+wget_small(Config) when is_list(Config) -> 
+    {ok, Result} = run_test(wget_client, "1k_file", Config),
+    notify(Result, Config, "wget_1k_file"). 
+
+wget_big(Config)  when is_list(Config) -> 
+    {ok, Result} = run_test(wget_client, "1M_file", Config),
+    notify(Result, Config, "wget_1M_file"). 
+
+httpc_small(Config) when is_list(Config) -> 
+    {ok, Result} = run_test(httpc_client, "1k_file", Config),
+    notify(Result, Config, "httpc_1k_file"). 
+
+httpc_big(Config)  when is_list(Config) -> 
+    {ok, Result} = run_test(httpc_client, "1M_file", Config),
+    notify(Result, Config, "httpc_1M_file"). 
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Report benchmark results  ------------------------------------------------
+%%--------------------------------------------------------------------
+
+notify({TestPerSec, _MBps}, Config, Suffix) ->
+    Name = lists:concat([?config(protocol,Config), " ", 
+			 server_name(Config, [dummy_pid, httpd_pid, nginx_port]), 
+			 "", Suffix]),
+    ct:comment("~p tps", [TestPerSec]),
+    ct_event:notify(#event{name = benchmark_data,
+			   data=[{value, TestPerSec},
+				 {suite, ?MODULE},
+				 {name, Name}]}),
+			 ok.
+%%--------------------------------------------------------------------
+%% Setup erlang nodes  ------------------------------------------------
+%%--------------------------------------------------------------------
+
+server_name(Config, [Server | Rest]) ->
+    case proplists:get_value(Server, Config) of
+	undefined ->
+	    server_name(Config, Rest);
+	_ ->
+	    server_name(Server)
+    end.
+
+server_name(httpd_pid) ->   
+   "inets";
+server_name(nginx_port) -> 
+    "nginx";
+server_name(dummy_pid) ->
+    "erlang".
+
+setup(_Config, nonode@nohost) ->
+    exit(dist_not_enabled);
+setup(_Config, _LocalNode) ->
+    Host = case os:getenv(?remote_host) of
+	       false ->
+		   {ok, This} = inet:gethostname(),
+		   This;
+	       RemHost ->
+		   RemHost
+	   end,
+    Node = list_to_atom("inets_perf_server@" ++ Host),
+    SlaveArgs = case init:get_argument(pa) of
+	       {ok, PaPaths} ->
+		   lists:append([" -pa " ++ P || [P] <- PaPaths]);
+	       _ -> []
+	   end,
+    Prog =
+	case os:find_executable("erl") of
+	    false -> "erl";
+	    P -> P
+	end,
+    case net_adm:ping(Node) of
+	pong -> ok;
+	pang ->
+	    {ok, Node} = slave:start(Host, inets_perf_server, SlaveArgs, no_link, Prog)
+    end,
+    Path = code:get_path(),
+    true = rpc:call(Node, code, set_path, [Path]),
+    [ensure_started(Node, App) || App <- [asn1, crypto, public_key, ssl, inets]],
+    [ensure_started(node(), App) || App <- [asn1, crypto, public_key, ssl, inets]],
+    (Node =:= node()) andalso restrict_schedulers(client),
+    {Node, Host}.
+
+ensure_started(Node, App) ->
+     ok = rpc:call(Node, application, ensure_started, [App]).
+
+
+restrict_schedulers(Type) ->
+    %% We expect this to run on 8 core machine
+    Extra0 = 1,
+    Extra =  if (Type =:= server) -> -Extra0; true -> Extra0 end,
+    Scheds = erlang:system_info(schedulers),
+    erlang:system_flag(schedulers_online, (Scheds div 2) + Extra).
+
+%%--------------------------------------------------------------------
+%% Setup TLS input files  ------------------------------------------------
+%%--------------------------------------------------------------------
+
+init_ssl(Config) ->
+    DDir = ?config(data_dir, Config),
+    PDir = ?config(priv_dir, Config),
+    {ok, _} = make_certs:all(DDir,
+			     PDir).
+cert_opts(Config) ->
+    ClientCaCertFile = filename:join([?config(priv_dir, Config), 
+				      "client", "cacerts.pem"]),
+    ClientCertFile = filename:join([?config(priv_dir, Config), 
+				    "client", "cert.pem"]),
+    ServerCaCertFile = filename:join([?config(priv_dir, Config), 
+				      "server", "cacerts.pem"]),
+    ServerCertFile = filename:join([?config(priv_dir, Config), 
+				    "server", "cert.pem"]),
+    ServerKeyFile = filename:join([?config(priv_dir, Config), 
+			     "server", "key.pem"]),
+    ClientKeyFile = filename:join([?config(priv_dir, Config), 
+				   "client", "key.pem"]),
+    [{server_verification_opts, [{reuseaddr, true}, 
+				 {cacertfile, ServerCaCertFile},
+				 {ciphers, ["ECDHE-RSA-AES256-GCM-SHA384"]},
+				 {certfile, ServerCertFile}, {keyfile, ServerKeyFile}]},
+     {client_verification_opts, [
+				 %%{verify, verify_peer},
+				 {cacertfile, ClientCaCertFile}, 
+				 {certfile, ClientCertFile},  
+				 {keyfile, ClientKeyFile}]}]. 
+
+%%--------------------------------------------------------------------
+%% Run clients  ------------------------------------------------
+%%--------------------------------------------------------------------
+
+run_test(Client, File, Config) -> 
+    Parent = self(),
+    Pid = spawn(fun() ->
+			receive
+			    go -> 
+				Parent ! {self(),
+					  do_runs(Client, [{file, File} | Config])}
+			end
+		end),
+    Pid ! go,
+    receive
+	{Pid,{{tps, Tps}, {mbps, MBps}}} ->
+	    ct:pal("Tps: ~p  Bps~p", [Tps, MBps]),
+	    {ok, {Tps, MBps}}
+    end.
+
+do_runs(Client, Config) ->
+    N = ?config(iter, Config),
+    DataDir = ?config(data_dir, Config),
+    File = ?config(file, Config),
+    Name = filename:join(DataDir, File), 
+    Args = ?MODULE:Client(Config),
+    ?MODULE:Client({init, Args}),
+    Run = 
+	fun() ->
+		ok = ?MODULE:Client(Args, N)	
+	end,
+    {ok, Info} = file:read_file_info(Name, []),
+    Length = Info#file_info.size,
+    {TimeInMicro, _} = timer:tc(Run),
+    ReqPerSecond = (1000000 * N) div TimeInMicro,
+    BytesPerSecond = (1000000 * N * Length) div TimeInMicro,
+    {{tps, ReqPerSecond}, {mbps, BytesPerSecond}}.
+
+
+httpc_client({init, [_, Profile, URL, Headers, HTTPOpts]}) ->
+     %% Make sure pipelining feature will kick in when appropriate. 
+    {ok, {{_ ,200, "OK"}, _,_}} = httpc:request(get,{URL, Headers}, HTTPOpts, 
+						[{body_format, binary}, 
+						 {socket_opts, [{nodelay, true}]}], Profile),
+    ct:sleep(1000);
+httpc_client(Config) ->
+    File = ?config(file, Config),
+    Protocol = ?config(protocol, Config),
+    Profile = ?config(profile, Config),
+    URL = (?config(urlfun,Config))(File),
+    Headers =  ?config(http_headers, Config),
+    HTTPOpts = ?config(http_opts, Config),
+    [Protocol, Profile, URL, Headers, HTTPOpts].
+httpc_client(_,0) ->
+    ok;
+httpc_client([Protocol, Profile, URL, Headers, HTTPOpts], N) ->
+    {ok, {{_ ,200,"OK"}, _,_}} = httpc:request(get,{URL, Headers}, HTTPOpts, [{body_format, binary},
+									     {socket_opts, [{nodelay, true}]}], Profile),
+    httpc_client([Protocol, Profile, URL, Headers, HTTPOpts], N-1).
+
+httpd_lib_client({init, [_, Type, Version, Request, Host, Port, Opts]}) ->
+    ok = httpd_test_lib:verify_request(Type, Host, 
+     				       Port,  
+     				       Opts, node(),
+     				       Request,
+     				       [{statuscode, 200},
+     					{version, Version}], infinity),
+    ct:sleep(1000);
+httpd_lib_client(Config) ->
+    File = ?config(file, Config),
+    KeepAlive = ?config(keep_alive, Config),
+    Host = ?config(server_host, Config),
+    Port = ?config(port, Config),
+    ReuseSession = ?config(reuse_sessions, Config),
+    {Type, Opts} = 
+	case ?config(protocol, Config) of
+	    "http" ->
+		{ip_comm, [{active, true}, {mode, binary},{nodelay, true}]};
+	    "https" ->	
+		SSLOpts =  proplists:get_value(client_verification_opts, cert_opts(Config)),
+		{ssl, [{active, true}, {mode, binary}, {nodelay, true},  
+		       {reuse_sessions, ReuseSession} | SSLOpts]}
+		    
+	end,
+    Version = ?config(http_version, Config),
+    Request = case KeepAlive of
+		  true ->
+		      http_request("GET /" ++ File ++ " ", Version, Host, {"connection:keep-alive\r\n", ""});
+		  false ->
+		      http_request("GET /" ++ File ++ " ", Version, Host)
+	      end,
+    
+    Args = [KeepAlive, Type, Version, Request, Host, Port, Opts],
+    httpd_lib_client(Args, 1),
+    Args.
+
+httpd_lib_client(_, 0) ->
+    ok;
+httpd_lib_client([true, Type, Version, Request, Host, Port, Opts], N) ->
+    ok = httpd_test_lib:verify_request_N(Type, Host, 
+					 Port,  
+					 Opts, node(),
+					 Request,
+					 [{statuscode, 200},
+					  {version, Version}], infinity, N);
+httpd_lib_client([false, Type, Version, Request, Host, Port, Opts] = List, N) ->
+    ok = httpd_test_lib:verify_request(Type, Host, 
+				       Port,  
+				       Opts, node(),
+				       Request,
+				       [{statuscode, 200},
+					{version, Version}], infinity),
+    httpd_lib_client(List, N-1).
+
+wget_client({init,_}) ->
+    ok;
+wget_client(Config) ->
+    File = ?config(file, Config),
+    URL = (?config(urlfun,Config))(File),
+    KeepAlive = ?config(keep_alive, Config),
+    PrivDir = ?config(priv_dir, Config),
+    Protocol = ?config(protocol, Config),
+    Iter = ?config(iter, Config),
+    FileName = filename:join(PrivDir, "wget_req"),
+    ProtocolOpts = case Protocol of
+		    "http" ->
+			   [];
+		       "https" ->
+			   proplists:get_value(client_verification_opts, cert_opts(Config))
+		   end,
+    wget_req_file(FileName,URL,Iter),
+    [KeepAlive, FileName, URL, Protocol, ProtocolOpts, Iter].
+wget_client([KeepAlive, WgetFile, _URL, Protocol, ProtocolOpts, _], _) ->
+    process_flag(trap_exit, true),
+    Cmd = wget_N(KeepAlive, WgetFile, Protocol, ProtocolOpts),
+    %%ct:pal("Wget cmd: ~p", [Cmd]),
+    Port = open_port({spawn, Cmd}, [stderr_to_stdout]), 
+    wait_for_wget(Port).
+
+
+%%--------------------------------------------------------------------
+%% Start/stop servers  ------------------------------------------------
+%%--------------------------------------------------------------------
+start_web_server(Group, Config) when Group == http_dummy;
+				     Group == http_dummy_keep_alive ->
+    start_dummy("http", Config);
+
+start_web_server(Group, Config) when Group == https_dummy;
+				     Group == https_dummy_keep_alive ->
+    start_dummy("https", Config);
+
+start_web_server(Group, Config) when Group == http_inets;
+				     Group == http_inets_keep_alive ->
+    start_inets("http", [], Config);
+    
+start_web_server(Group, Config) when Group == https_inets;
+				     Group == https_inets_keep_alive ->
+    Opts = proplists:get_value(server_verification_opts, cert_opts(Config)),
+    ReuseSessions = ?config(reuse_sessions, Config),
+    SSLConfHttpd = [{socket_type, {essl,
+				   [{nodelay, true}, {reuse_sessions, ReuseSessions} | Opts]}}],
+    start_inets("https", SSLConfHttpd, Config);
+
+start_web_server(Group, Config)  when Group == http_nginx;
+				      Group == http_nginx_keep_alive ->
+    case os:find_executable("nginx") of
+	false ->
+	    {skip, "nginx not found"};
+	_ ->
+	    start_nginx("http",  Config)
+    end;
+
+start_web_server(Group, Config)  when Group == https_nginx;
+				      Group == https_nginx_keep_alive ->
+     case os:find_executable("nginx") of
+	false ->
+	    {skip, "nginx not found"};
+	 _ ->
+	     start_nginx("https",  cert_opts(Config) ++ Config)  
+     end.
+   
+start_inets(Protocol, ConfHttpd, Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    DataDir = ?config(data_dir, Config),
+    Node = ?config(server_node, Config),
+    Host = ?config(server_host, Config),    
+    HTTPVersion = ?config(http_version, Config),    
+    Conf = [httpd, [{port,0},
+		    {http_version, HTTPVersion},
+		    {ipfamily, inet},
+		    {server_name, "inets_test"},
+		    {server_root, PrivDir}, 
+		    {document_root, DataDir},
+		    {keep_alive, ?config(keep_alive, Config)},
+		    {keep_alive_timeout, 360}
+		    | ConfHttpd]],
+    {ok, Pid} = rpc:call(Node, inets, start, Conf),
+    Port = proplists:get_value(port,  rpc:call(Node, httpd, info, [Pid])),
+    F = fun(File) -> 
+		lists:concat([Protocol,"://",Host,":",Port,"/",File]) 
+	end,
+    [{httpd_pid,Pid},{urlfun,F},{protocol,Protocol},{port,Port} | Config].
+
+start_dummy("http"= Protocol, Config) ->
+    HTTPVersion = ?config(http_version, Config),    
+    Node = ?config(server_node, Config),
+    %%DataDir= ?config(data_dir, Config),
+    Host = ?config(server_host, Config),
+    Conf = [
+	    %%{big, filename:join(DataDir, "1M_file")},
+	    %%{small, filename:join(DataDir, "1k_file")},
+	    {big, {gen,  crypto:rand_bytes(1000000)}},
+	    {small, {gen,  crypto:rand_bytes(1000)}},
+	    {http_version, HTTPVersion},
+	    {keep_alive,  ?config(keep_alive, Config)}
+	   ],
+    {Pid, Port} = rpc:call(Node, http_test_lib, dummy_server, [ip_comm, inet, [{content_cb, ?MODULE}, {conf, Conf}]]),
+    F = fun(File) -> 
+		lists:concat([Protocol,"://",Host,":",Port,"/",File]) 
+	end,
+    [{dummy_pid,Pid},{urlfun,F},{protocol, Protocol},{port,Port} | Config];
+
+start_dummy("https" = Protocol, Config) ->
+    HTTPVersion = ?config(http_version, Config),    
+    Node = ?config(server_node, Config),
+    %% DataDir= ?config(data_dir, Config),
+    Host = ?config(server_host, Config),
+    SSLOpts =  proplists:get_value(server_verification_opts, cert_opts(Config)),
+    Opts = [{active, true}, {nodelay, true}, {reuseaddr, true} | SSLOpts],
+    Conf = [%%{big, filename:join(DataDir, "1M_file")},
+	    %%{small, filename:join(DataDir, "1k_file")},
+	    {big, {gen, crypto:rand_bytes(1000000)}},
+	    {small, {gen, crypto:rand_bytes(1000)}},
+	    {http_version, HTTPVersion},
+	    {keep_alive, ?config(keep_alive, Config)}
+	   ],
+    {Pid, Port} = rpc:call(Node, http_test_lib, dummy_server,
+			   [ssl, inet, [{ssl, Opts}, {content_cb, ?MODULE}, {conf, Conf}]]),
+    F = fun(File) -> 
+		lists:concat([Protocol,"://",Host,":",Port,"/",File]) 
+	end,
+    [{dummy_pid,Pid},{urlfun,F},{protocol,Protocol},{port,Port} | Config].
+
+start_nginx(Protocol, Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    DataDir = ?config(data_dir, Config),
+    Host = ?config(server_host, Config),    
+    Port = inet_port(node()),
+    
+    ConfFile = filename:join(PrivDir, "nginx.conf"),
+    nginx_conf(ConfFile, [{port, Port}, {protocol, Protocol} | Config]),
+    Cmd = "nginx -c " ++ ConfFile, 
+    NginxPort =  open_port({spawn, Cmd}, [{cd, DataDir}, stderr_to_stdout]), 
+
+    F = fun(File) -> 
+ 		lists:concat([Protocol,"://",Host,":",Port,"/",File]) 
+	end,
+    
+    wait_for_nginx_up(Host, Port),
+   
+    [{port, Port},{nginx_port, NginxPort},{urlfun,F},{protocol, Protocol} | Config ].
+
+stop_nginx(Config)->
+    PrivDir = ?config(priv_dir, Config),    
+    {ok, Bin} = file:read_file(filename:join(PrivDir, "nginx.pid")),
+    Pid = string:strip(binary_to_list(Bin), right, $\n),
+    Cmd = "kill " ++ Pid,
+    os:cmd(Cmd).
+    
+stop_web_server(Group, Config) when  Group == http_inets;
+				     Group == http_inets_keep_alive;
+				     Group == https_inets;
+				     Group == https_inets_keep_alive -> 
+    ServerNode = ?config(server_node, Config),
+    rpc:call(ServerNode, inets, stop, [httpd, ?config(httpd_pid, Config)]);
+stop_web_server(Group, Config) when  Group == http_dummy;
+				     Group == http_dummy_keep_alive;
+				     Group == https_dummy;
+				     Group == https_dummy_keep_alive -> 
+    stop_dummy_server(Config);
+stop_web_server(Group, Config) when  Group == http_nginx;
+				     Group == http_nginx_keep_alive;
+				     Group == https_nginx;
+				     Group == https_nginx_keep_alive -> 
+    stop_nginx(Config).
+
+stop_dummy_server(Config) ->    
+      case ?config(dummy_pid, Config) of
+	  Pid when is_pid(Pid) ->
+	      exit(Pid, kill);
+	  _ ->
+	      ok
+      end.
+
+%%--------------------------------------------------------------------
+%% Misc  ------------------------------------------------
+%%--------------------------------------------------------------------
+http_request(Request, "HTTP/1.1" = Version, Host, {Headers, Body}) ->
+    Request ++ Version ++ "\r\nhost:" ++ Host ++ "\r\n" ++ Headers ++ "\r\n" ++ Body;
+http_request(Request, Version, _, {Headers, Body}) ->
+    Request ++ Version ++ "\r\n" ++ Headers  ++ "\r\n" ++ Body.
+
+http_request(Request, "HTTP/1.1" = Version, Host) ->
+    Request ++ Version ++ "\r\nhost:" ++ Host  ++ "\r\n\r\n";
+http_request(Request, Version, _) ->
+    Request ++ Version ++ "\r\n\r\n".
+
+http_version(_) ->
+    "HTTP/1.1".
+
+inet_port(Node) ->
+    {Port, Socket} = do_inet_port(Node),
+     rpc:call(Node, gen_tcp, close, [Socket]),
+     Port.
+
+do_inet_port(Node) ->
+    {ok, Socket} = rpc:call(Node, gen_tcp, listen, [0, [{reuseaddr, true}]]),
+    {ok, Port} = rpc:call(Node, inet, port, [Socket]),
+    {Port, Socket}.
+ 
+%%--------------------------------------------------------------------
+%% Dummy server callbacks  ------------------------------------------------
+%%--------------------------------------------------------------------
+
+handle_request(CB, S, "/1M_file" ++ _, Opts) ->
+    Name = proplists:get_value(big, Opts),
+    KeepAlive = proplists:get_value(keep_alive, Opts),
+    do_handle_request(CB, S, Name, Opts, KeepAlive);
+handle_request(CB, S, "/1k_file" ++ _, Opts) ->
+    Name = proplists:get_value(small, Opts),
+    KeepAlive = proplists:get_value(keep_alive, Opts),
+    do_handle_request(CB, S, Name, Opts, KeepAlive).
+
+do_handle_request(CB, S, Name, Opts, KeepAlive) when is_list(Name) ->
+    Version = proplists:get_value(http_version, Opts),
+    {ok, Fdesc} = file:open(Name, [read, binary]),
+    {ok, Info} = file:read_file_info(Name, []),
+    Length = Info#file_info.size,
+    Response = response_status_line_and_headers(Version, "Content-Length:" 
+						++ integer_to_list(Length) ++ ?CRLF, keep_alive(KeepAlive)), 
+    CB:send(S, Response),
+    send_file(CB, S, Fdesc);
+do_handle_request(CB, S, {gen, Data}, Opts, KeepAlive) ->
+    Version = proplists:get_value(http_version, Opts),
+    Length = size(Data),
+    Response = response_status_line_and_headers(Version, "Content-Length:" 
+						++ integer_to_list(Length) ++ ?CRLF, keep_alive(KeepAlive)), 
+    CB:send(S, Response),
+    send_file(CB, S, {gen, Data}).
+    
+send_file(CB, S, {gen, Data})  ->
+    CB:send(S, Data);
+    %% ChunkSize = 64*1024,
+    %% case size(Data) of
+    %% 	N when N > ChunkSize ->
+    %% 	    <<Chunk:N/binary, Rest/binary>> = Data,
+    %% 	    %%{Chunk, Rest} = lists:split(N, Data),
+    %% 	    CB:send(S, Chunk),
+    %% 	    send_file(CB, S, {gen, Rest});
+    %% 	_ ->
+    %% 	    CB:send(S, Data)
+    %% end; 
+
+send_file(CB, S, FileDesc) ->
+    case file:read(FileDesc, 64*1024) of
+	{ok, Chunk} ->
+	    CB:send(S, Chunk),
+	    send_file(CB, S, FileDesc);	
+	eof ->
+	    file:close(FileDesc),
+	    ok
+    end.
+
+response_status_line_and_headers(Version, Headers,  ConnectionHeader) -> 
+    StatusLine = [Version, " ", "200 OK", ?CRLF],
+    [StatusLine, Headers, ConnectionHeader, ?CRLF].
+
+keep_alive(true)->
+    "Connection:keep-alive\r\n";
+keep_alive(false) ->
+    "Connection:close\r\n".
+
+handle_http_msg({_Method, RelUri, _, {_, _Headers}, _Body}, Socket, Conf) ->
+    handle_request(connect_cb(Socket), Socket, RelUri, Conf),
+    case proplists:get_value(keep_alive, Conf) of
+	true ->
+	    <<>>;
+	false ->
+	    stop
+    end.
+    
+connect_cb({sslsocket, _, _}) ->
+    ssl;
+connect_cb(_) ->
+    gen_tcp.
+
+%%--------------------------------------------------------------------
+%% Setup wget  ------------------------------------------------
+%%--------------------------------------------------------------------
+wget_req_file(FileName, Url, Iter) ->
+    {ok, File} = file:open(FileName, [write]),
+    write_urls(File, Url, Iter).
+
+write_urls(File, Url, 1) ->
+    file:write(File, Url), 
+    file:close(File);
+write_urls(File, Url, N) ->
+    file:write(File, Url), 
+    file:write(File, "\n"),
+    write_urls(File, Url, N-1).
+    
+wait_for_wget(Port) ->
+    receive 
+	{Port, {data, _Data}} when is_port(Port) ->
+	    wait_for_wget(Port);
+	{Port, closed} -> 
+	    ok;
+	{'EXIT', Port, _Reason} ->
+	    ok
+    end.
+
+wget_N(KeepAlive, WegetFile, "http", _ProtocolOpts) ->
+    "wget -i " ++ WegetFile ++ " " ++ wget_keep_alive(KeepAlive) ++ 
+	" --no-cache --timeout=120" ;
+wget_N(KeepAlive, WegetFile, "https", ProtocolOpts) ->
+    
+    "wget -i " ++ WegetFile ++ " " ++ wget_keep_alive(KeepAlive) 
+	++ wget_cert(ProtocolOpts) ++ wget_key(ProtocolOpts)
+	++ wget_cacert(ProtocolOpts) ++ 
+	" --no-cache --timeout=120".
+
+wget(KeepAlive, URL, "http", _ProtocolOpts) ->
+    "wget " ++ URL ++ " " ++ wget_keep_alive(KeepAlive) ++ 
+	" --no-cache --timeout=120" ;
+wget(KeepAlive, URL, "https", ProtocolOpts) ->
+    
+    "wget " ++ URL ++ " " ++ wget_keep_alive(KeepAlive) 
+	++ wget_cert(ProtocolOpts) ++ wget_key(ProtocolOpts)
+	++ wget_cacert(ProtocolOpts) ++ 
+	" --no-cache --timeout=120".
+
+wget_keep_alive(true)->
+    "";
+wget_keep_alive(false) ->
+   "--no-http-keep-alive ".
+
+wget_cacert(ProtocolOpts) ->
+    "--ca-certificate=" ++ proplists:get_value(cacertfile, ProtocolOpts) ++ " ".
+
+wget_cert(ProtocolOpts) ->
+    "--certificate=" ++ proplists:get_value(certfile, ProtocolOpts) ++ " ".
+
+wget_key(ProtocolOpts) ->
+    "--private-key=" ++ proplists:get_value(keyfile, ProtocolOpts) ++ " ".
+
+%%--------------------------------------------------------------------
+%% Setup nginx  ------------------------------------------------
+%%--------------------------------------------------------------------
+nginx_conf(ConfFile, Config)->
+    Protocol = ?config(protocol, Config),
+    file:write_file(ConfFile,
+		    [format_nginx_conf(nginx_global(Config)),
+		     format_nginx_conf(nginx_events(Config)),
+		     format_nginx_conf(nginx_http(Protocol, Config))]).
+       
+format_nginx_conf(Directives) ->
+    lists:map(fun({Key, Value}) ->
+			  io_lib:format("~s ~s;\n", [Key, Value]);
+		     (Str) ->
+			  Str    
+		  end, Directives).
+
+
+nginx_global(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    [{"pid", filename:join(PrivDir, "nginx.pid")},
+     {"error_log",  filename:join(PrivDir, "nginx.pid")},
+     {"worker_processes", "1"}].
+
+nginx_events(_Config) ->
+    ["events {\n",
+     {"worker_connections",  "1024"},
+     "\n}"
+    ].
+
+nginx_http("http", Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    DataDir = ?config(data_dir, Config),
+    Port = ?config(port, Config),
+    ["http {\n" |
+     nginx_defaults(PrivDir) ++
+	 [" server {",
+	  {root,                DataDir}, 
+	  {listen,              integer_to_list(Port)},
+	  " location / {\n  try_files $uri $uri/ /index.html;\n}"
+	  "}\n", "}\n"
+	 ]
+    ];
+	
+nginx_http("https", Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    DataDir = ?config(data_dir, Config),
+    Port = ?config(port, Config),
+    SSLOpts = ?config(server_verification_opts, Config),
+    Ciphers = proplists:get_value(ciphers, SSLOpts),
+    ReuseSession = ?config(reuse_sessions, Config),
+    ["http {" |
+     nginx_defaults(PrivDir) ++
+	 [" server {",
+	  {"root",                DataDir}, 
+	  {"listen",              integer_to_list(Port) ++ " ssl"},
+	  {"ssl_certificate",     ?config(certfile, SSLOpts)},
+	  {"ssl_certificate_key", ?config(keyfile, SSLOpts)},
+	  {"ssl_protocols",       "TLSv1 TLSv1.1 TLSv1.2"},
+	  {"ssl_ciphers",         Ciphers}, 
+	  {"ssl_session_cache",    nginx_reuse_session(ReuseSession)},
+	  " location / {\n  try_files $uri $uri/ /index.html;\n}"
+	  "}\n", "}\n"
+	 ]
+    ].
+	
+nginx_defaults(PrivDir) ->
+    [
+     %% Set temp and cache file options that will otherwise default to
+     %% restricted locations accessible only to root.
+     {"client_body_temp_path", filename:join(PrivDir, "client_body")},
+     {"fastcgi_temp_path",   filename:join(PrivDir, "fastcgi_temp")}, 
+     {"proxy_temp_path", filename:join(PrivDir, "proxy_temp")},
+     {"scgi_temp_path", filename:join(PrivDir, "scgi_temp")},
+     {"uwsgi_temp_path", filename:join(PrivDir, "uwsgi_temp_path")},
+     {"access_log",  filename:join(PrivDir, "access.log")},
+     {"error_log",   filename:join(PrivDir, "error.log")},
+     %% Standard options
+     {"sendfile", "on"},
+     {"tcp_nopush", "on"},
+     {"tcp_nodelay", "on"},
+     {"keepalive_timeout",  "360"},
+     {"types_hash_max_size", "2048"},
+     {"include", "/etc/nginx/mime.types"},
+     {"default_type", "application/octet-stream"}
+    ].
+
+nginx_reuse_session(true) ->
+    "on";
+nginx_reuse_session(false) ->
+    "off".
+
+wait_for_nginx_up(Host, Port) ->
+    case gen_tcp:connect(Host, Port, []) of
+	{ok, Socket} ->
+	    gen_tcp:close(Socket);
+	_  ->
+	    ct:sleep(100),
+	    wait_for_nginx_up(Host, Port)
+    end.
+		
diff --git a/lib/inets/test/httpd_bench_SUITE_data/1M_file b/lib/inets/test/httpd_bench_SUITE_data/1M_file
new file mode 100644
index 0000000000..557989144e
--- /dev/null
+++ b/lib/inets/test/httpd_bench_SUITE_data/1M_file
diff --git a/lib/inets/test/httpd_bench_SUITE_data/1k_file b/lib/inets/test/httpd_bench_SUITE_data/1k_file
new file mode 100644
index 0000000000..cade172d80
--- /dev/null
+++ b/lib/inets/test/httpd_bench_SUITE_data/1k_file
diff --git a/lib/inets/test/httpd_block.erl b/lib/inets/test/httpd_block.erl
deleted file mode 100644
index 45547e6d4e..0000000000
--- a/lib/inets/test/httpd_block.erl
+++ /dev/null
@@ -1,372 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-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(httpd_block).
-
--include_lib("common_test/include/ct.hrl").
-
-%% General testcases bodies called from httpd_SUITE
--export([block_disturbing_idle/4, block_non_disturbing_idle/4,
-	 block_503/4, block_disturbing_active/4, 
-	 block_non_disturbing_active/4, 
-	 block_disturbing_active_timeout_not_released/4, 
-	 block_disturbing_active_timeout_released/4, 
-	 block_non_disturbing_active_timeout_not_released/4,
-	 block_non_disturbing_active_timeout_released/4,
-	 disturbing_blocker_dies/4,
-	 non_disturbing_blocker_dies/4, restart_no_block/4,
-	 restart_disturbing_block/4, restart_non_disturbing_block/4
-	]).
-
-%% Help functions 
--export([httpd_block/3, httpd_block/4, httpd_unblock/2, httpd_restart/2]).
--export([do_block_server/4, do_block_nd_server/5, do_long_poll/6]).
-
--define(report(Label, Content), 
-	inets:report_event(20, Label, test_case, 
-			   [{module, ?MODULE}, {line, ?LINE} | Content])).
-
-
-%%-------------------------------------------------------------------------
-%% Test cases starts here.
-%%-------------------------------------------------------------------------
-block_disturbing_idle(_Type, Port, Host, Node) ->
-    io:format("block_disturbing_idle -> entry~n", []),
-    validate_admin_state(Node, Host, Port, unblocked),
-    block_server(Node, Host, Port),
-    validate_admin_state(Node, Host, Port, blocked),
-    unblock_server(Node, Host, Port),
-    validate_admin_state(Node, Host, Port, unblocked),
-    io:format("block_disturbing_idle -> done~n", []),
-    ok.
-
-%%--------------------------------------------------------------------
-block_non_disturbing_idle(_Type, Port, Host, Node) ->
-    unblocked = get_admin_state(Node, Host, Port),
-    block_nd_server(Node, Host, Port),
-    blocked = get_admin_state(Node, Host, Port),
-    unblock_server(Node, Host, Port),
-    unblocked = get_admin_state(Node, Host, Port),
-    ok.
-
-%%--------------------------------------------------------------------
-block_503(Type, Port, Host, Node) ->
-    Req = "GET / HTTP/1.0\r\ndummy-host.ericsson.se:\r\n\r\n",
-    unblocked = get_admin_state(Node, Host, Port),
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, Req, 
-				  [{statuscode, 200},
-				   {version, "HTTP/1.0"}]),
-    ok = block_server(Node, Host, Port),
-    blocked = get_admin_state(Node, Host, Port),
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, Req,  
-				  [{statuscode, 503},
-				   {version, "HTTP/1.0"}]),
-    ok = unblock_server(Node, Host, Port),
-    unblocked = get_admin_state(Node, Host, Port),
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, Req, 
-				  [{statuscode, 200},
-				   {version, "HTTP/1.0"}]).
-
-%%--------------------------------------------------------------------
-block_disturbing_active(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Pid = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(15000),
-    block_server(Node, Host, Port),
-    await_suite_failed_process_exit(Pid, "poller", 60000,
-				    connection_closed),
-    blocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-block_non_disturbing_active(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(15000),
-    ok = block_nd_server(Node, Host, Port),
-    await_normal_process_exit(Poller, "poller", 60000),
-    blocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-block_disturbing_active_timeout_not_released(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(15000),
-    ok = httpd_block(undefined,  Port, disturbing, 50000),
-    await_normal_process_exit(Poller, "poller", 30000),
-    blocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-block_disturbing_active_timeout_released(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 40000),
-    ct:sleep(5000),
-    ok = httpd_block(undefined,  Port, disturbing, 10000),
-    await_suite_failed_process_exit(Poller, "poller", 40000, 
-					  connection_closed),
-    blocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-%%--------------------------------------------------------------------
-block_non_disturbing_active_timeout_not_released(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(5000),
-    ok = block_nd_server(Node, Host, Port, 40000),
-    await_normal_process_exit(Poller, "poller", 60000),
-    blocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-block_non_disturbing_active_timeout_released(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 45000),
-    ct:sleep(5000),
-    Blocker = blocker_nd(Node, Host, Port ,10000, {error,timeout}),
-    await_normal_process_exit(Blocker, "blocker", 15000),
-    await_normal_process_exit(Poller, "poller", 50000),
-    unblocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-%%--------------------------------------------------------------------
-disturbing_blocker_dies(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(5000),
-    Blocker = blocker(Node, Host, Port, 10000),
-    ct:sleep(5000),
-    exit(Blocker,simulate_blocker_crash),
-    await_normal_process_exit(Poller, "poller", 60000),
-    unblocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-non_disturbing_blocker_dies(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(5000),  
-    Blocker = blocker_nd(Node, Host, Port, 10000, ok),
-    ct:sleep(5000),
-    exit(Blocker, simulate_blocker_crash),
-    await_normal_process_exit(Poller, "poller", 60000),
-    unblocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-%%--------------------------------------------------------------------
-restart_no_block(_, Port, Host, Node) ->
-    {error,_Reason} = restart_server(Node, Host, Port).
-
-%%--------------------------------------------------------------------
-restart_disturbing_block(_, Port, Host, Node) ->
-    ?report("restart_disturbing_block - get_admin_state (unblocked)", []),
-    unblocked = get_admin_state(Node, Host, Port),
-    ?report("restart_disturbing_block - block_server", []),
-    ok = block_server(Node, Host, Port),
-    ?report("restart_disturbing_block - restart_server", []),
-    ok = restart_server(Node, Host, Port),
-    ?report("restart_disturbing_block - unblock_server", []),
-    ok = unblock_server(Node, Host, Port),
-    ?report("restart_disturbing_block - get_admin_state (unblocked)", []),
-    unblocked = get_admin_state(Node, Host, Port).
-
-%%--------------------------------------------------------------------
-restart_non_disturbing_block(_, Port, Host, Node) ->
-    ?report("restart_non_disturbing_block - get_admin_state (unblocked)", []),
-    unblocked = get_admin_state(Node, Host, Port),
-    ?report("restart_non_disturbing_block - block_nd_server", []),
-    ok = block_nd_server(Node, Host, Port),
-    ?report("restart_non_disturbing_block - restart_server", []),
-    ok = restart_server(Node, Host, Port),
-    ?report("restart_non_disturbing_block - unblock_server", []),
-    ok = unblock_server(Node, Host, Port),
-    ?report("restart_non_disturbing_block - get_admin_state (unblocked)", []),
-    unblocked = get_admin_state(Node, Host, Port).
-
-%%--------------------------------------------------------------------
-%% Internal functions
-%%--------------------------------------------------------------------
-blocker(Node, Host, Port, Timeout) ->
-    spawn_link(?MODULE, do_block_server,[Node, Host, Port,Timeout]).
-
-do_block_server(Node, Host, Port, Timeout) ->
-    ok = block_server(Node, Host, Port, Timeout),
-    exit(normal).
-
-blocker_nd(Node, Host, Port, Timeout, Reply) ->
-    spawn_link(?MODULE, do_block_nd_server,
-	       [Node, Host, Port, Timeout, Reply]).
-
-do_block_nd_server(Node, Host, Port, Timeout, Reply) ->
-    Reply = block_nd_server(Node, Host, Port, Timeout),
-    exit(normal).
-
-restart_server(Node, _Host, Port) ->
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_restart, [Addr, Port]).
-
-
-block_server(Node, _Host,  Port) ->
-    io:format("block_server -> entry~n", []),    
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, disturbing]).
-
-
-block_server(Node, _Host, Port, Timeout) ->
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, disturbing, Timeout]).
-
-
-block_nd_server(Node, _Host, Port) ->
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, non_disturbing]).
-
-block_nd_server(Node, _Host, Port, Timeout) ->
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, non_disturbing, Timeout]).
-
-unblock_server(Node, _Host, Port) ->
-    io:format("~p:~p:block_server -> entry~n", [node(),self()]),    
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_unblock, [Addr, Port]).
-
-
-httpd_block(Addr, Port, Mode) ->
-    io:format("~p:~p:httpd_block -> entry~n", [node(),self()]), 
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:block(Pid, Mode);
-	_ ->
-	    {error, not_started}
-    end.
-    
-httpd_block(Addr, Port, Mode, Timeout) ->
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:block(Pid, Mode, Timeout);
-	_ ->
-	    {error, not_started}
-    end.
-    
-httpd_unblock(Addr, Port) ->
-    io:format("~p:~p:httpd_unblock -> entry~n", [node(),self()]), 
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:unblock(Pid);
-	_ ->
-	    {error, not_started}
-    end.
-    
-httpd_restart(Addr, Port) ->
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:reload(Pid, undefined);
-	_ ->
-	    {error, not_started}
-    end.
-    
-make_name(Addr, Port) ->
-    httpd_util:make_name("httpd", Addr, Port, default).
-
-get_admin_state(_, _Host, Port) ->
-    Name = make_name(undefined, Port),
-    {status, _, _, StatusInfo} = sys:get_status(whereis(Name)),
-    [_, _,_, _, Prop] = StatusInfo,
-    State = state(Prop),
-    element(6, State).
-
-validate_admin_state(Node, Host, Port, Expect) ->
-    io:format("try validating server admin state: ~p~n", [Expect]),
-    case get_admin_state(Node, Host, Port) of
-	Expect ->
-	    ok;
-	Unexpected ->
-	    io:format("failed validating server admin state: ~p~n", 
-		      [Unexpected]),
-	    exit({unexpected_admin_state, Unexpected, Expect})
-    end.
-
-
-await_normal_process_exit(Pid, Name, Timeout) ->
-    receive
-	{'EXIT', Pid, normal} ->
-	    ok;
-	{'EXIT', Pid, Reason} ->
-	    Err = 
-		lists:flatten(
-		  io_lib:format("expected normal exit, "
-				"unexpected exit of ~s process: ~p",
-				[Name, Reason])),
-	    ct:fail(Err)
-    after Timeout ->
-	    ct:fail("timeout while waiting for " ++ Name)
-    end.
-
-
-await_suite_failed_process_exit(Pid, Name, Timeout, Why) ->
-    receive 
-	{'EXIT', Pid, {test_failed, Why}} ->
-	    ok;
-	{'EXIT', Pid, Reason} ->
-	    Err = 
-		lists:flatten(
-		  io_lib:format("expected connection_closed, "
-				"unexpected exit of ~s process: ~p",
-				[Name, Reason])),
-	    ct:fail(Err)
-    after Timeout ->
-	    ct:fail("timeout while waiting for " ++ Name)
-    end.
-	  
-long_poll(Type, Host, Port, Node, StatusCode, Timeout) ->
-    spawn_link(?MODULE, do_long_poll, [Type, Host, Port, Node, 
-				       StatusCode, Timeout]).
-
-do_long_poll(Type, Host, Port, Node, StatusCode, Timeout) ->
-    Mod  = "httpd_example",
-    Func = "delay",
-    Req  = lists:flatten(io_lib:format("GET /eval?" ++ Mod ++ ":" ++ Func ++ 
-				       "(~p) HTTP/1.0\r\n\r\n",[30000])),
-    case httpd_test_lib:verify_request(Type, Host, Port, Node, Req, 
-			      [{statuscode, StatusCode},
-			       {version, "HTTP/1.0"}], Timeout) of
-	ok ->
-	    exit(normal);
-	Reason ->
-	    exit({test_failed, Reason})
-    end.
-
-
-state([{data,[{"State", State}]} | _]) ->
-    State;
-state([{data,[{"StateData", State}]} | _]) ->
-    State;
-state([_ | Rest]) ->
-    state(Rest).
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index 1cecd2642c..b6525037b2 100644
--- a/lib/inets/test/httpd_test_lib.erl
+++ b/lib/inets/test/httpd_test_lib.erl
@@ -23,7 +23,8 @@
 -include("inets_test_lib.hrl").
 
 %% Poll functions
--export([verify_request/6, verify_request/7, verify_request/8, is_expect/1]).
+-export([verify_request/6, verify_request/7, verify_request/8, is_expect/1,
+	 verify_request_N/9]).
 
 -record(state, {request,        % string()
 		socket,         % socket()
@@ -109,9 +110,9 @@ verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options, Ti
 		    {error, Reason};
 		NewState ->
 		    ValidateResult = 
-			validate(RequestStr, NewState, Options, Node, Port),
+		   	validate(RequestStr, NewState, Options, Node, Port),
 		    inets_test_lib:close(SocketType, Socket),
-		    ValidateResult
+		    ValidateResult 
 	    end;
 
 	ConnectError ->
@@ -126,6 +127,46 @@ verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options, Ti
 		      {args,       [SocketType, Host, Port, TranspOpts]}]}) 
     end.
 
+verify_request_N(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options, TimeOut, N) ->
+    State = #state{},
+     try inets_test_lib:connect_bin(SocketType, Host, Port, TranspOpts) of
+	{ok, Socket} ->
+	     request_N(SocketType, Socket, RequestStr, Options, TimeOut, Node, Port, State, N); 
+	ConnectError ->
+	    ct:fail({connect_error, ConnectError, 
+		     [SocketType, Host, Port, TranspOpts]})
+    catch
+	T:E ->
+	    ct:fail({connect_failure, 
+		     [{type,       T}, 
+		      {error,      E}, 
+		      {stacktrace, erlang:get_stacktrace()}, 
+		      {args,       [SocketType, Host, Port, TranspOpts]}]}) 
+    end.
+
+request_N(SocketType, Socket, RequestStr, Options, TimeOut, Node, Port, State, 0) ->
+    ok = inets_test_lib:send(SocketType, Socket, RequestStr),
+    case request(State#state{request = RequestStr, 
+			     socket  = Socket}, TimeOut) of
+	{error, Reason} ->
+	    {error, Reason};	
+	NewState ->
+	    ValidateResult = 
+		validate(RequestStr, NewState, Options, Node, Port),
+	    inets_test_lib:close(SocketType, Socket),
+	    ValidateResult
+    end;
+request_N(SocketType, Socket, RequestStr, Options, TimeOut, Node, Port, State, N) ->
+    ok = inets_test_lib:send(SocketType, Socket, RequestStr),
+    case request(State#state{request = RequestStr, 
+			     socket  = Socket}, TimeOut) of
+	{error, Reason} ->
+	    {error, Reason};
+	_NewState ->
+	    request_N(SocketType, Socket, RequestStr, Options, TimeOut, Node, Port, 
+		      #state{}, N-1)
+    end.
+
 request(#state{mfa = {Module, Function, Args}, 
 	       request = RequestStr, socket = Socket} = State, TimeOut) ->
             
@@ -160,13 +201,35 @@ request(#state{mfa = {Module, Function, Args},
 	{ssl_closed, Socket} ->
 	    exit({test_failed, connection_closed});
 	{ssl_error, Socket, Reason} ->
-	    ct:fail({ssl_error, Reason})
+	    ct:fail({ssl_error, Reason});
+	{Socket, {data, Data}} when is_port(Socket) ->
+	    case Module:Function([list_to_binary(Data) | Args]) of
+		{ok, Parsed} ->
+		    port_handle_http_msg(Parsed, State); 
+		{_, whole_body, _} when HeadRequest =:= "HEAD" ->
+		    State#state{body = <<>>}; 
+		NewMFA ->
+		    request(State#state{mfa = NewMFA}, TimeOut)
+	    end;
+	{Socket, closed}  when Function =:= whole_body -> 
+	    State#state{body = hd(Args)};
+	{Socket, closed} ->
+	    exit({test_failed, connection_closed})
     after TimeOut ->
 	    ct:pal("~p ~w[~w]request -> timeout"
-		   "~n", [self(), ?MODULE, ?LINE]),
+		   "~p~n", [self(), ?MODULE, ?LINE, Args]),
 	    ct:fail(connection_timed_out)    
     end.
 
+
+port_handle_http_msg({Version, StatusCode, ReasonPharse, Headers, Body}, State) ->
+    State#state{status_line = {Version, 
+			       StatusCode,
+			       ReasonPharse},
+		headers = Headers,
+		body = Body}.
+
+
 handle_http_msg({Version, StatusCode, ReasonPharse, Headers, Body}, 
 		State = #state{request = RequestStr}) ->
     case is_expect(RequestStr) of
diff --git a/lib/inets/test/inets.spec b/lib/inets/test/inets.spec
index ed102f8219..6cb3d6526c 100644
--- a/lib/inets/test/inets.spec
+++ b/lib/inets/test/inets.spec
@@ -1 +1,3 @@
-{suites,"../inets_test",all}.
+{suites,"../inets_test", all}.
+{skip_suites, "../inets_test", [httpd_bench_SUITE], 
+    "Benchmarks run separately"}.
diff --git a/lib/inets/test/inets_bench.spec b/lib/inets/test/inets_bench.spec
new file mode 100644
index 0000000000..19136e691b
--- /dev/null
+++ b/lib/inets/test/inets_bench.spec
@@ -0,0 +1 @@
+{suites,"../inets_test",[httpd_bench_SUITE]}.
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index f1185f7574..2529cc5f9b 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -463,8 +463,9 @@ connect_bin(essl, Host, Port, Opts0) ->
     connect(ssl, Host, Port, Opts);
 connect_bin(ip_comm, Host, Port, Opts0) ->
     Opts = [binary, {packet, 0} | Opts0],
-    connect(ip_comm, Host, Port, Opts).
-
+    connect(ip_comm, Host, Port, Opts);
+connect_bin(Type, Host, Port, Opts) ->
+    connect(Type, Host, Port, Opts).
 
 connect_byte(SockType, Host, Port) ->
     connect_byte(SockType, Host, Port, []).
@@ -477,27 +478,40 @@ connect_byte(essl, Host, Port, Opts0) ->
     connect(ssl, Host, Port, Opts);
 connect_byte(ip_comm, Host, Port, Opts0) ->
     Opts = [{packet,0} | Opts0],
-    connect(ip_comm, Host, Port, Opts).
+    connect(ip_comm, Host, Port, Opts);
+connect_byte(Type, Host, Port, Opts) ->
+    connect(Type, Host, Port, Opts).
 
 connect(ip_comm, Host, Port, Opts) ->
     gen_tcp:connect(Host, Port, Opts);
 connect(ssl, Host, Port, Opts) ->
-    ssl:connect(Host, Port, Opts).
+    ssl:connect(Host, Port, Opts);
+connect(openssl_port, Host, Port, Opts) ->
+    CaCertFile = proplists:get_value(cacertfile, Opts),
+    Cmd = "openssl s_client -quiet -port " ++ integer_to_list(Port)  ++ " -host " ++ Host 
+	++ " -CAfile " ++ CaCertFile,
+    ct:log("openssl cmd: ~p~n", [Cmd]),
+    OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
+    read_junk(OpensslPort),
+    {ok, OpensslPort}.
 
 send(ssl, Socket, Data) ->
     ssl:send(Socket, Data);
 send(essl, Socket, Data) ->
     ssl:send(Socket, Data);
 send(ip_comm,Socket,Data) ->
-    gen_tcp:send(Socket,Data).
-
-
+    gen_tcp:send(Socket,Data);
+send(openssl_port, Port, Data) ->
+    true = port_command(Port, Data),
+    ok.
 close(ssl,Socket) ->
     catch ssl:close(Socket);
 close(essl,Socket) ->
     catch ssl:close(Socket);
 close(ip_comm,Socket) ->
-    catch gen_tcp:close(Socket).
+    catch gen_tcp:close(Socket);
+close(openssl_port, Port) ->
+    exit(Port, normal).
 
 
 hours(N)   -> trunc(N * 1000 * 60 * 60).
@@ -572,3 +586,11 @@ do_inet_port(Node) ->
     {ok, Socket} = rpc:call(Node, gen_tcp, listen, [0, [{reuseaddr, true}]]),
     {ok, Port} = rpc:call(Node, inet, port, [Socket]),
     {Port, Socket}.
+
+read_junk(OpensslPort) ->
+    receive
+	{OpensslPort, _} ->
+	    read_junk(OpensslPort)
+    after 500 -> 
+	    ok    
+    end.
diff --git a/lib/inets/test/make_certs.erl b/lib/inets/test/make_certs.erl
new file mode 100644
index 0000000000..7215a59823
--- /dev/null
+++ b/lib/inets/test/make_certs.erl
@@ -0,0 +1,530 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2007-2015. 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(make_certs).
+-compile([export_all]).
+
+%-export([all/1, all/2, rootCA/2, intermediateCA/3, endusers/3, enduser/3, revoke/3, gencrl/2, verify/3]).
+
+-record(config, {commonName, 
+	     organizationalUnitName = "Erlang OTP",
+	     organizationName = "Ericsson AB",
+	     localityName = "Stockholm",
+	     countryName = "SE",
+	     emailAddress = "[email protected]",
+	     default_bits = 2048,
+	     v2_crls = true,
+	     ecc_certs = false,
+	     issuing_distribution_point = false,
+	     crl_port = 8000,
+	     openssl_cmd = "openssl"}).
+
+
+default_config() ->
+    #config{}.
+
+make_config(Args) ->
+    make_config(Args, #config{}).
+
+make_config([], C) ->
+    C;
+make_config([{organizationalUnitName, Name}|T], C) when is_list(Name) ->
+    make_config(T, C#config{organizationalUnitName = Name});
+make_config([{organizationName, Name}|T], C) when is_list(Name) ->
+    make_config(T, C#config{organizationName = Name});
+make_config([{localityName, Name}|T], C) when is_list(Name) ->
+    make_config(T, C#config{localityName = Name});
+make_config([{countryName, Name}|T], C) when is_list(Name) ->
+    make_config(T, C#config{countryName = Name});
+make_config([{emailAddress, Name}|T], C) when is_list(Name) ->
+    make_config(T, C#config{emailAddress = Name});
+make_config([{default_bits, Bits}|T], C) when is_integer(Bits) ->
+    make_config(T, C#config{default_bits = Bits});
+make_config([{v2_crls, Bool}|T], C) when is_boolean(Bool) ->
+    make_config(T, C#config{v2_crls = Bool});
+make_config([{crl_port, Port}|T], C) when is_integer(Port) ->
+    make_config(T, C#config{crl_port = Port});
+make_config([{ecc_certs, Bool}|T], C) when is_boolean(Bool) ->
+    make_config(T, C#config{ecc_certs = Bool});
+make_config([{issuing_distribution_point, Bool}|T], C) when is_boolean(Bool) ->
+    make_config(T, C#config{issuing_distribution_point = Bool});
+make_config([{openssl_cmd, Cmd}|T], C) when is_list(Cmd) ->
+    make_config(T, C#config{openssl_cmd = Cmd}).
+
+
+all([DataDir, PrivDir]) ->
+    all(DataDir, PrivDir).
+
+all(DataDir, PrivDir) ->
+    all(DataDir, PrivDir, #config{}).
+
+all(DataDir, PrivDir, C) when is_list(C) ->
+    all(DataDir, PrivDir, make_config(C));
+all(DataDir, PrivDir, C = #config{}) ->
+    ok = filelib:ensure_dir(filename:join(PrivDir, "erlangCA")),
+    create_rnd(DataDir, PrivDir),			% For all requests
+    rootCA(PrivDir, "erlangCA", C),
+    intermediateCA(PrivDir, "otpCA", "erlangCA", C),
+    endusers(PrivDir, "otpCA", ["client", "server", "revoked", "a.server", "b.server"], C),
+    endusers(PrivDir, "erlangCA", ["localhost"], C),
+    %% Create keycert files 
+    SDir = filename:join([PrivDir, "server"]),
+    SC = filename:join([SDir, "cert.pem"]),
+    SK = filename:join([SDir, "key.pem"]),
+    SKC = filename:join([SDir, "keycert.pem"]),
+    append_files([SK, SC], SKC),
+    CDir = filename:join([PrivDir, "client"]),
+    CC = filename:join([CDir, "cert.pem"]),
+    CK = filename:join([CDir, "key.pem"]),
+    CKC = filename:join([CDir, "keycert.pem"]),
+    append_files([CK, CC], CKC),
+    RDir = filename:join([PrivDir, "revoked"]),
+    RC = filename:join([RDir, "cert.pem"]),
+    RK = filename:join([RDir, "key.pem"]),
+    RKC = filename:join([RDir, "keycert.pem"]),
+    revoke(PrivDir, "otpCA", "revoked", C),
+    append_files([RK, RC], RKC),
+    remove_rnd(PrivDir),
+    {ok, C}.
+
+append_files(FileNames, ResultFileName) ->
+    {ok, ResultFile} = file:open(ResultFileName, [write]),
+    do_append_files(FileNames, ResultFile).
+
+do_append_files([], RF) ->
+    ok = file:close(RF);
+do_append_files([F|Fs], RF) ->
+    {ok, Data} = file:read_file(F),
+    ok = file:write(RF, Data),
+    do_append_files(Fs, RF).
+
+rootCA(Root, Name, C) ->
+    create_ca_dir(Root, Name, ca_cnf(C#config{commonName = Name})),
+    create_self_signed_cert(Root, Name, req_cnf(C#config{commonName = Name}), C),
+    file:copy(filename:join([Root, Name, "cert.pem"]), filename:join([Root, Name, "cacerts.pem"])),
+    gencrl(Root, Name, C).
+
+intermediateCA(Root, CA, ParentCA, C) ->
+    create_ca_dir(Root, CA, ca_cnf(C#config{commonName = CA})),
+    CARoot = filename:join([Root, CA]),
+    CnfFile = filename:join([CARoot, "req.cnf"]),
+    file:write_file(CnfFile, req_cnf(C#config{commonName = CA})),
+    KeyFile = filename:join([CARoot, "private", "key.pem"]), 
+    ReqFile =  filename:join([CARoot, "req.pem"]), 
+    create_req(Root, CnfFile, KeyFile, ReqFile, C),
+    CertFile = filename:join([CARoot, "cert.pem"]),
+    sign_req(Root, ParentCA, "ca_cert", ReqFile, CertFile, C),
+    CACertsFile = filename:join(CARoot, "cacerts.pem"),
+    file:copy(filename:join([Root, ParentCA, "cacerts.pem"]), CACertsFile),
+    %% append this CA's cert to the cacerts file
+    {ok, Bin} = file:read_file(CertFile),
+    {ok, FD} = file:open(CACertsFile, [append]),
+    file:write(FD, ["\n", Bin]),
+    file:close(FD),
+    gencrl(Root, CA, C).
+
+endusers(Root, CA, Users, C) ->
+    [enduser(Root, CA, User, C) || User <- Users].
+
+enduser(Root, CA, User, C) ->
+    UsrRoot = filename:join([Root, User]),
+    file:make_dir(UsrRoot),
+    CnfFile = filename:join([UsrRoot, "req.cnf"]),
+    file:write_file(CnfFile, req_cnf(C#config{commonName = User})),
+    KeyFile = filename:join([UsrRoot, "key.pem"]), 
+    ReqFile =  filename:join([UsrRoot, "req.pem"]), 
+    create_req(Root, CnfFile, KeyFile, ReqFile, C),
+    %create_req(Root, CnfFile, KeyFile, ReqFile),
+    CertFileAllUsage =  filename:join([UsrRoot, "cert.pem"]),
+    sign_req(Root, CA, "user_cert", ReqFile, CertFileAllUsage, C),
+    CertFileDigitalSigOnly =  filename:join([UsrRoot, "digital_signature_only_cert.pem"]),
+    sign_req(Root, CA, "user_cert_digital_signature_only", ReqFile, CertFileDigitalSigOnly, C),
+    CACertsFile = filename:join(UsrRoot, "cacerts.pem"),
+    file:copy(filename:join([Root, CA, "cacerts.pem"]), CACertsFile),
+    ok.
+
+revoke(Root, CA, User, C) ->
+    UsrCert = filename:join([Root, User, "cert.pem"]),
+    CACnfFile = filename:join([Root, CA, "ca.cnf"]),
+    Cmd = [C#config.openssl_cmd, " ca"
+	   " -revoke ", UsrCert,
+	   [" -crl_reason keyCompromise" || C#config.v2_crls ],
+	   " -config ", CACnfFile],
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env),
+    gencrl(Root, CA, C).
+
+gencrl(Root, CA, C) ->
+    CACnfFile = filename:join([Root, CA, "ca.cnf"]),
+    CACRLFile = filename:join([Root, CA, "crl.pem"]),
+    Cmd = [C#config.openssl_cmd, " ca"
+	   " -gencrl ",
+	   " -crlhours 24",
+	   " -out ", CACRLFile,
+	   " -config ", CACnfFile],
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env).
+
+verify(Root, CA, User, C) ->
+    CAFile = filename:join([Root, User, "cacerts.pem"]),
+    CACRLFile = filename:join([Root, CA, "crl.pem"]),
+    CertFile = filename:join([Root, User, "cert.pem"]),
+    Cmd = [C#config.openssl_cmd, " verify"
+	   " -CAfile ", CAFile,
+	   " -CRLfile ", CACRLFile, %% this is undocumented, but seems to work
+	   " -crl_check ",
+	   CertFile],
+    Env = [{"ROOTDIR", filename:absname(Root)}],
+    try cmd(Cmd, Env) catch
+	   exit:{eval_cmd, _, _} ->
+		invalid
+    end.
+
+create_self_signed_cert(Root, CAName, Cnf, C = #config{ecc_certs = true}) ->
+    CARoot = filename:join([Root, CAName]),
+    CnfFile = filename:join([CARoot, "req.cnf"]),
+    file:write_file(CnfFile, Cnf),
+    KeyFile = filename:join([CARoot, "private", "key.pem"]), 
+    CertFile = filename:join([CARoot, "cert.pem"]), 
+    Cmd = [C#config.openssl_cmd, " ecparam"
+	   " -out ", KeyFile,
+	   " -name secp521r1 ",
+	   %" -name sect283k1 ",
+	   " -genkey "],
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env),
+
+    Cmd2 = [C#config.openssl_cmd, " req"
+	   " -new"
+	   " -x509"
+	   " -config ", CnfFile,
+	   " -key ", KeyFile, 
+		 " -outform PEM ",
+	   " -out ", CertFile], 
+    cmd(Cmd2, Env);
+create_self_signed_cert(Root, CAName, Cnf, C) ->
+    CARoot = filename:join([Root, CAName]),
+    CnfFile = filename:join([CARoot, "req.cnf"]),
+    file:write_file(CnfFile, Cnf),
+    KeyFile = filename:join([CARoot, "private", "key.pem"]), 
+    CertFile = filename:join([CARoot, "cert.pem"]), 
+    Cmd = [C#config.openssl_cmd, " req"
+	   " -new"
+	   " -x509"
+	   " -config ", CnfFile,
+	   " -keyout ", KeyFile,
+	   " -outform PEM",
+	   " -out ", CertFile], 
+    Env = [{"ROOTDIR", filename:absname(Root)}],  
+    cmd(Cmd, Env).
+
+
+create_ca_dir(Root, CAName, Cnf) ->
+    CARoot = filename:join([Root, CAName]),
+    ok = filelib:ensure_dir(CARoot),
+    file:make_dir(CARoot),
+    create_dirs(CARoot, ["certs", "crl", "newcerts", "private"]),
+    create_rnd(Root, filename:join([CAName, "private"])),
+    create_files(CARoot, [{"serial", "01\n"},
+			  {"crlnumber", "01"},
+			  {"index.txt", ""},
+			  {"ca.cnf", Cnf}]).
+
+create_req(Root, CnfFile, KeyFile, ReqFile, C = #config{ecc_certs = true}) ->
+    Cmd = [C#config.openssl_cmd, " ecparam"
+	   " -out ", KeyFile,
+	   " -name secp521r1 ",
+	   %" -name sect283k1 ",
+	   " -genkey "],
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env),
+    Cmd2 = [C#config.openssl_cmd, " req"
+	   " -new ",
+	   " -key ", KeyFile,
+	   " -outform PEM ",
+	   " -out ", ReqFile,
+	   " -config ", CnfFile],
+    cmd(Cmd2, Env);
+    %fix_key_file(KeyFile).
+create_req(Root, CnfFile, KeyFile, ReqFile, C) ->
+    Cmd = [C#config.openssl_cmd, " req"
+	   " -new"
+	   " -config ", CnfFile,
+	   " -outform PEM ",
+	   " -keyout ", KeyFile, 
+	   " -out ", ReqFile], 
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env).
+    %fix_key_file(KeyFile).
+
+
+sign_req(Root, CA, CertType, ReqFile, CertFile, C) ->
+    CACnfFile = filename:join([Root, CA, "ca.cnf"]),
+    Cmd = [C#config.openssl_cmd, " ca"
+	   " -batch"
+	   " -notext"
+	   " -config ", CACnfFile, 
+	   " -extensions ", CertType,
+	   " -in ", ReqFile, 
+	   " -out ", CertFile],
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env).
+    
+%%
+%%  Misc
+%%
+    
+create_dirs(Root, Dirs) ->
+    lists:foreach(fun(Dir) ->
+			  file:make_dir(filename:join([Root, Dir])) end,
+		  Dirs).
+
+create_files(Root, NameContents) ->
+    lists:foreach(
+      fun({Name, Contents}) ->
+	      file:write_file(filename:join([Root, Name]), Contents) end,
+      NameContents).
+
+create_rnd(FromDir, ToDir) ->
+     From = filename:join([FromDir, "RAND"]),
+     To = filename:join([ToDir, "RAND"]),
+     file:copy(From, To).
+
+remove_rnd(Dir) ->
+    File = filename:join([Dir, "RAND"]),
+    file:delete(File).
+
+cmd(Cmd, Env) ->
+    FCmd = lists:flatten(Cmd),
+    Port = open_port({spawn, FCmd}, [stream, eof, exit_status, stderr_to_stdout, 
+				    {env, Env}]),
+    eval_cmd(Port, FCmd).
+
+eval_cmd(Port, Cmd) ->
+    receive 
+	{Port, {data, _}} ->
+	    eval_cmd(Port, Cmd);
+	{Port, eof} ->
+	    ok
+    end,
+    receive
+	{Port, {exit_status, 0}}  ->
+	    ok;
+	{Port, {exit_status, Status}} ->
+	    exit({eval_cmd, Cmd, Status})
+    after 0 ->
+	    ok
+    end.
+
+%%
+%% Contents of configuration files 
+%%
+
+req_cnf(C) ->
+    ["# Purpose: Configuration for requests (end users and CAs)."
+     "\n"
+     "ROOTDIR	        = $ENV::ROOTDIR\n"
+     "\n"
+
+     "[req]\n"
+     "input_password	= secret\n"
+     "output_password	= secret\n"
+     "default_bits	= ", integer_to_list(C#config.default_bits), "\n"
+     "RANDFILE		= $ROOTDIR/RAND\n"
+     "encrypt_key	= no\n"
+     "default_md	= md5\n"
+     "#string_mask	= pkix\n"
+     "x509_extensions	= ca_ext\n"
+     "prompt		= no\n"
+     "distinguished_name= name\n"
+     "\n"
+
+     "[name]\n"
+     "commonName		= ", C#config.commonName, "\n"
+     "organizationalUnitName	= ", C#config.organizationalUnitName, "\n"
+     "organizationName	        = ", C#config.organizationName, "\n" 
+     "localityName		= ", C#config.localityName, "\n"
+     "countryName		= ", C#config.countryName, "\n"
+     "emailAddress		= ", C#config.emailAddress, "\n"
+     "\n"
+
+     "[ca_ext]\n"
+     "basicConstraints 	= critical, CA:true\n"
+     "keyUsage 		= cRLSign, keyCertSign\n"
+     "subjectKeyIdentifier = hash\n"
+     "subjectAltName	= email:copy\n"].
+
+ca_cnf(C = #config{issuing_distribution_point = true}) ->
+    ["# Purpose: Configuration for CAs.\n"
+     "\n"
+     "ROOTDIR	        = $ENV::ROOTDIR\n"
+     "default_ca	= ca\n"
+     "\n"
+
+     "[ca]\n"
+     "dir		= $ROOTDIR/", C#config.commonName, "\n"
+     "certs		= $dir/certs\n"
+     "crl_dir	        = $dir/crl\n"
+     "database	        = $dir/index.txt\n"
+     "new_certs_dir	= $dir/newcerts\n"
+     "certificate	= $dir/cert.pem\n"
+     "serial		= $dir/serial\n"
+     "crl		= $dir/crl.pem\n",
+     ["crlnumber		= $dir/crlnumber\n" || C#config.v2_crls],
+     "private_key	= $dir/private/key.pem\n"
+     "RANDFILE	        = $dir/private/RAND\n"
+     "\n"
+     "x509_extensions   = user_cert\n",
+     ["crl_extensions = crl_ext\n" || C#config.v2_crls],
+     "unique_subject  = no\n"
+     "default_days	= 3600\n"
+     "default_md	= md5\n"
+     "preserve	        = no\n"
+     "policy		= policy_match\n"
+     "\n"
+
+     "[policy_match]\n"
+     "commonName		= supplied\n"
+     "organizationalUnitName	= optional\n"
+     "organizationName	        = match\n"
+     "countryName		= match\n"
+     "localityName		= match\n"
+     "emailAddress		= supplied\n"
+     "\n"
+
+     "[crl_ext]\n"
+     "authorityKeyIdentifier=keyid:always,issuer:always\n",
+     ["issuingDistributionPoint=critical, @idpsec\n" || C#config.issuing_distribution_point],
+
+     "[idpsec]\n"
+     "fullname=URI:http://localhost:8000/",C#config.commonName,"/crl.pem\n"
+
+     "[user_cert]\n"
+     "basicConstraints	= CA:false\n"
+     "keyUsage 		= nonRepudiation, digitalSignature, keyEncipherment\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     "crlDistributionPoints=@crl_section\n"
+
+     "[crl_section]\n"
+     %% intentionally invalid
+     "URI.1=http://localhost/",C#config.commonName,"/crl.pem\n"
+     "URI.2=http://localhost:",integer_to_list(C#config.crl_port),"/",C#config.commonName,"/crl.pem\n"
+     "\n"
+
+     "[user_cert_digital_signature_only]\n"
+     "basicConstraints	= CA:false\n"
+     "keyUsage 		= digitalSignature\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     "\n"
+
+     "[ca_cert]\n"
+     "basicConstraints 	= critical,CA:true\n"
+     "keyUsage 		= cRLSign, keyCertSign\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid:always,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     "crlDistributionPoints=@crl_section\n"
+    ];
+
+ca_cnf(C = #config{issuing_distribution_point = false}) ->
+    ["# Purpose: Configuration for CAs.\n"
+     "\n"
+     "ROOTDIR	        = $ENV::ROOTDIR\n"
+     "default_ca	= ca\n"
+     "\n"
+
+     "[ca]\n"
+     "dir		= $ROOTDIR/", C#config.commonName, "\n"
+     "certs		= $dir/certs\n"
+     "crl_dir	        = $dir/crl\n"
+     "database	        = $dir/index.txt\n"
+     "new_certs_dir	= $dir/newcerts\n"
+     "certificate	= $dir/cert.pem\n"
+     "serial		= $dir/serial\n"
+     "crl		= $dir/crl.pem\n",
+     ["crlnumber		= $dir/crlnumber\n" || C#config.v2_crls],
+     "private_key	= $dir/private/key.pem\n"
+     "RANDFILE	        = $dir/private/RAND\n"
+     "\n"
+     "x509_extensions   = user_cert\n",
+     ["crl_extensions = crl_ext\n" || C#config.v2_crls],
+     "unique_subject  = no\n"
+     "default_days	= 3600\n"
+     "default_md	= md5\n"
+     "preserve	        = no\n"
+     "policy		= policy_match\n"
+     "\n"
+
+     "[policy_match]\n"
+     "commonName		= supplied\n"
+     "organizationalUnitName	= optional\n"
+     "organizationName	        = match\n"
+     "countryName		= match\n"
+     "localityName		= match\n"
+     "emailAddress		= supplied\n"
+     "\n"
+
+     "[crl_ext]\n"
+     "authorityKeyIdentifier=keyid:always,issuer:always\n",
+     %["issuingDistributionPoint=critical, @idpsec\n" || C#config.issuing_distribution_point],
+
+     %"[idpsec]\n"
+     %"fullname=URI:http://localhost:8000/",C#config.commonName,"/crl.pem\n"
+
+     "[user_cert]\n"
+     "basicConstraints	= CA:false\n"
+     "keyUsage 		= nonRepudiation, digitalSignature, keyEncipherment\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     %"crlDistributionPoints=@crl_section\n"
+
+     %%"[crl_section]\n"
+     %% intentionally invalid
+     %%"URI.1=http://localhost/",C#config.commonName,"/crl.pem\n"
+     %%"URI.2=http://localhost:",integer_to_list(C#config.crl_port),"/",C#config.commonName,"/crl.pem\n"
+     %%"\n"
+
+     "[user_cert_digital_signature_only]\n"
+     "basicConstraints	= CA:false\n"
+     "keyUsage 		= digitalSignature\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     "\n"
+
+     "[ca_cert]\n"
+     "basicConstraints 	= critical,CA:true\n"
+     "keyUsage 		= cRLSign, keyCertSign\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid:always,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     %"crlDistributionPoints=@crl_section\n"
+    ].
diff --git a/lib/inets/test/old_httpd_SUITE.erl b/lib/inets/test/old_httpd_SUITE.erl
deleted file mode 100644
index 172db53844..0000000000
--- a/lib/inets/test/old_httpd_SUITE.erl
+++ /dev/null
@@ -1,2347 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-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(old_httpd_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include("inets_test_lib.hrl").
-
--include_lib("kernel/include/file.hrl").
-
-%% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
--export([init_per_testcase/2, end_per_testcase/2,
-	 init_per_suite/1, end_per_suite/1]).
-
-%% Core Server tests
--export([
-	 ip_mod_alias/1, 
-	 ip_mod_actions/1, 
-	 ip_mod_security/1, 
-	 ip_mod_auth/1,
-	 ip_mod_auth_api/1, 
-	 ip_mod_auth_mnesia_api/1, 
-	 ip_mod_htaccess/1, 
-	 ip_mod_cgi/1, 
-	 ip_mod_esi/1,
-	 ip_mod_get/1, 
-	 ip_mod_head/1, 
-	 ip_mod_all/1, 
-	 ip_load_light/1,
-	 ip_load_medium/1, 
-	 ip_load_heavy/1, 
-	 ip_dos_hostname/1, 
-	 ip_time_test/1, 
-	 ip_block_disturbing_idle/1, 
-	 ip_block_non_disturbing_idle/1, 
-	 ip_block_503/1, 
-	 ip_block_disturbing_active/1, 
-	 ip_block_non_disturbing_active/1, 
-	 ip_block_disturbing_active_timeout_not_released/1, 
-	 ip_block_disturbing_active_timeout_released/1, 
-	 ip_block_non_disturbing_active_timeout_not_released/1, 
-	 ip_block_non_disturbing_active_timeout_released/1, 
-	 ip_block_disturbing_blocker_dies/1, 
-	 ip_block_non_disturbing_blocker_dies/1, 
-	 ip_restart_no_block/1, 
-	 ip_restart_disturbing_block/1, 
-	 ip_restart_non_disturbing_block/1
-	]).
-
--export([
-	 essl_mod_alias/1, 
-	 essl_mod_actions/1, 
-	 essl_mod_security/1, 
-	 essl_mod_auth/1, 
-	 essl_mod_auth_api/1,  
-	 essl_mod_auth_mnesia_api/1, 
-	 essl_mod_htaccess/1, 
-	 essl_mod_cgi/1,
-	 essl_mod_esi/1, 
-	 essl_mod_get/1, 
-	 essl_mod_head/1, 
-	 essl_mod_all/1, 
-	 essl_load_light/1, 
-	 essl_load_medium/1, 
-	 essl_load_heavy/1, 
-	 essl_dos_hostname/1, 
-	 essl_time_test/1,
-	 essl_restart_no_block/1, 
-	 essl_restart_disturbing_block/1,
-	 essl_restart_non_disturbing_block/1, 
-	 essl_block_disturbing_idle/1, 
-	 essl_block_non_disturbing_idle/1, 
-	 essl_block_503/1, 
-	 essl_block_disturbing_active/1, 
-	 essl_block_non_disturbing_active/1, 
-	 essl_block_disturbing_active_timeout_not_released/1, 
-	 essl_block_disturbing_active_timeout_released/1, 
-	 essl_block_non_disturbing_active_timeout_not_released/1, 
-	 essl_block_non_disturbing_active_timeout_released/1, 
-	 essl_block_disturbing_blocker_dies/1, 
-	 essl_block_non_disturbing_blocker_dies/1
-	]).
-
-%%% HTTP 1.1 tests
--export([ip_host/1, ip_chunked/1, ip_expect/1, ip_range/1,
-	 ip_if_test/1, ip_http_trace/1, ip_http1_1_head/1, 
-	 ip_mod_cgi_chunked_encoding_test/1]).
-
-%%% HTTP 1.0 tests
--export([ip_head_1_0/1, ip_get_1_0/1, ip_post_1_0/1]).
-
-%%% HTTP 0.9 tests
--export([ip_get_0_9/1]).
-
-%%% Ticket tests
--export([ticket_5775/1,ticket_5865/1,ticket_5913/1,ticket_6003/1,
-	 ticket_7304/1]).
-
-%%% IPv6 tests
--export([ipv6_hostname_ipcomm/0, ipv6_hostname_ipcomm/1, 
-	 ipv6_address_ipcomm/0,  ipv6_address_ipcomm/1, 
-	 ipv6_hostname_essl/0,   ipv6_hostname_essl/1,   
-	 ipv6_address_essl/0,    ipv6_address_essl/1]).
-
-%% Help functions 
--export([cleanup_mnesia/0, setup_mnesia/0, setup_mnesia/1]).
-
--define(IP_PORT, 8898).
--define(SSL_PORT, 8899).
--define(MAX_HEADER_SIZE, 256).
--define(IPV6_LOCAL_HOST, "0:0:0:0:0:0:0:1").
-
-%% Minutes before failed auths timeout.
--define(FAIL_EXPIRE_TIME,1). 
-
-%% Seconds before successful auths timeout.
--define(AUTH_TIMEOUT,5).
-
--record(httpd_user,  {user_name, password, user_data}).
--record(httpd_group, {group_name, userlist}).
-
-
-%%--------------------------------------------------------------------
-%% all(Arg) -> [Doc] | [Case] | {skip, Comment}
-%% Arg - doc | suite
-%% Doc - string()
-%% Case - atom() 
-%%	Name of a test case function. 
-%% Comment - string()
-%% Description: Returns documentation/test cases in this test suite
-%%		or a skip tuple if the platform is not supported.  
-%%--------------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [
-     {group, ip}, 
-     {group, ssl}, 
-     %%{group, http_1_1_ip},
-     %%{group, http_1_0_ip}, 
-     %%{group, http_0_9_ip},
-     %%{group, ipv6}, 
-     {group, tickets}
-    ].
-
-groups() -> 
-    [
-     {ip, [],
-      [
-       %%ip_mod_alias, 
-       ip_mod_actions, 
-       %%ip_mod_security,
-       %% ip_mod_auth, 
-       %% ip_mod_auth_api, 
-       ip_mod_auth_mnesia_api,
-       %%ip_mod_htaccess, 
-       %%ip_mod_cgi, 
-       %%ip_mod_esi, 
-       %%ip_mod_get,
-       %%ip_mod_head, 
-       %%ip_mod_all, 
-       %% ip_load_light, 
-       %% ip_load_medium,
-       %% ip_load_heavy, 
-       %%ip_dos_hostname, 
-       ip_time_test,
-       %% Only used through load_config
-       %% but we still need these tests
-       %% should be cleaned up and moved to new test suite 
-       %%ip_restart_no_block, 
-       %%ip_restart_disturbing_block,
-       %%ip_restart_non_disturbing_block,
-       %% Tested in inets_SUITE
-       %%ip_block_disturbing_idle, 
-       %%ip_block_non_disturbing_idle,
-       ip_block_503
-       %% Tested in new httpd_SUITE
-       %%ip_block_disturbing_active,
-       %%ip_block_non_disturbing_active,
-       %%ip_block_disturbing_blocker_dies,
-       %%ip_block_non_disturbing_blocker_dies
-       %% No longer relevant
-       %%ip_block_disturbing_active_timeout_not_released,
-       %%ip_block_disturbing_active_timeout_released,
-       %%ip_block_non_disturbing_active_timeout_not_released,
-       %%ip_block_non_disturbing_active_timeout_released,
-      ]},
-     {ssl, [], [{group, essl}]},
-     {essl, [],
-      [
-       %%essl_mod_alias, 
-       essl_mod_actions, 
-       %% essl_mod_security,
-       %% essl_mod_auth, 
-       %% essl_mod_auth_api,
-       essl_mod_auth_mnesia_api, 
-       %%essl_mod_htaccess,
-       %%essl_mod_cgi, 
-       %%essl_mod_esi, 
-       %%essl_mod_get, 
-       %%essl_mod_head,
-       %% essl_mod_all, 
-       %% essl_load_light, 
-       %% essl_load_medium,
-       %% essl_load_heavy, 
-       %%essl_dos_hostname, 
-       essl_time_test
-       %% Replaced by load_config
-       %% essl_restart_no_block, 
-       %% essl_restart_disturbing_block,
-       %% essl_restart_non_disturbing_block,
-       %% essl_block_disturbing_idle,
-       %% essl_block_non_disturbing_idle, essl_block_503,
-       %% essl_block_disturbing_active,
-       %% essl_block_non_disturbing_active,
-       %% essl_block_disturbing_active_timeout_not_released,
-       %% essl_block_disturbing_active_timeout_released,
-       %% essl_block_non_disturbing_active_timeout_not_released,
-       %% essl_block_non_disturbing_active_timeout_released,
-       %% essl_block_disturbing_blocker_dies,
-       %%  essl_block_non_disturbing_blocker_dies
-      ]},
-     %% {http_1_1_ip, [],
-     %%  [
-     %%   %%ip_host, ip_chunked, ip_expect, 
-     %%   %%ip_range, 
-     %%   %%ip_if_test
-     %%   %%ip_http_trace, ip_http1_1_head,
-     %%   %%ip_mod_cgi_chunked_encoding_test
-     %%  ]},
-     %%{http_1_0_ip, [],
-      %%[ip_head_1_0, ip_get_1_0, ip_post_1_0]},
-     %%{http_0_9_ip, [], [ip_get_0_9]},
-     %% {ipv6, [], [ipv6_hostname_ipcomm, ipv6_address_ipcomm, 
-     %% 		 ipv6_hostname_essl,   ipv6_address_essl]},
-     {tickets, [],
-      [%%ticket_5775, ticket_5865, 
-       ticket_5913%%, ticket_6003,
-       %%ticket_7304
-      ]}].
-
-init_per_group(ipv6 = _GroupName, Config) ->
-    case inets_test_lib:has_ipv6_support() of
-	{ok, _} ->
-	    Config;
-	_ ->
-	    {skip, "Host does not support IPv6"}
-    end;
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initiation before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    io:format(user, "init_per_suite -> entry with"
-	      "~n   Config: ~p"
-	      "~n", [Config]),
-
-    PrivDir = proplists:get_value(priv_dir, Config),
-    SuiteTopDir = filename:join(PrivDir, ?MODULE),
-    case file:make_dir(SuiteTopDir) of
-        ok ->
-            ok;
-        {error, eexist} ->
-            ok;
-        Error ->
-            throw({error, {failed_creating_suite_top_dir, Error}})
-    end,
-
-    [{has_ipv6_support, inets_test_lib:has_ipv6_support()}, 
-     {suite_top_dir,    SuiteTopDir},
-     {node,             node()},
-     {host,             inets_test_lib:hostname()},
-     {address,          getaddr()} | Config].
-
-
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> _
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after the whole suite
-%%--------------------------------------------------------------------
-
-end_per_suite(_Config) ->
-    %% SuiteTopDir = proplists:get_value(suite_top_dir, Config), 
-    %% inets_test_lib:del_dirs(SuiteTopDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% Function: init_per_testcase(Case, Config) -> Config
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Initiation before each test case
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    NewConfig = init_per_testcase2(Case, Config), 
-    init_per_testcase3(Case, NewConfig).
-
-
-init_per_testcase2(Case, Config) ->
-
-    %% tsp("init_per_testcase2 -> entry with"
-    %% 	"~n   Config: ~p", [Config]),
-    
-    IpNormal    = integer_to_list(?IP_PORT)    ++ ".conf",
-    IpHtaccess  = integer_to_list(?IP_PORT)   ++ "htaccess.conf",
-    SslNormal   = integer_to_list(?SSL_PORT)  ++ ".conf",
-    SslHtaccess = integer_to_list(?SSL_PORT) ++ "htaccess.conf",
-
-    DataDir     = proplists:get_value(data_dir, Config),
-    SuiteTopDir = proplists:get_value(suite_top_dir, Config),
-
-    %% tsp("init_per_testcase2 -> "
-    %% 	"~n   SuiteDir: ~p"
-    %% 	"~n   DataDir:  ~p", [SuiteTopDir, DataDir]),
-    
-    TcTopDir = filename:join(SuiteTopDir, Case),
-    ?line ok = file:make_dir(TcTopDir),
-
-    %% tsp("init_per_testcase2 -> "
-    %% 	"~n   TcTopDir: ~p", [TcTopDir]),
-
-    DataSrc    = filename:join([DataDir, "server_root"]),
-    ServerRoot = filename:join([TcTopDir, "server_root"]),
-    
-    %% tsp("init_per_testcase2 -> "
-    %% 	"~n   DataSrc:    ~p"
-    %% 	"~n   ServerRoot: ~p", [DataSrc, ServerRoot]),
-
-    ok = file:make_dir(ServerRoot),
-    ok = file:make_dir(filename:join([TcTopDir, "logs"])),
-
-    NewConfig = [{tc_top_dir, TcTopDir}, {server_root, ServerRoot} | Config],
-
-    %% tsp("init_per_testcase2 -> copy DataSrc to ServerRoot"),
-
-    inets_test_lib:copy_dirs(DataSrc, ServerRoot),
-
-    %% tsp("init_per_testcase2 -> fix cgi"),
-    EnvCGI =  filename:join([ServerRoot, "cgi-bin", "printenv.sh"]),
-    {ok, FileInfo} = file:read_file_info(EnvCGI),
-    ok = file:write_file_info(EnvCGI, 
-			      FileInfo#file_info{mode = 8#00755}),
-    
-    EchoCGI = case test_server:os_type() of
-	      {win32, _} ->
-		  "cgi_echo.exe";
-	      _ ->
-		  "cgi_echo"
-	      end,
-    CGIDir = filename:join([ServerRoot, "cgi-bin"]),
-    inets_test_lib:copy_file(EchoCGI, DataDir,  CGIDir),
-    NewEchoCGI = filename:join([CGIDir, EchoCGI]),
-    {ok, FileInfo1} = file:read_file_info(NewEchoCGI),
-    ok = file:write_file_info(NewEchoCGI, 
-			      FileInfo1#file_info{mode = 8#00755}),
-    
-    %% To be used by IP test cases
-    %% tsp("init_per_testcase2 -> ip testcase setups"),
-    create_config([{port, ?IP_PORT}, {sock_type, ip_comm} | NewConfig], 
-		  normal_access, IpNormal), 
-    create_config([{port, ?IP_PORT}, {sock_type, ip_comm} | NewConfig], 
-    		  mod_htaccess, IpHtaccess), 
-
-    %% To be used by SSL test cases
-    %% tsp("init_per_testcase2 -> ssl testcase setups"),
-    SocketType = 
-	case atom_to_list(Case) of
-	    [X, $s, $s, $l | _] ->
-		case X of
-		    $p -> ssl;
-		    $e -> essl
-		end;
-	    _ ->
-		ssl
-	end,
-
-    create_config([{port, ?SSL_PORT}, {sock_type, SocketType} | NewConfig], 
-		  normal_access, SslNormal),
-    create_config([{port, ?SSL_PORT}, {sock_type, SocketType} | NewConfig],
-    		  mod_htaccess, SslHtaccess),  
-  
-    %% To be used by IPv6 test cases. Case-clause is so that
-    %% you can do ts:run(inets, httpd_SUITE, <test case>)
-    %% for all cases except the ipv6 cases as they depend
-    %% on  'test_host_ipv6_only' that will only be present
-    %% when you run the whole test suite due  to shortcomings
-    %% of the test server.
-
-    tsp("init_per_testcase2 -> maybe generate IPv6 config file(s)"),
-    NewConfig2 = 
-	case atom_to_list(Case) of
-	    "ipv6_" ++ _ ->
-		case (catch inets_test_lib:has_ipv6_support(NewConfig)) of
-		    {ok, IPv6Address0} ->
-			{ok, Hostname} = inet:gethostname(), 
-			IPv6Address = http_transport:ipv6_name(IPv6Address0), 
-			create_ipv6_config([{port, ?IP_PORT}, 
-					    {sock_type, ip_comm},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_hostname_ipcomm.conf", 
-					   Hostname),
-			create_ipv6_config([{port, ?IP_PORT}, 
-					    {sock_type, ip_comm},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_address_ipcomm.conf",  
-					   IPv6Address),
-			create_ipv6_config([{port, ?SSL_PORT}, 
-					    {sock_type, essl},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_hostname_essl.conf", 
-					   Hostname),
-			create_ipv6_config([{port, ?SSL_PORT}, 
-					    {sock_type, essl},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_address_essl.conf",  
-					   IPv6Address),
-			[{ipv6_host, IPv6Address} | NewConfig];
-		    _ ->
-			NewConfig
-		end;
-
-	    _ ->
-		NewConfig
-	end,
-
-    %% tsp("init_per_testcase2 -> done when"
-    %% 	"~n   NewConfig2: ~p", [NewConfig2]),
-
-    NewConfig2.
-
-
-init_per_testcase3(Case, Config) ->
-    tsp("init_per_testcase3(~w) -> entry with"
-	"~n   Config: ~p", [Case, Config]),
-
-    
-%%     %% Create a new fresh node to be used by the server in this test-case
-    
-%%     NodeName = list_to_atom(atom_to_list(Case) ++ "_httpd"), 
-%%     Node     = inets_test_lib:start_node(NodeName),
-    
-    %% Clean up (we do not want this clean up in end_per_testcase
-    %% if init_per_testcase crashes for some testcase it will
-    %% have contaminated the environment and there will be no clean up.)
-    %% This init can take a few different paths so that one crashes
-    %% does not mean that all invocations will.
-
-    application:unset_env(inets, services),
-    application:stop(inets),
-    application:stop(ssl),
-    cleanup_mnesia(),
- 
-    %% Start initialization
-    tsp("init_per_testcase3(~w) -> start init", [Case]),
- 
-    Dog = test_server:timetrap(inets_test_lib:minutes(10)),
-    NewConfig = lists:keydelete(watchdog, 1, Config),
-    TcTopDir = proplists:get_value(tc_top_dir, Config),
-      
-    CaseRest = 
-	case atom_to_list(Case) of
-	    "ip_mod_htaccess" ->
-		inets_test_lib:start_http_server(
-		  filename:join(TcTopDir,
-				integer_to_list(?IP_PORT) ++
-				"htaccess.conf")),
-		"mod_htaccess";
-	    "ip_" ++ Rest ->
-		inets_test_lib:start_http_server(
-		  filename:join(TcTopDir,
-				integer_to_list(?IP_PORT) ++ ".conf")),
-		Rest;
-	    "ticket_5913" ->
-		HttpdOptions =
-		    [{file,
-		      filename:join(TcTopDir,
-				    integer_to_list(?IP_PORT) ++ ".conf")},
-		     {accept_timeout,30000},
-		     {debug,[{exported_functions,
-			      [httpd_manager,httpd_request_handler]}]}],
-		inets_test_lib:start_http_server(HttpdOptions);
-	    "ticket_"++Rest ->
-		%% OTP-5913 use the new syntax of inets.config 
-		inets_test_lib:start_http_server([{file,
-		  filename:join(TcTopDir,
-				integer_to_list(?IP_PORT) ++ ".conf")}]),
-		Rest;
-
-	    [X, $s, $s, $l, $_, $m, $o, $d, $_, $h, $t, $a, $c, $c, $e, $s, $s] ->
-		?ENSURE_STARTED([crypto, public_key, ssl]),		
-		SslTag = 
-		    case X of
-			$p -> ssl;  % Plain
-			$e -> essl  % Erlang based ssl
-		    end,
-		case inets_test_lib:start_http_server_ssl(
-		       filename:join(TcTopDir,
-				     integer_to_list(?SSL_PORT) ++ 
-				     "htaccess.conf"), SslTag) of
-		    ok ->
-			"mod_htaccess";
-		    Other ->
-			error_logger:info_msg("Other: ~p~n", [Other]),
-			{skip, "SSL does not seem to be supported"}
-		end;
-	    [X, $s, $s, $l, $_ | Rest] ->
-		?ENSURE_STARTED([crypto, public_key, ssl]),		
-		SslTag = 
-		    case X of
-			$p -> ssl;
-			$e -> essl
-		    end,
-		case inets_test_lib:start_http_server_ssl(
-		       filename:join(TcTopDir,
-				     integer_to_list(?SSL_PORT) ++ 
-				     ".conf"), SslTag) of
-		    ok ->
-			Rest;
-		    Other ->
-			error_logger:info_msg("Other: ~p~n", [Other]),
-			{skip, "SSL does not seem to be supported"}
-		end;
-	    "ipv6_" ++ _  = TestCaseStr ->
-		case inets_test_lib:has_ipv6_support() of
-		    {ok, _} ->
-			inets_test_lib:start_http_server(
-			  filename:join(TcTopDir,
-					TestCaseStr ++ ".conf"));
-		    
-		    _ ->
-			{skip, "Host does not support IPv6"}
-		end
-	end,
-
-    InitRes = 
-	case CaseRest of
-	    {skip, _} = Skip ->
-		Skip;
-	    "mod_auth_" ++ _ ->
-		start_mnesia(proplists:get_value(node, Config)),
-		[{watchdog, Dog} | NewConfig];
-	    "mod_htaccess" ->
-		ServerRoot = proplists:get_value(server_root, Config), 
-		Path = filename:join([ServerRoot, "htdocs"]),
-		catch remove_htaccess(Path),
-		create_htaccess_data(Path, proplists:get_value(address, Config)),
-		[{watchdog, Dog} | NewConfig];
-	    "range" ->
-		ServerRoot = proplists:get_value(server_root, Config), 
-		Path = filename:join([ServerRoot, "htdocs"]),
-		create_range_data(Path),
-		[{watchdog, Dog} | NewConfig];
-	    _ ->
-		[{watchdog, Dog} | NewConfig]
-	end,
-    
-    tsp("init_per_testcase3(~w) -> done when"
-	"~n   InitRes: ~p", [Case, InitRes]),
-
-    InitRes.
-
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(Case, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
-end_per_testcase(Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    end_per_testcase2(Case, lists:keydelete(watchdog, 1, Config)),
-    ok.
-
-end_per_testcase2(Case, Config) ->
-    tsp("end_per_testcase2(~w) -> entry with"
-	"~n   Config: ~p", [Case, Config]),
-    application:unset_env(inets, services),
-    application:stop(inets),
-    application:stop(ssl),     
-    application:stop(crypto), % used by the new ssl (essl test cases)  
-    cleanup_mnesia(),
-    tsp("end_per_testcase2(~w) -> done", [Case]),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-%% Test cases starts here.
-%%-------------------------------------------------------------------------
-
-%%-------------------------------------------------------------------------
-ip_mod_alias(doc) -> 
-    ["Module test: mod_alias"];
-ip_mod_alias(suite) -> 
-    [];
-ip_mod_alias(Config) when is_list(Config) ->
-    httpd_mod:alias(ip_comm, ?IP_PORT, 
-		    proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_actions(doc) -> 
-    ["Module test: mod_actions"];
-ip_mod_actions(suite) -> 
-    [];
-ip_mod_actions(Config) when is_list(Config) ->
-    httpd_mod:actions(ip_comm, ?IP_PORT, 
-		      proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_security(doc) -> 
-    ["Module test: mod_security"];
-ip_mod_security(suite) -> 
-    [];
-ip_mod_security(Config) when is_list(Config) ->
-    ServerRoot = proplists:get_value(server_root, Config), 
-    httpd_mod:security(ServerRoot, ip_comm, ?IP_PORT, 
-		       proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_auth(doc) -> 
-    ["Module test: mod_auth"];
-ip_mod_auth(suite) -> 
-    [];
-ip_mod_auth(Config) when is_list(Config) ->
-    httpd_mod:auth(ip_comm, ?IP_PORT, 
-		   proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_auth_api(doc) -> 
-    ["Module test: mod_auth_api"];
-ip_mod_auth_api(suite) -> 
-    [];
-ip_mod_auth_api(Config) when is_list(Config) ->
-    ServerRoot = proplists:get_value(server_root, Config), 
-    Host =  proplists:get_value(host, Config),
-    Node = proplists:get_value(node, Config),
-    httpd_mod:auth_api(ServerRoot, "", ip_comm, ?IP_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "dets_", ip_comm, ?IP_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "mnesia_", ip_comm, ?IP_PORT, Host, Node),
-    ok. 
-%%-------------------------------------------------------------------------
-ip_mod_auth_mnesia_api(doc) -> 
-    ["Module test: mod_auth_mnesia_api"];
-ip_mod_auth_mnesia_api(suite) -> 
-    [];
-ip_mod_auth_mnesia_api(Config) when is_list(Config) ->
-    httpd_mod:auth_mnesia_api(ip_comm, ?IP_PORT, 
-		   proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_htaccess(doc) -> 
-    ["Module test: mod_htaccess"];
-ip_mod_htaccess(suite) -> 
-    [];
-ip_mod_htaccess(Config) when is_list(Config) ->
-    httpd_mod:htaccess(ip_comm, ?IP_PORT, 
-		       proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_cgi(doc) ->
-    ["Module test: mod_cgi"];
-ip_mod_cgi(suite) ->
-    [];
-ip_mod_cgi(Config) when is_list(Config) ->
-    httpd_mod:cgi(ip_comm, ?IP_PORT, 
-	proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_esi(doc) ->
-    ["Module test: mod_esi"];
-ip_mod_esi(suite) ->
-    [];
-ip_mod_esi(Config) when is_list(Config) ->
-    httpd_mod:esi(ip_comm, ?IP_PORT, 
-		  proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_get(doc) ->
-    ["Module test: mod_get"];
-ip_mod_get(suite) ->
-    [];
-ip_mod_get(Config) when is_list(Config) ->
-    httpd_mod:get(ip_comm, ?IP_PORT, 
-		  proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_head(doc) ->
-    ["Module test: mod_head"];
-ip_mod_head(suite) ->
-    [];
-ip_mod_head(Config) when is_list(Config) ->
-    httpd_mod:head(ip_comm, ?IP_PORT, 
-		   proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_all(doc) ->
-    ["All modules test"];
-ip_mod_all(suite) ->
-    [];
-ip_mod_all(Config) when is_list(Config) ->
-    httpd_mod:all(ip_comm, ?IP_PORT, 
-		  proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_load_light(doc) ->
-    ["Test light load"];
-ip_load_light(suite) ->
-    [];
-ip_load_light(Config) when is_list(Config) ->
-    httpd_load:load_test(ip_comm, ?IP_PORT, proplists:get_value(host, Config), 
-			 proplists:get_value(node, Config),
-			 get_nof_clients(ip_comm, light)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_load_medium(doc) ->
-    ["Test  medium load"];
-ip_load_medium(suite) ->
-    [];
-ip_load_medium(Config) when is_list(Config) ->
-      httpd_load:load_test(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-			   proplists:get_value(node, Config),
-			   get_nof_clients(ip_comm, medium)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_load_heavy(doc) ->
-    ["Test heavy load"];
-ip_load_heavy(suite) ->
-    [];
-ip_load_heavy(Config) when is_list(Config) ->
-     httpd_load:load_test(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-			  proplists:get_value(node, Config),
-			  get_nof_clients(ip_comm, heavy)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-ip_dos_hostname(doc) ->
-    ["Denial Of Service (DOS) attack test case"];
-ip_dos_hostname(suite) ->
-    [];
-ip_dos_hostname(Config) when is_list(Config) ->
-    dos_hostname(ip_comm, ?IP_PORT, proplists:get_value(host, Config), 
-		 proplists:get_value(node, Config), ?MAX_HEADER_SIZE),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-ip_time_test(doc) ->
-    [""];
-ip_time_test(suite) ->
-    [];
-ip_time_test(Config) when is_list(Config) ->
-    httpd_time_test:t(ip_comm, proplists:get_value(host, Config), ?IP_PORT),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_block_503(doc) ->
-    ["Check that you will receive status code 503 when the server"
-     " is blocked and 200 when its not blocked."];
-ip_block_503(suite) ->
-    [];
-ip_block_503(Config) when is_list(Config) ->
-    httpd_block:block_503(ip_comm, ?IP_PORT, proplists:get_value(host, Config), 
-				 proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "distribing does not really make a difference in this case."];
-ip_block_disturbing_idle(suite) ->
-    [];
-ip_block_disturbing_idle(Config) when is_list(Config) ->
-    httpd_block:block_disturbing_idle(ip_comm, ?IP_PORT, 
-				      proplists:get_value(host, Config), 
-				      proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing does not really make a difference in this case."];
-ip_block_non_disturbing_idle(suite) ->
-    [];
-ip_block_non_disturbing_idle(Config) when is_list(Config) ->
-    httpd_block:block_non_disturbing_idle(ip_comm, ?IP_PORT, 
-					  proplists:get_value(host, Config), 
-					  proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_active(doc) ->
-    ["Check that you can block/unblock an active server. The strategy " 
-     "distribing means ongoing requests should be terminated."];
-ip_block_disturbing_active(suite) ->
-    [];
-ip_block_disturbing_active(Config) when is_list(Config) ->
-    httpd_block:block_disturbing_active(ip_comm, ?IP_PORT, 
-					proplists:get_value(host, Config), 
-					proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_active(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing means the ongoing requests should be compleated."];
-ip_block_non_disturbing_active(suite) ->
-    [];
-ip_block_non_disturbing_active(Config) when is_list(Config) ->
-    httpd_block:block_non_disturbing_idle(ip_comm, ?IP_PORT, 
-					  proplists:get_value(host, Config), 
-					  proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_block_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be compleated"
-     "if the timeout does not occur."];
-ip_block_disturbing_active_timeout_not_released(suite) ->
-    [];
-ip_block_disturbing_active_timeout_not_released(Config) 
-  when is_list(Config) ->
-    httpd_block:block_disturbing_active_timeout_not_released(ip_comm, 
-							     ?IP_PORT, 
-							     proplists:get_value(host,
-								     Config), 
-							     proplists:get_value(node, 
-								     Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be terminated when"
-     "the timeout occurs."];
-ip_block_disturbing_active_timeout_released(suite) ->
-    [];
-ip_block_disturbing_active_timeout_released(Config) 
-  when is_list(Config) ->
-    httpd_block:block_disturbing_active_timeout_released(ip_comm, 
-							 ?IP_PORT, 
-							 proplists:get_value(host,
-								 Config), 
-							 proplists:get_value(node, 
-								 Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed."];
-ip_block_non_disturbing_active_timeout_not_released(suite) ->
-    [];
-ip_block_non_disturbing_active_timeout_not_released(Config)
-  when is_list(Config) ->
-    httpd_block:
-	block_non_disturbing_active_timeout_not_released(ip_comm,
-							 ?IP_PORT, 
-							 proplists:get_value(host, 
-								 Config), 
-							 proplists:get_value(node, 
-								 Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed. "
-     "When the timeout occurs the block operation sohould be canceled." ];
-ip_block_non_disturbing_active_timeout_released(suite) ->
-    [];
-ip_block_non_disturbing_active_timeout_released(Config)
-  when is_list(Config) ->
-    httpd_block:
-	block_non_disturbing_active_timeout_released(ip_comm,
-						     ?IP_PORT, 
-						     proplists:get_value(host, 
-							     Config), 
-						     proplists:get_value(node, 
-							     Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_blocker_dies(doc) ->
-    [];
-ip_block_disturbing_blocker_dies(suite) ->
-    [];
-ip_block_disturbing_blocker_dies(Config) when is_list(Config) ->
-    httpd_block:disturbing_blocker_dies(ip_comm, ?IP_PORT, 
-					proplists:get_value(host, Config), 
-					proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_blocker_dies(doc) ->
-    [];
-ip_block_non_disturbing_blocker_dies(suite) ->
-    [];
-ip_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
-    httpd_block:non_disturbing_blocker_dies(ip_comm, ?IP_PORT, 
-					    proplists:get_value(host, Config), 
-					    proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_restart_no_block(doc) ->
-    [""];
-ip_restart_no_block(suite) ->
-    [];
-ip_restart_no_block(Config) when is_list(Config) ->
-    httpd_block:restart_no_block(ip_comm, ?IP_PORT, proplists:get_value(host, Config), 
-				 proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_restart_disturbing_block(doc) ->
-    [""];
-ip_restart_disturbing_block(suite) ->
-    [];
-ip_restart_disturbing_block(Config) when is_list(Config) ->
-    httpd_block:restart_disturbing_block(ip_comm, ?IP_PORT, 
-					 proplists:get_value(host, Config),
-					 proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_restart_non_disturbing_block(doc) ->
-    [""];
-ip_restart_non_disturbing_block(suite) ->
-    [];
-ip_restart_non_disturbing_block(Config) when is_list(Config) ->
-    httpd_block:restart_non_disturbing_block(ip_comm, ?IP_PORT,
-					    proplists:get_value(host, Config), 
-					    proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-
-essl_mod_alias(doc) -> 
-    ["Module test: mod_alias - using new of configure new SSL"];
-essl_mod_alias(suite) -> 
-    [];
-essl_mod_alias(Config) when is_list(Config) ->
-    ssl_mod_alias(essl, Config).
-
-
-ssl_mod_alias(Tag, Config) ->
-    httpd_mod:alias(Tag, ?SSL_PORT, 
-		    proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok. 
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_actions(doc) -> 
-    ["Module test: mod_actions - using new of configure new SSL"];
-essl_mod_actions(suite) -> 
-    [];
-essl_mod_actions(Config) when is_list(Config) ->
-    ssl_mod_actions(essl, Config).
-
-
-ssl_mod_actions(Tag, Config) ->
-    httpd_mod:actions(Tag, 
-		      ?SSL_PORT, 
-		      proplists:get_value(host, Config), 
-		      proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_security(doc) -> 
-    ["Module test: mod_security - using new of configure new SSL"];
-essl_mod_security(suite) -> 
-    [];
-essl_mod_security(Config) when is_list(Config) ->
-    ssl_mod_security(essl, Config).
-
-ssl_mod_security(Tag, Config) ->
-    ServerRoot = proplists:get_value(server_root, Config), 
-    httpd_mod:security(ServerRoot, 
-		       Tag, 
-		       ?SSL_PORT, 
-		       proplists:get_value(host, Config), 
-		       proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_auth(doc) -> 
-    ["Module test: mod_auth - using new of configure new SSL"];
-essl_mod_auth(suite) -> 
-    [];
-essl_mod_auth(Config) when is_list(Config) ->
-    ssl_mod_auth(essl, Config).
-
-ssl_mod_auth(Tag, Config) ->
-    httpd_mod:auth(Tag, 
-		   ?SSL_PORT, 
-		   proplists:get_value(host, Config), 
-		   proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_mod_auth_api(doc) -> 
-    ["Module test: mod_auth - using new of configure new SSL"];
-essl_mod_auth_api(suite) -> 
-    [];
-essl_mod_auth_api(Config) when is_list(Config) ->
-    ssl_mod_auth_api(essl, Config).
-
-ssl_mod_auth_api(Tag, Config) ->
-    ServerRoot = proplists:get_value(server_root, Config), 
-    Host       =  proplists:get_value(host, Config),
-    Node       = proplists:get_value(node, Config),
-    httpd_mod:auth_api(ServerRoot, "",        Tag, ?SSL_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "dets_",   Tag, ?SSL_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "mnesia_", Tag, ?SSL_PORT, Host, Node),
-    ok. 
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_mod_auth_mnesia_api(doc) -> 
-    ["Module test: mod_auth_mnesia_api - using new of configure new SSL"];
-essl_mod_auth_mnesia_api(suite) -> 
-    [];
-essl_mod_auth_mnesia_api(Config) when is_list(Config) ->
-    ssl_mod_auth_mnesia_api(essl, Config).
-
-ssl_mod_auth_mnesia_api(Tag, Config) ->
-    httpd_mod:auth_mnesia_api(Tag, 
-			      ?SSL_PORT, 
-			      proplists:get_value(host, Config), 
-			      proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_htaccess(doc) -> 
-    ["Module test: mod_htaccess - using new of configure new SSL"];
-essl_mod_htaccess(suite) -> 
-    [];
-essl_mod_htaccess(Config) when is_list(Config) ->
-    ssl_mod_htaccess(essl, Config).
-
-ssl_mod_htaccess(Tag, Config) ->
-    httpd_mod:htaccess(Tag, 
-		       ?SSL_PORT, 
-		       proplists:get_value(host, Config), 
-		       proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_cgi(doc) ->
-    ["Module test: mod_cgi - using new of configure new SSL"];
-essl_mod_cgi(suite) ->
-    [];
-essl_mod_cgi(Config) when is_list(Config) ->
-    ssl_mod_cgi(essl, Config).
-
-ssl_mod_cgi(Tag, Config) ->
-    httpd_mod:cgi(Tag, 
-	?SSL_PORT, 
-	proplists:get_value(host, Config), 
-	proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_esi(doc) ->
-    ["Module test: mod_esi - using new of configure new SSL"];
-essl_mod_esi(suite) ->
-    [];
-essl_mod_esi(Config) when is_list(Config) ->
-    ssl_mod_esi(essl, Config).
-
-ssl_mod_esi(Tag, Config) ->
-    httpd_mod:esi(Tag, 
-		  ?SSL_PORT, 
-		  proplists:get_value(host, Config), 
-		  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_get(doc) ->
-    ["Module test: mod_get - using new of configure new SSL"];
-essl_mod_get(suite) ->
-    [];
-essl_mod_get(Config) when is_list(Config) ->
-    ssl_mod_get(essl, Config).
-
-ssl_mod_get(Tag, Config) ->
-    httpd_mod:get(Tag, 
-		  ?SSL_PORT, 
-		  proplists:get_value(host, Config), 
-		  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_head(doc) ->
-    ["Module test: mod_head - using new of configure new SSL"];
-essl_mod_head(suite) ->
-    [];
-essl_mod_head(Config) when is_list(Config) ->
-    ssl_mod_head(essl, Config).
-
-ssl_mod_head(Tag, Config) ->
-    httpd_mod:head(Tag, 
-		   ?SSL_PORT, 
-		   proplists:get_value(host, Config), 
-		   proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_all(doc) ->
-    ["All modules test - using new of configure new SSL"];
-essl_mod_all(suite) ->
-    [];
-essl_mod_all(Config) when is_list(Config) ->
-    ssl_mod_all(essl, Config).
-
-ssl_mod_all(Tag, Config) ->
-    httpd_mod:all(Tag, 
-		  ?SSL_PORT, 
-		  proplists:get_value(host, Config), 
-		  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_load_light(doc) ->
-    ["Test light load - using new of configure new SSL"];
-essl_load_light(suite) ->
-    [];
-essl_load_light(Config) when is_list(Config) ->
-    ssl_load_light(essl, Config).
-
-ssl_load_light(Tag, Config) ->
-    httpd_load:load_test(Tag, 
-			 ?SSL_PORT, 
-			 proplists:get_value(host, Config), 
-			 proplists:get_value(node, Config),
-			 get_nof_clients(ssl, light)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_load_medium(doc) ->
-    ["Test medium load - using new of configure new SSL"];
-essl_load_medium(suite) ->
-    [];
-essl_load_medium(Config) when is_list(Config) ->
-    ssl_load_medium(essl, Config).
-
-ssl_load_medium(Tag, Config) ->
-    httpd_load:load_test(Tag, 
-			 ?SSL_PORT, 
-			 proplists:get_value(host, Config), 
-			 proplists:get_value(node, Config),
-			 get_nof_clients(ssl, medium)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_load_heavy(doc) ->
-    ["Test heavy load - using new of configure new SSL"];
-essl_load_heavy(suite) ->
-    [];
-essl_load_heavy(Config) when is_list(Config) ->
-    ssl_load_heavy(essl, Config).
-
-ssl_load_heavy(Tag, Config) ->
-    httpd_load:load_test(Tag, 
-			 ?SSL_PORT, 
-			 proplists:get_value(host, Config), 
-			 proplists:get_value(node, Config),
-			 get_nof_clients(ssl, heavy)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_dos_hostname(doc) ->
-    ["Denial Of Service (DOS) attack test case - using new of configure new SSL"];
-essl_dos_hostname(suite) ->
-    [];
-essl_dos_hostname(Config) when is_list(Config) ->
-    ssl_dos_hostname(essl, Config).
-
-ssl_dos_hostname(Tag, Config) ->
-    dos_hostname(Tag, 
-		 ?SSL_PORT, 
-		 proplists:get_value(host, Config), 
-		 proplists:get_value(node, Config), 
-		 ?MAX_HEADER_SIZE),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_time_test(doc) ->
-    ["using new of configure new SSL"];
-essl_time_test(suite) ->
-    [];
-essl_time_test(Config) when is_list(Config) ->
-    ssl_time_test(essl, Config).
-
-ssl_time_test(Tag, Config) when is_list(Config) ->
-    httpd_time_test:t(Tag, 
-		      proplists:get_value(host, Config), 
-		      ?SSL_PORT),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_block_503(doc) ->
-    ["Check that you will receive status code 503 when the server"
-     " is blocked and 200 when its not blocked - using new of configure new SSL."];
-essl_block_503(suite) ->
-    [];
-essl_block_503(Config) when is_list(Config) ->
-    ssl_block_503(essl, Config).
-
-ssl_block_503(Tag, Config) ->
-    httpd_block:block_503(Tag, 
-			  ?SSL_PORT, 
-			  proplists:get_value(host, Config), 
-			  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "distribing does not really make a difference in this case." 
-     "Using new of configure new SSL"];
-essl_block_disturbing_idle(suite) ->
-    [];
-essl_block_disturbing_idle(Config) when is_list(Config) ->
-    ssl_block_disturbing_idle(essl, Config).
-
-ssl_block_disturbing_idle(Tag, Config) ->
-    httpd_block:block_disturbing_idle(Tag, 
-				      ?SSL_PORT, 
-				      proplists:get_value(host, Config), 
-				      proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing does not really make a difference in this case." 
-     "Using new of configure new SSL"];
-essl_block_non_disturbing_idle(suite) ->
-    [];
-essl_block_non_disturbing_idle(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_idle(essl, Config).
-
-ssl_block_non_disturbing_idle(Tag, Config) ->
-    httpd_block:block_non_disturbing_idle(Tag, 
-					  ?SSL_PORT, 
-					  proplists:get_value(host, Config), 
-					  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_active(doc) ->
-    ["Check that you can block/unblock an active server. The strategy " 
-     "distribing means ongoing requests should be terminated." 
-     "Using new of configure new SSL"];
-essl_block_disturbing_active(suite) ->
-    [];
-essl_block_disturbing_active(Config) when is_list(Config) ->
-    ssl_block_disturbing_active(essl, Config).
-
-ssl_block_disturbing_active(Tag, Config) ->
-    httpd_block:block_disturbing_active(Tag, 
-					?SSL_PORT, 
-					proplists:get_value(host, Config), 
-					proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_active(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing means the ongoing requests should be compleated." 
-     "Using new of configure new SSL"];
-essl_block_non_disturbing_active(suite) ->
-    [];
-essl_block_non_disturbing_active(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_active(essl, Config).
-
-ssl_block_non_disturbing_active(Tag, Config) ->
-    httpd_block:block_non_disturbing_idle(Tag, 
-					  ?SSL_PORT, 
-					  proplists:get_value(host, Config), 
-					  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be compleated"
-     "if the timeout does not occur." 
-    "Using new of configure new SSL"];
-essl_block_disturbing_active_timeout_not_released(suite) ->
-    [];
-essl_block_disturbing_active_timeout_not_released(Config) 
-  when is_list(Config) ->
-    ssl_block_disturbing_active_timeout_not_released(essl, Config).
-
-ssl_block_disturbing_active_timeout_not_released(Tag, Config) ->
-    Port = ?SSL_PORT, 
-    Host = proplists:get_value(host, Config), 
-    Node = proplists:get_value(node, Config), 
-    httpd_block:block_disturbing_active_timeout_not_released(Tag, 
-							     Port, Host, Node),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be terminated when"
-     "the timeout occurs." 
-    "Using new of configure new SSL"];
-essl_block_disturbing_active_timeout_released(suite) ->
-    [];
-essl_block_disturbing_active_timeout_released(Config) 
-  when is_list(Config) ->
-    ssl_block_disturbing_active_timeout_released(essl, Config).
-
-ssl_block_disturbing_active_timeout_released(Tag, Config) ->
-    Port = ?SSL_PORT, 
-    Host = proplists:get_value(host, Config), 
-    Node = proplists:get_value(node, Config),     
-    httpd_block:block_disturbing_active_timeout_released(Tag, 
-							 Port, 
-							 Host, 
-							 Node), 
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed." 
-    "Using new of configure new SSL"];
-essl_block_non_disturbing_active_timeout_not_released(suite) ->
-    [];
-essl_block_non_disturbing_active_timeout_not_released(Config)
-  when is_list(Config) ->
-    ssl_block_non_disturbing_active_timeout_not_released(essl, Config).
-
-ssl_block_non_disturbing_active_timeout_not_released(Tag, Config) ->
-    Port = ?SSL_PORT, 
-    Host = proplists:get_value(host, Config), 
-    Node = proplists:get_value(node, Config), 
-    httpd_block:block_non_disturbing_active_timeout_not_released(Tag,
-								 Port, 
-								 Host, 
-								 Node),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_block_non_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non distribing means ongoing requests should be completed. "
-     "When the timeout occurs the block operation sohould be canceled." 
-     "Using new of configure new SSL"];
-essl_block_non_disturbing_active_timeout_released(suite) ->
-    [];
-essl_block_non_disturbing_active_timeout_released(Config)
-  when is_list(Config) ->
-    ssl_block_non_disturbing_active_timeout_released(essl, Config).
-
-ssl_block_non_disturbing_active_timeout_released(Tag, Config)
-  when is_list(Config) ->
-    Port = ?SSL_PORT, 
-    Host = proplists:get_value(host, Config), 
-    Node = proplists:get_value(node, Config), 
-    httpd_block:block_non_disturbing_active_timeout_released(Tag, 
-							     Port, 
-							     Host, 
-							     Node), 
-
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_block_disturbing_blocker_dies(doc) ->
-    ["using new of configure new SSL"];
-essl_block_disturbing_blocker_dies(suite) ->
-    [];
-essl_block_disturbing_blocker_dies(Config) when is_list(Config) ->
-    ssl_block_disturbing_blocker_dies(essl, Config).
-
-ssl_block_disturbing_blocker_dies(Tag, Config) ->
-    httpd_block:disturbing_blocker_dies(Tag, 
-					?SSL_PORT, 
-					proplists:get_value(host, Config), 
-					proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_blocker_dies(doc) ->
-    ["using new of configure new SSL"];
-essl_block_non_disturbing_blocker_dies(suite) ->
-    [];
-essl_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_blocker_dies(essl, Config).
-
-ssl_block_non_disturbing_blocker_dies(Tag, Config) ->
-    httpd_block:non_disturbing_blocker_dies(Tag, 
-					    ?SSL_PORT, 
-					    proplists:get_value(host, Config), 
-					    proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_restart_no_block(doc) ->
-    ["using new of configure new SSL"];
-essl_restart_no_block(suite) ->
-    [];
-essl_restart_no_block(Config) when is_list(Config) ->
-    ssl_restart_no_block(essl, Config).
-
-ssl_restart_no_block(Tag, Config) ->
-    httpd_block:restart_no_block(Tag, 
-				 ?SSL_PORT, 
-				 proplists:get_value(host, Config), 
-				 proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_restart_disturbing_block(doc) ->
-    ["using new of configure new SSL"];
-essl_restart_disturbing_block(suite) ->
-    [];
-essl_restart_disturbing_block(Config) when is_list(Config) ->
-    ssl_restart_disturbing_block(essl, Config).
-
-ssl_restart_disturbing_block(Tag, Config) ->
-    httpd_block:restart_disturbing_block(Tag, ?SSL_PORT, 
-					 proplists:get_value(host, Config), 
-					 proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_restart_non_disturbing_block(doc) ->
-    ["using new of configure new SSL"];
-essl_restart_non_disturbing_block(suite) ->
-    [];
-essl_restart_non_disturbing_block(Config) when is_list(Config) ->
-    ssl_restart_non_disturbing_block(essl, Config).
-
-ssl_restart_non_disturbing_block(Tag, Config) ->
-    httpd_block:restart_non_disturbing_block(Tag, 
-					     ?SSL_PORT, 
-					     proplists:get_value(host, Config), 
-					     proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-ip_host(doc) ->   
-    ["Control that the server accepts/rejects requests with/ without host"];
-ip_host(suite)->
-    [];
-ip_host(Config) when is_list(Config) ->
-    httpd_1_1:host(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-		   proplists:get_value(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_chunked(doc) ->   
-    ["Control that the server accepts chunked requests"];
-ip_chunked(suite) ->
-    [];
-ip_chunked(Config) when is_list(Config) ->
-    httpd_1_1:chunked(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-		      proplists:get_value(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_expect(doc) ->   
-    ["Control that the server handles request with the expect header "
-     "field appropiate"];
-ip_expect(suite)->
-    [];
-ip_expect(Config) when is_list(Config) ->
-    httpd_1_1:expect(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-		     proplists:get_value(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_range(doc) ->   
-    ["Control that the server can handle range requests to plain files"];
-ip_range(suite)->
-    [];
-ip_range(Config) when is_list(Config) ->
-    httpd_1_1:range(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-		    proplists:get_value(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_if_test(doc) ->   
-    ["Test that the if - request header fields is handled correclty"];
-ip_if_test(suite) ->
-    [];
-ip_if_test(Config) when is_list(Config) ->
-    ServerRoot = proplists:get_value(server_root, Config), 
-    DocRoot = filename:join([ServerRoot, "htdocs"]),
-    httpd_1_1:if_test(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-		      proplists:get_value(node, Config), DocRoot),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_http_trace(doc) ->   
-    ["Test the trace module "];
-ip_http_trace(suite) -> 
-    [];
-ip_http_trace(Config) when is_list(Config) ->
-    httpd_1_1:http_trace(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-			 proplists:get_value(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_http1_1_head(doc) ->  
-    ["Test the trace module "];
-ip_http1_1_head(suite)->
-    [];
-ip_http1_1_head(Config) when is_list(Config) ->
-    httpd_1_1:head(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-			   proplists:get_value(node, Config)),
-    ok.
-
-%%------------------------------------------------------------------------- 
-ip_get_0_9(doc) ->  
-    ["Test simple HTTP/0.9 GET"];
-ip_get_0_9(suite)->
-    [];
-ip_get_0_9(Config) when is_list(Config) ->
-    Host =  proplists:get_value(host, Config),
-    Node =  proplists:get_value(node, Config),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-				       "GET / \r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/0.9"} ]),
-    %% Without space after uri
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-				       "GET /\r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/0.9"} ]),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-				       "GET / HTTP/0.9\r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/0.9"}]),
-    
-    ok.
-%%------------------------------------------------------------------------- 
-ip_head_1_0(doc) ->  
-    ["Test HTTP/1.0 HEAD"];
-ip_head_1_0(suite)->
-    [];
-ip_head_1_0(Config) when is_list(Config) ->
-    Host =  proplists:get_value(host, Config),
-    Node =  proplists:get_value(node, Config),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-			 "HEAD / HTTP/1.0\r\n\r\n", [{statuscode, 200},
-						    {version, "HTTP/1.0"}]),
-    
-    ok.
-%%------------------------------------------------------------------------- 
-ip_get_1_0(doc) ->  
-    ["Test HTTP/1.0 GET"];
-ip_get_1_0(suite)->
-    [];
-ip_get_1_0(Config) when is_list(Config) ->
-    Host =  proplists:get_value(host, Config),
-    Node =  proplists:get_value(node, Config),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-			 "GET / HTTP/1.0\r\n\r\n", [{statuscode, 200},
-						    {version, "HTTP/1.0"}]),
-    
-    ok.
-%%------------------------------------------------------------------------- 
-ip_post_1_0(doc) ->  
-    ["Test HTTP/1.0 POST"];
-ip_post_1_0(suite)->
-    [];
-ip_post_1_0(Config) when is_list(Config) ->
-    Host =  proplists:get_value(host, Config),
-    Node =  proplists:get_value(node, Config),
-    %% Test the post message formatin 1.0! Real post are testes elsewhere
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-			 "POST / HTTP/1.0\r\n\r\n "  
-			 "Content-Length:6 \r\n\r\nfoobar", 
-			 [{statuscode, 500}, {version, "HTTP/1.0"}]),
-    
-    ok.
-%%------------------------------------------------------------------------- 
-ip_mod_cgi_chunked_encoding_test(doc) ->  
-    ["Test the trace module "];
-ip_mod_cgi_chunked_encoding_test(suite)->
-    [];
-ip_mod_cgi_chunked_encoding_test(Config) when is_list(Config) ->
-    Host = proplists:get_value(host, Config),
-    Script =
-	case test_server:os_type() of
-	    {win32, _} ->
-		"/cgi-bin/printenv.bat";
-	    _ ->
-		"/cgi-bin/printenv.sh"
-	end,
-    Requests = 
-	["GET " ++ Script ++ " HTTP/1.1\r\nHost:"++ Host ++"\r\n\r\n",
-	 "GET /cgi-bin/erl/httpd_example/newformat  HTTP/1.1\r\nHost:"
-	 ++ Host ++"\r\n\r\n"],
-    httpd_1_1:mod_cgi_chunked_encoding_test(ip_comm, ?IP_PORT,
-					    Host,
-					    proplists:get_value(node, Config),
-					    Requests),
-    ok.
-
-%------------------------------------------------------------------------- 
-
-ipv6_hostname_ipcomm() ->
-    [{require, ipv6_hosts}].
-ipv6_hostname_ipcomm(X) -> 
-    SocketType = ip_comm,
-    Port       = ?IP_PORT, 
-    ipv6_hostname(SocketType, Port, X).
-
-ipv6_hostname_essl() ->
-    [{require, ipv6_hosts}].
-ipv6_hostname_essl(X) -> 
-    SocketType = essl, 
-    Port       = ?SSL_PORT, 
-    ipv6_hostname(SocketType, Port, X).
-
-ipv6_hostname(_SocketType, _Port, doc) ->  
-    ["Test standard ipv6 address"];
-ipv6_hostname(_SocketType, _Port, suite)->
-    [];
-ipv6_hostname(SocketType, Port, Config) when is_list(Config) -> 
-    tsp("ipv6_hostname -> entry with"
-	"~n   SocketType: ~p"
-	"~n   Port:       ~p"
-	"~n   Config:     ~p", [SocketType, Port, Config]),
-    Host = proplists:get_value(host, Config),
-    URI  = "GET HTTP://" ++ 
-	Host ++ ":" ++ integer_to_list(Port) ++ "/ HTTP/1.1\r\n\r\n", 
-    tsp("ipv6_hostname -> Host: ~p", [Host]),
-    httpd_test_lib:verify_request(SocketType, Host, Port, [inet6], 
-				  node(), 
-				  URI, 
-				  [{statuscode, 200}, {version, "HTTP/1.1"}]),
-    ok.
-
-%%------------------------------------------------------------------------- 
-
-ipv6_address_ipcomm() ->
-    [{require, ipv6_hosts}].
-ipv6_address_ipcomm(X) ->
-    SocketType = ip_comm,
-    Port       = ?IP_PORT, 
-    ipv6_address(SocketType, Port, X).
-
-ipv6_address_essl() ->
-    [{require, ipv6_hosts}].
-ipv6_address_essl(X) ->
-    SocketType = essl,
-    Port       = ?SSL_PORT, 
-    ipv6_address(SocketType, Port, X).
-
-ipv6_address(_SocketType, _Port, doc) ->
-    ["Test standard ipv6 address"];
-ipv6_address(_SocketType, _Port, suite)->
-    [];
-ipv6_address(SocketType, Port, Config) when is_list(Config) ->   
-    tsp("ipv6_address -> entry with"
-	"~n   SocketType: ~p"
-	"~n   Port:       ~p"
-	"~n   Config:     ~p", [SocketType, Port, Config]),
-    Host = proplists:get_value(host, Config),
-    tsp("ipv6_address -> Host: ~p", [Host]),
-    URI = "GET HTTP://" ++ 
-	Host ++ ":" ++ integer_to_list(Port) ++ "/ HTTP/1.1\r\n\r\n", 
-    httpd_test_lib:verify_request(SocketType, Host, Port, [inet6], 
-				  node(), 
-				  URI, 
-				  [{statuscode, 200}, {version, "HTTP/1.1"}]),
-    ok.
-
-
-%%--------------------------------------------------------------------
-ticket_5775(doc) ->
-    ["Tests that content-length is correct"];
-ticket_5775(suite) ->
-    [];
-ticket_5775(Config) ->
-    ok=httpd_test_lib:verify_request(ip_comm, proplists:get_value(host, Config),
-				     ?IP_PORT, proplists:get_value(node, Config),
-				       "GET /cgi-bin/erl/httpd_example:get_bin "
-				       "HTTP/1.0\r\n\r\n", 
-				       [{statuscode, 200},
-				       {version, "HTTP/1.0"}]),
-    ok.
-ticket_5865(doc) ->
-    ["Tests that a header without last-modified is handled"];
-ticket_5865(suite) ->
-    [];
-ticket_5865(Config) ->
-    ct:skip(as_of_r15_behaviour_of_calendar_has_changed),
-    Host = proplists:get_value(host,Config),
-    ServerRoot = proplists:get_value(server_root, Config), 
-    DocRoot = filename:join([ServerRoot, "htdocs"]),
-    File = filename:join([DocRoot,"last_modified.html"]),
-
-    Bad_mtime = case test_server:os_type() of
-		    {win32, _} ->
-			{{1600,12,31},{23,59,59}};
-		    {unix, _} ->
-			{{1969,12,31},{23,59,59}}
-		end,
-    
-    {ok,FI}=file:read_file_info(File),
-    
-    case file:write_file_info(File,FI#file_info{mtime=Bad_mtime}) of
-	ok ->
-	    ok = httpd_test_lib:verify_request(ip_comm, Host,
-					       ?IP_PORT, proplists:get_value(node, Config),
-					       "GET /last_modified.html"
-					       " HTTP/1.1\r\nHost:"
-					       ++Host++"\r\n\r\n", 
-					       [{statuscode, 200},
-						{no_header,
-						 "last-modified"}]),
-	    ok;
-	{error, Reason} ->
-	    Fault = 
-		io_lib:format("Attempt to change the file info to set the"
-			      " preconditions of the test case failed ~p~n",
-			      [Reason]),
-	    {skip, Fault}
-    end.
-
-ticket_5913(doc) ->
-    ["Tests that a header without last-modified is handled"];
-ticket_5913(suite) -> [];
-ticket_5913(Config) ->
-    ok = httpd_test_lib:verify_request(ip_comm, proplists:get_value(host, Config),
-				       ?IP_PORT, proplists:get_value(node, Config),
-				       "GET /cgi-bin/erl/httpd_example:get_bin "
-				       "HTTP/1.0\r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/1.0"}]),
-    ok.
-
-ticket_6003(doc) ->
-    ["Tests that a URI with a bad hexadecimal code is handled"];
-ticket_6003(suite) -> [];
-ticket_6003(Config) ->
-    ok = httpd_test_lib:verify_request(ip_comm, proplists:get_value(host, Config),
-				       ?IP_PORT, proplists:get_value(node, Config),
-				       "GET http://www.erlang.org/%skalle "
-				       "HTTP/1.0\r\n\r\n",
-				       [{statuscode, 400},
-					{version, "HTTP/1.0"}]),
-    ok.
-
-ticket_7304(doc) ->
-     ["Tests missing CR in delimiter"];
-ticket_7304(suite) -> 
-    [];
-ticket_7304(Config) ->
-    ok = httpd_test_lib:verify_request(ip_comm, proplists:get_value(host, Config),
-				       ?IP_PORT, proplists:get_value(node, Config),
-				       "GET / HTTP/1.0\r\n\n",
-				       [{statuscode, 200},
-					{version, "HTTP/1.0"}]),
-    ok.
-
-%%--------------------------------------------------------------------
-%% Internal functions
-%%--------------------------------------------------------------------
-dos_hostname(Type, Port, Host, Node, Max) ->
-    H1 = {"", 200},
-    H2 = {"dummy-host.ericsson.se", 200},
-    TooLongHeader = lists:append(lists:duplicate(Max + 1, "a")),
-    H3 = {TooLongHeader, 403},
-    Hosts = [H1,H2,H3],
-    dos_hostname_poll(Type, Host, Port, Node, Hosts).
-
-%% make_ipv6(T) when is_tuple(T) andalso (size(T) =:= 8) ->
-%%     make_ipv6(tuple_to_list(T));
-
-%% make_ipv6([_, _, _, _, _, _, _, _] = IPV6) ->
-%%     lists:flatten(io_lib:format("~s:~s:~s:~s:~s:~s:~s:~s", IPV6)).
-
-
-%%--------------------------------------------------------------------
-%% Other help functions
-create_config(Config, Access, FileName) ->
-    ServerRoot = proplists:get_value(server_root, Config),
-    TcTopDir   = proplists:get_value(tc_top_dir,  Config),
-    Port       = proplists:get_value(port,        Config),
-    Type       = proplists:get_value(sock_type,   Config),
-    Host       = proplists:get_value(host,        Config),
-    Mods       = io_lib:format("~p", [httpd_mod]),
-    Funcs      = io_lib:format("~p", [ssl_password_cb]),
-    MaxHdrSz   = io_lib:format("~p", [256]),
-    MaxHdrAct  = io_lib:format("~p", [close]),
-
-    io:format(user, 
-	      "create_config -> "
-	      "~n   ServerRoot: ~p"
-	      "~n   TcTopDir:   ~p"
-	      "~n   Type:       ~p"
-	      "~n   Port:       ~p"
-	      "~n   Host:       ~p"
-	      "~n", [ServerRoot, TcTopDir, Type, Port, Host]),
-
-    SSL =
-	if
-	    (Type =:= ssl)  orelse 
-	    (Type =:= essl) ->
-		[cline(["SSLCertificateFile ", 
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCertificateKeyFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCACertificateFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLPasswordCallbackModule ", Mods]),
-		 cline(["SSLPasswordCallbackFunction ", Funcs]),
-		 cline(["SSLVerifyClient 0"]),
-		 cline(["SSLVerifyDepth 1"])];
-	    true ->
-		[]
-	end,
-    ModOrder = 
-	case Access of
-	    mod_htaccess ->
-		"Modules mod_alias mod_htaccess mod_auth "
-		    "mod_security "
-		    "mod_responsecontrol mod_trace mod_esi "
-		    "mod_actions mod_cgi mod_dir "
-		    "mod_range mod_get "
-		    "mod_head mod_log mod_disk_log";
-	    _ ->
-		"Modules mod_alias mod_auth mod_security "
-		    "mod_responsecontrol mod_trace mod_esi "
-		    "mod_actions mod_cgi mod_dir "
-			   "mod_range mod_get "
-		    "mod_head mod_log mod_disk_log"
-	end,
-    
-    %% The test suite currently does not handle an explicit BindAddress.
-    %% They assume any has been used, that is Addr is always set to undefined!
-
-    %%     {ok, Hostname} = inet:gethostname(), 
-    %%     {ok, Addr} = inet:getaddr(Hostname, inet6),
-    %%     AddrStr = make_ipv6(Addr), 
-    %%     BindAddress = lists:flatten(io_lib:format("~s|inet6", [AddrStr])),
-
-    BindAddress = "*|inet", 
-    %% BindAddress = "*", 
-
-    HttpConfig = [
-		  cline(["Port ", integer_to_list(Port)]),
-		  cline(["ServerName ", Host]),
-		  cline(["SocketType ", atom_to_list(Type)]),
-		  cline([ModOrder]),
-		  %% cline(["LogFormat ", "erlang"]),
-		  cline(["ServerAdmin [email protected]"]),
-		  cline(["BindAddress ", BindAddress]),
-		  cline(["ServerRoot ", ServerRoot]),
-		  cline(["ErrorLog ", TcTopDir, 
-		     "/logs/error_log_", integer_to_list(Port)]),
-		  cline(["TransferLog ", TcTopDir, 
-			 "/logs/access_log_", integer_to_list(Port)]),
-		  cline(["SecurityLog ", TcTopDir, 
-			 "/logs/security_log_", integer_to_list(Port)]),
-		  cline(["ErrorDiskLog ", TcTopDir, 
-			 "/logs/error_disk_log_", integer_to_list(Port)]),
-		  cline(["ErrorDiskLogSize ", "190000 ", "11"]),
-		  cline(["TransferDiskLog ", TcTopDir, 
-			 "/logs/access_disk_log_", integer_to_list(Port)]),
-		  cline(["TransferDiskLogSize ", "200000 ", "10"]),
-		  cline(["SecurityDiskLog ", TcTopDir, 
-			 "/logs/security_disk_log_", integer_to_list(Port)]),
-		  cline(["SecurityDiskLogSize ", "210000 ", "9"]),
-		  cline(["MaxClients 10"]),
-		  cline(["MaxHeaderSize ", MaxHdrSz]),
-		  cline(["MaxHeaderAction ", MaxHdrAct]),
-		  cline(["DocumentRoot ", 
-			 filename:join(ServerRoot, "htdocs")]),
-		  cline(["DirectoryIndex ", "index.html ", "welcome.html"]),
-		  cline(["DefaultType ", "text/plain"]),
-		  SSL,
-		  mod_alias_config(ServerRoot),
-		  
-		  config_directory(filename:join([ServerRoot,"htdocs",
-						  "open"]),
-				   "Open Area", 
-				   filename:join(ServerRoot, "auth/passwd"),
-				   filename:join(ServerRoot, "auth/group"),
-				   plain,
-				   "user one Aladdin",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "secret"]),
-				   "Secret Area", 
-				   filename:join(ServerRoot, "auth/passwd"),
-				   filename:join(ServerRoot, "auth/group"),
-				   plain,
-				   "group group1 group2",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "secret", 
-						  "top_secret"]),
-				   "Top Secret Area", 
-				   filename:join(ServerRoot, "auth/passwd"),
-				   filename:join(ServerRoot, "auth/group"),
-				   plain,
-				   "group group3",
-				   filename:join(ServerRoot, "security_data")),
-		  
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "dets_open"]),
-				   "Dets Open Area", 
-				   filename:join(ServerRoot, "passwd"),
-				   filename:join(ServerRoot, "group"),
-				   dets,
-				   "user one Aladdin",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "dets_secret"]),
-			       "Dets Secret Area", 
-				   filename:join(ServerRoot, "passwd"),
-				   filename:join(ServerRoot, "group"),
-				   dets,
-				   "group group1 group2",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "dets_secret", 
-						  "top_secret"]),
-				   "Dets Top Secret Area", 
-				   filename:join(ServerRoot, "passwd"),
-				   filename:join(ServerRoot, "group"),
-				   dets,
-				   "group group3",
-				   filename:join(ServerRoot, "security_data")),
-		  
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "mnesia_open"]),
-				   "Mnesia Open Area", 
-				   false,
-				   false,
-				   mnesia,
-				   "user one Aladdin",
-			       filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "mnesia_secret"]),
-				   "Mnesia Secret Area", 
-				   false,
-				   false,
-				   mnesia,
-				   "group group1 group2",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join(
-				     [ServerRoot, "htdocs", "mnesia_secret",
-				      "top_secret"]),
-				   "Mnesia Top Secret Area", 
-				   false,
-				   false,
-				   mnesia,
-				   "group group3",
-				   filename:join(ServerRoot, "security_data"))
-		 ],
-    ConfigFile = filename:join([TcTopDir, FileName]),
-    {ok, Fd} = file:open(ConfigFile, [write]),
-    ok = file:write(Fd, lists:flatten(HttpConfig)),
-    ok = file:close(Fd).
-
-config_directory(Dir, AuthName, AuthUserFile, AuthGroupFile, AuthDBType, 
-		 Require, SF) ->
-    file:delete(SF),
-    [
-     cline(["<Directory ", Dir, ">"]),
-     cline(["SecurityDataFile ", SF]),
-     cline(["SecurityMaxRetries 3"]),
-     cline(["SecurityFailExpireTime ", integer_to_list(?FAIL_EXPIRE_TIME)]),
-     cline(["SecurityBlockTime 1"]),
-     cline(["SecurityAuthTimeout ", integer_to_list(?AUTH_TIMEOUT)]),
-     cline(["SecurityCallbackModule ", "httpd_mod"]),
-     cline_if_set("AuthUserFile", AuthUserFile),
-     cline_if_set("AuthGroupFile", AuthGroupFile),
-     cline_if_set("AuthName", AuthName),
-     cline_if_set("AuthDBType", AuthDBType),
-     cline(["require ", Require]),
-     cline(["</Directory>\r\n"])
-    ].
-
-mod_alias_config(Root) ->
-    [
-     cline(["Alias /icons/ ", filename:join(Root,"icons"), "/"]),
-     cline(["Alias /pics/ ", filename:join(Root, "icons"), "/"]),
-     cline(["ScriptAlias /cgi-bin/ ", filename:join(Root, "cgi-bin"), "/"]),
-     cline(["ScriptAlias /htbin/ ", filename:join(Root, "cgi-bin"), "/"]),
-     cline(["ErlScriptAlias /cgi-bin/erl httpd_example io"]),
-     cline(["EvalScriptAlias /eval httpd_example io"])
-    ].
-
-cline(List) ->
-    lists:flatten([List, "\r\n"]).
-
-cline_if_set(_, false) ->
-    [];
-cline_if_set(Name, Var) when is_list(Var) ->
-    cline([Name, " ", Var]);
-cline_if_set(Name, Var) when is_atom(Var) ->
-    cline([Name, " ", atom_to_list(Var)]).
-
-getaddr() ->
-    {ok,HostName} = inet:gethostname(),
-    {ok,{A1,A2,A3,A4}} = inet:getaddr(HostName,inet),
-    lists:flatten(io_lib:format("~p.~p.~p.~p",[A1,A2,A3,A4])).
-
-start_mnesia(Node) ->
-    case rpc:call(Node, ?MODULE, cleanup_mnesia, []) of
-	ok ->
-	    ok;
-	Other ->
-	    tsf({failed_to_cleanup_mnesia, Other})
-    end,
-    case rpc:call(Node, ?MODULE, setup_mnesia, []) of
-	{atomic, ok} ->
-	    ok;
-	Other2 ->
-	    tsf({failed_to_setup_mnesia, Other2})
-    end,
-    ok.
-
-setup_mnesia() ->
-    setup_mnesia([node()]).
-
-setup_mnesia(Nodes) ->
-    ok = mnesia:create_schema(Nodes),
-    ok = mnesia:start(),
-    {atomic, ok} = mnesia:create_table(httpd_user,
-				       [{attributes, 
-					 record_info(fields, httpd_user)}, 
-					{disc_copies,Nodes}, {type, set}]),
-    {atomic, ok} = mnesia:create_table(httpd_group,
-				       [{attributes, 
-					 record_info(fields,
-						     httpd_group)}, 
-					{disc_copies,Nodes}, {type,bag}]).
-
-cleanup_mnesia() ->
-    mnesia:start(),
-    mnesia:delete_table(httpd_user),
-    mnesia:delete_table(httpd_group),
-    stopped = mnesia:stop(),
-    mnesia:delete_schema([node()]),
-    ok.
-
-create_htaccess_data(Path, IpAddress)->
-    create_htaccess_dirs(Path),
-    
-    create_html_file(filename:join([Path,"ht/open/dummy.html"])),
-    create_html_file(filename:join([Path,"ht/blocknet/dummy.html"])),
-    create_html_file(filename:join([Path,"ht/secret/dummy.html"])),
-    create_html_file(filename:join([Path,"ht/secret/top_secret/dummy.html"])),
-    
-    create_htaccess_file(filename:join([Path,"ht/open/.htaccess"]),
-			 Path, "user one Aladdin"),
-    create_htaccess_file(filename:join([Path,"ht/secret/.htaccess"]),
-			 Path, "group group1 group2"),
-    create_htaccess_file(filename:join([Path,
-				       "ht/secret/top_secret/.htaccess"]),
-			Path, "user four"),
-    create_htaccess_file(filename:join([Path,"ht/blocknet/.htaccess"]),
-			Path, nouser, IpAddress),
-   
-    create_user_group_file(filename:join([Path,"ht","users.file"]),
-			   "one:OnePassword\ntwo:TwoPassword\nthree:"
-			   "ThreePassword\nfour:FourPassword\nAladdin:"
-			   "AladdinPassword"),
-    create_user_group_file(filename:join([Path,"ht","groups.file"]),
-			   "group1: two one\ngroup2: two three").
-
-create_html_file(PathAndFileName)->
-    file:write_file(PathAndFileName,list_to_binary(
-	 "<html><head><title>test</title></head>
-         <body>testar</body></html>")).
-
-create_htaccess_file(PathAndFileName, BaseDir, RequireData)->
-    file:write_file(PathAndFileName,
-		    list_to_binary(
-		      "AuthUserFile "++ BaseDir ++
-		      "/ht/users.file\nAuthGroupFile "++ BaseDir
-		      ++ "/ht/groups.file\nAuthName Test\nAuthType"
-		      " Basic\n<Limit>\nrequire " ++ RequireData ++
-		      "\n</Limit>")).
-
-create_htaccess_file(PathAndFileName, BaseDir, nouser, IpAddress)->
-    file:write_file(PathAndFileName,list_to_binary(
-				      "AuthUserFile "++ BaseDir ++
-				      "/ht/users.file\nAuthGroupFile " ++ 
-				      BaseDir ++ "/ht/groups.file\nAuthName"
-				      " Test\nAuthType"
-				      " Basic\n<Limit GET>\n\tallow from " ++ 
-				      format_ip(IpAddress,
-						string:rchr(IpAddress,$.)) ++ 
-				      "\n</Limit>")).
-
-create_user_group_file(PathAndFileName, Data)->
-    file:write_file(PathAndFileName, list_to_binary(Data)).
-
-create_htaccess_dirs(Path)->
-    ok = file:make_dir(filename:join([Path,"ht"])),
-    ok = file:make_dir(filename:join([Path,"ht/open"])),
-    ok = file:make_dir(filename:join([Path,"ht/blocknet"])),
-    ok = file:make_dir(filename:join([Path,"ht/secret"])),
-    ok = file:make_dir(filename:join([Path,"ht/secret/top_secret"])).
-
-remove_htaccess_dirs(Path)->
-    file:del_dir(filename:join([Path,"ht/secret/top_secret"])),
-    file:del_dir(filename:join([Path,"ht/secret"])),
-    file:del_dir(filename:join([Path,"ht/blocknet"])),
-    file:del_dir(filename:join([Path,"ht/open"])),
-    file:del_dir(filename:join([Path,"ht"])).
-
-format_ip(IpAddress,Pos)when Pos > 0->
-    case lists:nth(Pos,IpAddress) of
-	$.->
-	    case lists:nth(Pos-2,IpAddress) of
-		$.->
-		   format_ip(IpAddress,Pos-3);
-		_->
-		    lists:sublist(IpAddress,Pos-2) ++ "."
-	    end;
-	_ ->
-	    format_ip(IpAddress,Pos-1)
-    end;
-
-format_ip(IpAddress, _Pos)->
-    "1" ++ IpAddress.
-
-remove_htaccess(Path)->
-    file:delete(filename:join([Path,"ht/open/dummy.html"])),
-    file:delete(filename:join([Path,"ht/secret/dummy.html"])),
-    file:delete(filename:join([Path,"ht/secret/top_secret/dummy.html"])),
-    file:delete(filename:join([Path,"ht/blocknet/dummy.html"])),
-    file:delete(filename:join([Path,"ht/blocknet/.htaccess"])),
-    file:delete(filename:join([Path,"ht/open/.htaccess"])),
-    file:delete(filename:join([Path,"ht/secret/.htaccess"])),
-    file:delete(filename:join([Path,"ht/secret/top_secret/.htaccess"])),
-    file:delete(filename:join([Path,"ht","users.file"])),
-    file:delete(filename:join([Path,"ht","groups.file"])),
-    remove_htaccess_dirs(Path).
-
-
-dos_hostname_poll(Type, Host, Port, Node, Hosts) ->
-    [dos_hostname_poll1(Type, Host, Port, Node, Host1, Code)
-     || {Host1,Code} <- Hosts].
-
-dos_hostname_poll1(Type, Host, Port, Node, Host1, Code) ->
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
-				       dos_hostname_request(Host1),
-				       [{statuscode, Code},
-					{version, "HTTP/1.0"}]).
-        
-dos_hostname_request(Host) ->
-    "GET / HTTP/1.0\r\n" ++ Host ++ "\r\n\r\n".
-
-get_nof_clients(Mode, Load) ->
-    get_nof_clients(test_server:os_type(), Mode, Load).
-
-get_nof_clients(_,       ip_comm, light)  -> 5;
-get_nof_clients(_,       ssl,     light)  -> 2;
-get_nof_clients(_,       ip_comm, medium) -> 10;
-get_nof_clients(_,       ssl,     medium) -> 4;
-get_nof_clients(_,       ip_comm, heavy)  -> 20;
-get_nof_clients(_,       ssl,     heavy)  -> 6.
-
-%% Make a file 100 bytes long containing 012...9*10
-create_range_data(Path) ->
-    PathAndFileName=filename:join([Path,"range.txt"]),
-    file:write_file(PathAndFileName,list_to_binary(["12345678901234567890",
-						   "12345678901234567890",
-						   "12345678901234567890",
-						   "12345678901234567890",
-						   "12345678901234567890"])).
-
-create_ipv6_config(Config, FileName, Ipv6Address) ->
-    ServerRoot = proplists:get_value(server_root, Config),
-    TcTopDir   = proplists:get_value(tc_top_dir,  Config),
-    Port       = proplists:get_value(port,        Config),
-    SockType   = proplists:get_value(sock_type,   Config),
-    Mods       = io_lib:format("~p",  [httpd_mod]),
-    Funcs      = io_lib:format("~p",  [ssl_password_cb]),
-    Host       = proplists:get_value(ipv6_host,   Config),
-
-    MaxHdrSz     = io_lib:format("~p", [256]),
-    MaxHdrAct    = io_lib:format("~p", [close]),
-  
-    Mod_order = "Modules mod_alias mod_auth mod_esi mod_actions mod_cgi" 
-	" mod_dir mod_get mod_head" 
-	" mod_log mod_disk_log mod_trace",
-	    
-    SSL =
-	if
-	    (SockType =:= ssl)  orelse 
-	    (SockType =:= essl) ->
-		[cline(["SSLCertificateFile ", 
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCertificateKeyFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCACertificateFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLPasswordCallbackModule ", Mods]),
-		 cline(["SSLPasswordCallbackFunction ", Funcs]),
-		 cline(["SSLVerifyClient 0"]),
-		 cline(["SSLVerifyDepth 1"])];
-	    true ->
-		[]
-	end,
-
-    BindAddress = "[" ++ Ipv6Address ++"]|inet6", 
-
-    HttpConfig = 
-	[cline(["BindAddress ", BindAddress]),
-	 cline(["Port ", integer_to_list(Port)]),
-	 cline(["ServerName ", Host]),
-	 cline(["SocketType ", atom_to_list(SockType)]),
-	 cline([Mod_order]),
-	 cline(["ServerRoot ", ServerRoot]),
-	 cline(["DocumentRoot ", filename:join(ServerRoot, "htdocs")]),
-	 cline(["MaxHeaderSize ",MaxHdrSz]),
-	 cline(["MaxHeaderAction ",MaxHdrAct]),
-	 cline(["DirectoryIndex ", "index.html "]),
-	 cline(["DefaultType ", "text/plain"]), 
-	 SSL],
-    ConfigFile = filename:join([TcTopDir,FileName]),
-    {ok, Fd} = file:open(ConfigFile, [write]),
-    ok = file:write(Fd, lists:flatten(HttpConfig)),
-    ok = file:close(Fd).
-
-
-tsp(F) ->
-    inets_test_lib:tsp("[~w]" ++ F, [?MODULE]).
-tsp(F, A) ->
-    inets_test_lib:tsp("[~w]" ++ F, [?MODULE|A]).
-
-tsf(Reason) ->
-    inets_test_lib:tsf(Reason).
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/Makefile.src b/lib/inets/test/old_httpd_SUITE_data/Makefile.src
deleted file mode 100644
index b0fdb43d8d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,14 +0,0 @@
-CC = @CC@
-LD = @LD@
-CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@
-CROSSLDFLAGS = @CROSSLDFLAGS@
-
-PROGS = cgi_echo@exe@
-
-all: $(PROGS)
-
-cgi_echo@exe@: cgi_echo@obj@
-	$(LD) $(CROSSLDFLAGS) -o cgi_echo cgi_echo@obj@ @LIBS@
-
-cgi_echo@obj@: cgi_echo.c
-	$(CC) -c -o cgi_echo@obj@ $(CFLAGS) cgi_echo.c
diff --git a/lib/inets/test/old_httpd_SUITE_data/cgi_echo.c b/lib/inets/test/old_httpd_SUITE_data/cgi_echo.c
deleted file mode 100644
index 580f860e96..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/cgi_echo.c
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-
-#if defined __WIN32__
-#include <windows.h> 
-#include <fcntl.h>
-#endif
-
-static int read_exact(char *buffer, int len);
-static int write_exact(char *buffer, int len);
-
-int main(void)
-{
-    char msg[100];
-    int msg_len;
-#ifdef __WIN32__
-    _setmode(_fileno( stdin),  _O_BINARY);
-    _setmode(_fileno( stdout), _O_BINARY);
-#endif    
-    msg_len = read_exact(msg, 100);
-
-    write_exact("Content-type: text/plain\r\n\r\n", 28);
-    write_exact(msg, msg_len);
-    exit(EXIT_SUCCESS);
-}
-  
-
-/* read from stdin */ 
-#ifdef __WIN32__
-static int read_exact(char *buffer, int len)
-{
-    HANDLE standard_input = GetStdHandle(STD_INPUT_HANDLE);
-    
-    unsigned read_result;
-    unsigned sofar = 0;
-    
-    if (!len) { /* Happens for "empty packages */
-	return 0;
-    }
-    for (;;) {
-	if (!ReadFile(standard_input, buffer + sofar,
-		      len - sofar, &read_result, NULL)) {
-	    return -1; /* EOF */
-	}
-	if (!read_result) {
-	    return -2; /* Interrupted while reading? */
-	}
-	sofar += read_result;
-	if (sofar == len) {
-	    return len;
-	}
-    }
-} 
-#else
-static int read_exact(char *buffer, int len) {
-    int i, got = 0;
-    
-    do {
-	if ((i = read(0, buffer + got, len - got)) <= 0)
-	    return(i);
-	got += i;
-    } while (got < len);
-    return len;
-   
-}
-#endif
-
-/* write to stdout */
-#ifdef __WIN32__
- static int write_exact(char *buffer, int len)
-   {
-     HANDLE standard_output = GetStdHandle(STD_OUTPUT_HANDLE);
-     unsigned written;
-
-     if (!WriteFile(standard_output, buffer, len, &written, NULL)) {
-       return -1; /* Broken Pipe */
-     }
-     if (written < ((unsigned) len)) {
-       /* This should not happen, standard output is not blocking? */
-       return -2;
-     }
-
-    return (int) written;
-}
-
-#else 
- static int write_exact(char *buffer, int len) {
-   int i, wrote = 0;
-
-   do {
-     if ((i = write(1, buffer + wrote, len - wrote)) <= 0)
-       return i;
-     wrote += i;
-   } while (wrote < len);
-   return len;
- }
-#endif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile b/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile
deleted file mode 100644
index ed4d63a3bb..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile
+++ /dev/null
@@ -1,210 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-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%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(INETS_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/inets-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-MODULE= 
-
-AUTH_FILES = auth/group \
-	auth/passwd 
-CGI_FILES = cgi-bin/printenv.sh 
-CONF_FILES = conf/8080.conf \
-	conf/8888.conf \
-	conf/httpd.conf \
-	conf/ssl.conf \
-	conf/mime.types 
-OPEN_FILES = htdocs/open/dummy.html 
-MNESIA_OPEN_FILES = htdocs/mnesia_open/dummy.html 
-MISC_FILES = htdocs/misc/friedrich.html \
-	htdocs/misc/oech.html
-SECRET_FILES = htdocs/secret/dummy.html 
-MNESIA_SECRET_FILES = htdocs/mnesia_secret/dummy.html 
-HTDOCS_FILES = htdocs/index.html \
-	htdocs/config.shtml \
-	htdocs/echo.shtml \
-	htdocs/exec.shtml \
-	htdocs/flastmod.shtml \
-	htdocs/fsize.shtml \
-	htdocs/include.shtml
-ICON_FILES = icons/README \
-	icons/a.gif \
-	icons/alert.black.gif \
-	icons/alert.red.gif \
-	icons/apache_pb.gif \
-	icons/back.gif \
-	icons/ball.gray.gif \
-	icons/ball.red.gif \
-	icons/binary.gif \
-	icons/binhex.gif \
-	icons/blank.gif \
-	icons/bomb.gif \
-	icons/box1.gif \
-	icons/box2.gif \
-	icons/broken.gif \
-	icons/burst.gif \
-	icons/button1.gif \
-	icons/button10.gif \
-	icons/button2.gif \
-	icons/button3.gif \
-	icons/button4.gif \
-	icons/button5.gif \
-	icons/button6.gif \
-	icons/button7.gif \
-	icons/button8.gif \
-	icons/button9.gif \
-	icons/buttonl.gif \
-	icons/buttonr.gif \
-	icons/c.gif \
-	icons/comp.blue.gif \
-	icons/comp.gray.gif \
-	icons/compressed.gif \
-	icons/continued.gif \
-	icons/dir.gif \
-	icons/down.gif \
-	icons/dvi.gif \
-	icons/f.gif \
-	icons/folder.gif \
-	icons/folder.open.gif \
-	icons/folder.sec.gif \
-	icons/forward.gif \
-	icons/generic.gif \
-	icons/generic.red.gif \
-	icons/generic.sec.gif \
-	icons/hand.right.gif \
-	icons/hand.up.gif \
-	icons/htdig.gif \
-	icons/icon.sheet.gif \
-	icons/image1.gif \
-	icons/image2.gif \
-	icons/image3.gif \
-	icons/index.gif \
-	icons/layout.gif \
-	icons/left.gif \
-	icons/link.gif \
-	icons/movie.gif \
-	icons/p.gif \
-	icons/patch.gif \
-	icons/pdf.gif \
-	icons/pie0.gif \
-	icons/pie1.gif \
-	icons/pie2.gif \
-	icons/pie3.gif \
-	icons/pie4.gif \
-	icons/pie5.gif \
-	icons/pie6.gif \
-	icons/pie7.gif \
-	icons/pie8.gif \
-	icons/portal.gif \
-	icons/poweredby.gif \
-	icons/ps.gif \
-	icons/quill.gif \
-	icons/right.gif \
-	icons/screw1.gif \
-	icons/screw2.gif \
-	icons/script.gif \
-	icons/sound1.gif \
-	icons/sound2.gif \
-	icons/sphere1.gif \
-	icons/sphere2.gif \
-	icons/star.gif \
-	icons/star_blank.gif \
-	icons/tar.gif \
-	icons/tex.gif \
-	icons/text.gif \
-	icons/transfer.gif \
-	icons/unknown.gif \
-	icons/up.gif \
-	icons/uu.gif \
-	icons/uuencoded.gif \
-	icons/world1.gif \
-	icons/world2.gif
-
-SSL_FILES = ssl/ssl_client.pem \
-	ssl/ssl_server.pem
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: 
-
-clean:
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/auth
-	$(INSTALL_DATA) $(AUTH_FILES) $(RELSYSDIR)/examples/server_root/auth
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/cgi-bin
-	$(INSTALL_SCRIPT) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/conf
-	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/examples/server_root/conf
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/open
-	$(INSTALL_DATA) $(OPEN_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/open
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
-	$(INSTALL_DATA) $(MNESIA_OPEN_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/misc
-	$(INSTALL_DATA) $(MISC_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/misc
-	$(INSTALL_DIR)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/secret/top_secret
-	$(INSTALL_DIR)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret/top_secret
-	$(INSTALL_DATA) $(SECRET_FILES)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/secret
-	$(INSTALL_DATA) $(MNESIA_SECRET_FILES)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs
-	$(INSTALL_DATA) $(HTDOCS_FILES) $(RELSYSDIR)/examples/server_root/htdocs
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/icons
-	$(INSTALL_DATA) $(ICON_FILES) $(RELSYSDIR)/examples/server_root/icons
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/ssl
-	$(INSTALL_DATA) $(SSL_FILES) $(RELSYSDIR)/examples/server_root/ssl
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/logs
-
-release_docs_spec:
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/auth/group b/lib/inets/test/old_httpd_SUITE_data/server_root/auth/group
deleted file mode 100644
index b3da0ccbd3..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/auth/group
+++ /dev/null
@@ -1,3 +0,0 @@
-group1: one two
-group2: two three
-group3: three Aladdin
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/auth/passwd b/lib/inets/test/old_httpd_SUITE_data/server_root/auth/passwd
deleted file mode 100644
index 8c980ff547..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/auth/passwd
+++ /dev/null
@@ -1,4 +0,0 @@
-one:onePassword
-two:twoPassword
-three:threePassword
-Aladdin:AladdinPassword
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.bat b/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.bat
deleted file mode 100644
index 25a49a1536..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-echo tomrad > c:\cygwin\tmp\hej
-echo Content-type: text/html
-echo.
-echo ^<HTML^> ^<HEAD^> ^<TITLE^>OS Environment^</TITLE^> ^</HEAD^> ^<BODY^>^<PRE^>
-set
-echo ^</PRE^>^</BODY^>^</HTML^>
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.sh b/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.sh
deleted file mode 100755
index de81de9bde..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-echo "Content-type: text/html"
-echo ""
-echo "<HTML> <HEAD> <TITLE>OS Environment</TITLE> </HEAD> <BODY><PRE>"
-env
-echo "</PRE></BODY></HTML>"
\ No newline at end of file
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf
deleted file mode 100644
index 7b1b4a15b2..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-Port 8080
-#ServerName your.server.net
-SocketType ip_comm
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
-ServerAdmin [email protected]
-ServerRoot /var/tmp/server_root
-ErrorLog logs/error_log_8080
-TransferLog logs/access_log_8080
-SecurityLog logs/security_log_8080
-ErrorDiskLog logs/error_disk_log_8080
-ErrorDiskLogSize 200000 10
-TransferDiskLog logs/access_disk_log_8080
-TransferDiskLogSize 200000 10
-SecurityDiskLog logs/security_disk_log
-SecurityDiskLogSize 200000 10
-MaxClients 50
-#KeepAlive 5
-#KeepAliveTimeout 10
-DocumentRoot /var/tmp/server_root/htdocs
-DirectoryIndex index.html welcome.html
-DefaultType text/plain
-Alias /icons/ /var/tmp/server_root/icons/
-Alias /pics/ /var/tmp/server_root/icons/
-ScriptAlias /cgi-bin/ /var/tmp/server_root/cgi-bin/
-ScriptAlias /htbin/ /var/tmp/server_root/cgi-bin/
-ErlScriptAlias /cgi-bin/erl httpd_example io
-EvalScriptAlias /eval httpd_example io
-#Script HEAD /cgi-bin/printenv.sh
-#Action image/gif /cgi-bin/printenv.sh
-
-<Directory /var/tmp/server_root/htdocs/open>
-AuthDBType plain
-AuthName Open Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret>
-AuthDBType plain
-AuthName Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret/top_secret>
-AuthDBType plain
-AuthName Top Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group3
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_open>
-AuthDBType mnesia
-AuthName Open Area
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret>
-AuthDBType mnesia
-AuthName Secret Area
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret/top_secret>
-AuthDBType mnesia
-AuthName Top Secret Area
-require group group3
-allow from 130.100.34 130.100.35
-deny from 100.234.22.12 194.100.34.1 130.100.34.25
-SecurityDataFile logs/security_data
-SecurityMaxRetries 3
-SecurityBlockTime 10
-SecurityFailExpireTime 1
-SecurityAuthTimeout 1
-SecurityCallbackModule security_callback
-</Directory>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf
deleted file mode 100644
index 042779fcd0..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-Port 8888
-#ServerName your.server.net
-SocketType ip_comm
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
-ServerAdmin [email protected]
-ServerRoot /var/tmp/server_root
-ErrorLog logs/error_log_8888
-TransferLog logs/access_log_8888
-ErrorDiskLog logs/error_disk_log_8888
-ErrorDiskLogSize 200000 10
-TransferDiskLog logs/access_disk_log_8888
-TransferDiskLogSize 200000 10
-MaxClients 150
-DocumentRoot /var/tmp/server_root/htdocs
-DirectoryIndex index.html welcome.html
-DefaultType text/plain
-Alias /icons/ /var/tmp/server_root/icons/
-Alias /pics/ /var/tmp/server_root/icons/
-ScriptAlias /cgi-bin/ /var/tmp/server_root/cgi-bin/
-ScriptAlias /htbin/ /var/tmp/server_root/cgi-bin/
-ErlScriptAlias /cgi-bin/erl httpd_example io
-EvalScriptAlias /eval httpd_example io
-#Script HEAD /cgi-bin/printenv.sh
-#Action image/gif /cgi-bin/printenv.sh
-
-<Directory /var/tmp/server_root/htdocs/open>
-AuthName Open Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret>
-AuthName Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret/top_secret>
-AuthName Top Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group3
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_open>
-AuthName Open Area
-AuthMnesiaDB On
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret>
-AuthName Secret Area
-AuthMnesiaDB On
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret/top_secret>
-AuthName Top Secret Area
-AuthMnesiaDB On
-require group group3
-</Directory>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
deleted file mode 100644
index 3add93cd73..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
+++ /dev/null
@@ -1,269 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-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.
-# 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%
-#
-#
-
-# Port: The port the standalone listens to. For ports < 1023, you will
-# need httpd to be run as root initially.
-
-Port 8888
-
-# BindAddress: This directive is used to tell the server which IP address
-# to listen to. It can either contain "*", an IP address, or a fully
-# qualified Internet domain name.
-# 
-# It is also possible to specify the ip-family with the directive.
-# There ar three possible value: inet, inet6 and inet6fb4
-# inet:     Use IpFamily inet when retreiving the address and
-#           fail if that does not work.
-# inet6:    Use IpFamily inet6 when retreiving the address and
-#           fail if that does not work.
-# inet6fb4: First IpFamily inet6 is tried and if that does not work, 
-#           inet is used as fallback. 
-# Default value for ip-family is inet6fb4
-# 
-# The syntax is: <address>[|<ip-family>]
-#
-#BindAddress *
-#BindAddress *|inet
-
-
-# ServerName allows you to set a host name which is sent back to clients for
-# your server if it's different than the one the program would get (i.e. use
-# "www" instead of the host's real name).
-#
-# Note: You cannot just invent host names and hope they work. The name you 
-# define here must be a valid DNS name for your host. If you don't understand
-# this, ask your network administrator.
-
-#ServerName your.server.net
-
-# SocketType is either ip_comm, sockets or ssl.
-
-SocketType ip_comm
-
-# Modules: Server run-time plug-in modules written using the Erlang
-# Web Server API (EWSAPI). The server API make it easy to add functionality
-# to the server. Read more about EWSAPI in the Reference Manual.
-# WARNING! Do not tamper with this directive unless you are familiar with
-# EWSAPI.
-
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_responsecontrol mod_trace mod_range mod_head mod_dir mod_get mod_log mod_disk_log
-
-# ServerAdmin: Your address, where problems with the server should be
-# e-mailed.
-
-ServerAdmin [email protected]
-
-# ServerRoot: The directory the server's config, error, and log files
-# are kept in
-
-ServerRoot /var/tmp/server_root
-
-# ErrorLog: The location of the error log file. If this does not start
-# with /, ServerRoot is prepended to it.
-
-ErrorLog logs/error_log
-
-# TransferLog: The location of the transfer log file. If this does not
-# start with /, ServerRoot is prepended to it.
-
-TransferLog logs/access_log
-
-# SecurityLog: The location of the security log file (mod_security required)
-#
-SecurityLog logs/security_log
-
-# ErrorDiskLog: The location of the error log file. If this does not
-# start with /, ServerRoot is prepended to it. This log file is managed
-# with the disk_log module [See disk_log(3)]. The ErrorDiskLogSize directive
-# takes two argument, i.e. MaxBytes and MaxFiles. The wrap log writes at most
-# MaxBytes bytes on each file, and it uses MaxFiles files before it wraps, and
-# truncates the first file.
-
-ErrorDiskLog logs/error_disk_log
-ErrorDiskLogSize 200000 10
-
-# TransferDiskLog: The location of the transfer log file. If this does not
-# start with /, ServerRoot is prepended to it. This log file is managed
-# with the disk_log module [See disk_log(3)]. The TransferDiskLogSize directive
-# takes two argument, i.e. MaxBytes and MaxFiles. The wrap log writes at most
-# MaxBytes bytes on each file, and it uses MaxFiles files before it wraps, and
-# truncates the first file.
-
-TransferDiskLog logs/access_disk_log
-TransferDiskLogSize 200000 10
-
-# SecurityDiskLog: The location of the security log file. If this does not
-# start with /, ServerRoot is prepended to it. This log file is managed
-# with the disk_log module [See disk_log(3)]. The SecurityDiskLogSize directive
-# takes two argument, i.e. MaxBytes and MaxFiles. The wrap log writes at most
-# MaxBytes bytes on each file, and it uses MaxFiles files before it wraps, and
-# truncates the first file.
-
-SecurityDiskLog logs/security_disk_log
-SecurityDiskLogSize 200000 10
-
-# Limit on total number of servers running, i.e., limit on the number
-# of clients who can simultaneously connect --- if this limit is ever
-# reached, clients will be LOCKED OUT, so it should NOT BE SET TOO LOW.
-# It is intended mainly as a brake to keep a runaway server from taking
-# the server with it as it spirals down...
-
-MaxClients 50
-
-# KeepAlive set the flag for persistent connections. For persistent connections
-# set KeepAlive to on. To use One request per connection set the flag to off
-# Note: The value has changed since previous version of INETS.
-KeepAlive on
-
-# KeepAliveTimeout sets the number of seconds before a persistent connection
-# times out and closes.
-KeepAliveTimeout 10
-
-# MaxKeepAliveRequests sets the number of seconds before a persistent connection
-# times out and closes.
-MaxKeepAliveRequests 10
-
-
-
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-
-DocumentRoot /var/tmp/server_root/htdocs
-
-# DirectoryIndex: Name of the file or files to use as a pre-written HTML
-# directory index.  Separate multiple entries with spaces.
-
-DirectoryIndex index.html welcome.html
-
-# DefaultType is the default MIME type for documents which the server
-# cannot find the type of from filename extensions.
-
-DefaultType text/plain
-
-# Aliases: Add here as many aliases as you need (with no limit). The format is 
-# Alias fakename realname
-
-Alias /icons/ /var/tmp/server_root/icons/
-Alias /pics/ /var/tmp/server_root/icons/
-
-# ScriptAlias: This controls which directories contain server scripts.
-# Format: ScriptAlias fakename realname
-
-ScriptAlias /cgi-bin/ /var/tmp/server_root/cgi-bin/
-ScriptAlias /htbin/ /var/tmp/server_root/cgi-bin/
-
-# This directive adds an action, which will activate cgi-script when a
-# file is requested using the method of method, which can be one of
-# GET, POST and HEAD. It sends the URL and file path of the requested
-# document using the standard CGI PATH_INFO and PATH_TRANSLATED
-# environment variables.
-
-#Script HEAD /cgi-bin/printenv.sh
-
-# This directive adds an action, which will activate cgi-script when a
-# file of content type mime-type is requested. It sends the URL and
-# file path of the requested document using the standard CGI PATH_INFO
-# and PATH_TRANSLATED environment variables.
-
-#Action image/gif /cgi-bin/printenv.sh
-
-# ErlScriptAlias: This specifies how "Erl" server scripts are called.
-# Format: ErlScriptAlias fakename realname allowed_modules
-
-ErlScriptAlias /down/erl httpd_example io
-
-# EvalScriptAlias: This specifies how "Eval" server scripts are called.
-# Format: EvalScriptAlias fakename realname allowed_modules
-
-EvalScriptAlias /eval httpd_example io
-
-# Point SSLCertificateFile at a PEM encoded certificate.
-
-SSLCertificateFile /var/tmp/server_root/ssl/ssl_server.pem
-
-# If the key is not combined with the certificate, use this directive to
-# point at the key file.
-
-SSLCertificateKeyFile /var/tmp/server_root/ssl/ssl_server.pem
-
-# Set SSLVerifyClient to:
-# 0 if no certicate is required
-# 1 if the client may present a valid certificate
-# 2 if the client must present a valid certificate
-# 3 if the client may present a valid certificate but it is not required to
-#   have a valid CA
-
-SSLVerifyClient 0
-
-# Each directory to which INETS has access, can be configured with respect
-# to which services and features are allowed and/or disabled in that
-# directory (and its subdirectories). 
-
-<Directory /var/tmp/server_root/htdocs/open>
-AuthDBType plain
-AuthName Open Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret>
-AuthDBType plain
-AuthName Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret/top_secret>
-AuthDBType plain
-AuthName Top Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group3
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_open>
-AuthDBType mnesia
-AuthName Open Area
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret>
-AuthDBType mnesia
-AuthName Secret Area
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret/top_secret>
-AuthDBType mnesia
-AuthName Top Secret Area
-require group group3
-allow from 130.100.34 130.100.35
-deny from 100.234.22.12 194.100.34.1 130.100.34.25
-SecurityDataFile logs/security_data
-SecurityMaxRetries 3
-SecurityBlockTime 10
-SecurityFailExpireTime 1
-SecurityAuthTimeout 1
-SecurityCallbackModule security_callback
-</Directory>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/mime.types b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/mime.types
deleted file mode 100644
index d2f81e4e5e..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/mime.types
+++ /dev/null
@@ -1,465 +0,0 @@
-# This is a comment. I love comments.
-
-# MIME type			Extension
-application/EDI-Consent
-application/EDI-X12
-application/EDIFACT
-application/activemessage
-application/andrew-inset	ez
-application/applefile
-application/atomicmail
-application/batch-SMTP
-application/beep+xml
-application/cals-1840
-application/commonground
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/dvcs
-application/eshop
-application/http
-application/hyperstudio
-application/iges
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/font-tdpfr
-application/mac-binhex40	hqx
-application/mac-compactpro	cpt
-application/macwriteii
-application/marc
-application/mathematica
-application/mathematica-old
-application/msword		doc
-application/news-message-id
-application/news-transmission
-application/ocsp-request
-application/ocsp-response
-application/octet-stream	bin dms lha lzh exe class so dll
-application/oda			oda
-application/parityfec
-application/pdf			pdf
-application/pgp-encrypted
-application/pgp-keys
-application/pgp-signature
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/pkix-cert
-application/pkix-crl
-application/pkixcmp
-application/postscript		ai eps ps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/qsig
-application/remote-printing
-application/riscos
-application/rtf
-application/sdp
-application/set-payment
-application/set-payment-initiation
-application/set-registration
-application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/sieve
-application/slate
-application/smil		smi smil
-application/timestamp-query
-application/timestamp-reply
-application/vemmi
-application/vnd.3M.Post-it-Notes
-application/vnd.FloGraphIt
-application/vnd.accpac.simply.aso
-application/vnd.accpac.simply.imp
-application/vnd.acucobol
-application/vnd.aether.imp
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.businessobjects
-application/vnd.bmi
-application/vnd.canon-cpdl
-application/vnd.canon-lips
-application/vnd.claymore
-application/vnd.commerce-battelle
-application/vnd.commonspace
-application/vnd.comsocaller
-application/vnd.contact.cmsg
-application/vnd.cosmocaller
-application/vnd.cups-postscript
-application/vnd.cups-raster
-application/vnd.cups-raw
-application/vnd.ctc-posml
-application/vnd.cybank
-application/vnd.dna
-application/vnd.dpgraph
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.esf
-application/vnd.epson.msf
-application/vnd.epson.quickanime
-application/vnd.epson.salt
-application/vnd.epson.ssf
-application/vnd.ericsson.quickcall
-application/vnd.eudora.data
-application/vnd.fdf
-application/vnd.ffsns
-application/vnd.framemaker
-application/vnd.fsc.weblaunch
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.ddd
-application/vnd.fujixerox.docuworks
-application/vnd.fujixerox.docuworks.binder
-application/vnd.fut-misnet
-application/vnd.grafeq
-application/vnd.groove-account
-application/vnd.groove-identity-message
-application/vnd.groove-injector
-application/vnd.groove-tool-message
-application/vnd.groove-tool-template
-application/vnd.groove-vcard
-application/vnd.hhe.lesson-player
-application/vnd.hp-HPGL
-application/vnd.hp-PCL
-application/vnd.hp-PCLXL
-application/vnd.hp-hpid
-application/vnd.hp-hps
-application/vnd.httphone
-application/vnd.hzn-3d-crossword
-application/vnd.ibm.afplinedata
-application/vnd.ibm.MiniPay
-application/vnd.ibm.modcap
-application/vnd.informix-visionary
-application/vnd.intercon.formnet
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.intu.qbo
-application/vnd.intu.qfx
-application/vnd.irepository.package+xml
-application/vnd.is-xpr
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.koan
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-notes
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.mcd
-application/vnd.mediastation.cdkey
-application/vnd.meridian-slingshot
-application/vnd.mif		mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf
-application/vnd.mobius.dis
-application/vnd.mobius.msl
-application/vnd.mobius.plc
-application/vnd.mobius.txf
-application/vnd.motorola.flexsuite
-application/vnd.motorola.flexsuite.adsi
-application/vnd.motorola.flexsuite.fis
-application/vnd.motorola.flexsuite.gotap
-application/vnd.motorola.flexsuite.kmr
-application/vnd.motorola.flexsuite.ttc
-application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel	xls
-application/vnd.ms-lrm
-application/vnd.ms-powerpoint	ppt
-application/vnd.ms-project
-application/vnd.ms-tnef
-application/vnd.ms-works
-application/vnd.mseq
-application/vnd.msign
-application/vnd.music-niff
-application/vnd.musician
-application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.EDM
-application/vnd.novadigm.EDX
-application/vnd.novadigm.EXT
-application/vnd.osa.netdeploy
-application/vnd.palm
-application/vnd.pg.format
-application/vnd.pg.osasli
-application/vnd.powerbuilder6
-application/vnd.powerbuilder6-s
-application/vnd.powerbuilder7
-application/vnd.powerbuilder7-s
-application/vnd.powerbuilder75
-application/vnd.powerbuilder75-s
-application/vnd.previewsystems.box
-application/vnd.publishare-delta-tree
-application/vnd.pvi.ptid1
-application/vnd.pwg-xhtml-print+xml
-application/vnd.rapid
-application/vnd.s3sms
-application/vnd.seemail
-application/vnd.shana.informed.formdata
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.sss-cod
-application/vnd.sss-dtf
-application/vnd.sss-ntf
-application/vnd.street-stream
-application/vnd.svd
-application/vnd.swiftview-ics
-application/vnd.triscape.mxs
-application/vnd.trueapp
-application/vnd.truedoc
-application/vnd.tve-trigger
-application/vnd.ufdl
-application/vnd.uplanet.alert
-application/vnd.uplanet.alert-wbxml
-application/vnd.uplanet.bearer-choice-wbxml
-application/vnd.uplanet.bearer-choice
-application/vnd.uplanet.cacheop
-application/vnd.uplanet.cacheop-wbxml
-application/vnd.uplanet.channel
-application/vnd.uplanet.channel-wbxml
-application/vnd.uplanet.list
-application/vnd.uplanet.list-wbxml
-application/vnd.uplanet.listcmd
-application/vnd.uplanet.listcmd-wbxml
-application/vnd.uplanet.signal
-application/vnd.vcx
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio
-application/vnd.vividence.scriptfile
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml	wbxml
-application/vnd.wap.wmlc	wmlc
-application/vnd.wap.wmlscriptc	wmlsc
-application/vnd.webturbo
-application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf
-application/vnd.xara
-application/vnd.xfdl
-application/vnd.yellowriver-custom-menu
-application/whoispp-query
-application/whoispp-response
-application/wita
-application/wordperfect5.1
-application/x-bcpio		bcpio
-application/x-cdlink		vcd
-application/x-chess-pgn		pgn
-application/x-compress
-application/x-cpio		cpio
-application/x-csh		csh
-application/x-director		dcr dir dxr
-application/x-dvi		dvi
-application/x-futuresplash	spl
-application/x-gtar		gtar
-application/x-gzip
-application/x-hdf		hdf
-application/x-javascript	js
-application/x-koan		skp skd skt skm
-application/x-latex		latex
-application/x-netcdf		nc cdf
-application/x-sh		sh
-application/x-shar		shar
-application/x-shockwave-flash	swf
-application/x-stuffit		sit
-application/x-sv4cpio		sv4cpio
-application/x-sv4crc		sv4crc
-application/x-tar		tar
-application/x-tcl		tcl
-application/x-tex		tex
-application/x-texinfo		texinfo texi
-application/x-troff		t tr roff
-application/x-troff-man		man
-application/x-troff-me		me
-application/x-troff-ms		ms
-application/x-ustar		ustar
-application/x-wais-source	src
-application/x400-bp
-application/xml
-application/xml-dtd
-application/xml-external-parsed-entity
-application/zip			zip
-audio/32kadpcm
-audio/basic			au snd
-audio/g.722.1
-audio/l16
-audio/midi			mid midi kar
-audio/mp4a-latm
-audio/mpa-robust
-audio/mpeg			mpga mp2 mp3
-audio/parityfec
-audio/prs.sid
-audio/telephone-event
-audio/tone
-audio/vnd.cisco.nse
-audio/vnd.cns.anp1
-audio/vnd.cns.inf1
-audio/vnd.digital-winds
-audio/vnd.everad.plj
-audio/vnd.lucent.voice
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800
-audio/vnd.nuera.ecelp7470
-audio/vnd.nuera.ecelp9600
-audio/vnd.octel.sbc
-audio/vnd.qcelp
-audio/vnd.rhetorex.32kadpcm
-audio/vnd.vmx.cvsd
-audio/x-aiff			aif aiff aifc
-audio/x-mpegurl			m3u
-audio/x-pn-realaudio		ram rm
-audio/x-pn-realaudio-plugin	rpm
-audio/x-realaudio		ra
-audio/x-wav			wav
-chemical/x-pdb			pdb
-chemical/x-xyz			xyz
-image/bmp			bmp
-image/cgm
-image/g3fax
-image/gif			gif
-image/ief			ief
-image/jpeg			jpeg jpg jpe
-image/naplps
-image/png			png
-image/prs.btif
-image/prs.pti
-image/tiff			tiff tif
-image/vnd.cns.inf2
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fastbidsheet
-image/vnd.fpx
-image/vnd.fst
-image/vnd.fujixerox.edmics-mmr
-image/vnd.fujixerox.edmics-rlc
-image/vnd.mix
-image/vnd.net-fpx
-image/vnd.svf
-image/vnd.wap.wbmp		wbmp
-image/vnd.xiff
-image/x-cmu-raster		ras
-image/x-portable-anymap		pnm
-image/x-portable-bitmap		pbm
-image/x-portable-graymap	pgm
-image/x-portable-pixmap		ppm
-image/x-rgb			rgb
-image/x-xbitmap			xbm
-image/x-xpixmap			xpm
-image/x-xwindowdump		xwd
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/news
-message/partial
-message/rfc822
-message/s-http
-model/iges			igs iges
-model/mesh			msh mesh silo
-model/vnd.dwf
-model/vnd.flatland.3dml
-model/vnd.gdl
-model/vnd.gs-gdl
-model/vnd.gtw
-model/vnd.mts
-model/vnd.vtu
-model/vrml			wrl vrml
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-text/calendar
-text/css			css
-text/directory
-text/enriched
-text/html			html htm
-text/parityfec
-text/plain			asc txt
-text/prs.lines.tag
-text/rfc822-headers
-text/richtext			rtx
-text/rtf			rtf
-text/sgml			sgml sgm
-text/tab-separated-values	tsv
-text/t140
-text/uri-list
-text/vnd.DMClientScript
-text/vnd.IPTC.NITF
-text/vnd.IPTC.NewsML
-text/vnd.abc
-text/vnd.curl
-text/vnd.flatland.3dml
-text/vnd.fly
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
-text/vnd.latex-z
-text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
-text/vnd.wap.si
-text/vnd.wap.sl
-text/vnd.wap.wml		wml
-text/vnd.wap.wmlscript		wmls
-text/x-setext			etx
-text/x-server-parsed-html       shtml
-text/xml			xml xsl
-text/xml-external-parsed-entity
-video/mp4v-es
-video/mpeg			mpeg mpg mpe
-video/parityfec
-video/pointer
-video/quicktime			qt mov
-video/vnd.fvt
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.mpegurl		mxu
-video/vnd.mts
-video/vnd.nokia.interleaved-multimedia
-video/vnd.vivo
-video/x-msvideo			avi
-video/x-sgi-movie		movie
-x-conference/x-cooltalk		ice
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf
deleted file mode 100644
index de49ceafd0..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-Port 8088
-#ServerName your.server.net
-SocketType ssl
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
-ServerAdmin [email protected]
-ServerRoot /var/tmp/server_root
-ErrorLog logs/error_log_8088
-TransferLog logs/access_log_8088
-ErrorDiskLog logs/error_disk_log_8088
-ErrorDiskLogSize 200000 10
-TransferDiskLog logs/access_disk_log_8088
-TransferDiskLogSize 200000 10
-MaxClients 150
-DocumentRoot /var/tmp/server_root/htdocs
-DirectoryIndex index.html welcome.html
-DefaultType text/plain
-Alias /icons/ /var/tmp/server_root/icons/
-Alias /pics/ /var/tmp/server_root/icons/
-ScriptAlias /cgi-bin/ /var/tmp/server_root/cgi-bin/
-ScriptAlias /htbin/ /var/tmp/server_root/cgi-bin/
-ErlScriptAlias /cgi-bin/erl httpd_example io
-EvalScriptAlias /eval httpd_example io
-SSLCertificateFile /var/tmp/server_root/ssl/ssl_server.pem
-SSLCertificateKeyFile /var/tmp/server_root/ssl/ssl_server.pem
-SSLVerifyClient 0
-#Script HEAD /cgi-bin/printenv.sh
-#Action image/gif /cgi-bin/printenv.sh
-
-<Directory /var/tmp/server_root/htdocs/open>
-AuthName Open Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret>
-AuthName Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret/top_secret>
-AuthName Top Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group3
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_open>
-AuthName Open Area
-AuthMnesiaDB On
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret>
-AuthName Secret Area
-AuthMnesiaDB On
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret/top_secret>
-AuthName Top Secret Area
-AuthMnesiaDB On
-require group group3
-</Directory>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/config.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/config.shtml
deleted file mode 100644
index 107e3ff610..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/config.shtml
+++ /dev/null
@@ -1,70 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/ssi.html (17-Apr-1997)</TITLE>
-</HEAD>
-<BODY>
-<H1>/ssi.html</H1>
-
-<!-- ************* CONFIG ************* -->
-
-<!--#config timefmt="%a %b %e %T %Z %Y" sizefmt="abbrev"-->
-<!--#config errmsg="[an especially ugly error occurred while processing this directive]"-->
-
-<!-- ************* INCLUDE ************* -->
-
-<P>Include /misc/friedrich.html:
-<!--#include virtual="/misc/friedrich.html"-->
-<P>Include /misc/not_defined.html: <!--#include virtual="/misc/not_defined.html"-->
-<P>Include misc/friedrich.html:
-<!--#include file="misc/friedrich.html"-->
-<P>Include not_defined.html: <!--#include file="not_defined.html"-->
-
-<P><HR>
-
-<!-- ************* ECHO ************* -->
-
-<P>DOCUMENT_NAME: <!--#echo var="DOCUMENT_NAME"-->
-<P>DOCUMENT_URI: <!--#echo var="DOCUMENT_URI"-->
-<P>QUERY_STRING_UNESCAPED: <!--#echo var="QUERY_STRING_UNESCAPED"-->
-<P>DATE_LOCAL: <!--#echo var="DATE_LOCAL"-->
-<P>DATE_GMT: <!--#echo var="DATE_GMT"-->
-<P>LAST_MODIFIED: <!--#echo var="LAST_MODIFIED"-->
-<P>NOT_DEFINED: <!--#echo var="NOT_DEFINED"-->
-
-<P><HR>
-
-<!-- ************* FSIZE ************* -->
-
-<P>Size of index.html: <!--#fsize file="index.html"-->
-<P>Size of not_defined.html: <!--#fsize file="not_defined.html"-->
-<!--#config sizefmt="bytes"-->
-<P>Size of /misc/friedrich.html: <!--#fsize virtual="/misc/friedrich.html"-->
-<P>Size of /misc/not_defined.html: <!--#fsize virtual="/misc/not_defined.html"-->
-
-<P><HR>
-
-<!-- ************* FLASTMOD ************* -->
-
-<P>Last modification of index.html: <!--#flastmod file="index.html"-->
-<P>Last modification of not_defined.html: <!--#flastmod file="not_defined.html"-->
-<P>Last modification of /misc/friedrich.html: <!--#flastmod virtual="/misc/friedrich.html"-->
-<P>Last modification of /misc/not_defined.html: <!--#flastmod virtual="/misc/not_defined.html"-->
-
-<!--#exec cmd="ls"-->
-<!--#exec cmd="printenv"-->
-<!--#exec cmd="sunemaja"-->
-
-<!--#exec cgi="/cgi-bin/printenv.sh"-->
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_open/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_open/dummy.html
deleted file mode 100644
index a6e8a35a04..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_open/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/open/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/open/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/dummy.html
deleted file mode 100644
index 016b04e540..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/secret/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/secret/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/top_secret/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/top_secret/index.html
deleted file mode 100644
index 34db3d5d1a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/top_secret/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/secret/top_secret/index.html (04-Feb-1998)</TITLE>
-<!-- Created by: Mattias Nilsson, 04-Feb-1998 -->
-</HEAD>
-<BODY>
-<H1>/secret/top_secret/index.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/echo.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/echo.shtml
deleted file mode 100644
index 141db5be59..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/echo.shtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/echo.shtml</TITLE>
-</HEAD>
-<BODY>
-<H1>/echo.shtml</H1>
-
-<P>DOCUMENT_NAME: <!--#echo var="DOCUMENT_NAME"-->
-
-<P>DOCUMENT_URI: <!--#echo var="DOCUMENT_URI"-->
-
-<P>QUERY_STRING_UNESCAPED: <!--#echo var="QUERY_STRING_UNESCAPED"-->
-
-<P>DATE_LOCAL: <!--#echo var="DATE_LOCAL"-->
-
-<P>DATE_GMT: <!--#echo var="DATE_GMT"-->
-
-<P>LAST_MODIFIED: <!--#echo var="LAST_MODIFIED"-->
-
-<P>NOT_DEFINED: <!--#echo var="NOT_DEFINED"-->
-
-<P>[<A HREF="ssi.html">Back</A>]
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/exec.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/exec.shtml
deleted file mode 100644
index 97333da898..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/exec.shtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/exec.shtml</TITLE>
-</HEAD>
-<BODY>
-<H1>/exec.shtml</H1>
-<PRE>
-<!--#exec cmd="ls"-->
-<HR>
-<!--#exec cmd="printenv"-->
-<HR>
-<!--#exec cmd="sunemaja"-->
-<HR>
-<!--#exec cgi="/cgi-bin/printenv.sh"-->
-</PRE>
-
-<P>[<A HREF="ssi.html">Back</A>]
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/flastmod.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/flastmod.shtml
deleted file mode 100644
index d54c36fe50..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/flastmod.shtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<HTML>
-<HEAD>	
-<TITLE>/flastmod.shtml</TITLE>
-</HEAD>
-<BODY>
-<H1>/flastmod.shtml</H1>
-
-<P>Last modification of index.html: <!--#flastmod file="index.html"-->
-
-<P>Last modification of not_defined.html: <!--#flastmod file="not_defined.html"-->
-
-<P>Last modification of /misc/friedrich.html: <!--#flastmod virtual="/misc/friedrich.html"-->
-
-<P>Last modification of /misc/not_defined.html: <!--#flastmod virtual="/misc/not_defined.html"-->
-
-<P>[<A HREF="ssi.html">Back</A>]
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/fsize.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/fsize.shtml
deleted file mode 100644
index 570ee9cf6d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/fsize.shtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/fsize.shtml</TITLE>
-</HEAD>
-<BODY>
-<H1>/fsize.shtml</H1>
-
-<P>Size of index.html: <!--#fsize file="index.html"-->
-
-<P>Size of not_defined.html: <!--#fsize file="not_defined.html"-->
-
-<P>Size of /misc/friedrich.html: <!--#fsize virtual="/misc/friedrich.html"-->
-
-<P>Size of /misc/not_defined.html: <!--#fsize virtual="/misc/not_defined.html"-->
-
-<P>[<A HREF="ssi.html">Back</A>]
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/include.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/include.shtml
deleted file mode 100644
index 529aad0437..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/include.shtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<HTML>
-<HEAD>	
-<TITLE>/include.shtml</TITLE>
-</HEAD>
-<BODY>
-<H1>/include.shtml</H1>
-
-<P>Include /misc/friedrich.html:
-<!--#include virtual="/misc/friedrich.html"-->
-
-<P>Include /misc/not_defined.html:
-<!--#include virtual="/misc/not_defined.html"-->
-
-<P>Include misc/friedrich.html:
-<!--#include file="misc/friedrich.html"-->
-
-<P>Include not_defined.html:
-<!--#include file="not_defined.html"-->
-
-<P>[<A HREF="ssi.html">Back</A>]
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/index.html
deleted file mode 100644
index cfdc9f9ab7..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/index.html</TITLE>
-</HEAD>
-<BODY>
-<H1>/index.html</H1>
-
-<STRONG>Server-Side Include (SSI) commands:</STRONG><BR>
-<A HREF="config.shtml">config</A><BR>
-<A HREF="echo.shtml">echo</A><BR>
-<A HREF="exec.shtml">exec</A><BR>
-<A HREF="flastmod.shtml">flastmod</A><BR>
-<A HREF="fsize.shtml">fsize</A><BR>
-<A HREF="include.shtml">include</A><BR>
-
-<BR>
-<BR>
-
-<STRONG>ESI callback:</STRING><BR>
-<A HREF="cgi-bin/erl/httpd_example/get">cgi-bin/erl/httpd_example/get</A><BR>
-<A HREF="cgi-bin/erl/httpd_example/yahoo">cgi-bin/erl/httpd_example/yahoo</A><BR>
-<A HREF="cgi-bin/erl/httpd_example/test1">cgi-bin/erl/httpd_example/test1</A><BR>
-
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/last_modified.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/last_modified.html
deleted file mode 100644
index 65c1790813..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/last_modified.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/last_modified.html</TITLE>
-</HEAD>
-<BODY>
-<H1>/last_modified.html</H1>
-
-<P>This document is only used for test of illegal last-modified date.</P>
-
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/friedrich.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/friedrich.html
deleted file mode 100644
index d7953d5df4..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/friedrich.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><CITE>
-Talking much about oneself can also be a means to conceal oneself.<BR>
--- Friedrich Nietzsche
-</CITE>
-
-<P>Nested Include:
-<!--#include file="misc/oech.html"-->
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/oech.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/oech.html
deleted file mode 100644
index 506064bf04..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/oech.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<P><CITE>
-What excuses stand in your way?  How can you eliminate them?<BR>
--- Roger von Oech
-</CITE>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/welcome.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/welcome.html
deleted file mode 100644
index 8c17451f91..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/welcome.html
+++ /dev/null
@@ -1 +0,0 @@
-<HTML></HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_open/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_open/dummy.html
deleted file mode 100644
index a6e8a35a04..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_open/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/open/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/open/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/dummy.html
deleted file mode 100644
index 016b04e540..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/secret/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/secret/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/top_secret/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/top_secret/index.html
deleted file mode 100644
index 2d17e8b596..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/top_secret/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/mnesia_secret/top_secret/index.html (04-Feb-1998)</TITLE>
-<!-- Created by: Mattias Nilsson, 04-Feb-1998 -->
-</HEAD>
-<BODY>
-<H1>/mnesia_secret/top_secret/index.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/open/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/open/dummy.html
deleted file mode 100644
index a6e8a35a04..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/open/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/open/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/open/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/dummy.html
deleted file mode 100644
index 016b04e540..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/secret/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/secret/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/top_secret/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/top_secret/index.html
deleted file mode 100644
index 34db3d5d1a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/top_secret/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/secret/top_secret/index.html (04-Feb-1998)</TITLE>
-<!-- Created by: Mattias Nilsson, 04-Feb-1998 -->
-</HEAD>
-<BODY>
-<H1>/secret/top_secret/index.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/README b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/README
deleted file mode 100644
index a1fc5a5a9c..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/README
+++ /dev/null
@@ -1,161 +0,0 @@
-Public Domain Icons
-
-     These icons were originally made for Mosaic for X and have been
-     included in the NCSA httpd and Apache server distributions in the
-     past. They are in the public domain and may be freely included in any
-     application. The originals were done by Kevin Hughes ([email protected]).
-
-     Many thanks to Andy Polyakov for tuning the icon colors and adding a
-     few new images. If you'd like to contribute additions or ideas to
-     this set, please let me know.
-
-     The distribution site for these icons is at:
-
-          http://www.eit.com/goodies/www.icons/
-
-     Kevin Hughes
-     September 11, 1995
-
-
-Suggested Uses
-
-The following are a few suggestions, to serve as a starting point for ideas.
-Please feel free to tweak and rename the icons as you like.
-
-     a.gif
-          This might be used to represent PostScript or text layout
-          languages.
-
-     alert.black.gif, alert.red.gif
-          These can be used to highlight any important items, such as a
-          README file in a directory.
-
-     back.gif, forward.gif
-          These can be used as links to go to previous and next areas.
-
-     ball.gray.gif, ball.red.gif
-          These might be used as bullets.
-
-     binary.gif
-          This can be used to represent binary files.
-
-     binhex.gif
-          This can represent BinHex-encoded data.
-
-     blank.gif
-          This can be used as a placeholder or a spacing element.
-
-     bomb.gif
-          This can be used to repreesnt core files.
-
-     box1.gif, box2.gif
-          These icons can be used to represent generic 3D applications and
-          related files.
-
-     broken.gif
-          This can represent corrupted data.
-
-     burst.gif
-          This can call attention to new and important items.
-
-     c.gif
-          This might represent C source code.
-
-     comp.blue.gif, comp.red.gif
-          These little computer icons can stand for telnet or FTP
-          sessions.
-
-     compressed.gif
-          This may represent compressed data.
-
-     continued.gif
-          This can be a link to a continued listing of a directory.
-
-     down.gif, up.gif, left.gif, right.gif
-          These can be used to scroll up, down, left and right in a
-          listing or may be used to denote items in an outline.
-
-     dvi.gif
-          This can represent DVI files.
-
-     f.gif
-          This might represent FORTRAN or Forth source code.
-
-     folder.gif, folder.open.gif, folder.sec.gif
-          The folder can represent directories. There is also a version
-          that can represent secure directories or directories that cannot
-          be viewed.
-
-     generic.gif, generic.sec.gif, generic.red.gif
-          These can represent generic files, secure files, and important
-          files, respectively.
-
-     hand.right.gif, hand.up.gif
-          These can point out important items (pun intended).
-
-     image1.gif, image2.gif, image3.gif
-          These can represent image formats of various types.
-
-     index.gif
-          This might represent a WAIS index or search facility.
-
-     layout.gif
-          This might represent files and formats that contain graphics as
-          well as text layout, such as HTML and PDF files.
-
-     link.gif
-          This might represent files that are symbolic links.
-
-     movie.gif
-          This can represent various movie formats.
-
-     p.gif
-          This may stand for Perl or Python source code.
-
-     pie0.gif ... pie8.gif
-          These icons can be used in applications where a list of
-          documents is returned from a search. The little pie chart images
-          can denote how relevant the documents may be to your search
-          query.
-
-     patch.gif
-          This may stand for patches and diff files.
-
-     portal.gif
-          This might be a link to an online service or a 3D world.
-
-     ps.gif, quill.gif
-          These may represent PostScript files.
-
-     screw1.gif, screw2.gif
-          These may represent CAD or engineering data and formats.
-
-     script.gif
-          This can represent any of various interpreted languages, such as
-          Perl, python, TCL, and shell scripts, as well as server
-          configuration files.
-
-     sound1.gif, sound2.gif
-          These can represent sound files.
-
-     sphere1.gif, sphere2.gif
-          These can represent 3D worlds or rendering applications and
-          formats.
-
-     tex.gif
-          This can represent TeX files.
-
-     text.gif
-          This can represent generic (plain) text files.
-
-     transfer.gif
-          This can represent FTP transfers or uploads/downloads.
-
-     unknown.gif
-          This may represent a file of an unknown type.
-
-     uuencoded.gif
-          This can stand for uuencoded data.
-
-     world1.gif, world2.gif
-          These can represent 3D worlds or other 3D formats.
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/a.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/a.gif
deleted file mode 100644
index bb23d971f4..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/a.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.black.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.black.gif
deleted file mode 100644
index eaecd2172a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.black.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.red.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.red.gif
deleted file mode 100644
index a423894043..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.red.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/apache_pb.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/apache_pb.gif
deleted file mode 100644
index 3a1c139fc4..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/apache_pb.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/back.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/back.gif
deleted file mode 100644
index a694ae1ec3..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/back.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.gray.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.gray.gif
deleted file mode 100644
index eb84268c4c..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.gray.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.red.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.red.gif
deleted file mode 100644
index a8425cb574..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.red.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binary.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binary.gif
deleted file mode 100644
index 9a15cbae04..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binary.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binhex.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binhex.gif
deleted file mode 100644
index 62d0363108..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binhex.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/blank.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/blank.gif
deleted file mode 100644
index 0ccf01e198..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/blank.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/bomb.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/bomb.gif
deleted file mode 100644
index 270fdb1c06..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/bomb.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box1.gif
deleted file mode 100644
index 65dcd002ea..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box2.gif
deleted file mode 100644
index c43bc4faec..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/broken.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/broken.gif
deleted file mode 100644
index 9f8cbe9f76..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/broken.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/burst.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/burst.gif
deleted file mode 100644
index fbdcf575f7..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/burst.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button1.gif
deleted file mode 100644
index eb97cb7333..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button10.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button10.gif
deleted file mode 100644
index fe0c97998c..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button10.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button2.gif
deleted file mode 100644
index 7698455bf9..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button3.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button3.gif
deleted file mode 100644
index a8b8319232..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button3.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button4.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button4.gif
deleted file mode 100644
index 0fd15a0d7f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button4.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button5.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button5.gif
deleted file mode 100644
index 64241e5c5d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button5.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button6.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button6.gif
deleted file mode 100644
index 867cfd1212..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button6.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button7.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button7.gif
deleted file mode 100644
index b3f5fb248f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button7.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button8.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button8.gif
deleted file mode 100644
index 7a308be8f6..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button8.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button9.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button9.gif
deleted file mode 100644
index 9acba576c0..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button9.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonl.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonl.gif
deleted file mode 100644
index 3883088e7a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonl.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonr.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonr.gif
deleted file mode 100644
index c4dc3887db..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonr.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/c.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/c.gif
deleted file mode 100644
index 7555b6c164..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/c.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.blue.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.blue.gif
deleted file mode 100644
index f8d76a8c23..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.blue.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.gray.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.gray.gif
deleted file mode 100644
index 7664cd0364..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.gray.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/compressed.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/compressed.gif
deleted file mode 100644
index 39e732739f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/compressed.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/continued.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/continued.gif
deleted file mode 100644
index b0ffb7e0cc..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/continued.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dir.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dir.gif
deleted file mode 100644
index 48264601ae..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dir.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/down.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/down.gif
deleted file mode 100644
index a354c871cd..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/down.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dvi.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dvi.gif
deleted file mode 100644
index 791be33105..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dvi.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/f.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/f.gif
deleted file mode 100644
index fbe353c282..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/f.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.gif
deleted file mode 100644
index 48264601ae..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.open.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.open.gif
deleted file mode 100644
index 30979cb528..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.open.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.sec.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.sec.gif
deleted file mode 100644
index 75332d9e59..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.sec.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/forward.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/forward.gif
deleted file mode 100644
index b2959b4c85..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/forward.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.gif
deleted file mode 100644
index de60b2940f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.red.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.red.gif
deleted file mode 100644
index 94743981d9..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.red.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.sec.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.sec.gif
deleted file mode 100644
index 88d5240c3c..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.sec.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.right.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.right.gif
deleted file mode 100644
index 5cdbc7206d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.right.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.up.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.up.gif
deleted file mode 100644
index 85a5d68317..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.up.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/htdig.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/htdig.gif
deleted file mode 100644
index 35443fb63a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/htdig.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/icon.sheet.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/icon.sheet.gif
deleted file mode 100644
index ad1686e448..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/icon.sheet.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image1.gif
deleted file mode 100644
index 01e442bfa9..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image2.gif
deleted file mode 100644
index 751faeea36..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image3.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image3.gif
deleted file mode 100644
index 4f30484ff6..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image3.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/index.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/index.gif
deleted file mode 100644
index 162478fb3a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/index.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/layout.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/layout.gif
deleted file mode 100644
index c96338a152..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/layout.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/left.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/left.gif
deleted file mode 100644
index 279e6710d4..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/left.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/link.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/link.gif
deleted file mode 100644
index c5b6889a76..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/link.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/movie.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/movie.gif
deleted file mode 100644
index 0035183774..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/movie.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/p.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/p.gif
deleted file mode 100644
index 7b917b4e91..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/p.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/patch.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/patch.gif
deleted file mode 100644
index 39bc90e795..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/patch.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pdf.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pdf.gif
deleted file mode 100644
index c88fd777c4..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pdf.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie0.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie0.gif
deleted file mode 100644
index 6f7a0ae7a7..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie0.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie1.gif
deleted file mode 100644
index 03aa6be71e..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie2.gif
deleted file mode 100644
index b04c5e0908..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie3.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie3.gif
deleted file mode 100644
index 4db9d023ed..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie3.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie4.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie4.gif
deleted file mode 100644
index 93471fdd88..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie4.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie5.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie5.gif
deleted file mode 100644
index 57aee93f07..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie5.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie6.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie6.gif
deleted file mode 100644
index 0dc327b569..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie6.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie7.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie7.gif
deleted file mode 100644
index 8661337f06..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie7.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie8.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie8.gif
deleted file mode 100644
index 59ddb34ce0..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie8.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/portal.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/portal.gif
deleted file mode 100644
index 0e6e506e00..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/portal.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/poweredby.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/poweredby.gif
deleted file mode 100644
index d324ab80ea..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/poweredby.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ps.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ps.gif
deleted file mode 100644
index 0f565bc1db..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ps.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/quill.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/quill.gif
deleted file mode 100644
index 818a5cdc7e..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/quill.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/right.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/right.gif
deleted file mode 100644
index b256e5f75f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/right.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw1.gif
deleted file mode 100644
index af6ba2b097..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw2.gif
deleted file mode 100644
index 06dccb3e44..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/script.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/script.gif
deleted file mode 100644
index d8a853bc58..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/script.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound1.gif
deleted file mode 100644
index 8efb49f55d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound2.gif
deleted file mode 100644
index 48e6a7fb2f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere1.gif
deleted file mode 100644
index 7067070da2..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere2.gif
deleted file mode 100644
index a9e462a377..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star.gif
deleted file mode 100644
index 4cfe0a5e0f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star_blank.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star_blank.gif
deleted file mode 100644
index a0c83cb85b..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star_blank.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tar.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tar.gif
deleted file mode 100644
index 617e779efa..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tar.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tex.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tex.gif
deleted file mode 100644
index 45e43233b8..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tex.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/text.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/text.gif
deleted file mode 100644
index 4c623909fb..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/text.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/transfer.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/transfer.gif
deleted file mode 100644
index 33697dbb66..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/transfer.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/unknown.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/unknown.gif
deleted file mode 100644
index 32b1ea23fb..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/unknown.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/up.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/up.gif
deleted file mode 100644
index 6d6d6d1ebf..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/up.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uu.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uu.gif
deleted file mode 100644
index 4387d529f6..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uu.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uuencoded.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uuencoded.gif
deleted file mode 100644
index 4387d529f6..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uuencoded.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world1.gif
deleted file mode 100644
index 05b4ec2058..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world2.gif
deleted file mode 100644
index e3203f7a88..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/logs/Dummy_File_Needed_By_WinZip b/lib/inets/test/old_httpd_SUITE_data/server_root/logs/Dummy_File_Needed_By_WinZip
deleted file mode 100644
index 8d1c8b69c3..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/logs/Dummy_File_Needed_By_WinZip
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_client.pem b/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_client.pem
deleted file mode 100644
index 427447958d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_client.pem
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCTFBPkOO98fDY3j6MIxIGKp+rampfIay50Lx4+EnCnRSSVwC+n
-0VVmP7V5SGFJpuXJzN0hvqPUWOOjiMTNlNRaGy0pqu2oMXWAPLOxHWL1wT53h2Zr
-3FUNU/N0Rvnkttse1KZJ9uYCLKUiuXXsv2rR62nH3OhRIiBHSAcSv0NRWwIDAQAB
-AoGACdIVYe/LTeydUihtInC8lZ2QuPgJmoBNocRjqJFipEihoL4scHAx25n1bBvB
-I0HZphffzBkGp28oBAtl2LRPWXqu527unc/RWRfLMqSK1xNSq1DxD1a30zkrZPna
-QiV65vEJuNSJTtlDy/Zqc/BVZXCpxWlzYQedZgkmf0Qse8ECQQCmaz02Yur8zC9f
-eSQKU5OSzGw3bSIumEzziCfHdTheK6MEoccf5TCAyLXhZwA7QlKja4tFXfeyVxws
-/LlnUJN9AkEA4j+xnOeYUyGKXL5i+BAbnqpI4MzPiq+IoCYkaRlD/wAws24r5HNI
-ZQmEHWqD/NNzOf/A2XuyLtMiTGJPW/DftwJBAKKpJP6Ytuh6xz8BUCnLwO12Y7vV
-LtjuQiCzD3aUa5EYA9HOMqxJPxxRkf0LyR0i2VUkE8+sZiPpov+R0cJa7p0CQQCj
-40GUiArGRSiF7/+e84QeVfl+pb29F1QftiFv5DZmFEwy3Z572KpbTh5edJbxYHY6
-UDHxGHJFCvnwXNJhpkVXAkBJqfEfiMJ3Q/E5Gpf3sQizacouW92iiN8ojlF1oB80
-t34RysJH7SgI3gdMhTribCo2UUaV0StjR6yodPN+TB2J
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIChzCCAfCgAwIBAgIGAIsapa8BMA0GCSqGSIb3DQEBBQUAMHoxDjAMBgNVBAMT
-BW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJAZXJsYW5nLm9yZzESMBAGA1UE
-BxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0GA1UEChMGZXJsYW5nMRQwEgYD
-VQQLEwt0ZXN0aW5nIGRlcDAiGA8yMDEwMDkwMTAwMDAwMFoYDzIwMjUwODI4MDAw
-MDAwWjB7MQ8wDQYDVQQDEwZjbGllbnQxIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBl
-cmxhbmcub3JnMRIwEAYDVQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYD
-VQQKEwZlcmxhbmcxFDASBgNVBAsTC3Rlc3RpbmcgZGVwMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQCTFBPkOO98fDY3j6MIxIGKp+rampfIay50Lx4+EnCnRSSV
-wC+n0VVmP7V5SGFJpuXJzN0hvqPUWOOjiMTNlNRaGy0pqu2oMXWAPLOxHWL1wT53
-h2Zr3FUNU/N0Rvnkttse1KZJ9uYCLKUiuXXsv2rR62nH3OhRIiBHSAcSv0NRWwID
-AQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAG8t6f1A
-PF7xayGxtUpG2r6W5ETylC3ZIKPS2kfJk9aYi7AZNTp7/xTU6SgqvFBN8aBPzxCD
-4jHrSNC8DSb4X1x9uimarb6qdZDHEdij+DRAd2eygJHZxEf7+8B4Fx34thQeU9hZ
-S1Izke5AlsyFMkvB7h0anE4k9BfuU70vl6v5
------END CERTIFICATE-----
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_server.pem b/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_server.pem
deleted file mode 100644
index 4aac86db49..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_server.pem
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCf4Htxr99lLs5W8QQw7jdakqyAkIjOW4aqH8sr4va4SvZ9Adq6
-7k8jMHefCVZo+F8x4cwsBgB4aWzFIGBnvFTi6YsH27XW7f9O9IPCej8fdhRZ4UAt
-NHa253buOWpDGla2JmIdkmfFvXFJycMIKbG5tYilVXoWKBMKmCwWaXz0nQIDAQAB
-AoGAQIlma0r6W6bcRj4+Wd4fXCFvHuq5Psu1fYEeC5Yvz8761xVjjSfbrDHJZ9pm
-FjOEgedK+s5lbDXqYVyjbdyZSugStBRocSmbG8SQHcAsxR2ZIkNzX2hYzB+lslWo
-T3YJojDyB134O7XJznCu+ZFXP86jyJ1JT6k6a+OIHcwnJ+ECQQDYn57dY4Px3mEd
-VBLStN3YkRF5oFyT+xk7IaKeLLB6n4gCnoVbBoHut7PFbPYPzoNzEwPk3MQKDIHb
-Kig3S5CpAkEAvPA1VmoJWAlN6kUi+F2L8HXEArzE8x7vwdsslrwMKUe4dFS+ZC/7
-5iDOaxcZ7TYkCgwzBt341++DCgP6j3fY1QJBALB6AcOcwi52m6l4B8mu3ZkEPjdX
-BHTuONTqhv/TqoaLlxODL2NDvvDKqeMp7KBd/srt79swW2lQXS4+fvrlTdkCQQCm
-zxj4O1QWkthkfje6ubSkTwUIOatUzrp1F9GNH2dJRtX2dx9FCwxGCC7WY6XzRXqa
-GF0wsedSllbGD+82nWQlAkAicMGqCqRq4hKR/cVmFatOqKVWCVkx6OFF2FhuiI5Z
-h5eIOPGCt8dVRs1P9DNSld/D98Sfm65m85z8BtXovvYV
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIChzCCAfCgAwIBAgIGANUxXM9BMA0GCSqGSIb3DQEBBQUAMHoxDjAMBgNVBAMT
-BW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJAZXJsYW5nLm9yZzESMBAGA1UE
-BxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0GA1UEChMGZXJsYW5nMRQwEgYD
-VQQLEwt0ZXN0aW5nIGRlcDAiGA8yMDEwMDkwMTAwMDAwMFoYDzIwMjUwODI4MDAw
-MDAwWjB7MQ8wDQYDVQQDEwZzZXJ2ZXIxIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBl
-cmxhbmcub3JnMRIwEAYDVQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYD
-VQQKEwZlcmxhbmcxFDASBgNVBAsTC3Rlc3RpbmcgZGVwMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQCf4Htxr99lLs5W8QQw7jdakqyAkIjOW4aqH8sr4va4SvZ9
-Adq67k8jMHefCVZo+F8x4cwsBgB4aWzFIGBnvFTi6YsH27XW7f9O9IPCej8fdhRZ
-4UAtNHa253buOWpDGla2JmIdkmfFvXFJycMIKbG5tYilVXoWKBMKmCwWaXz0nQID
-AQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAGF5Pfwk
-QDdwJup/mVITPxbBls4Yl7anDooUQsq8066lA1g54H/PRfXscGkyCFGh1ifXvf1L
-psMRoBAdDHL/wSJplk3rRavkC94eBgnTFZmfKL6844g1j53yameiYL8IEVExYMBg
-/XGyc0qwq57WT8B/K4aElrvlBlQ0wF3wN54M
------END CERTIFICATE-----
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 108d259823..1fad9afe33 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 6.4.3
+INETS_VSN   = 6.5
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile
index 7eb0e20b4d..37de0a35c5 100644
--- a/lib/jinterface/doc/src/Makefile
+++ b/lib/jinterface/doc/src/Makefile
@@ -46,12 +46,11 @@ XML_PART_FILES = \
 	part.xml
 XML_CHAPTER_FILES = \
 	notes.xml \
-	notes_history.xml \
 	jinterface_users_guide.xml
 
 BOOK_FILES = book.xml
 
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
+XML_FILES = $(BOOK_FILES) $(XML_APP_FILES) $(XML_REF3_FILES) \
             $(XML_PART_FILES) $(XML_CHAPTER_FILES)
 
 GIF_FILES =
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index b44a04d7cd..346d467c2d 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the Jinterface application.</p>
 
+<section><title>Jinterface 1.8.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Jinterface 1.8</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
index e55cfa62ea..001acfdd2e 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
@@ -130,7 +130,6 @@ release_spec: opt
 
 release_docs_spec:
 
-
-
+xmllint:
 
 # ----------------------------------------------------
diff --git a/lib/jinterface/java_src/pom.xml.src b/lib/jinterface/java_src/pom.xml.src
index 98232db78c..584bd81076 100644
--- a/lib/jinterface/java_src/pom.xml.src
+++ b/lib/jinterface/java_src/pom.xml.src
@@ -76,6 +76,17 @@
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Automatic-Module-Name>com.ericsson.otp.erlang</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.10.3</version>
 				<executions>
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl
index 81944f71d4..daa17195ee 100644
--- a/lib/jinterface/test/nc_SUITE.erl
+++ b/lib/jinterface/test/nc_SUITE.erl
@@ -651,11 +651,10 @@ do_echo(DataList, Config, OutTrans, InTrans, ExtraArgs)
 echo_loop([D|Ds], Echoer, OutTrans, InTrans, TermAcc) ->
     OutMsg = OutTrans(D),
     Echoer ! OutMsg,
-    io:format("echo_server ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
+    %%io:format("echo_server ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
     receive
 	Reply ->
-	    io:format("echo_server ~p: receive ~P~n",
-		      [self(),Reply,10]),
+	    %%io:format("echo_server ~p: receive ~P~n", [self(),Reply,10]),
 	    InTrans(Echoer, D, Reply)
     end,
     Term = case OutMsg of
@@ -670,11 +669,10 @@ echo_loop(Cont, Echoer, OutTrans, InTrans, TermAcc)
   when is_function(Cont, 0) ->
     check_terms(Echoer, TermAcc),
     OutMsg = Echoer ! {self(),undefined,hash_clear},
-    io:format("echo_server ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
+    %%io:format("echo_server ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
     receive
 	{Echoer,hash_cleared,hash_clear}=Reply ->
-	    io:format("echo_server ~p: receive ~P~n",
-		      [self(),Reply,10]),
+	    %%io:format("echo_server ~p: receive ~P~n", [self(),Reply,10]),
 	    ok;
 	Other ->
 	    io:format("echo_server_terms unexpected ~p: receive ~P~n",
@@ -686,11 +684,10 @@ echo_loop(Cont, Echoer, OutTrans, InTrans, TermAcc)
 check_terms(Echoer, [Term | Rest]) ->
     OutMsg = {self(),Term,hash_lookup},
     Echoer ! OutMsg,
-    io:format("check_terms ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
+    %%io:format("check_terms ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
     receive
 	{Echoer,true,hash_lookup} = ReplyMsg ->
-	    io:format("check_terms ~p: receive ~P~n",
-		      [self(),ReplyMsg,10]),
+	    %%io:format("check_terms ~p: receive ~P~n", [self(),ReplyMsg,10]),
 	    check_terms(Echoer, Rest);
 	Other ->
 	    io:format("check_terms unexpected ~p: receive ~P~n",
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index 373e2dab22..0a8a1190ec 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1 +1 @@
-JINTERFACE_VSN = 1.8
+JINTERFACE_VSN = 1.8.1
diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile
index c9d23ac4c4..0759f362d4 100644
--- a/lib/kernel/doc/src/Makefile
+++ b/lib/kernel/doc/src/Makefile
@@ -71,7 +71,7 @@ XML_REF4_FILES = app.xml config.xml
 XML_REF6_FILES = kernel_app.xml
 
 XML_PART_FILES =
-XML_CHAPTER_FILES = notes.xml notes_history.xml
+XML_CHAPTER_FILES = notes.xml
 
 BOOK_FILES = book.xml
 
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index c94f612c01..bd95819636 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -34,26 +34,28 @@
     <p>This module contains the interface to the Erlang
       <em>code server</em>, which deals with the loading of compiled
       code into a running Erlang runtime system.</p>
-    <p>The runtime system can be started in <em>embedded</em> or
-      <em>interactive</em> mode. Which one is decided by command-line
+    <p>The runtime system can be started in <em>interactive</em> or
+      <em>embedded</em> mode. Which one is decided by the command-line
       flag <c>-mode</c>:</p>
     <pre>
 % <input>erl -mode interactive</input></pre>
     <p>The modes are as follows:</p>
     <list type="bulleted">
       <item>
-        <p>In embedded mode, all code is loaded during system startup
-          according to the boot script. (Code can also be loaded later
-          by explicitly ordering the code server to do so).</p>
-      </item>
-      <item>
         <p>In interactive mode, which is default, only some code is loaded
-	  during system startup, basically the modules needed by the runtime
+          during system startup, basically the modules needed by the runtime
           system. Other code is dynamically loaded when first
           referenced. When a call to a function in a certain module is
           made, and the module is not loaded, the code server searches
           for and tries to load the module.</p>
       </item>
+      <item>
+        <p>In embedded mode, modules are not auto loaded. Trying to use
+        a module that has not been loaded results in an error. This mode is
+        recommended when the boot script loads all modules, as it is
+        typically done in OTP releases. (Code can still be loaded later
+        by explicitly ordering the code server to do so).</p>
+      </item>
     </list>
     <p>To prevent accidentally reloading of modules affecting the Erlang
       runtime system, directories <c>kernel</c>, <c>stdlib</c>,
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 2ab35b9b05..1b72769ce3 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -33,11 +33,14 @@
   <description>
     <p>This module provides an interface to the file system.</p>
 
-    <p>On operating systems with thread support,
-      file operations can be performed in threads of their own, allowing
-      other Erlang processes to continue executing in parallel with
-      the file operations. See command-line flag
-      <c>+A</c> in <seealso marker="erts:erl"><c>erl(1)</c></seealso>.</p>
+    <warning>
+       <p>File operations are only guaranteed to appear atomic when going
+          through the same file server. A NIF or other OS process may observe
+          intermediate steps on certain operations on some operating systems,
+          eg. renaming an existing file on Windows, or
+          <seealso marker="#write_file_info/2"><c>write_file_info/2</c>
+          </seealso> on any OS at the time of writing.</p>
+    </warning>
 
     <p>Regarding filename encoding, the Erlang VM can operate in
     two modes. The current mode can be queried using function
@@ -90,13 +93,6 @@
       are now <em>rejected</em> and will cause primitive
       file operations fail.
     </p></note>
-    <warning><p>
-      Currently null characters at the end of the filename
-      will be accepted by primitive file operations. Such
-      filenames are however still documented as invalid. The
-      implementation will also change in the future and
-      reject such filenames.
-    </p></warning>
 
   </description>
 
@@ -985,8 +981,7 @@ f.txt:  {person, "kalle", 25}.
           </item>
           <tag><c>eisdir</c></tag>
           <item>
-            <p>The named file is not a regular file. It can be a
-              directory, a FIFO, or a device.</p>
+            <p>The named file is a directory.</p>
           </item>
           <tag><c>enotdir</c></tag>
           <item>
@@ -1438,8 +1433,12 @@ f.txt:  {person, "kalle", 25}.
 	    which is 1970-01-01 00:00 UTC.</p></item>
 	  </taglist>
 	<p>Default is <c>{time, local}</c>.</p>
-        <p>If the option <c>raw</c> is set, the file server is not called
-          and only information about local files is returned.</p>
+        <p>If the option <c>raw</c> is set, the file server is not called and
+           only information about local files is returned. Note that this will
+           break this module's atomicity guarantees as it can race with a
+           concurrent call to
+           <seealso marker="#write_file_info/2"><c>write_file_info/1,2</c>
+           </seealso></p>
 	  <note>
           <p>As file times are stored in POSIX time on most OS, it is faster to
 	  query file information with option <c>posix</c>.</p>
@@ -1687,8 +1686,12 @@ f.txt:  {person, "kalle", 25}.
 	except that if <c><anno>Name</anno></c> is a symbolic link, information
 	about the link is returned in the <c>file_info</c> record and
           the <c>type</c> field of the record is set to <c>symlink</c>.</p>
-      <p>If the option <c>raw</c> is set, the file server is not called
-        and only information about local files is returned.</p>
+        <p>If the option <c>raw</c> is set, the file server is not called and
+           only information about local files is returned. Note that this will
+           break this module's atomicity guarantees as it can race with a
+           concurrent call to
+           <seealso marker="#write_file_info/2"><c>write_file_info/1,2</c>
+           </seealso></p>
         <p>If <c><anno>Name</anno></c> is not a symbolic link, this function returns
           the same result as <c>read_file_info/1</c>.
           On platforms that do not support symbolic links, this function
@@ -1826,24 +1829,16 @@ f.txt:  {person, "kalle", 25}.
 	<p>The file used must be opened using the <c>raw</c> flag, and the process
 	calling <c>sendfile</c> must be the controlling process of the socket.
 	See <seealso marker="gen_tcp#controlling_process-2"><c>gen_tcp:controlling_process/2</c></seealso>.</p>
-	<p>If the OS used does not support <c>sendfile</c>, an Erlang fallback
-	using
-	<seealso marker="#read/2"><c>read/2</c></seealso> and
-	<seealso marker="gen_tcp#send/2"><c>gen_tcp:send/2</c></seealso> is used.</p>
+	<p>If the OS used does not support non-blocking <c>sendfile</c>, an
+	Erlang fallback using <seealso marker="#read/2"><c>read/2</c></seealso>
+	and <seealso marker="gen_tcp#send/2"><c>gen_tcp:send/2</c></seealso> is
+        used.</p>
 	<p>The option list can contain the following options:</p>
 	<taglist>
           <tag><c>chunk_size</c></tag>
           <item><p>The chunk size used by the Erlang fallback to send
 	  data. If using the fallback, set this to a value
 	  that comfortably fits in the systems memory. Default is 20 MB.</p></item>
-	  <tag><c>use_threads</c></tag>
-          <item><p>Instructs the emulator to use the <c>async</c> thread pool for the
-	  <c>sendfile</c> system call. This can be useful if the OS you are running
-	  on does not properly support non-blocking <c>sendfile</c> calls. Notice that
-	  using <c>async</c> threads potentially makes your system vulnerable to slow
-	  client attacks. If set to <c>true</c> and no <c>async</c> threads are available,
-	  the <c>sendfile</c> call returns <c>{error,einval}</c>.
-	  Introduced in Erlang/OTP 17.0. Default is <c>false</c>.</p></item>
 	</taglist>
       </desc>
     </func>
@@ -2148,144 +2143,77 @@ f.txt:  {person, "kalle", 25}.
 
   <section>
     <title>Performance</title>
-    <p>Some operating system file operations, for example, a
-      <c>sync/1</c> or <c>close/1</c> on a huge file, can block their
-      calling thread for seconds. If this affects the emulator main
-      thread, the response time is no longer in the order of
-      milliseconds, depending on the definition of "soft" in soft
-      real-time system.</p>
-    <p>If the device driver thread pool is active, file operations are
-      done through those threads instead, so the emulator can go on
-      executing Erlang processes. Unfortunately, the time for serving a
-      file operation increases because of the extra scheduling required
-      from the operating system.</p>
-    <p>If the device driver thread pool is disabled or of size 0, large
-      file reads and writes are segmented into many smaller, which
-      enable the emulator to serve other processes during the file
-      operation. This has the same effect as when using the thread
-      pool, but with larger overhead. Other file operations, for
-      example, <c>sync/1</c> or <c>close/1</c> on a huge file, still are
-      a problem.</p>
-    <p>For increased performance, raw files are recommended. Raw files
-      use the file system of the host machine of the node.</p>
+    <p>For increased performance, raw files are recommended.</p>
+    <p>A normal file is really a process so it can be used as an I/O
+       device (see <seealso marker="stdlib:io"><c>io</c></seealso>).
+       Therefore, when data is written to a normal file, the sending of the
+       data to the file process, copies all data that are not binaries. Opening
+       the file in binary mode and writing binaries is therefore recommended.
+       If the file is opened on another node, or if the file server runs as
+       slave to the file server of another node, also binaries are copied.</p>
     <note>
-      <p>
-	For normal files (non-raw), the file server is used to find the files,
-	and if the node is running its file server as slave to the file server
-	of another node, and the other node runs on some other host machine,
-	they can have different file systems.
-        However, this is seldom a problem.</p>
+      <p>Raw files use the file system of the host machine of the node.
+         For normal files (non-raw), the file server is used to find the files,
+         and if the node is running its file server as slave to the file server
+         of another node, and the other node runs on some other host machine,
+         they can have different file systems.
+         However, this is seldom a problem.</p>
     </note>
-    <p>A normal file is really a process so it can be used as an I/O
-      device (see
-      <seealso marker="stdlib:io"><c>io</c></seealso>).
-      Therefore, when data is written to a
-      normal file, the sending of the data to the file process, copies 
-      all data that are not binaries. Opening the file in binary mode
-      and writing binaries is therefore recommended. If the file is
-      opened on another node, or if the file server runs as slave to
-      the file server of another node, also binaries are copied.</p>
-    <p>Caching data to reduce the number of file operations, or rather
-      the number of calls to the file driver, generally increases
-      performance. The following function writes 4 MBytes in 23
-      seconds when tested:</p>
+    <p><seealso marker="#open/2"><c>open/2</c></seealso> can be given the
+       options <c>delayed_write</c> and <c>read_ahead</c> to turn on caching,
+       which will reduce the number of operating system calls and greatly
+       improve performance for small reads and writes. However, the overhead
+       won't disappear completely and it's best to keep the number of file
+       operations to a minimum. As a contrived example, the following function
+       writes 4MB in 2.5 seconds when tested:</p>
+
     <code type="none"><![CDATA[
-create_file_slow(Name, N) when integer(N), N >= 0 ->
-    {ok, FD} = file:open(Name, [raw, write, delayed_write, binary]),
-    ok = create_file_slow(FD, 0, N),
-    ok = ?FILE_MODULE:close(FD),
-    ok.
-      
-create_file_slow(FD, M, M) ->
+create_file_slow(Name) ->
+    {ok, Fd} = file:open(Name, [raw, write, delayed_write, binary]),
+    create_file_slow_1(Fd, 4 bsl 20),
+    file:close(Fd).
+
+create_file_slow_1(_Fd, 0) ->
     ok;
-create_file_slow(FD, M, N) ->
-    ok = file:write(FD, <<M:32/unsigned>>),
-    create_file_slow(FD, M+1, N).]]></code>
+create_file_slow_1(Fd, M) ->
+    ok = file:write(Fd, <<0>>),
+    create_file_slow_1(Fd, M - 1).]]></code>
+
+    <p>The following functionally equivalent code writes 128 bytes per call
+       to <seealso marker="#write/2"><c>write/2</c></seealso> and so does the
+       same work in 0.08 seconds, which is roughly 30 times faster:</p>
 
-    <p>The following, functionally equivalent, function collects 1024
-      entries into a list of 128 32-byte binaries before each call to
-      <seealso marker="#write/2"><c>write/2</c></seealso> and so
-      does the same work in 0.52 seconds,
-      which is 44 times faster:</p>
     <code type="none"><![CDATA[
-create_file(Name, N) when integer(N), N >= 0 ->
-    {ok, FD} = file:open(Name, [raw, write, delayed_write, binary]),
-    ok = create_file(FD, 0, N),
-    ok = ?FILE_MODULE:close(FD),
+create_file(Name) ->
+    {ok, Fd} = file:open(Name, [raw, write, delayed_write, binary]),
+    create_file_1(Fd, 4 bsl 20),
+    file:close(Fd),
     ok.
-      
-create_file(FD, M, M) ->
+
+create_file_1(_Fd, 0) ->
     ok;
-create_file(FD, M, N) when M + 1024 =&lt; N ->
-    create_file(FD, M, M + 1024, []),
-    create_file(FD, M + 1024, N);
-create_file(FD, M, N) ->
-    create_file(FD, M, N, []).
-      
-create_file(FD, M, M, R) ->
-    ok = file:write(FD, R);
-create_file(FD, M, N0, R) when M + 8 =&lt; N0 ->
-    N1  = N0-1,  N2  = N0-2,  N3  = N0-3,  N4  = N0-4, 
-    N5  = N0-5,  N6  = N0-6,  N7  = N0-7,  N8  = N0-8, 
-    create_file(FD, M, N8, 
-                [<<N8:32/unsigned,  N7:32/unsigned, 
-                   N6:32/unsigned,  N5:32/unsigned, 
-                   N4:32/unsigned,  N3:32/unsigned, 
-                   N2:32/unsigned,  N1:32/unsigned>> | R]);
-create_file(FD, M, N0, R) ->
-    N1 = N0-1,
-    create_file(FD, M, N1, [<<N1:32/unsigned>> | R]).]]></code>
+create_file_1(Fd, M) when M >= 128 ->
+    ok = file:write(Fd, <<0:(128)/unit:8>>),
+    create_file_1(Fd, M - 128);
+create_file_1(Fd, M) ->
+    ok = file:write(Fd, <<0:(M)/unit:8>>),
+    create_file_1(Fd, M - 1).]]></code>
 
-    <note>
-      <p>Trust only your own benchmarks. If the list length in 
-        <c>create_file/2</c> above is increased, it runs slightly
-        faster, but consumes more memory and causes more memory
-        fragmentation. How much this affects your application is
-        something that this simple benchmark cannot predict.</p>
-      <p>If the size of each binary is increased to 64 bytes, it
-        also runs slightly faster, but the code is then twice as clumsy.
-        In the current implementation, binaries larger than 64 bytes are
-        stored in memory common to all processes and not copied when
-        sent between processes, while these smaller binaries are stored
-        on the process heap and copied when sent like any other term.</p>
-      <p>So, with a binary size of 68 bytes, <c>create_file/2</c> runs
-        30 percent slower than with 64 bytes, and causes much more
-        memory fragmentation. Notice that if the binaries were to be sent
-        between processes (for example, a non-raw file), the results
-        would probably be completely different.</p>
-    </note>
-    <p>A raw file is really a port. When writing data to a port, it is
-      efficient to write a list of binaries. It is not needed to
-      flatten a deep list before writing. On Unix hosts, scatter output,
-      which writes a set of buffers in one operation, is used when
-      possible. In this way <c>write(FD, [Bin1, Bin2 | Bin3])</c>
-      writes the contents of the binaries without copying the data
-      at all, except for perhaps deep down in the operating system
-      kernel.</p>
-    <p>For raw files, <c>pwrite/2</c> and <c>pread/2</c> are
-      efficiently implemented. The file driver is called only once for
-      the whole operation, and the list iteration is done in the file
-      driver.</p>
-    <p>The options <c>delayed_write</c> and <c>read_ahead</c> to 
-      <seealso marker="#open/2"><c>open/2</c></seealso>
-      make the file driver cache data to reduce
-      the number of operating system calls. The function
-      <c>create_file/2</c> in the recent example takes 60 seconds
-      without option <c>delayed_write</c>, which is 2.6
-      times slower.</p>
-    <p>As a bad example, <c>create_file_slow/2</c>
-      without options <c>raw</c>, <c>binary</c>, and <c>delayed_write</c>,
-      meaning it calls <c>open(Name, [write])</c>, needs
-      1 min 20 seconds for the job, which is 3.5 times slower than
-      the first example, and 150 times slower than the optimized
-      <c>create_file/2</c>.</p>
-      <warning>
-	<p>If an error occurs when accessing an open file with module
-      <seealso marker="stdlib:io"><c>io</c></seealso>,
-      the process handling the file exits. The dead
-      file process can hang if a process tries to access it later.
-      This will be fixed in a future release.</p>
-      </warning>
+    <p>When writing data it's generally more efficient to write a list of
+       binaries rather than a list of integers. It is not needed to
+       flatten a deep list before writing. On Unix hosts, scatter output,
+       which writes a set of buffers in one operation, is used when
+       possible. In this way <c>write(FD, [Bin1, Bin2 | Bin3])</c>
+       writes the contents of the binaries without copying the data
+       at all, except for perhaps deep down in the operating system
+       kernel.</p>
+    <warning>
+        <p>If an error occurs when accessing an open file with module
+           <seealso marker="stdlib:io"><c>io</c></seealso>, the process
+           handling the file exits. The dead file process can hang if a process
+           tries to access it later. This will be fixed in a future release.
+           </p>
+    </warning>
   </section>
 
   <section>
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 070782e1f3..e6104b0c76 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -51,6 +51,7 @@ server() ->
     {ok, Sock} = gen_tcp:accept(LSock),
     {ok, Bin} = do_recv(Sock, []),
     ok = gen_tcp:close(Sock),
+    ok = gen_tcp:close(LSock),
     Bin.
 
 do_recv(Sock, Bs) ->
@@ -309,9 +310,9 @@ do_recv(Sock, Bs) ->
             <seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>.
             </p></item>
         </taglist>
-        <p>The returned socket <c><anno>ListenSocket</anno></c> can only be
-          used in calls to
-          <seealso marker="#accept/1"><c>accept/1,2</c></seealso>.</p>
+        <p>The returned socket <c><anno>ListenSocket</anno></c> should be used
+          in calls to <seealso marker="#accept/1"><c>accept/1,2</c></seealso> to
+          accept incoming connection requests.</p>
         <note>
           <p>The default values for options specified to <c>listen</c> can
             be affected by the Kernel configuration parameter
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 169a76463b..9552332948 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2017</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -197,6 +197,9 @@ fe80::204:acff:fe17:bf38
     <datatype>
       <name name="address_family"/>
     </datatype>
+    <datatype>
+      <name name="socket_protocol"/>
+    </datatype>
   </datatypes>
 
   <funcs>
@@ -274,9 +277,7 @@ fe80::204:acff:fe17:bf38
         <p>Returns a <c>hostent</c> record for the host with the specified
           hostname.</p>
         <p>If resolver option <c>inet6</c> is <c>true</c>,
-          an IPv6 address is looked up. If that fails,
-          the IPv4 address is looked up and returned on
-          IPv6-mapped IPv4 format.</p>
+          an IPv6 address is looked up.</p>
       </desc>
     </func>
 
@@ -461,6 +462,61 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
+      <name name="i" arity="0" />
+      <name name="i" arity="1" />
+      <name name="i" arity="2" />
+      <fsummary>Displays information and statistics about sockets on the terminal</fsummary>
+      <desc>
+        <p>
+          Lists all TCP, UDP and SCTP sockets, including those that the Erlang runtime system uses as well as
+          those created by the application.
+        </p>
+        <p>
+          The following options are available:
+        </p>
+
+        <taglist>
+          <tag><c>port</c></tag>
+          <item>
+            <p>The internal index of the port.</p>
+          </item>
+          <tag><c>module</c></tag>
+          <item>
+            <p>The callback module of the socket.</p>
+          </item>
+          <tag><c>recv</c></tag>
+          <item>
+            <p>Number of bytes received by the socket.</p>
+          </item>
+          <tag><c>sent</c></tag>
+          <item>
+            <p>Number of bytes sent from the socket.</p>
+          </item>
+          <tag><c>owner</c></tag>
+          <item>
+            <p>The socket owner process.</p>
+          </item>
+          <tag><c>local_address</c></tag>
+          <item>
+            <p>The local address of the socket.</p>
+          </item>
+          <tag><c>foreign_address</c></tag>
+          <item>
+            <p>The address and port of the other end of the connection.</p>
+          </item>
+          <tag><c>state</c></tag>
+          <item>
+            <p>The connection state.</p>
+          </item>
+          <tag><c>type</c></tag>
+          <item>
+            <p>STREAM or DGRAM or SEQPACKET.</p>
+          </item>
+        </taglist>
+      </desc>
+    </func>
+
+    <func>
       <name name="ntoa" arity="1" />
       <fsummary>Convert IPv6/IPV4 address to ASCII.</fsummary>
       <desc>
@@ -524,6 +580,19 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
+      <name name="ipv4_mapped_ipv6_address" arity="1" />
+      <fsummary>Convert to and from IPv4-mapped IPv6 address.</fsummary>
+      <desc>
+	<p>
+	  Convert an IPv4 address to an IPv4-mapped IPv6 address
+	  or the reverse.  When converting from an IPv6 address
+	  all but the 2 low words are ignored so this function also
+	  works on some other types of addresses than IPv4-mapped.
+	</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="parse_strict_address" arity="1" />
       <fsummary>Parse an IPv4 or IPv6 address strict.</fsummary>
       <desc>
@@ -1214,7 +1283,7 @@ inet:setopts(Sock,[{raw,6,8,<<30:32/native>>}]),]]></code>
 	  For one-to-many style sockets, the special value <c>0</c>
 	  is defined to mean that the returned addresses must be
 	  without any particular association.
-	  How different SCTP implementations interprets this varies somewhat.
+	  How different SCTP implementations interpret this varies somewhat.
         </p>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/inet_res.xml b/lib/kernel/doc/src/inet_res.xml
index 3454e3c6f9..351d86a93a 100644
--- a/lib/kernel/doc/src/inet_res.xml
+++ b/lib/kernel/doc/src/inet_res.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2009</year><year>2015</year>
+      <year>2009</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -230,9 +230,7 @@ inet_dns:record_type(_) -> undefined.</pre>
           <seealso marker="#getbyname/2"><c>getbyname/2,3</c></seealso>.
         </p>
         <p>If resolver option <c>inet6</c> is <c>true</c>,
-          an IPv6 address is looked up. If that fails,
-          the IPv4 address is looked up and returned on
-          IPv6-mapped IPv4 format.</p>
+          an IPv6 address is looked up.</p>
       </desc>
     </func>
 
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index e5ac031539..0762cebc94 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -469,8 +469,12 @@ MaxT = TickTime + TickTime / 4</code>
           <item><c>ObjSuffix = string()</c></item>
           <item><c>SrcSuffix = string()</c></item>
         </list>
-        <p>Specifies a list of rules for use by <c>filelib:find_file/2</c> and
-          <c>filelib:find_source/2</c>. If this is set to some other value
+        <p>Specifies a list of rules for use by
+	  <seealso marker="stdlib:filelib#find_file/2">
+	  <c>filelib:find_file/2</c></seealso>
+	  <seealso marker="stdlib:filelib#find_source/2">
+	  <c>filelib:find_source/2</c></seealso>
+          If this is set to some other value
           than the empty list, it replaces the default rules. Rules can be
           simple pairs of directory suffixes, such as <c>{"ebin",
           "src"}</c>, which are used by <c>filelib:find_file/2</c>, or
@@ -478,6 +482,16 @@ MaxT = TickTime + TickTime / 4</code>
           file name extensions, for example <c>[{".beam", ".erl", [{"ebin",
           "src"}]}</c>, which are used by <c>filelib:find_source/2</c>. Both
           kinds of rules can be mixed in the list.</p>
+	  <p>The interpretation of <c>ObjDirSuffix</c> and <c>SrcDirSuffix</c>
+	  is as follows: if the end of the directory name where an
+	  object is located matches <c>ObjDirSuffix</c>, then the
+	  name created by replacing <c>ObjDirSuffix</c> with
+	  <c>SrcDirSuffix</c> is expanded by calling
+	  <seealso marker="stdlib:filelib#wildcard/1">
+	  <c>filelib:wildcard/1</c></seealso>, and the first regular
+	  file found among the matches is the source file.
+	</p>
+
       </item>
     </taglist>
   </section>
diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml
index 0b94fc0fa6..a30d28d55a 100644
--- a/lib/kernel/doc/src/net_kernel.xml
+++ b/lib/kernel/doc/src/net_kernel.xml
@@ -56,7 +56,7 @@ $ <input>erl -sname foobar</input></pre>
     <p>Normally, connections are established automatically when
       another node is referenced. This functionality can be disabled
       by setting Kernel configuration parameter
-      <c>dist_auto_connect</c> to <c>false</c>, see
+      <c>dist_auto_connect</c> to <c>never</c>, see
       <seealso marker="kernel_app"><c>kernel(6)</c></seealso>. In this case,
       connections must be established explicitly by calling
       <seealso marker="#connect_node/1"><c>connect_node/1</c></seealso>.</p>
@@ -230,7 +230,12 @@ $ <input>erl -sname foobar</input></pre>
           <item>
             <p>The tuple <c>{nodedown_reason, Reason}</c> is included in
               <c>InfoList</c> in <c>nodedown</c> messages.</p>
-            <p><c>Reason</c> can be any of the following:</p>
+            <p>
+	      <c>Reason</c> can, depending on which
+	      distribution module or process that is used be any term,
+	      but for the standard TCP distribution module it is
+	      any of the following:
+	    </p>
             <taglist>
               <tag><c>connection_setup_failed</c></tag>
               <item><p>The connection setup failed (after <c>nodeup</c>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index a5316dd476..65fe9b9c07 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,41 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 5.4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add <c>os:cmd/2</c> that takes an options map as the
+	    second argument.</p>
+          <p>
+	    Add <c>max_size</c> as an option to <c>os:cmd/2</c> that
+	    control the maximum size of the result that
+	    <c>os:cmd/2</c> will return.</p>
+          <p>
+	    Own Id: OTP-14823</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 5.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Refactored an internal API.</p>
+          <p>
+	    Own Id: OTP-14784</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 5.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 0a08e2c78a..ef416ed233 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -58,17 +58,6 @@
 	operations to fail.
       </p>
     </note>
-    <warning>
-      <p>
-	Currently null characters at the end of filenames,
-	environment variable names and values will be accepted
-	by the primitive operations. Such filenames, environment
-	variable names and values are however still documented as
-	invalid. The implementation will also change in the
-	future and reject such filenames, environment variable
-	names and values.
-      </p>
-    </warning>
   </description>
 
   <datatypes>
@@ -114,7 +103,7 @@
       </desc>
     </datatype>
     <datatype>
-      <name name="command_input"/>
+      <name name="os_command"/>
       <desc>
         <p>All characters needs to be valid characters on the
 	specific OS using
@@ -127,28 +116,36 @@
 	</p>
       </desc>
     </datatype>
+    <datatype>
+      <name name="os_command_opts"/>
+      <desc>
+        <p>Options for <seealso marker="#cmd/2"><c>os:cmd/2</c></seealso></p>
+        <taglist>
+          <tag><c>max_size</c></tag>
+          <item>
+            <p>The maximum size of the data returned by the <c>os:cmd</c> call.
+            See the <seealso marker="#cmd/2"><c>os:cmd/2</c></seealso>
+            documentation for more details.</p>
+          </item>
+        </taglist>
+      </desc>
+    </datatype>
   </datatypes>
- 
+
   <funcs>
     <func>
       <name name="cmd" arity="1"/>
+      <name name="cmd" arity="2"/>
       <fsummary>Execute a command in a shell of the target OS.</fsummary>
       <desc>
         <p>Executes <c><anno>Command</anno></c> in a command shell of the
-          target OS,
-          captures the standard output of the command, and returns this
-          result as a string. This function is a replacement of
-          the previous function <c>unix:cmd/1</c>; they are equivalent on a
-          Unix platform.</p>
+	  target OS, captures the standard output of the command,
+          and returns this result as a string.</p>
 	  <warning><p>Previous implementation used to allow all characters
 	  as long as they were integer values greater than or equal to zero.
 	  This sometimes lead to unwanted results since null characters
-	  (integer value zero) often are interpreted as string termination.
-	  Current implementation still accepts null characters at the end
-	  of <c><anno>Command</anno></c> even though the documentation
-	  states that no null characters are allowed. This will however
-	  be changed in the future so that no null characters at all will
-	  be accepted.</p></warning>
+	  (integer value zero) often are interpreted as string termination. The
+	  current implementation rejects these.</p></warning>
         <p><em>Examples:</em></p>
         <code type="none">
 LsOut = os:cmd("ls"), % on unix platform
@@ -157,6 +154,21 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
           called from another program (for example, <c>os:cmd/1</c>)
           can differ, compared with the standard output of the command
           when called directly from an OS command shell.</p>
+        <p><c>os:cmd/2</c> was added in kernel-5.5 (OTP-20.2.1). It makes it
+          possible to pass an options map as the second argument in order to
+          control the behaviour of <c>os:cmd</c>. The possible options are:
+        </p>
+        <taglist>
+          <tag><c>max_size</c></tag>
+          <item>
+            <p>The maximum size of the data returned by the <c>os:cmd</c> call.
+              This option is a safety feature that should be used when the command
+              executed can return a very large, possibly infinite, result.</p>
+            <code type="none">
+> os:cmd("cat /dev/zero", #{ max_size => 20 }).
+[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]</code>
+          </item>
+        </taglist>
       </desc>
     </func>
 
diff --git a/lib/kernel/doc/src/rpc.xml b/lib/kernel/doc/src/rpc.xml
index adec2d9520..fab616e630 100644
--- a/lib/kernel/doc/src/rpc.xml
+++ b/lib/kernel/doc/src/rpc.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>
@@ -217,7 +217,7 @@
         <list type="bulleted">
           <item>A list of the nodes that do not exist</item>
           <item>A list of the nodes where the server does not exist</item>
-          <item>A list of the nodes where the server terminatd before sending
+          <item>A list of the nodes where the server terminated before sending
           any reply.</item>
         </list>
       </desc>
@@ -268,8 +268,9 @@
           on the specified nodes and collects the answers. It returns
           <c>{<anno>ResL</anno>, <anno>BadNodes</anno>}</c>, where
           <c><anno>BadNodes</anno></c> is a list
-          of the nodes that terminated or timed out during computation,
-          and <c><anno>ResL</anno></c> is a list of the return values.
+          of the nodes that do not exist,
+          and <c><anno>ResL</anno></c> is a list of the return values,
+	  or <c>{badrpc, <anno>Reason</anno>}</c> for failing calls.
           <c><anno>Timeout</anno></c> is a time (integer) in milliseconds, or
           <c>infinity</c>.</p>
         <p>The following example is useful when new object code is to
@@ -347,7 +348,7 @@
 
     <func>
       <name name="pmap" arity="3"/>
-      <fsummary>Parallell evaluation of mapping a function over a
+      <fsummary>Parallel evaluation of mapping a function over a
         list.</fsummary>
       <desc>
         <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
diff --git a/lib/kernel/include/dist.hrl b/lib/kernel/include/dist.hrl
index db4a5eaebc..b7c35712a6 100644
--- a/lib/kernel/include/dist.hrl
+++ b/lib/kernel/include/dist.hrl
@@ -42,31 +42,5 @@
 -define(DFLAG_BIG_CREATION, 16#40000).
 -define(DFLAG_SEND_SENDER, 16#80000).
 
-%% DFLAGs that require strict ordering or:ed together...
--define(DFLAGS_STRICT_ORDER_DELIVERY,
-        ?DFLAG_DIST_HDR_ATOM_CACHE).
-
-
 %% Also update dflag2str() in ../src/dist_util.erl
 %% when adding flags...
-
--define(DFLAGS_ALL,
-        (?DFLAG_PUBLISHED
-             bor ?DFLAG_ATOM_CACHE
-             bor ?DFLAG_EXTENDED_REFERENCES
-             bor ?DFLAG_DIST_MONITOR
-             bor ?DFLAG_FUN_TAGS
-             bor ?DFLAG_DIST_MONITOR_NAME
-             bor ?DFLAG_HIDDEN_ATOM_CACHE
-             bor ?DFLAG_NEW_FUN_TAGS
-             bor ?DFLAG_EXTENDED_PIDS_PORTS
-             bor ?DFLAG_EXPORT_PTR_TAG
-             bor ?DFLAG_BIT_BINARIES
-             bor ?DFLAG_NEW_FLOATS
-             bor ?DFLAG_UNICODE_IO
-             bor ?DFLAG_DIST_HDR_ATOM_CACHE
-             bor ?DFLAG_SMALL_ATOM_TAGS
-             bor ?DFLAG_UTF8_ATOMS
-             bor ?DFLAG_MAP_TAG
-             bor ?DFLAG_BIG_CREATION
-             bor ?DFLAG_SEND_SENDER)).
diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
index 5946620f0f..0bc9f121a0 100644
--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
@@ -106,6 +106,7 @@ MODULES = \
 	inet_sctp \
 	kernel \
 	kernel_config \
+	kernel_refc \
 	local_udp \
 	local_tcp \
 	net \
@@ -120,6 +121,13 @@ MODULES = \
 	user \
 	user_drv \
 	user_sup \
+	raw_file_io \
+	raw_file_io_compressed \
+	raw_file_io_inflate \
+	raw_file_io_deflate \
+	raw_file_io_delayed \
+	raw_file_io_list \
+	raw_file_io_raw \
 	wrap_log_reader
 
 HRL_FILES= ../include/file.hrl ../include/inet.hrl ../include/inet_sctp.hrl \
@@ -226,7 +234,8 @@ $(EBIN)/disk_log_server.beam: disk_log.hrl
 $(EBIN)/dist_util.beam: ../include/dist_util.hrl ../include/dist.hrl
 $(EBIN)/erl_boot_server.beam: inet_boot.hrl
 $(EBIN)/erl_epmd.beam: inet_int.hrl erl_epmd.hrl
-$(EBIN)/file.beam: ../include/file.hrl
+$(EBIN)/file.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/file_io_server.beam: ../include/file.hrl file_int.hrl
 $(EBIN)/gen_tcp.beam: inet_int.hrl
 $(EBIN)/gen_udp.beam: inet_int.hrl
 $(EBIN)/gen_sctp.beam: ../include/inet_sctp.hrl
@@ -254,3 +263,10 @@ $(EBIN)/net_kernel.beam: ../include/net_address.hrl
 $(EBIN)/os.beam: ../include/file.hrl
 $(EBIN)/ram_file.beam: ../include/file.hrl
 $(EBIN)/wrap_log_reader.beam: disk_log.hrl ../include/file.hrl
+$(EBIN)/raw_file_io.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_compressed.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_inflate.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_deflate.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_delayed.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_list.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_raw.beam: ../include/file.hrl file_int.hrl
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index 418b0c50e1..f5a890cb95 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -340,8 +340,7 @@ handle_call(all_loaded, _From, S) ->
     {reply,all_loaded(Db),S};
 
 handle_call({get_object_code,Mod}, _From, St) when is_atom(Mod) ->
-    Path = St#state.path,
-    case mod_to_bin(Path, Mod) of
+    case get_object_code(St, Mod) of
 	{_,Bin,FName} -> {reply,{Mod,Bin,FName},St};
 	Error -> {reply,Error,St}
     end;
@@ -1182,19 +1181,28 @@ load_file(Mod, From, St0) ->
 	     end,
     handle_pending_on_load(Action, Mod, From, St0).
 
-load_file_1(Mod, From, #state{path=Path}=St) ->
-    case mod_to_bin(Path, Mod) of
+load_file_1(Mod, From, St) ->
+    case get_object_code(St, Mod) of
 	error ->
 	    {reply,{error,nofile},St};
 	{Mod,Binary,File} ->
 	    try_load_module_1(File, Mod, Binary, From, St)
     end.
 
-mod_to_bin([Dir|Tail], Mod) ->
-    File = filename:append(Dir, atom_to_list(Mod) ++ objfile_extension()),
+get_object_code(#state{path=Path}, Mod) when is_atom(Mod) ->
+    ModStr = atom_to_list(Mod),
+    case erl_prim_loader:is_basename(ModStr) of
+        true ->
+            mod_to_bin(Path, Mod, ModStr ++ objfile_extension());
+        false ->
+            error
+    end.
+
+mod_to_bin([Dir|Tail], Mod, ModFile) ->
+    File = filename:append(Dir, ModFile),
     case erl_prim_loader:get_file(File) of
 	error -> 
-	    mod_to_bin(Tail, Mod);
+	    mod_to_bin(Tail, Mod, ModFile);
 	{ok,Bin,_} ->
 	    case filename:pathtype(File) of
 		absolute ->
@@ -1203,10 +1211,9 @@ mod_to_bin([Dir|Tail], Mod) ->
 		    {Mod,Bin,absname(File)}
 	    end
     end;
-mod_to_bin([], Mod) ->
+mod_to_bin([], Mod, ModFile) ->
     %% At last, try also erl_prim_loader's own method
-    File = to_list(Mod) ++ objfile_extension(),
-    case erl_prim_loader:get_file(File) of
+    case erl_prim_loader:get_file(ModFile) of
 	error -> 
 	    error;     % No more alternatives !
 	{ok,Bin,FName} ->
diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl
index 70cbf1c87c..99ea8dc384 100644
--- a/lib/kernel/src/disk_log.erl
+++ b/lib/kernel/src/disk_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -266,7 +266,7 @@ inc_wrap_file(Log) ->
       Size :: dlog_size(),
       Reason :: no_such_log | nonode | {read_only_mode, Log}
               | {blocked_log, Log}
-              | {new_size_too_small, CurrentSize :: pos_integer()}
+              | {new_size_too_small, Log, CurrentSize :: pos_integer()}
               | {badarg, size}
               | {file_error, file:filename(), file_error()}.
 change_size(Log, NewSize) -> 
diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl
index 08bd5946cd..3927b64b06 100644
--- a/lib/kernel/src/dist_util.erl
+++ b/lib/kernel/src/dist_util.erl
@@ -27,6 +27,7 @@
 
 %%-compile(export_all).
 -export([handshake_we_started/1, handshake_other_started/1,
+         strict_order_flags/0,
 	 start_timer/1, setup_timer/2, 
 	 reset_timer/1, cancel_timer/1,
 	 shutdown/3, shutdown/4]).
@@ -116,22 +117,8 @@ dflag2str(_) ->
     "UNKNOWN".
 
 
-remove_flag(Flag, Flags) ->
-    case Flags band Flag of
-	0 ->
-	    Flags;
-	_ ->
-	    Flags - Flag
-    end.
-
-adjust_flags(ThisFlags, OtherFlags, RejectFlags) ->
-    case (?DFLAG_PUBLISHED band ThisFlags) band OtherFlags of
-	0 ->
-	    {remove_flag(?DFLAG_PUBLISHED, ThisFlags),
-	     remove_flag(?DFLAG_PUBLISHED, OtherFlags)};
-	_ ->
-	    {ThisFlags, OtherFlags band (bnot RejectFlags)}
-    end.
+adjust_flags(ThisFlags, OtherFlags) ->
+    ThisFlags band OtherFlags.
 
 publish_flag(hidden, _) ->
     0;
@@ -143,50 +130,35 @@ publish_flag(_, OtherNode) ->
 	    0
     end.
 
--define(DFLAGS_REMOVABLE,
-        (?DFLAG_DIST_HDR_ATOM_CACHE
-             bor ?DFLAG_HIDDEN_ATOM_CACHE
-             bor ?DFLAG_ATOM_CACHE)).
-
--define(DFLAGS_ADDABLE,
-        (?DFLAGS_ALL
-             band (bnot (?DFLAG_PUBLISHED
-                             bor ?DFLAG_HIDDEN_ATOM_CACHE
-                             bor ?DFLAG_ATOM_CACHE)))).
-
--define(DFLAGS_THIS_DEFAULT,
-        (?DFLAG_EXPORT_PTR_TAG
-             bor ?DFLAG_EXTENDED_PIDS_PORTS
-             bor ?DFLAG_EXTENDED_REFERENCES
-             bor ?DFLAG_DIST_MONITOR
-             bor ?DFLAG_FUN_TAGS
-             bor ?DFLAG_DIST_MONITOR_NAME
-             bor ?DFLAG_NEW_FUN_TAGS
-             bor ?DFLAG_BIT_BINARIES
-             bor ?DFLAG_NEW_FLOATS
-             bor ?DFLAG_UNICODE_IO
-             bor ?DFLAG_DIST_HDR_ATOM_CACHE
-             bor ?DFLAG_SMALL_ATOM_TAGS
-             bor ?DFLAG_UTF8_ATOMS
-             bor ?DFLAG_MAP_TAG
-             bor ?DFLAG_BIG_CREATION
-             bor ?DFLAG_SEND_SENDER)).
-
-make_this_flags(RequestType, AddFlags, RemoveFlags, OtherNode) ->
-    case RemoveFlags band (bnot ?DFLAGS_REMOVABLE) of
+
+%% Sync with dist.c
+-record(erts_dflags, {
+          default,      % flags erts prefers
+          mandatory,    % flags erts needs
+          addable,      % flags local dist implementation is allowed to add
+          rejectable,   % flags local dist implementation is allowed to reject
+          strict_order  % flags for features needing strict order delivery
+}).
+
+-spec strict_order_flags() -> integer().
+strict_order_flags() ->
+    EDF = erts_internal:get_dflags(),
+    EDF#erts_dflags.strict_order.
+
+make_this_flags(RequestType, AddFlags, RejectFlags, OtherNode,
+                #erts_dflags{}=EDF) ->
+    case RejectFlags band (bnot EDF#erts_dflags.rejectable) of
         0 -> ok;
         Rerror -> exit({"Rejecting non rejectable flags", Rerror})
     end,
-    case AddFlags band (bnot ?DFLAGS_ADDABLE) of
+    case AddFlags band (bnot EDF#erts_dflags.addable) of
         0 -> ok;
         Aerror -> exit({"Adding non addable flags", Aerror})
     end,
-    Flgs0 = ?DFLAGS_THIS_DEFAULT,
+    Flgs0 = EDF#erts_dflags.default,
     Flgs1 = Flgs0 bor publish_flag(RequestType, OtherNode),
     Flgs2 = Flgs1 bor AddFlags,
-    Flgs3 = Flgs2 band (bnot (?DFLAG_HIDDEN_ATOM_CACHE
-                                  bor ?DFLAG_ATOM_CACHE)),
-    Flgs3 band (bnot RemoveFlags).
+    Flgs2 band (bnot RejectFlags).
 
 handshake_other_started(#hs_data{request_type=ReqType,
                                  add_flags=AddFlgs0,
@@ -196,19 +168,18 @@ handshake_other_started(#hs_data{request_type=ReqType,
     RejFlgs = convert_flags(RejFlgs0),
     ReqFlgs = convert_flags(ReqFlgs0),
     {PreOtherFlags,Node,Version} = recv_name(HSData0),
-    PreThisFlags = make_this_flags(ReqType, AddFlgs, RejFlgs, Node),
-    {ThisFlags, OtherFlags} = adjust_flags(PreThisFlags,
-					   PreOtherFlags,
-                                           RejFlgs),
-    HSData = HSData0#hs_data{this_flags=ThisFlags,
-			     other_flags=OtherFlags,
+    EDF = erts_internal:get_dflags(),
+    PreThisFlags = make_this_flags(ReqType, AddFlgs, RejFlgs, Node, EDF),
+    ChosenFlags = adjust_flags(PreThisFlags, PreOtherFlags),
+    HSData = HSData0#hs_data{this_flags=ChosenFlags,
+			     other_flags=ChosenFlags,
 			     other_version=Version,
 			     other_node=Node,
 			     other_started=true,
                              add_flags=AddFlgs,
                              reject_flags=RejFlgs,
                              require_flags=ReqFlgs},
-    check_dflags(HSData),
+    check_dflags(HSData, EDF),
     is_allowed(HSData),
     ?debug({"MD5 connection from ~p (V~p)~n",
 	    [Node, HSData#hs_data.other_version]}),
@@ -247,13 +218,11 @@ is_allowed(#hs_data{other_node = Node,
 check_dflags(#hs_data{other_node = Node,
                       other_flags = OtherFlags,
                       other_started = OtherStarted,
-                      require_flags = RequiredFlags} = HSData) ->
-    Mandatory = ((?DFLAG_EXTENDED_REFERENCES
-                      bor ?DFLAG_EXTENDED_PIDS_PORTS
-                      bor ?DFLAG_UTF8_ATOMS)
-                     bor RequiredFlags),
-    Missing = check_mandatory(0, ?DFLAGS_ALL, Mandatory,
-                              OtherFlags, []),
+                      require_flags = RequiredFlags} = HSData,
+             #erts_dflags{}=EDF) ->
+
+    Mandatory = (EDF#erts_dflags.mandatory bor RequiredFlags),
+    Missing = check_mandatory(Mandatory, OtherFlags, []),
     case Missing of
         [] ->
             ok;
@@ -273,21 +242,20 @@ check_dflags(#hs_data{other_node = Node,
 	    ?shutdown2(Node, {check_dflags_failed, Missing})
     end.
 
-check_mandatory(_Bit, 0, _Mandatory, _OtherFlags, Missing) ->
+check_mandatory(0, _OtherFlags, Missing) ->
     Missing;
-check_mandatory(Bit, Left, Mandatory, OtherFlags, Missing) ->
-    DFlag = (1 bsl Bit),
-    NewLeft = Left band (bnot DFlag),
-    NewMissing = case {DFlag band Mandatory,
-                       DFlag band OtherFlags} of
-                     {DFlag, 0} ->
+check_mandatory(Mandatory, OtherFlags, Missing) ->
+    Left = Mandatory band (Mandatory - 1),   % clear lowest set bit
+    DFlag = Mandatory bxor Left,             % only lowest set bit
+    NewMissing = case DFlag band OtherFlags of
+                     0 ->
                          %% Mandatory and missing...
                          [dflag2str(DFlag) | Missing];
                      _ ->
-                         %% Not mandatory or present...
+                         %% Mandatory and present...
                          Missing
                  end,
-    check_mandatory(Bit+1, NewLeft, Mandatory, OtherFlags, NewMissing).
+    check_mandatory(Left, OtherFlags, NewMissing).
                     
 
 %% No nodedown will be sent if we fail before this process has
@@ -409,7 +377,8 @@ handshake_we_started(#hs_data{request_type=ReqType,
     AddFlgs = convert_flags(AddFlgs0),
     RejFlgs = convert_flags(RejFlgs0),
     ReqFlgs = convert_flags(ReqFlgs0),
-    PreThisFlags = make_this_flags(ReqType, AddFlgs, RejFlgs, Node),
+    EDF = erts_internal:get_dflags(),
+    PreThisFlags = make_this_flags(ReqType, AddFlgs, RejFlgs, Node, EDF),
     HSData = PreHSData#hs_data{this_flags = PreThisFlags,
                                add_flags = AddFlgs,
                                reject_flags = RejFlgs,
@@ -417,13 +386,11 @@ handshake_we_started(#hs_data{request_type=ReqType,
     send_name(HSData),
     recv_status(HSData),
     {PreOtherFlags,ChallengeA} = recv_challenge(HSData),
-    {ThisFlags,OtherFlags} = adjust_flags(PreThisFlags,
-                                          PreOtherFlags,
-                                          RejFlgs),
-    NewHSData = HSData#hs_data{this_flags = ThisFlags,
-			       other_flags = OtherFlags, 
+    ChosenFlags = adjust_flags(PreThisFlags, PreOtherFlags),
+    NewHSData = HSData#hs_data{this_flags = ChosenFlags,
+			       other_flags = ChosenFlags,
 			       other_started = false}, 
-    check_dflags(NewHSData),
+    check_dflags(NewHSData, EDF),
     MyChallenge = gen_challenge(),
     {MyCookie,HisCookie} = get_cookies(Node),
     send_challenge_reply(NewHSData,MyChallenge,
@@ -538,8 +505,8 @@ do_setnode(#hs_data{other_node = Node, socket = Socket,
 			      "no table space left for node ~w ** ~n",
 			      [Node]),
 		    ?shutdown(Node);
-                error:Other ->
-                    exit({Other, erlang:get_stacktrace()})
+                error:Other:Stacktrace ->
+                    exit({Other, Stacktrace})
 	    end;
 	_ ->
 	    error_msg("** Distribution connection error, "
diff --git a/lib/kernel/src/erl_boot_server.erl b/lib/kernel/src/erl_boot_server.erl
index 2a38266579..4ac945ce01 100644
--- a/lib/kernel/src/erl_boot_server.erl
+++ b/lib/kernel/src/erl_boot_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -58,13 +58,11 @@
 
 -define(single_addr_mask, {255, 255, 255, 255}).
 
--type ip4_address() :: {0..255,0..255,0..255,0..255}.
-
--spec start(Slaves) -> {'ok', Pid} | {'error', What} when
+-spec start(Slaves) -> {'ok', Pid} | {'error', Reason} when
       Slaves :: [Host],
-      Host :: atom(),
+      Host :: inet:ip_address() | inet:hostname(),
       Pid :: pid(),
-      What :: any().
+      Reason :: {'badarg', Slaves}.
 
 start(Slaves) ->
     case check_arg(Slaves) of
@@ -74,11 +72,11 @@ start(Slaves) ->
 	    {error, {badarg, Slaves}}
     end.
 
--spec start_link(Slaves) -> {'ok', Pid} | {'error', What} when
+-spec start_link(Slaves) -> {'ok', Pid} | {'error', Reason} when
       Slaves :: [Host],
-      Host :: atom(),
+      Host :: inet:ip_address() | inet:hostname(),
       Pid :: pid(),
-      What :: any().
+      Reason :: {'badarg', Slaves}.
 
 start_link(Slaves) ->
     case check_arg(Slaves) of
@@ -104,10 +102,10 @@ check_arg([], Result) ->
 check_arg(_, _Result) ->
     error.
 
--spec add_slave(Slave) -> 'ok' | {'error', What} when
+-spec add_slave(Slave) -> 'ok' | {'error', Reason} when
       Slave :: Host,
-      Host :: atom(),
-      What :: any().
+      Host :: inet:ip_address() | inet:hostname(),
+      Reason :: {'badarg', Slave}.
 
 add_slave(Slave) ->
     case inet:getaddr(Slave, inet) of
@@ -117,10 +115,10 @@ add_slave(Slave) ->
 	    {error, {badarg, Slave}}
     end.
 
--spec delete_slave(Slave) -> 'ok' | {'error', What} when
+-spec delete_slave(Slave) -> 'ok' | {'error', Reason} when
       Slave :: Host,
-      Host :: atom(),
-      What :: any().
+      Host :: inet:ip_address() | inet:hostname(),
+      Reason :: {'badarg', Slave}.
 
 delete_slave(Slave) ->
     case inet:getaddr(Slave, inet) of
@@ -130,7 +128,7 @@ delete_slave(Slave) ->
 	    {error, {badarg, Slave}}
     end.
 
--spec add_subnet(Mask :: ip4_address(), Addr :: ip4_address()) ->
+-spec add_subnet(Netmask :: inet:ip_address(), Addr :: inet:ip_address()) ->
 	'ok' | {'error', any()}.
 
 add_subnet(Mask, Addr) when is_tuple(Mask), is_tuple(Addr) ->
@@ -141,14 +139,15 @@ add_subnet(Mask, Addr) when is_tuple(Mask), is_tuple(Addr) ->
 	    {error, empty_subnet}
     end.
 
--spec delete_subnet(Mask :: ip4_address(), Addr :: ip4_address()) -> 'ok'.
+-spec delete_subnet(Netmask :: inet:ip_address(),
+                    Addr :: inet:ip_address()) -> 'ok'.
 
 delete_subnet(Mask, Addr) when is_tuple(Mask), is_tuple(Addr) ->
     gen_server:call(boot_server, {delete, {Mask, Addr}}).
 
 -spec which_slaves() -> Slaves when
-      Slaves :: [Host],
-      Host :: atom().
+      Slaves :: [Slave],
+      Slave :: {Netmask :: inet:ip_address(), Address :: inet:ip_address()}.
 
 which_slaves() ->
     gen_server:call(boot_server, which).
diff --git a/lib/kernel/src/error_handler.erl b/lib/kernel/src/error_handler.erl
index 59ca8e690d..a9582c6225 100644
--- a/lib/kernel/src/error_handler.erl
+++ b/lib/kernel/src/error_handler.erl
@@ -106,8 +106,8 @@ crash(M, F, A) ->
 crash(Tuple) ->
     try erlang:error(undef)
     catch
-	error:undef ->
-	    Stk = [Tuple|tl(erlang:get_stacktrace())],
+	error:undef:Stacktrace ->
+	    Stk = [Tuple|tl(Stacktrace)],
 	    erlang:raise(error, undef, Stk)
     end.
 
diff --git a/lib/kernel/src/erts_debug.erl b/lib/kernel/src/erts_debug.erl
index 2887014c1c..3456c8511e 100644
--- a/lib/kernel/src/erts_debug.erl
+++ b/lib/kernel/src/erts_debug.erl
@@ -21,7 +21,7 @@
 
 %% Low-level debugging support. EXPERIMENTAL!
 
--export([size/1,df/1,df/2,df/3,ic/1]).
+-export([size/1,df/1,df/2,df/3,dis_to_file/2,ic/1]).
 
 %% This module contains the following *experimental* BIFs:
 %%   disassemble/1
@@ -378,6 +378,16 @@ df(Mod, Func, Arity) when is_atom(Mod), is_atom(Func) ->
     catch _:_ -> {undef,Mod}
     end.
 
+-spec dis_to_file(module(), file:filename()) -> df_ret().
+
+dis_to_file(Mod, Name) when is_atom(Mod) ->
+    try Mod:module_info(functions) of
+	Fs0 when is_list(Fs0) ->
+	    Fs = [{Mod,Func,Arity} || {Func,Arity} <- Fs0],
+	    dff(Name, Fs)
+    catch _:_ -> {undef,Mod}
+    end.
+
 dff(Name, Fs) ->
     case file:open(Name, [write,raw,delayed_write]) of
 	{ok,F} ->
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 933f2d5f65..c2df1ee288 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -72,7 +72,7 @@
               io_device/0, name/0, name_all/0, posix/0]).
 
 %%% Includes and defines
--include("file.hrl").
+-include("file_int.hrl").
 
 -define(FILE_IO_SERVER_TABLE, file_io_servers).
 
@@ -454,41 +454,23 @@ raw_write_file_info(Name, #file_info{} = Info) ->
       Reason :: posix() | badarg | system_limit.
 
 open(Item, ModeList) when is_list(ModeList) ->
-    case lists:member(raw, ModeList) of
-	%% Raw file, use ?PRIM_FILE to handle this file
-	true ->
+    case {lists:member(raw, ModeList), lists:member(ram, ModeList)} of
+        {false, false} ->
+            %% File server file
             Args = [file_name(Item) | ModeList],
             case check_args(Args) of
                 ok ->
                     [FileName | _] = Args,
-                    %% We rely on the returned Handle (in {ok, Handle})
-                    %% being a pid() or a #file_descriptor{}
-                    ?PRIM_FILE:open(FileName, ModeList);
+                    call(open, [FileName, ModeList]);
                 Error ->
                     Error
-	    end;
-	false ->
-	    case lists:member(ram, ModeList) of
-		%% RAM file, use ?RAM_FILE to handle this file
-		true ->
-		    case check_args(ModeList) of
-			ok ->
-			    ?RAM_FILE:open(Item, ModeList);
-			Error ->
-			    Error
-		    end;
-		%% File server file
-		false ->
-		    Args = [file_name(Item) | ModeList],
-		    case check_args(Args) of 
-			ok ->
-			    [FileName | _] = Args,
-			    call(open, [FileName, ModeList]);
-			Error ->
-			    Error
-		    end
-	    end
+            end;
+        {true, _Either} ->
+            raw_file_io:open(file_name(Item), ModeList);
+        {false, true} ->
+            ram_file:open(Item, ModeList)
     end;
+
 %% Old obsolete mode specification in atom or 2-tuple format
 open(Item, Mode) ->
     open(Item, mode_list(Mode)).
@@ -1254,15 +1236,18 @@ sendfile(File, _Sock, _Offet, _Bytes, _Opts) when is_pid(File) ->
 sendfile(File, Sock, Offset, Bytes, []) ->
     sendfile(File, Sock, Offset, Bytes, ?MAX_CHUNK_SIZE, [], [], []);
 sendfile(File, Sock, Offset, Bytes, Opts) ->
-    ChunkSize0 = proplists:get_value(chunk_size, Opts, ?MAX_CHUNK_SIZE),
-    ChunkSize = if ChunkSize0 > ?MAX_CHUNK_SIZE ->
-			?MAX_CHUNK_SIZE;
-		   true -> ChunkSize0
-		end,
-    %% Support for headers, trailers and options has been removed because the
-    %% Darwin and BSD API for using it does not play nice with
-    %% non-blocking sockets. See unix_efile.c for more info.
-    sendfile(File, Sock, Offset, Bytes, ChunkSize, [], [], Opts).
+    try proplists:get_value(chunk_size, Opts, ?MAX_CHUNK_SIZE) of
+        ChunkSize0 when is_integer(ChunkSize0) ->
+            ChunkSize = erlang:min(ChunkSize0, ?MAX_CHUNK_SIZE),
+            %% Support for headers, trailers and options has been removed
+            %% because the Darwin and BSD API for using it does not play nice
+            %% with non-blocking sockets. See unix_efile.c for more info.
+            sendfile(File, Sock, Offset, Bytes, ChunkSize, [], [], Opts);
+        _Other ->
+            {error, badarg}
+    catch
+        error:_ -> {error, badarg}
+    end.
 
 %% sendfile/2
 -spec sendfile(Filename, Socket) ->
@@ -1397,8 +1382,8 @@ eval_stream2({ok,Form,EndLine}, Fd, H, Last, E, Bs0) ->
     try erl_eval:exprs(Form, Bs0) of
 	{value,V,Bs} ->
 	    eval_stream(Fd, H, EndLine, {V}, E, Bs)
-    catch Class:Reason ->
-            Error = {EndLine,?MODULE,{Class,Reason,erlang:get_stacktrace()}},
+    catch Class:Reason:StackTrace ->
+            Error = {EndLine,?MODULE,{Class,Reason,StackTrace}},
 	    eval_stream(Fd, H, EndLine, Last, [Error|E], Bs0)
     end;
 eval_stream2({error,What,EndLine}, Fd, H, Last, E, Bs) ->
diff --git a/lib/kernel/src/file_int.hrl b/lib/kernel/src/file_int.hrl
new file mode 100644
index 0000000000..bafc330c04
--- /dev/null
+++ b/lib/kernel/src/file_int.hrl
@@ -0,0 +1,33 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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%
+%%
+
+%%
+%% Internal definitions for the 'file' module and friends.
+%%
+
+-ifndef(FILE_INTERNAL_HRL_).
+-define(FILE_INTERNAL_HRL_, 1).
+
+-include("file.hrl").
+
+-define(CALL_FD(Fd, Method, Args),
+    apply(Fd#file_descriptor.module, Method, [Fd | Args])).
+
+-endif.
diff --git a/lib/kernel/src/file_io_server.erl b/lib/kernel/src/file_io_server.erl
index deb7b315b1..34d5497a4a 100644
--- a/lib/kernel/src/file_io_server.erl
+++ b/lib/kernel/src/file_io_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2000-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.
@@ -28,7 +28,8 @@
 
 -record(state, {handle,owner,mref,buf,read_mode,unic}).
 
--define(PRIM_FILE, prim_file).
+-include("file_int.hrl").
+
 -define(READ_SIZE_LIST, 128).
 -define(READ_SIZE_BINARY, (8*1024)).
 
@@ -67,8 +68,9 @@ do_start(Spawn, Owner, FileName, ModeList) ->
 		  erlang:dt_restore_tag(Utag),
 		  %% process_flag(trap_exit, true),
 		  case parse_options(ModeList) of
-		      {ReadMode, UnicodeMode, Opts} ->
-			  case ?PRIM_FILE:open(FileName, Opts) of
+                      {ReadMode, UnicodeMode, Opts0} ->
+                          Opts = maybe_add_read_ahead(ReadMode, Opts0),
+			  case raw_file_io:open(FileName, [raw | Opts]) of
 			      {error, Reason} = Error ->
 				  Self ! {Ref, Error},
 				  exit(Reason);
@@ -157,6 +159,24 @@ valid_enc({utf32,little}) ->
 valid_enc(_Other) ->
     {error,badarg}.
 
+%% Add a small read_ahead buffer if the file is opened for reading
+%% only in list mode and no read_ahead is already given.
+maybe_add_read_ahead(binary, Opts) ->
+    Opts;
+maybe_add_read_ahead(list, Opts) ->
+    P = fun(read_ahead) -> true;
+           ({read_ahead,_}) -> true;
+           (append) -> true;
+           (exclusive) -> true;
+           (write) -> true;
+           (_) -> false
+        end,
+    case lists:any(P, Opts) of
+        false ->
+            [{read_ahead, 4096}|Opts];
+        true ->
+            Opts
+    end.
 
 server_loop(#state{mref = Mref} = State) ->
     receive
@@ -205,7 +225,7 @@ io_reply(From, ReplyAs, Reply) ->
 
 file_request({advise,Offset,Length,Advise},
          #state{handle=Handle}=State) ->
-    case ?PRIM_FILE:advise(Handle, Offset, Length, Advise) of
+    case ?CALL_FD(Handle, advise, [Offset, Length, Advise]) of
     {error,Reason}=Reply ->
         {stop,Reason,Reply,State};
     Reply ->
@@ -213,7 +233,7 @@ file_request({advise,Offset,Length,Advise},
     end;
 file_request({allocate, Offset, Length},
          #state{handle = Handle} = State) ->
-    Reply = ?PRIM_FILE:allocate(Handle, Offset, Length),
+    Reply = ?CALL_FD(Handle, allocate, [Offset, Length]),
     {reply, Reply, State};
 file_request({pread,At,Sz}, State)
   when At =:= cur;
@@ -256,7 +276,7 @@ file_request({pwrite,At,Data},
     end;
 file_request(datasync,
 	     #state{handle=Handle}=State) ->
-    case ?PRIM_FILE:datasync(Handle) of
+    case ?CALL_FD(Handle, datasync, []) of
 	{error,Reason}=Reply ->
 	    {stop,Reason,Reply,State};
 	Reply ->
@@ -264,7 +284,7 @@ file_request(datasync,
     end;
 file_request(sync, 
 	     #state{handle=Handle}=State) ->
-    case ?PRIM_FILE:sync(Handle) of
+    case ?CALL_FD(Handle, sync, []) of
 	{error,Reason}=Reply ->
 	    {stop,Reason,Reply,State};
 	Reply ->
@@ -272,7 +292,7 @@ file_request(sync,
     end;
 file_request(close, 
 	     #state{handle=Handle}=State) ->
-    case ?PRIM_FILE:close(Handle) of
+    case ?CALL_FD(Handle, close, []) of
 	{error,Reason}=Reply ->
 	    {stop,Reason,Reply,State#state{buf= <<>>}};
 	Reply ->
@@ -288,7 +308,7 @@ file_request({position,At},
     end;
 file_request(truncate, 
 	     #state{handle=Handle}=State) ->
-    case ?PRIM_FILE:truncate(Handle) of
+    case ?CALL_FD(Handle, truncate, []) of
 	{error,Reason}=Reply ->
 	    {stop,Reason,Reply,State#state{buf= <<>>}};
 	Reply ->
@@ -398,7 +418,7 @@ io_request_loop([Request|Tail],
 %%
 put_chars(Chars, latin1, #state{handle=Handle, unic=latin1}=State) ->
     NewState = State#state{buf = <<>>},
-    case ?PRIM_FILE:write(Handle, Chars) of
+    case ?CALL_FD(Handle, write, [Chars]) of
 	{error,Reason}=Reply ->
 	    {stop,Reason,Reply,NewState};
 	Reply ->
@@ -408,7 +428,7 @@ put_chars(Chars, InEncoding, #state{handle=Handle, unic=OutEncoding}=State) ->
     NewState = State#state{buf = <<>>},
     case unicode:characters_to_binary(Chars,InEncoding,OutEncoding) of
 	Bin when is_binary(Bin) ->
-	    case ?PRIM_FILE:write(Handle, Bin) of
+	    case ?CALL_FD(Handle, write, [Bin]) of
 		{error,Reason}=Reply ->
 		    {stop,Reason,Reply,NewState};
 		Reply ->
@@ -422,7 +442,7 @@ put_chars(Chars, InEncoding, #state{handle=Handle, unic=OutEncoding}=State) ->
 
 get_line(S, {<<>>, Cont}, OutEnc,
 	 #state{handle=Handle, read_mode=Mode, unic=InEnc}=State) ->
-    case ?PRIM_FILE:read(Handle, read_size(Mode)) of
+    case ?CALL_FD(Handle, read, [read_size(Mode)]) of
 	{ok,Bin} ->
 	    get_line(S, convert_enc([Cont, Bin], InEnc, OutEnc), OutEnc, State);
 	eof ->
@@ -472,7 +492,7 @@ get_chars(N, OutEnc,#state{handle=Handle,buf=Buf,read_mode=ReadMode,unic=latin1}
     BufSize = byte_size(Buf),
     NeedSize = N-BufSize,
     Size = erlang:max(NeedSize, ?READ_SIZE_BINARY),
-    case ?PRIM_FILE:read(Handle, Size) of
+    case ?CALL_FD(Handle, read, [Size]) of
 	{ok, B} ->
 	    if BufSize+byte_size(B) < N ->
 		    std_reply(cat(Buf, B, ReadMode,latin1,OutEnc), State);
@@ -504,7 +524,7 @@ get_chars(N, OutEnc,#state{handle=Handle,buf=Buf,read_mode=ReadMode,unic=InEncod
 		%% Need more, Try to read 4*needed in bytes...
 		NeedSize = (N - BufCount) * 4,
 		Size = erlang:max(NeedSize, ?READ_SIZE_BINARY),
-		case ?PRIM_FILE:read(Handle, Size) of
+		case ?CALL_FD(Handle, read, [Size]) of
 		    {ok, B} ->
 			NewBuf = list_to_binary([Buf,B]),
 			{NewCount,NewSplit} = count_and_find(NewBuf,N,InEncoding),
@@ -544,7 +564,7 @@ get_chars(Mod, Func, XtraArg, OutEnc, #state{buf=Buf}=State) ->
 
 get_chars_empty(Mod, Func, XtraArg, S, latin1,
 		#state{handle=Handle,read_mode=ReadMode, unic=latin1}=State) ->
-    case ?PRIM_FILE:read(Handle, read_size(ReadMode)) of
+    case ?CALL_FD(Handle, read, [read_size(ReadMode)]) of
 	{ok,Bin} ->
 	    get_chars_apply(Mod, Func, XtraArg, S, latin1, State, Bin);
 	eof ->
@@ -554,7 +574,7 @@ get_chars_empty(Mod, Func, XtraArg, S, latin1,
     end;
 get_chars_empty(Mod, Func, XtraArg, S, OutEnc,
 		#state{handle=Handle,read_mode=ReadMode}=State) ->
-    case ?PRIM_FILE:read(Handle, read_size(ReadMode)) of
+    case ?CALL_FD(Handle, read, [read_size(ReadMode)]) of
 	{ok,Bin} ->
 	    get_chars_apply(Mod, Func, XtraArg, S, OutEnc, State, Bin);
 	eof ->
@@ -564,7 +584,7 @@ get_chars_empty(Mod, Func, XtraArg, S, OutEnc,
     end.
 get_chars_notempty(Mod, Func, XtraArg, S, OutEnc,
 		   #state{handle=Handle,read_mode=ReadMode,buf = B}=State) ->
-    case ?PRIM_FILE:read(Handle, read_size(ReadMode)) of
+    case ?CALL_FD(Handle, read, [read_size(ReadMode)]) of
 	{ok,Bin} ->
 	    get_chars_apply(Mod, Func, XtraArg, S, OutEnc, State, list_to_binary([B,Bin]));
 	eof ->
@@ -918,13 +938,10 @@ cbv({utf32,little},_) ->
 %% Compensates ?PRIM_FILE:position/2 for the number of bytes 
 %% we have buffered
 position(Handle, At, Buf) ->
-    ?PRIM_FILE:position(
-       Handle,
-       case At of
-	   cur ->
-	       {cur, -byte_size(Buf)};
-	   {cur, Offs} ->
-	       {cur, Offs-byte_size(Buf)};
-	   _ ->
-	       At
-       end).
+    SeekTo =
+        case At of
+            {cur, Offs} -> {cur, Offs-byte_size(Buf)};
+            cur -> {cur, -byte_size(Buf)};
+            _ -> At
+        end,
+    ?CALL_FD(Handle, position, [SeekTo]).
diff --git a/lib/kernel/src/file_server.erl b/lib/kernel/src/file_server.erl
index 6e8f64d932..ecc1ffbdd6 100644
--- a/lib/kernel/src/file_server.erl
+++ b/lib/kernel/src/file_server.erl
@@ -63,7 +63,7 @@ stop() ->
 %%% Callback functions from gen_server
 %%%----------------------------------------------------------------------
 
--type state() :: port().	% Internal type
+-type state() :: term().	% Internal type
 
 %%----------------------------------------------------------------------
 %% Func: init/1
@@ -77,14 +77,8 @@ stop() ->
 
 init([]) ->
     process_flag(trap_exit, true),
-    case ?PRIM_FILE:start() of
-	{ok, Handle} ->
-	    ?FILE_IO_SERVER_TABLE =
-                ets:new(?FILE_IO_SERVER_TABLE, [named_table]),
-	    {ok, Handle};
-	{error, Reason} ->
-	    {stop, Reason}
-    end.
+    ?FILE_IO_SERVER_TABLE =  ets:new(?FILE_IO_SERVER_TABLE, [named_table]),
+    {ok, undefined}.
 
 %%----------------------------------------------------------------------
 %% Func: handle_call/3
@@ -101,7 +95,7 @@ init([]) ->
 	{'reply', 'eof' | 'ok' | {'error', term()} | {'ok', term()}, state()} |
 	{'stop', 'normal', 'stopped', state()}.
 
-handle_call({open, Name, ModeList}, {Pid, _Tag} = _From, Handle)
+handle_call({open, Name, ModeList}, {Pid, _Tag} = _From, State)
   when is_list(ModeList) ->
     Child = ?FILE_IO_SERVER:start_link(Pid, Name, ModeList),
     case Child of
@@ -110,78 +104,78 @@ handle_call({open, Name, ModeList}, {Pid, _Tag} = _From, Handle)
 	_ ->
 	    ok
     end,
-    {reply, Child, Handle};
+    {reply, Child, State};
 
-handle_call({open, _Name, _Mode}, _From, Handle) ->
-    {reply, {error, einval}, Handle};
+handle_call({open, _Name, _Mode}, _From, State) ->
+    {reply, {error, einval}, State};
 
-handle_call({read_file, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_file(Name), Handle};
+handle_call({read_file, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:read_file(Name), State};
 
-handle_call({write_file, Name, Bin}, _From, Handle) ->
-    {reply, ?PRIM_FILE:write_file(Name, Bin), Handle};
+handle_call({write_file, Name, Bin}, _From, State) ->
+    {reply, ?PRIM_FILE:write_file(Name, Bin), State};
 
-handle_call({set_cwd, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:set_cwd(Handle, Name), Handle};
+handle_call({set_cwd, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:set_cwd(Name), State};
 
-handle_call({delete, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:delete(Handle, Name), Handle};
+handle_call({delete, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:delete(Name), State};
 
-handle_call({rename, Fr, To}, _From, Handle) ->
-    {reply, ?PRIM_FILE:rename(Handle, Fr, To), Handle};
+handle_call({rename, Fr, To}, _From, State) ->
+    {reply, ?PRIM_FILE:rename(Fr, To), State};
 
-handle_call({make_dir, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:make_dir(Handle, Name), Handle};
+handle_call({make_dir, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:make_dir(Name), State};
 
-handle_call({del_dir, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:del_dir(Handle, Name), Handle};
+handle_call({del_dir, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:del_dir(Name), State};
 
-handle_call({list_dir, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:list_dir(Handle, Name), Handle};
-handle_call({list_dir_all, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:list_dir_all(Handle, Name), Handle};
+handle_call({list_dir, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:list_dir(Name), State};
+handle_call({list_dir_all, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:list_dir_all(Name), State};
 
-handle_call(get_cwd, _From, Handle) ->
-    {reply, ?PRIM_FILE:get_cwd(Handle), Handle};
-handle_call({get_cwd}, _From, Handle) ->
-    {reply, ?PRIM_FILE:get_cwd(Handle), Handle};
-handle_call({get_cwd, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:get_cwd(Handle, Name), Handle};
+handle_call(get_cwd, _From, State) ->
+    {reply, ?PRIM_FILE:get_cwd(), State};
+handle_call({get_cwd}, _From, State) ->
+    {reply, ?PRIM_FILE:get_cwd(), State};
+handle_call({get_cwd, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:get_cwd(Name), State};
 
-handle_call({read_file_info, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_file_info(Handle, Name), Handle};
+handle_call({read_file_info, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:read_file_info(Name), State};
 
-handle_call({read_file_info, Name, Opts}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_file_info(Handle, Name, Opts), Handle};
+handle_call({read_file_info, Name, Opts}, _From, State) ->
+    {reply, ?PRIM_FILE:read_file_info(Name, Opts), State};
 
-handle_call({altname, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:altname(Handle, Name), Handle};
+handle_call({altname, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:altname(Name), State};
 
-handle_call({write_file_info, Name, Info}, _From, Handle) ->
-    {reply, ?PRIM_FILE:write_file_info(Handle, Name, Info), Handle};
+handle_call({write_file_info, Name, Info}, _From, State) ->
+    {reply, ?PRIM_FILE:write_file_info(Name, Info), State};
 
-handle_call({write_file_info, Name, Info, Opts}, _From, Handle) ->
-    {reply, ?PRIM_FILE:write_file_info(Handle, Name, Info, Opts), Handle};
+handle_call({write_file_info, Name, Info, Opts}, _From, State) ->
+    {reply, ?PRIM_FILE:write_file_info(Name, Info, Opts), State};
 
-handle_call({read_link_info, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_link_info(Handle, Name), Handle};
+handle_call({read_link_info, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:read_link_info(Name), State};
 
-handle_call({read_link_info, Name, Opts}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_link_info(Handle, Name, Opts), Handle};
+handle_call({read_link_info, Name, Opts}, _From, State) ->
+    {reply, ?PRIM_FILE:read_link_info(Name, Opts), State};
 
-handle_call({read_link, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_link(Handle, Name), Handle};
-handle_call({read_link_all, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_link_all(Handle, Name), Handle};
+handle_call({read_link, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:read_link(Name), State};
+handle_call({read_link_all, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:read_link_all(Name), State};
 
-handle_call({make_link, Old, New}, _From, Handle) ->
-    {reply, ?PRIM_FILE:make_link(Handle, Old, New), Handle};
+handle_call({make_link, Old, New}, _From, State) ->
+    {reply, ?PRIM_FILE:make_link(Old, New), State};
 
-handle_call({make_symlink, Old, New}, _From, Handle) ->
-    {reply, ?PRIM_FILE:make_symlink(Handle, Old, New), Handle};
+handle_call({make_symlink, Old, New}, _From, State) ->
+    {reply, ?PRIM_FILE:make_symlink(Old, New), State};
 
 handle_call({copy, SourceName, SourceOpts, DestName, DestOpts, Length},
-	    _From, Handle) ->
+	    _From, State) ->
     Reply = 
 	case ?PRIM_FILE:open(SourceName, [read, binary | SourceOpts]) of
 	    {ok, Source} ->
@@ -201,14 +195,14 @@ handle_call({copy, SourceName, SourceOpts, DestName, DestOpts, Length},
 	    {error, _} = Error ->
 		Error
 	end,
-    {reply, Reply, Handle};
+    {reply, Reply, State};
 
-handle_call(stop, _From, Handle) ->
-    {stop, normal, stopped, Handle};
+handle_call(stop, _From, State) ->
+    {stop, normal, stopped, State};
 
-handle_call(Request, From, Handle) ->
+handle_call(Request, From, State) ->
     error_logger:error_msg("handle_call(~tp, ~tp, _)", [Request, From]),
-    {noreply, Handle}.
+    {noreply, State}.
 
 %%----------------------------------------------------------------------
 %% Func: handle_cast/2
@@ -233,14 +227,9 @@ handle_cast(Msg, State) ->
 -spec handle_info(term(), state()) ->
         {'noreply', state()} | {'stop', 'normal', state()}.
 
-handle_info({'EXIT', Pid, _Reason}, Handle) when is_pid(Pid) ->
+handle_info({'EXIT', Pid, _Reason}, State) when is_pid(Pid) ->
     ets:delete(?FILE_IO_SERVER_TABLE, Pid),
-    {noreply, Handle};
-
-handle_info({'EXIT', Handle, _Reason}, Handle) ->
-    error_logger:error_msg("Port controlling ~w terminated in ~w",
-			   [?FILE_SERVER, ?MODULE]),
-    {stop, normal, Handle};
+    {noreply, State};
 
 handle_info(Info, State) ->
     error_logger:error_msg("handle_Info(~tp, _)", [Info]),
@@ -254,8 +243,8 @@ handle_info(Info, State) ->
 
 -spec terminate(term(), state()) -> 'ok'.
 
-terminate(_Reason, Handle) ->
-    ?PRIM_FILE:stop(Handle).
+terminate(_Reason, _State) ->
+    ok.
 
 %%----------------------------------------------------------------------
 %% Func: code_change/3
diff --git a/lib/kernel/src/group_history.erl b/lib/kernel/src/group_history.erl
index 91f3663cc5..9745848992 100644
--- a/lib/kernel/src/group_history.erl
+++ b/lib/kernel/src/group_history.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2017. All Rights Reserved.
+%% Copyright Ericsson AB 2017-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.
@@ -260,7 +260,7 @@ resize_log(Name, _OldSize, NewSize) ->
         ok ->
             show('$#erlang-history-resize-result',
                  "ok~n", []);
-        {error, {new_size_too_small, _}} ->
+        {error, {new_size_too_small, _, _}} ->
             show('$#erlang-history-resize-result',
                  "failed (new size is too small)~n", []),
             disable_history();
diff --git a/lib/kernel/src/hipe_unified_loader.erl b/lib/kernel/src/hipe_unified_loader.erl
index f4c7c277ed..fd06f0f7d8 100644
--- a/lib/kernel/src/hipe_unified_loader.erl
+++ b/lib/kernel/src/hipe_unified_loader.erl
@@ -236,9 +236,10 @@ load_common(Mod, Bin, Beam, Architecture) ->
 	  lists:foreach(fun({FE, DestAddress}) ->
 			    hipe_bifs:set_native_address_in_fe(FE, DestAddress)
 			end, erase(closures_to_patch)),
-          ok = hipe_bifs:commit_patch_load(LoaderState),
 	  set_beam_call_traps(FunDefs),
-	  ok;
+	  export_funs(FunDefs),
+          ok = hipe_bifs:commit_patch_load(LoaderState),
+          ok;
 	BeamBinary when is_binary(BeamBinary) ->
 	  %% Find all closures in the code.
 	  [] = erase(closures_to_patch),	%Clean up, assertion.
@@ -274,6 +275,7 @@ needs_trampolines(Architecture) ->
     arm -> true;
     powerpc -> true;
     ppc64 -> true;
+    amd64 -> true;
     _ -> false
   end.
 
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index dc20c21c77..4bad523dff 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -34,7 +34,8 @@
 	 ip/1, stats/0, options/0, 
 	 pushf/3, popf/1, close/1, gethostname/0, gethostname/1, 
 	 parse_ipv4_address/1, parse_ipv6_address/1, parse_ipv4strict_address/1,
-	 parse_ipv6strict_address/1, parse_address/1, parse_strict_address/1, ntoa/1]).
+	 parse_ipv6strict_address/1, parse_address/1, parse_strict_address/1,
+         ntoa/1, ipv4_mapped_ipv6_address/1]).
 
 -export([connect_options/2, listen_options/2, udp_options/2, sctp_options/2]).
 -export([udp_module/1, tcp_module/1, tcp_module/2, sctp_module/1]).
@@ -72,7 +73,7 @@
 %% timer interface
 -export([start_timer/1, timeout/1, timeout/2, stop_timer/1]).
 
--export_type([address_family/0, hostent/0, hostname/0, ip4_address/0,
+-export_type([address_family/0, socket_protocol/0, hostent/0, hostname/0, ip4_address/0,
               ip6_address/0, ip_address/0, port_number/0,
 	      local_address/0, socket_address/0, returned_non_ip_address/0,
 	      socket_setopt/0, socket_getopt/0,
@@ -675,6 +676,14 @@ parse_address(Addr) ->
 parse_strict_address(Addr) ->
     inet_parse:strict_address(Addr).
 
+-spec ipv4_mapped_ipv6_address(ip_address()) -> ip_address().
+ipv4_mapped_ipv6_address({D1,D2,D3,D4})
+  when (D1 bor D2 bor D3 bor D4) < 256 ->
+    {0,0,0,0,0,16#ffff,(D1 bsl 8) bor D2,(D3 bsl 8) bor D4};
+ipv4_mapped_ipv6_address({D1,D2,D3,D4,D5,D6,D7,D8})
+  when (D1 bor D2 bor D3 bor D4 bor D5 bor D6 bor D7 bor D8) < 65536 ->
+    {D7 bsr 8,D7 band 255,D8 bsr 8,D8 band 255}.
+
 %% Return a list of available options
 options() ->
     [
@@ -1244,9 +1253,7 @@ gethostbyname_string(Name, Type)
 	    inet ->
 		inet_parse:ipv4_address(Name);
 	    inet6 ->
-		%% XXX should we really translate IPv4 addresses here
-		%% even if we do not know if this host can do IPv6?
-		inet_parse:ipv6_address(Name)
+		inet_parse:ipv6strict_address(Name)
 	end of
 	{ok,IP} ->
 	    {ok,make_hostent(Name, [IP], [], Type)};
@@ -1452,11 +1459,14 @@ fdopen(Fd, Addr, Port, Opts, Protocol, Family, Type, Module) ->
 %%  socket stat
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+-spec i() -> ok.
 i() -> i(tcp), i(udp), i(sctp).
 
+-spec i(socket_protocol()) -> ok.
 i(Proto) -> i(Proto, [port, module, recv, sent, owner,
 		      local_address, foreign_address, state, type]).
 
+-spec i(socket_protocol(), [atom()]) -> ok.
 i(tcp, Fs) ->
     ii(tcp_sockets(), Fs, tcp);
 i(udp, Fs) ->
diff --git a/lib/kernel/src/inet_hosts.erl b/lib/kernel/src/inet_hosts.erl
index 0bdf00ac30..fc653bf0d3 100644
--- a/lib/kernel/src/inet_hosts.erl
+++ b/lib/kernel/src/inet_hosts.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -72,9 +72,6 @@ gethostbyname(Name, Type, Byname, Byaddr) ->
 
 gethostbyaddr({A,B,C,D}=IP) when ?ip(A,B,C,D) ->
     gethostbyaddr(IP, inet);
-%% ipv4  only ipv6 address
-gethostbyaddr({0,0,0,0,0,16#ffff=F,G,H}) when ?ip6(0,0,0,0,0,F,G,H) ->
-    gethostbyaddr({G bsr 8, G band 255, H bsr 8, H band 255});
 gethostbyaddr({A,B,C,D,E,F,G,H}=IP) when ?ip6(A,B,C,D,E,F,G,H) ->
     gethostbyaddr(IP, inet6);
 gethostbyaddr(Addr) when is_list(Addr) ->
diff --git a/lib/kernel/src/inet_int.hrl b/lib/kernel/src/inet_int.hrl
index bc5b67f7bf..357e27826c 100644
--- a/lib/kernel/src/inet_int.hrl
+++ b/lib/kernel/src/inet_int.hrl
@@ -100,6 +100,8 @@
 -define(TCP_REQ_RECV,           42).
 -define(TCP_REQ_UNRECV,         43).
 -define(TCP_REQ_SHUTDOWN,       44).
+-define(TCP_REQ_SENDFILE,       45).
+
 %% UDP and SCTP requests
 -define(PACKET_REQ_RECV,        60).
 %%-define(SCTP_REQ_LISTEN,        61). MERGED
@@ -319,6 +321,12 @@
 	[((X) bsr 24) band 16#ff, ((X) bsr 16) band 16#ff,
 	 ((X) bsr 8) band 16#ff, (X) band 16#ff]).
 
+-define(int64(X),
+	[((X) bsr 56) band 16#ff, ((X) bsr 48) band 16#ff,
+	 ((X) bsr 40) band 16#ff, ((X) bsr 32) band 16#ff,
+	 ((X) bsr 24) band 16#ff, ((X) bsr 16) band 16#ff,
+	 ((X) bsr 8) band 16#ff, (X) band 16#ff]).
+
 -define(intAID(X), % For SCTP AssocID
         ?int32(X)).
 
diff --git a/lib/kernel/src/inet_res.erl b/lib/kernel/src/inet_res.erl
index 49aa5f8bda..6454802b04 100644
--- a/lib/kernel/src/inet_res.erl
+++ b/lib/kernel/src/inet_res.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -349,9 +349,6 @@ gethostbyaddr_tm({A,B,C,D} = IP, Timer) when ?ip(A,B,C,D) ->
 	{ok, HEnt} -> {ok, HEnt};
 	_ -> res_gethostbyaddr(dn_in_addr_arpa(A,B,C,D), IP, Timer)
     end;
-%% ipv4  only ipv6 address
-gethostbyaddr_tm({0,0,0,0,0,16#ffff,G,H},Timer) when is_integer(G+H) ->
-    gethostbyaddr_tm({G div 256, G rem 256, H div 256, H rem 256},Timer);
 gethostbyaddr_tm({A,B,C,D,E,F,G,H} = IP, Timer) when ?ip6(A,B,C,D,E,F,G,H) ->
     inet_db:res_update_conf(),
     case inet_db:gethostbyaddr(IP) of
@@ -431,28 +428,7 @@ gethostbyname(Name,Family,Timeout) ->
 gethostbyname_tm(Name,inet,Timer) ->
     getbyname_tm(Name,?S_A,Timer);
 gethostbyname_tm(Name,inet6,Timer) ->
-    case getbyname_tm(Name,?S_AAAA,Timer) of
-	{ok,HEnt} -> {ok,HEnt};
-	{error,nxdomain} ->
-	    case getbyname_tm(Name, ?S_A,Timer) of
-		{ok, HEnt} ->
-		    %% rewrite to a ipv4 only ipv6 address
-		    {ok,
-		     HEnt#hostent {
-		       h_addrtype = inet6,
-		       h_length = 16,
-		       h_addr_list = 
-		       lists:map(
-			 fun({A,B,C,D}) ->
-				 {0,0,0,0,0,16#ffff,A*256+B,C*256+D}
-			 end, HEnt#hostent.h_addr_list)
-		      }};
-		Error ->
-		    Error
-	    end;
-	Error ->
-	    Error
-    end;
+    getbyname_tm(Name,?S_AAAA,Timer);
 gethostbyname_tm(_Name, _Family, _Timer) ->
     {error, einval}.
 	    
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 080b11fc4d..82a3571da9 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -57,6 +57,7 @@
 	     inet_tcp_dist,
 	     kernel,
 	     kernel_config,
+	     kernel_refc,
 	     local_tcp,
 	     local_udp,
 	     net,
@@ -88,6 +89,13 @@
              inet_udp,
 	     inet_sctp,
              pg2,
+             raw_file_io,
+             raw_file_io_compressed,
+             raw_file_io_deflate,
+             raw_file_io_delayed,
+             raw_file_io_inflate,
+             raw_file_io_list,
+             raw_file_io_raw,
 	     seq_trace,
 	     standard_error,
 	     wrap_log_reader]},
@@ -107,6 +115,7 @@
 		heart,
 		init,
 		kernel_config,
+		kernel_refc,
 		kernel_sup,
 		net_kernel,
 		net_sup,
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index fc5417597f..4ee497bbbd 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -18,7 +18,9 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max one major revision back
- [{<<"5\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-20.*
+ [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*, OTP-20.0
+  {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}],    % OTP-20.1+
  %% Down to - max one major revision back
- [{<<"5\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-20.*
+ [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*, OTP-20.0
+  {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}]     % OTP-20.1+
 }.
diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl
index cba57088ec..0382764b39 100644
--- a/lib/kernel/src/kernel.erl
+++ b/lib/kernel/src/kernel.erl
@@ -111,6 +111,13 @@ init([]) ->
                type => worker,
                modules => [kernel_config]},
 
+    RefC = #{id => kernel_refc,
+             start => {kernel_refc, start_link, []},
+             restart => permanent,
+             shutdown => 2000,
+             type => worker,
+             modules => [kernel_refc]},
+
     Code = #{id => code_server,
              start => {code, start_link, []},
              restart => permanent,
@@ -148,7 +155,7 @@ init([]) ->
 
     case init:get_argument(mode) of
         {ok, [["minimal"]]} ->
-            {ok, {SupFlags, [Code, File, StdError, User, Config, SafeSup]}};
+            {ok, {SupFlags, [Code, File, StdError, User, Config, RefC, SafeSup]}};
         _ ->
             Rpc = #{id => rex,
                     start => {rpc, start_link, []},
@@ -199,7 +206,7 @@ init([]) ->
             {ok, {SupFlags,
                   [Code, Rpc, Global, InetDb | DistAC] ++
                   [NetSup, GlGroup, File, SigSrv,
-                   StdError, User, Config, SafeSup] ++ Timer}}
+                   StdError, User, Config, RefC, SafeSup] ++ Timer}}
     end;
 init(safe) ->
     SupFlags = #{strategy => one_for_one,
diff --git a/lib/kernel/src/kernel_refc.erl b/lib/kernel/src/kernel_refc.erl
new file mode 100644
index 0000000000..05076dc885
--- /dev/null
+++ b/lib/kernel/src/kernel_refc.erl
@@ -0,0 +1,139 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(kernel_refc).
+
+-behaviour(gen_server).
+
+%% External exports
+-export([start_link/0, scheduler_wall_time/1]).
+%% Internal exports
+-export([init/1, handle_info/2, terminate/2]).
+-export([handle_call/3, handle_cast/2, code_change/3]).
+
+%%%-----------------------------------------------------------------
+%%% This module implements a process that handles reference counters for
+%%% various erts or other kernel resources which needs reference counting.
+%%%
+%%% Should not be documented nor used directly by user applications.
+%%%-----------------------------------------------------------------
+start_link() ->
+    gen_server:start_link({local,kernel_refc}, kernel_refc, [], []).
+
+-spec scheduler_wall_time(boolean()) -> boolean().
+scheduler_wall_time(Bool) ->
+    gen_server:call(kernel_refc, {scheduler_wall_time, self(), Bool}, infinity).
+
+%%-----------------------------------------------------------------
+%% Callback functions from gen_server
+%%-----------------------------------------------------------------
+
+-spec init([]) -> {'ok', map()} | {'stop', term()}.
+
+init([]) ->
+    resource(scheduler_wall_time, false),
+    {ok, #{scheduler_wall_time=>#{}}}.
+
+-spec handle_call(term(), term(), State) -> {'reply', term(), State}.
+handle_call({What, Who, false}, _From, State) ->
+    {Reply, Cnt} = do_stop(What, maps:get(What, State), Who),
+    {reply, Reply, State#{What:=Cnt}};
+handle_call({What, Who, true}, _From, State) ->
+    {Reply, Cnt} = do_start(What, maps:get(What, State), Who),
+    {reply, Reply, State#{What:=Cnt}};
+handle_call(_, _From, State) ->
+    {reply, badarg, State}.
+
+-spec handle_cast(term(), State) -> {'noreply', State}.
+handle_cast(_, State) ->
+    {noreply, State}.
+
+-spec handle_info(term(), State) -> {'noreply', State}.
+handle_info({'DOWN', _Ref, process, Pid, _}, State) ->
+    Cleanup = fun(Resource, Cnts) ->
+                      cleanup(Resource, Cnts, Pid)
+              end,
+    {noreply, maps:map(Cleanup, State)};
+handle_info(_, State) ->
+    {noreply, State}.
+
+-spec terminate(term(), term()) -> 'ok'.
+terminate(_Reason, _State) ->
+    ok.
+
+-spec code_change(term(), State, term()) -> {'ok', State}.
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%-----------------------------------------------------------------
+%% Internal functions
+%%-----------------------------------------------------------------
+
+do_start(Resource, Cnt, Pid) ->
+    case maps:get(Pid, Cnt, undefined) of
+        undefined ->
+            Ref = erlang:monitor(process, Pid),
+            case any(Cnt) of
+                true ->
+                    {true, Cnt#{Pid=>{1, Ref}}};
+                false ->
+                    resource(Resource, true),
+                    {false, Cnt#{Pid=>{1, Ref}}}
+            end;
+        {N, Ref} ->
+            {true, Cnt#{Pid=>{N+1, Ref}}}
+    end.
+
+do_stop(Resource, Cnt0, Pid) ->
+    case maps:get(Pid, Cnt0, undefined) of
+        undefined ->
+            {any(Cnt0), Cnt0};
+        {1, Ref} ->
+            erlang:demonitor(Ref, [flush]),
+            Cnt = maps:remove(Pid, Cnt0),
+            case any(Cnt) of
+                true ->
+                    {true, Cnt};
+                false ->
+                    resource(Resource, false),
+                    {true, Cnt}
+            end;
+        {N, Ref} ->
+            {true, Cnt0#{Pid=>{N-1, Ref}}}
+    end.
+
+cleanup(Resource, Cnt0, Pid) ->
+    case maps:is_key(Pid, Cnt0) of
+        true ->
+            Cnt = maps:remove(Pid, Cnt0),
+            case any(Cnt) of
+                true ->
+                    Cnt;
+                false ->
+                    resource(Resource, false),
+                    Cnt
+            end;
+        false ->
+            Cnt0
+    end.
+
+any(Cnt) -> maps:size(Cnt) > 0.
+
+resource(scheduler_wall_time, Enable) ->
+    _ = erts_internal:scheduler_wall_time(Enable).
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index f36b4f1e6a..f38989d103 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -70,8 +70,8 @@
 	 protocol_childspecs/0,
 	 epmd_module/0]).
 
--export([connect/1, disconnect/1, hidden_connect/1, passive_cnct/1]).
--export([hidden_connect_node/1]). %% explicit connect
+-export([disconnect/1, passive_cnct/1]).
+-export([hidden_connect_node/1]).
 -export([set_net_ticktime/1, set_net_ticktime/2, get_net_ticktime/0]).
 
 -export([node_info/1, node_info/2, nodes_info/0,
@@ -122,6 +122,7 @@
 
 -record(connection, {
 		     node,          %% remote node name
+                     conn_id,       %% Connection identity
 		     state,         %% pending | up | up_pending
 		     owner,         %% owner pid
 	             pending_owner, %% possible new owner
@@ -247,14 +248,15 @@ ticktime_res(A)      when is_atom(A)             -> A.
 
 %% Called though BIF's
 
-connect(Node) ->               do_connect(Node, normal, false).
 %%% Long timeout if blocked (== barred), only affects nodes with
 %%% {dist_auto_connect, once} set.
-passive_cnct(Node) ->              do_connect(Node, normal, true).
-disconnect(Node) ->            request({disconnect, Node}).
+passive_cnct(Node) ->
+    case request({passive_cnct, Node}) of
+        ignored -> false;
+        Other -> Other
+    end.
 
-%% connect but not seen
-hidden_connect(Node) ->        do_connect(Node, hidden, false).
+disconnect(Node) ->            request({disconnect, Node}).
 
 %% Should this node publish itself on Node?
 publish_on_node(Node) when is_atom(Node) ->
@@ -272,67 +274,30 @@ connect_node(Node) when is_atom(Node) ->
 hidden_connect_node(Node) when is_atom(Node) ->
     request({connect, hidden, Node}).
 
-do_connect(Node, Type, WaitForBarred) -> %% Type = normal | hidden
-    case catch ets:lookup(sys_dist, Node) of
-	{'EXIT', _} ->
-	    ?connect_failure(Node,{table_missing, sys_dist}),
-	    false;
-	[#barred_connection{}] ->
-	    case WaitForBarred of
-		false ->
-		    false;
-		true ->
-		    Pid = spawn(?MODULE,passive_connect_monitor,[self(),Node]),
-		    receive
-			{Pid, true} ->
-			    %%io:format("Net Kernel: barred connection (~p) "
-			    %%          "connected from other end.~n",[Node]),
-			    true;
-			{Pid, false} ->
-			    ?connect_failure(Node,{barred_connection,
-						   ets:lookup(sys_dist, Node)}),
-			    %%io:format("Net Kernel: barred connection (~p) "
-			    %%      "- failure.~n",[Node]),
-			    false
-		    end
-	    end;
-	Else ->
-	    case application:get_env(kernel, dist_auto_connect) of
-		{ok, never} ->
-		    ?connect_failure(Node,{dist_auto_connect,never}),
-		    false;
-		% This might happen due to connection close
-		% not beeing propagated to user space yet.
-		% Save the day by just not connecting...
-		{ok, once} when Else =/= [],
-				(hd(Else))#connection.state =:= up ->
-		    ?connect_failure(Node,{barred_connection,
-				ets:lookup(sys_dist, Node)}),
-		    false;
-		_ ->
-		    request({connect, Type, Node})
-	    end
-    end.
 
-passive_connect_monitor(Parent, Node) ->
+passive_connect_monitor(From, Node) ->
     ok = monitor_nodes(true,[{node_type,all}]),
-    case lists:member(Node,nodes([connected])) of
-	true ->
-	    ok = monitor_nodes(false,[{node_type,all}]),
-	    Parent ! {self(),true};
-	_ ->
-	    Ref = make_ref(),
-	    Tref = erlang:send_after(connecttime(),self(),Ref),
-	    receive
-		Ref ->
-		    ok = monitor_nodes(false,[{node_type,all}]),
-		    Parent ! {self(), false};
-		{nodeup,Node,_} ->
-		    ok = monitor_nodes(false,[{node_type,all}]),
-		    _ = erlang:cancel_timer(Tref),
-		    Parent ! {self(),true}
-	    end
-    end.
+    Reply = case lists:member(Node,nodes([connected])) of
+                true ->
+                    io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]),
+                    true;
+                _ ->
+                    receive
+                        {nodeup,Node,_} ->
+                            io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]),
+                            true
+                    after connecttime() ->
+                            io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]),
+                            false
+                    end
+            end,
+    ok = monitor_nodes(false,[{node_type,all}]),
+    io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]),
+    {Pid, Tag} = From,
+    io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]),
+    erlang:send(Pid, {Tag, Reply}),
+    io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]).
+
 
 %% If the net_kernel isn't running we ignore all requests to the
 %% kernel, thus basically accepting them :-)
@@ -394,40 +359,135 @@ init({Name, LongOrShortNames, TickT, CleanHalt}) ->
     end.
 
 
+do_auto_connect(Type, Node, ConnId, WaitForBarred, From, State) ->
+    ConnLookup = ets:lookup(sys_dist, Node),
+
+    case ConnLookup of
+        [#barred_connection{}] ->
+            case WaitForBarred of
+                false ->
+                    {reply, false, State};
+                true ->
+                    spawn(?MODULE,passive_connect_monitor,[From,Node]),
+                    {noreply, State}
+            end;
+
+        [#connection{conn_id=ConnId, state = up}] ->
+            {reply, true, State};
+        [#connection{conn_id=ConnId, waiting=Waiting}=Conn] ->
+            case From of
+                noreply -> ok;
+                _ -> ets:insert(sys_dist, Conn#connection{waiting = [From|Waiting]})
+            end,
+            {noreply, State};
+
+        _ ->
+            case application:get_env(kernel, dist_auto_connect) of
+                {ok, never} ->
+                    ?connect_failure(Node,{dist_auto_connect,never}),
+                    {reply, false, State};
+
+                %% This might happen due to connection close
+                %% not beeing propagated to user space yet.
+                %% Save the day by just not connecting...
+                {ok, once} when ConnLookup =/= [],
+                                (hd(ConnLookup))#connection.state =:= up ->
+                    ?connect_failure(Node,{barred_connection,
+                                           ets:lookup(sys_dist, Node)}),
+                    {reply, false, State};
+                _ ->
+                    case setup(ConnLookup, Node,ConnId,Type,From,State) of
+                        {ok, SetupPid} ->
+                            Owners = [{SetupPid, Node} | State#state.conn_owners],
+                            {noreply,State#state{conn_owners=Owners}};
+                        _Error  ->
+                            ?connect_failure(Node, {setup_call, failed, _Error}),
+                            {reply, false, State}
+                    end
+            end
+    end.
+
+
+do_explicit_connect([#connection{conn_id = ConnId, state = up}], _, _, ConnId, _From, State) ->
+    {reply, true, State};
+do_explicit_connect([#connection{conn_id = ConnId}=Conn], _, _, ConnId, From, State)
+  when Conn#connection.state =:= pending;
+       Conn#connection.state =:= up_pending ->
+    Waiting = Conn#connection.waiting,
+    ets:insert(sys_dist, Conn#connection{waiting = [From|Waiting]}),    
+    {noreply, State};
+do_explicit_connect([#barred_connection{}], Type, Node, ConnId, From , State) ->
+    %% Barred connection only affects auto_connect, ignore it.
+    do_explicit_connect([], Type, Node, ConnId, From , State);
+do_explicit_connect(ConnLookup, Type, Node, ConnId, From , State) ->
+    case setup(ConnLookup, Node,ConnId,Type,From,State) of
+        {ok, SetupPid} ->
+            Owners = [{SetupPid, Node} | State#state.conn_owners],
+            {noreply,State#state{conn_owners=Owners}};
+        _Error ->
+            ?connect_failure(Node, {setup_call, failed, _Error}),
+            {reply, false, State}
+    end.
+
+-define(ERTS_DIST_CON_ID_MASK, 16#ffffff).  % also in external.h
+
+verify_new_conn_id([], {Nr,_DHandle})
+  when (Nr band (bnot ?ERTS_DIST_CON_ID_MASK)) =:= 0 ->
+    true;
+verify_new_conn_id([#connection{conn_id = {Old,_}}], {New,_})
+  when New =:= ((Old+1) band ?ERTS_DIST_CON_ID_MASK) ->
+    true;
+verify_new_conn_id(_, _) ->
+    false.
+                                                              
+
+
 %% ------------------------------------------------------------
 %% handle_call.
 %% ------------------------------------------------------------
 
 %%
-%% Set up a connection to Node.
-%% The response is delayed until the connection is up and
-%% running.
+%% Passive auto-connect to Node.
+%% The response is delayed until the connection is up and running.
 %%
-handle_call({connect, _, Node}, From, State) when Node =:= node() ->
+handle_call({passive_cnct, Node}, From, State) when Node =:= node() ->
+    async_reply({reply, true, State}, From);
+handle_call({passive_cnct, Node}, From, State) ->
+    verbose({passive_cnct, Node}, 1, State),
+    Type = normal,
+    WaitForBarred = true,
+    R = case (catch erts_internal:new_connection(Node)) of
+            {Nr,_DHandle}=ConnId when is_integer(Nr) ->
+                do_auto_connect(Type, Node, ConnId, WaitForBarred, From, State);
+
+            _Error ->
+                error_logger:error_msg("~n** Cannot get connection id for node ~w~n",
+                                       [Node]),
+                {reply, false, State}
+        end,
+
+    return_call(R, From);
+
+%%
+%% Explicit connect
+%% The response is delayed until the connection is up and running.
+%%
+handle_call({connect, _, Node, _, _}, From, State) when Node =:= node() ->
     async_reply({reply, true, State}, From);
 handle_call({connect, Type, Node}, From, State) ->
     verbose({connect, Type, Node}, 1, State),
-    case ets:lookup(sys_dist, Node) of
-	[Conn] when Conn#connection.state =:= up ->
-	    async_reply({reply, true, State}, From);
-	[Conn] when Conn#connection.state =:= pending ->
-	    Waiting = Conn#connection.waiting,
-	    ets:insert(sys_dist, Conn#connection{waiting = [From|Waiting]}),
-	    {noreply, State};
-	[Conn] when Conn#connection.state =:= up_pending ->
-	    Waiting = Conn#connection.waiting,
-	    ets:insert(sys_dist, Conn#connection{waiting = [From|Waiting]}),
-	    {noreply, State};
-	_ ->
-	    case setup(Node,Type,From,State) of
-		{ok, SetupPid} ->
-		    Owners = [{SetupPid, Node} | State#state.conn_owners],
-		    {noreply,State#state{conn_owners=Owners}};
-		_Error  ->
-		    ?connect_failure(Node, {setup_call, failed, _Error}),
-		    async_reply({reply, false, State}, From)
-	    end
-    end;
+    ConnLookup = ets:lookup(sys_dist, Node),
+    R = case (catch erts_internal:new_connection(Node)) of
+            {Nr,_DHandle}=ConnId when is_integer(Nr) ->
+                do_explicit_connect(ConnLookup, Type, Node, ConnId, From, State);
+                    
+            _Error ->
+                error_logger:error_msg("~n** Cannot get connection id for node ~w~n",
+                                       [Node]),
+                {reply, false, State}                    
+        end,
+    return_call(R, From);
+            
 
 %%
 %% Close the connection to Node.
@@ -634,6 +694,26 @@ terminate(_Reason, State) ->
 %% ------------------------------------------------------------
 
 %%
+%% Asynchronous auto connect request
+%%
+handle_info({auto_connect,Node, Nr, DHandle}, State) ->
+    verbose({auto_connect, Node, Nr, DHandle}, 1, State),
+    ConnId = {Nr, DHandle},
+    NewState =
+        case do_auto_connect(normal, Node, ConnId, false, noreply, State) of
+            {noreply, S} ->           %% Pending connection
+                S;
+
+            {reply, true, S} ->  %% Already connected
+                S;
+
+            {reply, false, S} -> %% Connection refused
+                erts_internal:abort_connection(Node, ConnId),
+                S
+        end,
+    {noreply, NewState};
+
+%%
 %% accept a new connection.
 %%
 handle_info({accept,AcceptPid,Socket,Family,Proto}, State) ->
@@ -713,14 +793,23 @@ handle_info({AcceptPid, {accept_pending,MyNode,Node,Address,Type}}, State) ->
 	    AcceptPid ! {self(), {accept_pending, already_pending}},
 	    {noreply, State};
 	_ ->
-	    ets:insert(sys_dist, #connection{node = Node,
-					     state = pending,
-					     owner = AcceptPid,
-					     address = Address,
-					     type = Type}),
-	    AcceptPid ! {self(),{accept_pending,ok}},
-	    Owners = [{AcceptPid,Node} | State#state.conn_owners],
-	    {noreply, State#state{conn_owners = Owners}}
+            case (catch erts_internal:new_connection(Node)) of
+                {Nr,_DHandle}=ConnId when is_integer(Nr) ->
+                    ets:insert(sys_dist, #connection{node = Node,
+                                                     conn_id = ConnId,
+                                                     state = pending,
+                                                     owner = AcceptPid,
+                                                     address = Address,
+                                                     type = Type}),
+                    AcceptPid ! {self(),{accept_pending,ok}},
+                    Owners = [{AcceptPid,Node} | State#state.conn_owners],
+                    {noreply, State#state{conn_owners = Owners}};
+
+                _ ->
+                    error_logger:error_msg("~n** Cannot get connection id for node ~w~n",
+                                           [Node]),
+                    AcceptPid ! {self(),{accept_pending,nok_pending}}
+            end
     end;
 
 handle_info({SetupPid, {is_pending, Node}}, State) ->
@@ -906,6 +995,7 @@ pending_nodedown(Conn, Node, Type, State) ->
     % Don't bar connections that have never been alive
     %mark_sys_dist_nodedown(Node),
     % - instead just delete the node:
+    erts_internal:abort_connection(Node, Conn#connection.conn_id),
     ets:delete(sys_dist, Node),
     reply_waiting(Node,Conn#connection.waiting, false),
     case Type of
@@ -920,7 +1010,9 @@ up_pending_nodedown(Conn, Node, _Reason, _Type, State) ->
     AcceptPid = Conn#connection.pending_owner,
     Owners = State#state.conn_owners,
     Pend = lists:keydelete(AcceptPid, 1, State#state.pend_owners),
+    erts_internal:abort_connection(Node, Conn#connection.conn_id),
     Conn1 = Conn#connection { owner = AcceptPid,
+                              conn_id = erts_internal:new_connection(Node),
 			      pending_owner = undefined,
 			      state = pending },
     ets:insert(sys_dist, Conn1),
@@ -928,15 +1020,16 @@ up_pending_nodedown(Conn, Node, _Reason, _Type, State) ->
     State#state{conn_owners = [{AcceptPid,Node}|Owners], pend_owners = Pend}.
 
 
-up_nodedown(_Conn, Node, _Reason, Type, State) ->
-    mark_sys_dist_nodedown(Node),
+up_nodedown(Conn, Node, _Reason, Type, State) ->
+    mark_sys_dist_nodedown(Conn, Node),
     case Type of
 	normal -> ?nodedown(Node, State);
 	_ -> ok
     end,
     State.
 
-mark_sys_dist_nodedown(Node) ->
+mark_sys_dist_nodedown(Conn, Node) ->
+    erts_internal:abort_connection(Node, Conn#connection.conn_id),
     case application:get_env(kernel, dist_auto_connect) of
 	{ok, once} ->
 	    ets:insert(sys_dist, #barred_connection{node = Node});
@@ -1179,15 +1272,8 @@ spawn_func(_,{From,Tag},M,F,A,Gleader) ->
 %% Set up connection to a new node.
 %% -----------------------------------------------------------
 
-setup(Node,Type,From,State) ->
-    Allowed = State#state.allowed,
-    case lists:member(Node, Allowed) of
-	false when Allowed =/= [] ->
-	    error_msg("** Connection attempt with "
-		      "disallowed node ~w ** ~n", [Node]),
-	    {error, bad_node};
-	_ ->
-	    case select_mod(Node, State#state.listen) of
+setup(ConnLookup, Node,ConnId,Type,From,State) ->
+    case setup_check(ConnLookup, Node, ConnId, State) of
 		{ok, L} ->
 		    Mod = L#listen.module,
 		    LAddr = L#listen.address,
@@ -1200,18 +1286,45 @@ setup(Node,Type,From,State) ->
 		    Addr = LAddr#net_address {
 					      address = undefined,
 					      host = undefined },
+                    Waiting = case From of
+                                  noreply -> [];
+                                  _ -> [From]
+                              end,
 		    ets:insert(sys_dist, #connection{node = Node,
+                                                     conn_id = ConnId,
 						     state = pending,
 						     owner = Pid,
-						     waiting = [From],
+						     waiting = Waiting,
 						     address = Addr,
 						     type = normal}),
 		    {ok, Pid};
 		Error ->
 		    Error
-	    end
     end.
 
+setup_check(ConnLookup, Node, ConnId, State) ->
+    Allowed = State#state.allowed,    
+    case lists:member(Node, Allowed) of
+	false when Allowed =/= [] ->
+	    error_msg("** Connection attempt with "
+		      "disallowed node ~w ** ~n", [Node]),
+	    {error, bad_node};
+       _ ->
+            case verify_new_conn_id(ConnLookup, ConnId) of
+                false ->
+                    error_msg("** Connection attempt to ~w with "
+                              "bad connection id ~w ** ~n", [Node, ConnId]),
+                    {error, bad_conn_id};
+                true ->
+                    case select_mod(Node, State#state.listen) of
+                        {ok, _L}=OK -> OK;
+                        Error -> Error
+                    end
+            end
+    end.                    
+
+    
+
 %%
 %% Find a module that is willing to handle connection setup to Node
 %%
@@ -1652,6 +1765,11 @@ verbose(_, _, _) ->
 getnode(P) when is_pid(P) -> node(P);
 getnode(P) -> P.
 
+return_call({noreply, _State}=R, _From) ->
+    R;
+return_call(R, From) ->
+    async_reply(R, From).
+
 async_reply({reply, Msg, State}, From) ->
     async_gen_server_reply(From, Msg),
     {noreply, State}.
@@ -1659,16 +1777,16 @@ async_reply({reply, Msg, State}, From) ->
 async_gen_server_reply(From, Msg) ->
     {Pid, Tag} = From,
     M = {Tag, Msg},
-    case catch erlang:send(Pid, M, [nosuspend, noconnect]) of
+    try erlang:send(Pid, M, [nosuspend, noconnect]) of
         ok ->
             ok;
         nosuspend ->
             _ = spawn(fun() -> catch erlang:send(Pid, M, [noconnect]) end),
 	    ok;
         noconnect ->
-            ok; % The gen module takes care of this case.
-        {'EXIT', _} ->
-            ok
+            ok % The gen module takes care of this case.
+    catch
+        _:_ -> ok
     end.
 
 call_owner(Owner, Msg) ->
diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index b5f19d4b99..77c883f57f 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -21,18 +21,24 @@
 
 %% Provides a common operating system interface.
 
--export([type/0, version/0, cmd/1, find_executable/1, find_executable/2]).
+-export([type/0, version/0, cmd/1, cmd/2, find_executable/1, find_executable/2]).
 
 -include("file.hrl").
 
--export_type([env_var_name/0, env_var_value/0, env_var_name_value/0, command_input/0]).
+-export_type([env_var_name/0, env_var_value/0, env_var_name_value/0]).
+
+-export([getenv/0, getenv/1, getenv/2, putenv/2, unsetenv/1]).
 
 %%% BIFs
 
--export([getenv/0, getenv/1, getenv/2, getpid/0,
-         perf_counter/0, perf_counter/1,
-         putenv/2, set_signal/2, system_time/0, system_time/1,
-	 timestamp/0, unsetenv/1]).
+-export([get_env_var/1, getpid/0, list_env_vars/0, perf_counter/0,
+         perf_counter/1, set_env_var/2, set_signal/2, system_time/0,
+         system_time/1, timestamp/0, unset_env_var/1]).
+
+-type os_command() :: atom() | io_lib:chars().
+-type os_command_opts() :: #{ max_size => non_neg_integer() | infinity }.
+
+-export_type([os_command/0, os_command_opts/0]).
 
 -type env_var_name() :: nonempty_string().
 
@@ -40,31 +46,15 @@
 
 -type env_var_name_value() :: nonempty_string().
 
--type command_input() :: atom() | io_lib:chars().
-
--spec getenv() -> [env_var_name_value()].
-
-getenv() -> erlang:nif_error(undef).
-
--spec getenv(VarName) -> Value | false when
-      VarName :: env_var_name(),
-      Value :: env_var_value().
-
-getenv(_) ->
+-spec list_env_vars() -> [{env_var_name(), env_var_value()}].
+list_env_vars() ->
     erlang:nif_error(undef).
 
--spec getenv(VarName, DefaultValue) -> Value when
+-spec get_env_var(VarName) -> Value | false when
       VarName :: env_var_name(),
-      DefaultValue :: env_var_value(),
       Value :: env_var_value().
-
-getenv(VarName, DefaultValue) ->
-    case os:getenv(VarName) of
-        false ->
-           DefaultValue;
-        Value ->
-            Value
-    end.
+get_env_var(_VarName) ->
+    erlang:nif_error(undef).
 
 -spec getpid() -> Value when
       Value :: string().
@@ -84,11 +74,10 @@ perf_counter() ->
 perf_counter(Unit) ->
       erlang:convert_time_unit(os:perf_counter(), perf_counter, Unit).
 
--spec putenv(VarName, Value) -> true when
+-spec set_env_var(VarName, Value) -> true when
       VarName :: env_var_name(),
       Value :: env_var_value().
-
-putenv(_, _) ->
+set_env_var(_, _) ->
     erlang:nif_error(undef).
 
 -spec system_time() -> integer().
@@ -108,10 +97,9 @@ system_time(_Unit) ->
 timestamp() ->
     erlang:nif_error(undef).
 
--spec unsetenv(VarName) -> true when
+-spec unset_env_var(VarName) -> true when
       VarName :: env_var_name().
-
-unsetenv(_) ->
+unset_env_var(_) ->
     erlang:nif_error(undef).
 
 -spec set_signal(Signal, Option) -> 'ok' when
@@ -125,6 +113,39 @@ set_signal(_Signal, _Option) ->
 
 %%% End of BIFs
 
+-spec getenv() -> [env_var_name_value()].
+getenv() ->
+    [lists:flatten([Key, $=, Value]) || {Key, Value} <- os:list_env_vars() ].
+
+-spec getenv(VarName) -> Value | false when
+      VarName :: env_var_name(),
+      Value :: env_var_value().
+getenv(VarName) ->
+    os:get_env_var(VarName).
+
+-spec getenv(VarName, DefaultValue) -> Value when
+      VarName :: env_var_name(),
+      DefaultValue :: env_var_value(),
+      Value :: env_var_value().
+getenv(VarName, DefaultValue) ->
+    case os:getenv(VarName) of
+        false ->
+           DefaultValue;
+        Value ->
+            Value
+    end.
+
+-spec putenv(VarName, Value) -> true when
+      VarName :: env_var_name(),
+      Value :: env_var_value().
+putenv(VarName, Value) ->
+    os:set_env_var(VarName, Value).
+
+-spec unsetenv(VarName) -> true when
+      VarName :: env_var_name().
+unsetenv(VarName) ->
+    os:unset_env_var(VarName).
+
 -spec type() -> {Osfamily, Osname} when
       Osfamily :: unix | win32,
       Osname :: atom().
@@ -242,14 +263,20 @@ extensions() ->
 
 %% Executes the given command in the default shell for the operating system.
 -spec cmd(Command) -> string() when
-      Command :: os:command_input().
+      Command :: os_command().
 cmd(Cmd) ->
+    cmd(Cmd, #{ }).
+
+-spec cmd(Command, Options) -> string() when
+      Command :: os_command(),
+      Options :: os_command_opts().
+cmd(Cmd, Opts) ->
     {SpawnCmd, SpawnOpts, SpawnInput, Eot} = mk_cmd(os:type(), validate(Cmd)),
     Port = open_port({spawn, SpawnCmd}, [binary, stderr_to_stdout,
                                          stream, in, hide | SpawnOpts]),
     MonRef = erlang:monitor(port, Port),
     true = port_command(Port, SpawnInput),
-    Bytes = get_data(Port, MonRef, Eot, []),
+    Bytes = get_data(Port, MonRef, Eot, [], 0, maps:get(max_size, Opts, infinity)),
     demonitor(MonRef, [flush]),
     String = unicode:characters_to_list(Bytes),
     if  %% Convert to unicode list if possible otherwise return bytes
@@ -314,12 +341,13 @@ validate2([List|Rest]) when is_list(List) ->
     validate2(List),
     validate2(Rest).
 
-get_data(Port, MonRef, Eot, Sofar) ->
+get_data(Port, MonRef, Eot, Sofar, Size, Max) ->
     receive
 	{Port, {data, Bytes}} ->
-            case eot(Bytes, Eot) of
+            case eot(Bytes, Eot, Size, Max) of
                 more ->
-                    get_data(Port, MonRef, Eot, [Sofar,Bytes]);
+                    get_data(Port, MonRef, Eot, [Sofar, Bytes],
+                             Size + byte_size(Bytes), Max);
                 Last ->
                     catch port_close(Port),
                     flush_until_down(Port, MonRef),
@@ -330,13 +358,16 @@ get_data(Port, MonRef, Eot, Sofar) ->
 	    iolist_to_binary(Sofar)
     end.
 
-eot(_Bs, <<>>) ->
+eot(Bs, <<>>, Size, Max) when Size + byte_size(Bs) < Max ->
     more;
-eot(Bs, Eot) ->
+eot(Bs, <<>>, Size, Max) ->
+    binary:part(Bs, {0, Max - Size});
+eot(Bs, Eot, Size, Max) ->
     case binary:match(Bs, Eot) of
-        nomatch -> more;
-        {Pos, _} ->
-            binary:part(Bs,{0, Pos})
+        {Pos, _} when Size + Pos < Max ->
+            binary:part(Bs,{0, Pos});
+        _ ->
+            eot(Bs, <<>>, Size, Max)
     end.
 
 %% When port_close returns we know that all the
diff --git a/lib/kernel/src/raw_file_io.erl b/lib/kernel/src/raw_file_io.erl
new file mode 100644
index 0000000000..e3c07c8f78
--- /dev/null
+++ b/lib/kernel/src/raw_file_io.erl
@@ -0,0 +1,75 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(raw_file_io).
+
+-export([open/2]).
+
+open(Filename, Modes) ->
+    %% Layers are applied in this order, and the listed modules will call this
+    %% function again as necessary. eg. a raw compressed delayed file in list
+    %% mode will walk through [_list -> _compressed -> _delayed -> _raw].
+    ModuleOrder = [{raw_file_io_list, fun match_list/1},
+                   {raw_file_io_compressed, fun match_compressed/1},
+                   {raw_file_io_delayed, fun match_delayed/1},
+                   {raw_file_io_raw, fun match_raw/1}],
+    open_1(ModuleOrder, Filename, add_implicit_modes(Modes)).
+open_1([], _Filename, _Modes) ->
+    error(badarg);
+open_1([{Module, Match} | Rest], Filename, Modes) ->
+    case lists:any(Match, Modes) of
+        true ->
+            {Options, ChildModes} =
+                lists:partition(fun(Mode) -> Match(Mode) end, Modes),
+            Module:open_layer(Filename, ChildModes, Options);
+        false ->
+            open_1(Rest, Filename, Modes)
+    end.
+
+%% 'read' and 'list' mode are enabled unless disabled by another option, so
+%% we'll explicitly add them to avoid duplicating this logic in child layers.
+add_implicit_modes(Modes0) ->
+    Modes1 = add_unless_matched(Modes0, fun match_writable/1, read),
+    add_unless_matched(Modes1, fun match_binary/1, list).
+add_unless_matched(Modes, Match, Default) ->
+    case lists:any(Match, Modes) of
+        false -> [Default | Modes];
+        true -> Modes
+    end.
+
+match_list(list) -> true;
+match_list(_Other) -> false.
+
+match_compressed(compressed) -> true;
+match_compressed(_Other) -> false.
+
+match_delayed({delayed_write, _Size, _Timeout}) -> true;
+match_delayed(delayed_write) -> true;
+match_delayed(_Other) -> false.
+
+match_raw(raw) -> true;
+match_raw(_Other) -> false.
+
+match_writable(write) -> true;
+match_writable(append) -> true;
+match_writable(exclusive) -> true;
+match_writable(_Other) -> false.
+
+match_binary(binary) -> true;
+match_binary(_Other) -> false.
diff --git a/lib/kernel/src/raw_file_io_compressed.erl b/lib/kernel/src/raw_file_io_compressed.erl
new file mode 100644
index 0000000000..d5ab042d25
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_compressed.erl
@@ -0,0 +1,134 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(raw_file_io_compressed).
+
+-export([close/1, sync/1, datasync/1, truncate/1, advise/4, allocate/3,
+         position/2, write/2, pwrite/2, pwrite/3,
+         read_line/1, read/2, pread/2, pread/3]).
+
+%% OTP internal.
+-export([ipread_s32bu_p32bu/3, sendfile/8]).
+
+-export([open_layer/3]).
+
+-include("file_int.hrl").
+
+open_layer(Filename, Modes, Options) ->
+    IsAppend = lists:member(append, Modes),
+    IsDeflate = lists:member(write, Modes),
+    IsInflate = lists:member(read, Modes),
+    if
+        IsDeflate, IsInflate; IsAppend ->
+            {error, einval};
+        IsDeflate, not IsInflate ->
+            start_server_module(raw_file_io_deflate, Filename, Modes, Options);
+        IsInflate ->
+            start_server_module(raw_file_io_inflate, Filename, Modes, Options)
+    end.
+
+start_server_module(Module, Filename, Modes, Options) ->
+    Secret = make_ref(),
+    case gen_statem:start(Module, {self(), Secret, Options}, []) of
+        {ok, Pid} -> open_next_layer(Pid, Secret, Filename, Modes);
+        Other -> Other
+    end.
+
+open_next_layer(Pid, Secret, Filename, Modes) ->
+    case gen_statem:call(Pid, {'$open', Secret, Filename, Modes}, infinity) of
+        ok ->
+            PublicFd = #file_descriptor{
+                module = raw_file_io_compressed, data = {self(), Pid} },
+            {ok, PublicFd};
+        Other -> Other
+    end.
+
+close(Fd) ->
+    wrap_call(Fd, [close]).
+
+sync(Fd) ->
+    wrap_call(Fd, [sync]).
+datasync(Fd) ->
+    wrap_call(Fd, [datasync]).
+
+truncate(Fd) ->
+    wrap_call(Fd, [truncate]).
+
+advise(Fd, Offset, Length, Advise) ->
+    wrap_call(Fd, [advise, Offset, Length, Advise]).
+allocate(Fd, Offset, Length) ->
+    wrap_call(Fd, [allocate, Offset, Length]).
+
+position(Fd, Mark) ->
+    wrap_call(Fd, [position, Mark]).
+
+write(Fd, IOData) ->
+    try
+        CompactedData = erlang:iolist_to_iovec(IOData),
+        wrap_call(Fd, [write, CompactedData])
+    catch
+        error:badarg -> {error, badarg}
+    end.
+
+pwrite(Fd, Offset, IOData) ->
+    try
+        CompactedData = erlang:iolist_to_iovec(IOData),
+        wrap_call(Fd, [pwrite, Offset, CompactedData])
+    catch
+        error:badarg -> {error, badarg}
+    end.
+pwrite(Fd, LocBytes) ->
+    try
+        CompactedLocBytes =
+            [ {Offset, erlang:iolist_to_iovec(IOData)} ||
+              {Offset, IOData} <- LocBytes ],
+        wrap_call(Fd, [pwrite, CompactedLocBytes])
+    catch
+        error:badarg -> {error, badarg}
+    end.
+
+read_line(Fd) ->
+    wrap_call(Fd, [read_line]).
+read(Fd, Size) ->
+    wrap_call(Fd, [read, Size]).
+pread(Fd, Offset, Size) ->
+    wrap_call(Fd, [pread, Offset, Size]).
+pread(Fd, LocNums) ->
+    wrap_call(Fd, [pread, LocNums]).
+
+ipread_s32bu_p32bu(Fd, Offset, MaxSize) ->
+    wrap_call(Fd, [ipread_s32bu_p32bu, Offset, MaxSize]).
+
+sendfile(_,_,_,_,_,_,_,_) ->
+    {error, enotsup}.
+
+wrap_call(Fd, Command) ->
+    {_Owner, Pid} = get_fd_data(Fd),
+    try gen_statem:call(Pid, Command, infinity) of
+        Result -> Result
+    catch
+        exit:{noproc, _StackTrace} -> {error, einval}
+    end.
+
+get_fd_data(#file_descriptor{ data = Data }) ->
+    {Owner, _ServerPid} = Data,
+    case self() of
+        Owner -> Data;
+        _ -> error(not_on_controlling_process)
+    end.
diff --git a/lib/kernel/src/raw_file_io_deflate.erl b/lib/kernel/src/raw_file_io_deflate.erl
new file mode 100644
index 0000000000..acfc546743
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_deflate.erl
@@ -0,0 +1,159 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(raw_file_io_deflate).
+
+-behavior(gen_statem).
+
+-export([init/1, callback_mode/0, terminate/3]).
+-export([opening/3, opened/3]).
+
+-include("file_int.hrl").
+
+-define(GZIP_WBITS, 16 + 15).
+
+callback_mode() -> state_functions.
+
+init({Owner, Secret, [compressed]}) ->
+    Monitor = monitor(process, Owner),
+    Z = zlib:open(),
+    ok = zlib:deflateInit(Z, default, deflated, ?GZIP_WBITS, 8, default),
+    Data =
+        #{ owner => Owner,
+           monitor => Monitor,
+           secret => Secret,
+           position => 0,
+           zlib => Z },
+    {ok, opening, Data}.
+
+opening({call, From}, {'$open', Secret, Filename, Modes}, #{ secret := Secret } = Data) ->
+    case raw_file_io:open(Filename, Modes) of
+        {ok, PrivateFd} ->
+            NewData = Data#{ handle => PrivateFd },
+            {next_state, opened, NewData, [{reply, From, ok}]};
+        Other ->
+            {stop_and_reply, normal, [{reply, From, Other}]}
+    end;
+opening(_Event, _Contents, _Data) ->
+    {keep_state_and_data, [postpone]}.
+
+%%
+
+opened(info, {'DOWN', Monitor, process, _Owner, Reason}, #{ monitor := Monitor } = Data) ->
+    if
+        Reason =/= kill -> flush_deflate_state(Data);
+        Reason =:= kill -> ignored
+    end,
+    {stop, shutdown};
+
+opened(info, _Message, _Data) ->
+    keep_state_and_data;
+
+opened({call, {Owner, _Tag} = From}, [close], #{ owner := Owner } = Data) ->
+    #{ handle := PrivateFd } = Data,
+    Response =
+        case flush_deflate_state(Data) of
+            ok -> ?CALL_FD(PrivateFd, close, []);
+            Other -> Other
+        end,
+    {stop_and_reply, normal, [{reply, From, Response}]};
+
+opened({call, {Owner, _Tag} = From}, [position, Mark], #{ owner := Owner } = Data) ->
+    case position(Data, Mark) of
+        {ok, NewData, Result} ->
+            Response = {ok, Result},
+            {keep_state, NewData, [{reply, From, Response}]};
+        Other ->
+            {keep_state_and_data, [{reply, From, Other}]}
+    end;
+
+opened({call, {Owner, _Tag} = From}, [write, IOVec], #{ owner := Owner } = Data) ->
+    case write(Data, IOVec) of
+        {ok, NewData} -> {keep_state, NewData, [{reply, From, ok}]};
+        Other -> {keep_state_and_data, [{reply, From, Other}]}
+    end;
+
+opened({call, {Owner, _Tag} = From}, [read, _Size], #{ owner := Owner }) ->
+    Response = {error, ebadf},
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened({call, {Owner, _Tag} = From}, [read_line], #{ owner := Owner }) ->
+    Response = {error, ebadf},
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened({call, {Owner, _Tag} = From}, _Command, #{ owner := Owner }) ->
+    Response = {error, enotsup},
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened({call, _From}, _Command, _Data) ->
+    %% The client functions filter this out, so we'll crash if the user does
+    %% anything stupid on purpose.
+    {shutdown, protocol_violation};
+
+opened(_Event, _Request, _Data) ->
+    keep_state_and_data.
+
+write(Data, IOVec) ->
+    #{ handle := PrivateFd, position := Position, zlib := Z } = Data,
+    UncompressedSize = iolist_size(IOVec),
+    case ?CALL_FD(PrivateFd, write, [zlib:deflate(Z, IOVec)]) of
+        ok -> {ok, Data#{ position := (Position + UncompressedSize) }};
+        Other -> Other
+    end.
+
+%%
+%% We support "seeking" forward as long as it isn't relative to EOF.
+%%
+%% Seeking is a bit of a misnomer as it's really just compressing zeroes until
+%% we reach the desired point, but it has always behaved like this.
+%%
+
+position(Data, Mark) when is_atom(Mark) ->
+    position(Data, {Mark, 0});
+position(Data, Offset) when is_integer(Offset) ->
+    position(Data, {bof, Offset});
+position(Data, {bof, Offset}) when is_integer(Offset) ->
+    position_1(Data, Offset);
+position(Data, {cur, Offset}) when is_integer(Offset) ->
+    #{ position := Position } = Data,
+    position_1(Data, Position + Offset);
+position(_Data, {eof, Offset}) when is_integer(Offset) ->
+    {error, einval};
+position(_Data, _Any) ->
+    {error, badarg}.
+
+position_1(#{ position := Desired } = Data, Desired) ->
+    {ok, Data, Desired};
+position_1(#{ position := Current } = Data, Desired) when Current < Desired ->
+    BytesToWrite = min(Desired - Current, 4 bsl 20),
+    case write(Data, <<0:(BytesToWrite)/unit:8>>) of
+        {ok, NewData} -> position_1(NewData, Desired);
+        Other -> Other
+    end;
+position_1(#{ position := Current }, Desired) when Current > Desired ->
+    {error, einval}.
+
+flush_deflate_state(#{ handle := PrivateFd, zlib := Z }) ->
+    case ?CALL_FD(PrivateFd, write, [zlib:deflate(Z, [], finish)]) of
+        ok -> ok;
+        Other -> Other
+    end.
+
+terminate(_Reason, _State, _Data) ->
+    ok.
diff --git a/lib/kernel/src/raw_file_io_delayed.erl b/lib/kernel/src/raw_file_io_delayed.erl
new file mode 100644
index 0000000000..d2ad7550a1
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_delayed.erl
@@ -0,0 +1,320 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(raw_file_io_delayed).
+
+-behavior(gen_statem).
+
+-export([close/1, sync/1, datasync/1, truncate/1, advise/4, allocate/3,
+         position/2, write/2, pwrite/2, pwrite/3,
+         read_line/1, read/2, pread/2, pread/3]).
+
+%% OTP internal.
+-export([ipread_s32bu_p32bu/3, sendfile/8]).
+
+-export([open_layer/3]).
+
+-export([init/1, callback_mode/0, terminate/3]).
+-export([opening/3, opened/3]).
+
+-include("file_int.hrl").
+
+open_layer(Filename, Modes, Options) ->
+    Secret = make_ref(),
+    case gen_statem:start(?MODULE, {self(), Secret, Options}, []) of
+        {ok, Pid} ->
+            gen_statem:call(Pid, {'$open', Secret, Filename, Modes}, infinity);
+        Other ->
+            Other
+    end.
+
+callback_mode() -> state_functions.
+
+init({Owner, Secret, Options}) ->
+    Monitor = monitor(process, Owner),
+    Defaults =
+        #{ owner => Owner,
+           monitor => Monitor,
+           secret => Secret,
+           timer => none,
+           pid => self(),
+           buffer => prim_buffer:new(),
+           delay_size => 64 bsl 10,
+           delay_time => 2000 },
+    Data = fill_delay_values(Defaults, Options),
+    {ok, opening, Data}.
+
+fill_delay_values(Data, []) ->
+    Data;
+fill_delay_values(Data, [{delayed_write, Size, Time} | Options]) ->
+    fill_delay_values(Data#{ delay_size => Size, delay_time => Time }, Options);
+fill_delay_values(Data, [_ | Options]) ->
+    fill_delay_values(Data, Options).
+
+opening({call, From}, {'$open', Secret, Filename, Modes}, #{ secret := Secret } = Data) ->
+    case raw_file_io:open(Filename, Modes) of
+        {ok, PrivateFd} ->
+            PublicData = maps:with([owner, buffer, delay_size, pid], Data),
+            PublicFd = #file_descriptor{ module = ?MODULE, data = PublicData },
+
+            NewData = Data#{ handle => PrivateFd },
+            Response = {ok, PublicFd},
+            {next_state, opened, NewData, [{reply, From, Response}]};
+        Other ->
+            {stop_and_reply, normal, [{reply, From, Other}]}
+    end;
+opening(_Event, _Contents, _Data) ->
+    {keep_state_and_data, [postpone]}.
+
+%%
+
+opened(info, {'$timed_out', Secret}, #{ secret := Secret } = Data) ->
+    %% If the user writes something at this exact moment, the flush will fail
+    %% and the timer won't reset on the next write since the buffer won't be
+    %% empty (Unless we collided on a flush). We therefore reset the timeout to
+    %% ensure that data won't sit idle for extended periods of time.
+    case try_flush_write_buffer(Data) of
+        busy -> gen_statem:cast(self(), '$reset_timeout');
+        ok -> ok
+    end,
+    {keep_state, Data#{ timer => none }, []};
+
+opened(info, {'DOWN', Monitor, process, _Owner, Reason}, #{ monitor := Monitor } = Data) ->
+    if
+        Reason =/= kill -> try_flush_write_buffer(Data);
+        Reason =:= kill -> ignored
+    end,
+    {stop, shutdown};
+
+opened(info, _Message, _Data) ->
+    keep_state_and_data;
+
+opened({call, {Owner, _Tag} = From}, [close], #{ owner := Owner } = Data) ->
+    case flush_write_buffer(Data) of
+        ok ->
+            #{ handle := PrivateFd } = Data,
+            Response = ?CALL_FD(PrivateFd, close, []),
+            {stop_and_reply, normal, [{reply, From, Response}]};
+        Other ->
+            {stop_and_reply, normal, [{reply, From, Other}]}
+    end;
+
+opened({call, {Owner, _Tag} = From}, '$wait', #{ owner := Owner }) ->
+    %% Used in write/2 to synchronize writes on lock conflicts.
+    {keep_state_and_data, [{reply, From, ok}]};
+
+opened({call, {Owner, _Tag} = From}, '$synchronous_flush', #{ owner := Owner } = Data) ->
+    cancel_flush_timeout(Data),
+    Response = flush_write_buffer(Data),
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened({call, {Owner, _Tag} = From}, Command, #{ owner := Owner } = Data) ->
+    Response =
+        case flush_write_buffer(Data) of
+            ok -> dispatch_command(Data, Command);
+            Other -> Other
+        end,
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened({call, _From}, _Command, _Data) ->
+    %% The client functions filter this out, so we'll crash if the user does
+    %% anything stupid on purpose.
+    {shutdown, protocol_violation};
+
+opened(cast, '$reset_timeout', #{ delay_time := Timeout, secret := Secret } = Data) ->
+    cancel_flush_timeout(Data),
+    Timer = erlang:send_after(Timeout, self(), {'$timed_out', Secret}),
+    {keep_state, Data#{ timer => Timer }, []};
+
+opened(cast, _Message, _Data) ->
+    {keep_state_and_data, []}.
+
+dispatch_command(Data, [Function | Args]) ->
+    #{ handle := Handle } = Data,
+    Module = Handle#file_descriptor.module,
+    apply(Module, Function, [Handle | Args]).
+
+cancel_flush_timeout(#{ timer := none }) ->
+    ok;
+cancel_flush_timeout(#{ timer := Timer }) ->
+    _ = erlang:cancel_timer(Timer, [{async, true}]),
+    ok.
+
+try_flush_write_buffer(#{ buffer := Buffer, handle := PrivateFd }) ->
+    case prim_buffer:try_lock(Buffer) of
+        acquired ->
+            flush_write_buffer_1(Buffer, PrivateFd),
+            prim_buffer:unlock(Buffer),
+            ok;
+        busy ->
+            busy
+    end.
+
+%% This is only safe to use when there is no chance of conflict with the owner
+%% process, or in other words, "during synchronous calls outside of the locked
+%% section of write/2"
+flush_write_buffer(#{ buffer := Buffer, handle := PrivateFd }) ->
+    acquired = prim_buffer:try_lock(Buffer),
+    Result = flush_write_buffer_1(Buffer, PrivateFd),
+    prim_buffer:unlock(Buffer),
+    Result.
+
+flush_write_buffer_1(Buffer, PrivateFd) ->
+    case prim_buffer:size(Buffer) of
+        Size when Size > 0 ->
+            ?CALL_FD(PrivateFd, write, [prim_buffer:read_iovec(Buffer, Size)]);
+        0 ->
+            ok
+    end.
+
+terminate(_Reason, _State, _Data) ->
+    ok.
+
+%% Client functions
+
+write(Fd, IOData) ->
+    try
+        enqueue_write(Fd, erlang:iolist_to_iovec(IOData))
+    catch
+        error:badarg -> {error, badarg}
+    end.
+enqueue_write(_Fd, []) ->
+    ok;
+enqueue_write(Fd, IOVec) ->
+    %% get_fd_data will reject everyone except the process that opened the Fd,
+    %% so we can't race with anyone except the wrapper process.
+    #{ delay_size := DelaySize,
+       buffer := Buffer,
+       pid := Pid } = get_fd_data(Fd),
+    case prim_buffer:try_lock(Buffer) of
+        acquired ->
+            %% (The wrapper process will exit without flushing if we're killed
+            %% while holding the lock).
+            enqueue_write_locked(Pid, Buffer, DelaySize, IOVec);
+        busy ->
+            %% This can only happen while we're processing a timeout in the
+            %% wrapper process, so we perform a bogus call to get a completion
+            %% notification before trying again.
+            gen_statem:call(Pid, '$wait'),
+            enqueue_write(Fd, IOVec)
+    end.
+enqueue_write_locked(Pid, Buffer, DelaySize, IOVec) ->
+    %% The synchronous operations (write, forced flush) are safe since we're
+    %% running on the only process that can fill the buffer; a timeout being
+    %% processed just before $synchronous_flush will cause the flush to nop,
+    %% and a timeout sneaking in just before a synchronous write won't do
+    %% anything since the buffer is guaranteed to be empty at that point.
+    BufSize = prim_buffer:size(Buffer),
+    case is_iovec_smaller_than(IOVec, DelaySize - BufSize) of
+        true when BufSize > 0 ->
+            prim_buffer:write(Buffer, IOVec),
+            prim_buffer:unlock(Buffer);
+        true ->
+            prim_buffer:write(Buffer, IOVec),
+            prim_buffer:unlock(Buffer),
+            gen_statem:cast(Pid, '$reset_timeout');
+        false when BufSize > 0 ->
+            prim_buffer:write(Buffer, IOVec),
+            prim_buffer:unlock(Buffer),
+            gen_statem:call(Pid, '$synchronous_flush');
+        false ->
+            prim_buffer:unlock(Buffer),
+            gen_statem:call(Pid, [write, IOVec])
+    end.
+
+%% iolist_size/1 will always look through the entire list to get a precise
+%% amount, which is pretty inefficient since we only need to know whether we've
+%% hit the buffer threshold or not.
+%%
+%% We only handle the binary case since write/2 forcibly translates input to
+%% erlang:iovec().
+is_iovec_smaller_than(IOVec, Max) ->
+    is_iovec_smaller_than_1(IOVec, Max, 0).
+is_iovec_smaller_than_1(_IOVec, Max, Acc) when Acc >= Max ->
+    false;
+is_iovec_smaller_than_1([], _Max, _Acc) ->
+    true;
+is_iovec_smaller_than_1([Binary | Rest], Max, Acc) when is_binary(Binary) ->
+    is_iovec_smaller_than_1(Rest, Max, Acc + byte_size(Binary)).
+
+close(Fd) ->
+    wrap_call(Fd, [close]).
+
+sync(Fd) ->
+    wrap_call(Fd, [sync]).
+datasync(Fd) ->
+    wrap_call(Fd, [datasync]).
+
+truncate(Fd) ->
+    wrap_call(Fd, [truncate]).
+
+advise(Fd, Offset, Length, Advise) ->
+    wrap_call(Fd, [advise, Offset, Length, Advise]).
+allocate(Fd, Offset, Length) ->
+    wrap_call(Fd, [allocate, Offset, Length]).
+
+position(Fd, Mark) ->
+    wrap_call(Fd, [position, Mark]).
+
+pwrite(Fd, Offset, IOData) ->
+    try
+        CompactedData = erlang:iolist_to_iovec(IOData),
+        wrap_call(Fd, [pwrite, Offset, CompactedData])
+    catch
+        error:badarg -> {error, badarg}
+    end.
+pwrite(Fd, LocBytes) ->
+    try
+        CompactedLocBytes =
+            [ {Offset, erlang:iolist_to_iovec(IOData)} ||
+              {Offset, IOData} <- LocBytes ],
+        wrap_call(Fd, [pwrite, CompactedLocBytes])
+    catch
+        error:badarg -> {error, badarg}
+    end.
+
+read_line(Fd) ->
+    wrap_call(Fd, [read_line]).
+read(Fd, Size) ->
+    wrap_call(Fd, [read, Size]).
+pread(Fd, Offset, Size) ->
+    wrap_call(Fd, [pread, Offset, Size]).
+pread(Fd, LocNums) ->
+    wrap_call(Fd, [pread, LocNums]).
+
+ipread_s32bu_p32bu(Fd, Offset, MaxSize) ->
+    wrap_call(Fd, [ipread_s32bu_p32bu, Offset, MaxSize]).
+
+sendfile(_,_,_,_,_,_,_,_) ->
+    {error, enotsup}.
+
+wrap_call(Fd, Command) ->
+    #{ pid := Pid } = get_fd_data(Fd),
+    try gen_statem:call(Pid, Command, infinity) of
+        Result -> Result
+    catch
+        exit:{noproc, _StackTrace} -> {error, einval}
+    end.
+
+get_fd_data(#file_descriptor{ data = Data }) ->
+    #{ owner := Owner } = Data,
+    case self() of
+        Owner -> Data;
+        _ -> error(not_on_controlling_process)
+    end.
diff --git a/lib/kernel/src/raw_file_io_inflate.erl b/lib/kernel/src/raw_file_io_inflate.erl
new file mode 100644
index 0000000000..7e9780310c
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_inflate.erl
@@ -0,0 +1,261 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(raw_file_io_inflate).
+
+-behavior(gen_statem).
+
+-export([init/1, callback_mode/0, terminate/3]).
+-export([opening/3, opened_gzip/3, opened_passthrough/3]).
+
+-include("file_int.hrl").
+
+-define(INFLATE_CHUNK_SIZE, (1 bsl 10)).
+-define(GZIP_WBITS, (16 + 15)).
+
+callback_mode() -> state_functions.
+
+init({Owner, Secret, [compressed]}) ->
+    Monitor = monitor(process, Owner),
+    %% We're using the undocumented inflateInit/3 to open the stream in
+    %% 'reset mode', which resets the inflate state at the end of every stream,
+    %% allowing us to read concatenated gzip files.
+    Z = zlib:open(),
+    ok = zlib:inflateInit(Z, ?GZIP_WBITS, reset),
+    Data =
+        #{ owner => Owner,
+           monitor => Monitor,
+           secret => Secret,
+           position => 0,
+           buffer => prim_buffer:new(),
+           zlib => Z },
+    {ok, opening, Data}.
+
+%% The old driver fell back to plain reads if the file didn't start with the
+%% magic gzip bytes.
+choose_decompression_state(PrivateFd) ->
+    State =
+        case ?CALL_FD(PrivateFd, read, [2]) of
+            {ok, <<16#1F, 16#8B>>} -> opened_gzip;
+            _Other -> opened_passthrough
+        end,
+    {ok, 0} = ?CALL_FD(PrivateFd, position, [0]),
+    State.
+
+opening({call, From}, {'$open', Secret, Filename, Modes}, #{ secret := Secret } = Data) ->
+    case raw_file_io:open(Filename, Modes) of
+        {ok, PrivateFd} ->
+            NextState = choose_decompression_state(PrivateFd),
+            NewData = Data#{ handle => PrivateFd },
+            {next_state, NextState, NewData, [{reply, From, ok}]};
+        Other ->
+            {stop_and_reply, normal, [{reply, From, Other}]}
+    end;
+opening(_Event, _Contents, _Data) ->
+    {keep_state_and_data, [postpone]}.
+
+internal_close(From, Data) ->
+    #{ handle := PrivateFd } = Data,
+    Response = ?CALL_FD(PrivateFd, close, []),
+    {stop_and_reply, normal, [{reply, From, Response}]}.
+
+opened_passthrough(info, {'DOWN', Monitor, process, _Owner, _Reason}, #{ monitor := Monitor }) ->
+    {stop, shutdown};
+
+opened_passthrough(info, _Message, _Data) ->
+    keep_state_and_data;
+
+opened_passthrough({call, {Owner, _Tag} = From}, [close], #{ owner := Owner } = Data) ->
+    internal_close(From, Data);
+
+opened_passthrough({call, {Owner, _Tag} = From}, [Method | Args], #{ owner := Owner } = Data) ->
+    #{ handle := PrivateFd } = Data,
+    Response = ?CALL_FD(PrivateFd, Method, Args),
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened_passthrough({call, _From}, _Command, _Data) ->
+    %% The client functions filter this out, so we'll crash if the user does
+    %% anything stupid on purpose.
+    {shutdown, protocol_violation};
+
+opened_passthrough(_Event, _Request, _Data) ->
+    keep_state_and_data.
+
+%%
+
+opened_gzip(info, {'DOWN', Monitor, process, _Owner, _Reason}, #{ monitor := Monitor }) ->
+    {stop, shutdown};
+
+opened_gzip(info, _Message, _Data) ->
+    keep_state_and_data;
+
+opened_gzip({call, {Owner, _Tag} = From}, [close], #{ owner := Owner } = Data) ->
+    internal_close(From, Data);
+
+opened_gzip({call, {Owner, _Tag} = From}, [position, Mark], #{ owner := Owner } = Data) ->
+    case position(Data, Mark) of
+        {ok, NewData, Result} ->
+            Response = {ok, Result},
+            {keep_state, NewData, [{reply, From, Response}]};
+        Other ->
+            {keep_state_and_data, [{reply, From, Other}]}
+    end;
+
+opened_gzip({call, {Owner, _Tag} = From}, [read, Size], #{ owner := Owner } = Data) ->
+    case read(Data, Size) of
+        {ok, NewData, Result} ->
+            Response = {ok, Result},
+            {keep_state, NewData, [{reply, From, Response}]};
+        Other ->
+            {keep_state_and_data, [{reply, From, Other}]}
+    end;
+
+opened_gzip({call, {Owner, _Tag} = From}, [read_line], #{ owner := Owner } = Data) ->
+    case read_line(Data) of
+        {ok, NewData, Result} ->
+            Response = {ok, Result},
+            {keep_state, NewData, [{reply, From, Response}]};
+        Other ->
+            {keep_state_and_data, [{reply, From, Other}]}
+    end;
+
+opened_gzip({call, {Owner, _Tag} = From}, [write, _IOData], #{ owner := Owner }) ->
+    Response = {error, ebadf},
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened_gzip({call, {Owner, _Tag} = From}, _Request, #{ owner := Owner }) ->
+    Response = {error, enotsup},
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened_gzip({call, _From}, _Request, _Data) ->
+    %% The client functions filter this out, so we'll crash if the user does
+    %% anything stupid on purpose.
+    {shutdown, protocol_violation};
+
+opened_gzip(_Event, _Request, _Data) ->
+    keep_state_and_data.
+
+%%
+
+read(#{ buffer := Buffer } = Data, Size) ->
+    try read_1(Data, Buffer, prim_buffer:size(Buffer), Size) of
+        Result -> Result
+    catch
+        error:badarg -> {error, badarg};
+        error:_ -> {error, eio}
+    end.
+read_1(Data, Buffer, BufferSize, ReadSize) when BufferSize >= ReadSize ->
+    #{ position := Position } = Data,
+    Decompressed = prim_buffer:read(Buffer, ReadSize),
+    {ok, Data#{ position => (Position + ReadSize) }, Decompressed};
+read_1(Data, Buffer, BufferSize, ReadSize) when BufferSize < ReadSize ->
+    #{ handle := PrivateFd } = Data,
+    case ?CALL_FD(PrivateFd, read, [?INFLATE_CHUNK_SIZE]) of
+        {ok, Compressed} ->
+            #{ zlib := Z } = Data,
+            Uncompressed = erlang:iolist_to_iovec(zlib:inflate(Z, Compressed)),
+            prim_buffer:write(Buffer, Uncompressed),
+            read_1(Data, Buffer, prim_buffer:size(Buffer), ReadSize);
+        eof when BufferSize > 0 ->
+            read_1(Data, Buffer, BufferSize, BufferSize);
+        Other ->
+            Other
+    end.
+
+read_line(#{ buffer := Buffer } = Data) ->
+    try read_line_1(Data, Buffer, prim_buffer:find_byte_index(Buffer, $\n)) of
+        {ok, NewData, Decompressed} -> {ok, NewData, Decompressed};
+        Other -> Other
+    catch
+        error:badarg -> {error, badarg};
+        error:_ -> {error, eio}
+    end.
+
+read_line_1(Data, Buffer, not_found) ->
+    #{ handle := PrivateFd, zlib := Z } = Data,
+    case ?CALL_FD(PrivateFd, read, [?INFLATE_CHUNK_SIZE]) of
+        {ok, Compressed} ->
+            Uncompressed = erlang:iolist_to_iovec(zlib:inflate(Z, Compressed)),
+            prim_buffer:write(Buffer, Uncompressed),
+            read_line_1(Data, Buffer, prim_buffer:find_byte_index(Buffer, $\n));
+        eof ->
+            case prim_buffer:size(Buffer) of
+                Size when Size > 0 -> {ok, prim_buffer:read(Buffer, Size)};
+                Size when Size =:= 0 -> eof
+            end;
+        Error ->
+            Error
+    end;
+read_line_1(Data, Buffer, {ok, LFIndex}) ->
+    %% Translate CRLF into just LF, completely ignoring which encoding is used,
+    %% but treat the file position as including CR.
+    #{ position := Position } = Data,
+    NewData = Data#{ position => (Position + LFIndex + 1) },
+    CRIndex = (LFIndex - 1),
+    TranslatedLine =
+        case prim_buffer:read(Buffer, LFIndex + 1) of
+            <<Line:CRIndex/binary, "\r\n">> -> <<Line/binary, "\n">>;
+            Line -> Line
+        end,
+    {ok, NewData, TranslatedLine}.
+
+%%
+%% We support seeking in both directions as long as it isn't relative to EOF.
+%%
+%% Seeking backwards is extremely inefficient since we have to seek to the very
+%% beginning and then decompress up to the desired point.
+%%
+
+position(Data, Mark) when is_atom(Mark) ->
+    position(Data, {Mark, 0});
+position(Data, Offset) when is_integer(Offset) ->
+    position(Data, {bof, Offset});
+position(Data, {bof, Offset}) when is_integer(Offset) ->
+    position_1(Data, Offset);
+position(Data, {cur, Offset}) when is_integer(Offset) ->
+    #{ position := Position } = Data,
+    position_1(Data, Position + Offset);
+position(_Data, {eof, Offset}) when is_integer(Offset) ->
+    {error, einval};
+position(_Data, _Other) ->
+    {error, badarg}.
+
+position_1(_Data, Desired) when Desired < 0 ->
+    {error, einval};
+position_1(#{ position := Desired } = Data, Desired) ->
+    {ok, Data, Desired};
+position_1(#{ position := Current } = Data, Desired) when Current < Desired ->
+    case read(Data, min(Desired - Current, ?INFLATE_CHUNK_SIZE)) of
+        {ok, NewData, _Data} -> position_1(NewData, Desired);
+        eof -> {ok, Data, Current};
+        Other -> Other
+    end;
+position_1(#{ position := Current } = Data, Desired) when Current > Desired ->
+    #{ handle := PrivateFd, buffer := Buffer, zlib := Z } = Data,
+    case ?CALL_FD(PrivateFd, position, [bof]) of
+        {ok, 0} ->
+            ok = zlib:inflateReset(Z),
+            prim_buffer:wipe(Buffer),
+            position_1(Data#{ position => 0 }, Desired);
+        Other ->
+            Other
+    end.
+
+terminate(_Reason, _State, _Data) ->
+    ok.
diff --git a/lib/kernel/src/raw_file_io_list.erl b/lib/kernel/src/raw_file_io_list.erl
new file mode 100644
index 0000000000..2e16e63f0e
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_list.erl
@@ -0,0 +1,128 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(raw_file_io_list).
+
+-export([close/1, sync/1, datasync/1, truncate/1, advise/4, allocate/3,
+         position/2, write/2, pwrite/2, pwrite/3,
+         read_line/1, read/2, pread/2, pread/3]).
+
+%% OTP internal.
+-export([ipread_s32bu_p32bu/3, sendfile/8]).
+
+-export([open_layer/3]).
+
+-include("file_int.hrl").
+
+open_layer(Filename, Modes, [list]) ->
+    case raw_file_io:open(Filename, [binary | Modes]) of
+        {ok, PrivateFd} -> {ok, make_public_fd(PrivateFd, Modes)};
+        Other -> Other
+    end.
+
+%% We can skip wrapping the file if it's write-only since only read operations
+%% are affected by list mode. Since raw_file_io fills in all implicit options
+%% for us, all we need to do is check whether 'read' is among them.
+make_public_fd(PrivateFd, Modes) ->
+    case lists:member(read, Modes) of
+        true -> #file_descriptor{ module = ?MODULE, data = PrivateFd };
+        false -> PrivateFd
+    end.
+
+close(Fd) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, close, []).
+
+sync(Fd) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, sync, []).
+datasync(Fd) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, datasync, []).
+
+truncate(Fd) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, truncate, []).
+
+advise(Fd, Offset, Length, Advise) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, advise, [Offset, Length, Advise]).
+allocate(Fd, Offset, Length) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, allocate, [Offset, Length]).
+
+position(Fd, Mark) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, position, [Mark]).
+
+write(Fd, IOData) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, write, [IOData]).
+
+pwrite(Fd, Offset, IOData) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, pwrite, [Offset, IOData]).
+pwrite(Fd, LocBytes) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, pwrite, [LocBytes]).
+
+read_line(Fd) ->
+    PrivateFd = Fd#file_descriptor.data,
+    case ?CALL_FD(PrivateFd, read_line, []) of
+        {ok, Binary} -> {ok, binary_to_list(Binary)};
+        Other -> Other
+    end.
+read(Fd, Size) ->
+    PrivateFd = Fd#file_descriptor.data,
+    case ?CALL_FD(PrivateFd, read, [Size]) of
+        {ok, Binary} -> {ok, binary_to_list(Binary)};
+        Other -> Other
+    end.
+pread(Fd, Offset, Size) ->
+    PrivateFd = Fd#file_descriptor.data,
+    case ?CALL_FD(PrivateFd, pread, [Offset, Size]) of
+        {ok, Binary} -> {ok, binary_to_list(Binary)};
+        Other -> Other
+    end.
+pread(Fd, LocNums) ->
+    PrivateFd = Fd#file_descriptor.data,
+    case ?CALL_FD(PrivateFd, pread, [LocNums]) of
+        {ok, LocResults} ->
+            TranslatedResults =
+                [ case Result of
+                      Result when is_binary(Result) -> binary_to_list(Result);
+                      eof -> eof
+                  end || Result <- LocResults ],
+            {ok, TranslatedResults};
+        Other -> Other
+    end.
+
+ipread_s32bu_p32bu(Fd, Offset, MaxSize) ->
+    PrivateFd = Fd#file_descriptor.data,
+    case ?CALL_FD(PrivateFd, ipread_s32bu_p32bu, [Offset, MaxSize]) of
+        {ok, {Size, Pointer, Binary}} when is_binary(Binary) ->
+            {ok, {Size, Pointer, binary_to_list(Binary)}};
+        Other ->
+            Other
+    end.
+
+sendfile(Fd, Dest, Offset, Bytes, ChunkSize, Headers, Trailers, Flags) ->
+    Args = [Dest, Offset, Bytes, ChunkSize, Headers, Trailers, Flags],
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, sendfile, Args).
diff --git a/lib/kernel/src/raw_file_io_raw.erl b/lib/kernel/src/raw_file_io_raw.erl
new file mode 100644
index 0000000000..9a9fe78eb1
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_raw.erl
@@ -0,0 +1,25 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(raw_file_io_raw).
+
+-export([open_layer/3]).
+
+open_layer(Filename, Modes, [raw]) ->
+    prim_file:open(Filename, [raw | Modes]).
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index 0e0b7dffa3..d197de942f 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -418,10 +418,7 @@ abcast(Name, Mess) ->
 
 abcast([Node|Tail], Name, Mess) ->
     Dest = {Name,Node},
-    case catch erlang:send(Dest, Mess, [noconnect]) of
-	noconnect -> spawn(erlang, send, [Dest,Mess]), ok;
-	_ -> ok
-    end,
+    try erlang:send(Dest, Mess) catch error:_ -> ok end,
     abcast(Tail, Name, Mess);
 abcast([], _,_) -> abcast.
 
@@ -498,7 +495,7 @@ start_monitor(Node, Name) ->
       Module :: module(),
       Function :: atom(),
       Args :: [term()],
-      ResL :: [term()],
+      ResL :: [Res :: term() | {'badrpc', Reason :: term()}],
       BadNodes :: [node()].
 
 multicall(M, F, A) -> 
@@ -509,14 +506,14 @@ multicall(M, F, A) ->
                   Module :: module(),
                   Function :: atom(),
                   Args :: [term()],
-                  ResL :: [term()],
+                  ResL :: [Res :: term() | {'badrpc', Reason :: term()}],
                   BadNodes :: [node()];
                (Module, Function, Args, Timeout) -> {ResL, BadNodes} when
                   Module :: module(),
                   Function :: atom(),
                   Args :: [term()],
                   Timeout :: timeout(),
-                  ResL :: [term()],
+                  ResL :: [Res :: term() | {'badrpc', Reason :: term()}],
                   BadNodes :: [node()].
 
 multicall(Nodes, M, F, A) when is_list(Nodes) ->
@@ -531,7 +528,7 @@ multicall(M, F, A, Timeout) ->
       Function :: atom(),
       Args :: [term()],
       Timeout :: timeout(),
-      ResL :: [term()],
+      ResL :: [Res :: term() | {'badrpc', Reason :: term()}],
       BadNodes :: [node()].
 
 multicall(Nodes, M, F, A, infinity)
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 569753155f..902196def2 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -931,37 +931,34 @@ purge_stacktrace(Config) when is_list(Config) ->
     code:purge(code_b_test),
     try code_b_test:call(fun(b) -> ok end, a)
     catch
-	error:function_clause ->
+	error:function_clause:Stacktrace ->
 	    code:load_file(code_b_test),
-	    case erlang:get_stacktrace() of
+	    case Stacktrace of
 		      [{?MODULE,_,[a],_},
 		       {code_b_test,call,2,_},
 		       {?MODULE,purge_stacktrace,1,_}|_] ->
-			  false = code:purge(code_b_test),
-			  [] = erlang:get_stacktrace()
+			  false = code:purge(code_b_test)
 		  end
     end,
     try code_b_test:call(nofun, 2)
     catch
-	error:function_clause ->
+	error:function_clause:Stacktrace2 ->
 	    code:load_file(code_b_test),
-	    case erlang:get_stacktrace() of
+	    case Stacktrace2 of
 		      [{code_b_test,call,[nofun,2],_},
 		       {?MODULE,purge_stacktrace,1,_}|_] ->
-			  false = code:purge(code_b_test),
-			  [] = erlang:get_stacktrace()
+			  false = code:purge(code_b_test)
 		  end
     end,
     Args = [erlang,error,[badarg]],
     try code_b_test:call(erlang, error, [badarg,Args])
     catch
-	error:badarg ->
+	error:badarg:Stacktrace3 ->
 	    code:load_file(code_b_test),
-	    case erlang:get_stacktrace() of
+	    case Stacktrace3 of
 		      [{code_b_test,call,Args,_},
 		       {?MODULE,purge_stacktrace,1,_}|_] ->
-			  false = code:purge(code_b_test),
-			  [] = erlang:get_stacktrace()
+			  false = code:purge(code_b_test)
 		  end
     end,
     ok.
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index fe2fc778f2..0709a6e766 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -89,8 +89,6 @@
 	 dist_terminate/1, dist_accessible/1, dist_deadlock/1,
          dist_open2/1, other_groups/1,
 
-         evil/1,
-
          otp_6278/1, otp_10131/1]).
 
 -export([head_fun/1, hf/0, lserv/1, 
@@ -123,7 +121,7 @@
 	[halt_int, wrap_int, halt_ext, wrap_ext, read_mode, head,
 	 notif, new_idx_vsn, reopen, block, unblock, open, close,
 	 error, chunk, truncate, many_users, info, change_size,
-	 change_attribute, distribution, evil, otp_6278, otp_10131]).
+	 change_attribute, distribution, otp_6278, otp_10131]).
 
 %% These test cases should be skipped if the VxWorks card is 
 %% configured without NFS cache.
@@ -149,7 +147,7 @@ all() ->
      {group, open}, {group, close}, {group, error}, chunk,
      truncate, many_users, {group, info},
      {group, change_size}, change_attribute,
-     {group, distribution}, evil, otp_6278, otp_10131].
+     {group, distribution}, otp_6278, otp_10131].
 
 groups() -> 
     [{halt_int, [], [halt_int_inf, {group, halt_int_sz}]},
@@ -4676,119 +4674,6 @@ other_groups(Conf) when is_list(Conf) ->
 
     ok.
 
--define(MAX, ?MAX_FWRITE_CACHE). % as in disk_log_1.erl
-%% Evil cases such as closed file descriptor port.
-evil(Conf) when is_list(Conf) ->
-    Dir = ?privdir(Conf),
-    File = filename:join(Dir, "n.LOG"),
-    Log = n,
-
-    %% Not a very thorough test.
-
-    ok = setup_evil_filled_cache_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:log(Log, apa),
-    ok = disk_log:close(Log),
-
-    ok = setup_evil_filled_cache_halt(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:truncate(Log, apa),
-    ok = stop_evil(Log),
-
-    %% White box test. 
-    file:delete(File),
-    Ports0 = erlang:ports(),
-    {ok, Log} = disk_log:open([{name,Log},{file,File},{type,halt},
-                                     {size,?MAX+50},{format,external}]),
-    [Fd] = erlang:ports() -- Ports0,
-    {B,_} = x_mk_bytes(30),
-    ok = disk_log:blog(Log, <<0:(?MAX-1)/unit:8>>),
-    exit(Fd, kill),
-    {error, {file_error,_,einval}} = disk_log:blog_terms(Log, [B,B]),
-    ok= disk_log:close(Log),
-    file:delete(File),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:close(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:log(Log, apa),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_halt(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:log(Log, apa),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
-    {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:inc_wrap_file(Log),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:chunk(Log, start),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:truncate(Log),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:chunk_step(Log, start, 1),
-    ok = stop_evil(Log),
-
-    io:format("messages: ~p~n", [erlang:process_info(self(), messages)]),
-    del(File, 2),
-    file:delete(File),
-    ok.
-
-setup_evil_wrap(Log, Dir) ->
-    setup_evil(Log, [{type,wrap},{size,{100,2}}], Dir).
-
-setup_evil_halt(Log, Dir) ->
-    setup_evil(Log, [{type,halt},{size,10000}], Dir).
-
-setup_evil(Log, Args, Dir) ->
-    File = filename:join(Dir, lists:concat([Log, ".LOG"])),
-    file:delete(File),
-    del(File, 2),
-    ok = disk_log:start(),
-    Ports0 = erlang:ports(),
-    {ok, Log} = disk_log:open([{name,Log},{file,File} | Args]),
-    [Fd] = erlang:ports() -- Ports0,
-    exit(Fd, kill),
-    ok = disk_log:log_terms(n, [<<0:10/unit:8>>]),
-    timer:sleep(2500), % TIMEOUT in disk_log_1.erl is 2000
-    ok.
-
-stop_evil(Log) ->
-    {error, _} = disk_log:close(Log),
-    ok.
-
-setup_evil_filled_cache_wrap(Log, Dir) ->
-    setup_evil_filled_cache(Log, [{type,wrap},{size,{?MAX,2}}], Dir).
-
-setup_evil_filled_cache_halt(Log, Dir) ->
-    setup_evil_filled_cache(Log, [{type,halt},{size,infinity}], Dir).
-
-%% The cache is filled, and the file descriptor port gone.
-setup_evil_filled_cache(Log, Args, Dir) ->
-    File = filename:join(Dir, lists:concat([Log, ".LOG"])),
-    file:delete(File),
-    del(File, 2),
-    ok = disk_log:start(),
-    Ports0 = erlang:ports(),
-    {ok, Log} = disk_log:open([{name,Log},{file,File} | Args]),
-    [Fd] = erlang:ports() -- Ports0,
-    ok = disk_log:log_terms(n, [<<0:?MAX/unit:8>>]),
-    exit(Fd, kill),
-    ok.
-
 %% OTP-6278. open/1 creates no status or crash report.
 otp_6278(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index bbfaa9d147..f6791adf86 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -95,7 +95,11 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-
+init_per_testcase(TC, Config) when TC == hostnames;
+                                   TC == nodenames ->
+    file:make_dir("hostnames_nodedir"),
+    file:write_file("hostnames_nodedir/ignore_core_files",""),
+    Config;
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Config.
 
@@ -251,7 +255,7 @@ test_node(Name, Illigal) ->
         end,
     net_kernel:monitor_nodes(true),
     BinCommand = unicode:characters_to_binary(Command, utf8),
-    Prt = open_port({spawn, BinCommand}, [stream]),
+    Prt = open_port({spawn, BinCommand}, [stream,{cd,"hostnames_nodedir"}]),
     Node = list_to_atom(Name),
     receive
         {nodeup, Node} ->
@@ -459,9 +463,9 @@ run_remote_test([FuncStr, TestNodeStr | Args]) ->
 		1
 	end
     catch
-	C:E ->
+	C:E:S ->
 	    io:format("Node ~p got EXCEPTION ~p:~p\nat ~p\n",
-		      [node(), C, E, erlang:get_stacktrace()]),
+		      [node(), C, E, S]),
 	    2
     end,
     io:format("Node ~p doing halt(~p).\n",[node(), Status]),
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index 03aaee56b7..8256444bdc 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -61,10 +61,13 @@
 %% From R9 and forward extended references is compulsory
 %% From R10 and forward extended pids and ports are compulsory
 %% From R20 and forward UTF8 atoms are compulsory
+%% From R21 and forward NEW_FUN_TAGS is compulsory (no more tuple fallback {fun, ...})
 -define(COMPULSORY_DFLAGS, (?DFLAG_EXTENDED_REFERENCES bor
                             ?DFLAG_EXTENDED_PIDS_PORTS bor
-                            ?DFLAG_UTF8_ATOMS)).
+                            ?DFLAG_UTF8_ATOMS bor
+                            ?DFLAG_NEW_FUN_TAGS)).
 
+-define(PASS_THROUGH, $p).
 
 -define(shutdown(X), exit(X)).
 -define(int16(X), [((X) bsr 8) band 16#ff, (X) band 16#ff]).
@@ -674,15 +677,16 @@ build_rex_message(Cookie,OurName) ->
 %% Receive a distribution message    
 recv_message(Socket) ->
     case gen_tcp:recv(Socket, 0) of
+        {ok,[]} ->
+            recv_message(Socket);  %% a tick, ignore
 	{ok,Data} ->
 	    B0 = list_to_binary(Data),
-	    {_,B1} = erlang:split_binary(B0,1),
-	    Header = binary_to_term(B1),
-	    Siz = byte_size(term_to_binary(Header)),
-	    {_,B2} = erlang:split_binary(B1,Siz),
+	    <<?PASS_THROUGH, B1/binary>> = B0,
+	    {Header,Siz} = binary_to_term(B1,[used]),
+	    <<_:Siz/binary,B2/binary>> = B1,
 	    Message = case (catch binary_to_term(B2)) of
 			  {'EXIT', _} ->
-			      could_not_digest_message;
+			      {could_not_digest_message,B2};
 			  Other ->
 			      Other
 		      end,
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index b6417210b9..3502a4ad08 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -33,6 +33,7 @@
 	 primary_archive/1, virtual_dir_in_archive/1,
 	 get_modules/1]).
 
+-define(PRIM_FILE, prim_file).
 
 %%-----------------------------------------------------------------
 %% Test suite for erl_prim_loader. (Most code is run during system start/stop.)
@@ -461,7 +462,7 @@ primary_archive(Config) when is_list(Config) ->
     %% Set primary archive 
     ExpectedEbins = [Archive, DictDir ++ "/ebin", DummyDir ++ "/ebin"],
     io:format("ExpectedEbins: ~p\n", [ExpectedEbins]),
-    {ok, FileInfo} = prim_file:read_file_info(Archive),
+    {ok, FileInfo} = ?PRIM_FILE:read_file_info(Archive),
     {ok, Ebins} = rpc:call(Node, erl_prim_loader, set_primary_archive,
 			   [Archive, ArchiveBin, FileInfo,
 			    fun escript:parse_file/1]),
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 119e1f24bb..9a77454432 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -39,6 +39,8 @@
 -define(FILE_FIN_PER_TESTCASE(Config), Config).
 -endif.
 
+-define(PRIM_FILE, prim_file).
+
 -module(?FILE_SUITE).
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -97,6 +99,12 @@
 
 -export([unicode_mode/1]).
 
+-export([volume_relative_paths/1]).
+
+-export([tiny_writes/1, tiny_writes_delayed/1,
+         large_writes/1, large_writes_delayed/1,
+         tiny_reads/1, tiny_reads_ahead/1]).
+
 %% Debug exports
 -export([create_file_slow/2, create_file/2, create_bin/2]).
 -export([verify_file/2, verify_bin/3]).
@@ -107,6 +115,8 @@
 -export([disc_free/1, memsize/0]).
 
 -include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
 -include_lib("kernel/include/file.hrl").
 
 -define(THROW_ERROR(RES), throw({fail, ?LINE, RES})).
@@ -118,13 +128,13 @@ suite() ->
 
 all() -> 
     [unicode, altname, read_write_file, {group, dirs},
-     {group, files}, delete, rename, names, {group, errors},
-     {group, compression}, {group, links}, copy,
+     {group, files}, delete, rename, names, volume_relative_paths,
+     {group, errors}, {group, compression}, {group, links}, copy,
      delayed_write, read_ahead, segment_read, segment_write,
      ipread, pid2name, interleaved_read_write, otp_5814, otp_10852,
      large_file, large_write, read_line_1, read_line_2, read_line_3,
      read_line_4, standard_io, old_io_protocol,
-     unicode_mode
+     unicode_mode, {group, bench}
     ].
 
 groups() -> 
@@ -154,11 +164,19 @@ groups() ->
        write_compressed, compress_errors, catenated_gzips,
        compress_async_crash]},
      {links, [],
-      [make_link, read_link_info_for_non_link, symlinks]}].
+      [make_link, read_link_info_for_non_link, symlinks]},
+     {bench, [],
+      [tiny_writes, tiny_writes_delayed,
+       large_writes, large_writes_delayed,
+       tiny_reads, tiny_reads_ahead]}].
 
 init_per_group(_GroupName, Config) ->
     Config.
 
+end_per_group(bench, Config) ->
+    ScratchDir = proplists:get_value(priv_dir, Config),
+    file:delete(filename:join(ScratchDir, "benchmark_scratch_file")),
+    Config;
 end_per_group(_GroupName, Config) ->
     Config.
 
@@ -381,11 +399,11 @@ read_write_0(Str, {Func, ReadFun}, Options) ->
 	    io:format("~p:~p: ~p ERROR: ~ts vs~n             ~w~n  - ~p~n",
 		      [?MODULE, Line, Func, Str, ReadBytes, Options]),
 	    exit({error, ?LINE});
-	  error:What ->
+	  error:What:Stacktrace ->
 	    io:format("~p:??: ~p ERROR: ~p from~n  ~w~n  ~p~n",
 		      [?MODULE, Func, What, Str, Options]),
 
-	    io:format("\t~p~n", [erlang:get_stacktrace()]),
+	    io:format("\t~p~n", [Stacktrace]),
 	    exit({error, ?LINE})
     end.
 
@@ -473,7 +491,7 @@ um_check_unicode(_Utf8Bin, {ok, _ListOrBin}, _, _UTF8_) ->
 um_filename(Bin, Dir, Options) when is_binary(Bin) ->
     um_filename(binary_to_list(Bin), Dir, Options);
 um_filename(Str = [_|_], Dir, Options) ->
-    Name = hd(string:tokens(Str, ":")),
+    Name = hd(string:lexemes(Str, ":")),
     Enc = atom_to_list(proplists:get_value(encoding, Options, latin1)),
     File = case lists:member(binary, Options) of
 	       true ->
@@ -638,6 +656,10 @@ cur_dir_0(Config) when is_list(Config) ->
 	    {ok,NewDirFiles} = ?FILE_MODULE:list_dir("."),
 	    true = lists:member(UncommonName,NewDirFiles),
 
+	    %% Ensure that we get the same result with a trailing slash; the
+	    %% APIs used on Windows will choke on them if passed directly.
+	    {ok,NewDirFiles} = ?FILE_MODULE:list_dir("./"),
+
 	    %% Delete the directory and return to the old current directory
 	    %% and check that the created file isn't there (too!)
 	    expect({error, einval}, {error, eacces}, 
@@ -690,10 +712,15 @@ win_cur_dir_1(_Config) ->
     %% Get the drive letter from the current directory,
     %% and try to get current directory for that drive.
 
-    [Drive,$:|_] = BaseDir,
-    {ok,BaseDir} = ?FILE_MODULE:get_cwd([Drive,$:]),
+    [CurDrive,$:|_] = BaseDir,
+    {ok,BaseDir} = ?FILE_MODULE:get_cwd([CurDrive,$:]),
     io:format("BaseDir = ~s\n", [BaseDir]),
 
+    %% We should error out on non-existent drives. Any reasonable system will
+    %% have at least one.
+    CurDirs = [?FILE_MODULE:get_cwd([Drive,$:]) || Drive <- lists:seq($A, $Z)],
+    lists:member({error,eaccess}, CurDirs),
+
     %% Unfortunately, there is no way to move away from the
     %% current drive as we can't use the "subst" command from
     %% a SSH connection. We can't test any more.
@@ -831,7 +858,7 @@ no_untranslatable_names() ->
     end.
 
 start_node(Name, Args) ->
-    [_,Host] = string:tokens(atom_to_list(node()), "@"),
+    [_,Host] = string:lexemes(atom_to_list(node()), "@"),
     ct:log("Trying to start ~w@~s~n", [Name,Host]),
     case test_server:start_node(Name, peer, [{args,Args}]) of
 	{error,Reason} ->
@@ -1019,6 +1046,23 @@ close(Config) when is_list(Config) ->
     Val = ?FILE_MODULE:close(Fd1),
     io:format("Second close gave: ~p",[Val]),
 
+    %% All operations on a closed raw file should EINVAL, even if they're not
+    %% supported on the current platform.
+    {ok,Fd2} = ?FILE_MODULE:open(Name, [read, write, raw]),
+    ok = ?FILE_MODULE:close(Fd2),
+
+    {error, einval} = ?FILE_MODULE:advise(Fd2, 5, 5, normal),
+    {error, einval} = ?FILE_MODULE:allocate(Fd2, 5, 5),
+    {error, einval} = ?FILE_MODULE:close(Fd2),
+    {error, einval} = ?FILE_MODULE:datasync(Fd2),
+    {error, einval} = ?FILE_MODULE:position(Fd2, 5),
+    {error, einval} = ?FILE_MODULE:pread(Fd2, 5, 1),
+    {error, einval} = ?FILE_MODULE:pwrite(Fd2, 5, "einval please"),
+    {error, einval} = ?FILE_MODULE:read(Fd2, 1),
+    {error, einval} = ?FILE_MODULE:sync(Fd2),
+    {error, einval} = ?FILE_MODULE:truncate(Fd2),
+    {error, einval} = ?FILE_MODULE:write(Fd2, "einval please"),
+
     [] = flush(),
     ok.
 
@@ -1132,8 +1176,8 @@ pread_write_test(File, Data) ->
 	   end,
     I = Size + 17,
     ok = ?FILE_MODULE:pwrite(File, 0, Data),
-    Res = ?FILE_MODULE:pread(File, 0, I),
-    {ok, Data} = Res,
+    {ok, Data} = ?FILE_MODULE:pread(File, 0, I),
+    {ok, [Data]} = ?FILE_MODULE:pread(File, [{0, I}]),
     eof = ?FILE_MODULE:pread(File, I, 1),
     ok = ?FILE_MODULE:pwrite(File, [{0, Data}, {I, Data}]),
     {ok, [Data, eof, Data]} =
@@ -2044,13 +2088,22 @@ names(Config) when is_list(Config) ->
     ok = ?FILE_MODULE:close(Fd2),
     {ok,Fd3} = ?FILE_MODULE:open(Name3,read),
     ok = ?FILE_MODULE:close(Fd3),
+
+    %% Now try the same on raw files.
+    {ok,Fd4} = ?FILE_MODULE:open(Name2, [read, raw]),
+    ok = ?FILE_MODULE:close(Fd4),
+    {ok,Fd4f} = ?FILE_MODULE:open(lists:flatten(Name2), [read, raw]),
+    ok = ?FILE_MODULE:close(Fd4f),
+    {ok,Fd5} = ?FILE_MODULE:open(Name3, [read, raw]),
+    ok = ?FILE_MODULE:close(Fd5),
+
     case length(Name1) > 255 of
 	true ->
 	    io:format("Path too long for an atom:\n\n~p\n", [Name1]);
 	false ->
 	    Name4 = list_to_atom(Name1),
-	    {ok,Fd4} = ?FILE_MODULE:open(Name4,read),
-	    ok = ?FILE_MODULE:close(Fd4)
+	    {ok,Fd6} = ?FILE_MODULE:open(Name4,read),
+	    ok = ?FILE_MODULE:close(Fd6)
     end,
 
     %% Try some path names
@@ -2074,6 +2127,22 @@ names(Config) when is_list(Config) ->
     [] = flush(),
     ok.
 
+volume_relative_paths(Config) when is_list(Config) ->
+    case os:type() of
+        {win32, _} ->
+            {ok, [Drive, $: | _]} = file:get_cwd(),
+            %% Relative to current device root.
+            {ok, RootInfo} = file:read_file_info([Drive, $:, $/]),
+            {ok, RootInfo} = file:read_file_info("/"),
+            %% Relative to current device directory.
+            {ok, DirContents} = file:list_dir([Drive, $:]),
+            {ok, DirContents} = file:list_dir("."),
+            [] = flush(),
+            ok;
+        _ ->
+            {skip, "This test is Windows-specific."}
+    end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
@@ -2641,8 +2710,8 @@ altname(Config) when is_list(Config) ->
 		{skipped, "Altname not supported on this platform"};
 	    {ok, "LONGAL~1"} -> 
 		{ok, "A_FILE~1"} = ?FILE_MODULE:altname(Name),
-		{ok, "C:/"} = ?FILE_MODULE:altname("C:/"),
-		{ok, "C:\\"} = ?FILE_MODULE:altname("C:\\"),
+		{ok, "c:/"} = ?FILE_MODULE:altname("C:/"),
+		{ok, "c:/"} = ?FILE_MODULE:altname("C:\\"),
 		{error,enoent} = ?FILE_MODULE:altname(NonexName),
 		{ok, "short"} = ?FILE_MODULE:altname(ShortName),
 		ok
@@ -2923,20 +2992,22 @@ delayed_write(Config) when is_list(Config) ->
     %%
     %% Test caching and normal close of non-raw file
     {ok, Fd1} = 
-	?FILE_MODULE:open(File, [write, {delayed_write, Size+1, 2000}]),
+	?FILE_MODULE:open(File, [write, {delayed_write, Size+1, 400}]),
     ok = ?FILE_MODULE:write(Fd1, Data1),
-    timer:sleep(1000), % Just in case the file system is slow
+    %% Wait for a reasonable amount of time to check whether the write was
+    %% practically instantaneous or actually delayed.
+    timer:sleep(100),
     {ok, Fd2} = ?FILE_MODULE:open(File, [read]),
     eof = ?FILE_MODULE:read(Fd2, 1),
     ok = ?FILE_MODULE:write(Fd1, Data1), % Data flush on size
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100),
     {ok, Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 2*Size+1),
     ok = ?FILE_MODULE:write(Fd1, Data1),
-    timer:sleep(3000), % Wait until data flush on timeout
+    timer:sleep(500), % Wait until data flush on timeout
     {ok, Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 3*Size+1),
     ok = ?FILE_MODULE:write(Fd1, Data1),
     ok = ?FILE_MODULE:close(Fd1), % Data flush on close
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100),
     {ok, Data1Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 4*Size+1),
     ok = ?FILE_MODULE:close(Fd2),
     %%
@@ -2970,7 +3041,7 @@ delayed_write(Config) when is_list(Config) ->
         {'DOWN', Mref1, _, _, _} = Down1a ->
             ct:fail(Down1a)
     end,
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100), % Just in case the file system is slow
     {ok, Fd3} = ?FILE_MODULE:open(File, [read]),
     eof = ?FILE_MODULE:read(Fd3, 1),
     Child1 ! {Parent, continue, normal},
@@ -2980,7 +3051,7 @@ delayed_write(Config) when is_list(Config) ->
         {'DOWN', Mref1, _, _, _} = Down1b ->
             ct:fail(Down1b)
     end,
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100), % Just in case the file system is slow
     {ok, Data1} = ?FILE_MODULE:pread(Fd3, bof, Size+1),
     ok = ?FILE_MODULE:close(Fd3),
     %%
@@ -2993,7 +3064,7 @@ delayed_write(Config) when is_list(Config) ->
         {'DOWN', Mref2, _, _, _} = Down2a ->
             ct:fail(Down2a)
     end,
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100), % Just in case the file system is slow
     {ok, Fd4} = ?FILE_MODULE:open(File, [read]),
     eof = ?FILE_MODULE:read(Fd4, 1),
     Child2 ! {Parent, continue, kill},
@@ -3003,7 +3074,7 @@ delayed_write(Config) when is_list(Config) ->
         {'DOWN', Mref2, _, _, _} = Down2b ->
             ct:fail(Down2b)
     end,
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100), % Just in case the file system is slow
     eof = ?FILE_MODULE:pread(Fd4, bof, 1),
     ok  = ?FILE_MODULE:close(Fd4),
     %%
@@ -3095,6 +3166,16 @@ read_ahead(Config) when is_list(Config) ->
     Data1Data2Data3 = Data1++Data2++Data3,
     {ok, Data1Data2Data3} = ?FILE_MODULE:read(Fd5, 3*Size+1),
     ok = ?FILE_MODULE:close(Fd5),
+
+    %% Ensure that a read that draws from both the buffer and the file won't
+    %% return anything wonky.
+    SplitData = << <<(I rem 256)>> || I <- lists:seq(1, 1024) >>,
+    file:write_file(File, SplitData),
+    {ok, Fd6} = ?FILE_MODULE:open(File, [raw, read, binary, {read_ahead, 256}]),
+    {ok, <<1>>} = file:read(Fd6, 1),
+    <<1, Shifted:512/binary, _Rest/binary>> = SplitData,
+    {ok, Shifted} = file:read(Fd6, 512),
+
     %%
     [] = flush(),
     ok.
@@ -3699,6 +3780,83 @@ do_large_write(Name) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%% Benchmarks
+%%
+%% Note that we only measure the time it takes to run the isolated file
+%% operations and that the actual test runtime can differ significantly,
+%% especially on the write side as the files need to be truncated before
+%% writing.
+
+large_writes(Config) when is_list(Config) ->
+    Modes = [raw, binary],
+    OpCount = 4096,
+    Data = <<0:(64 bsl 10)/unit:8>>,
+    run_write_benchmark(Config, Modes, OpCount, Data).
+
+large_writes_delayed(Config) when is_list(Config) ->
+    %% Each write is exactly as large as the delay buffer, causing the writes
+    %% to pass through each time, giving us a decent idea of how much overhead
+    %% delayed_write adds.
+    Modes = [raw, binary, {delayed_write, 64 bsl 10, 2000}],
+    OpCount = 4096,
+    Data = <<0:(64 bsl 10)/unit:8>>,
+    run_write_benchmark(Config, Modes, OpCount, Data).
+
+tiny_writes(Config) when is_list(Config) ->
+    Modes = [raw, binary],
+    OpCount = 512 bsl 10,
+    Data = <<0>>,
+    run_write_benchmark(Config, Modes, OpCount, Data).
+
+tiny_writes_delayed(Config) when is_list(Config) ->
+    Modes = [raw, binary, {delayed_write, 512 bsl 10, 2000}],
+    OpCount = 512 bsl 10,
+    Data = <<0>>,
+    run_write_benchmark(Config, Modes, OpCount, Data).
+
+%% The read benchmarks assume that "benchmark_scratch_file" has been filled by
+%% the write benchmarks.
+
+tiny_reads(Config) when is_list(Config) ->
+    Modes = [raw, binary],
+    OpCount = 512 bsl 10,
+    run_read_benchmark(Config, Modes, OpCount, 1).
+
+tiny_reads_ahead(Config) when is_list(Config) ->
+    Modes = [raw, binary, {read_ahead, 512 bsl 10}],
+    OpCount = 512 bsl 10,
+    run_read_benchmark(Config, Modes, OpCount, 1).
+
+run_write_benchmark(Config, Modes, OpCount, Data) ->
+    run_benchmark(Config, [write | Modes], OpCount, fun file:write/2, Data).
+
+run_read_benchmark(Config, Modes, OpCount, OpSize) ->
+    run_benchmark(Config, [read | Modes], OpCount, fun file:read/2, OpSize).
+
+run_benchmark(Config, Modes, OpCount, Fun, Arg) ->
+    ScratchDir = proplists:get_value(priv_dir, Config),
+    Path = filename:join(ScratchDir, "benchmark_scratch_file"),
+    {ok, Fd} = file:open(Path, Modes),
+    submit_throughput_results(Fun, [Fd, Arg], OpCount).
+
+submit_throughput_results(Fun, Args, Times) ->
+    MSecs = measure_repeated_file_op(Fun, Args, Times, millisecond),
+    IOPS = trunc(Times * (1000 / MSecs)),
+    ct_event:notify(#event{ name = benchmark_data, data = [{value,IOPS}] }),
+    {comment, io_lib:format("~p IOPS, ~p ms", [IOPS, trunc(MSecs)])}.
+
+measure_repeated_file_op(Fun, Args, Times, Unit) ->
+    Start = os:perf_counter(Unit),
+    repeated_apply(Fun, Args, Times),
+    os:perf_counter(Unit) - Start.
+
+repeated_apply(_F, _Args, Times) when Times =< 0 ->
+    ok;
+repeated_apply(F, Args, Times) ->
+    erlang:apply(F, Args),
+    repeated_apply(F, Args, Times - 1).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 response_analysis(Module, Function, Arguments) ->
@@ -3934,7 +4092,7 @@ read_line_create_files(TestData) ->
 read_line_remove_files(TestData) ->
     [ file:delete(File) || {_Function,File,_,_} <- TestData ].
 
-%% read_line with prim_file.
+%% read_line with ?PRIM_FILE.
 read_line_1(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     All = read_line_testdata(PrivDir),
@@ -4103,9 +4261,9 @@ read_line_create7(Filename) ->
     file:close(F).
 
 read_line_all(Filename) ->
-    {ok,F} = prim_file:open(Filename,[read,binary]),
+    {ok,F} = ?PRIM_FILE:open(Filename,[read,binary]),
     X=read_rl_lines(F),
-    prim_file:close(F),
+    ?PRIM_FILE:close(F),
     Bin = list_to_binary([B || {ok,B} <- X]),
     Bin = re:replace(list_to_binary([element(2,file:read_file(Filename))]),
 		     "\r\n","\n",[global,{return,binary}]),
@@ -4138,7 +4296,7 @@ read_line_all4(Filename) ->
     {length(X),Bin}.
 
 read_rl_lines(F) ->
-    case prim_file:read_line(F) of
+    case ?PRIM_FILE:read_line(F) of
 	eof ->
 	    [];
 	{error,X} ->
@@ -4158,9 +4316,9 @@ read_rl_lines2(F) ->
     end.
 
 read_line_all_alternating(Filename) ->
-    {ok,F} = prim_file:open(Filename,[read,binary]),
+    {ok,F} = ?PRIM_FILE:open(Filename,[read,binary]),
     X=read_rl_lines(F,true),
-    prim_file:close(F),
+    ?PRIM_FILE:close(F),
     Bin = list_to_binary([B || {ok,B} <- X]),
     Bin = re:replace(list_to_binary([element(2,file:read_file(Filename))]),
 		     "\r\n","\n",[global,{return,binary}]),
@@ -4194,8 +4352,8 @@ read_line_all_alternating4(Filename) ->
 read_rl_lines(F,Alternate) ->
     case begin
 	     case Alternate of
-		 true -> prim_file:read(F,1);
-		 false -> prim_file:read_line(F)
+		 true -> ?PRIM_FILE:read(F,1);
+		 false -> ?PRIM_FILE:read_line(F)
 	     end 
 	 end of
 	eof ->
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index f23529fec9..3afc647081 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -77,6 +77,7 @@
 	 init_per_testcase/2, end_per_testcase/2]).
 -export([normal/1,icky/1,very_icky/1,normalize/1,home_dir/1]).
 
+-define(PRIM_FILE, prim_file).
 
 init_per_testcase(_Func, Config) ->
     Config.
@@ -131,7 +132,7 @@ home_dir(Config) when is_list(Config) ->
 					     os:putenv("HOME",NewHome),
 					     {"HOME",Save};
 					 _ ->
-					     rm_rf(prim_file,NewHome),
+					     rm_rf(?PRIM_FILE,NewHome),
 					     throw(unsupported_os)
 				     end,
 	try
@@ -145,7 +146,7 @@ home_dir(Config) when is_list(Config) ->
 		_ ->
 		    os:putenv(SaveOldName,SaveOldValue)
 	    end,
-	    rm_rf(prim_file,NewHome)
+	    rm_rf(?PRIM_FILE,NewHome)
 	end
     catch
 	throw:need_unicode_mode ->
@@ -190,7 +191,7 @@ normal(Config) when is_list(Config) ->
     try
 	Priv = proplists:get_value(priv_dir, Config),
 	file:set_cwd(Priv),
-	ok = check_normal(prim_file),
+	ok = check_normal(?PRIM_FILE),
 	ok = check_normal(file),
 	%% If all is good, delete dir again (avoid hanging dir on windows)
 	rm_rf(file,"normal_dir"),
@@ -210,7 +211,7 @@ icky(Config) when is_list(Config) ->
 	    try
 		Priv = proplists:get_value(priv_dir, Config),
 		file:set_cwd(Priv),
-		ok = check_icky(prim_file),
+		ok = check_icky(?PRIM_FILE),
 		ok = check_icky(file),
 		%% If all is good, delete dir again (avoid hanging dir on windows)
 		rm_rf(file,"icky_dir"),
@@ -229,7 +230,7 @@ very_icky(Config) when is_list(Config) ->
 	    try
 		Priv = proplists:get_value(priv_dir, Config),
 		file:set_cwd(Priv),
-		case check_very_icky(prim_file) of
+		case check_very_icky(?PRIM_FILE) of
 		    need_unicode_mode ->
 			{skipped,"VM needs to be started in Unicode filename mode"};
 		    ok ->
@@ -292,11 +293,6 @@ check_normal(Mod) ->
 		ok
 	end,
 	[ begin
-	      {ok, FD} = Mod:open(Name,[read]),
-	      {ok, Content} = Mod:read(FD,1024),
-	      ok = file:close(FD)
-	  end || {regular,Name,Content} <- NormalDir ],
-	[ begin
 	      {ok, FD} = Mod:open(Name,[read,binary]),
 	      BC = list_to_binary(Content),
 	      {ok, BC} = Mod:read(FD,1024),
@@ -412,11 +408,6 @@ check_icky(Mod) ->
 		ok
 	end,
 	[ begin
-	      {ok, FD} = Mod:open(Name,[read]),
-	      {ok, Content} = Mod:read(FD,1024),
-	      ok = file:close(FD)
-	  end || {regular,Name,Content} <- IckyDir ],
-	[ begin
 	      {ok, FD} = Mod:open(Name,[read,binary]),
 	      BC = list_to_binary([Content]),
 	      {ok, BC} = Mod:read(FD,1024),
@@ -521,11 +512,6 @@ check_very_icky(Mod) ->
 		ok
 	end,
 	[ begin
-	      {ok, FD} = Mod:open(Name,[read]),
-	      {ok, Content} = Mod:read(FD,1024),
-	      ok = file:close(FD)
-	  end || {regular,Name,Content} <- VeryIckyDir ],
-	[ begin
 	      {ok, FD} = Mod:open(Name,[read,binary]),
 	      BC = list_to_binary([Content]),
 	      {ok, BC} = Mod:read(FD,1024),
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 620ab235a0..9dde00652c 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -1038,8 +1038,7 @@ do_from_other_process(Fun) ->
 			  Result ->
 			      Parent ! {Ref,Result}
 		      catch
-			  Class:Reason ->
-			      Stacktrace = erlang:get_stacktrace(),
+			  Class:Reason:Stacktrace ->
 			      Parent ! {Ref,Class,Reason,Stacktrace}
 		      end
 	      end),
@@ -1617,8 +1616,7 @@ s_start(Socket, Timeout, Parent) ->
     try
 	s_loop(Socket, Timeout, Parent, Handler, gb_trees:empty())
     catch
-	Class:Reason ->
-	    Stacktrace = erlang:get_stacktrace(),
+	Class:Reason:Stacktrace ->
 	    io:format(?MODULE_STRING":socket exception ~w:~w at~n"
 		      "~p.~n", [Class,Reason,Stacktrace]),
 	    erlang:raise(Class, Reason, Stacktrace)
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index 12d22519ce..0fe44e8a88 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -605,9 +605,9 @@ ok({ok,V}) -> V;
 ok(NotOk) ->
     try throw(not_ok)
     catch
-	Thrown ->
+	throw:Thrown:Stacktrace ->
 	    erlang:raise(
-	      error, {Thrown, NotOk}, tl(erlang:get_stacktrace()))
+	      error, {Thrown, NotOk}, tl(Stacktrace))
     end.
 
 get_localaddr() ->
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index 96e495505a..6a50239c2a 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -755,9 +755,9 @@ ok({ok,V}) -> V;
 ok(NotOk) ->
     try throw(not_ok)
     catch
-	Thrown ->
+	throw:Thrown:Stacktrace ->
 	    erlang:raise(
-	      error, {Thrown, NotOk}, tl(erlang:get_stacktrace()))
+	      error, {Thrown, NotOk}, tl(Stacktrace))
     end.
 
 
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index 0a7f73c344..0e7b7adc47 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -3470,8 +3470,8 @@ start_procs(Parent, N1, N2, N3, Config) ->
     Pid6 = rpc:call(N3, ?MODULE, start_proc3, [test4]),
     assert_pid(Pid6),
     yes = global:register_name(test1, Pid3),
-    yes = global:register_name(test2, Pid4, {global, notify_all_name}),
-    yes = global:register_name(test3, Pid5, {global, random_notify_name}),
+    yes = global:register_name(test2, Pid4, fun global:notify_all_name/3),
+    yes = global:register_name(test3, Pid5, fun global:random_notify_name/3),
     Resolve = fun(Name, Pid1, Pid2) ->
 		      Parent ! {resolve_called, Name, node()},
 		      {Min, Max} = minmax(Pid1, Pid2),
@@ -3546,7 +3546,7 @@ start_proc_basic(Name) ->
     end.
 
 init_proc_basic(Parent, Name) ->
-    X = global:register_name(Name, self(), {?MODULE, fix_basic_name}),
+    X = global:register_name(Name, self(), fun ?MODULE:fix_basic_name/3),
     Parent ! {self(),X},
     loop().
 
@@ -3791,15 +3791,6 @@ stop() ->
 			  test_server:stop_node(Node)
 		  end, nodes()).
 
-dbg_logs(Name) -> dbg_logs(Name, ?NODES).
-
-dbg_logs(Name, Nodes) ->
-    lists:foreach(fun(N) ->
-			  F = lists:concat([Name, ".log.", N, ".txt"]),
-			  ok = sys:log_to_file({global_name_server, N}, F)
-		  end, Nodes).
-
-
 %% Tests that locally loaded nodes do not loose contact with other nodes.
 global_lost_nodes(Config) when is_list(Config) ->
     Timeout = 60,
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 3b502be8b8..2e5f8c7d2c 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -40,7 +40,8 @@
 	 lookup_bad_search_option/1,
 	 getif/1,
 	 getif_ifr_name_overflow/1,getservbyname_overflow/1, getifaddrs/1,
-	 parse_strict_address/1, simple_netns/1, simple_netns_open/1,
+	 parse_strict_address/1, ipv4_mapped_ipv6_address/1,
+         simple_netns/1, simple_netns_open/1,
          simple_bind_to_device/1, simple_bind_to_device_open/1]).
 
 -export([get_hosts/1, get_ipv6_hosts/1, parse_hosts/1, parse_address/1,
@@ -667,6 +668,26 @@ parse_strict_address(Config) when is_list(Config) ->
     {ok, {3089,3106,23603,50240,0,0,119,136}} =
 	inet:parse_strict_address("c11:0c22:5c33:c440::077:0088").
 
+ipv4_mapped_ipv6_address(Config) when is_list(Config) ->
+    {D1,D2,D3,D4} = IPv4Address =
+        {rand:uniform(256) - 1,
+         rand:uniform(256) - 1,
+         rand:uniform(256) - 1,
+         rand:uniform(256) - 1},
+    E7 = (D1 bsl 8) bor D2,
+    E8 = (D3 bsl 8) bor D4,
+    io:format("IPv4Address: ~p.~n", [IPv4Address]),
+    {0,0,0,0,0,65535,E7,E8} = inet:ipv4_mapped_ipv6_address(IPv4Address),
+    IPv6Address =
+        {rand:uniform(65536) - 1,
+         rand:uniform(65536) - 1,
+         rand:uniform(65536) - 1,
+         rand:uniform(65536) - 1,
+         rand:uniform(65536) - 1,
+         rand:uniform(65536) - 1, E7, E8},
+    IPv4Address = inet:ipv4_mapped_ipv6_address(IPv6Address),
+    ok.
+
 t_gethostnative(Config) when is_list(Config) ->
     %% this will result in 26 bytes sent which causes problem in Windows
     %% if the port-program has not assured stdin to be read in BINARY mode
@@ -1083,11 +1104,9 @@ ifaddrs([{If,Opts}|IOs]) ->
     #ifopts{flags=F} = Ifopts = check_ifopts(Opts, #ifopts{name=If}),
     case F of
 	{flags,Flags} ->
-	    case lists:member(up, Flags) of
-		true ->
-		  Ifopts#ifopts.addrs;
-		false ->
-		    []
+	    case lists:member(running, Flags) of
+		true -> Ifopts#ifopts.addrs;
+		false -> []
 	    end ++ ifaddrs(IOs);
 	undefined ->
 	    ifaddrs(IOs)
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl
index 6691ad9c06..2a5b8d0044 100644
--- a/lib/kernel/test/inet_res_SUITE.erl
+++ b/lib/kernel/test/inet_res_SUITE.erl
@@ -217,10 +217,10 @@ proxy_start(TC, {NS,P}) ->
 	spawn_link(
 	  fun () ->
 		  try proxy_start(TC, NS, P, Parent, Tag)
-		  catch C:X ->
+		  catch C:X:Stacktrace ->
 			  io:format(
 			    "~w: ~w:~p ~p~n",
-			    [self(),C,X,erlang:get_stacktrace()])
+			    [self(),C,X,Stacktrace])
 		  end
 	  end),
     receive {started,Tag,Port} ->
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index da56359294..7898988dbe 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -30,14 +30,14 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases must be exported.
--export([app_test/1, appup_test/1]).
+-export([app_test/1, appup_test/1, refc/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
      {timetrap,{minutes,2}}].
 
 all() -> 
-    [app_test, appup_test].
+    [app_test, appup_test, refc].
 
 groups() -> 
     [].
@@ -163,3 +163,68 @@ check_appup([Vsn|Vsns],Instrs,Expected) ->
     end;
 check_appup([],_,_) ->
     ok.
+
+%%% Check that refc module handles the counters as expected
+refc(_Config) ->
+    Enable = fun(Enable) -> erlang:system_flag(scheduler_wall_time, Enable) end,
+    IsOn = fun() -> undefined /= erlang:statistics(scheduler_wall_time) end,
+    Tester = self(),
+    Loop = fun Loop() ->
+                   receive
+                       die -> normal;
+                       {apply, Bool} ->
+                           Res = Enable(Bool),
+                           Tester ! {self(), Res},
+                           Loop()
+                   end
+           end,
+
+    %% Counter should be 0
+    false = Enable(false),
+
+    false = Enable(true),
+    true  = Enable(true),
+    true  = Enable(false),
+    true  = Enable(false),
+
+    %% Counter should be 0
+    false = IsOn(),
+
+    P1 = spawn_link(Loop),
+    P1 ! {apply, true},
+    receive {P1, R1} -> false = R1 end,
+
+    %% P1 has turned it on counter should be one
+    true = IsOn(),
+    true = Enable(true),
+    true = Enable(false),
+    true = IsOn(),
+
+    P1 ! {apply, false},
+    receive {P1, R2} -> true = R2 end,
+    false = IsOn(),
+
+    P1 ! {apply, true},
+    receive {P1, R3} -> false = R3 end,
+    true = IsOn(),
+    true = Enable(false),
+
+
+    P1 ! die,
+    timer:sleep(100),
+    false = IsOn(),
+    false = Enable(false),
+
+    P2 = spawn_link(Loop),
+    P2 ! {apply, true},
+    receive {P2, R4} -> false = R4 end,
+    true = IsOn(),
+    P2 ! {apply, true},
+    receive {P2, R5} -> true = R5 end,
+    true = IsOn(),
+
+    P2 ! die,
+    timer:sleep(100),
+    false = IsOn(),
+
+    ok.
diff --git a/lib/kernel/test/kernel_bench.spec b/lib/kernel/test/kernel_bench.spec
index 8de60dae31..4de133f21b 100644
--- a/lib/kernel/test/kernel_bench.spec
+++ b/lib/kernel/test/kernel_bench.spec
@@ -1 +1,2 @@
 {groups,"../kernel_test",zlib_SUITE,[bench]}.
+{groups,"../kernel_test",file_SUITE,[bench]}.
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index 8056321448..591fbb2125 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -26,7 +26,8 @@
          null_in_command/1, space_in_name/1, bad_command/1,
 	 find_executable/1, unix_comment_in_command/1, deep_list_command/1,
          large_output_command/1, background_command/0, background_command/1,
-         message_leak/1, close_stdin/0, close_stdin/1, perf_counter_api/1]).
+         message_leak/1, close_stdin/0, close_stdin/1, max_size_command/1,
+         perf_counter_api/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -39,7 +40,7 @@ all() ->
      space_in_name, bad_command,
      find_executable, unix_comment_in_command, deep_list_command,
      large_output_command, background_command, message_leak,
-     close_stdin, perf_counter_api].
+     close_stdin, max_size_command, perf_counter_api].
 
 groups() ->
     [].
@@ -322,6 +323,19 @@ close_stdin(Config) ->
 
     "-1" = os:cmd(Fds).
 
+max_size_command(_Config) ->
+
+    Res20 = os:cmd("cat /dev/zero", #{ max_size => 20 }),
+    20 = length(Res20),
+
+    Res0 = os:cmd("cat /dev/zero", #{ max_size => 0 }),
+    0 = length(Res0),
+
+    Res32768 = os:cmd("cat /dev/zero", #{ max_size => 32768 }),
+    32768 = length(Res32768),
+
+    ResHello = string:trim(os:cmd("echo hello", #{ max_size => 20 })),
+    5 = length(ResHello).
 
 %% Test that the os:perf_counter api works as expected
 perf_counter_api(_Config) ->
diff --git a/lib/kernel/test/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index d105952df9..a891451c82 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -33,6 +33,7 @@
 	 init_per_group/2,end_per_group/2,
 	 mixed/1,
          literals/1,
+         destructive/1,
 	 simple/1, complicated/1, heavy/1, simple_all_keys/1, info/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 -export([other_process/2]).
@@ -52,6 +53,7 @@ suite() ->
 all() -> 
     [simple, complicated, heavy, simple_all_keys, info,
      literals,
+     destructive,
      mixed].
 
 groups() -> 
@@ -367,6 +369,36 @@ match_keys(All) ->
     ok.
 
 
+%% Test destructive put optimization of immed values
+%% does not affect get/0 or process_info.
+destructive(_Config) ->
+    Keys = lists:seq(1,100),
+    [put(Key, 17) || Key <- Keys],
+    Get1 = get(),
+    {dictionary,PI1} = process_info(self(), dictionary),
+
+    [begin
+         {Key, 17} = lists:keyfind(Key, 1, Get1),
+         {Key, 17} = lists:keyfind(Key, 1, PI1)
+     end
+     || Key <- Keys],
+
+    [17 = put(Key, 42) || Key <- Keys],   % Mutate
+
+    Get2 = get(),
+    {dictionary,PI2} = process_info(self(), dictionary),
+
+    [begin
+         {Key, 17} = lists:keyfind(Key, 1, Get1),
+         {Key, 17} = lists:keyfind(Key, 1, PI1),
+         {Key, 42} = lists:keyfind(Key, 1, Get2),
+         {Key, 42} = lists:keyfind(Key, 1, PI2)
+
+     end
+     || Key <- Keys],
+
+    ok.
+
 %% Do random mixed put/erase to test grow/shrink
 %% Written for a temporary bug in gc during shrink
 mixed(_Config) ->
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 2f4330c217..ab62f4dc34 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -21,38 +21,23 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2,
 	 read_write_file/1, free_memory/0]).
--export([cur_dir_0a/1, cur_dir_0b/1, 
-	 cur_dir_1a/1, cur_dir_1b/1, 
-	 make_del_dir_a/1, make_del_dir_b/1,
-	 pos1/1, pos2/1]).
--export([close/1, 
-	 delete_a/1, delete_b/1]).
--export([ open1/1, modes/1]).
--export([ 
-	  file_info_basic_file_a/1, file_info_basic_file_b/1,
-	  file_info_basic_directory_a/1, file_info_basic_directory_b/1,
-	  file_info_bad_a/1, file_info_bad_b/1, 
-	  file_info_times_a/1, file_info_times_b/1, 
-	  file_write_file_info_a/1, file_write_file_info_b/1,
-	  file_read_file_info_opts/1, file_write_file_info_opts/1,
-	  file_write_read_file_info_opts/1
-	]).
--export([rename_a/1, rename_b/1, 
-	 access/1, truncate/1, datasync/1, sync/1,
+-export([cur_dir_0/1, cur_dir_1/1,
+	 make_del_dir/1, pos1/1, pos2/1]).
+-export([close/1, delete/1]).
+-export([open1/1, modes/1]).
+-export([file_info_basic_file/1, file_info_basic_directory/1, file_info_bad/1,
+	 file_info_times/1, file_write_file_info/1,
+         file_read_file_info_opts/1, file_write_file_info_opts/1,
+	 file_write_read_file_info_opts/1]).
+-export([rename/1, access/1, truncate/1, datasync/1, sync/1,
 	 read_write/1, pread_write/1, append/1, exclusive/1]).
--export([ e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
+-export([e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
 
--export([ read_not_really_compressed/1,
-	  read_compressed/1, write_compressed/1,
-	  compress_errors/1]).
-
--export([ 
-	  make_link_a/1, make_link_b/1,
-	  read_link_info_for_non_link/1, 
-	  symlinks_a/1, symlinks_b/1,
-	  list_dir_limit/1,
-	  list_dir_error/1,
-	  list_dir/1]).
+-export([make_link/1, read_link_info_for_non_link/1,
+	 symlinks/1,
+	 list_dir_limit/1,
+	 list_dir_error/1,
+	 list_dir/1]).
 
 -export([advise/1]).
 -export([large_write/1]).
@@ -67,29 +52,16 @@
 
 -define(PRIM_FILE, prim_file).
 
-%% Calls ?PRIM_FILE:F with arguments A and an optional handle H 
-%% as first argument, unless the handle is [], i.e no handle.
-%% This is a macro to give the compiler and thereby 
-%% the cross reference tool the possibility to interprete
-%% the call, since M, F, A (or [H | A]) can all be known at 
-%% compile time.
--define(PRIM_FILE_call(F, H, A), 
-	case H of
-	    [] -> apply(?PRIM_FILE, F, A);
-	    _ ->  apply(?PRIM_FILE, F, [H | A])
-	end).
-
 suite() -> [].
 
 all() -> 
     [read_write_file, {group, dirs}, {group, files},
-     delete_a, delete_b, rename_a, rename_b, {group, errors},
-     {group, compression}, {group, links}, list_dir_limit, list_dir].
+     delete, rename, {group, errors}, {group, links},
+     list_dir_limit, list_dir].
 
 groups() -> 
     [{dirs, [],
-      [make_del_dir_a, make_del_dir_b, cur_dir_0a, cur_dir_0b,
-       cur_dir_1a, cur_dir_1b]},
+      [make_del_dir, cur_dir_0, cur_dir_1]},
      {files, [],
       [{group, open}, {group, pos}, {group, file_info},
        truncate, sync, datasync, advise, large_write, allocate]},
@@ -98,22 +70,14 @@ groups() ->
        append, exclusive]},
      {pos, [], [pos1, pos2]},
      {file_info, [],
-      [file_info_basic_file_a, file_info_basic_file_b,
-       file_info_basic_directory_a,
-       file_info_basic_directory_b, file_info_bad_a,
-       file_info_bad_b, file_info_times_a, file_info_times_b,
-       file_write_file_info_a, file_write_file_info_b,
-       file_read_file_info_opts, file_write_file_info_opts,
-       file_write_read_file_info_opts
+      [file_info_basic_file,file_info_basic_directory, file_info_bad,
+       file_info_times, file_write_file_info, file_read_file_info_opts,
+       file_write_file_info_opts, file_write_read_file_info_opts
       ]},
      {errors, [],
       [e_delete, e_rename, e_make_dir, e_del_dir]},
-     {compression, [],
-      [read_compressed, read_not_really_compressed,
-       write_compressed, compress_errors]},
      {links, [],
-      [make_link_a, make_link_b, read_link_info_for_non_link,
-       symlinks_a, symlinks_b, list_dir_error]}].
+      [make_link, read_link_info_for_non_link, symlinks, list_dir_error]}].
 
 init_per_testcase(large_write, Config) ->
     {ok, Started} = application:ensure_all_started(os_mon),
@@ -246,39 +210,27 @@ read_write_file(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
-make_del_dir_a(Config) when is_list(Config) ->
-    make_del_dir(Config, [], "_a").
-
-make_del_dir_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = make_del_dir(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    %% Just to make sure the state of the server makes a difference
-    {error, einval} = ?PRIM_FILE_call(get_cwd, Handle, []),
-    Result.
-
-make_del_dir(Config, Handle, Suffix) ->
+make_del_dir(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     NewDir = filename:join(RootDir,
 			   atom_to_list(?MODULE)
-			   ++"_mk-dir"++Suffix),
-    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
-    {error, eexist} = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
-    ok = ?PRIM_FILE_call(del_dir, Handle, [NewDir]),
-    {error, enoent} = ?PRIM_FILE_call(del_dir, Handle, [NewDir]),
+			   ++"_mk-dir"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
+    {error, eexist} = ?PRIM_FILE:make_dir(NewDir),
+    ok = ?PRIM_FILE:del_dir(NewDir),
+    {error, enoent} = ?PRIM_FILE:del_dir(NewDir),
 
     %% Make sure we are not in a directory directly under test_server
     %% as that would result in eacces errors when trying to delete '..',
     %% because there are processes having that directory as current.
-    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
-    {ok, CurrentDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+    ok = ?PRIM_FILE:make_dir(NewDir),
+    {ok, CurrentDir} = ?PRIM_FILE:get_cwd(),
     case {os:type(), length(NewDir) >= 260 } of
 	{{win32,_}, true} ->
 	    io:format("Skip set_cwd for windows path longer than 260 (MAX_PATH)\n", []),
 	    io:format("\nNewDir = ~p\n", [NewDir]);
 	_ ->
-	    ok = ?PRIM_FILE_call(set_cwd, Handle, [NewDir])
+	    ok = ?PRIM_FILE:set_cwd(NewDir)
     end,
     try
 	%% Check that we get an error when trying to create...
@@ -286,14 +238,14 @@ make_del_dir(Config, Handle, Suffix) ->
 	NewDir2 = filename:join(RootDir,
 				atom_to_list(?MODULE)
 				++"_mk-dir-noexist/foo"),
-	{error, enoent} = ?PRIM_FILE_call(make_dir, Handle, [NewDir2]),
+	{error, enoent} = ?PRIM_FILE:make_dir(NewDir2),
 	%% a nameless directory
-	{error, enoent} = ?PRIM_FILE_call(make_dir, Handle, [""]),
+	{error, enoent} = ?PRIM_FILE:make_dir(""),
 	%% a directory with illegal name
-	{error, badarg} = ?PRIM_FILE_call(make_dir, Handle, ['mk-dir']),
+	{error, badarg} = ?PRIM_FILE:make_dir('mk-dir'),
 
 	%% a directory with illegal name, even if it's a (bad) list
-	{error, badarg} = ?PRIM_FILE_call(make_dir, Handle, [[1,2,3,{}]]),
+	{error, badarg} = ?PRIM_FILE:make_dir([1,2,3,{}]),
 
 	%% Maybe this isn't an error, exactly, but worth mentioning anyway:
 	%% ok = ?PRIM_FILE:make_dir([$f,$o,$o,0,$b,$a,$r])),
@@ -306,125 +258,101 @@ make_del_dir(Config, Handle, Suffix) ->
 	%% Try deleting some bad directories
 	%% Deleting the parent directory to the current, sounds dangerous, huh?
 	%% Don't worry ;-) the parent directory should never be empty, right?
-	case ?PRIM_FILE_call(del_dir, Handle, [".."]) of
+	case ?PRIM_FILE:del_dir("..") of
 	    {error, eexist} -> ok;
 	    {error, eacces} -> ok;	%OpenBSD
 	    {error, einval} -> ok		%FreeBSD
 	end,
-	{error, enoent} = ?PRIM_FILE_call(del_dir, Handle, [""]),
-	{error, badarg} = ?PRIM_FILE_call(del_dir, Handle, [[3,2,1,{}]])
+	{error, enoent} = ?PRIM_FILE:del_dir(""),
+	{error, badarg} = ?PRIM_FILE:del_dir([3,2,1,{}])
     after
-	ok = ?PRIM_FILE_call(set_cwd, Handle, [CurrentDir])
+	ok = ?PRIM_FILE:set_cwd(CurrentDir)
     end,
     ok.
 
-cur_dir_0a(Config) when is_list(Config) ->
-    cur_dir_0(Config, []).
-
-cur_dir_0b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = cur_dir_0(Config, Handle),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-cur_dir_0(Config, Handle) ->
+cur_dir_0(Config) when is_list(Config) ->
     %% Find out the current dir, and cd to it ;-)
-    {ok,BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+    {ok,BaseDir} = ?PRIM_FILE:get_cwd(),
     Dir1 = BaseDir ++ "", %% Check that it's a string
-    ok = ?PRIM_FILE_call(set_cwd, Handle, [Dir1]),
-    DirName = atom_to_list(?MODULE) ++
-	case Handle of
-	    [] ->
-		"_curdir";
-	    _ ->
-		"_curdir_h"
-	end,
+    ok = ?PRIM_FILE:set_cwd(Dir1),
+    DirName = atom_to_list(?MODULE) ++ "_curdir",
 
     %% Make a new dir, and cd to that
     RootDir = proplists:get_value(priv_dir,Config),
     NewDir = filename:join(RootDir, DirName),
-    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+    ok = ?PRIM_FILE:make_dir(NewDir),
     case {os:type(), length(NewDir) >= 260} of
 	{{win32,_}, true} ->
 	    io:format("Skip set_cwd for windows path longer than 260 (MAX_PATH):\n"),
 	    io:format("\nNewDir = ~p\n", [NewDir]);
 	_ ->
 	    io:format("cd to ~s",[NewDir]),
-	    ok = ?PRIM_FILE_call(set_cwd, Handle, [NewDir]),
+	    ok = ?PRIM_FILE:set_cwd(NewDir),
 
 	    %% Create a file in the new current directory, and check that it
 	    %% really is created there
 	    UncommonName = "uncommon.fil",
 	    {ok,Fd} = ?PRIM_FILE:open(UncommonName, [read, write]),
 	    ok = ?PRIM_FILE:close(Fd),
-	    {ok,NewDirFiles} = ?PRIM_FILE_call(list_dir, Handle, ["."]),
+	    {ok,NewDirFiles} = ?PRIM_FILE:list_dir("."),
 	    true = lists:member(UncommonName,NewDirFiles),
 
 	    %% Delete the directory and return to the old current directory
 	    %% and check that the created file isn't there (too!)
 	    expect({error, einval}, {error, eacces}, {error, eexist},
-		   ?PRIM_FILE_call(del_dir, Handle, [NewDir])),
-	    ?PRIM_FILE_call(delete, Handle, [UncommonName]),
-	    {ok,[]} = ?PRIM_FILE_call(list_dir, Handle, ["."]),
-	    ok = ?PRIM_FILE_call(set_cwd, Handle, [Dir1]),
+		   ?PRIM_FILE:del_dir(NewDir)),
+	    ?PRIM_FILE:delete(UncommonName),
+	    {ok,[]} = ?PRIM_FILE:list_dir("."),
+	    ok = ?PRIM_FILE:set_cwd(Dir1),
 	    io:format("cd back to ~s",[Dir1]),
-	    ok = ?PRIM_FILE_call(del_dir, Handle, [NewDir]),
-	    {error, enoent} = ?PRIM_FILE_call(set_cwd, Handle, [NewDir]),
-	    ok = ?PRIM_FILE_call(set_cwd, Handle, [Dir1]),
+	    ok = ?PRIM_FILE:del_dir(NewDir),
+	    {error, enoent} = ?PRIM_FILE:set_cwd(NewDir),
+	    ok = ?PRIM_FILE:set_cwd(Dir1),
 	    io:format("cd back to ~s",[Dir1]),
-	    {ok,OldDirFiles} = ?PRIM_FILE_call(list_dir, Handle, ["."]),
+	    {ok,OldDirFiles} = ?PRIM_FILE:list_dir("."),
 	    false = lists:member(UncommonName,OldDirFiles)
     end,
 
     %% Try doing some bad things
     {error, badarg} =
-	?PRIM_FILE_call(set_cwd, Handle, [{foo,bar}]),
+	?PRIM_FILE:set_cwd({foo,bar}),
     {error, enoent} =
-	?PRIM_FILE_call(set_cwd, Handle, [""]),
+	?PRIM_FILE:set_cwd(""),
     {error, enoent} =
-	?PRIM_FILE_call(set_cwd, Handle, [".......a......"]),
+	?PRIM_FILE:set_cwd(".......a......"),
     {ok,BaseDir} =
-	?PRIM_FILE_call(get_cwd, Handle, []), %% Still there?
+	?PRIM_FILE:get_cwd(), %% Still there?
 
     %% On Windows, there should only be slashes, no backslashes,
     %% in the return value of get_cwd().
     %% (The test is harmless on Unix, because filenames usually
     %% don't contain backslashes.)
 
-    {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+    {ok, BaseDir} = ?PRIM_FILE:get_cwd(),
     false = lists:member($\\, BaseDir),
 
     ok.
 
 %% Tests ?PRIM_FILE:get_cwd/1.
 
-cur_dir_1a(Config) when is_list(Config) ->
-    cur_dir_1(Config, []).
-
-cur_dir_1b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = cur_dir_1(Config, Handle),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-cur_dir_1(Config, Handle) ->
+cur_dir_1(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
-	    win_cur_dir_1(Config, Handle);
+	    win_cur_dir_1(Config);
 	_ ->
 	    {error, enotsup} =
-		?PRIM_FILE_call(get_cwd, Handle, ["d:"])
+		?PRIM_FILE:get_cwd("d:")
     end,
     ok.
 
-win_cur_dir_1(_Config, Handle) ->
-    {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+win_cur_dir_1(_Config) ->
+    {ok, BaseDir} = ?PRIM_FILE:get_cwd(),
 
     %% Get the drive letter from the current directory,
     %% and try to get current directory for that drive.
 
     [Drive, $:|_] = BaseDir,
-    {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, [[Drive, $:]]),
+    {ok, BaseDir} = ?PRIM_FILE:get_cwd([Drive, $:]),
     io:format("BaseDir = ~s\n", [BaseDir]),
 
     %% Unfortunately, there is no way to move away from the
@@ -446,12 +374,12 @@ open1(Config) when is_list(Config) ->
     Name = filename:join(NewDir, "foo1.fil"),
     {ok,Fd1} = ?PRIM_FILE:open(Name, [read, write]),
     {ok,Fd2} = ?PRIM_FILE:open(Name, [read]),
-    Str = "{a,tuple}.\n",
-    Length = length(Str),
-    ?PRIM_FILE:write(Fd1,Str),
+    Bin = list_to_binary("{a,tuple}.\n"),
+    Length = byte_size(Bin),
+    ?PRIM_FILE:write(Fd1,Bin),
     {ok,0} = ?PRIM_FILE:position(Fd1,bof),
-    {ok, Str} = ?PRIM_FILE:read(Fd1,Length),
-    {ok, Str} = ?PRIM_FILE:read(Fd2,Length),
+    {ok, Bin} = ?PRIM_FILE:read(Fd1,Length),
+    {ok, Bin} = ?PRIM_FILE:read(Fd2,Length),
     ok = ?PRIM_FILE:close(Fd2),
     {ok,0} = ?PRIM_FILE:position(Fd1,bof),
     ok = ?PRIM_FILE:truncate(Fd1),
@@ -471,13 +399,13 @@ modes(Config) when is_list(Config) ->
 			   ++"_open_modes"),
     ok = ?PRIM_FILE:make_dir(NewDir),
     Name1 = filename:join(NewDir, "foo1.fil"),
-    Marker = "hello, world",
-    Length = length(Marker),
+    Marker = <<"hello, world">>,
+    Length = byte_size(Marker),
 
     %% write
     {ok, Fd1} = ?PRIM_FILE:open(Name1, [write]),
     ok = ?PRIM_FILE:write(Fd1, Marker),
-    ok = ?PRIM_FILE:write(Fd1, ".\n"),
+    ok = ?PRIM_FILE:write(Fd1, <<".\n">>),
     ok = ?PRIM_FILE:close(Fd1),
 
     %% read
@@ -496,12 +424,6 @@ modes(Config) when is_list(Config) ->
     {ok, Marker} = ?PRIM_FILE:read(Fd4, Length),
     ok = ?PRIM_FILE:close(Fd4),
 
-    %% read and binary
-    BinaryMarker = list_to_binary(Marker),
-    {ok, Fd5} = ?PRIM_FILE:open(Name1, [read, binary]),
-    {ok, BinaryMarker} = ?PRIM_FILE:read(Fd5, Length),
-    ok = ?PRIM_FILE:close(Fd5),
-
     ok.
 
 close(Config) when is_list(Config) ->
@@ -528,9 +450,9 @@ access(Config) when is_list(Config) ->
     Name = filename:join(RootDir,
 			 atom_to_list(?MODULE)
 			 ++"_access.fil"),
-    Str = "ABCDEFGH",
+    Bin = <<"ABCDEFGH">>,
     {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?PRIM_FILE:write(Fd1,Str),
+    ?PRIM_FILE:write(Fd1,Bin),
     ok = ?PRIM_FILE:close(Fd1),
     %% Check that we can't write when in read only mode
     {ok,Fd2} = ?PRIM_FILE:open(Name, [read]),
@@ -542,7 +464,7 @@ access(Config) when is_list(Config) ->
     end,
     ok = ?PRIM_FILE:close(Fd2),
     {ok, Fd3} = ?PRIM_FILE:open(Name, [read]),
-    {ok, Str} = ?PRIM_FILE:read(Fd3,length(Str)),
+    {ok, Bin} = ?PRIM_FILE:read(Fd3,byte_size(Bin)),
     ok = ?PRIM_FILE:close(Fd3),
 
     ok.
@@ -564,7 +486,7 @@ read_write(Config) when is_list(Config) ->
     ok.
 
 read_write_test(File) ->
-    Marker = "hello, world",
+    Marker = <<"hello, world">>,
     ok = ?PRIM_FILE:write(File, Marker),
     {ok, 0} = ?PRIM_FILE:position(File, 0),
     {ok, Marker} = ?PRIM_FILE:read(File, 100),
@@ -590,15 +512,15 @@ pread_write(Config) when is_list(Config) ->
     ok.
 
 pread_write_test(File) ->
-    Marker = "hello, world",
-    Len = length(Marker),
+    Marker = <<"hello, world">>,
+    Len = byte_size(Marker),
     ok = ?PRIM_FILE:write(File, Marker),
     {ok, Marker} = ?PRIM_FILE:pread(File, 0, 100),
     eof = ?PRIM_FILE:pread(File, 100, 1),
     ok = ?PRIM_FILE:pwrite(File, Len, Marker),
     {ok, Marker} = ?PRIM_FILE:pread(File, Len, 100),
     eof = ?PRIM_FILE:pread(File, 100, 1),
-    MM = Marker ++ Marker,
+    MM = <<Marker/binary,Marker/binary>>,
     {ok, MM} = ?PRIM_FILE:pread(File, 0, 100),
     ok = ?PRIM_FILE:close(File),
     ok.
@@ -655,24 +577,24 @@ pos1(Config) when is_list(Config) ->
 			 atom_to_list(?MODULE)
 			 ++"_pos1.fil"),
     {ok, Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?PRIM_FILE:write(Fd1,"ABCDEFGH"),
+    ?PRIM_FILE:write(Fd1,<<"ABCDEFGH">>),
     ok        = ?PRIM_FILE:close(Fd1),
     {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
 
     %% Start pos is first char
     io:format("Relative positions"),
-    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"A">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 2}   = ?PRIM_FILE:position(Fd2,{cur,1}),
-    {ok, "C"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"C">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 0}   = ?PRIM_FILE:position(Fd2,{cur,-3}),
-    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"A">>} = ?PRIM_FILE:read(Fd2,1),
     %% Backwards from first char should be an error
     {ok,0}    = ?PRIM_FILE:position(Fd2,{cur,-1}),
     {error, einval} = ?PRIM_FILE:position(Fd2,{cur,-1}),
     %% Reset position and move again
     {ok, 0}   = ?PRIM_FILE:position(Fd2,0),
     {ok, 2}   = ?PRIM_FILE:position(Fd2,{cur,2}),
-    {ok, "C"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"C">>} = ?PRIM_FILE:read(Fd2,1),
     %% Go a lot forwards
     {ok, 13}  = ?PRIM_FILE:position(Fd2,{cur,10}),
     eof       = ?PRIM_FILE:read(Fd2,1),
@@ -684,27 +606,27 @@ pos1(Config) when is_list(Config) ->
     {ok, 8}   = ?PRIM_FILE:position(Fd2,cur),
     eof = ?PRIM_FILE:read(Fd2,1),
     {ok, 7}   = ?PRIM_FILE:position(Fd2,7),
-    {ok, "H"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"H">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 0}   = ?PRIM_FILE:position(Fd2,0),
-    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"A">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 3}   = ?PRIM_FILE:position(Fd2,3),
-    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"D">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 12}  = ?PRIM_FILE:position(Fd2,12),
     eof       = ?PRIM_FILE:read(Fd2,1),
     {ok, 3}   = ?PRIM_FILE:position(Fd2,3),
-    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"D">>} = ?PRIM_FILE:read(Fd2,1),
     %% Try the {bof,X} notation
     {ok, 3}   = ?PRIM_FILE:position(Fd2,{bof,3}),
-    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"D">>} = ?PRIM_FILE:read(Fd2,1),
 
     %% Try eof positions
     io:format("EOF positions"),
     {ok, 8}   = ?PRIM_FILE:position(Fd2,{eof,0}),
     eof       = ?PRIM_FILE:read(Fd2,1),
     {ok, 7}   = ?PRIM_FILE:position(Fd2,{eof,-1}),
-    {ok, "H"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"H">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 0}   = ?PRIM_FILE:position(Fd2,{eof,-8}),
-    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"A">>} = ?PRIM_FILE:read(Fd2,1),
     {error, einval} = ?PRIM_FILE:position(Fd2,{eof,-9}),
     ok.
 
@@ -714,7 +636,7 @@ pos2(Config) when is_list(Config) ->
 			 atom_to_list(?MODULE)
 			 ++"_pos2.fil"),
     {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?PRIM_FILE:write(Fd1,"ABCDEFGH"),
+    ?PRIM_FILE:write(Fd1,<<"ABCDEFGH">>),
     ok = ?PRIM_FILE:close(Fd1),
     {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
     {error, einval} = ?PRIM_FILE:position(Fd2,-1),
@@ -722,35 +644,25 @@ pos2(Config) when is_list(Config) ->
     %% Make sure that we still can search after an error.
     {ok, 0}   = ?PRIM_FILE:position(Fd2, 0),
     {ok, 3}   = ?PRIM_FILE:position(Fd2, {bof,3}),
-    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"D">>} = ?PRIM_FILE:read(Fd2,1),
 
     io:format("DONE"),
     ok.
 
-
-file_info_basic_file_a(Config) when is_list(Config) ->
-    file_info_basic_file(Config, [], "_a").
-
-file_info_basic_file_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = file_info_basic_file(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-file_info_basic_file(Config, Handle, Suffix) ->
+file_info_basic_file(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
 
     %% Create a short file.
     Name = filename:join(RootDir,
 			 atom_to_list(?MODULE)
-			 ++"_basic_test"++Suffix++".fil"),
+			 ++"_basic_test"".fil"),
     {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
     ?PRIM_FILE:write(Fd1, "foo bar"),
     ok = ?PRIM_FILE:close(Fd1),
 
     %% Test that the file has the expected attributes.
     %% The times are tricky, so we will save them to a separate test case.
-    {ok, FileInfo} = ?PRIM_FILE_call(read_file_info, Handle, [Name]),
+    {ok, FileInfo} = ?PRIM_FILE:read_file_info(Name),
     #file_info{size = Size, type = Type, access = Access,
 	       atime = AccessTime, mtime = ModifyTime} =
 	FileInfo,
@@ -768,39 +680,30 @@ file_info_basic_file(Config, Handle, Suffix) ->
 
     ok.
 
-file_info_basic_directory_a(Config) when is_list(Config) ->
-    file_info_basic_directory(Config, []).
-
-file_info_basic_directory_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = file_info_basic_directory(Config, Handle),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-file_info_basic_directory(Config, Handle) ->
+file_info_basic_directory(Config) when is_list(Config) ->
     %% Note: filename:join/1 removes any trailing slash,
     %% which is essential for ?PRIM_FILE:read_file_info/1 to work on
     %% platforms such as Windows95.
     RootDir = filename:join([proplists:get_value(priv_dir, Config)]),
 
     %% Test that the RootDir directory has the expected attributes.
-    test_directory(RootDir, read_write, Handle),
+    test_directory(RootDir, read_write),
 
     %% Note that on Windows file systems, "/" or "c:/" are *NOT* directories.
     %% Therefore, test that ?PRIM_FILE:read_file_info/1 behaves 
     %% as if they were directories.
     case os:type() of
 	{win32, _} ->
-	    test_directory("/", read_write, Handle),
-	    test_directory("c:/", read_write, Handle),
-	    test_directory("c:\\", read_write, Handle);
+	    test_directory("/", read_write),
+	    test_directory("c:/", read_write),
+	    test_directory("c:\\", read_write);
 	_ ->
-	    test_directory("/", read, Handle)
+	    test_directory("/", read)
     end,
     ok.
 
-test_directory(Name, ExpectedAccess, Handle) ->
-    {ok, FileInfo} = ?PRIM_FILE_call(read_file_info, Handle, [Name]),
+test_directory(Name, ExpectedAccess) ->
+    {ok, FileInfo} = ?PRIM_FILE:read_file_info(Name),
     #file_info{size = Size, type = Type, access = Access,
 	       atime = AccessTime, mtime = ModifyTime} =
 	FileInfo,
@@ -824,45 +727,24 @@ all_integers([]) ->
 
 %% Try something nonexistent.
 
-file_info_bad_a(Config) when is_list(Config) ->
-    file_info_bad(Config, []).
-
-file_info_bad_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = file_info_bad(Config, Handle),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-file_info_bad(Config, Handle) ->
+file_info_bad(Config) when is_list(Config) ->
     RootDir = filename:join([proplists:get_value(priv_dir, Config)]),
-    {error, enoent} =
-	?PRIM_FILE_call(
-	   read_file_info, Handle, 
-	   [filename:join(RootDir,
-			  atom_to_list(?MODULE)++"_nonexistent")]),
+    NonExistent = filename:join(RootDir, atom_to_list(?MODULE)++"_nonexistent"),
+    {error, enoent} = ?PRIM_FILE:read_file_info(NonExistent),
     ok.
 
 %% Test that the file times behave as they should.
 
-file_info_times_a(Config) when is_list(Config) ->
-    file_info_times(Config, [], "_a").
-
-file_info_times_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = file_info_times(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-file_info_times(Config, Handle, Suffix) ->
+file_info_times(Config) when is_list(Config) ->
     %% We have to try this twice, since if the test runs across the change
     %% of a month the time diff calculations will fail. But it won't happen
     %% if you run it twice in succession.
     test_server:m_out_of_n(
       1,2,
-      fun() -> file_info_int(Config, Handle, Suffix) end),
+      fun() -> file_info_int(Config) end),
     ok.
 
-file_info_int(Config, Handle, Suffix) ->
+file_info_int(Config) ->
     %% Note: filename:join/1 removes any trailing slash,
     %% which is essential for ?PRIM_FILE:read_file_info/1 to work on
     %% platforms such as Windows95.
@@ -872,14 +754,14 @@ file_info_int(Config, Handle, Suffix) ->
 
     Name = filename:join(RootDir,
 			 atom_to_list(?MODULE)
-			 ++"_file_info"++Suffix++".fil"),
+			 ++"_file_info.fil"),
     {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
     ?PRIM_FILE:write(Fd1,"foo"),
 
     %% check that the file got a modify date max a few seconds away from now
     {ok, #file_info{type = regular,
 		    atime = AccTime1, mtime = ModTime1}} =
-	?PRIM_FILE_call(read_file_info, Handle, [Name]),
+	?PRIM_FILE:read_file_info(Name),
     Now = erlang:localtime(),
     io:format("Now ~p",[Now]),
     io:format("Open file Acc ~p Mod ~p",[AccTime1,ModTime1]),
@@ -897,7 +779,7 @@ file_info_int(Config, Handle, Suffix) ->
     ok = ?PRIM_FILE:close(Fd1),
     {ok, #file_info{size = Size, type = regular, access = Access,
 		    atime = AccTime2, mtime = ModTime2}} =
-	?PRIM_FILE_call(read_file_info, Handle, [Name]),
+	?PRIM_FILE:read_file_info(Name),
     io:format("Closed file Acc ~p Mod ~p",[AccTime2,ModTime2]),
     true = time_dist(ModTime1, ModTime2) >= 0,
 
@@ -909,7 +791,7 @@ file_info_int(Config, Handle, Suffix) ->
     {ok, #file_info{size = DSize, type = directory,
 		    access = DAccess,
 		    atime = AccTime3, mtime = ModTime3}} =
-	?PRIM_FILE_call(read_file_info, Handle, [RootDir]),
+	?PRIM_FILE:read_file_info(RootDir),
     %% this dir was modified only a few secs ago
     io:format("Dir Acc ~p; Mod ~p; Now ~p",
 	      [AccTime3, ModTime3, Now]),
@@ -936,16 +818,7 @@ filter_atime(Atime, Config) ->
 
 %% Test the write_file_info/2 function.
 
-file_write_file_info_a(Config) when is_list(Config) ->
-    file_write_file_info(Config, [], "_a").
-
-file_write_file_info_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = file_write_file_info(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-file_write_file_info(Config, Handle, Suffix) ->
+file_write_file_info(Config) when is_list(Config) ->
     RootDir = get_good_directory(Config),
     io:format("RootDir = ~p", [RootDir]),
 
@@ -955,16 +828,16 @@ file_write_file_info(Config, Handle, Suffix) ->
 
     Name = filename:join(RootDir,
 			 atom_to_list(?MODULE)
-			 ++"_write_file_info_ro"++Suffix),
+			 ++"_write_file_info_ro"),
     ok = ?PRIM_FILE:write_file(Name, "hello"),
     Time = {{1997, 01, 02}, {12, 35, 42}},
     Info = #file_info{mode=8#400, atime=Time, mtime=Time, ctime=Time},
-    ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, Info]),
+    ok = ?PRIM_FILE:write_file_info(Name, Info),
 
     %% Read back the times.
 
     {ok, ActualInfo} =
-	?PRIM_FILE_call(read_file_info, Handle, [Name]),
+	?PRIM_FILE:read_file_info(Name),
     #file_info{mode=_Mode, atime=ActAtime, mtime=Time,
 	       ctime=ActCtime} = ActualInfo,
     FilteredAtime = filter_atime(Time, Config),
@@ -980,14 +853,11 @@ file_write_file_info(Config, Handle, Suffix) ->
     {error, eacces} = ?PRIM_FILE:write_file(Name, "hello again"),
 
     %% Make the file writable again.
-
-    ?PRIM_FILE_call(write_file_info, Handle,
-		    [Name, #file_info{mode=8#600}]),
+    ?PRIM_FILE:write_file_info(Name, #file_info{mode=8#600}),
     ok = ?PRIM_FILE:write_file(Name, "hello again"),
 
     %% And unwritable.
-    ?PRIM_FILE_call(write_file_info, Handle,
-		    [Name, #file_info{mode=8#400}]),
+    ?PRIM_FILE:write_file_info(Name, #file_info{mode=8#400}),
     {error, eacces} = ?PRIM_FILE:write_file(Name, "hello again"),
 
     %% Write the times again.
@@ -995,9 +865,9 @@ file_write_file_info(Config, Handle, Suffix) ->
 
     NewTime = {{1997, 02, 15}, {13, 18, 20}},
     NewInfo = #file_info{atime=NewTime, mtime=NewTime, ctime=NewTime},
-    ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, NewInfo]),
+    ok = ?PRIM_FILE:write_file_info(Name, NewInfo),
     {ok, ActualInfo2} =
-	?PRIM_FILE_call(read_file_info, Handle, [Name]),
+	?PRIM_FILE:read_file_info(Name),
     #file_info{atime=NewActAtime, mtime=NewTime,
 	       ctime=NewActCtime} = ActualInfo2,
     NewFilteredAtime = filter_atime(NewTime, Config),
@@ -1012,14 +882,12 @@ file_write_file_info(Config, Handle, Suffix) ->
 
     %% Make the file writeable again, so that we can remove the
     %% test suites ... :-)
-    ?PRIM_FILE_call(write_file_info, Handle,
-		    [Name, #file_info{mode=8#600}]),
+    ?PRIM_FILE:write_file_info(Name, #file_info{mode=8#600}),
     ok.
 
 %% Test the write_file_info/3 function.
 
 file_write_file_info_opts(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
     RootDir = get_good_directory(Config),
     io:format("RootDir = ~p", [RootDir]),
 
@@ -1028,7 +896,7 @@ file_write_file_info_opts(Config) when is_list(Config) ->
 
     lists:foreach(fun
 		      ({FI, Opts}) ->
-			 ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI, Opts])
+			 ok = ?PRIM_FILE:write_file_info(Name, FI, Opts)
 		 end, [
 			{#file_info{ mode=8#600, atime = Time, mtime = Time, ctime = Time}, Opts} ||
 			  Opts <- [[{time, posix}]],
@@ -1038,7 +906,7 @@ file_write_file_info_opts(Config) when is_list(Config) ->
     %% REM: determine date range dependent on time_t = Uint32 | Sint32 | Sint64 | Uint64
     %% Determine time_t on os:type()?
     lists:foreach(fun ({FI, Opts}) ->
-			 ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI, Opts])
+			 ok = ?PRIM_FILE:write_file_info(Name, FI, Opts)
 		 end, [ {#file_info{ mode=8#400, atime = Time, mtime = Time, ctime = Time}, Opts} ||
 			  Opts <- [[{time, universal}],[{time, local}]],
 			  Time <- [
@@ -1050,11 +918,9 @@ file_write_file_info_opts(Config) when is_list(Config) ->
 				   {{2037,2,3},{23,59,59}},
 				   erlang:localtime()
 				  ]]),
-    ok   = ?PRIM_FILE:stop(Handle),
     ok.
 
 file_read_file_info_opts(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
     RootDir = get_good_directory(Config),
     io:format("RootDir = ~p", [RootDir]),
 
@@ -1063,41 +929,38 @@ file_read_file_info_opts(Config) when is_list(Config) ->
 
     lists:foreach(fun
 		      (Opts) ->
-			 {ok,_} = ?PRIM_FILE_call(read_file_info, Handle, [Name, Opts])
+			 {ok,_} = ?PRIM_FILE:read_file_info(Name, Opts)
 		 end, [[{time, Type}] || Type <- [local, universal, posix]]),
-    ok   = ?PRIM_FILE:stop(Handle),
     ok.
 
 %% Test the write and read back *_file_info/3 functions.
 
 file_write_read_file_info_opts(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
     RootDir = get_good_directory(Config),
     io:format("RootDir = ~p", [RootDir]),
 
     Name = filename:join(RootDir, atom_to_list(?MODULE) ++"_read_write_file_info_opts"),
     ok   = ?PRIM_FILE:write_file(Name, "hello_opts2"),
 
-    ok = file_write_read_file_info_opts(Handle, Name, {{1989, 04, 28}, {19,30,22}}, [{time, local}]),
-    ok = file_write_read_file_info_opts(Handle, Name, {{1989, 04, 28}, {19,30,22}}, [{time, universal}]),
+    ok = file_write_read_file_info_opts(Name, {{1989, 04, 28}, {19,30,22}}, [{time, local}]),
+    ok = file_write_read_file_info_opts(Name, {{1989, 04, 28}, {19,30,22}}, [{time, universal}]),
     %% will not work on platforms with unsigned time_t
-    %ok = file_write_read_file_info_opts(Handle, Name, {{1930, 04, 28}, {19,30,22}}, [{time, local}]),
-    %ok = file_write_read_file_info_opts(Handle, Name, {{1930, 04, 28}, {19,30,22}}, [{time, universal}]),
-    ok = file_write_read_file_info_opts(Handle, Name, 1, [{time, posix}]),
+    %ok = file_write_read_file_info_opts(Name, {{1930, 04, 28}, {19,30,22}}, [{time, local}]),
+    %ok = file_write_read_file_info_opts(Name, {{1930, 04, 28}, {19,30,22}}, [{time, universal}]),
+    ok = file_write_read_file_info_opts(Name, 1, [{time, posix}]),
     %% will not work on platforms with unsigned time_t
-    %ok = file_write_read_file_info_opts(Handle, Name, -1, [{time, posix}]),
-    %ok = file_write_read_file_info_opts(Handle, Name, -300000, [{time, posix}]),
-    ok = file_write_read_file_info_opts(Handle, Name, 300000, [{time, posix}]),
-    ok = file_write_read_file_info_opts(Handle, Name, 0, [{time, posix}]),
+    %ok = file_write_read_file_info_opts(Name, -1, [{time, posix}]),
+    %ok = file_write_read_file_info_opts(Name, -300000, [{time, posix}]),
+    ok = file_write_read_file_info_opts(Name, 300000, [{time, posix}]),
+    ok = file_write_read_file_info_opts(Name, 0, [{time, posix}]),
 
-    ok = ?PRIM_FILE:stop(Handle),
     ok.
 
-file_write_read_file_info_opts(Handle, Name, Mtime, Opts) ->
-    {ok, FI} = ?PRIM_FILE_call(read_file_info, Handle, [Name, Opts]),
+file_write_read_file_info_opts(Name, Mtime, Opts) ->
+    {ok, FI} = ?PRIM_FILE:read_file_info(Name, Opts),
     FI2 = FI#file_info{ mtime = Mtime },
-    ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI2, Opts]),
-    {ok, FI3} = ?PRIM_FILE_call(read_file_info, Handle, [Name, Opts]),
+    ok = ?PRIM_FILE:write_file_info(Name, FI2, Opts),
+    {ok, FI3} = ?PRIM_FILE:read_file_info(Name, Opts),
     io:format("Expecting mtime = ~p, got ~p~n", [FI2#file_info.mtime, FI3#file_info.mtime]),
     FI2 = FI3,
     ok.
@@ -1175,8 +1038,8 @@ advise(Config) when is_list(Config) ->
 			   atom_to_list(?MODULE)
 			   ++"_advise.fil"),
 
-    Line1 = "Hello\n",
-    Line2 = "World!\n",
+    Line1 = <<"Hello\n">>,
+    Line2 = <<"World!\n">>,
 
     {ok, Fd} = ?PRIM_FILE:open(Advise, [write]),
     ok = ?PRIM_FILE:advise(Fd, 0, 0, normal),
@@ -1226,7 +1089,7 @@ advise(Config) when is_list(Config) ->
     {ok, Fd9} = ?PRIM_FILE:open(Advise, [read]),
     Offset = 0,
     %% same as a 0 length in some implementations
-    Length = length(Line1) + length(Line2),
+    Length = byte_size(Line1) + byte_size(Line2),
     ok = ?PRIM_FILE:advise(Fd9, Offset, Length, sequential),
     {ok, Line1} = ?PRIM_FILE:read_line(Fd9),
     {ok, Line2} = ?PRIM_FILE:read_line(Fd9),
@@ -1250,23 +1113,18 @@ do_large_write(Name) ->
     Chunk = <<0:ChunkSize/unit:8>>,
     Data = zip_data(lists:duplicate(Chunks, Chunk), Interleave),
     Size = Chunks * ChunkSize + Chunks,	% 4 G + 32
-    Wordsize = erlang:system_info(wordsize),
-    case prim_file:write_file(Name, Data) of
-	ok when Wordsize =:= 8 ->
-	    {ok,#file_info{size=Size}} = file:read_file_info(Name),
-	    {ok,Fd} = prim_file:open(Name, [read]),
-	    check_large_write(Fd, ChunkSize, 0, Interleave);
-	{error,einval} when Wordsize =:= 4 ->
-	    ok
-    end.
+    ok = ?PRIM_FILE:write_file(Name, Data),
+    {ok,#file_info{size=Size}} = file:read_file_info(Name),
+    {ok,Fd} = ?PRIM_FILE:open(Name, [read]),
+    check_large_write(Fd, ChunkSize, 0, Interleave).
 
 check_large_write(Fd, ChunkSize, Pos, [X|Interleave]) ->
     Pos1 = Pos + ChunkSize,
-    {ok,Pos1} = prim_file:position(Fd, {cur,ChunkSize}),
-    {ok,[X]} = prim_file:read(Fd, 1),
+    {ok,Pos1} = ?PRIM_FILE:position(Fd, {cur,ChunkSize}),
+    {ok,<<X>>} = ?PRIM_FILE:read(Fd, 1),
     check_large_write(Fd, ChunkSize, Pos1+1, Interleave);
 check_large_write(Fd, _, _, []) ->
-    eof = prim_file:read(Fd, 1),
+    eof = ?PRIM_FILE:read(Fd, 1),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1338,71 +1196,53 @@ allocate_and_assert(Fd, Offset, Length) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-delete_a(Config) when is_list(Config) ->
-    delete(Config, [], "_a").
-
-delete_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = delete(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-delete(Config, Handle, Suffix) ->
+delete(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     Name = filename:join(RootDir,
 			 atom_to_list(?MODULE)
-			 ++"_delete"++Suffix++".fil"),
+			 ++"_delete.fil"),
     {ok, Fd1} = ?PRIM_FILE:open(Name, [write]),
     ?PRIM_FILE:write(Fd1,"ok.\n"),
     ok = ?PRIM_FILE:close(Fd1),
     %% Check that the file is readable
     {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
     ok = ?PRIM_FILE:close(Fd2),
-    ok = ?PRIM_FILE_call(delete, Handle, [Name]),
+    ok = ?PRIM_FILE:delete(Name),
     %% Check that the file is not readable anymore
     {error, _} = ?PRIM_FILE:open(Name, [read]),
     %% Try deleting a nonexistent file
-    {error, enoent} = ?PRIM_FILE_call(delete, Handle, [Name]),
+    {error, enoent} = ?PRIM_FILE:delete(Name),
     ok.
 
-rename_a(Config) when is_list(Config) ->
-    rename(Config, [], "_a").
-
-rename_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = rename(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-rename(Config, Handle, Suffix) ->
+rename(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
-    FileName1 = atom_to_list(?MODULE)++"_rename"++Suffix++".fil",
-    FileName2 = atom_to_list(?MODULE)++"_rename"++Suffix++".ful",
+    FileName1 = atom_to_list(?MODULE)++"_rename.fil",
+    FileName2 = atom_to_list(?MODULE)++"_rename.ful",
     Name1 = filename:join(RootDir, FileName1),
     Name2 = filename:join(RootDir, FileName2),
     {ok,Fd1} = ?PRIM_FILE:open(Name1, [write]),
     ok = ?PRIM_FILE:close(Fd1),
     %% Rename, and check that it really changed name
-    ok = ?PRIM_FILE_call(rename, Handle, [Name1, Name2]),
+    ok = ?PRIM_FILE:rename(Name1, Name2),
     {error, _} = ?PRIM_FILE:open(Name1, [read]),
     {ok, Fd2} = ?PRIM_FILE:open(Name2, [read]),
     ok = ?PRIM_FILE:close(Fd2),
     %% Try renaming something to itself
-    ok = ?PRIM_FILE_call(rename, Handle, [Name2, Name2]),
+    ok = ?PRIM_FILE:rename(Name2, Name2),
     %% Try renaming something that doesn't exist
     {error, enoent} =
-	?PRIM_FILE_call(rename, Handle, [Name1, Name2]),
+	?PRIM_FILE:rename(Name1, Name2),
     %% Try renaming to something else than a string
     {error, badarg} =
-	?PRIM_FILE_call(rename, Handle, [Name1, foobar]),
+	?PRIM_FILE:rename(Name1, foobar),
 
     %% Move between directories
     DirName1 = filename:join(RootDir,
 			     atom_to_list(?MODULE)
-			     ++"_rename_dir"++Suffix),
+			     ++"_rename_dir"),
     DirName2 = filename:join(RootDir,
 			     atom_to_list(?MODULE)
-			     ++"_second_rename_dir"++Suffix),
+			     ++"_second_rename_dir"),
     Name1foo = filename:join(DirName1, "foo.fil"),
     Name2foo = filename:join(DirName2, "foo.fil"),
     Name2bar = filename:join(DirName2, "bar.dir"),
@@ -1410,21 +1250,21 @@ rename(Config, Handle, Suffix) ->
     %% The name has to include the full file name, path is not enough
     expect(
       {error, eexist}, {error, eisdir},
-      ?PRIM_FILE_call(rename, Handle, [Name2, DirName1])),
+      ?PRIM_FILE:rename(Name2, DirName1)),
     ok =
-	?PRIM_FILE_call(rename, Handle, [Name2, Name1foo]),
+	?PRIM_FILE:rename(Name2, Name1foo),
     %% Now rename the directory
-    ok = ?PRIM_FILE_call(rename, Handle, [DirName1, DirName2]),
+    ok = ?PRIM_FILE:rename(DirName1, DirName2),
     %% And check that the file is there now
     {ok,Fd3} = ?PRIM_FILE:open(Name2foo, [read]),
     ok = ?PRIM_FILE:close(Fd3),
     %% Try some dirty things now: move the directory into itself
     {error, Msg1} =
-	?PRIM_FILE_call(rename, Handle, [DirName2, Name2bar]),
+	?PRIM_FILE:rename(DirName2, Name2bar),
     io:format("Errmsg1: ~p",[Msg1]),
     %% move dir into a file in itself
     {error, Msg2} =
-	?PRIM_FILE_call(rename, Handle, [DirName2, Name2foo]),
+	?PRIM_FILE:rename(DirName2, Name2foo),
     io:format("Errmsg2: ~p",[Msg2]),
 
     ok.
@@ -1657,165 +1497,19 @@ e_del_dir(Config) when is_list(Config) ->
     ok.
 
 
-%% Trying reading and positioning from a compressed file.
-
-read_compressed(Config) when is_list(Config) ->
-    Data = proplists:get_value(data_dir, Config),
-    Real = filename:join(Data, "realmen.html.gz"),
-    {ok, Fd} = ?PRIM_FILE:open(Real, [read, compressed]),
-    try_read_file(Fd).
-
-%% Trying reading and positioning from an uncompressed file,
-%% but with the compressed flag given.
-
-read_not_really_compressed(Config) when is_list(Config) ->
-    Data = proplists:get_value(data_dir, Config),
-    Priv = proplists:get_value(priv_dir, Config),
-
-    %% The file realmen.html might have got CRs added (by WinZip).
-    %% Remove them, or the file positions will not be correct.
-
-    Real = filename:join(Data, "realmen.html"),
-    RealPriv = filename:join(Priv,
-			     atom_to_list(?MODULE)++"_realmen.html"),
-    {ok, RealDataBin} = ?PRIM_FILE:read_file(Real),
-    RealData = remove_crs(binary_to_list(RealDataBin), []),
-    ok = ?PRIM_FILE:write_file(RealPriv, RealData),
-    {ok, Fd} = ?PRIM_FILE:open(RealPriv, [read, compressed]),
-    try_read_file(Fd).
-
-remove_crs([$\r|Rest], Result) ->
-    remove_crs(Rest, Result);
-remove_crs([C|Rest], Result) ->
-    remove_crs(Rest, [C|Result]);
-remove_crs([], Result) ->
-    lists:reverse(Result).
-
-try_read_file(Fd) ->
-    %% Seek to the current position (nothing should happen).
-
-    {ok, 0} = ?PRIM_FILE:position(Fd, 0),
-    {ok, 0} = ?PRIM_FILE:position(Fd, {cur, 0}),
-
-    %% Read a few lines from a compressed file.
-
-    ShouldBe = "<TITLE>Real Programmers Don't Use PASCAL</TITLE>\n",
-    {ok, ShouldBe} = ?PRIM_FILE:read(Fd, length(ShouldBe)),
-
-    %% Now seek forward.
-
-    {ok, 381} = ?PRIM_FILE:position(Fd, 381),
-    Back = "Back in the good old days -- the \"Golden Era\" " ++
-	"of computers, it was\n",
-    {ok, Back} = ?PRIM_FILE:read(Fd, length(Back)),
-
-    %% Try to search forward relative to the current position.
-
-    {ok, CurPos} = ?PRIM_FILE:position(Fd, {cur, 0}),
-    RealPos = 4273,
-    {ok, RealPos} = ?PRIM_FILE:position(Fd, {cur, RealPos-CurPos}),
-    RealProg = "<LI> Real Programmers aren't afraid to use GOTOs.\n",
-    {ok, RealProg} = ?PRIM_FILE:read(Fd, length(RealProg)),
-
-    %% Seek backward.
-
-    AfterTitle = length("<TITLE>"),
-    {ok, AfterTitle} = ?PRIM_FILE:position(Fd, AfterTitle),
-    Title = "Real Programmers Don't Use PASCAL</TITLE>\n",
-    {ok, Title} = ?PRIM_FILE:read(Fd, length(Title)),
-
-    %% Done.
-
-    ?PRIM_FILE:close(Fd),
-    ok.
-
-write_compressed(Config) when is_list(Config) ->
-    Priv = proplists:get_value(priv_dir, Config),
-    MyFile = filename:join(Priv,
-			   atom_to_list(?MODULE)++"_test.gz"),
-
-    %% Write a file.
-
-    {ok, Fd} = ?PRIM_FILE:open(MyFile, [write, compressed]),
-    {ok, 0} = ?PRIM_FILE:position(Fd, 0),
-    Prefix = "hello\n",
-    End = "end\n",
-    ok = ?PRIM_FILE:write(Fd, Prefix),
-    {ok, 143} = ?PRIM_FILE:position(Fd, 143),
-    ok = ?PRIM_FILE:write(Fd, End),
-    ok = ?PRIM_FILE:close(Fd),
-
-    %% Read the file and verify the contents.
-
-    {ok, Fd1} = ?PRIM_FILE:open(MyFile, [read, compressed]),
-    {ok, Prefix} = ?PRIM_FILE:read(Fd1, length(Prefix)),
-    Second = lists:duplicate(143-length(Prefix), 0) ++ End,
-    {ok, Second} = ?PRIM_FILE:read(Fd1, length(Second)),
-    ok = ?PRIM_FILE:close(Fd1),
-
-    %% Ensure that the file is compressed.
-
-    TotalSize = 143 + length(End),
-    case ?PRIM_FILE:read_file_info(MyFile) of
-	{ok, #file_info{size=Size}} when Size < TotalSize ->
-	    ok;
-	{ok, #file_info{size=Size}} when Size == TotalSize ->
-	    ct:fail(file_not_compressed)
-    end,
-
-    %% Write again to ensure that the file is truncated.
-
-    {ok, Fd2} = ?PRIM_FILE:open(MyFile, [write, compressed]),
-    NewString = "aaaaaaaaaaa",
-    ok = ?PRIM_FILE:write(Fd2, NewString),
-    ok = ?PRIM_FILE:close(Fd2),
-    {ok, Fd3} = ?PRIM_FILE:open(MyFile, [read, compressed]),
-    {ok, NewString} = ?PRIM_FILE:read(Fd3, 1024),
-    ok = ?PRIM_FILE:close(Fd3),
-
-    ok.
-
-compress_errors(Config) when is_list(Config) ->
-    Data = proplists:get_value(data_dir, Config),
-    {error, enoent} = ?PRIM_FILE:open("non_existing__",
-				      [compressed, read]),
-    {error, einval} = ?PRIM_FILE:open("non_existing__",
-				      [compressed, read, write]),
-
-    %% Read a corrupted .gz file.
-
-    Corrupted = filename:join(Data, "corrupted.gz"),
-    {ok, Fd} = ?PRIM_FILE:open(Corrupted, [read, compressed]),
-    {error, eio} = ?PRIM_FILE:read(Fd, 100),
-    ?PRIM_FILE:close(Fd),
-
-    ok.
-
-
-%% Test creating a hard link.
-make_link_a(Config) when is_list(Config) ->
-    make_link(Config, [], "_a").
-
-%% Test creating a hard link.
-make_link_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = make_link(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-make_link(Config, Handle, Suffix) ->
+make_link(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     NewDir = filename:join(RootDir,
 			   atom_to_list(?MODULE)
-			   ++"_make_link"++Suffix),
-    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+			   ++"_make_link"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
 
     Name = filename:join(NewDir, "a_file"),
     ok = ?PRIM_FILE:write_file(Name, "some contents\n"),
 
     Alias = filename:join(NewDir, "an_alias"),
     Result =
-	case ?PRIM_FILE_call(make_link, Handle, [Name, Alias]) of
+	case ?PRIM_FILE:make_link(Name, Alias) of
 	    {error, enotsup} ->
 		{skipped, "Links not supported on this platform"};
 	    ok ->
@@ -1826,12 +1520,12 @@ make_link(Config, Handle, Suffix) ->
 		%% since they are not used on symbolic links.
 
 		{ok, Info} =
-		    ?PRIM_FILE_call(read_link_info, Handle, [Name]),
+		    ?PRIM_FILE:read_link_info(Name),
 		{ok, Info} =
-		    ?PRIM_FILE_call(read_link_info, Handle, [Alias]),
+		    ?PRIM_FILE:read_link_info(Alias),
 		#file_info{links = 2, type = regular} = Info,
 		{error, eexist} =
-		    ?PRIM_FILE_call(make_link, Handle, [Name, Alias]),
+		    ?PRIM_FILE:make_link(Name, Alias),
 		ok
 	end,
 
@@ -1843,30 +1537,19 @@ read_link_info_for_non_link(Config) when is_list(Config) ->
     {ok, #file_info{type=directory}} = ?PRIM_FILE:read_link_info("."),
     ok.
 
-%% Test operations on symbolic links (for Unix).
-symlinks_a(Config) when is_list(Config) ->
-    symlinks(Config, [], "_a").
-
-%% Test operations on symbolic links (for Unix).
-symlinks_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = symlinks(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-symlinks(Config, Handle, Suffix) ->
+symlinks(Config) when is_list(Config)  ->
     RootDir = proplists:get_value(priv_dir, Config),
     NewDir = filename:join(RootDir,
 			   atom_to_list(?MODULE)
-			   ++"_make_symlink"++Suffix),
-    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+			   ++"_make_symlink"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
 
     Name = filename:join(NewDir, "a_plain_file"),
     ok = ?PRIM_FILE:write_file(Name, "some stupid content\n"),
 
     Alias = filename:join(NewDir, "a_symlink_alias"),
     Result =
-	case ?PRIM_FILE_call(make_symlink, Handle, [Name, Alias]) of
+	case ?PRIM_FILE:make_symlink(Name, Alias) of
 	    {error, enotsup} ->
 		{skipped, "Links not supported on this platform"};
 	    {error, eperm} ->
@@ -1874,20 +1557,20 @@ symlinks(Config, Handle, Suffix) ->
 		{skipped, "Windows user not privileged to create links"};
 	    ok ->
 		{ok, Info1} =
-		    ?PRIM_FILE_call(read_file_info, Handle, [Name]),
+		    ?PRIM_FILE:read_file_info(Name),
 		{ok, Info1} =
-		    ?PRIM_FILE_call(read_file_info, Handle, [Alias]),
+		    ?PRIM_FILE:read_file_info(Alias),
 		{ok, Info1} =
-		    ?PRIM_FILE_call(read_link_info, Handle, [Name]),
+		    ?PRIM_FILE:read_link_info(Name),
 		#file_info{links = 1, type = regular} = Info1,
 
 		{ok, Info2} =
-		    ?PRIM_FILE_call(read_link_info, Handle, [Alias]),
+		    ?PRIM_FILE:read_link_info(Alias),
 		#file_info{links=1, type=symlink} = Info2,
 		{ok, Name} =
-		    ?PRIM_FILE_call(read_link, Handle, [Alias]),
+		    ?PRIM_FILE:read_link(Alias),
 		{ok, Name} =
-		    ?PRIM_FILE_call(read_link_all, Handle, [Alias]),
+		    ?PRIM_FILE:read_link_all(Alias),
 		%% If all is good, delete dir again (avoid hanging dir on windows)
 		rm_rf(?PRIM_FILE,NewDir),
 		ok
@@ -1907,10 +1590,9 @@ list_dir_limit(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     NewDir = filename:join(RootDir,
 			   atom_to_list(?MODULE)++"_list_dir_limit"),
-    {ok, Handle1} = ?PRIM_FILE:start(),
-    ok = ?PRIM_FILE_call(make_dir, Handle1, [NewDir]),
+    ok = ?PRIM_FILE:make_dir(NewDir),
     Ref = erlang:start_timer(MaxTime*1000, self(), []),
-    Result = list_dir_limit_loop(NewDir, Handle1, Ref, MaxNumber, 0),
+    Result = list_dir_limit_loop(NewDir, Ref, MaxNumber, 0),
     Time = case erlang:cancel_timer(Ref) of
 	       false -> MaxTime;
 	       T -> MaxTime - (T div 1000)
@@ -1920,21 +1602,18 @@ list_dir_limit(Config) when is_list(Config) ->
 		 {error, _Reason, N} -> N;
 		 _ -> 0
 	     end,
-    {ok, Handle2} = ?PRIM_FILE:start(),
-    list_dir_limit_cleanup(NewDir, Handle2, Number, 0),
-    ok = ?PRIM_FILE:stop(Handle1),
-    ok = ?PRIM_FILE:stop(Handle2),
+    list_dir_limit_cleanup(NewDir, Number, 0),
     {ok, Number} = Result,
     {comment, 
      "Created " ++ integer_to_list(Number) ++ " files in " 
      ++ integer_to_list(Time) ++ " seconds."}.
 
-list_dir_limit_loop(Dir, Handle, _Ref, N, Cnt) when Cnt >= N ->
-    list_dir_check(Dir, Handle, Cnt);
-list_dir_limit_loop(Dir, Handle, Ref, N, Cnt) ->
+list_dir_limit_loop(Dir, _Ref, N, Cnt) when Cnt >= N ->
+    list_dir_check(Dir, Cnt);
+list_dir_limit_loop(Dir, Ref, N, Cnt) ->
     receive 
 	{timeout, Ref, []} -> 
-	    list_dir_check(Dir, Handle, Cnt)
+	    list_dir_check(Dir, Cnt)
     after 0 ->
 	    Name = integer_to_list(Cnt),
 	    case ?PRIM_FILE:write_file(filename:join(Dir, Name), Name) of
@@ -1942,23 +1621,23 @@ list_dir_limit_loop(Dir, Handle, Ref, N, Cnt) ->
 		    Next = Cnt + 1,
 		    case Cnt rem 100 of
 			0 ->
-			    case list_dir_check(Dir, Handle, Next) of
+			    case list_dir_check(Dir, Next) of
 				{ok, Next} ->
 				    list_dir_limit_loop(
-				      Dir, Handle, Ref, N, Next);
+				      Dir, Ref, N, Next);
 				Other ->
 				    Other
 			    end;
 			_ ->
-			    list_dir_limit_loop(Dir, Handle, Ref, N, Next)
+			    list_dir_limit_loop(Dir, Ref, N, Next)
 		    end;
 		{error, Reason} ->
 		    {error, Reason, Cnt}
 	    end
     end.
 
-list_dir_check(Dir, Handle, Cnt) ->
-    case ?PRIM_FILE:list_dir(Handle, Dir) of
+list_dir_check(Dir, Cnt) ->
+    case ?PRIM_FILE:list_dir(Dir) of
 	{ok, ListDir} ->
 	    case length(ListDir) of
 		Cnt ->
@@ -1975,18 +1654,18 @@ list_dir_check(Dir, Handle, Cnt) ->
 %% Deletes N files while ignoring errors, then continues deleting
 %% as long as they exist.
 
-list_dir_limit_cleanup(Dir, Handle, N, Cnt) when Cnt >= N ->
+list_dir_limit_cleanup(Dir, N, Cnt) when Cnt >= N ->
     Name = integer_to_list(Cnt),
-    case ?PRIM_FILE:delete(Handle, filename:join(Dir, Name)) of
+    case ?PRIM_FILE:delete(filename:join(Dir, Name)) of
 	ok ->
-	    list_dir_limit_cleanup(Dir, Handle, N, Cnt+1);
+	    list_dir_limit_cleanup(Dir, N, Cnt+1);
 	_ ->
 	    ok
     end;
-list_dir_limit_cleanup(Dir, Handle, N, Cnt) ->
+list_dir_limit_cleanup(Dir, N, Cnt) ->
     Name = integer_to_list(Cnt),
-    ?PRIM_FILE:delete(Handle, filename:join(Dir, Name)),
-    list_dir_limit_cleanup(Dir, Handle, N, Cnt+1).
+    ?PRIM_FILE:delete(filename:join(Dir, Name)),
+    list_dir_limit_cleanup(Dir, N, Cnt+1).
 
 %%%
 %%% Test list_dir() on a non-existing pathname.
@@ -1995,7 +1674,7 @@ list_dir_limit_cleanup(Dir, Handle, N, Cnt) ->
 list_dir_error(Config) ->
     Priv = proplists:get_value(priv_dir, Config),
     NonExisting = filename:join(Priv, "non-existing-dir"),
-    {error,enoent} = prim_file:list_dir(NonExisting),
+    {error,enoent} = ?PRIM_FILE:list_dir(NonExisting),
     ok.
 
 %%%
@@ -2063,7 +1742,7 @@ do_run_large_file_test(Config, Run, Name0) ->
 		      {'DOWN',Mref,_,_,_} -> ok;
 		      {Tester,done} -> ok
 		  end,
-		  prim_file:delete(Name)
+		  ?PRIM_FILE:delete(Name)
 	  end),
 
     %% Run the test case.
@@ -2108,12 +1787,25 @@ free_memory() ->
 		       {value, {buffered_memory, Buffed}} -> Buffed;
 		       false -> 0
 		   end),
-	TotFree div (1024*1024)
+	usable_mem(TotFree) div (1024*1024)
     catch
 	error : undef ->
 	    ct:fail({"os_mon not built"})
     end.
 
+usable_mem(Memory) ->
+    case test_server:is_valgrind() of
+        true ->
+            %% Valgrind uses extra memory for the V- and A-bits.
+            %% http://valgrind.org/docs/manual/mc-manual.html#mc-manual.value
+            %% Docs says it uses "compression to represent the V bits compactly"
+            %% but let's be conservative and cut usable memory in half.
+            Memory div 2;
+        false ->
+            Memory
+    end.
+
+
 %%%-----------------------------------------------------------------
 %%% Utilities
 rm_rf(Mod,Dir) ->
diff --git a/lib/kernel/test/sendfile_SUITE.erl b/lib/kernel/test/sendfile_SUITE.erl
index bfa564c32c..0c0b1cbcb6 100644
--- a/lib/kernel/test/sendfile_SUITE.erl
+++ b/lib/kernel/test/sendfile_SUITE.erl
@@ -23,30 +23,41 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
--compile(export_all).
-
-all() -> [{group,async_threads},
-	  {group,no_async_threads}].
-
-groups() ->
-    [{async_threads,[],tcs()},
-     {no_async_threads,[],tcs()}].
-
-tcs() ->
-    [t_sendfile_small
-     ,t_sendfile_big_all
-     ,t_sendfile_big_size
-     ,t_sendfile_many_small
-     ,t_sendfile_partial
-     ,t_sendfile_offset
-     ,t_sendfile_sendafter
-     ,t_sendfile_recvafter
-     ,t_sendfile_recvafter_remoteclose
-     ,t_sendfile_sendduring
-     ,t_sendfile_recvduring
-     ,t_sendfile_closeduring
-     ,t_sendfile_crashduring
-    ].
+-export([all/0, init_per_suite/1, end_per_suite/1, init_per_testcase/2]).
+
+-export([sendfile_server/2, sendfile_do_recv/2, init/1, handle_event/2]).
+
+-export(
+    [t_sendfile_small/1,
+     t_sendfile_big_all/1,
+     t_sendfile_big_size/1,
+     t_sendfile_many_small/1,
+     t_sendfile_partial/1,
+     t_sendfile_offset/1,
+     t_sendfile_sendafter/1,
+     t_sendfile_recvafter/1,
+     t_sendfile_recvafter_remoteclose/1,
+     t_sendfile_sendduring/1,
+     t_sendfile_recvduring/1,
+     t_sendfile_closeduring/1,
+     t_sendfile_crashduring/1,
+     t_sendfile_arguments/1]).
+
+all() ->
+    [t_sendfile_small,
+     t_sendfile_big_all,
+     t_sendfile_big_size,
+     t_sendfile_many_small,
+     t_sendfile_partial,
+     t_sendfile_offset,
+     t_sendfile_sendafter,
+     t_sendfile_recvafter,
+     t_sendfile_recvafter_remoteclose,
+     t_sendfile_sendduring,
+     t_sendfile_recvduring,
+     t_sendfile_closeduring,
+     t_sendfile_crashduring,
+     t_sendfile_arguments].
 
 init_per_suite(Config) ->
     case {os:type(),os:version()} of
@@ -72,28 +83,18 @@ init_per_suite(Config) ->
 end_per_suite(Config) ->
     file:delete(proplists:get_value(big_file, Config)).
 
-init_per_group(async_threads,Config) ->
-    case erlang:system_info(thread_pool_size) of
-	0 ->
-	    {skip,"No async threads"};
-	_ ->
-	    [{sendfile_opts,[{use_threads,true}]}|Config]
-    end;
-init_per_group(no_async_threads,Config) ->
-    [{sendfile_opts,[{use_threads,false}]}|Config].
-
-end_per_group(_,_Config) ->
-    ok.
-
 init_per_testcase(TC,Config) when TC == t_sendfile_recvduring;
 				  TC == t_sendfile_sendduring ->
     Filename = proplists:get_value(small_file, Config),
 
     Send = fun(Sock) ->
 		   {_Size, Data} = sendfile_file_info(Filename),
-		   {ok,D} = file:open(Filename, [raw,binary,read]),
-		   prim_file:sendfile(D, Sock, 0, 0, 0,
-				      [],[],[]),
+		   {ok,Fd} = file:open(Filename, [raw,binary,read]),
+                   %% Determine whether the driver has native support by
+                   %% hitting the raw module directly; file:sendfile/5 will
+                   %% land in the fallback if it doesn't.
+                   RawModule = Fd#file_descriptor.module,
+                   {ok, _Ignored} = RawModule:sendfile(Fd,Sock,0,0,0,[],[],[]),
 		   Data
 	   end,
 
@@ -105,9 +106,8 @@ init_per_testcase(TC,Config) when TC == t_sendfile_recvduring;
 	    ct:log("Error: ~p",[Error]),
 	    {skip,"Not supported"}
     end;
-init_per_testcase(_Tc,Config) ->
-    Config ++ [{sendfile_opts,[{use_threads,false}]}].
-
+init_per_testcase(_TC,Config) ->
+    Config.
 
 t_sendfile_small(Config) when is_list(Config) ->
     Filename = proplists:get_value(small_file, Config),
@@ -124,7 +124,7 @@ t_sendfile_small(Config) when is_list(Config) ->
 t_sendfile_many_small(Config) when is_list(Config) ->
     Filename = proplists:get_value(small_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     error_logger:add_report_handler(?MODULE,[self()]),
 
@@ -151,7 +151,7 @@ t_sendfile_many_small(Config) when is_list(Config) ->
 
 t_sendfile_big_all(Config) when is_list(Config) ->
     Filename = proplists:get_value(big_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {ok, #file_info{size = Size}} =
@@ -165,7 +165,7 @@ t_sendfile_big_all(Config) when is_list(Config) ->
 t_sendfile_big_size(Config) ->
     Filename = proplists:get_value(big_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     SendAll = fun(Sock) ->
 		      {ok, #file_info{size = Size}} =
@@ -180,7 +180,7 @@ t_sendfile_big_size(Config) ->
 t_sendfile_partial(Config) ->
     Filename = proplists:get_value(small_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     SendSingle = fun(Sock) ->
 			 {_Size, <<Data:5/binary,_/binary>>} =
@@ -217,7 +217,7 @@ t_sendfile_partial(Config) ->
 t_sendfile_offset(Config) ->
     Filename = proplists:get_value(small_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {_Size, <<_:5/binary,Data:3/binary,_/binary>> = AllData} =
@@ -233,7 +233,7 @@ t_sendfile_offset(Config) ->
 
 t_sendfile_sendafter(Config) ->
     Filename = proplists:get_value(small_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {Size, Data} = sendfile_file_info(Filename),
@@ -246,7 +246,7 @@ t_sendfile_sendafter(Config) ->
 
 t_sendfile_recvafter(Config) ->
     Filename = proplists:get_value(small_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {Size, Data} = sendfile_file_info(Filename),
@@ -279,7 +279,7 @@ t_sendfile_recvafter_remoteclose(Config) ->
 
 t_sendfile_sendduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {ok, #file_info{size = Size}} =
@@ -296,7 +296,7 @@ t_sendfile_sendduring(Config) ->
 
 t_sendfile_recvduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {ok, #file_info{size = Size}} =
@@ -315,7 +315,7 @@ t_sendfile_recvduring(Config) ->
 
 t_sendfile_closeduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock,SFServPid) ->
 		   spawn_link(fun() ->
@@ -345,7 +345,7 @@ t_sendfile_closeduring(Config) ->
 
 t_sendfile_crashduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     error_logger:add_report_handler(?MODULE,[self()]),
 
@@ -373,6 +373,36 @@ t_sendfile_crashduring(Config) ->
 		end
 	end.
 
+t_sendfile_arguments(Config) ->
+    Filename = proplists:get_value(small_file, Config),
+
+    {ok, Listener} = gen_tcp:listen(0,
+        [{packet, 0}, {active, false}, {reuseaddr, true}]),
+    {ok, Port} = inet:port(Listener),
+
+    ErrorCheck =
+        fun(Reason, Offset, Length, Opts) ->
+            {ok, Sender} = gen_tcp:connect({127, 0, 0, 1}, Port,
+                [{packet, 0}, {active, false}]),
+            {ok, Receiver} = gen_tcp:accept(Listener),
+            {ok, Fd} = file:open(Filename, [read, raw]),
+            {error, Reason} = file:sendfile(Fd, Sender, Offset, Length, Opts),
+            gen_tcp:close(Receiver),
+            gen_tcp:close(Sender),
+            file:close(Fd)
+        end,
+
+    ErrorCheck(einval, -1, 0, []),
+    ErrorCheck(einval, 0, -1, []),
+    ErrorCheck(badarg, gurka, 0, []),
+    ErrorCheck(badarg, 0, gurka, []),
+    ErrorCheck(badarg, 0, 0, gurka),
+    ErrorCheck(badarg, 0, 0, [{chunk_size, gurka}]),
+
+    gen_tcp:close(Listener),
+
+    ok.
+
 %% Generic sendfile server code
 sendfile_send(Send) ->
     sendfile_send({127,0,0,1},Send).
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index 7be7e503df..f203ef878f 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -166,7 +166,7 @@ api_deflateInit(Config) when is_list(Config) ->
 			  ?m(ok, zlib:deflateInit(Z12,default,deflated,-Wbits,8,default)),
 			  ?m(ok,zlib:close(Z11)),
 			  ?m(ok,zlib:close(Z12))
-		  end, lists:seq(8, 15)),
+		  end, lists:seq(9, 15)),
 
     lists:foreach(fun(MemLevel) ->
 			  Z = zlib:open(),
@@ -213,12 +213,46 @@ api_deflateReset(Config) when is_list(Config) ->
 
 %% Test deflateParams.
 api_deflateParams(Config) when is_list(Config) ->
+    Levels = [none, default, best_speed, best_compression] ++ lists:seq(0, 9),
+    Strategies = [filtered, huffman_only, rle, default],
+
     Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
-    ?m(L when is_list(L), zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, none)),
-    ?m(ok, zlib:deflateParams(Z1, best_compression, huffman_only)),
-    ?m(L when is_list(L), zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, sync)),
-    ?m(ok, zlib:close(Z1)).
+
+    ApiTest =
+        fun(Level, Strategy) ->
+            ?m(ok, zlib:deflateParams(Z1, Level, Strategy)),
+            ?m(ok, zlib:deflateReset(Z1))
+        end,
+
+    [ ApiTest(Level, Strategy) || Level <- Levels, Strategy <- Strategies ],
+
+    ?m(ok, zlib:close(Z1)),
+
+    FlushTest =
+        fun FlushTest(Size, Level, Strategy) ->
+            Z = zlib:open(),
+            ok = zlib:deflateInit(Z, default),
+            Data = gen_determ_rand_bytes(Size),
+            case zlib:deflate(Z, Data, none) of
+                [<<120, 156>>] ->
+                    %% All data is present in the internal zlib state, and will
+                    %% be flushed on deflateParams.
+
+                    ok = zlib:deflateParams(Z, Level, Strategy),
+                    Compressed = [<<120, 156>>, zlib:deflate(Z, <<>>, finish)],
+                    Data = zlib:uncompress(Compressed),
+                    zlib:close(Z),
+
+                    FlushTest(Size + (1 bsl 10), Level, Strategy);
+                _Other ->
+                    ok
+            end
+        end,
+
+    [ FlushTest(1, Level, Strategy) || Level <- Levels, Strategy <- Strategies ],
+
+    ok.
 
 %% Test deflate.
 api_deflate(Config) when is_list(Config) ->
@@ -652,6 +686,11 @@ api_g_un_zip(Config) when is_list(Config) ->
     Concatenated = <<Bin/binary, Bin/binary>>,
     ?m(Concatenated, zlib:gunzip([Comp, Comp])),
 
+    %% Don't explode if the uncompressed size is a perfect multiple of the
+    %% internal inflate chunk size.
+    ChunkSizedData = <<0:16384/unit:8>>,
+    ?m(ChunkSizedData, zlib:gunzip(zlib:gzip(ChunkSizedData))),
+
     %% Bad CRC; bad length.
     BadCrc = bad_crc_data(),
     ?m(?EXIT(data_error),(catch zlib:gunzip(BadCrc))),
@@ -762,13 +801,13 @@ zip_usage({run,ZIP,ORIG}) ->
 
     ?m(ok, zlib:deflateInit(Z, default, deflated, -15, 8, default)),
     C2 = zlib:deflate(Z, ORIG, finish),
-    ?m(true, C1 == list_to_binary(C2)),
+    ?m(ORIG, zlib:unzip(C2)),
     ?m(ok, zlib:deflateEnd(Z)),
 
     ?m(ok, zlib:deflateInit(Z, none, deflated, -15, 8, filtered)),
     ?m(ok, zlib:deflateParams(Z, default, default)),
     C3 = zlib:deflate(Z, ORIG, finish),
-    ?m(true, C1 == list_to_binary(C3)),
+    ?m(ORIG, zlib:unzip(C3)),
     ?m(ok, zlib:deflateEnd(Z)),
 
     ok = zlib:close(Z),
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index cef54dd41a..91261e1d55 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 5.4
+KERNEL_VSN = 5.4.2
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index deb2bfcff3..54e048a172 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -37,7 +37,22 @@
   section is the version number of Megaco.</p>
 
 
-  <section><title>Megaco 3.18.2</title>
+  <section><title>Megaco 3.18.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Megaco 3.18.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 9c6ba5bba0..a4f7de7f07 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.18.2
+MEGACO_VSN  = 3.18.3
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/mnesia/doc/src/Makefile b/lib/mnesia/doc/src/Makefile
index da7a9e9516..82fcf66256 100644
--- a/lib/mnesia/doc/src/Makefile
+++ b/lib/mnesia/doc/src/Makefile
@@ -48,6 +48,7 @@ XML_PART_FILES = \
 
 XML_CHAPTER_FILES = \
 	Mnesia_chap1.xml \
+	Mnesia_overview.xml \
 	Mnesia_chap2.xml \
 	Mnesia_chap3.xml \
 	Mnesia_chap4.xml \
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 026c6a89d7..ba94e913f5 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,49 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.15.1</title>
+  <section><title>Mnesia 4.15.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Removed a quadratic behavior in startup. This change
+	    implies that backend plugins (if used) must be set when
+	    the schema is created or via configuration parameters
+	    before mnesia is started.</p>
+          <p>
+	    Own Id: OTP-14829 Aux Id: ERIERL-84 </p>
+        </item>
+        <item>
+          <p>
+	    Bad timing could crash mnesia after a checkpoint was
+	    deactivated and reactivated with the same checkpoint name
+	    on different tables.</p>
+          <p>
+	    Own Id: OTP-14841 Aux Id: ERIERL-113 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.15.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix backup error handling, the real failure reason was
+	    not returned.</p>
+          <p>
+	    Own Id: OTP-14776 Aux Id: ERIERL-103 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.15.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl
index b68b2de028..6d87544bd2 100644
--- a/lib/mnesia/src/mnesia.erl
+++ b/lib/mnesia/src/mnesia.erl
@@ -151,7 +151,8 @@
         {'snmp', SnmpStruct::term()} |
         {'storage_properties', [{Backend::module(), [BackendProp::_]}]} |
         {'type', 'set' | 'ordered_set' | 'bag'} |
-        {'local_content', boolean()}.
+        {'local_content', boolean()} |
+        {'user_properties', proplists:proplist()}.
 
 -type t_result(Res) :: {'atomic', Res} | {'aborted', Reason::term()}.
 -type activity() :: 'ets' | 'async_dirty' | 'sync_dirty' | 'transaction' | 'sync_transaction' |
@@ -176,8 +177,8 @@
 
 %% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
@@ -2681,7 +2682,7 @@ del_table_index(Tab, Ix) ->
 
 -spec transform_table(Tab::table(), Fun, [Attr]) -> t_result(ok) when
       Attr :: atom(),
-      Fun:: fun((Record::tuple()) -> Transformed::tuple()).
+      Fun:: fun((Record::tuple()) -> Transformed::tuple()) | ignore.
 transform_table(Tab, Fun, NewA) ->
     try val({Tab, record_name}) of
 	OldRN -> mnesia_schema:transform_table(Tab, Fun, NewA, OldRN)
@@ -2692,7 +2693,7 @@ transform_table(Tab, Fun, NewA) ->
 -spec transform_table(Tab::table(), Fun, [Attr], RecName) -> t_result(ok) when
       RecName :: atom(),
       Attr :: atom(),
-      Fun:: fun((Record::tuple()) -> Transformed::tuple()).
+      Fun:: fun((Record::tuple()) -> Transformed::tuple()) | ignore.
 transform_table(Tab, Fun, NewA, NewRN) ->
     mnesia_schema:transform_table(Tab, Fun, NewA, NewRN).
 
diff --git a/lib/mnesia/src/mnesia.hrl b/lib/mnesia/src/mnesia.hrl
index da7e662288..e36222d098 100644
--- a/lib/mnesia/src/mnesia.hrl
+++ b/lib/mnesia/src/mnesia.hrl
@@ -47,6 +47,10 @@
 -define(catch_val(Var), (try ?ets_lookup_element(mnesia_gvar, Var, 2)
 			 catch error:_ -> {'EXIT', {badarg, []}} end)).
 
+-define(catch_val_and_stack(Var),
+        (try ?ets_lookup_element(mnesia_gvar, Var, 2)
+         catch error:_:_Stacktrace -> {'EXIT', _Stacktrace} end)).
+
 %% It's important that counter is first, since we compare tid's
 
 -record(tid,
diff --git a/lib/mnesia/src/mnesia_bup.erl b/lib/mnesia/src/mnesia_bup.erl
index 34f16f178b..9dda340333 100644
--- a/lib/mnesia/src/mnesia_bup.erl
+++ b/lib/mnesia/src/mnesia_bup.erl
@@ -90,9 +90,9 @@ iterate(Mod, Fun, Opaque, Acc) ->
 	    catch throw:Err ->
 		    close_read(R2),
 		    Err;
-		  _:Reason ->
+		  _:Reason:Stacktrace ->
 		    close_read(R2),
-		    {error, {Reason, erlang:get_stacktrace()}}
+		    {error, {Reason, Stacktrace}}
 	    end
     catch throw:{error,_} = Err ->
 	    Err
@@ -198,9 +198,9 @@ do_read_schema_section(R) ->
     try
 	{R3, RawSchema} = safe_apply(R2, read, [R2#restore.bup_data]),
 	do_read_schema_section(R3, verify_header(RawSchema), [])
-    catch T:E ->
+    catch T:E:S ->
 	    close_read(R2),
-	    erlang:raise(T,E,erlang:get_stacktrace())
+	    erlang:raise(T,E,S)
     end.
 
 do_read_schema_section(R, {ok, B, C, []}, Acc) ->
diff --git a/lib/mnesia/src/mnesia_checkpoint.erl b/lib/mnesia/src/mnesia_checkpoint.erl
index 2ff77326a9..8290237908 100644
--- a/lib/mnesia/src/mnesia_checkpoint.erl
+++ b/lib/mnesia/src/mnesia_checkpoint.erl
@@ -857,9 +857,9 @@ retainer_loop(Cp = #checkpoint_args{is_activated=false, name=Name}) ->
 retainer_loop(Cp = #checkpoint_args{name=Name}) ->
     receive
 	{_From, {retain, Tid, Tab, Key, OldRecs}} ->
-	    R = val({Tab, {retainer, Name}}),
+	    R = ?catch_val({Tab, {retainer, Name}}),
 	    PendingTab = Cp#checkpoint_args.pending_tab,
-	    case R#retainer.really_retain of
+            case is_record(R, retainer) andalso R#retainer.really_retain of
 		true ->
 		    Store = R#retainer.store,
 		    try true = ets:member(PendingTab, Tid),
@@ -1269,9 +1269,9 @@ system_code_change(Cp, _Module, _OldVsn, _Extra) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
-	_VaLuE_ -> _VaLuE_
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
+	Value -> Value
     end.
-
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index 77013489b3..77e67a59db 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -185,9 +185,10 @@ max_loaders() ->
 		      worker_res
 		     }).
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl
index f0ed7aef4a..31bcc1451f 100644
--- a/lib/mnesia/src/mnesia_dumper.erl
+++ b/lib/mnesia/src/mnesia_dumper.erl
@@ -191,8 +191,7 @@ do_perform_dump(Cont, InPlace, InitBy, Regulator, OldVersion) ->
 	    try insert_recs(Recs, InPlace, InitBy, Regulator, OldVersion) of
 		Version ->
 		    do_perform_dump(C2, InPlace, InitBy, Regulator, Version)
-	    catch _:R when R =/= fatal ->
-		    ST = erlang:get_stacktrace(),
+	    catch _:R:ST when R =/= fatal ->
 		    Reason = {"Transaction log dump error: ~tp~n", [{R, ST}]},
 		    close_files(InPlace, {error, Reason}, InitBy),
 		    exit(Reason)
@@ -325,8 +324,7 @@ perform_update(Tid, SchemaOps, _DumperMode, _UseDir) ->
 	 ?eval_debug_fun({?MODULE, post_dump}, [InitBy]),
 	 close_files(InPlace, ok, InitBy),
 	 ok
-    catch _:Reason when Reason =/= fatal ->
-	    ST = erlang:get_stacktrace(),
+    catch _:Reason:ST when Reason =/= fatal ->
 	    Error = {error, {"Schema update error", {Reason, ST}}},
 	    close_files(InPlace, Error, InitBy),
             fatal("Schema update error ~tp ~tp", [{Reason,ST}, SchemaOps])
@@ -1471,8 +1469,9 @@ regulate(RegulatorPid) ->
 	{regulated, RegulatorPid} -> ok
     end.
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
diff --git a/lib/mnesia/src/mnesia_frag.erl b/lib/mnesia/src/mnesia_frag.erl
index c39f30e140..63fb4981fe 100644
--- a/lib/mnesia/src/mnesia_frag.erl
+++ b/lib/mnesia/src/mnesia_frag.erl
@@ -1157,9 +1157,10 @@ remove_node(Node, Cs) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Helpers
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl
index 53fdd76de8..56f6926df0 100644
--- a/lib/mnesia/src/mnesia_lib.erl
+++ b/lib/mnesia/src/mnesia_lib.erl
@@ -116,7 +116,7 @@
 	 lock_table/1,
 	 mkcore/1,
 	 not_active_here/1,
-         other_val/1,
+         other_val/2,
          overload_read/0,
          overload_read/1,
          overload_set/2,
@@ -435,8 +435,8 @@ validate_record(Tab, Obj) ->
 %%
 
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> other_val(Var, Stacktrace);
 	_VaLuE_ -> _VaLuE_
     end.
 
@@ -446,9 +446,9 @@ set(Var, Val) ->
 unset(Var) ->
     ?ets_delete(mnesia_gvar, Var).
 
-other_val(Var) ->
+other_val(Var, Stacktrace) ->
     case other_val_1(Var) of
-        error -> pr_other(Var);
+        error -> pr_other(Var, Stacktrace);
         Val -> Val
     end.
 
@@ -460,8 +460,8 @@ other_val_1(Var) ->
 	_ -> error
     end.
 
--spec pr_other(_) -> no_return().
-pr_other(Var) ->
+-spec pr_other(_, _) -> no_return().
+pr_other(Var, Stacktrace) ->
     Why =
 	case is_running() of
 	    no -> {node_not_running, node()};
@@ -469,7 +469,7 @@ pr_other(Var) ->
 	end,
     verbose("~p (~tp) val(mnesia_gvar, ~tw) -> ~p ~tp ~n",
 	    [self(), process_info(self(), registered_name),
-	     Var, Why, erlang:get_stacktrace()]),
+	     Var, Why, Stacktrace]),
     mnesia:abort(Why).
 
 %% Some functions for list valued variables
diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl
index 4c6336cb73..bbceb9ba66 100644
--- a/lib/mnesia/src/mnesia_loader.erl
+++ b/lib/mnesia/src/mnesia_loader.erl
@@ -34,9 +34,10 @@
 
 -include("mnesia.hrl").
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
@@ -535,7 +536,7 @@ init_table(Tab, _, Fun, _DetsInfo,_) ->
     try
 	true = ets:init_table(Tab, Fun),
 	ok
-    catch _:Else -> {Else, erlang:get_stacktrace()}
+    catch _:Else:Stacktrace -> {Else, Stacktrace}
     end.
 
 
@@ -777,9 +778,9 @@ do_send_table(Pid, Tab, Storage, RemoteS) ->
         throw:receiver_died ->
             cleanup_tab_copier(Pid, Storage, Tab),
             ok;
-        error:Reason -> %% Prepare failed
+        error:Reason:Stacktrace -> %% Prepare failed
             cleanup_tab_copier(Pid, Storage, Tab),
-            {error, {tab_copier, Tab, {Reason, erlang:get_stacktrace()}}}
+            {error, {tab_copier, Tab, {Reason, Stacktrace}}}
     after
         unlink(whereis(mnesia_tm))
     end.
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl
index 073b48abc0..710bf38cb5 100644
--- a/lib/mnesia/src/mnesia_locker.erl
+++ b/lib/mnesia/src/mnesia_locker.erl
@@ -97,10 +97,11 @@ init(Parent) ->
     end,
     loop(#state{supervisor = Parent}).
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
-	_VaLuE_ -> _VaLuE_
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
+	Value -> Value
     end.
 
 reply(From, R) ->
diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl
index 55b1d6e419..a2de23a2a3 100644
--- a/lib/mnesia/src/mnesia_log.erl
+++ b/lib/mnesia/src/mnesia_log.erl
@@ -752,8 +752,8 @@ abort_write(B, What, Args, Reason) ->
     Opaque = B#backup_args.opaque,
     dbg_out("Failed to perform backup. M=~p:F=~tp:A=~tp -> ~tp~n",
 	    [Mod, What, Args, Reason]),
-    try apply(Mod, abort_write, [Opaque]) of
-	{ok, _Res} -> throw({error, Reason})
+    try {ok, _Res} = apply(Mod, abort_write, [Opaque]) of
+        _ -> throw({error, Reason})
     catch _:Other ->
 	    error("Failed to abort backup. ~p:~tp~tp -> ~tp~n",
 		  [Mod, abort_write, [Opaque], Other]),
diff --git a/lib/mnesia/src/mnesia_recover.erl b/lib/mnesia/src/mnesia_recover.erl
index d792070332..475bf3c327 100644
--- a/lib/mnesia/src/mnesia_recover.erl
+++ b/lib/mnesia/src/mnesia_recover.erl
@@ -177,10 +177,10 @@ disconnect(Node) ->
 log_decision(D) ->
     cast({log_decision, D}).
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _Reason} ->
-	    mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index 83cc19c678..de6c3fb4ee 100644
--- a/lib/mnesia/src/mnesia_schema.erl
+++ b/lib/mnesia/src/mnesia_schema.erl
@@ -181,9 +181,10 @@ exit_on_error({error, Reason}) ->
 exit_on_error(GoodRes) ->
     GoodRes.
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
@@ -952,19 +953,9 @@ get_index_plugins() ->
     get_schema_user_property(mnesia_index_plugins).
 
 get_schema_user_property(Key) ->
-    Tab = schema,
-    %% Must work reliably both within transactions and outside of transactions
-    Res = case get(mnesia_activity_state) of
-	      undefined ->
-		  dirty_read_table_property(Tab, Key);
-	      _ ->
-		  do_read_table_property(Tab, Key)
-	  end,
-    case Res of
-	undefined ->
-	    [];
-	{_, Types} ->
-	    Types
+    case dirty_read_table_property(schema, Key) of
+	undefined ->  [];
+	{_, Types} -> Types
     end.
 
 get_ext_types_disc() ->
@@ -2705,10 +2696,10 @@ prepare_op(_Tid, {op, transform, Fun, TabDef}, _WaitFor) ->
                 Objs ->
 		    mnesia_lib:db_fixtable(Storage, Tab, false),
                     {true, Objs, mandatory}
-	    catch _:Reason ->
+	    catch _:Reason:Stacktrace ->
 		    mnesia_lib:db_fixtable(Storage, Tab, false),
 		    mnesia_lib:important("Transform function failed: '~tp' in '~tp'",
-					 [Reason, erlang:get_stacktrace()]),
+					 [Reason, Stacktrace]),
                     exit({"Bad transform function", Tab, Fun, node(), Reason})
             end
     end;
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl
index ebf580d09e..eaebdf6d02 100644
--- a/lib/mnesia/src/mnesia_tm.erl
+++ b/lib/mnesia/src/mnesia_tm.erl
@@ -121,10 +121,11 @@ init(Parent) ->
     proc_lib:init_ack(Parent, {ok, self()}),
     doit_loop(#state{supervisor = Parent}).
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
-	_VaLuE_ -> _VaLuE_
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
+	Value -> Value
     end.
 
 reply({From,Ref}, R) ->
@@ -597,9 +598,9 @@ recover_coordinator(Tid, Etabs) ->
 		false ->  %% When killed before store havn't been copied to
 		    ok    %% to the new nested trans store.
 	    end
-    catch _:Reason ->
+    catch _:Reason:Stacktrace ->
 	    dbg_out("Recovery of coordinator ~p failed: ~tp~n",
-		    [Tid, {Reason, erlang:get_stacktrace()}]),
+		    [Tid, {Reason, Stacktrace}]),
 	    Protocol = asym_trans,
 	    tell_outcome(Tid, Protocol, node(), CheckNodes, TellNodes)
     end,
@@ -825,8 +826,7 @@ execute_transaction(Fun, Args, Factor, Retries, Type) ->
     catch throw:Value ->  %% User called throw
 	    Reason = {aborted, {throw, Value}},
 	    return_abort(Fun, Args, Reason);
-	  error:Reason ->
-	    ST = erlang:get_stacktrace(),
+	  error:Reason:ST ->
 	    check_exit(Fun, Args, Factor, Retries, {Reason,ST}, Type);
 	  _:Reason ->
 	    check_exit(Fun, Args, Factor, Retries, Reason, Type)
@@ -1796,14 +1796,13 @@ do_update(Tid, Storage, [Op | Ops], OldRes) ->
     try do_update_op(Tid, Storage, Op) of
 	ok ->     do_update(Tid, Storage, Ops, OldRes);
 	NewRes -> do_update(Tid, Storage, Ops, NewRes)
-    catch _:Reason ->
+    catch _:Reason:ST ->
 	    %% This may only happen when we recently have
 	    %% deleted our local replica, changed storage_type
 	    %% or transformed table
 	    %% BUGBUG: Updates may be lost if storage_type is changed.
 	    %%         Determine actual storage type and try again.
 	    %% BUGBUG: Updates may be lost if table is transformed.
-	    ST = erlang:get_stacktrace(),
 	    verbose("do_update in ~w failed: ~tp -> {'EXIT', ~tp}~n",
 		    [Tid, Op, {Reason, ST}]),
 	    do_update(Tid, Storage, Ops, OldRes)
@@ -1914,11 +1913,10 @@ commit_clear([H|R], Tid, Storage, Tab, K, Obj)
 do_snmp(_, []) ->   ok;
 do_snmp(Tid, [Head|Tail]) ->
     try mnesia_snmp_hook:update(Head)
-    catch _:Reason ->
+    catch _:Reason:ST ->
 	    %% This should only happen when we recently have
 	    %% deleted our local replica or recently deattached
 	    %% the snmp table
-	    ST = erlang:get_stacktrace(),
 	    verbose("do_snmp in ~w failed: ~tp -> {'EXIT', ~tp}~n",
 		    [Tid, Head, {Reason, ST}])
     end,
diff --git a/lib/mnesia/test/mnesia_test_lib.erl b/lib/mnesia/test/mnesia_test_lib.erl
index 78dbe7ffde..db0e7beac6 100644
--- a/lib/mnesia/test/mnesia_test_lib.erl
+++ b/lib/mnesia/test/mnesia_test_lib.erl
@@ -470,9 +470,9 @@ get_suite(Mod, {group, Suite}) ->
 	{_, _, TCList} = lists:keyfind(Suite, 1, Groups),
 	TCList
     catch
-	_:Reason ->
+	_:Reason:Stacktrace ->
 	    io:format("Not implemented ~p ~p (~p ~p)~n",
-		      [Mod,Suite,Reason, erlang:get_stacktrace()]),
+		      [Mod,Suite,Reason,Stacktrace]),
 	    'NYI'
     end;
 get_suite(Mod, all) ->
diff --git a/lib/mnesia/test/mnesia_test_lib.hrl b/lib/mnesia/test/mnesia_test_lib.hrl
index ba7eb10ea2..90a3c686b0 100644
--- a/lib/mnesia/test/mnesia_test_lib.hrl
+++ b/lib/mnesia/test/mnesia_test_lib.hrl
@@ -55,25 +55,25 @@
 			?error("Not Matching Actual result was:~n ~p~n",[_AR_0]),
 			{fail,_AR_0}
 		catch
-		    exit:{aborted, _ER_1} when
+		    exit:{aborted, _ER_1}:Stacktrace when
 			  element(1, _ER_1) =:= node_not_running;
 			  element(1, _ER_1) =:= bad_commit;
 			  element(1, _ER_1) =:= cyclic ->
 			%% Need to re-raise these to restart transaction
-			erlang:raise(exit, {aborted, _ER_1}, erlang:get_stacktrace());
-		    exit:_AR_1 ->
+			erlang:raise(exit, {aborted, _ER_1}, Stacktrace);
+		    exit:_AR_1:Stacktrace ->
 			case fun(_AR_EXIT_) -> {'EXIT', _AR_EXIT_} end(_AR_1) of
 			    _AR_2 = ExpectedRes ->
 				?verbose("ok, ~n Result as expected:~p~n",[_AR_2]),
 				{success,_AR_2};
 			    _AR_2 ->
 				?error("Not Matching Actual result was:~n ~p~n ~p~n",
-				       [_AR_2, erlang:get_stacktrace()]),
+				       [_AR_2, Stacktrace]),
 				{fail,_AR_2}
 			end;
-		    _T1_:_AR_1 ->
+		    _T1_:_AR_1:Stacktrace ->
 			?error("Not Matching Actual result was:~n ~p~n  ~p~n",
-			       [{_T1_,_AR_1}, erlang:get_stacktrace()]),
+			       [{_T1_,_AR_1}, Stacktrace]),
 			{fail,{_T1_,_AR_1}}
 		end
 	end()).
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index a95f468ba2..45f811846d 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.15.1
+MNESIA_VSN = 4.15.3
diff --git a/lib/observer/doc/src/Makefile b/lib/observer/doc/src/Makefile
index a3b0663041..11bfee1bdb 100644
--- a/lib/observer/doc/src/Makefile
+++ b/lib/observer/doc/src/Makefile
@@ -48,12 +48,12 @@ XML_PART_FILES = \
 	part.xml
 
 XML_CHAPTER_FILES = \
+	introduction_ug.xml \
 	crashdump_ug.xml \
 	etop_ug.xml \
 	observer_ug.xml \
 	ttb_ug.xml \
-	notes.xml \
-	notes_history.xml
+	notes.xml
 
 BOOK_FILES = book.xml
 
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 05ea550964..96cd89b375 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,6 +32,73 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 2.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A bug introduced in OTP-20 would make Crashdump Viewer
+	    crash when trying to expand an empty binary. This is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-14642</p>
+        </item>
+        <item>
+          <p>
+	    If a match spec in the config file contained more than
+	    one clause, observer would earlier crash when trying to
+	    display it in the GUI. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-14643 Aux Id: ERL-489 </p>
+        </item>
+        <item>
+	    <p>Writing of crash dumps is significantly faster.</p>
+	    <p>Maps are now included in crash dumps.</p>
+	    <p>Constants terms would only be shown in one process,
+	    while other processes referencing the same constant term
+	    would show a marker for incomplete heap. </p>
+          <p>
+	    Own Id: OTP-14685 Aux Id: OTP-14611, OTP-14603, OTP-14595 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Binaries and some other data in crash dumps are now
+	    encoded in base64 (instead of in hex), which will reduce
+	    the size of crash dumps.</p>
+	    <p>A few bugs in the handling of sub binaries in
+	    <c>crashdump_viewer</c> have been fixed.</p>
+          <p>
+	    Own Id: OTP-14686</p>
+        </item>
+        <item>
+          <p>
+	    In order to allow future improvements, Crashdump Viewer
+	    now checks the version tag of the crashdump to see that
+	    it is a known format. If the crashdump version is newer
+	    than Crashdump Viewer is prepared to read, then an
+	    information dialog is displayed before Crashdump Viewer
+	    terminates.</p>
+          <p>
+	    If an incomplete process heap is discovered in a
+	    crashdump, Crashdump Viewer will now display a warning
+	    for this, similar to the warning displayed when a
+	    crashdump is truncated. Incomplete heaps can occur if for
+	    instance the literals are not included, which is the case
+	    for all dumps prior to OTP-20.2.</p>
+          <p>
+	    Own Id: OTP-14755</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 2.5</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/observer/include/etop.hrl b/lib/observer/include/etop.hrl
index 002937e522..f8d370450b 100644
--- a/lib/observer/include/etop.hrl
+++ b/lib/observer/include/etop.hrl
@@ -18,4 +18,4 @@
 %% %CopyrightEnd%
 %%
 
--include("../../runtime_tools/include/observer_backend.hrl").
+-include_lib("runtime_tools/include/observer_backend.hrl").
diff --git a/lib/observer/src/cdv_bin_cb.erl b/lib/observer/src/cdv_bin_cb.erl
index 5502869973..a4a542297c 100644
--- a/lib/observer/src/cdv_bin_cb.erl
+++ b/lib/observer/src/cdv_bin_cb.erl
@@ -71,6 +71,8 @@ hex_binary_fun(Bin) ->
 	    plain_html(io_lib:format("~s",[S]))
     end.
 
+format_hex(<<>>,_) ->
+    [];
 format_hex(<<B1:4,B2:4>>,_) ->
     [integer_to_list(B1,16),integer_to_list(B2,16)];
 format_hex(<<B1:4,B2:4,Bin/binary>>,0) ->
diff --git a/lib/observer/src/cdv_detail_wx.erl b/lib/observer/src/cdv_detail_wx.erl
index f6d282638a..6c4739042b 100644
--- a/lib/observer/src/cdv_detail_wx.erl
+++ b/lib/observer/src/cdv_detail_wx.erl
@@ -48,6 +48,7 @@ init([Id, Data, ParentFrame, Callback, App, Parent]) ->
     display_progress(ParentFrame,App),
     case Callback:get_details(Id, Data) of
 	{ok,Details} ->
+            display_progress_pulse(Callback,Id),
 	    init(Id,ParentFrame,Callback,App,Parent,Details);
 	{yes_no, Info, Fun} ->
             destroy_progress(App),
@@ -69,8 +70,16 @@ display_progress(ParentFrame,cdv) ->
                                          "Reading data");
 display_progress(_,_) ->
     ok.
+
+%% Display pulse while creating process detail page with much data
+display_progress_pulse(cdv_proc_cb,Pid) ->
+    observer_lib:report_progress({ok,"Displaying data for "++Pid}),
+    observer_lib:report_progress({ok,start_pulse});
+display_progress_pulse(_,_) ->
+    ok.
+
 destroy_progress(cdv) ->
-    observer_lib:destroy_progress_dialog();
+    observer_lib:sync_destroy_progress_dialog();
 destroy_progress(_) ->
     ok.
 
diff --git a/lib/observer/src/cdv_html_wx.erl b/lib/observer/src/cdv_html_wx.erl
index 4b43b6a840..77a9d3207b 100644
--- a/lib/observer/src/cdv_html_wx.erl
+++ b/lib/observer/src/cdv_html_wx.erl
@@ -94,21 +94,21 @@ handle_event(#wx{event=#wxHtmlLink{type=command_html_link_clicked,
 	case Target of
 	    "#Binary?" ++ BinSpec ->
 		[{"offset",Off},{"size",Size},{"pos",Pos}] =
-		    httpd:parse_query(BinSpec),
+		    uri_string:dissect_query(BinSpec),
 		Id = {cdv, {list_to_integer(Off),
 			    list_to_integer(Size),
 			    list_to_integer(Pos)}},
 		expand(Id,cdv_bin_cb,State);
 	    "#OBSBinary?" ++ BinSpec ->
 		[{"key1",Preview},{"key2",Size},{"key3",Hash}] =
-		    httpd:parse_query(BinSpec),
+		    uri_string:dissect_query(BinSpec),
 		Id = {obs, {Tab, {list_to_integer(Preview),
 				  list_to_integer(Size),
 				  list_to_integer(Hash)}}},
 		expand(Id,cdv_bin_cb,State);
 	    "#Term?" ++ TermKeys ->
 		[{"key1",Key1},{"key2",Key2},{"key3",Key3}] =
-		    httpd:parse_query(TermKeys),
+		    uri_string:dissect_query(TermKeys),
 		Id = {cdv, {Tab,{list_to_integer(Key1),
 				 list_to_integer(Key2),
 				 list_to_integer(Key3)}}},
diff --git a/lib/observer/src/cdv_info_wx.erl b/lib/observer/src/cdv_info_wx.erl
index 7e416dd11a..07c28610e2 100644
--- a/lib/observer/src/cdv_info_wx.erl
+++ b/lib/observer/src/cdv_info_wx.erl
@@ -95,6 +95,10 @@ handle_cast(Msg, State) ->
     io:format("~p~p: Unhandled cast ~tp~n",[?MODULE, ?LINE, Msg]),
     {noreply, State}.
 
+handle_event(#wx{obj=MoreEntry,event=#wxMouse{type=left_down},userData={more,More}}, State) ->
+    observer_lib:add_scroll_entries(MoreEntry,More),
+    {noreply, State};
+
 handle_event(#wx{event=#wxMouse{type=left_down},userData=Target}, State) ->
     cdv_virtual_list_wx:start_detail_win(Target),
     {noreply, State};
diff --git a/lib/observer/src/cdv_port_cb.erl b/lib/observer/src/cdv_port_cb.erl
index b5cbe8132d..6bb8f07a74 100644
--- a/lib/observer/src/cdv_port_cb.erl
+++ b/lib/observer/src/cdv_port_cb.erl
@@ -34,7 +34,8 @@
 -define(COL_CONN, ?COL_ID+1).
 -define(COL_NAME, ?COL_CONN+1).
 -define(COL_CTRL, ?COL_NAME+1).
--define(COL_SLOT, ?COL_CTRL+1).
+-define(COL_QUEUE, ?COL_CTRL+1).
+-define(COL_SLOT, ?COL_QUEUE+1).
 
 
 
@@ -44,6 +45,7 @@ col_to_elem(?COL_ID)  -> #port.id;
 col_to_elem(?COL_CONN) -> #port.connected;
 col_to_elem(?COL_NAME)  -> #port.name;
 col_to_elem(?COL_CTRL) -> #port.controls;
+col_to_elem(?COL_QUEUE) -> #port.queue;
 col_to_elem(?COL_SLOT) -> #port.slot.
 
 col_spec() ->
@@ -51,6 +53,7 @@ col_spec() ->
      {"Connected", ?wxLIST_FORMAT_LEFT, 120},
      {"Name", ?wxLIST_FORMAT_LEFT, 150},
      {"Controls", ?wxLIST_FORMAT_LEFT, 200},
+     {"Queue", ?wxLIST_FORMAT_RIGHT, 100},
      {"Slot", ?wxLIST_FORMAT_RIGHT, 50}].
 
 get_info(_) ->
@@ -96,9 +99,17 @@ format(D) ->
 info_fields() ->
     [{"Overview",
       [{"Name",             name},
+       {"State",            state},
+       {"Task Flags",       task_flags},
        {"Connected",        {click,connected}},
        {"Slot",             slot},
-       {"Controls",         controls}]},
+       {"Controls",         controls},
+       {"Input bytes",      input},
+       {"Output bytes",     output},
+       {"Queue bytes",      queue},
+       {"Port data",        port_data}]},
     {scroll_boxes,
      [{"Links",1,{click,links}},
-       {"Monitors",1,{click,monitors}}]}].
+      {"Monitors",1,{click,monitors}},
+      {"Suspended",1,{click,suspended}}
+     ]}].
diff --git a/lib/observer/src/cdv_proc_cb.erl b/lib/observer/src/cdv_proc_cb.erl
index f10650bbb7..0ea23dd7cb 100644
--- a/lib/observer/src/cdv_proc_cb.erl
+++ b/lib/observer/src/cdv_proc_cb.erl
@@ -149,6 +149,10 @@ info_fields() ->
        {"Old Heap",         old_heap},
        {"Heap Unused",      heap_unused},
        {"Old Heap Unused",  old_heap_unused},
+       {"Binary vheap",     bin_vheap},
+       {"Old Binary vheap", old_bin_vheap},
+       {"Binary vheap unused",  bin_vheap_unused},
+       {"Old Binary vheap unused", old_bin_vheap_unused},
        {"Number of Heap Fragements", num_heap_frag},
        {"Heap Fragment Data",heap_frag_data},
        {"New Heap Start",   new_heap_start},
diff --git a/lib/observer/src/cdv_sched_cb.erl b/lib/observer/src/cdv_sched_cb.erl
index 192aaf31a7..d2696a276f 100644
--- a/lib/observer/src/cdv_sched_cb.erl
+++ b/lib/observer/src/cdv_sched_cb.erl
@@ -31,7 +31,8 @@
 
 %% Columns
 -define(COL_ID,  0).
--define(COL_PROC,  ?COL_ID+1).
+-define(COL_TYPE,  ?COL_ID+1).
+-define(COL_PROC,  ?COL_TYPE+1).
 -define(COL_PORT,  ?COL_PROC+1).
 -define(COL_RQL,   ?COL_PORT+1).
 -define(COL_PQL,   ?COL_RQL+1).
@@ -39,6 +40,7 @@
 %% Callbacks for cdv_virtual_list_wx
 col_to_elem(id) -> col_to_elem(?COL_ID);
 col_to_elem(?COL_ID)  -> #sched.name;
+col_to_elem(?COL_TYPE)  -> #sched.type;
 col_to_elem(?COL_PROC)  -> #sched.process;
 col_to_elem(?COL_PORT)  -> #sched.port;
 col_to_elem(?COL_RQL)   -> #sched.run_q;
@@ -46,6 +48,7 @@ col_to_elem(?COL_PQL)   -> #sched.port_q.
 
 col_spec() ->
     [{"Id",                ?wxLIST_FORMAT_RIGHT,   50},
+     {"Type",              ?wxLIST_FORMAT_CENTER, 100},
      {"Current Process",   ?wxLIST_FORMAT_CENTER, 130},
      {"Current Port",      ?wxLIST_FORMAT_CENTER, 130},
      {"Run Queue Length",  ?wxLIST_FORMAT_RIGHT,  180},
@@ -73,7 +76,8 @@ detail_pages() ->
     [{"Scheduler Information", fun init_gen_page/2}].
 
 init_gen_page(Parent, Info0) ->
-    Fields = info_fields(),
+    Type = proplists:get_value(type, Info0),
+    Fields = info_fields(Type),
     Details = proplists:get_value(details, Info0),
     Info = if is_map(Details) -> Info0 ++ maps:to_list(Details);
 	      true -> Info0
@@ -81,15 +85,16 @@ init_gen_page(Parent, Info0) ->
     cdv_info_wx:start_link(Parent,{Fields,Info,[]}).
 
 %%% Internal
-info_fields() ->
+info_fields(Type) ->
     [{"Scheduler Overview",
       [{"Id",             id},
+       {"Type",           type},
        {"Current Process",process},
        {"Current Port",   port},
        {"Sleep Info Flags", sleep_info},
        {"Sleep Aux Work",   sleep_aux}
       ]},
-     {"Run Queues",
+     {run_queues_header(Type),
       [{"Flags",                   runq_flags},
        {"Priority Max Length",     runq_max},
        {"Priority High Length",    runq_high},
@@ -116,3 +121,8 @@ info_fields() ->
        {"     ",           {currp_stack, 11}}
       ]}
     ].
+
+run_queues_header(normal) ->
+    "Run Queues";
+run_queues_header(DirtyX) ->
+    "Run Queues (common for all '" ++ atom_to_list(DirtyX) ++ "' schedulers)".
diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl
index 7f6bb9bdcd..d0c14db486 100644
--- a/lib/observer/src/crashdump_viewer.erl
+++ b/lib/observer/src/crashdump_viewer.erl
@@ -26,10 +26,25 @@
 %% Tables
 %% ------
 %% cdv_dump_index_table: This table holds all tags read from the
-%% crashdump.  Each tag indicates where the information about a
-%% specific item starts.  The table entry for a tag includes the start
-%% position for this item-information. In a crash dump file, all tags
-%% start with a "=" at the beginning of a line.
+%% crashdump, except the 'binary' tag.  Each tag indicates where the
+%% information about a specific item starts.  The table entry for a
+%% tag includes the start position for this item-information. In a
+%% crash dump file, all tags start with a "=" at the beginning of a
+%% line.
+%%
+%% cdv_binary_index_table: This table holds all 'binary' tags. The hex
+%% address for each binary is converted to its integer value before
+%% storing Address -> Start Position in this table. The hex value of
+%% the address is never used for lookup.
+%%
+%% cdv_reg_proc_table: This table holds mappings between pid and
+%% registered name. This is used for timers and monitors.
+%%
+%% cdv_heap_file_chars: For each 'proc_heap' and 'literals' tag, this
+%% table contains the number of characters to read from the crash dump
+%% file. This is used for giving an indication in percent of the
+%% progress when parsing this data.
+%%
 %%
 %% Process state
 %% -------------
@@ -73,6 +88,9 @@
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, 
 	 terminate/2, code_change/3]).
 
+%% Test support
+-export([get_dump_versions/0]).
+
 %% Debug support
 -export([debug/1,stop_debug/0]).
 
@@ -87,7 +105,10 @@
 			    % line_head/1 function can return
 -define(not_available,"N/A").
 -define(binary_size_progress_limit,10000).
+-define(max_dump_version,[0,5]).
 
+%% The value of the next define must be divisible by 4.
+-define(base64_chunk_size, (4*256)).
 
 %% All possible tags - use macros in order to avoid misspelling in the code
 -define(abort,abort).
@@ -95,6 +116,10 @@
 -define(allocator,allocator).
 -define(atoms,atoms).
 -define(binary,binary).
+-define(dirty_cpu_scheduler,dirty_cpu_scheduler).
+-define(dirty_cpu_run_queue,dirty_cpu_run_queue).
+-define(dirty_io_scheduler,dirty_io_scheduler).
+-define(dirty_io_run_queue,dirty_io_run_queue).
 -define(ende,ende).
 -define(erl_crash_dump,erl_crash_dump).
 -define(ets,ets).
@@ -126,6 +151,7 @@
 
 
 -record(state,{file,dump_vsn,wordsize=4,num_atoms="unknown"}).
+-record(dec_opts, {bin_addr_adj=0,base64=true}).
 
 %%%-----------------------------------------------------------------
 %%% Debugging
@@ -294,6 +320,11 @@ port(Id) ->
 expand_binary(Pos) ->
     call({expand_binary,Pos}).
 
+%%%-----------------------------------------------------------------
+%%% For testing only - called from crashdump_viewer_SUITE
+get_dump_versions() ->
+    call(get_dump_versions).
+
 %%====================================================================
 %% Server functions
 %%====================================================================
@@ -343,10 +374,12 @@ handle_call(general_info,_From,State=#state{file=File}) ->
     ets:insert(cdv_reg_proc_table,
 	       {cdv_dump_node_name,GenInfo#general_info.node_name}),
     {reply,{ok,GenInfo,TW},State#state{wordsize=WS, num_atoms=NumAtoms}};
-handle_call({expand_binary,{Offset,Size,Pos}},_From,State=#state{file=File}) ->
+handle_call({expand_binary,{Offset,Size,Pos}},_From,
+            #state{file=File,dump_vsn=DumpVsn}=State) ->
     Fd = open(File),
     pos_bof(Fd,Pos),
-    {Bin,_Line} = get_binary(Offset,Size,bytes(Fd)),
+    DecodeOpts = get_decode_opts(DumpVsn),
+    {Bin,_Line} = get_binary(Offset,Size,bytes(Fd),DecodeOpts),
     close(Fd),
     {reply,{ok,Bin},State};
 handle_call(procs_summary,_From,State=#state{file=File,wordsize=WS}) ->
@@ -419,9 +452,11 @@ handle_call(loaded_mods,_From,State=#state{file=File}) ->
     TW = truncated_warning([?mod]),
     {_CC,_OC,Mods} = loaded_mods(File),
     {reply,{ok,Mods,TW},State};
-handle_call({loaded_mod_details,Mod},_From,State=#state{file=File}) ->
+handle_call({loaded_mod_details,Mod},_From,
+            #state{dump_vsn=DumpVsn,file=File}=State) ->
     TW = truncated_warning([{?mod,Mod}]),
-    ModInfo = get_loaded_mod_details(File,Mod),
+    DecodeOpts = get_decode_opts(DumpVsn),
+    ModInfo = get_loaded_mod_details(File,Mod,DecodeOpts),
     {reply,{ok,ModInfo,TW},State};
 handle_call(funs,_From,State=#state{file=File}) ->
     TW = truncated_warning([?fu]),
@@ -455,8 +490,9 @@ handle_call(index_tables,_From,State=#state{file=File}) ->
 handle_call(schedulers,_From,State=#state{file=File}) ->
     Schedulers=schedulers(File),
     TW = truncated_warning([?scheduler]),
-    {reply,{ok,Schedulers,TW},State}.
-
+    {reply,{ok,Schedulers,TW},State};
+handle_call(get_dump_versions,_From,State=#state{dump_vsn=DumpVsn}) ->
+    {reply,{ok,{?max_dump_version,DumpVsn}},State}.
 
 
 %%--------------------------------------------------------------------
@@ -781,10 +817,8 @@ parse_vsn_str(Str,WS) ->
 
 
 %%%-----------------------------------------------------------------
-%%% Traverse crash dump and insert index in table for each heading
-%%%
-%%% Progress is reported during the time and MUST be checked with
-%%% crashdump_viewer:get_progress/0 until it returns {ok,done}.
+%%% Traverse crash dump and insert index in table for each heading.
+%%% Progress is reported during the time.
 do_read_file(File) ->
     erase(?literals),                           %Clear literal cache.
     put(truncated,false),                       %Not truncated (yet).
@@ -800,17 +834,21 @@ do_read_file(File) ->
 		    {Tag,Id,Rest,N1} = tag(Fd,TagAndRest,1),
 		    case Tag of
 			?erl_crash_dump ->
-			    reset_tables(),
-			    insert_index(Tag,Id,N1+1),
-			    put_last_tag(Tag,""),
-                            DumpVsn = [list_to_integer(L) ||
-                                          L<-string:lexemes(Id,".")],
-                            AddrAdj = get_bin_addr_adj(DumpVsn),
-                            indexify(Fd,AddrAdj,Rest,N1),
-			    end_progress(),
-			    check_if_truncated(),
-			    close(Fd),
-                            {ok,DumpVsn};
+                            case check_dump_version(Id) of
+                                {ok,DumpVsn} ->
+                                    reset_tables(),
+                                    insert_index(Tag,Id,N1+1),
+                                    put_last_tag(Tag,""),
+                                    DecodeOpts = get_decode_opts(DumpVsn),
+                                    indexify(Fd,DecodeOpts,Rest,N1),
+                                    end_progress(),
+                                    check_if_truncated(),
+                                    close(Fd),
+                                    {ok,DumpVsn};
+                                Error ->
+                                    close(Fd),
+                                    Error
+                            end;
 			_Other ->
 			    R = io_lib:format(
 				  "~ts is not an Erlang crash dump~n",
@@ -838,7 +876,19 @@ do_read_file(File) ->
 	    {error,R}
     end.
 
-indexify(Fd,AddrAdj,Bin,N) ->
+check_dump_version(Vsn) ->
+    DumpVsn = [list_to_integer(L) || L<-string:lexemes(Vsn,".")],
+    if DumpVsn > ?max_dump_version ->
+            Info =
+                "This Crashdump Viewer is too old for the given "
+                "Erlang crash dump. Please use a newer version of "
+                "Crashdump Viewer.",
+            {error,Info};
+       true ->
+            {ok,DumpVsn}
+    end.
+
+indexify(Fd,DecodeOpts,Bin,N) ->
     case binary:match(Bin,<<"\n=">>) of
 	{Start,Len} ->
 	    Pos = Start+Len,
@@ -851,7 +901,7 @@ indexify(Fd,AddrAdj,Bin,N) ->
                     %% order to minimize lookup time. Key is the
                     %% translated address.
                     {HexAddr,_} = get_hex(Id),
-                    Addr = HexAddr bor AddrAdj,
+                    Addr = HexAddr bor DecodeOpts#dec_opts.bin_addr_adj,
                     insert_binary_index(Addr,NewPos);
                 _ ->
                     insert_index(Tag,Id,NewPos)
@@ -875,7 +925,7 @@ indexify(Fd,AddrAdj,Bin,N) ->
                     end;
                 _ -> ok
             end,
-	    indexify(Fd,AddrAdj,Rest,N1);
+	    indexify(Fd,DecodeOpts,Rest,N1);
 	nomatch ->
 	    case progress_read(Fd) of
 		{ok,Chunk0} when is_binary(Chunk0) ->
@@ -886,7 +936,7 @@ indexify(Fd,AddrAdj,Bin,N) ->
 			    _ ->
 				{Chunk0,N+byte_size(Bin)}
 			end,
-		    indexify(Fd,AddrAdj,Chunk,N1);
+		    indexify(Fd,DecodeOpts,Chunk,N1);
 		eof ->
 		    eof
 	    end
@@ -1083,7 +1133,7 @@ get_proc_details(File,Pid,WS,DumpVsn) ->
 	    {{Stack,MsgQ,Dict},TW} =
 		case truncated_warning([{?proc,Pid}]) of
 		    [] ->
-			{expand_memory(Fd,Pid,DumpVsn),[]};
+                        expand_memory(Fd,Pid,DumpVsn);
 		    TW0 ->
 			{{[],[],[]},TW0}
 		end,
@@ -1176,6 +1226,18 @@ all_procinfo(Fd,Fun,Proc,WS,LineHead) ->
 	"OldHeap unused" ->
 	    Bytes = list_to_integer(bytes(Fd))*WS,
 	    get_procinfo(Fd,Fun,Proc#proc{old_heap_unused=Bytes},WS);
+	"BinVHeap" ->
+	    Bytes = list_to_integer(bytes(Fd))*WS,
+	    get_procinfo(Fd,Fun,Proc#proc{bin_vheap=Bytes},WS);
+	"OldBinVHeap" ->
+	    Bytes = list_to_integer(bytes(Fd))*WS,
+	    get_procinfo(Fd,Fun,Proc#proc{old_bin_vheap=Bytes},WS);
+	"BinVHeap unused" ->
+	    Bytes = list_to_integer(bytes(Fd))*WS,
+	    get_procinfo(Fd,Fun,Proc#proc{bin_vheap_unused=Bytes},WS);
+	"OldBinVHeap unused" ->
+	    Bytes = list_to_integer(bytes(Fd))*WS,
+	    get_procinfo(Fd,Fun,Proc#proc{old_bin_vheap_unused=Bytes},WS);
 	"New heap start" ->
 	    get_procinfo(Fd,Fun,Proc#proc{new_heap_start=bytes(Fd)},WS);
 	"New heap top" ->
@@ -1194,7 +1256,7 @@ all_procinfo(Fd,Fun,Proc,WS,LineHead) ->
 	"Last calls" ->
 	    get_procinfo(Fd,Fun,Proc#proc{last_calls=get_last_calls(Fd)},WS);
 	"Link list" ->
-	    {Links,Monitors,MonitoredBy} = parse_link_list(bytes(Fd),[],[],[]),
+	    {Links,Monitors,MonitoredBy} = get_link_list(Fd),
 	    get_procinfo(Fd,Fun,Proc#proc{links=Links,
 					  monitors=Monitors,
 					  mon_by=MonitoredBy},WS);
@@ -1276,86 +1338,64 @@ get_last_calls(Fd,<<>>,Acc,Lines) ->
 	    lists:reverse(Lines,[byte_list_to_string(lists:reverse(Acc))])
     end.
 
-parse_link_list([SB|Str],Links,Monitors,MonitoredBy) when SB==$[; SB==$] ->
-    parse_link_list(Str,Links,Monitors,MonitoredBy);
-parse_link_list("#Port"++_=Str,Links,Monitors,MonitoredBy) ->
-    {Link,Rest} = parse_port(Str),
-    parse_link_list(Rest,[Link|Links],Monitors,MonitoredBy);
-parse_link_list("<"++_=Str,Links,Monitors,MonitoredBy) ->
-    {Link,Rest} = parse_pid(Str),
-    parse_link_list(Rest,[Link|Links],Monitors,MonitoredBy);
-parse_link_list("{to,"++Str,Links,Monitors,MonitoredBy) ->
-    {Mon,Rest} = parse_monitor(Str),
-    parse_link_list(Rest,Links,[Mon|Monitors],MonitoredBy);
-parse_link_list("{from,"++Str,Links,Monitors,MonitoredBy) ->
-    {Mon,Rest} = parse_monitor(Str),
-    parse_link_list(Rest,Links,Monitors,[Mon|MonitoredBy]);
-parse_link_list(", "++Rest,Links,Monitors,MonitoredBy) ->
-    parse_link_list(Rest,Links,Monitors,MonitoredBy);
-parse_link_list([],Links,Monitors,MonitoredBy) ->
-    {lists:reverse(Links),lists:reverse(Monitors),lists:reverse(MonitoredBy)};
-parse_link_list(Unexpected,Links,Monitors,MonitoredBy) ->
-    io:format("WARNING: found unexpected data in link list:~n~ts~n",[Unexpected]),
-    parse_link_list([],Links,Monitors,MonitoredBy).
-
-
-parse_port(Str) ->
-    {Port,Rest} = parse_link(Str,[]),
-    {{Port,Port},Rest}.
-
-parse_pid(Str) ->
-    {Pid,Rest} = parse_link(Str,[]),
-    {{Pid,Pid},Rest}.
-
-parse_monitor("{"++Str) ->
-    %% Named process
-    {Name,Node,Rest1} = parse_name_node(Str,[]),
-    Pid = get_pid_from_name(Name,Node),
-    case parse_link(string:trim(Rest1,leading,","),[]) of
-	{Ref,"}"++Rest2} ->
-	    %% Bug in break.c - prints an extra "}" for remote
-	    %% nodes... thus the strip
-	    {{Pid,"{"++Name++","++Node++"} ("++Ref++")"},
-	     string:trim(Rest2,leading,"}")};
-	{Ref,[]} ->
-	    {{Pid,"{"++Name++","++Node++"} ("++Ref++")"},[]}
-    end;
-parse_monitor(Str) ->
-    case parse_link(Str,[]) of
-	{Pid,","++Rest1} ->
-	    case parse_link(Rest1,[]) of
-		{Ref,"}"++Rest2} ->
-		    {{Pid,Pid++" ("++Ref++")"},Rest2};
-		{Ref,[]} ->
-		    {{Pid,Pid++" ("++Ref++")"},[]}
-	    end;
-	{Pid,[]} ->
-	    {{Pid,Pid++" (unknown_ref)"},[]}
+get_link_list(Fd) ->
+    case get_chunk(Fd) of
+	{ok,<<"[",Bin/binary>>} ->
+            #{links:=Links,
+              mons:=Monitors,
+              mon_by:=MonitoredBy} =
+                get_link_list(Fd,Bin,#{links=>[],mons=>[],mon_by=>[]}),
+            {lists:reverse(Links),
+             lists:reverse(Monitors),
+             lists:reverse(MonitoredBy)};
+        eof ->
+            {[],[],[]}
     end.
 
-parse_link(">"++Rest,Acc) ->
-    {lists:reverse(Acc,">"),Rest};
-parse_link([H|T],Acc) ->
-    parse_link(T,[H|Acc]);
-parse_link([],Acc) ->
-    %% truncated
-    {lists:reverse(Acc),[]}.
+get_link_list(Fd,<<NL:8,_/binary>>=Bin,Acc) when NL=:=$\r; NL=:=$\n->
+    skip(Fd,Bin),
+    Acc;
+get_link_list(Fd,Bin,Acc) ->
+    case binary:split(Bin,[<<", ">>,<<"]">>]) of
+        [Link,Rest] ->
+            get_link_list(Fd,Rest,get_link(Link,Acc));
+        [Incomplete] ->
+            case get_chunk(Fd) of
+                {ok,More} ->
+                    get_link_list(Fd,<<Incomplete/binary,More/binary>>,Acc);
+                eof ->
+                    Acc
+            end
+    end.
 
-parse_name_node(","++Rest,Name) ->
-    parse_name_node(Rest,Name,[]);
-parse_name_node([H|T],Name) ->
-    parse_name_node(T,[H|Name]);
-parse_name_node([],Name) ->
-    %% truncated
-    {lists:reverse(Name),[],[]}.
-
-parse_name_node("}"++Rest,Name,Node) ->
-    {lists:reverse(Name),lists:reverse(Node),Rest};
-parse_name_node([H|T],Name,Node) ->
-    parse_name_node(T,Name,[H|Node]);
-parse_name_node([],Name,Node) ->
-    %% truncated
-    {lists:reverse(Name),lists:reverse(Node),[]}.
+get_link(<<"#Port",_/binary>>=PortBin,#{links:=Links}=Acc) ->
+    PortStr = binary_to_list(PortBin),
+    Acc#{links=>[{PortStr,PortStr}|Links]};
+get_link(<<"<",_/binary>>=PidBin,#{links:=Links}=Acc) ->
+    PidStr = binary_to_list(PidBin),
+    Acc#{links=>[{PidStr,PidStr}|Links]};
+get_link(<<"{to,",Bin/binary>>,#{mons:=Monitors}=Acc) ->
+    Acc#{mons=>[parse_monitor(Bin)|Monitors]};
+get_link(<<"{from,",Bin/binary>>,#{mon_by:=MonitoredBy}=Acc) ->
+    Acc#{mon_by=>[parse_monitor(Bin)|MonitoredBy]};
+get_link(Unexpected,Acc) ->
+    io:format("WARNING: found unexpected data in link list:~n~ts~n",[Unexpected]),
+    Acc.
+
+parse_monitor(MonBin) ->
+    case binary:split(MonBin,[<<",">>,<<"{">>,<<"}">>],[global]) of
+        [PidBin,RefBin,<<>>] ->
+            PidStr = binary_to_list(PidBin),
+            RefStr = binary_to_list(RefBin),
+            {PidStr,PidStr++" ("++RefStr++")"};
+        [<<>>,NameBin,NodeBin,<<>>,RefBin,<<>>] ->
+            %% Named process
+            NameStr = binary_to_list(NameBin),
+            NodeStr = binary_to_list(NodeBin),
+            PidStr = get_pid_from_name(NameStr,NodeStr),
+            RefStr = binary_to_list(RefBin),
+            {PidStr,"{"++NameStr++","++NodeStr++"} ("++RefStr++")"}
+    end.
 
 get_pid_from_name(Name,Node) ->
     case ets:lookup(cdv_reg_proc_table,cdv_dump_node_name) of
@@ -1402,70 +1442,85 @@ maybe_other_node2(Channel) ->
 
 
 expand_memory(Fd,Pid,DumpVsn) ->
-    BinAddrAdj = get_bin_addr_adj(DumpVsn),
+    DecodeOpts = get_decode_opts(DumpVsn),
     put(fd,Fd),
     Dict0 = case get(?literals) of
                 undefined ->
-                    Literals = read_literals(Fd),
+                    Literals = read_literals(Fd,DecodeOpts),
                     put(?literals,Literals),
                     put(fd,Fd),
                     Literals;
                 Literals ->
                     Literals
             end,
-    Dict = read_heap(Fd,Pid,BinAddrAdj,Dict0),
-    Expanded = {read_stack_dump(Fd,Pid,BinAddrAdj,Dict),
-		read_messages(Fd,Pid,BinAddrAdj,Dict),
-		read_dictionary(Fd,Pid,BinAddrAdj,Dict)},
+    Dict = read_heap(Fd,Pid,DecodeOpts,Dict0),
+    Expanded = {read_stack_dump(Fd,Pid,DecodeOpts,Dict),
+		read_messages(Fd,Pid,DecodeOpts,Dict),
+		read_dictionary(Fd,Pid,DecodeOpts,Dict)},
     erase(fd),
-    Expanded.
-
-read_literals(Fd) ->
+    IncompleteWarning =
+        case erase(incomplete_heap) of
+            undefined ->
+                [];
+            true ->
+                ["WARNING: This process has an incomplete heap. "
+                 "Some information might be missing."]
+        end,
+    {Expanded,IncompleteWarning}.
+
+read_literals(Fd,DecodeOpts) ->
     case lookup_index(?literals,[]) of
 	[{_,Start}] ->
             [{_,Chars}] = ets:lookup(cdv_heap_file_chars,literals),
             init_progress("Reading literals",Chars),
 	    pos_bof(Fd,Start),
-	    read_heap(0,gb_trees:empty());
+	    read_heap(DecodeOpts,gb_trees:empty());
         [] ->
             gb_trees:empty()
     end.
 
-%%%-----------------------------------------------------------------
-%%% This is a workaround for a bug in dump versions prior to 0.3:
-%%% Addresses were truncated to 32 bits. This could cause binaries to
-%%% get the same address as heap terms in the dump. To work around it
-%%% we always store binaries on very high addresses in the gb_tree.
-get_bin_addr_adj(DumpVsn) when DumpVsn < [0,3] ->
-    16#f bsl 64;
-get_bin_addr_adj(_) ->
-    0.
+get_decode_opts(DumpVsn) ->
+    BinAddrAdj = if
+                     DumpVsn < [0,3] ->
+                         %% This is a workaround for a bug in dump
+                         %% versions prior to 0.3: Addresses were
+                         %% truncated to 32 bits. This could cause
+                         %% binaries to get the same address as heap
+                         %% terms in the dump. To work around it we
+                         %% always store binaries on very high
+                         %% addresses in the gb_tree.
+                         16#f bsl 64;
+                     true ->
+                         0
+                 end,
+    Base64 = DumpVsn >= [0,5],
+    #dec_opts{bin_addr_adj=BinAddrAdj,base64=Base64}.
 
 %%%
 %%% Read top level section.
 %%%
 
-read_stack_dump(Fd,Pid,BinAddrAdj,Dict) ->
+read_stack_dump(Fd,Pid,DecodeOpts,Dict) ->
     case lookup_index(?proc_stack,Pid) of
 	[{_,Start}] ->
 	    pos_bof(Fd,Start),
-	    read_stack_dump1(Fd,BinAddrAdj,Dict,[]);
+	    read_stack_dump1(Fd,DecodeOpts,Dict,[]);
 	[] ->
 	    []
     end.
-read_stack_dump1(Fd,BinAddrAdj,Dict,Acc) ->
+read_stack_dump1(Fd,DecodeOpts,Dict,Acc) ->
     %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case bytes(Fd) of
 	"=" ++ _next_tag ->
 	    lists:reverse(Acc);
 	Line ->
-	    Stack = parse_top(Line,BinAddrAdj,Dict),
-	    read_stack_dump1(Fd,BinAddrAdj,Dict,[Stack|Acc])
+	    Stack = parse_top(Line,DecodeOpts,Dict),
+	    read_stack_dump1(Fd,DecodeOpts,Dict,[Stack|Acc])
     end.
 
-parse_top(Line0, BinAddrAdj, D) ->
+parse_top(Line0, DecodeOpts, D) ->
     {Label,Line1} = get_label(Line0),
-    {Term,Line,D} = parse_term(Line1, BinAddrAdj, D),
+    {Term,Line,D} = parse_term(Line1, DecodeOpts, D),
     [] = skip_blanks(Line),
     {Label,Term}.
 
@@ -1473,27 +1528,27 @@ parse_top(Line0, BinAddrAdj, D) ->
 %%% Read message queue.
 %%%
 
-read_messages(Fd,Pid,BinAddrAdj,Dict) ->
+read_messages(Fd,Pid,DecodeOpts,Dict) ->
     case lookup_index(?proc_messages,Pid) of
 	[{_,Start}] ->
 	    pos_bof(Fd,Start),
-	    read_messages1(Fd,BinAddrAdj,Dict,[]);
+	    read_messages1(Fd,DecodeOpts,Dict,[]);
 	[] ->
 	    []
     end.
-read_messages1(Fd,BinAddrAdj,Dict,Acc) ->
+read_messages1(Fd,DecodeOpts,Dict,Acc) ->
     %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case bytes(Fd) of
 	"=" ++ _next_tag ->
 	    lists:reverse(Acc);
 	Line ->
-	    Msg = parse_message(Line,BinAddrAdj,Dict),
-	    read_messages1(Fd,BinAddrAdj,Dict,[Msg|Acc])
+	    Msg = parse_message(Line,DecodeOpts,Dict),
+	    read_messages1(Fd,DecodeOpts,Dict,[Msg|Acc])
     end.
     
-parse_message(Line0, BinAddrAdj, D) ->
-    {Msg,":"++Line1,_} = parse_term(Line0, BinAddrAdj, D),
-    {Token,Line,_} = parse_term(Line1, BinAddrAdj, D),
+parse_message(Line0, DecodeOpts, D) ->
+    {Msg,":"++Line1,_} = parse_term(Line0, DecodeOpts, D),
+    {Token,Line,_} = parse_term(Line1, DecodeOpts, D),
     [] = skip_blanks(Line),
     {Msg,Token}.
     
@@ -1501,26 +1556,26 @@ parse_message(Line0, BinAddrAdj, D) ->
 %%% Read process dictionary
 %%%
 
-read_dictionary(Fd,Pid,BinAddrAdj,Dict) ->
+read_dictionary(Fd,Pid,DecodeOpts,Dict) ->
     case lookup_index(?proc_dictionary,Pid) of
 	[{_,Start}] ->
 	    pos_bof(Fd,Start),
-	    read_dictionary1(Fd,BinAddrAdj,Dict,[]);
+	    read_dictionary1(Fd,DecodeOpts,Dict,[]);
 	[] ->
 	    []
     end.
-read_dictionary1(Fd,BinAddrAdj,Dict,Acc) ->
+read_dictionary1(Fd,DecodeOpts,Dict,Acc) ->
     %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case bytes(Fd) of
 	"=" ++ _next_tag ->
 	    lists:reverse(Acc);
 	Line ->
-	    Msg = parse_dictionary(Line,BinAddrAdj,Dict),
-	    read_dictionary1(Fd,BinAddrAdj,Dict,[Msg|Acc])
+	    Msg = parse_dictionary(Line,DecodeOpts,Dict),
+	    read_dictionary1(Fd,DecodeOpts,Dict,[Msg|Acc])
     end.
     
-parse_dictionary(Line0, BinAddrAdj, D) ->
-    {Entry,Line,_} = parse_term(Line0, BinAddrAdj, D),
+parse_dictionary(Line0, DecodeOpts, D) ->
+    {Entry,Line,_} = parse_term(Line0, DecodeOpts, D),
     [] = skip_blanks(Line),
     Entry.
     
@@ -1528,18 +1583,18 @@ parse_dictionary(Line0, BinAddrAdj, D) ->
 %%% Read heap data.
 %%%
 
-read_heap(Fd,Pid,BinAddrAdj,Dict0) ->
+read_heap(Fd,Pid,DecodeOpts,Dict0) ->
     case lookup_index(?proc_heap,Pid) of
 	[{_,Pos}] ->
             [{_,Chars}] = ets:lookup(cdv_heap_file_chars,Pid),
             init_progress("Reading process heap",Chars),
 	    pos_bof(Fd,Pos),
-	    read_heap(BinAddrAdj,Dict0);
+	    read_heap(DecodeOpts,Dict0);
 	[] ->
 	    Dict0
     end.
 
-read_heap(BinAddrAdj,Dict0) ->
+read_heap(DecodeOpts,Dict0) ->
     %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case get(fd) of
 	end_of_heap ->
@@ -1553,14 +1608,14 @@ read_heap(BinAddrAdj,Dict0) ->
 		    Dict0;
 		Line ->
                     update_progress(length(Line)+1),
-		    Dict = parse(Line,BinAddrAdj,Dict0),
-		    read_heap(BinAddrAdj,Dict)
+		    Dict = parse(Line,DecodeOpts,Dict0),
+		    read_heap(DecodeOpts,Dict)
 	    end
     end.
 
-parse(Line0, BinAddrAdj, Dict0) ->
+parse(Line0, DecodeOpts, Dict0) ->
     {Addr,":"++Line1} = get_hex(Line0),
-    {_Term,Line,Dict} = parse_heap_term(Line1, Addr, BinAddrAdj, Dict0),
+    {_Term,Line,Dict} = parse_heap_term(Line1, Addr, DecodeOpts, Dict0),
     [] = skip_blanks(Line),
     Dict.
 
@@ -1593,6 +1648,10 @@ port_to_tuple("#Port<"++Port) ->
 
 get_portinfo(Fd,Port) ->
     case line_head(Fd) of
+        "State" ->
+	    get_portinfo(Fd,Port#port{state=bytes(Fd)});
+        "Task Flags" ->
+	    get_portinfo(Fd,Port#port{task_flags=bytes(Fd)});
 	"Slot" ->
 	    %% stored as integer so we can sort on it
 	    get_portinfo(Fd,Port#port{slot=list_to_integer(bytes(Fd))});
@@ -1617,6 +1676,10 @@ get_portinfo(Fd,Port) ->
 			    {Pid,Pid++" ("++Ref++")"}
 			end || Mon <- Monitors0],
 	    get_portinfo(Fd,Port#port{monitors=Monitors});
+        "Suspended" ->
+	    Pids = split_pid_list_no_space(bytes(Fd)),
+	    Suspended = [{Pid,Pid} || Pid <- Pids],
+	    get_portinfo(Fd,Port#port{suspended=Suspended});
 	"Port controls linked-in driver" ->
 	    Str = lists:flatten(["Linked in driver: " | string(Fd)]),
 	    get_portinfo(Fd,Port#port{controls=Str});
@@ -1632,6 +1695,15 @@ get_portinfo(Fd,Port) ->
 	"Port is UNIX fd not opened by emulator" ->
 	    Str = lists:flatten(["UNIX fd not opened by emulator: "| string(Fd)]),
 	    get_portinfo(Fd,Port#port{controls=Str});
+        "Input" ->
+	    get_portinfo(Fd,Port#port{input=list_to_integer(bytes(Fd))});
+        "Output" ->
+	    get_portinfo(Fd,Port#port{output=list_to_integer(bytes(Fd))});
+        "Queue" ->
+	    get_portinfo(Fd,Port#port{queue=list_to_integer(bytes(Fd))});
+        "Port Data" ->
+	    get_portinfo(Fd,Port#port{port_data=string(Fd)});
+
 	"=" ++ _next_tag ->
 	    Port;
 	Other ->
@@ -1882,12 +1954,15 @@ get_nodeinfo(Fd,Nod) ->
 
 %%-----------------------------------------------------------------
 %% Page with details about one loaded modules
-get_loaded_mod_details(File,Mod) ->
+get_loaded_mod_details(File,Mod,DecodeOpts) ->
     [{_,Start}] = lookup_index(?mod,Mod),
     Fd = open(File),
     pos_bof(Fd,Start),
     InitLM = #loaded_mod{mod=Mod,old_size="No old code exists"},
-    ModInfo = get_loaded_mod_info(Fd,InitLM,fun all_modinfo/3),
+    Fun = fun(F, LM, LineHead) ->
+                  all_modinfo(F, LM, LineHead, DecodeOpts)
+          end,
+    ModInfo = get_loaded_mod_info(Fd,InitLM,Fun),
     close(Fd),
     ModInfo.
 
@@ -1945,59 +2020,48 @@ get_loaded_mod_info(Fd,LM,Fun) ->
 
 main_modinfo(_Fd,LM,_LineHead) ->
     LM.
-all_modinfo(Fd,LM,LineHead) ->
+all_modinfo(Fd,LM,LineHead,DecodeOpts) ->
     case LineHead of
 	"Current attributes" ->
-	    Str = hex_to_str(bytes(Fd,"")),
+            Str = get_attribute(Fd, DecodeOpts),
 	    LM#loaded_mod{current_attrib=Str};
 	"Current compilation info" ->
-	    Str = hex_to_str(bytes(Fd,"")),
+            Str = get_attribute(Fd, DecodeOpts),
 	    LM#loaded_mod{current_comp_info=Str};
 	"Old attributes" ->
-	    Str = hex_to_str(bytes(Fd,"")),
+            Str = get_attribute(Fd, DecodeOpts),
 	    LM#loaded_mod{old_attrib=Str};
 	"Old compilation info" ->
-	    Str = hex_to_str(bytes(Fd,"")),
+            Str = get_attribute(Fd, DecodeOpts),
 	    LM#loaded_mod{old_comp_info=Str};
 	Other ->
 	    unexpected(Fd,Other,"loaded modules info"),
 	    LM
     end.
-    
 
-hex_to_str(Hex) ->
-    Term = hex_to_term(Hex,[]),
+get_attribute(Fd, DecodeOpts) ->
+    Term = do_get_attribute(Fd, DecodeOpts),
     io_lib:format("~tp~n",[Term]).
 
-hex_to_term([X,Y|Hex],Acc) ->
-    MS = hex_to_dec([X]),
-    LS = hex_to_dec([Y]),
-    Z = 16*MS+LS,
-    hex_to_term(Hex,[Z|Acc]);
-hex_to_term([],Acc) ->
-    Bin = list_to_binary(lists:reverse(Acc)),
-    case catch binary_to_term(Bin) of
-	{'EXIT',_Reason} ->
-	    {"WARNING: The term is probably truncated!",
-	     "I can not do binary_to_term.",
-	     Bin};
-	Term ->
-	    Term
-    end;
-hex_to_term(Rest,Acc) ->
-    {"WARNING: The term is probably truncated!",
-     "I can not convert hex to term.",
-     Rest,list_to_binary(lists:reverse(Acc))}.
-
-
-hex_to_dec("F") -> 15;
-hex_to_dec("E") -> 14;
-hex_to_dec("D") -> 13;
-hex_to_dec("C") -> 12;
-hex_to_dec("B") -> 11;
-hex_to_dec("A") -> 10;
-hex_to_dec(N) -> list_to_integer(N).
-    
+do_get_attribute(Fd, DecodeOpts) ->
+    Bytes = bytes(Fd, ""),
+    try get_binary(Bytes, DecodeOpts) of
+        {Bin,_} ->
+            try binary_to_term(Bin) of
+                Term ->
+                    Term
+            catch
+                _:_ ->
+                    {"WARNING: The term is probably truncated!",
+                     "I cannot do binary_to_term/1.",
+                     Bin}
+            end
+    catch
+        _:_ ->
+            {"WARNING: The term is probably truncated!",
+             "I cannot convert to binary.",
+             Bytes}
+    end.
 
 %%-----------------------------------------------------------------
 %% Page with list of all funs
@@ -2472,73 +2536,142 @@ get_indextableinfo1(Fd,IndexTable) ->
 %%-----------------------------------------------------------------
 %% Page with scheduler table information
 schedulers(File) ->
-    case lookup_index(?scheduler) of
-	[] ->
-	    [];
-	Schedulers ->
-	    Fd = open(File),
-	    R = lists:map(fun({Name,Start}) ->
-				  get_schedulerinfo(Fd,Name,Start)
-			  end,
-			  Schedulers),
-	    close(Fd),
-	    R
-    end.
+    Fd = open(File),
+
+    Schds0 = case lookup_index(?scheduler) of
+                 [] ->
+                     [];
+                 Normals ->
+                     [{Normals, #sched{type=normal}}]
+             end,
+    Schds1 = case lookup_index(?dirty_cpu_scheduler) of
+                 [] ->
+                     Schds0;
+                 DirtyCpus ->
+                     [{DirtyCpus, get_dirty_runqueue(Fd, ?dirty_cpu_run_queue)}
+                      | Schds0]
+             end,
+    Schds2 = case lookup_index(?dirty_io_scheduler) of
+                 [] ->
+                     Schds1;
+                 DirtyIos ->
+                     [{DirtyIos, get_dirty_runqueue(Fd, ?dirty_io_run_queue)}
+                      | Schds1]
+             end,
+
+    R = schedulers1(Fd, Schds2, []),
+    close(Fd),
+    R.
 
-get_schedulerinfo(Fd,Name,Start) ->
+schedulers1(_Fd, [], Acc) ->
+    Acc;
+schedulers1(Fd, [{Scheds,Sched0} | Tail], Acc0) ->
+    Acc1 = lists:foldl(fun({Name,Start}, AccIn) ->
+                               [get_schedulerinfo(Fd,Name,Start,Sched0) | AccIn]
+                       end,
+                       Acc0,
+                       Scheds),
+    schedulers1(Fd, Tail, Acc1).
+
+get_schedulerinfo(Fd,Name,Start,Sched0) ->
     pos_bof(Fd,Start),
-    get_schedulerinfo1(Fd,#sched{name=Name}).
+    get_schedulerinfo1(Fd,Sched0#sched{name=list_to_integer(Name)}).
+
+sched_type(?dirty_cpu_run_queue) -> dirty_cpu;
+sched_type(?dirty_io_run_queue) ->  dirty_io.
+
+get_schedulerinfo1(Fd, Sched) ->
+    case get_schedulerinfo2(Fd, Sched) of
+        {more, Sched2} ->
+            get_schedulerinfo1(Fd, Sched2);
+        {done, Sched2} ->
+            Sched2
+    end.
 
-get_schedulerinfo1(Fd,Sched=#sched{details=Ds}) ->
+get_schedulerinfo2(Fd, Sched=#sched{details=Ds}) ->
     case line_head(Fd) of
 	"Current Process" ->
-	    get_schedulerinfo1(Fd,Sched#sched{process=bytes(Fd, "None")});
+	    {more, Sched#sched{process=bytes(Fd, "None")}};
 	"Current Port" ->
-	    get_schedulerinfo1(Fd,Sched#sched{port=bytes(Fd, "None")});
+	    {more, Sched#sched{port=bytes(Fd, "None")}};
+
+	"Scheduler Sleep Info Flags" ->
+	    {more, Sched#sched{details=Ds#{sleep_info=>bytes(Fd, "None")}}};
+	"Scheduler Sleep Info Aux Work" ->
+	    {more, Sched#sched{details=Ds#{sleep_aux=>bytes(Fd, "None")}}};
+
+	"Current Process State" ->
+	    {more, Sched#sched{details=Ds#{currp_state=>bytes(Fd)}}};
+	"Current Process Internal State" ->
+	    {more, Sched#sched{details=Ds#{currp_int_state=>bytes(Fd)}}};
+	"Current Process Program counter" ->
+	    {more, Sched#sched{details=Ds#{currp_prg_cnt=>string(Fd)}}};
+	"Current Process CP" ->
+	    {more, Sched#sched{details=Ds#{currp_cp=>string(Fd)}}};
+	"Current Process Limited Stack Trace" ->
+	    %% If there shall be last in scheduler information block
+	    {done, Sched#sched{details=get_limited_stack(Fd, 0, Ds)}};
+
+	"=" ++ _next_tag ->
+            {done, Sched};
+
+	Other ->
+            case Sched#sched.type of
+                normal ->
+                    get_runqueue_info2(Fd, Other, Sched);
+                _ ->
+                    unexpected(Fd,Other,"dirty scheduler information"),
+                    {done, Sched}
+            end
+    end.
+
+get_dirty_runqueue(Fd, Tag) ->
+    case lookup_index(Tag) of
+        [{_, Start}] ->
+            pos_bof(Fd,Start),
+            get_runqueue_info1(Fd,#sched{type=sched_type(Tag)});
+        [] ->
+            #sched{}
+    end.
+
+get_runqueue_info1(Fd, Sched) ->
+    case get_runqueue_info2(Fd, line_head(Fd), Sched) of
+        {more, Sched2} ->
+            get_runqueue_info1(Fd, Sched2);
+        {done, Sched2} ->
+            Sched2
+    end.
+
+get_runqueue_info2(Fd, LineHead, Sched=#sched{details=Ds}) ->
+    case LineHead of
 	"Run Queue Max Length" ->
 	    RQMax = list_to_integer(bytes(Fd)),
 	    RQ = RQMax + Sched#sched.run_q,
-	    get_schedulerinfo1(Fd,Sched#sched{run_q=RQ, details=Ds#{runq_max=>RQMax}});
+	    {more, Sched#sched{run_q=RQ, details=Ds#{runq_max=>RQMax}}};
 	"Run Queue High Length" ->
 	    RQHigh = list_to_integer(bytes(Fd)),
 	    RQ = RQHigh + Sched#sched.run_q,
-	    get_schedulerinfo1(Fd,Sched#sched{run_q=RQ, details=Ds#{runq_high=>RQHigh}});
+	    {more, Sched#sched{run_q=RQ, details=Ds#{runq_high=>RQHigh}}};
 	"Run Queue Normal Length" ->
 	    RQNorm = list_to_integer(bytes(Fd)),
 	    RQ = RQNorm + Sched#sched.run_q,
-	    get_schedulerinfo1(Fd,Sched#sched{run_q=RQ, details=Ds#{runq_norm=>RQNorm}});
+	    {more, Sched#sched{run_q=RQ, details=Ds#{runq_norm=>RQNorm}}};
 	"Run Queue Low Length" ->
 	    RQLow = list_to_integer(bytes(Fd)),
 	    RQ = RQLow + Sched#sched.run_q,
-	    get_schedulerinfo1(Fd,Sched#sched{run_q=RQ, details=Ds#{runq_low=>RQLow}});
+	    {more, Sched#sched{run_q=RQ, details=Ds#{runq_low=>RQLow}}};
 	"Run Queue Port Length" ->
 	    RQ = list_to_integer(bytes(Fd)),
-	    get_schedulerinfo1(Fd,Sched#sched{port_q=RQ});
-
-	"Scheduler Sleep Info Flags" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{sleep_info=>bytes(Fd, "None")}});
-	"Scheduler Sleep Info Aux Work" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{sleep_aux=>bytes(Fd, "None")}});
+	    {more, Sched#sched{port_q=RQ}};
 
 	"Run Queue Flags" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{runq_flags=>bytes(Fd, "None")}});
+	    {more, Sched#sched{details=Ds#{runq_flags=>bytes(Fd, "None")}}};
 
-	"Current Process State" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{currp_state=>bytes(Fd)}});
-	"Current Process Internal State" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{currp_int_state=>bytes(Fd)}});
-	"Current Process Program counter" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{currp_prg_cnt=>string(Fd)}});
-	"Current Process CP" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{currp_cp=>string(Fd)}});
-	"Current Process Limited Stack Trace" ->
-	    %% If there shall be last in scheduler information block
-	    Sched#sched{details=get_limited_stack(Fd, 0, Ds)};
 	"=" ++ _next_tag ->
-	    Sched;
+            {done, Sched};
 	Other ->
 	    unexpected(Fd,Other,"scheduler information"),
-	    Sched
+	    {done, Sched}
     end.
 
 get_limited_stack(Fd, N, Ds) ->
@@ -2554,112 +2687,110 @@ get_limited_stack(Fd, N, Ds) ->
 %%%-----------------------------------------------------------------
 %%% Parse memory in crashdump version 0.1 and newer
 %%%
-parse_heap_term([$l|Line0], Addr, BinAddrAdj, D0) ->	%Cons cell.
-    {H,"|"++Line1,D1} = parse_term(Line0, BinAddrAdj, D0),
-    {T,Line,D2} = parse_term(Line1, BinAddrAdj, D1),
+parse_heap_term([$l|Line0], Addr, DecodeOpts, D0) ->	%Cons cell.
+    {H,"|"++Line1,D1} = parse_term(Line0, DecodeOpts, D0),
+    {T,Line,D2} = parse_term(Line1, DecodeOpts, D1),
     Term = [H|T],
     D = gb_trees:insert(Addr, Term, D2),
     {Term,Line,D};
-parse_heap_term([$t|Line0], Addr, BinAddrAdj, D) ->	%Tuple
+parse_heap_term([$t|Line0], Addr, DecodeOpts, D) ->	%Tuple
     {N,":"++Line} = get_hex(Line0),
-    parse_tuple(N, Line, Addr, BinAddrAdj, D, []);
-parse_heap_term([$F|Line0], Addr, _BinAddrAdj, D0) ->	%Float
+    parse_tuple(N, Line, Addr, DecodeOpts, D, []);
+parse_heap_term([$F|Line0], Addr, _DecodeOpts, D0) ->	%Float
     {N,":"++Line1} = get_hex(Line0),
     {Chars,Line} = get_chars(N, Line1),
     Term = list_to_float(Chars),
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D};
-parse_heap_term("B16#"++Line0, Addr, _BinAddrAdj, D0) -> %Positive big number.
+parse_heap_term("B16#"++Line0, Addr, _DecodeOpts, D0) -> %Positive big number.
     {Term,Line} = get_hex(Line0),
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D};
-parse_heap_term("B-16#"++Line0, Addr, _BinAddrAdj, D0) -> %Negative big number
+parse_heap_term("B-16#"++Line0, Addr, _DecodeOpts, D0) -> %Negative big number
     {Term0,Line} = get_hex(Line0),
     Term = -Term0,
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D};
-parse_heap_term("B"++Line0, Addr, _BinAddrAdj, D0) ->	%Decimal big num
+parse_heap_term("B"++Line0, Addr, _DecodeOpts, D0) ->	%Decimal big num
     case string:to_integer(Line0) of
 	{Int,Line} when is_integer(Int) ->
 	    D = gb_trees:insert(Addr, Int, D0),
 	    {Int,Line,D}
     end;
-parse_heap_term([$P|Line0], Addr, _BinAddrAdj, D0) ->	% External Pid.
+parse_heap_term([$P|Line0], Addr, _DecodeOpts, D0) ->	% External Pid.
     {Pid0,Line} = get_id(Line0),
     Pid = ['#CDVPid'|Pid0],
     D = gb_trees:insert(Addr, Pid, D0),
     {Pid,Line,D};
-parse_heap_term([$p|Line0], Addr, _BinAddrAdj, D0) ->   % External Port.
+parse_heap_term([$p|Line0], Addr, _DecodeOpts, D0) ->   % External Port.
     {Port0,Line} = get_id(Line0),
     Port = ['#CDVPort'|Port0],
     D = gb_trees:insert(Addr, Port, D0),
     {Port,Line,D};
-parse_heap_term("E"++Line0, Addr, _BinAddrAdj, D0) ->	%Term encoded in external format.
-    {Bin,Line} = get_binary(Line0),
+parse_heap_term("E"++Line0, Addr, DecodeOpts, D0) ->	%Term encoded in external format.
+    {Bin,Line} = get_binary(Line0, DecodeOpts),
     Term = binary_to_term(Bin),
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D};
-parse_heap_term("Yh"++Line0, Addr, _BinAddrAdj, D0) ->	%Heap binary.
-    {Term,Line} = get_binary(Line0),
+parse_heap_term("Yh"++Line0, Addr, DecodeOpts, D0) ->	%Heap binary.
+    {Term,Line} = get_binary(Line0, DecodeOpts),
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D};
-parse_heap_term("Yc"++Line0, Addr, BinAddrAdj, D0) ->	%Reference-counted binary.
+parse_heap_term("Yc"++Line0, Addr, DecodeOpts, D0) ->	%Reference-counted binary.
     {Binp0,":"++Line1} = get_hex(Line0),
     {Offset,":"++Line2} = get_hex(Line1),
     {Sz,Line} = get_hex(Line2),
-    Binp = Binp0 bor BinAddrAdj,
-    Term = case lookup_binary_index(Binp) of
-               [{_,Start}] -> cdvbin(Offset,Sz,{'#CDVBin',Start});
-	       [] -> '#CDVNonexistingBinary'
-	   end,
-    D = gb_trees:insert(Addr, Term, D0),
-    {Term,Line,D};
-parse_heap_term("Ys"++Line0, Addr, BinAddrAdj, D0) ->	%Sub binary.
+    Binp = Binp0 bor DecodeOpts#dec_opts.bin_addr_adj,
+    case lookup_binary_index(Binp) of
+        [{_,Start}] ->
+            SymbolicBin = {'#CDVBin',Start},
+            Term = cdvbin(Offset, Sz, SymbolicBin),
+            D1 = gb_trees:insert(Addr, Term, D0),
+            D = gb_trees:insert(Binp, SymbolicBin, D1),
+            {Term,Line,D};
+        [] ->
+            Term = '#CDVNonexistingBinary',
+            D1 = gb_trees:insert(Addr, Term, D0),
+            D = gb_trees:insert(Binp, Term, D1),
+            {Term,Line,D}
+    end;
+parse_heap_term("Ys"++Line0, Addr, DecodeOpts, D0) ->	%Sub binary.
     {Binp0,":"++Line1} = get_hex(Line0),
     {Offset,":"++Line2} = get_hex(Line1),
-    {Sz,Line} = get_hex(Line2),
-    Binp = Binp0 bor BinAddrAdj,
-    Term = case lookup_binary_index(Binp) of
-               [{_,Start}] -> cdvbin(Offset,Sz,{'#CDVBin',Start});
-	       [] ->
-		   %% Might it be on the heap?
-		   case gb_trees:lookup(Binp, D0) of
-		       {value,Bin} -> cdvbin(Offset,Sz,Bin);
-		       none -> '#CDVNonexistingBinary'
-		   end
-	   end,
-    D = gb_trees:insert(Addr, Term, D0),
+    {Sz,Line3} = get_hex(Line2),
+    {Term,Line,D1} = deref_bin(Binp0, Offset, Sz, Line3, DecodeOpts, D0),
+    D = gb_trees:insert(Addr, Term, D1),
     {Term,Line,D};
-parse_heap_term("Mf"++Line0, Addr, BinAddrAdj, D0) -> %Flatmap.
+parse_heap_term("Mf"++Line0, Addr, DecodeOpts, D0) -> %Flatmap.
     {Size,":"++Line1} = get_hex(Line0),
-    {Keys,":"++Line2,D1} = parse_term(Line1, BinAddrAdj, D0),
-    {Values,Line,D2} = parse_tuple(Size, Line2, Addr,BinAddrAdj, D1, []),
+    {Keys,":"++Line2,D1} = parse_term(Line1, DecodeOpts, D0),
+    {Values,Line,D2} = parse_tuple(Size, Line2, Addr,DecodeOpts, D1, []),
     Pairs = zip_tuples(tuple_size(Keys), Keys, Values, []),
     Map = maps:from_list(Pairs),
     D = gb_trees:update(Addr, Map, D2),
     {Map,Line,D};
-parse_heap_term("Mh"++Line0, Addr, BinAddrAdj, D0) -> %Head node in a hashmap.
+parse_heap_term("Mh"++Line0, Addr, DecodeOpts, D0) -> %Head node in a hashmap.
     {MapSize,":"++Line1} = get_hex(Line0),
     {N,":"++Line2} = get_hex(Line1),
-    {Nodes,Line,D1} = parse_tuple(N, Line2, Addr, BinAddrAdj, D0, []),
+    {Nodes,Line,D1} = parse_tuple(N, Line2, Addr, DecodeOpts, D0, []),
     Map = maps:from_list(flatten_hashmap_nodes(Nodes)),
     MapSize = maps:size(Map),                   %Assertion.
     D = gb_trees:update(Addr, Map, D1),
     {Map,Line,D};
-parse_heap_term("Mn"++Line0, Addr, BinAddrAdj, D) -> %Interior node in a hashmap.
+parse_heap_term("Mn"++Line0, Addr, DecodeOpts, D) -> %Interior node in a hashmap.
     {N,":"++Line} = get_hex(Line0),
-    parse_tuple(N, Line, Addr, BinAddrAdj, D, []).
+    parse_tuple(N, Line, Addr, DecodeOpts, D, []).
 
 parse_tuple(0, Line, Addr, _, D0, Acc) ->
     Tuple = list_to_tuple(lists:reverse(Acc)),
     D = gb_trees:insert(Addr, Tuple, D0),
     {Tuple,Line,D};
-parse_tuple(N, Line0, Addr, BinAddrAdj, D0, Acc) ->
-    case parse_term(Line0, BinAddrAdj, D0) of
+parse_tuple(N, Line0, Addr, DecodeOpts, D0, Acc) ->
+    case parse_term(Line0, DecodeOpts, D0) of
 	{Term,[$,|Line],D} when N > 1 ->
-	    parse_tuple(N-1, Line, Addr, BinAddrAdj, D, [Term|Acc]);
+	    parse_tuple(N-1, Line, Addr, DecodeOpts, D, [Term|Acc]);
 	{Term,Line,D}->
-	    parse_tuple(N-1, Line, Addr, BinAddrAdj, D, [Term|Acc])
+	    parse_tuple(N-1, Line, Addr, DecodeOpts, D, [Term|Acc])
     end.
 
 zip_tuples(0, _T1, _T2, Acc) ->
@@ -2681,9 +2812,9 @@ flatten_hashmap_nodes_1(N, Tuple0, Acc0) ->
             flatten_hashmap_nodes_1(tuple_size(Tuple), Tuple, Acc)
     end.
 
-parse_term([$H|Line0], BinAddrAdj, D) ->        %Pointer to heap term.
+parse_term([$H|Line0], DecodeOpts, D) ->        %Pointer to heap term.
     {Ptr,Line} = get_hex(Line0),
-    deref_ptr(Ptr, Line, BinAddrAdj, D);
+    deref_ptr(Ptr, Line, DecodeOpts, D);
 parse_term([$N|Line], _, D) ->			%[] (nil).
     {[],Line,D};
 parse_term([$I|Line0], _, D) ->			%Small.
@@ -2700,11 +2831,11 @@ parse_term([$p|Line0], _, D) ->			%Port.
 parse_term([$S|Str0], _, D) ->			%Information string.
     Str = lists:reverse(skip_blanks(lists:reverse(Str0))),
     {Str,[],D};
-parse_term([$D|Line0], _, D) ->                 %DistExternal
+parse_term([$D|Line0], DecodeOpts, D) ->                 %DistExternal
     try
 	{AttabSize,":"++Line1} = get_hex(Line0),
 	{Attab, "E"++Line2} = parse_atom_translation_table(AttabSize, Line1, []),
-	{Bin,Line3} = get_binary(Line2),
+	{Bin,Line3} = get_binary(Line2, DecodeOpts),
 	{try
 	     erts_debug:dist_ext_to_term(Attab, Bin)
 	 catch
@@ -2737,26 +2868,55 @@ parse_atom_translation_table(0, Line0, As) ->
 parse_atom_translation_table(N, Line0, As) ->
     {A, Line1, _} = parse_atom(Line0, []),
     parse_atom_translation_table(N-1, Line1, [A|As]).
-    
-    
 
-deref_ptr(Ptr, Line, BinAddrAdj, D0) ->
-    case gb_trees:lookup(Ptr, D0) of
+
+deref_ptr(Ptr, Line, DecodeOpts, D) ->
+    Lookup = fun(D0) ->
+                     gb_trees:lookup(Ptr, D0)
+             end,
+    do_deref_ptr(Lookup, Line, DecodeOpts, D).
+
+deref_bin(Binp0, Offset, Sz, Line, DecodeOpts, D) ->
+    Binp = Binp0 bor DecodeOpts#dec_opts.bin_addr_adj,
+    Lookup = fun(D0) ->
+                     lookup_binary(Binp, Offset, Sz, D0)
+             end,
+    do_deref_ptr(Lookup, Line, DecodeOpts, D).
+
+lookup_binary(Binp, Offset, Sz, D) ->
+    case lookup_binary_index(Binp) of
+        [{_,Start}] ->
+            Term = cdvbin(Offset, Sz, {'#CDVBin',Start}),
+            {value,Term};
+        [] ->
+            case gb_trees:lookup(Binp, D) of
+                {value,<<_:Offset/bytes,Sub:Sz/bytes,_/bytes>>} ->
+                    {value,Sub};
+                {value,SymbolicBin} ->
+                    {value,cdvbin(Offset, Sz, SymbolicBin)};
+                none ->
+                    none
+            end
+    end.
+
+do_deref_ptr(Lookup, Line, DecodeOpts, D0) ->
+    case Lookup(D0) of
 	{value,Term} ->
 	    {Term,Line,D0};
 	none ->
 	    case get(fd) of
 		end_of_heap ->
+                    put(incomplete_heap,true),
 		    {['#CDVIncompleteHeap'],Line,D0};
 		Fd ->
 		    case bytes(Fd) of
 			"="++_ ->
 			    put(fd, end_of_heap),
-			    deref_ptr(Ptr, Line, BinAddrAdj, D0);
+			    do_deref_ptr(Lookup, Line, DecodeOpts, D0);
 			L ->
                             update_progress(length(L)+1),
-			    D = parse(L, BinAddrAdj, D0),
-			    deref_ptr(Ptr, Line, BinAddrAdj, D)
+			    D = parse(L, DecodeOpts, D0),
+			    do_deref_ptr(Lookup, Line, DecodeOpts, D)
 		    end
 	    end
     end.
@@ -2819,36 +2979,80 @@ get_label([$:|Line], Acc) ->
 get_label([H|T], Acc) ->
     get_label(T, [H|Acc]).
 
-get_binary(Line0) ->
+get_binary(Line0,DecodeOpts) ->
     case get_hex(Line0) of
         {N,":"++Line} ->
-            do_get_binary(N, Line, [], false);
+            get_binary_1(N, Line, DecodeOpts);
         _  ->
            {'#CDVTruncatedBinary',[]}
     end.
 
-get_binary(Offset,Size,Line0) ->
+get_binary_1(N,Line,#dec_opts{base64=false}) ->
+    get_binary_hex(N, Line, [], false);
+get_binary_1(N,Line0,#dec_opts{base64=true}) ->
+    NumBytes = ((N+2) div 3) * 4,
+    {Base64,Line} = lists:split(NumBytes, Line0),
+    Bin = get_binary_base64(list_to_binary(Base64), <<>>, false),
+    {Bin,Line}.
+
+get_binary(Offset,Size,Line0,DecodeOpts) ->
     case get_hex(Line0) of
         {_N,":"++Line} ->
-            Progress = Size>?binary_size_progress_limit,
-            Progress andalso init_progress("Reading binary",Size),
-            do_get_binary(Size, lists:sublist(Line,(Offset*2)+1,Size*2), [],
-                          Progress);
-        _  ->
-           {'#CDVTruncatedBinary',[]}
-    end.
-
-do_get_binary(0, Line, Acc, Progress) ->
+            get_binary_1(Offset,Size,Line,DecodeOpts);
+        _ ->
+            {'#CDVTruncatedBinary',[]}
+    end.
+
+get_binary_1(Offset,Size,Line,#dec_opts{base64=false}) ->
+    Progress = Size > ?binary_size_progress_limit,
+    Progress andalso init_progress("Reading binary",Size),
+    get_binary_hex(Size, lists:sublist(Line,(Offset*2)+1,Size*2), [],
+                  Progress);
+get_binary_1(StartOffset,Size,Line,#dec_opts{base64=true}) ->
+    Progress = Size > ?binary_size_progress_limit,
+    Progress andalso init_progress("Reading binary",Size),
+    EndOffset = StartOffset + Size,
+    StartByte = (StartOffset div 3) * 4,
+    EndByte = ((EndOffset + 2) div 3) * 4,
+    NumBytes = EndByte - StartByte,
+    case list_to_binary(Line) of
+        <<_:StartByte/bytes,Base64:NumBytes/bytes,_/bytes>> ->
+            Bin0 = get_binary_base64(Base64, <<>>, Progress),
+            Skip = StartOffset - (StartOffset div 3) * 3,
+            <<_:Skip/bytes,Bin:Size/bytes,_/bytes>> = Bin0,
+            {Bin,[]};
+        _ ->
+            {'#CDVTruncatedBinary',[]}
+    end.
+
+get_binary_hex(0, Line, Acc, Progress) ->
     Progress andalso end_progress(),
     {list_to_binary(lists:reverse(Acc)),Line};
-do_get_binary(N, [A,B|Line], Acc, Progress) ->
+get_binary_hex(N, [A,B|Line], Acc, Progress) ->
     Byte = (get_hex_digit(A) bsl 4) bor get_hex_digit(B),
     Progress andalso update_progress(),
-    do_get_binary(N-1, Line, [Byte|Acc], Progress);
-do_get_binary(_N, [], _Acc, Progress) ->
+    get_binary_hex(N-1, Line, [Byte|Acc], Progress);
+get_binary_hex(_N, [], _Acc, Progress) ->
     Progress andalso end_progress(),
     {'#CDVTruncatedBinary',[]}.
 
+get_binary_base64(<<Chunk0:?base64_chunk_size/bytes,T/bytes>>,
+                  Acc0, Progress) ->
+    Chunk = base64:decode(Chunk0),
+    Acc = <<Acc0/binary,Chunk/binary>>,
+    Progress andalso update_progress(?base64_chunk_size * 3 div 4),
+    get_binary_base64(T, Acc, Progress);
+get_binary_base64(Chunk0, Acc, Progress) ->
+    case Progress of
+        true ->
+            update_progress(?base64_chunk_size * 3 div 4),
+            end_progress();
+        false ->
+            ok
+    end,
+    Chunk = base64:decode(Chunk0),
+    <<Acc/binary,Chunk/binary>>.
+
 cdvbin(Offset,Size,{'#CDVBin',Pos}) ->
     ['#CDVBin',Offset,Size,Pos];
 cdvbin(Offset,Size,['#CDVBin',_,_,Pos]) ->
@@ -2898,6 +3102,10 @@ tag_to_atom("allocated_areas") -> ?allocated_areas;
 tag_to_atom("allocator") -> ?allocator;
 tag_to_atom("atoms") -> ?atoms;
 tag_to_atom("binary") -> ?binary;
+tag_to_atom("dirty_cpu_scheduler") -> ?dirty_cpu_scheduler;
+tag_to_atom("dirty_cpu_run_queue") -> ?dirty_cpu_run_queue;
+tag_to_atom("dirty_io_scheduler") -> ?dirty_io_scheduler;
+tag_to_atom("dirty_io_run_queue") -> ?dirty_io_run_queue;
 tag_to_atom("end") -> ?ende;
 tag_to_atom("erl_crash_dump") -> ?erl_crash_dump;
 tag_to_atom("ets") -> ?ets;
diff --git a/lib/observer/src/crashdump_viewer.hrl b/lib/observer/src/crashdump_viewer.hrl
index 6a93a089fd..252e19379d 100644
--- a/lib/observer/src/crashdump_viewer.hrl
+++ b/lib/observer/src/crashdump_viewer.hrl
@@ -80,6 +80,10 @@
 	 old_heap,
 	 heap_unused,
 	 old_heap_unused,
+         bin_vheap,
+         old_bin_vheap,
+         bin_vheap_unused,
+         old_bin_vheap_unused,
 	 new_heap_start,
 	 new_heap_top,
 	 stack_top,
@@ -95,19 +99,27 @@
 
 -record(port,
 	{id,
+         state,
+         task_flags=0,
 	 slot,
 	 connected,
 	 links,
 	 name,
 	 monitors,
-	 controls}).
+         suspended,
+	 controls,
+         input,
+         output,
+         queue,
+         port_data}).
 
 -record(sched,
 	{name,
+         type,
 	 process,
 	 port,
 	 run_q=0,
-	 port_q=0,
+	 port_q,
 	 details=#{}
 	}).
 
diff --git a/lib/observer/src/observer.app.src b/lib/observer/src/observer.app.src
index f682e3dc7b..cd4aa2e299 100644
--- a/lib/observer/src/observer.app.src
+++ b/lib/observer/src/observer.app.src
@@ -65,8 +65,7 @@
     {registered, []},
     {applications, [kernel, stdlib]},
     {env, []},
-    {runtime_dependencies, ["wx-1.2","stdlib-3.4","runtime_tools-1.8.14",
-			    "kernel-3.0","inets-5.10","et-1.5",
-			    "erts-7.0"]}]}.
+    {runtime_dependencies, ["wx-1.2","stdlib-3.5","runtime_tools-1.8.14",
+			    "kernel-3.0","et-1.5","erts-7.0"]}]}.
 
 
diff --git a/lib/observer/src/observer_alloc_wx.erl b/lib/observer/src/observer_alloc_wx.erl
index 7f4b3dd484..e0f319b6cc 100644
--- a/lib/observer/src/observer_alloc_wx.erl
+++ b/lib/observer/src/observer_alloc_wx.erl
@@ -79,8 +79,8 @@ init([Notebook, Parent, Config]) ->
                       max   = #{}
 		     }
 	}
-    catch _:Err ->
-	    io:format("~p crashed ~tp: ~tp~n",[?MODULE, Err, erlang:get_stacktrace()]),
+    catch _:Err:Stacktrace ->
+	    io:format("~p crashed ~tp: ~tp~n",[?MODULE, Err, Stacktrace]),
 	    {stop, Err}
     end.
 
diff --git a/lib/observer/src/observer_html_lib.erl b/lib/observer/src/observer_html_lib.erl
index 68381bcc7b..8202f91030 100644
--- a/lib/observer/src/observer_html_lib.erl
+++ b/lib/observer/src/observer_html_lib.erl
@@ -355,11 +355,11 @@ href_proc_bin(From, T, Acc, LTB) ->
                                 PreviewStr
                         end
                 end;
-	    [PreviewIntStr,SizeStr,Md5] when From =:= obs ->
+	    [PreviewIntStr,PreviewBitSizeStr,SizeStr,Md5] when From =:= obs ->
 		Size = list_to_integer(SizeStr),
                 PreviewInt = list_to_integer(PreviewIntStr),
-		PrevSize = (trunc(math:log2(PreviewInt)/8)+1)*8,
-		PreviewStr = preview_string(Size,<<PreviewInt:PrevSize>>),
+                PreviewBitSize = list_to_integer(PreviewBitSizeStr),
+		PreviewStr = preview_string(Size,<<PreviewInt:PreviewBitSize>>),
 		if LTB ->
 			href("TARGET=\"expanded\"",
 			     ["#OBSBinary?key1="++PreviewIntStr++
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index e5ffe61d25..0678b64134 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -21,7 +21,8 @@
 
 -export([get_wx_parent/1,
 	 display_info_dialog/2, display_yes_no_dialog/1,
-	 display_progress_dialog/3, destroy_progress_dialog/0,
+	 display_progress_dialog/3,
+         destroy_progress_dialog/0, sync_destroy_progress_dialog/0,
 	 wait_for_progress/0, report_progress/1,
 	 user_term/3, user_term_multiline/3,
 	 interval_dialog/4, start_timer/1, start_timer/2, stop_timer/1, timer_config/1,
@@ -31,7 +32,8 @@
 	 set_listctrl_col_size/2,
 	 create_status_bar/1,
 	 html_window/1, html_window/2,
-         make_obsbin/2
+         make_obsbin/2,
+         add_scroll_entries/2
 	]).
 
 -include_lib("wx/include/wx.hrl").
@@ -40,6 +42,8 @@
 -define(SINGLE_LINE_STYLE, ?wxBORDER_NONE bor ?wxTE_READONLY bor ?wxTE_RICH2).
 -define(MULTI_LINE_STYLE, ?SINGLE_LINE_STYLE bor ?wxTE_MULTILINE).
 
+-define(NUM_SCROLL_ITEMS,8).
+
 -define(pulse_timeout,50).
 
 get_wx_parent(Window) ->
@@ -397,17 +401,18 @@ get_box_info({Title, left, List}) -> {Title, ?wxALIGN_LEFT, List};
 get_box_info({Title, right, List}) -> {Title, ?wxALIGN_RIGHT, List}.
 
 add_box(Panel, OuterBox, Cursor, Title, Proportion, {Format, List}) ->
-    Box = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, Title}]),
+    NumStr = " ("++integer_to_list(length(List))++")",
+    Box = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, Title ++ NumStr}]),
     Scroll = wxScrolledWindow:new(Panel),
     wxScrolledWindow:enableScrolling(Scroll,true,true),
     wxScrolledWindow:setScrollbars(Scroll,1,1,0,0),
     ScrollSizer  = wxBoxSizer:new(?wxVERTICAL),
     wxScrolledWindow:setSizer(Scroll, ScrollSizer),
     wxWindow:setBackgroundStyle(Scroll, ?wxBG_STYLE_SYSTEM),
-    add_entries(Format, List, Scroll, ScrollSizer, Cursor),
+    Entries = add_entries(Format, List, Scroll, ScrollSizer, Cursor),
     wxSizer:add(Box,Scroll,[{proportion,1},{flag,?wxEXPAND}]),
     wxSizer:add(OuterBox,Box,[{proportion,Proportion},{flag,?wxEXPAND}]),
-    {Scroll,ScrollSizer,length(List)}.
+    {Scroll,ScrollSizer,length(Entries)}.
 
 add_entries(click, List, Scroll, ScrollSizer, Cursor) ->
     Add = fun(Link) ->
@@ -415,7 +420,20 @@ add_entries(click, List, Scroll, ScrollSizer, Cursor) ->
                   wxWindow:setBackgroundStyle(TC, ?wxBG_STYLE_SYSTEM),
 		  wxSizer:add(ScrollSizer,TC, [{flag,?wxEXPAND}])
 	  end,
-    [Add(Link) || Link <- List];
+    if length(List) > ?NUM_SCROLL_ITEMS ->
+            {List1,Rest} = lists:split(?NUM_SCROLL_ITEMS,List),
+            LinkEntries = [Add(Link) || Link <- List1],
+            NStr = integer_to_list(length(Rest)),
+            TC = link_entry2(Scroll,
+                             {{more,{Rest,Scroll,ScrollSizer}},"more..."},
+                             Cursor,
+                             "Click to see " ++ NStr ++ " more entries"),
+            wxWindow:setBackgroundStyle(TC, ?wxBG_STYLE_SYSTEM),
+            E = wxSizer:add(ScrollSizer,TC, [{flag,?wxEXPAND}]),
+            LinkEntries ++ [E];
+       true ->
+            [Add(Link) || Link <- List]
+    end;
 add_entries(plain, List, Scroll, ScrollSizer, _) ->
     Add = fun(String) ->
 		  TC = wxStaticText:new(Scroll, ?wxID_ANY, String),
@@ -423,6 +441,23 @@ add_entries(plain, List, Scroll, ScrollSizer, _) ->
 	  end,
     [Add(String) || String <- List].
 
+add_scroll_entries(MoreEntry,{List, Scroll, ScrollSizer}) ->
+    wx:batch(
+      fun() ->
+              wxSizer:remove(ScrollSizer,?NUM_SCROLL_ITEMS),
+              wxStaticText:destroy(MoreEntry),
+              Cursor = wxCursor:new(?wxCURSOR_HAND),
+              Add = fun(Link) ->
+                            TC = link_entry(Scroll, Link, Cursor),
+                            wxWindow:setBackgroundStyle(TC, ?wxBG_STYLE_SYSTEM),
+                            wxSizer:add(ScrollSizer,TC, [{flag,?wxEXPAND}])
+                    end,
+              Entries = [Add(Link) || Link <- List],
+              wxCursor:destroy(Cursor),
+              wxSizer:layout(ScrollSizer),
+              wxSizer:setVirtualSizeHints(ScrollSizer,Scroll),
+              Entries
+      end).
 
 create_box(_Panel, {scroll_boxes,[]}) ->
     undefined;
@@ -449,7 +484,7 @@ create_box(Panel, {scroll_boxes,Data}) ->
     {_,H} = wxWindow:getSize(Dummy),
     wxTextCtrl:destroy(Dummy),
 
-    MaxH = if MaxL > 8 -> 8*H;
+    MaxH = if MaxL > ?NUM_SCROLL_ITEMS -> ?NUM_SCROLL_ITEMS*H;
 	      true -> MaxL*H
 	   end,
     [wxWindow:setMinSize(B,{0,MaxH}) || {B,_,_} <- Boxes],
@@ -504,20 +539,22 @@ create_box(Parent, Data) ->
 
 link_entry(Panel, Link) ->
     Cursor = wxCursor:new(?wxCURSOR_HAND),
-    TC = link_entry2(Panel, to_link(Link), Cursor),
+    TC = link_entry(Panel, Link, Cursor),
     wxCursor:destroy(Cursor),
     TC.
 link_entry(Panel, Link, Cursor) ->
-    link_entry2(Panel, to_link(Link), Cursor).
+    link_entry2(Panel,to_link(Link),Cursor).
 
 link_entry2(Panel,{Target,Str},Cursor) ->
+    link_entry2(Panel,{Target,Str},Cursor,"Click to see properties for " ++ Str).
+link_entry2(Panel,{Target,Str},Cursor,ToolTipText) ->
     TC = wxStaticText:new(Panel, ?wxID_ANY, Str),
     wxWindow:setForegroundColour(TC,?wxBLUE),
     wxWindow:setCursor(TC, Cursor),
     wxWindow:connect(TC, left_down, [{userData,Target}]),
     wxWindow:connect(TC, enter_window),
     wxWindow:connect(TC, leave_window),
-    ToolTip = wxToolTip:new("Click to see properties for " ++ Str),
+    ToolTip = wxToolTip:new(ToolTipText),
     wxWindow:setToolTip(TC, ToolTip),
     TC.
 
@@ -708,6 +745,11 @@ wait_for_progress() ->
 destroy_progress_dialog() ->
     report_progress(finish).
 
+sync_destroy_progress_dialog() ->
+    Ref = erlang:monitor(process,?progress_handler),
+    destroy_progress_dialog(),
+    receive {'DOWN',Ref,process,_,_} -> ok end.
+
 report_progress(Progress) ->
     case whereis(?progress_handler) of
 	Pid when is_pid(Pid) ->
@@ -787,9 +829,8 @@ progress_dialog_new(Parent,Title,Str) ->
                           [{style,?wxDEFAULT_DIALOG_STYLE}]),
     Panel = wxPanel:new(Dialog),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
-    Message = wxStaticText:new(Panel, 1, Str),
-    Gauge = wxGauge:new(Panel, 2, 100, [{size, {170, -1}},
-                                        {style, ?wxGA_HORIZONTAL}]),
+    Message = wxStaticText:new(Panel, 1, Str,[{size,{220,-1}}]),
+    Gauge = wxGauge:new(Panel, 2, 100, [{style, ?wxGA_HORIZONTAL}]),
     SizerFlags = ?wxEXPAND bor ?wxLEFT bor ?wxRIGHT bor ?wxTOP,
     wxSizer:add(Sizer, Message, [{flag,SizerFlags},{border,15}]),
     wxSizer:add(Sizer, Gauge, [{flag, SizerFlags bor ?wxBOTTOM},{border,15}]),
@@ -810,7 +851,7 @@ progress_dialog_destroy({Dialog,_,_}) ->
 
 make_obsbin(Bin,Tab) ->
     Size = byte_size(Bin),
-    Preview =
+    {Preview,PreviewBitSize} =
         try
             %% The binary might be a unicode string, in which case we
             %% don't want to split it in the middle of a grapheme
@@ -819,14 +860,14 @@ make_obsbin(Bin,Tab) ->
             PB1 = string:slice(Bin,0,PL1),
             PS1 = byte_size(PB1) * 8,
             <<P1:PS1>> = PB1,
-            P1
+            {P1,PS1}
         catch _:_ ->
                 %% Probably not a string, so just split anywhere
                 PS2 = min(Size, 10) * 8,
                 <<P2:PS2, _/binary>> = Bin,
-                P2
+                {P2,PS2}
         end,
     Hash = erlang:phash2(Bin),
     Key = {Preview, Size, Hash},
     ets:insert(Tab, {Key,Bin}),
-    ['#OBSBin',Preview,Size,Hash].
+    ['#OBSBin',Preview,PreviewBitSize,Size,Hash].
diff --git a/lib/observer/src/observer_perf_wx.erl b/lib/observer/src/observer_perf_wx.erl
index 5adfadb16e..eddb9327f3 100644
--- a/lib/observer/src/observer_perf_wx.erl
+++ b/lib/observer/src/observer_perf_wx.erl
@@ -86,8 +86,8 @@ init([Notebook, Parent, Config]) ->
                                  secs=maps:get(secs, Config, ?DISP_SECONDS)}
 		       },
 	{Panel, State0}
-    catch _:Err ->
-	    io:format("~p crashed ~tp: ~tp~n",[?MODULE, Err, erlang:get_stacktrace()]),
+    catch _:Err:Stacktrace ->
+	    io:format("~p crashed ~tp: ~tp~n",[?MODULE, Err, Stacktrace]),
 	    {stop, Err}
     end.
 
diff --git a/lib/observer/src/observer_port_wx.erl b/lib/observer/src/observer_port_wx.erl
index 5908e99e36..f7ae07fb85 100644
--- a/lib/observer/src/observer_port_wx.erl
+++ b/lib/observer/src/observer_port_wx.erl
@@ -242,6 +242,10 @@ handle_event(#wx{id=?ID_REFRESH_INTERVAL},
     Timer = observer_lib:interval_dialog(Grid, Timer0, 10, 5*60),
     {noreply, State#state{timer=Timer}};
 
+handle_event(#wx{obj=MoreEntry,event=#wxMouse{type=left_down},userData={more,More}}, State) ->
+    observer_lib:add_scroll_entries(MoreEntry,More),
+    {noreply, State};
+
 handle_event(#wx{event=#wxMouse{type=left_down}, userData=TargetPid}, State) ->
     observer ! {open_link, TargetPid},
     {noreply, State};
diff --git a/lib/observer/src/observer_pro_wx.erl b/lib/observer/src/observer_pro_wx.erl
index 2e5fe0bc1a..1c40afba46 100644
--- a/lib/observer/src/observer_pro_wx.erl
+++ b/lib/observer/src/observer_pro_wx.erl
@@ -27,7 +27,7 @@
 	 handle_event/2, handle_cast/2]).
 
 -include_lib("wx/include/wx.hrl").
--include("../include/etop.hrl").
+-include("etop.hrl").
 -include("observer_defs.hrl").
 -include("etop_defs.hrl").
 
@@ -572,7 +572,8 @@ change_accum(true, S0) ->
     S0#holder{accum=true};
 change_accum(false, S0=#holder{info=Info}) ->
     self() ! refresh,
-    S0#holder{accum=lists:sort(array:to_list(Info))}.
+    Accum = [{Pid, Reds} || #etop_proc_info{pid=Pid, reds=Reds} <- array:to_list(Info)],
+    S0#holder{accum=lists:sort(Accum)}.
 
 handle_update_old(#etop_info{procinfo=ProcInfo0},
                   S0=#holder{parent=Parent, sort=Sort=#sort{sort_key=KeyField}}) ->
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index 4ce38e439d..6a85d29c1e 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -120,6 +120,10 @@ handle_event(#wx{id=?REFRESH}, #state{frame=Frame, pid=Pid, pages=Pages, expand_
     end,
     {noreply, State};
 
+handle_event(#wx{obj=MoreEntry,event=#wxMouse{type=left_down},userData={more,More}}, State) ->
+    observer_lib:add_scroll_entries(MoreEntry,More),
+    {noreply, State};
+
 handle_event(#wx{event=#wxMouse{type=left_down}, userData=TargetPid}, State) ->
     observer ! {open_link, TargetPid},
     {noreply, State};
@@ -144,7 +148,7 @@ handle_event(#wx{event=#wxHtmlLink{linkInfo=#wxHtmlLinkInfo{href=Href}}},
 	    observer ! {open_link, Href},
 	    {noreply, State};
 	Callback ->
-	    [{"key1",Key1},{"key2",Key2},{"key3",Key3}] = httpd:parse_query(Rest),
+	    [{"key1",Key1},{"key2",Key2},{"key3",Key3}] = uri_string:dissect_query(Rest),
 	    Id = {obs, {T,{list_to_integer(Key1),
 			   list_to_integer(Key2),
 			   list_to_integer(Key3)}}},
@@ -253,8 +257,6 @@ init_stack_page(Parent, Pid) ->
 					      [Pid, current_stacktrace])
 		     of
 			 {current_stacktrace,RawBt} ->
-			     observer_wx:try_rpc(node(Pid), erlang, process_info,
-						 [Pid, current_stacktrace]),
 			     wxListCtrl:deleteAllItems(LCtrl),
 			     wx:foldl(fun({M, F, A, Info}, Row) ->
 					      _Item = wxListCtrl:insertItem(LCtrl, Row, ""),
diff --git a/lib/observer/src/observer_traceoptions_wx.erl b/lib/observer/src/observer_traceoptions_wx.erl
index fbcf6d7fe9..ff8c40ce77 100644
--- a/lib/observer/src/observer_traceoptions_wx.erl
+++ b/lib/observer/src/observer_traceoptions_wx.erl
@@ -536,7 +536,7 @@ ms_from_string(Str) ->
 	    {error, List} -> throw([[Error, $\n] || {_, Error} <- List])
 	end
     catch error:_Reason ->
-	    %% io:format("Bad term: ~ts~n ~tp in ~tp~n", [Str, _Reason, erlang:get_stacktrace()]),
+	    %% io:format("Bad term: ~ts~n ~tp in ~tp~n", [Str, _Reason, Stacktrace]),
 	    throw("Invalid term")
     end.
 
diff --git a/lib/observer/src/observer_tv_wx.erl b/lib/observer/src/observer_tv_wx.erl
index e16f3cab6b..2e387f7e74 100644
--- a/lib/observer/src/observer_tv_wx.erl
+++ b/lib/observer/src/observer_tv_wx.erl
@@ -38,13 +38,13 @@
 -define(ID_SYSTEM_TABLES, 406).
 -define(ID_TABLE_INFO, 407).
 -define(ID_SHOW_TABLE, 408).
- 
--record(opt, {type=ets,
-	      sys_hidden=true,
-	      unread_hidden=true,
-	      sort_key=2,
-	      sort_incr=true
-	     }).
+
+-record(opts, {type=ets,
+               sys_hidden=true,
+               unread_hidden=true}).
+
+-record(sort, {sort_incr=true,
+               sort_key=2}).
 
 -record(state,
 	{
@@ -52,9 +52,9 @@
 	  grid,
 	  panel,
 	  node=node(),
-	  opt=#opt{},
+	  opts=#opts{},
+          holder,
 	  selected,
-	  tabs,
 	  timer
 	}).
 
@@ -64,8 +64,18 @@ start_link(Notebook,  Parent, Config) ->
 init([Notebook, Parent, Config]) ->
     Panel = wxPanel:new(Notebook),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
-    Style = ?wxLC_REPORT bor ?wxLC_SINGLE_SEL bor ?wxLC_HRULES,
-    Grid = wxListCtrl:new(Panel, [{winid, ?GRID}, {style, Style}]),
+
+    Opts=#opts{type=maps:get(type, Config, ets),
+               sys_hidden=maps:get(sys_hidden, Config, true),
+               unread_hidden=maps:get(unread_hidden, Config, true)},
+
+    Style = ?wxLC_REPORT bor ?wxLC_VIRTUAL bor ?wxLC_SINGLE_SEL bor ?wxLC_HRULES,
+    Self = self(),
+    Attrs = observer_lib:create_attrs(),
+    Holder = spawn_link(fun() -> init_table_holder(Self, Attrs) end),
+    CBs = [{onGetItemText, fun(_, Item,Col) -> get_row(Holder, Item, Col) end},
+           {onGetItemAttr, fun(_, Item) -> get_attr(Holder, Item) end}],
+    Grid = wxListCtrl:new(Panel, [{winid, ?GRID}, {style, Style} | CBs]),
     wxSizer:add(Sizer, Grid, [{flag, ?wxEXPAND bor ?wxALL},
 			      {proportion, 1}, {border, 5}]),
     wxWindow:setSizer(Panel, Sizer),
@@ -95,38 +105,26 @@ init([Notebook, Parent, Config]) ->
 
     wxWindow:setFocus(Grid),
     {Panel, #state{grid=Grid, parent=Parent, panel=Panel,
-                   timer=Config,
-                   opt=#opt{type=maps:get(type, Config, ets),
-                            sys_hidden=maps:get(sys_hidden, Config, true),
-                            unread_hidden=maps:get(unread_hidden, Config, true)}
-                  }}.
+                   opts=Opts, timer=Config, holder=Holder}}.
 
 handle_event(#wx{id=?ID_REFRESH},
-	     State = #state{node=Node, grid=Grid, opt=Opt}) ->
-    Tables = get_tables(Node, Opt),
-    {Tabs,Sel} = update_grid(Grid, sel(State), Opt, Tables),
-    Sel =/= undefined andalso wxListCtrl:ensureVisible(Grid, Sel),
-    {noreply, State#state{tabs=Tabs, selected=Sel}};
+	     State = #state{holder=Holder, node=Node, opts=Opts}) ->
+    Tables = get_tables(Node, Opts),
+    Holder ! {refresh, Tables},
+    {noreply, State};
 
 handle_event(#wx{event=#wxList{type=command_list_col_click, col=Col}},
-	     State = #state{node=Node, grid=Grid,
-			    opt=Opt0=#opt{sort_key=Key, sort_incr=Bool}}) ->
-    Opt = case col2key(Col) of
-	      Key -> Opt0#opt{sort_incr=not Bool};
-	      NewKey -> Opt0#opt{sort_key=NewKey}
-	  end,
-    Tables = get_tables(Node, Opt),
-    {Tabs,Sel} = update_grid(Grid, sel(State), Opt, Tables),
-    wxWindow:setFocus(Grid),
-    {noreply, State#state{opt=Opt, tabs=Tabs, selected=Sel}};
+	     State = #state{holder=Holder}) ->
+    Holder ! {sort, Col},
+    {noreply, State};
 
-handle_event(#wx{id=Id}, State = #state{node=Node, grid=Grid, opt=Opt0})
+handle_event(#wx{id=Id}, State = #state{node=Node, holder=Holder, grid=Grid, opts=Opt0})
   when Id >= ?ID_ETS, Id =< ?ID_SYSTEM_TABLES ->
     Opt = case Id of
-	      ?ID_ETS -> Opt0#opt{type=ets};
-	      ?ID_MNESIA -> Opt0#opt{type=mnesia};
-	      ?ID_UNREADABLE -> Opt0#opt{unread_hidden= not Opt0#opt.unread_hidden};
-	      ?ID_SYSTEM_TABLES -> Opt0#opt{sys_hidden= not Opt0#opt.sys_hidden}
+	      ?ID_ETS -> Opt0#opts{type=ets};
+	      ?ID_MNESIA -> Opt0#opts{type=mnesia};
+	      ?ID_UNREADABLE -> Opt0#opts{unread_hidden= not Opt0#opts.unread_hidden};
+	      ?ID_SYSTEM_TABLES -> Opt0#opts{sys_hidden= not Opt0#opts.sys_hidden}
 	  end,
     case get_tables2(Node, Opt) of
 	Error = {error, _} ->
@@ -135,9 +133,9 @@ handle_event(#wx{id=Id}, State = #state{node=Node, grid=Grid, opt=Opt0})
 	    self() ! Error,
 	    {noreply, State};
 	Tables ->
-	    {Tabs, Sel} = update_grid(Grid, sel(State), Opt, Tables),
+	    Holder ! {refresh, Tables},
 	    wxWindow:setFocus(Grid),
-	    {noreply, State#state{opt=Opt, tabs=Tabs, selected=Sel}}
+	    {noreply, State#state{opts=Opt}}
     end;
 
 handle_event(#wx{event=#wxSize{size={W,_}}},  State=#state{grid=Grid}) ->
@@ -146,19 +144,18 @@ handle_event(#wx{event=#wxSize{size={W,_}}},  State=#state{grid=Grid}) ->
 
 handle_event(#wx{event=#wxList{type=command_list_item_activated,
 			       itemIndex=Index}},
-	     State=#state{grid=Grid, node=Node, opt=#opt{type=Type}, tabs=Tabs}) ->
-    Table = lists:nth(Index+1, Tabs),
-    case Table#tab.protection of
-	private ->
-	    self() ! {error, "Table has 'private' protection and can not be read"};
-	_ ->
-	    observer_tv_table:start_link(Grid, [{node,Node}, {type,Type}, {table,Table}])
+	     State=#state{holder=Holder, node=Node, opts=#opts{type=Type}, grid=Grid}) ->
+    case get_table(Holder, Index) of
+        #tab{protection=private} ->
+            self() ! {error, "Table has 'private' protection and can not be read"};
+        #tab{}=Table ->
+	    observer_tv_table:start_link(Grid, [{node,Node}, {type,Type}, {table,Table}]);
+        _ -> ignore
     end,
     {noreply, State};
 
 handle_event(#wx{event=#wxList{type=command_list_item_right_click}},
 	     State=#state{panel=Panel}) ->
-
     Menu = wxMenu:new(),
     wxMenu:append(Menu, ?ID_TABLE_INFO, "Table info"),
     wxMenu:append(Menu, ?ID_SHOW_TABLE, "Show Table Content"),
@@ -167,32 +164,33 @@ handle_event(#wx{event=#wxList{type=command_list_item_right_click}},
     {noreply, State};
 
 handle_event(#wx{event=#wxList{type=command_list_item_selected, itemIndex=Index}},
-	     State) ->
+	     State=#state{holder=Holder}) ->
+    Holder ! {selected, Index},
     {noreply, State#state{selected=Index}};
 
 handle_event(#wx{id=?ID_TABLE_INFO},
-	     State = #state{grid=Grid, node=Node, opt=#opt{type=Type}, tabs=Tabs, selected=Sel}) ->
+	     State = #state{holder=Holder, grid=Grid, node=Node, opts=#opts{type=Type}, selected=Sel}) ->
     case Sel of
 	undefined ->
 	    {noreply, State};
 	R when is_integer(R) ->
-	    Table = lists:nth(Sel+1, Tabs),
+	    Table = get_table(Holder, Sel),
 	    display_table_info(Grid, Node, Type, Table),
 	    {noreply, State}
     end;
 
 handle_event(#wx{id=?ID_SHOW_TABLE},
-	     State=#state{grid=Grid, node=Node, opt=#opt{type=Type}, tabs=Tabs, selected=Sel}) ->
+	     State=#state{holder=Holder, grid=Grid, node=Node, opts=#opts{type=Type}, selected=Sel}) ->
     case Sel of
 	undefined ->
 	    {noreply, State};
 	R when is_integer(R) ->
-	    Table = lists:nth(Sel+1, Tabs),
-	    case Table#tab.protection of
-		private ->
+	    case get_table(Holder, R) of
+		#tab{protection=private} ->
 		    self() ! {error, "Table has 'private' protection and can not be read"};
-		_ ->
-		    observer_tv_table:start_link(Grid, [{node,Node}, {type,Type}, {table,Table}])
+                #tab{}=Table ->
+		    observer_tv_table:start_link(Grid, [{node,Node}, {type,Type}, {table,Table}]);
+                _ -> ignore
 	    end,
 	    {noreply, State}
     end;
@@ -202,14 +200,14 @@ handle_event(#wx{id=?ID_REFRESH_INTERVAL},
     Timer = observer_lib:interval_dialog(Grid, Timer0, 10, 5*60),
     {noreply, State#state{timer=Timer}};
 
-handle_event(Event, _State) ->
-    error({unhandled_event, Event}).
+handle_event(_Event, State) ->
+    {noreply, State}.
 
 handle_sync_event(_Event, _Obj, _State) ->
     ok.
 
-handle_call(get_config, _, #state{timer=Timer, opt=Opt}=State) ->
-    #opt{type=Type, sys_hidden=Sys, unread_hidden=Unread} = Opt,
+handle_call(get_config, _, #state{timer=Timer, opts=Opt}=State) ->
+    #opts{type=Type, sys_hidden=Sys, unread_hidden=Unread} = Opt,
     Conf0 = observer_lib:timer_config(Timer),
     Conf = Conf0#{type=>Type, sys_hidden=>Sys, unread_hidden=>Unread},
     {reply, Conf, State};
@@ -220,50 +218,68 @@ handle_call(Event, From, _State) ->
 handle_cast(Event, _State) ->
     error({unhandled_cast, Event}).
 
-handle_info(refresh_interval, State = #state{node=Node, grid=Grid, opt=Opt,
-                                             tabs=OldTabs}) ->
-    case get_tables(Node, Opt) of
-        OldTabs ->
-            %% no change
-            {noreply, State};
-        Tables ->
-            {Tabs, Sel} = update_grid(Grid, sel(State), Opt, Tables),
-            Sel =/= undefined andalso wxListCtrl:ensureVisible(Grid, Sel),
-            {noreply, State#state{tabs=Tabs, selected=Sel}}
-    end;
+handle_info(refresh_interval, State = #state{holder=Holder, node=Node, opts=Opt}) ->
+    Tables = get_tables(Node, Opt),
+    Holder ! {refresh, Tables},
+    {noreply, State};
 
-handle_info({active, Node}, State = #state{parent=Parent, grid=Grid, opt=Opt0,
-					   timer=Timer0}) ->
-    {Tables, Opt} = case Opt0#opt.type =:= mnesia andalso get_tables2(Node, Opt0) of
+handle_info({active, Node}, State = #state{parent=Parent, holder=Holder, grid=Grid,
+                                           opts=Opt0, timer=Timer0}) ->
+    {Tables, Opt} = case Opt0#opts.type =:= mnesia andalso get_tables2(Node, Opt0) of
                         Ts when is_list(Ts) ->
                             {Ts, Opt0};
                         _ -> % false or error getting mnesia tables
-                            Opt1 = Opt0#opt{type=ets},
+                            Opt1 = Opt0#opts{type=ets},
                             {get_tables(Node, Opt1), Opt1}
                     end,
-    {Tabs,Sel} = update_grid(Grid, sel(State), Opt, Tables),
+    Holder ! {refresh, Tables},
     wxWindow:setFocus(Grid),
     create_menus(Parent, Opt),
     Timer = observer_lib:start_timer(Timer0, 10),
-    {noreply, State#state{node=Node, tabs=Tabs, timer=Timer, opt=Opt, selected=Sel}};
+    {noreply, State#state{node=Node, timer=Timer, opts=Opt}};
 
 handle_info(not_active, State = #state{timer = Timer0}) ->
     Timer = observer_lib:stop_timer(Timer0),
     {noreply, State#state{timer=Timer}};
 
-handle_info({error, Error}, #state{panel=Panel,opt=Opt}=State) ->
+handle_info({error, Error}, #state{panel=Panel,opts=Opt}=State) ->
     Str = io_lib:format("ERROR: ~ts~n",[Error]),
     observer_lib:display_info_dialog(Panel,Str),
-    case Opt#opt.type of
+    case Opt#opts.type of
         mnesia -> wxMenuBar:check(observer_wx:get_menubar(), ?ID_ETS, true);
         _ -> ok
     end,
-    {noreply, State#state{opt=Opt#opt{type=ets}}};
+    {noreply, State#state{opts=Opt#opts{type=ets}}};
+
+handle_info({refresh, Min, Min}, State = #state{grid=Grid}) ->
+    wxListCtrl:setItemCount(Grid, Min+1),
+    wxListCtrl:refreshItem(Grid, Min), %% Avoid assert in wx below if Max is 0
+    observer_wx:set_status(io_lib:format("Tables: ~w", [Min+1])),
+    {noreply, State};
+handle_info({refresh, Min, Max}, State = #state{grid=Grid}) ->
+    wxListCtrl:setItemCount(Grid, Max+1),
+    Max > 0 andalso wxListCtrl:refreshItems(Grid, Min, Max),
+    observer_wx:set_status(io_lib:format("Tables: ~w", [Max+1])),
+    {noreply, State};
+
+handle_info({selected, New, Size}, #state{grid=Grid, selected=Old} = State) ->
+    if
+        is_integer(Old), Old < Size ->
+            wxListCtrl:setItemState(Grid, Old, 0, ?wxLIST_STATE_SELECTED);
+        true -> ignore
+    end,
+    if is_integer(New) ->
+            wxListCtrl:setItemState(Grid, New, 16#FFFF, ?wxLIST_STATE_SELECTED),
+            wxListCtrl:ensureVisible(Grid, New);
+       true -> ignore
+    end,
+    {noreply, State#state{selected=New}};
 
 handle_info(_Event, State) ->
     {noreply, State}.
 
-terminate(_Event, _State) ->
+terminate(_Event, #state{holder=Holder}) ->
+    Holder ! stop,
     ok.
 
 code_change(_, _, State) ->
@@ -271,7 +287,7 @@ code_change(_, _, State) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-create_menus(Parent, #opt{sys_hidden=Sys, unread_hidden=UnR, type=Type}) ->
+create_menus(Parent, #opts{sys_hidden=Sys, unread_hidden=UnR, type=Type}) ->
     MenuEntries = [{"View",
 		    [#create_menu{id = ?ID_TABLE_INFO, text = "Table information\tCtrl-I"},
 		     separator,
@@ -298,7 +314,7 @@ get_tables(Node, Opts) ->
 	Res ->
 	    Res
     end.
-get_tables2(Node, #opt{type=Type, sys_hidden=Sys, unread_hidden=Unread}) ->
+get_tables2(Node, #opts{type=Type, sys_hidden=Sys, unread_hidden=Unread}) ->
     Args = [Type, [{sys_hidden,Sys}, {unread_hidden,Unread}]],
     case rpc:call(Node, observer_backend, get_table_list, Args) of
 	{badrpc, Error} ->
@@ -386,49 +402,134 @@ list_to_strings([A]) -> integer_to_list(A);
 list_to_strings([A|B]) ->
     integer_to_list(A) ++ " ," ++ list_to_strings(B).
 
-update_grid(Grid, Selected, Opt, Tables) ->
-    wx:batch(fun() -> update_grid2(Grid, Selected, Opt, Tables) end).
-
-update_grid2(Grid, {SelName,SelId}, #opt{sort_key=Sort,sort_incr=Dir}, Tables) ->
-    wxListCtrl:deleteAllItems(Grid),
-    Update =
-	fun(#tab{name = Name, id = Id, owner = Owner, size = Size, memory = Memory,
-		 protection = Protection, reg_name = RegName},
-            {Row, Sel}) ->
-		_Item = wxListCtrl:insertItem(Grid, Row, ""),
-		if (Row rem 2) =:= 0 ->
-			wxListCtrl:setItemBackgroundColour(Grid, Row, ?BG_EVEN);
-		   true -> ignore
-		end,
-		if Protection == private ->
-			wxListCtrl:setItemTextColour(Grid, Row, {200,130,50});
-		   true -> ignore
-		end,
-
-		lists:foreach(fun({_, ignore}) -> ignore;
-				 ({Col, Val}) ->
-				      wxListCtrl:setItem(Grid, Row, Col, observer_lib:to_str(Val))
-			      end,
-			      [{0,Name}, {1,Size}, {2, Memory div 1024},
-			       {3,Owner}, {4,RegName}, {5,Id}]),
-                if SelName =:= Name, SelId =:= Id ->
-                        wxListCtrl:setItemState(Grid, Row, 16#FFFF, ?wxLIST_STATE_SELECTED),
-                        {Row+1, Row};
-                   true ->
-                        wxListCtrl:setItemState(Grid, Row, 0, ?wxLIST_STATE_SELECTED),
-                        {Row+1, Sel}
-                end
-	end,
-    ProcInfo = case Dir of
-		   false -> lists:reverse(lists:keysort(Sort, Tables));
-		   true -> lists:keysort(Sort, Tables)
-	       end,
-    {_, Sel} = lists:foldl(Update, {0, undefined}, ProcInfo),
-    {ProcInfo, Sel}.
-
-sel(#state{selected=Sel, tabs=Tabs}) ->
-    try lists:nth(Sel+1, Tabs) of
-        #tab{name=Name, id=Id} -> {Name, Id}
-    catch _:_ ->
-            {undefined, undefined}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%  Table holder needs to be in a separate process otherwise
+%%  the callback get_row/3 may deadlock if the process do
+%%  wx calls when callback is invoked.
+
+get_table(Table, Item) ->
+    get_row(Table, Item, all).
+
+get_row(Table, Item, Column) ->
+    Ref = erlang:monitor(process, Table),
+    Table ! {get_row, self(), Item, Column},
+    receive
+	{'DOWN', Ref, _, _, _} -> "";
+	{Table, Res} ->
+	    erlang:demonitor(Ref),
+	    Res
     end.
+
+get_attr(Table, Item) ->
+    Ref = erlang:monitor(process, Table),
+    Table ! {get_attr, self(), Item},
+    receive
+	{'DOWN', Ref, _, _, _} -> wx:null();
+	{Table, Res} ->
+	    erlang:demonitor(Ref),
+	    Res
+    end.
+
+-record(holder, {node, parent, pid,
+		 tabs=array:new(),
+                 sort=#sort{},
+		 attrs,
+                 sel
+		}).
+
+init_table_holder(Parent, Attrs) ->
+    Parent ! refresh,
+    table_holder(#holder{node=node(), parent=Parent, attrs=Attrs}).
+
+table_holder(S0 = #holder{parent=Parent, tabs=Tabs0, sel=Sel0}) ->
+    receive
+	{get_attr, From, Row} ->
+	    get_attr(From, Row, S0),
+	    table_holder(S0);
+	{get_row, From, Row, Col} ->
+	    get_row(From, Row, Col, Tabs0),
+	    table_holder(S0);
+	{sort, Col} ->
+            STab = get_sel(Sel0, Tabs0),
+	    Parent ! {refresh, 0, array:size(Tabs0)-1},
+            S1 = sort(col2key(Col), S0),
+            Sel = sel_idx(STab, S1#holder.tabs),
+            Parent ! {selected, Sel, array:size(Tabs0)},
+	    table_holder(S1#holder{sel=Sel});
+	{refresh, Tabs1} ->
+            STab = get_sel(Sel0, Tabs0),
+            Tabs = case S0#holder.sort of
+                       #sort{sort_incr=false, sort_key=Col} ->
+                           array:from_list(lists:reverse(lists:keysort(Col, Tabs1)));
+                       #sort{sort_key=Col} ->
+                           array:from_list(lists:keysort(Col, Tabs1))
+                   end,
+	    Parent ! {refresh, 0, array:size(Tabs)-1},
+            Sel = sel_idx(STab, Tabs),
+            Parent ! {selected, Sel,array:size(Tabs)},
+	    table_holder(S0#holder{tabs=Tabs, sel=Sel});
+        {selected, Sel} ->
+            table_holder(S0#holder{sel=Sel});
+	stop ->
+	    ok;
+	What ->
+	    io:format("Table holder got ~tp~n",[What]),
+	    Parent ! {refresh, 0, array:size(Tabs0)-1},
+	    table_holder(S0)
+    end.
+
+get_sel(undefined, _Tabs) ->
+    undefined;
+get_sel(Idx, Tabs) ->
+    array:get(Idx, Tabs).
+
+sel_idx(undefined, _Tabs) ->
+    undefined;
+sel_idx(Tab, Tabs) ->
+    Find = fun(Idx, C, Acc) -> C =:= Tab andalso throw({found, Idx}), Acc end,
+    try array:foldl(Find, undefined, Tabs)
+    catch {found, Idx} -> Idx
+    end.
+
+sort(Col, #holder{sort=#sort{sort_key=Col, sort_incr=Incr}=S, tabs=Table0}=H) ->
+    Table = lists:reverse(array:to_list(Table0)),
+    H#holder{sort=S#sort{sort_incr=(not Incr)},
+             tabs=array:from_list(Table)};
+sort(Col, #holder{sort=#sort{sort_incr=Incr}=S, tabs=Table0}=H) ->
+    Table = case Incr of
+                false -> lists:reverse(lists:keysort(Col, array:to_list(Table0)));
+                true -> lists:keysort(Col, array:to_list(Table0))
+            end,
+    H#holder{sort=S#sort{sort_key=Col},
+             tabs=array:from_list(Table)}.
+
+get_row(From, Row, Col, Table) ->
+    Object = array:get(Row, Table),
+    From ! {self(), get_col(Col, Object)}.
+
+get_col(all, Rec) ->
+    Rec;
+get_col(2, #tab{}=Rec) -> %% Memory in kB
+    observer_lib:to_str(element(#tab.memory, Rec) div 1024);
+get_col(Col, #tab{}=Rec) ->
+    case element(col2key(Col), Rec) of
+        ignore -> "";
+        Val -> observer_lib:to_str(Val)
+    end;
+get_col(_, _) ->
+    "".
+
+get_attr(From, Row, #holder{tabs=Tabs, attrs=Attrs}) ->
+    EvenOdd = case (Row rem 2) > 0 of
+                  true -> Attrs#attrs.odd;
+                  false -> Attrs#attrs.even
+              end,
+    What = try array:get(Row, Tabs) of
+               #tab{protection=private} ->
+                   Attrs#attrs.deleted;
+               _ ->
+                   EvenOdd
+           catch _ ->
+                   EvenOdd
+           end,
+    From ! {self(), What}.
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl
index 41041682c2..b5e94a893a 100644
--- a/lib/observer/test/crashdump_helper.erl
+++ b/lib/observer/test/crashdump_helper.erl
@@ -21,7 +21,7 @@
 -module(crashdump_helper).
 -export([n1_proc/2,remote_proc/2,
          dump_maps/0,create_maps/0,
-         create_binaries/0]).
+         create_binaries/0,create_sub_binaries/1]).
 -compile(r18).
 -include_lib("common_test/include/ct.hrl").
 
@@ -64,6 +64,7 @@ n1_proc(Creator,_N2,Pid2,Port2,_L) ->
     put(bin,Bin),
     put(bins,create_binaries()),
     put(sub_bin,SubBin),
+    put(sub_bins,create_sub_binaries(get(bins))),
     put(bignum,83974938738373873),
     put(neg_bignum,-38748762783736367),
     put(ext_pid,Pid2),
@@ -82,6 +83,7 @@ n1_proc(Creator,_N2,Pid2,Port2,_L) ->
     link(OtherPid), % own node
     link(Pid2),     % external node
     erlang:monitor(process,OtherPid),
+    erlang:monitor(process,init), % named process
     erlang:monitor(process,Pid2),
 
     code:load_file(?MODULE),
@@ -104,6 +106,17 @@ create_binaries() ->
          <<Data:Size/unit:8>>
      end || Size <- Sizes].
 
+create_sub_binaries(Bins) ->
+    [create_sub_binary(Bin, Start, LenSub) ||
+        Bin <- Bins,
+        Start <- [0,1,2,3,4,5,10,22],
+        LenSub <- [0,1,2,3,4,6,9]].
+
+create_sub_binary(Bin, Start, LenSub) ->
+    Len = byte_size(Bin) - LenSub - Start,
+    <<_:Start/bytes,Sub:Len/bytes,_/bytes>> = Bin,
+    Sub.
+
 %%%
 %%% Test dumping of maps. Dumping of maps only from OTP 20.2.
 %%%
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 86a60e15f4..41ca3f3ce9 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -25,7 +25,7 @@
 %% Test functions
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 start_stop/1,load_file/1,not_found_items/1,
-	 non_existing/1,not_a_crashdump/1,old_crashdump/1]).
+	 non_existing/1,not_a_crashdump/1,old_crashdump/1,new_crashdump/1]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -83,6 +83,7 @@ all() ->
      non_existing,
      not_a_crashdump,
      old_crashdump,
+     new_crashdump,
      load_file,
      not_found_items
     ].
@@ -212,6 +213,25 @@ not_a_crashdump(Config) when is_list(Config) ->
 
     ok = crashdump_viewer:stop().
 
+%% Try to load a file with newer version than this crashdump viewer can handle
+new_crashdump(Config) ->
+    Dump = hd(?config(dumps,Config)),
+    ok = start_backend(Dump),
+    {ok,{MaxVsn,CurrentVsn}} = crashdump_viewer:get_dump_versions(),
+    if MaxVsn =/= CurrentVsn ->
+            ct:fail("Current dump version is not equal to cdv's max version");
+       true ->
+            ok
+    end,
+    ok = crashdump_viewer:stop(),
+    NewerVsn = lists:join($.,[integer_to_list(X+1) || X <- MaxVsn]),
+    PrivDir = ?config(priv_dir,Config),
+    NewDump = filename:join(PrivDir,"new_erl_crash.dump"),
+    ok = file:write_file(NewDump,"=erl_crash_dump:"++NewerVsn++"\n"),
+    {error, Reason} = start_backend(NewDump),
+    "This Crashdump Viewer is too old" ++_ = Reason,
+    ok = crashdump_viewer:stop().
+
 %% Load files into the tool and view all pages
 load_file(Config) when is_list(Config) ->
     case ?t:is_debug() of
@@ -328,7 +348,7 @@ browse_file(File) ->
 
     io:format("  info read",[]),
 
-    lookat_all_pids(Procs),
+    lookat_all_pids(Procs,is_truncated(File),incomplete_allowed(File)),
     io:format("  pids ok",[]),
     lookat_all_ports(Ports),
     io:format("  ports ok",[]),
@@ -339,6 +359,21 @@ browse_file(File) ->
 
     Procs. % used as second arg to special/2
 
+is_truncated(File) ->
+    case filename:extension(File) of
+        ".trunc"++_ ->
+            true;
+        _ ->
+            false
+    end.
+
+incomplete_allowed(File) ->
+    %% Incomplete heap is allowed for native libs, since some literals
+    %% are not dumped - and for pre OTP-20 (really pre 20.2) releases,
+    %% since literals were not dumped at all then.
+    Rel = get_rel_from_dump_name(File),
+    Rel < 20 orelse test_server:is_native(lists).
+
 special(File,Procs) ->
     case filename:extension(File) of
 	".full_dist" ->
@@ -368,6 +403,10 @@ special(File,Procs) ->
             verify_binaries(Binaries, proplists:get_value(bins,Dict)),
 	    io:format("  binaries ok",[]),
 
+            SubBinaries = crashdump_helper:create_sub_binaries(Binaries),
+            verify_binaries(SubBinaries, proplists:get_value(sub_bins,Dict)),
+	    io:format("  sub binaries ok",[]),
+
 	    #proc{last_calls=LastCalls} = ProcDetails,
             true = length(LastCalls) =< 4,
 
@@ -420,13 +459,36 @@ special(File,Procs) ->
 			old_attrib=undefined,
 			old_comp_info=undefined}=Mod2,
 	    ok;
+        ".trunc_mod" ->
+            ModName = atom_to_list(?helper_mod),
+            {ok,Mod=#loaded_mod{},[TW]} =
+                crashdump_viewer:loaded_mod_details(ModName),
+            "WARNING: The crash dump is truncated here."++_ = TW,
+            #loaded_mod{current_attrib=CA,current_comp_info=CCI,
+                        old_attrib=OA,old_comp_info=OCI} = Mod,
+            case lists:all(fun(undefined) ->
+                                   true;
+                              (S) when is_list(S) ->
+                                   io_lib:printable_unicode_list(lists:flatten(S));
+                              (_) -> false
+                           end,
+                           [CA,CCI,OA,OCI]) of
+                true ->
+                    ok;
+                false ->
+                    ct:fail({should_be_printable_strings_or_undefined,
+                             {CA,CCI,OA,OCI}})
+            end,
+            ok;
 	".trunc_bin1" ->
             %% This is 'full_dist' truncated after the first
             %% "=binary:"
             %% i.e. no binary exist in the dump
 	    [#proc{pid=Pid0}|_Rest] = lists:keysort(#proc.name,Procs),
 	    Pid = pid_to_list(Pid0),
-	    {ok,ProcDetails=#proc{},[]} = crashdump_viewer:proc_details(Pid),
+            %%WarnIncompleteHeap = ["WARNING: This process has an incomplete heap. Some information might be missing."],
+	    {ok,ProcDetails=#proc{},[]} =
+                crashdump_viewer:proc_details(Pid),
 	    io:format("  process details ok",[]),
 
 	    #proc{dict=Dict} = ProcDetails,
@@ -528,7 +590,7 @@ special(File,Procs) ->
 	    io:format("  process details ok",[]),
 
 	    #proc{dict=Dict} = ProcDetails,
-            io:format("~p\n", [Dict]),
+            %% io:format("~p\n", [Dict]),
             Maps = crashdump_helper:create_maps(),
             Maps = proplists:get_value(maps,Dict),
             io:format("  maps ok",[]),
@@ -548,14 +610,25 @@ verify_binaries([Bin|T1], [['#CDVBin',Offset,Size,Pos]|T2]) ->
 verify_binaries([], []) ->
     ok.
 
-lookat_all_pids([]) ->
+lookat_all_pids([],_,_) ->
     ok;
-lookat_all_pids([#proc{pid=Pid0}|Procs]) ->
+lookat_all_pids([#proc{pid=Pid0}|Procs],TruncAllowed,IncompAllowed) ->
     Pid = pid_to_list(Pid0),
-    {ok,_ProcDetails=#proc{},_ProcTW} = crashdump_viewer:proc_details(Pid),
-    {ok,_Ets,_EtsTW} = crashdump_viewer:ets_tables(Pid),
-    {ok,_Timers,_TimersTW} = crashdump_viewer:timers(Pid),
-    lookat_all_pids(Procs).
+    {ok,_ProcDetails=#proc{},ProcTW} = crashdump_viewer:proc_details(Pid),
+    {ok,_Ets,EtsTW} = crashdump_viewer:ets_tables(Pid),
+    {ok,_Timers,TimersTW} = crashdump_viewer:timers(Pid),
+    case {ProcTW,EtsTW,TimersTW} of
+        {[],[],[]} ->
+            ok;
+        {["WARNING: This process has an incomplete heap."++_],[],[]}
+          when IncompAllowed ->
+            ok;  % native libs, literals might not be included in dump
+        _ when TruncAllowed ->
+            ok; % truncated dump
+        TWs ->
+            ct:fail({unexpected_warning,TWs})
+    end,
+    lookat_all_pids(Procs,TruncAllowed,IncompAllowed).
 
 lookat_all_ports([]) ->
     ok;
@@ -603,22 +676,35 @@ do_create_dumps(DataDir,Rel) ->
 	current ->
 	    CD3 = dump_with_args(DataDir,Rel,"instr","+Mim true"),
 	    CD4 = dump_with_strange_module_name(DataDir,Rel,"strangemodname"),
-	    Tmp = dump_with_args(DataDir,Rel,"trunc_bytes",""),
-            {ok,#file_info{size=Max}} = file:read_file_info(Tmp),
-            ok = file:delete(Tmp),
-            Bytes = max(15,rand:uniform(Max)),
-            CD5 = dump_with_args(DataDir,Rel,"trunc_bytes",
-                                 "-env ERL_CRASH_DUMP_BYTES " ++
-                                     integer_to_list(Bytes)),
+            CD5 = dump_with_size_limit_reached(DataDir,Rel,"trunc_bytes"),
             CD6 = dump_with_unicode_atoms(DataDir,Rel,"unicode"),
             CD7 = dump_with_maps(DataDir,Rel,"maps"),
-            TruncatedDumps = truncate_dump(CD1),
-	    {[CD1,CD2,CD3,CD4,CD5,CD6,CD7|TruncatedDumps], DosDump};
+            TruncDumpMod = truncate_dump_mod(CD1),
+            TruncatedDumpsBinary = truncate_dump_binary(CD1),
+	    {[CD1,CD2,CD3,CD4,CD5,CD6,CD7,TruncDumpMod|TruncatedDumpsBinary],
+             DosDump};
 	_ ->
 	    {[CD1,CD2], DosDump}
     end.
 
-truncate_dump(File) ->
+truncate_dump_mod(File) ->
+    {ok,Bin} = file:read_file(File),
+    ModNameBin = atom_to_binary(?helper_mod,latin1),
+    NewLine = case os:type() of
+                  {win32,_} -> <<"\r\n">>;
+                  _ -> <<"\n">>
+              end,
+    RE = <<NewLine/binary,"=mod:",ModNameBin/binary,
+           NewLine/binary,"Current size: [0-9]*",
+           NewLine/binary,"Current attributes: ...">>,
+    {match,[{Pos,Len}]} = re:run(Bin,RE),
+    Size = Pos + Len,
+    <<Truncated:Size/binary,_/binary>> = Bin,
+    DumpName = filename:rootname(File) ++ ".trunc_mod",
+    file:write_file(DumpName,Truncated),
+    DumpName.
+
+truncate_dump_binary(File) ->
     {ok,Bin} = file:read_file(File),
     BinTag = <<"\n=binary:">>,
     Colon = <<":">>,
@@ -628,7 +714,7 @@ truncate_dump(File) ->
               end,
     %% Split after "our binary" created by crashdump_helper
     %% (it may not be the first binary).
-    RE = <<"\n=binary:(?=[0-9A-Z]+",NewLine/binary,"FF:010203)">>,
+    RE = <<"\n=binary:(?=[0-9A-Z]+",NewLine/binary,"FF:AQID)">>,
     [StartBin,AfterTag] = re:split(Bin,RE,[{parts,2}]),
     [AddrAndSize,BinaryAndRest] = binary:split(AfterTag,Colon),
     [Binary,_Rest] = binary:split(BinaryAndRest,NewLine),
@@ -722,6 +808,28 @@ dump_with_strange_module_name(DataDir,Rel,DumpName) ->
     ?t:stop_node(n1),
     CD.
 
+dump_with_size_limit_reached(DataDir,Rel,DumpName) ->
+    Tmp = dump_with_args(DataDir,Rel,DumpName,""),
+    {ok,#file_info{size=Max}} = file:read_file_info(Tmp),
+    ok = file:delete(Tmp),
+    dump_with_size_limit_reached(DataDir,Rel,DumpName,Max).
+
+dump_with_size_limit_reached(DataDir,Rel,DumpName,Max) ->
+    Bytes = max(15,rand:uniform(Max)),
+    CD = dump_with_args(DataDir,Rel,DumpName,
+                        "-env ERL_CRASH_DUMP_BYTES " ++
+                            integer_to_list(Bytes)),
+    {ok,#file_info{size=Size}} = file:read_file_info(CD),
+    if Size =< Bytes ->
+            %% This means that the dump was actually smaller than the
+            %% randomly selected truncation size, so we'll just do it
+            %% again with a smaller number
+            ok = file:delete(CD),
+            dump_with_size_limit_reached(DataDir,Rel,DumpName,Size-3);
+       true ->
+            CD
+    end.
+
 dump_with_unicode_atoms(DataDir,Rel,DumpName) ->
     Opt = rel_opt(Rel),
     Pz = "-pz \"" ++ filename:dirname(code:which(?MODULE)) ++ "\"",
@@ -794,6 +902,11 @@ dump_prefix(current) ->
 dump_prefix(Rel) ->
     lists:concat(["r",Rel,"_dump."]).
 
+get_rel_from_dump_name(File) ->
+    Name = filename:basename(File),
+    ["r"++Rel|_] = string:split(Name,"_"),
+    list_to_integer(Rel).
+
 compat_rel(current) ->
     "";
 compat_rel(Rel) ->
diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl
index 0db2c1ea77..fd4f93f662 100644
--- a/lib/observer/test/observer_SUITE.erl
+++ b/lib/observer/test/observer_SUITE.erl
@@ -113,7 +113,12 @@ appup_file(Config) when is_list(Config) ->
 basic(suite) -> [];
 basic(doc) -> [""];
 basic(Config) when is_list(Config) ->
-    timer:send_after(100, "foobar"), %% Otherwise the timer server gets added to procs
+    %% Start these before
+    wx:new(),
+    wx:destroy(),
+    timer:send_after(100, "foobar"),
+    {foo, node@machine} ! dummy_msg,  %% start distribution stuff
+    %% Otherwise ever lasting servers gets added to procs
     ProcsBefore = processes(),
     ProcInfoBefore = [{P,process_info(P)} || P <- ProcsBefore],
     NumProcsBefore = length(ProcsBefore),
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index 5f43198f85..fc1fca0925 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.5
+OBSERVER_VSN = 2.6
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index 6a8b0485eb..2aa55ca99c 100644
--- a/lib/odbc/doc/src/notes.xml
+++ b/lib/odbc/doc/src/notes.xml
@@ -32,7 +32,22 @@
   <p>This document describes the changes made to the odbc application.
   </p>
 
-  <section><title>ODBC 2.12</title>
+  <section><title>ODBC 2.12.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ODBC 2.12</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index 2e313570e1..3f7677a71d 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.12
+ODBC_VSN = 2.12.1
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 5a82270b28..35da4f73da 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -33,7 +33,28 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>Orber 3.8.3</title>
+  <section><title>Orber 3.8.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+        <item>
+	    <p> Removed the man warnings by using the code tag
+	    instead of c tag. </p>
+          <p>
+	    Own Id: OTP-14673</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Orber 3.8.3</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index 595e686cb7..bfd3f283b5 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1 +1 @@
-ORBER_VSN = 3.8.3
+ORBER_VSN = 3.8.4
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index b29a64155e..cec0856a8b 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the OS_Mon application.</p>
 
+<section><title>Os_Mon 2.4.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Os_Mon 2.4.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl
index aeec335ba7..5118d807e1 100644
--- a/lib/os_mon/src/disksup.erl
+++ b/lib/os_mon/src/disksup.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.
@@ -357,7 +357,7 @@ parse_df_take_word_percent(Input) ->
 %% and capacity), skip % sign, (optionally for susv3 can also skip IUsed, IFree
 %% and ICap% fields) then take remaining characters as the mount path
 -spec parse_df(string(), posix | susv3) ->
-    {error, parse_df} | {ok, {integer(), integer(), integer()}, string()}.
+    {error, parse_df} | {ok, {integer(), integer(), list()}, string()}.
 parse_df(Input0, Flavor) ->
     %% Format of Posix/Linux df output looks like Header + Lines
     %% Filesystem     1024-blocks     Used Available Capacity Mounted on
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index e4250f577b..eb4f13ea9e 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.4.3
+OS_MON_VSN = 2.4.4
diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml
index dbd2f47ffb..c99148a904 100644
--- a/lib/otp_mibs/doc/src/notes.xml
+++ b/lib/otp_mibs/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the OTP_Mibs
     application.</p>
 
+<section><title>Otp_Mibs 1.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Otp_Mibs 1.1.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk
index 7a793007ee..13406cb5b1 100644
--- a/lib/otp_mibs/vsn.mk
+++ b/lib/otp_mibs/vsn.mk
@@ -1,4 +1,4 @@
-OTP_MIBS_VSN = 1.1.1
+OTP_MIBS_VSN = 1.1.2
 
 # Note: The branch 'otp_mibs' is defunct as of otp_mibs-1.0.4 and
 # should NOT be used again.
diff --git a/lib/parsetools/doc/src/notes.xml b/lib/parsetools/doc/src/notes.xml
index 3fa7169f50..b3370a06ab 100644
--- a/lib/parsetools/doc/src/notes.xml
+++ b/lib/parsetools/doc/src/notes.xml
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the Parsetools application.</p>
 
+<section><title>Parsetools 2.1.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Warnings about unused functions in <c>leexinc.hrl</c>
+	    are suppressed. </p>
+          <p>
+	    Own Id: OTP-14697</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Parsetools 2.1.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/parsetools/include/yeccpre.hrl b/lib/parsetools/include/yeccpre.hrl
index 91d6cd49a6..53e8124aaa 100644
--- a/lib/parsetools/include/yeccpre.hrl
+++ b/lib/parsetools/include/yeccpre.hrl
@@ -56,8 +56,7 @@ return_error(Line, Message) ->
 yeccpars0(Tokens, Tzr, State, States, Vstack) ->
     try yeccpars1(Tokens, Tzr, State, States, Vstack)
     catch 
-        error: Error ->
-            Stacktrace = erlang:get_stacktrace(),
+        error: Error: Stacktrace ->
             try yecc_error_type(Error, Stacktrace) of
                 Desc ->
                     erlang:raise(error, {yecc_bug, ?CODE_VERSION, Desc},
diff --git a/lib/parsetools/src/yeccparser.erl b/lib/parsetools/src/yeccparser.erl
index 6f6f66d56c..45d91a83a3 100644
--- a/lib/parsetools/src/yeccparser.erl
+++ b/lib/parsetools/src/yeccparser.erl
@@ -72,8 +72,7 @@ return_error(Line, Message) ->
 yeccpars0(Tokens, Tzr, State, States, Vstack) ->
     try yeccpars1(Tokens, Tzr, State, States, Vstack)
     catch 
-        error: Error ->
-            Stacktrace = erlang:get_stacktrace(),
+        error: Error: Stacktrace ->
             try yecc_error_type(Error, Stacktrace) of
                 Desc ->
                     erlang:raise(error, {yecc_bug, ?CODE_VERSION, Desc},
@@ -167,21 +166,20 @@ yecctoken_location(Token) ->
     end.
 
 -compile({nowarn_unused_function, yecctoken2string/1}).
-yecctoken2string({atom, _, A}) -> io_lib:write(A);
+yecctoken2string({atom, _, A}) -> io_lib:write_atom(A);
 yecctoken2string({integer,_,N}) -> io_lib:write(N);
 yecctoken2string({float,_,F}) -> io_lib:write(F);
 yecctoken2string({char,_,C}) -> io_lib:write_char(C);
 yecctoken2string({var,_,V}) -> io_lib:format("~s", [V]);
 yecctoken2string({string,_,S}) -> io_lib:write_string(S);
 yecctoken2string({reserved_symbol, _, A}) -> io_lib:write(A);
-yecctoken2string({_Cat, _, Val}) -> io_lib:format("~p",[Val]);
+yecctoken2string({_Cat, _, Val}) -> io_lib:format("~tp", [Val]);
 yecctoken2string({dot, _}) -> "'.'";
-yecctoken2string({'$end', _}) ->
-    [];
+yecctoken2string({'$end', _}) -> [];
 yecctoken2string({Other, _}) when is_atom(Other) ->
-    io_lib:write(Other);
+    io_lib:write_atom(Other);
 yecctoken2string(Other) ->
-    io_lib:write(Other).
+    io_lib:format("~tp", [Other]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index a7166b91ed..2d3b15326b 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -1674,8 +1674,7 @@ format_error(Message) ->
 yeccpars0(Tokens, MFA) ->
     try yeccpars1(Tokens, MFA, 0, [], [])
     catch 
-        error: Error ->
-            Stacktrace = erlang:get_stacktrace(),
+        error: Error : Stacktrace ->
             try yecc_error_type(Error, Stacktrace) of
                 {syntax_error, Token} ->
                     yeccerror(Token);
diff --git a/lib/parsetools/vsn.mk b/lib/parsetools/vsn.mk
index 502ca00a47..b6d2ce0cd4 100644
--- a/lib/parsetools/vsn.mk
+++ b/lib/parsetools/vsn.mk
@@ -1 +1 @@
-PARSETOOLS_VSN = 2.1.5
+PARSETOOLS_VSN = 2.1.6
diff --git a/lib/public_key/asn1/PKCS-7.asn1 b/lib/public_key/asn1/PKCS-7.asn1
index e76f928acb..e9c188be39 100644
--- a/lib/public_key/asn1/PKCS-7.asn1
+++ b/lib/public_key/asn1/PKCS-7.asn1
@@ -124,7 +124,7 @@ SignerInfoAuthenticatedAttributes ::= CHOICE {
 
 -- Also defined in X.509
 -- Redeclared here as a parameterized type
-AlgorithmIdentifierPKSC-7 {ALGORITHM:IOSet} ::= SEQUENCE {
+AlgorithmIdentifierPKCS-7 {ALGORITHM:IOSet} ::= SEQUENCE {
    algorithm   ALGORITHM.&id({IOSet}),
    parameters  ALGORITHM.&Type({IOSet}{@algorithm}) OPTIONAL
 }
@@ -146,21 +146,21 @@ CRLSequence ::=
   SEQUENCE OF CertificateList
 
 ContentEncryptionAlgorithmIdentifier ::=
-  AlgorithmIdentifierPKSC-7 {{ContentEncryptionAlgorithms}}
+  AlgorithmIdentifierPKCS-7 {{ContentEncryptionAlgorithms}}
 
 ContentEncryptionAlgorithms ALGORITHM ::= {
   ...  -- add any application-specific algorithms here
 }
 
 DigestAlgorithmIdentifier ::=
-  AlgorithmIdentifierPKSC-7 {{DigestAlgorithms}}
+  AlgorithmIdentifierPKCS-7 {{DigestAlgorithms}}
 
 DigestAlgorithms ALGORITHM ::= {
    ...  -- add any application-specific algorithms here
 }
 
 DigestEncryptionAlgorithmIdentifier ::=
-  AlgorithmIdentifierPKSC-7 {{DigestEncryptionAlgorithms}}
+  AlgorithmIdentifierPKCS-7 {{DigestEncryptionAlgorithms}}
 
 DigestEncryptionAlgorithms ALGORITHM ::= {
   ...  -- add any application-specific algorithms here
@@ -182,7 +182,7 @@ IssuerAndSerialNumber ::= SEQUENCE {
 }
 
 KeyEncryptionAlgorithmIdentifier ::=
-  AlgorithmIdentifierPKSC-7 {{KeyEncryptionAlgorithms}}
+  AlgorithmIdentifierPKCS-7 {{KeyEncryptionAlgorithms}}
 
 KeyEncryptionAlgorithms ALGORITHM ::= {
   ...  -- add any application-specific algorithms here
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 7a7c828760..11012ee9e5 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,55 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 1.5.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed a bug in <c>public_key:ssh_encode/2</c> that made
+	    it possible to erroneously encode e.g. an RSA key with
+	    another type e.g. ECDSA in the resulting binary.</p>
+          <p>
+	    Own Id: OTP-14570 Aux Id: ERIERL-52, OTP-14676 </p>
+        </item>
+        <item>
+          <p>
+	    Corrected handling of parameterized EC keys in
+	    public_key:generate_key/1 so that it will work as
+	    expected instead of causing a runtime error in crypto.</p>
+          <p>
+	    Own Id: OTP-14620</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Public_Key 1.5.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Hostname verification: Add handling of the general name
+	    <c>iPAddress</c> in certificate's subject alternative
+	    name extension (<c>subjAltName</c>).</p>
+          <p>
+	    Own Id: OTP-14653</p>
+        </item>
+        <item>
+          <p>
+	    Correct key handling in pkix_test_data/1 and use a
+	    generic example mail address instead of an existing one.</p>
+          <p>
+	    Own Id: OTP-14766</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 1.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 5230cef496..dea35bc390 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -774,6 +774,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
 
   <func>
     <name>pkix_test_data(Options) -> Config </name>
+    <name>pkix_test_data([chain_opts()]) -> [conf_opt()]</name>
     <fsummary>Creates certificate test data.</fsummary>
     <type>
       <v>Options = #{chain_type() := chain_opts()} </v>
@@ -781,30 +782,83 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
       
       <v>chain_type() = server_chain | client_chain </v>
 
-      <v>chain_opts() = #{chain_end() := [cert_opt()],
-          intermediates => [[cert_opt()]]}</v>
-      <d>A valid chain must have at least a ROOT and a peer cert</d>
-
-      <v>chain_end() = root | peer </v>
-
+      <v>chain_opts() = #{root := [cert_opt()] | root_cert(),
+      peer := [cert_opt()],
+      intermediates => [[cert_opt()]]}</v>
+      <d>
+	A valid chain must have at least a ROOT and a peer cert.
+	The root cert can be given either as a cert pre-generated by
+	<seealso marker="#pkix_test_root_cert-2">
+	  pkix_test_root_cert/2
+	</seealso>, or as root cert generation options.
+      </d>
+      <v>root_cert() = #{cert := der_encoded(), key := Key}</v>
+      <d>
+	A root certificate generated by
+	<seealso marker="#pkix_test_root_cert-2">
+	  pkix_test_root_cert/2
+	</seealso>.
+      </d>
       <v>cert_opt() = {Key, Value}</v>
       <d>For available options see <seealso marker="#cert_opt"> cert_opt()</seealso> below.</d>
 
       <v>Config = #{server_config := [conf_opt()],
       client_config := [conf_opt()]}</v>
 
-      <v>conf_opt() = {cert, der_encoded()} | {key, der_encoded()} |{cacerts, [der_encoded()]}</v>
-      <d>This is a subset of the type <seealso marker="ssl:ssl#type-ssloption"> ssl:ssl_option()</seealso> </d>
+      <v>conf_opt() = {cert, der_encoded()} | {key, PrivateKey} |{cacerts, [der_encoded()]}</v>
+      <d>
+	This is a subset of the type
+	<seealso marker="ssl:ssl#type-ssloption"> ssl:ssl_option()</seealso>.
+	<c>PrivateKey</c> is what
+	<seealso marker="#generate_key-1">generate_key/1</seealso>
+	returns.
+      </d>
     </type>
     
     <desc>
-      <p>Creates certificate test data to facilitate automated testing
-      of applications using X509-certificates often through
-      SSL/TLS. The test data can be used when you have control
-      over both the client and the server in a test scenario.
+      <p>
+	Creates certificate configuration(s) consisting of certificate
+	and its private key plus CA certificate bundle, for a client
+	and a server, intended to facilitate automated testing
+	of applications using X509-certificates,
+	often through SSL/TLS. The test data can be used
+	when you have control over both the client and the server
+	in a test scenario.
+      </p>
+      <p>
+	When this function is called with a map containing
+	client and server chain specifications;
+	it generates both a client and a server certificate chain
+	where the <c>cacerts</c>
+	returned for the server contains the root cert the server
+	should trust and the intermediate certificates the server
+	should present to connecting clients.
+	The root cert the server should trust is the one used
+	as root of the client certificate chain.
+	Vice versa applies to the <c>cacerts</c> returned for the client.
+	The root cert(s) can either be pre-generated with
+	<seealso marker="#pkix_test_root_cert-2">
+	  pkix_test_root_cert/2
+	</seealso>, or if options are specified; it is (they are)
+	 generated.
+      </p>
+      <p>
+	When this function is called with a list of certificate options;
+	it generates a configuration with just one node certificate
+	where <c>cacerts</c> contains the root cert
+	and the intermediate certs that should be presented to a peer.
+	In this case the same root cert must be used for all peers.
+	This is useful in for example an Erlang distributed cluster
+	where any node,	towards another node, acts either
+	as a server or as a client depending on who connects to whom.
+	The generated certificate contains a subject altname,
+	which is not needed in a client certificate,
+	but makes the certificate useful for both roles.
+      </p>
+      <p>
+	The <marker id="cert_opt"/><c>cert_opt()</c>
+	type consists of the following options:
       </p>
-      
-      <p> The <marker id="cert_opt"/> cert_opt() type consists of the following options: </p>
       <taglist>
 	<tag> {digest, digest_type()}</tag>
 	<item><p>Hash algorithm to be used for
@@ -851,6 +905,36 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
     </desc>
   </func>
   
+  <func>
+    <name>pkix_test_root_cert(Name, Options) -> RootCert</name>
+    <fsummary>Generates a test data root cert.</fsummary>
+    <type>
+      <v>Name = string()</v>
+      <d>The root certificate name.</d>
+      <v>Options = [cert_opt()]</v>
+      <d>
+	For available options see
+	<seealso marker="#cert_opt">cert_opt()</seealso>
+	under
+	<seealso marker="#pkix_test_data-1">pkix_test_data/1</seealso>.
+      </d>
+      <v>RootCert = #{cert := der_encoded(), key := Key}</v>
+      <d>
+	A root certificate and key.  The <c>Key</c> is generated by
+	<seealso marker="#generate_key-1">generate_key/1</seealso>.
+      </d>
+    </type>
+    <desc>
+      <p>
+	Generates a root certificate that can be used
+	in multiple calls to
+	<seealso marker="#pkix_test_data-1">pkix_test_data/1</seealso>
+	when you want the same root certificate for
+	several generated certificates.
+      </p>
+    </desc>
+  </func>
+
   <func>  
     <name>pkix_verify(Cert, Key) -> boolean()</name>
     <fsummary>Verifies PKIX x.509 certificate signature.</fsummary>
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
index 76fd0f8133..c0d7b9be8e 100644
--- a/lib/public_key/src/pubkey_cert.erl
+++ b/lib/public_key/src/pubkey_cert.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -33,11 +33,12 @@
 	 is_fixed_dh_cert/1, verify_data/1, verify_fun/4, 
 	 select_extension/2, match_name/3,
 	 extensions_list/1, cert_auth_key_id/1, time_str_2_gregorian_sec/1,
-         gen_test_certs/1]).
+         gen_test_certs/1, root_cert/2]).
 
 -define(NULL, 0).
 
--export_type([chain_opts/0, test_config/0]).
+-export_type([cert_opt/0, chain_opts/0, conf_opt/0,
+              test_config/0, test_root_cert/0]).
 
 -type cert_opt()  :: {digest, public_key:digest_type()} | 
                      {key, public_key:key_params() | public_key:private_key()} | 
@@ -46,9 +47,12 @@
 -type chain_end()   :: root | peer.
 -type chain_opts()  :: #{chain_end() := [cert_opt()],  intermediates =>  [[cert_opt()]]}.
 -type conf_opt()    :: {cert, public_key:der_encoded()} | 
-                       {key,  public_key:der_encoded()} |
+                       {key,  public_key:private_key()} |
                        {cacerts, [public_key:der_encoded()]}.
--type test_config() :: #{server_config := [conf_opt()],  client_config :=  [conf_opt()]}.
+-type test_config() ::
+        #{server_config := [conf_opt()],  client_config :=  [conf_opt()]}.
+-type test_root_cert() ::
+        #{cert := binary(), key := public_key:private_key()}.
 %%====================================================================
 %% Internal application APIu
 %%====================================================================
@@ -367,23 +371,23 @@ match_name(directoryName, DirName,  [PermittedName | Rest]) ->
     match_name(fun is_rdnSeq/2, DirName, PermittedName, Rest);
 
 match_name(uniformResourceIdentifier, URI,  [PermittedName | Rest]) ->
-    case split_uri(URI) of
-	incomplete ->
-	    false;
-	{_, _, Host, _, _} ->
-	    PN = case split_uri(PermittedName) of
-		     {_, _, PNhost, _, _} -> PNhost;
+    case uri_string:normalize(URI, [return_map]) of
+	#{host := Host} ->
+	    PN = case uri_string:normalize(PermittedName, [return_map]) of
+		     #{host := PNhost} -> PNhost;
 		     _X -> PermittedName
 		 end,
-	    match_name(fun is_valid_host_or_domain/2, Host, PN, Rest)
+	    match_name(fun is_valid_host_or_domain/2, Host, PN, Rest);
+        _ ->
+            false
     end;
 
 match_name(emailAddress, Name, [PermittedName | Rest]) ->
     Fun = fun(Email, PermittedEmail) ->
-		  is_valid_email_address(Email, PermittedEmail,
-				   string:tokens(PermittedEmail,"@"))
-	  end,
-     match_name(Fun, Name, PermittedName, Rest);
+                  is_valid_email_address(Email, PermittedEmail,
+                                         string:tokens(PermittedEmail,"@"))
+          end,
+    match_name(Fun, Name, PermittedName, Rest);
 
 match_name(dNSName, Name, [PermittedName | Rest]) ->
     Fun = fun(Domain, [$.|Domain]) -> true;
@@ -430,31 +434,94 @@ match_name(Fun, Name, PermittedName, [Head | Tail]) ->
 	false ->
 	    match_name(Fun, Name, Head, Tail)
     end.
+
 %%%
--spec gen_test_certs(#{server_chain:= chain_opts(), client_chain:= chain_opts()}) -> test_config().
- 
-%% Generates server and and client configuration for testing 
+-spec gen_test_certs(#{server_chain:= chain_opts(),
+                       client_chain:= chain_opts()} |
+                     chain_opts()) ->
+                            test_config() |
+                            [conf_opt()].
+%%
+%% Generates server and and client configuration for testing
 %% purposes. All certificate options have default values
-gen_test_certs(#{client_chain := #{root := ClientRootConf,
-                                   intermediates := ClientCAs,
-                                   peer := ClientPeer}, 
-                 server_chain := 
-                     #{root := ServerRootConf,
-                       intermediates := ServerCAs,
-                       peer := ServerPeer}}) ->
-    SRootKey = gen_key(proplists:get_value(key, ServerRootConf, default_key_gen())),
-    CRootKey = gen_key(proplists:get_value(key, ClientRootConf, default_key_gen())),
-    ServerRoot = root_cert("server", SRootKey, ClientRootConf),
-    ClientRoot = root_cert("client", CRootKey, ServerRootConf),
-    
-    [{ServerDERCert, ServerDERKey} | ServerCAsKeys] = config(server, ServerRoot, 
-                                                       SRootKey, lists:reverse([ServerPeer | lists:reverse(ServerCAs)])),
-    [{ClientDERCert, ClientDERKey} | ClientCAsKeys] = config(client, ClientRoot, 
-                                                       CRootKey, lists:reverse([ClientPeer | lists:reverse(ClientCAs)])),
-    ServerDERCA = ca_config(ClientRoot, ServerCAsKeys),
-    ClientDERCA = ca_config(ServerRoot, ClientCAsKeys),
-    #{server_config => [{cert, ServerDERCert}, {key, ServerDERKey}, {cacerts, ServerDERCA}], 
-      client_config => [{cert, ClientDERCert}, {key, ClientDERKey}, {cacerts, ClientDERCA}]}.
+gen_test_certs(
+  #{client_chain :=
+        #{root := ClientRoot,
+          intermediates := ClientCAs,
+          peer := ClientPeer},
+    server_chain :=
+        #{root := ServerRoot,
+          intermediates := ServerCAs,
+          peer := ServerPeer}}) ->
+    #{cert := ServerRootCert, key := ServerRootKey} =
+        case ServerRoot of
+            #{} ->
+                ServerRoot;
+            ServerRootConf when is_list(ServerRootConf) ->
+                root_cert("SERVER ROOT CA", ServerRootConf)
+        end,
+    #{cert := ClientRootCert, key := ClientRootKey} =
+        case ClientRoot of
+            #{} ->
+                ClientRoot;
+            ClientRootConf when is_list(ClientRootConf) ->
+                root_cert("CLIENT ROOT CA", ClientRootConf)
+        end,
+    [{ServerDERCert, ServerDERKey} | ServerCAsKeys] =
+        config(
+          server, ServerRootCert, ServerRootKey,
+          lists:reverse([ServerPeer | lists:reverse(ServerCAs)])),
+    [{ClientDERCert, ClientDERKey} | ClientCAsKeys] =
+        config(
+          client, ClientRootCert, ClientRootKey,
+          lists:reverse([ClientPeer | lists:reverse(ClientCAs)])),
+    ServerDERCA = ca_config(ClientRootCert, ServerCAsKeys),
+    ClientDERCA = ca_config(ServerRootCert, ClientCAsKeys),
+    #{server_config =>
+          [{cert, ServerDERCert}, {key, ServerDERKey},
+           {cacerts, ServerDERCA}],
+      client_config =>
+          [{cert, ClientDERCert}, {key, ClientDERKey},
+           {cacerts, ClientDERCA}]};
+%%
+%% Generates a node configuration for testing purposes,
+%% when using the node server cert also for the client.
+%% All certificate options have default values
+gen_test_certs(
+  #{root := Root, intermediates := CAs, peer := Peer}) ->
+    #{cert := RootCert, key := RootKey} =
+        case Root of
+            #{} ->
+                Root;
+            RootConf when is_list(RootConf) ->
+                root_cert("SERVER ROOT CA", RootConf)
+        end,
+    [{DERCert, DERKey} | CAsKeys] =
+        config(
+          server, RootCert, RootKey,
+          lists:reverse([Peer | lists:reverse(CAs)])),
+    DERCAs = ca_config(RootCert, CAsKeys),
+    [{cert, DERCert}, {key, DERKey}, {cacerts, DERCAs}].
+
+%%%
+-spec root_cert(string(), [cert_opt()]) -> test_root_cert().
+%%
+%% Generate a self-signed root cert
+root_cert(Name, Opts) ->
+    PrivKey = gen_key(proplists:get_value(key, Opts, default_key_gen())),
+    TBS = cert_template(),
+    Issuer = subject("root", Name),
+    OTPTBS =
+        TBS#'OTPTBSCertificate'{
+          signature = sign_algorithm(PrivKey, Opts),
+          issuer = Issuer,
+          validity = validity(Opts),
+          subject = Issuer,
+          subjectPublicKeyInfo = public_key(PrivKey),
+          extensions = extensions(undefined, ca, Opts)
+         },
+    #{cert => public_key:pkix_sign(OTPTBS, PrivKey),
+      key => PrivKey}.
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -801,75 +868,12 @@ is_valid_subject_alt_name({otherName, #'AnotherName'{}}) ->
 is_valid_subject_alt_name({_, _}) ->
     false.
 
-is_ip_address(Address) ->
-    case inet_parse:address(Address) of
-	{ok, _} ->
-	    true;
-	_ ->
-	    false
-    end.
-
-is_fully_qualified_name(_Name) ->
-    true.
-
 is_valid_uri(AbsURI) -> 
-    case split_uri(AbsURI) of
-	incomplete ->
-	    false;
-	{StrScheme, _, Host, _, _} ->
-	    case string:to_lower(StrScheme) of
-		Scheme when Scheme =:= "http"; Scheme =:= "ftp" ->
-		    is_valid_host(Host);
-		_ ->
-		    false
-	    end
-    end.
-
-is_valid_host(Host) ->
-    case is_ip_address(Host) of
-	true ->
-	    true;   
-	false -> 
-	    is_fully_qualified_name(Host)
-    end.
-
-%% Could have a more general split URI in stdlib? Maybe when
-%% regexs are improved. Needed also in inets!
-split_uri(Uri) ->
-    case split_uri(Uri, ":", {error, no_scheme}, 1, 1) of
-	{error, no_scheme} ->
-	    incomplete;
-	{StrScheme, "//" ++ URIPart} ->
-	    {Authority, PathQuery} = 
-		split_auth_path(URIPart),
-	    {UserInfo, HostPort} = 
-		split_uri(Authority, "@", {"", Authority}, 1, 1),
-	    {Host, Port} = 
-		split_uri(HostPort, ":", {HostPort, dummy_port}, 1, 1),
-	    {StrScheme, UserInfo, Host, Port, PathQuery}
-    end.
-
-split_auth_path(URIPart) ->
-    case split_uri(URIPart, "/", URIPart, 1, 0) of
-	Split = {_, _} ->
-	    Split;
-	URIPart ->
-	    case split_uri(URIPart, "\\?", URIPart, 1, 0) of
-		Split = {_, _} ->
-		    Split;
-		URIPart ->
-		    {URIPart,""}
-	    end
-    end.
-
-split_uri(UriPart, SplitChar, NoMatchResult, SkipLeft, SkipRight) ->
-    case re:run(UriPart, SplitChar) of
-	{match,[{Start, _}]} ->
-	    StrPos = Start + 1,
-	    {string:substr(UriPart, 1, StrPos - SkipLeft),
-	     string:substr(UriPart, StrPos + SkipRight, length(UriPart))}; 
-	nomatch ->
-	    NoMatchResult
+    case uri_string:normalize(AbsURI, [return_map]) of
+        #{scheme := _} ->
+            true;
+        _ ->
+            false
     end.
 
 is_rdnSeq({rdnSequence,[]}, {rdnSequence,[none]}) -> 
@@ -1103,7 +1107,7 @@ missing_basic_constraints(OtpCert, SelfSigned, ValidationState, VerifyFun, UserS
 	     UserState}
     end.
 
- gen_key(KeyGen) ->
+gen_key(KeyGen) ->
      case is_key(KeyGen) of
          true ->
              KeyGen;
@@ -1120,28 +1124,14 @@ is_key(#'ECPrivateKey'{}) ->
 is_key(_) ->
     false.
 
-root_cert(Role, PrivKey, Opts) ->
-     TBS = cert_template(),
-     Issuer = issuer("root", Role, " ROOT CA"),
-     OTPTBS = TBS#'OTPTBSCertificate'{
-                signature = sign_algorithm(PrivKey, Opts),
-                issuer = Issuer,
-                validity = validity(Opts),  
-                subject = Issuer,
-                subjectPublicKeyInfo = public_key(PrivKey),
-                extensions = extensions(Role, ca, Opts)
-               },
-     public_key:pkix_sign(OTPTBS, PrivKey).
 
 cert_template() ->
     #'OTPTBSCertificate'{
        version = v3,              
-       serialNumber = trunc(rand:uniform()*100000000)*10000 + 1,
+       serialNumber = erlang:unique_integer([positive, monotonic]),
        issuerUniqueID = asn1_NOVALUE,       
        subjectUniqueID = asn1_NOVALUE
       }.
-issuer(Contact, Role, Name) ->
-  subject(Contact, Role ++ Name).
 
 subject(Contact, Name) ->
     Opts = [{email, Contact ++ "@example.org"},
@@ -1176,9 +1166,11 @@ validity(Opts) ->
     DefFrom0 = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())-1),
     DefTo0   = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())+7),
     {DefFrom, DefTo} = proplists:get_value(validity, Opts, {DefFrom0, DefTo0}),
-    Format = fun({Y,M,D}) -> 
-                     lists:flatten(io_lib:format("~w~2..0w~2..0w000000Z",[Y,M,D])) 
-             end,
+    Format =
+        fun({Y,M,D}) ->
+                lists:flatten(
+                  io_lib:format("~4..0w~2..0w~2..0w000000Z",[Y,M,D]))
+        end,
     #'Validity'{notBefore={generalTime, Format(DefFrom)},
 		notAfter ={generalTime, Format(DefTo)}}.
 
@@ -1240,7 +1232,6 @@ cert(Role, #'OTPCertificate'{tbsCertificate = #'OTPTBSCertificate'{subject = Iss
                subject = subject(Contact, atom_to_list(Role) ++ Name),
                subjectPublicKeyInfo = public_key(Key),
                extensions = extensions(Role, Type, Opts)
-               
               },
     public_key:pkix_sign(OTPTBS, PrivKey).
 
@@ -1297,7 +1288,7 @@ add_default_extensions(server, peer, Exts) ->
               ],
     add_default_extensions(Default, Exts);
     
-add_default_extensions(_, peer, Exts) ->
+add_default_extensions(client, peer, Exts) ->
     Exts.
 
 add_default_extensions(Defaults0, Exts) ->
diff --git a/lib/public_key/src/pubkey_ssh.erl b/lib/public_key/src/pubkey_ssh.erl
index a7d018e440..02c061efc9 100644
--- a/lib/public_key/src/pubkey_ssh.erl
+++ b/lib/public_key/src/pubkey_ssh.erl
@@ -38,6 +38,8 @@
 -define(Empint(X),  (mpint(X))/binary ).
 -define(Estring(X), (string(X))/binary ).
 
+-define(b64enc(X), base64:encode(iolist_to_binary(X)) ).
+-define(b64mime_dec(X), base64:mime_decode(iolist_to_binary(X)) ).
 
 %% Max encoded line length is 72, but conformance examples use 68
 %% Comment from rfc 4716: "The following are some examples of public
@@ -163,7 +165,7 @@ rfc4716_decode_line(Line, Lines, Acc) ->
 	    rfc4716_decode_lines(Lines, [{string_decode(Tag), unicode_decode(Value)} | Acc]);
 	_ ->
 	    {Body, Rest} = join_entry([Line | Lines], []),
-	    {lists:reverse(Acc), rfc4716_pubkey_decode(base64:mime_decode(Body)), Rest}
+	    {lists:reverse(Acc), rfc4716_pubkey_decode(?b64mime_dec(Body)), Rest}
     end.
 
 join_entry([<<"---- END SSH2 PUBLIC KEY ----", _/binary>>| Lines], Entry) ->
@@ -257,11 +259,11 @@ decode_comment(Comment) ->
 
 openssh_pubkey_decode(Type,  Base64Enc) ->
     try
-        <<?DEC_BIN(Type,_TL), Bin/binary>> = base64:mime_decode(Base64Enc),
+        <<?DEC_BIN(Type,_TL), Bin/binary>> = ?b64mime_dec(Base64Enc),
 	ssh2_pubkey_decode(Type,  Bin)
     catch
 	_:_ ->
-	    {Type, base64:mime_decode(Base64Enc)}
+	    {Type, ?b64mime_dec(Base64Enc)}
     end.
 
 
@@ -292,12 +294,12 @@ do_encode(Type, Key, Attributes) ->
 
 rfc4716_encode(Key, [],[]) ->
     iolist_to_binary([begin_marker(),"\n",
-			     split_lines(base64:encode(ssh2_pubkey_encode(Key))),
+			     split_lines(?b64enc(ssh2_pubkey_encode(Key))),
 			     "\n", end_marker(), "\n"]);
 rfc4716_encode(Key, [], [_|_] = Acc) ->
     iolist_to_binary([begin_marker(), "\n",
 			     lists:reverse(Acc),
-			     split_lines(base64:encode(ssh2_pubkey_encode(Key))),
+			     split_lines(?b64enc(ssh2_pubkey_encode(Key))),
 			     "\n", end_marker(), "\n"]);
 rfc4716_encode(Key, [ Header | Headers], Acc) ->
     LinesStr = rfc4716_encode_header(Header),
@@ -326,7 +328,7 @@ rfc4716_encode_value(Value) ->
 
 openssh_encode(openssh_public_key, Key, Attributes) ->
     Comment = proplists:get_value(comment, Attributes, ""),
-    Enc = base64:encode(ssh2_pubkey_encode(Key)),
+    Enc = ?b64enc(ssh2_pubkey_encode(Key)),
     iolist_to_binary([key_type(Key), " ",  Enc,  " ", Comment, "\n"]);
 
 openssh_encode(auth_keys, Key, Attributes) ->
@@ -351,10 +353,10 @@ openssh_encode(known_hosts, Key, Attributes) ->
     end.
 
 openssh_ssh2_auth_keys_encode(undefined, Key, Comment) ->
-    iolist_to_binary([key_type(Key)," ",  base64:encode(ssh2_pubkey_encode(Key)), line_end(Comment)]);
+    iolist_to_binary([key_type(Key)," ",  ?b64enc(ssh2_pubkey_encode(Key)), line_end(Comment)]);
 openssh_ssh2_auth_keys_encode(Options, Key, Comment) ->
     iolist_to_binary([comma_list_encode(Options, []), " ",
-			     key_type(Key)," ", base64:encode(ssh2_pubkey_encode(Key)), line_end(Comment)]).
+			     key_type(Key)," ", ?b64enc(ssh2_pubkey_encode(Key)), line_end(Comment)]).
 
 openssh_ssh1_auth_keys_encode(undefined, Bits,
 			      #'RSAPublicKey'{modulus = N, publicExponent = E},
@@ -369,7 +371,7 @@ openssh_ssh1_auth_keys_encode(Options, Bits,
 
 openssh_ssh2_know_hosts_encode(Hostnames, Key, Comment) ->
     iolist_to_binary([comma_list_encode(Hostnames, []), " ",
-			     key_type(Key)," ",  base64:encode(ssh2_pubkey_encode(Key)), line_end(Comment)]).
+			     key_type(Key)," ",  ?b64enc(ssh2_pubkey_encode(Key)), line_end(Comment)]).
 
 openssh_ssh1_known_hosts_encode(Hostnames, Bits,
 				#'RSAPublicKey'{modulus = N, publicExponent = E},
diff --git a/lib/public_key/src/public_key.app.src b/lib/public_key/src/public_key.app.src
index dbd732c384..5833141e87 100644
--- a/lib/public_key/src/public_key.app.src
+++ b/lib/public_key/src/public_key.app.src
@@ -14,7 +14,7 @@
    {applications, [asn1, crypto, kernel, stdlib]},
    {registered, []},
    {env, []},
-   {runtime_dependencies, ["stdlib-2.0","kernel-3.0","erts-6.0","crypto-3.8",
+   {runtime_dependencies, ["stdlib-3.5","kernel-3.0","erts-6.0","crypto-3.8",
 			   "asn1-3.0"]}
    ]
 }.
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 6788c1ee92..931901640a 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -59,7 +59,8 @@
 	 pkix_crl_verify/2,
 	 pkix_crl_issuer/1,
 	 short_name_hash/1,
-         pkix_test_data/1
+         pkix_test_data/1,
+         pkix_test_root_cert/2
 	]).
 
 -export_type([public_key/0, private_key/0, pem_entry/0,
@@ -1033,10 +1034,12 @@ short_name_hash({rdnSequence, _Attributes} = Name) ->
 
 
 %%--------------------------------------------------------------------
--spec pkix_test_data(#{chain_type() := pubkey_cert:chain_opts()}) ->
-                            pubkey_cert:test_config().
+-spec pkix_test_data(#{chain_type() := pubkey_cert:chain_opts()} |
+                     pubkey_cert:chain_opts()) ->
+                            pubkey_cert:test_config() |
+                            [pubkey_cert:conf_opt()].
 
-%% Description: Generates OpenSSL-style hash of a name.
+%% Description: Generates cert(s) and ssl configuration
 %%--------------------------------------------------------------------
 
 pkix_test_data(#{client_chain := ClientChain0,
@@ -1045,7 +1048,21 @@ pkix_test_data(#{client_chain := ClientChain0,
     ClientChain = maps:merge(Default, ClientChain0),
     ServerChain = maps:merge(Default, ServerChain0),
     pubkey_cert:gen_test_certs(#{client_chain => ClientChain,
-                                 server_chain => ServerChain}).
+                                 server_chain => ServerChain});
+pkix_test_data(#{} = Chain) ->
+    Default = #{intermediates => []},
+    pubkey_cert:gen_test_certs(maps:merge(Default, Chain)).
+
+%%--------------------------------------------------------------------
+-spec pkix_test_root_cert(
+        Name :: string(), Opts :: [pubkey_cert:cert_opt()]) ->
+                                 pubkey_cert:test_root_cert().
+
+%% Description: Generates a root cert suitable for pkix_test_data/1
+%%--------------------------------------------------------------------
+
+pkix_test_root_cert(Name, Opts) ->
+    pubkey_cert:root_cert(Name, Opts).
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -1439,7 +1456,7 @@ ascii_to_lower(String) ->
 verify_hostname_extract_fqdn_default({dns_id,S}) ->
     S;
 verify_hostname_extract_fqdn_default({uri_id,URI}) ->
-    {ok,{https,_,Host,_,_,_}} = http_uri:parse(URI),
+    #{scheme := "https", host := Host} = uri_string:normalize(URI, [return_map]),
     Host.
 
 
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index 38e8f30a25..449d1fc040 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -64,7 +64,9 @@ all() ->
 groups() -> 
     [{pem_decode_encode, [], [dsa_pem, rsa_pem, ec_pem, encrypted_pem,
 			      dh_pem, cert_pem, pkcs7_pem, pkcs10_pem, ec_pem2,
-                  ec_pem_encode_generated, gen_ec_param]},
+                              ec_pem_encode_generated,
+                              gen_ec_param_prime_field, gen_ec_param_char_2_field
+                             ]},
      {ssh_public_key_decode_encode, [],
       [ssh_rsa_public_key, ssh_dsa_public_key, ssh_ecdsa_public_key,
        ssh_rfc4716_rsa_comment, ssh_rfc4716_dsa_comment,
@@ -105,18 +107,11 @@ init_per_testcase(pkix_test_data_all_default, Config) ->
              init_common_per_testcase(Config)
      end;
 
-init_per_testcase(gen_ec_param, Config) ->
-    case crypto:ec_curves() of
-         [] ->
-             {skip, missing_ecc_support};
-         Curves ->
-            case lists:member(secp521r1, Curves) of
-                true ->
-                    init_common_per_testcase(Config);
-                false ->
-                    {skip, missing_ecc_secp52r1_support}
-            end
-    end;
+init_per_testcase(gen_ec_param_prime_field=TC, Config) ->
+    init_per_testcase_gen_ec_param(TC, secp521r1, Config);
+
+init_per_testcase(gen_ec_param_char_2_field=TC, Config) ->
+    init_per_testcase_gen_ec_param(TC, sect571r1, Config);
 
 init_per_testcase(TestCase, Config) ->
     case TestCase of
@@ -1034,8 +1029,6 @@ pkix_verify_hostname_subjAltName_IP(Config) ->
     true  =  public_key:pkix_verify_hostname(Cert, [{ip, {10,67,16,75}}]),
     false =  public_key:pkix_verify_hostname(Cert, [{ip, {1,2,3,4}}]),
     false =  public_key:pkix_verify_hostname(Cert, [{ip, {10,11,12,13}}]).
-        
-
 %%--------------------------------------------------------------------
 pkix_iso_rsa_oid() ->
  [{doc, "Test workaround for supporting certs that use ISO oids"
@@ -1220,12 +1213,19 @@ short_crl_issuer_hash(Config) when is_list(Config) ->
     Issuer = public_key:pkix_crl_issuer(CrlDER),
 
     CrlIssuerHash = public_key:short_name_hash(Issuer).
+
 %%--------------------------------------------------------------------
-gen_ec_param() ->
-    [{doc, "Generate key with EC parameters"}].
-gen_ec_param(Config) when is_list(Config) ->
+gen_ec_param_prime_field() ->
+    [{doc, "Generate key with EC prime_field parameters"}].
+gen_ec_param_prime_field(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(data_dir, Config),
+    do_gen_ec_param(filename:join(Datadir, "ec_key_param0.pem")).
+
+%%--------------------------------------------------------------------
+gen_ec_param_char_2_field() ->
+    [{doc, "Generate key with EC characteristic_two_field parameters"}].
+gen_ec_param_char_2_field(Config) when is_list(Config) ->
     Datadir = proplists:get_value(data_dir, Config),
-    do_gen_ec_param(filename:join(Datadir, "ec_key_param0.pem")),
     do_gen_ec_param(filename:join(Datadir, "ec_key_param1.pem")).
 
 %%--------------------------------------------------------------------
@@ -1312,6 +1312,30 @@ do_gen_ec_param(File) ->
             ct:fail({key_gen_fail, File})
     end.
 
+init_per_testcase_gen_ec_param(TC, Curve, Config) ->
+    case crypto:ec_curves() of
+        [] ->
+            {skip, missing_ec_support};
+        Curves ->
+            case lists:member(Curve, Curves)
+                andalso crypto_supported_curve(Curve, Curves)
+            of
+                true ->
+                    init_common_per_testcase(Config);
+                false ->
+                    {skip, {missing_ec_support, Curve}}
+            end
+    end.
+
+
+crypto_supported_curve(Curve, Curves) ->
+    try crypto:generate_key(ecdh, Curve) of
+        {error,_} -> false; % Just in case crypto is changed in the future...
+        _-> true
+    catch
+        _:_-> false
+    end.
+        
 incorrect_countryname_pkix_cert() ->
     <<48,130,5,186,48,130,4,162,160,3,2,1,2,2,7,7,250,61,63,6,140,137,48,13,6,9,42, 134,72,134,247,13,1,1,5,5,0,48,129,220,49,11,48,9,6,3,85,4,6,19,2,85,83,49, 16,48,14,6,3,85,4,8,19,7,65,114,105,122,111,110,97,49,19,48,17,6,3,85,4,7,19, 10,83,99,111,116,116,115,100,97,108,101,49,37,48,35,6,3,85,4,10,19,28,83,116, 97,114,102,105,101,108,100,32,84,101,99,104,110,111,108,111,103,105,101,115, 44,32,73,110,99,46,49,57,48,55,6,3,85,4,11,19,48,104,116,116,112,58,47,47,99, 101,114,116,105,102,105,99,97,116,101,115,46,115,116,97,114,102,105,101,108, 100,116,101,99,104,46,99,111,109,47,114,101,112,111,115,105,116,111,114,121, 49,49,48,47,6,3,85,4,3,19,40,83,116,97,114,102,105,101,108,100,32,83,101,99, 117,114,101,32,67,101,114,116,105,102,105,99,97,116,105,111,110,32,65,117, 116,104,111,114,105,116,121,49,17,48,15,6,3,85,4,5,19,8,49,48,54,56,56,52,51, 53,48,30,23,13,49,48,49,48,50,51,48,49,51,50,48,53,90,23,13,49,50,49,48,50, 51,48,49,51,50,48,53,90,48,122,49,11,48,9,6,3,85,4,6,12,2,85,83,49,11,48,9,6, 3,85,4,8,12,2,65,90,49,19,48,17,6,3,85,4,7,12,10,83,99,111,116,116,115,100, 97,108,101,49,38,48,36,6,3,85,4,10,12,29,83,112,101,99,105,97,108,32,68,111, 109,97,105,110,32,83,101,114,118,105,99,101,115,44,32,73,110,99,46,49,33,48, 31,6,3,85,4,3,12,24,42,46,108,111,103,105,110,46,115,101,99,117,114,101,115, 101,114,118,101,114,46,110,101,116,48,130,1,34,48,13,6,9,42,134,72,134,247, 13,1,1,1,5,0,3,130,1,15,0,48,130,1,10,2,130,1,1,0,185,136,240,80,141,36,124, 245,182,130,73,19,188,74,166,117,72,228,185,209,43,129,244,40,44,193,231,11, 209,12,234,88,43,142,1,162,48,122,17,95,230,105,171,131,12,147,46,204,36,80, 250,171,33,253,35,62,83,22,71,212,186,141,14,198,89,89,121,204,224,122,246, 127,110,188,229,162,67,95,6,74,231,127,99,131,7,240,85,102,203,251,50,58,58, 104,245,103,181,183,134,32,203,121,232,54,32,188,139,136,112,166,126,14,91, 223,153,172,164,14,61,38,163,208,215,186,210,136,213,143,70,147,173,109,217, 250,169,108,31,211,104,238,103,93,182,59,165,43,196,189,218,241,30,148,240, 109,90,69,176,194,52,116,173,151,135,239,10,209,179,129,192,102,75,11,25,168, 223,32,174,84,223,134,70,167,55,172,143,27,130,123,226,226,7,34,142,166,39, 48,246,96,231,150,84,220,106,133,193,55,95,159,227,24,249,64,36,1,142,171,16, 202,55,126,7,156,15,194,22,116,53,113,174,104,239,203,120,45,131,57,87,84, 163,184,27,83,57,199,91,200,34,43,98,61,180,144,76,65,170,177,2,3,1,0,1,163, 130,1,224,48,130,1,220,48,15,6,3,85,29,19,1,1,255,4,5,48,3,1,1,0,48,29,6,3, 85,29,37,4,22,48,20,6,8,43,6,1,5,5,7,3,1,6,8,43,6,1,5,5,7,3,2,48,14,6,3,85, 29,15,1,1,255,4,4,3,2,5,160,48,56,6,3,85,29,31,4,49,48,47,48,45,160,43,160, 41,134,39,104,116,116,112,58,47,47,99,114,108,46,115,116,97,114,102,105,101, 108,100,116,101,99,104,46,99,111,109,47,115,102,115,50,45,48,46,99,114,108, 48,83,6,3,85,29,32,4,76,48,74,48,72,6,11,96,134,72,1,134,253,110,1,7,23,2,48, 57,48,55,6,8,43,6,1,5,5,7,2,1,22,43,104,116,116,112,115,58,47,47,99,101,114, 116,115,46,115,116,97,114,102,105,101,108,100,116,101,99,104,46,99,111,109, 47,114,101,112,111,115,105,116,111,114,121,47,48,129,141,6,8,43,6,1,5,5,7,1, 1,4,129,128,48,126,48,42,6,8,43,6,1,5,5,7,48,1,134,30,104,116,116,112,58,47, 47,111,99,115,112,46,115,116,97,114,102,105,101,108,100,116,101,99,104,46,99, 111,109,47,48,80,6,8,43,6,1,5,5,7,48,2,134,68,104,116,116,112,58,47,47,99, 101,114,116,105,102,105,99,97,116,101,115,46,115,116,97,114,102,105,101,108, 100,116,101,99,104,46,99,111,109,47,114,101,112,111,115,105,116,111,114,121, 47,115,102,95,105,110,116,101,114,109,101,100,105,97,116,101,46,99,114,116, 48,31,6,3,85,29,35,4,24,48,22,128,20,73,75,82,39,209,27,188,242,161,33,106, 98,123,81,66,122,138,215,213,86,48,59,6,3,85,29,17,4,52,48,50,130,24,42,46, 108,111,103,105,110,46,115,101,99,117,114,101,115,101,114,118,101,114,46,110, 101,116,130,22,108,111,103,105,110,46,115,101,99,117,114,101,115,101,114,118, 101,114,46,110,101,116,48,29,6,3,85,29,14,4,22,4,20,138,233,191,208,157,203, 249,85,242,239,20,195,48,10,148,49,144,101,255,116,48,13,6,9,42,134,72,134, 247,13,1,1,5,5,0,3,130,1,1,0,82,31,121,162,49,50,143,26,167,202,143,61,71, 189,201,199,57,81,122,116,90,192,88,24,102,194,174,48,157,74,27,87,210,223, 253,93,3,91,150,109,120,1,110,27,11,200,198,141,222,246,14,200,71,105,41,138, 13,114,122,106,63,17,197,181,234,121,61,89,74,65,41,231,248,219,129,83,176, 219,55,107,55,211,112,98,38,49,69,77,96,221,108,123,152,12,210,159,157,141, 43,226,55,187,129,3,82,49,136,66,81,196,91,234,196,10,82,48,6,80,163,83,71, 127,102,177,93,209,129,26,104,2,84,24,255,248,161,3,244,169,234,92,122,110, 43,4,17,113,185,235,108,219,210,236,132,216,177,227,17,169,58,162,159,182, 162,93,160,229,200,9,163,229,110,121,240,168,232,14,91,214,188,196,109,210, 164,222,0,109,139,132,113,91,16,118,173,178,176,80,132,34,41,199,51,206,250, 224,132,60,115,192,94,107,163,219,212,226,225,65,169,148,108,213,46,174,173, 103,110,189,229,166,149,254,31,51,44,144,108,187,182,11,251,201,206,86,138, 208,59,51,86,132,235,81,225,88,34,190,8,184>>.
 
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index bb96c2237d..99a0cc087e 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.5
+PUBLIC_KEY_VSN = 1.5.2
diff --git a/lib/reltool/src/reltool_app_win.erl b/lib/reltool/src/reltool_app_win.erl
index 663144861f..335b40fa74 100644
--- a/lib/reltool/src/reltool_app_win.erl
+++ b/lib/reltool/src/reltool_app_win.erl
@@ -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) ->
diff --git a/lib/reltool/src/reltool_mod_win.erl b/lib/reltool/src/reltool_mod_win.erl
index dcd802a5de..8272d864c2 100644
--- a/lib/reltool/src/reltool_mod_win.erl
+++ b/lib/reltool/src/reltool_mod_win.erl
@@ -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) ->
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index 853191c696..66ee1a3742 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -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) ->
diff --git a/lib/reltool/src/reltool_sys_win.erl b/lib/reltool/src/reltool_sys_win.erl
index 92df270752..d87b1dc91f 100644
--- a/lib/reltool/src/reltool_sys_win.erl
+++ b/lib/reltool/src/reltool_sys_win.erl
@@ -135,9 +135,9 @@ init(Options) ->
     try
 	do_init(Options)
     catch
-	error:Reason ->
-	    io:format("~tp: ~tp~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]) ->
diff --git a/lib/runtime_tools/doc/src/LTTng.xml b/lib/runtime_tools/doc/src/LTTng.xml
index 392d54857c..93937b3fdc 100644
--- a/lib/runtime_tools/doc/src/LTTng.xml
+++ b/lib/runtime_tools/doc/src/LTTng.xml
@@ -134,7 +134,7 @@ $ make </code>
         <p><em>port_open</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
         </list>
         <p>
@@ -323,7 +323,7 @@ $ make </code>
 
         <p><em>driver_init</em></p>
         <list type="bulleted">
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>major : integer</c> :: Major version. Ex. <c>3</c></item>
             <item><c>minor : integer</c> :: Minor version. Ex. <c>1</c></item>
             <item><c>flags : integer</c> :: Flags. Ex. <c>1</c></item>
@@ -334,7 +334,7 @@ $ make </code>
         <p><em>driver_start</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
         </list>
         <p>Example:</p>
@@ -344,7 +344,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>bytes : integer</c> :: Size of data returned. Ex. <c>82</c></item>
         </list>
         <p>Example:</p>
@@ -354,7 +354,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>bytes : integer</c> :: Size of data returned. Ex. <c>82</c></item>
         </list>
         <p>Example:</p>
@@ -364,7 +364,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
         <code type="none">driver_ready_input: { cpu_id = 5 }, { pid = "&lt;0.189.0&gt;", port = "#Port&lt;0.3637&gt;", driver = "inet_gethost 4 " }</code>
@@ -373,7 +373,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
         <code type="none">driver_ready_output: { cpu_id = 5 }, { pid = "&lt;0.194.0&gt;", port = "#Port&lt;0.3663&gt;", driver = "tcp_inet" }</code>
@@ -382,14 +382,14 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
         <code type="none">driver_timeout: { cpu_id = 5 }, { pid = "&lt;0.196.0&gt;", port = "#Port&lt;0.3664&gt;", driver = "tcp_inet" }</code>
 
         <p><em>driver_stop_select</em></p>
         <list type="bulleted">
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
         <code type="none">driver_stop_select: { cpu_id = 5 }, { driver = "unknown" }</code>
@@ -398,7 +398,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
         <code type="none">driver_flush: { cpu_id = 7 }, { pid = "&lt;0.204.0&gt;", port = "#Port&lt;0.3686&gt;", driver = "tcp_inet" }</code>
@@ -407,32 +407,32 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
-        <code type="none">driver_stop: { cpu_id = 5 }, { pid = "[]", port = "#Port&lt;0.3673&gt;", driver = "efile" }</code>
+        <code type="none">driver_stop: { cpu_id = 5 }, { pid = "[]", port = "#Port&lt;0.3673&gt;", driver = "tcp_inet" }</code>
 
         <p><em>driver_process_exit</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
 
         <p><em>driver_ready_async</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
-        <code type="none">driver_ready_async: { cpu_id = 3 }, { pid = "&lt;0.181.0&gt;", port = "#Port&lt;0.3622&gt;", driver = "efile" }</code>
+        <code type="none">driver_ready_async: { cpu_id = 3 }, { pid = "&lt;0.181.0&gt;", port = "#Port&lt;0.3622&gt;", driver = "tcp_inet" }</code>
 
         <p><em>driver_call</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>command : integer</c> :: Command integer. Ex. <c>1</c></item>
             <item><c>bytes : integer</c> :: Size of data returned. Ex. <c>82</c></item>
         </list>
@@ -443,7 +443,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>command : integer</c> :: Command integer. Ex. <c>1</c></item>
             <item><c>bytes : integer</c> :: Size of data returned. Ex. <c>82</c></item>
         </list>
diff --git a/lib/runtime_tools/doc/src/Makefile b/lib/runtime_tools/doc/src/Makefile
index dad229e193..a9b0056a93 100644
--- a/lib/runtime_tools/doc/src/Makefile
+++ b/lib/runtime_tools/doc/src/Makefile
@@ -41,11 +41,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = dbg.xml dyntrace.xml erts_alloc_config.xml system_information.xml msacc.xml
+XML_REF3_FILES = \
+	dbg.xml \
+	dyntrace.xml \
+	erts_alloc_config.xml \
+	system_information.xml \
+	msacc.xml \
+	scheduler.xml
 XML_REF6_FILES = runtime_tools_app.xml
 
 XML_PART_FILES = part.xml
-XML_CHAPTER_FILES = notes.xml notes_history.xml LTTng.xml
+XML_CHAPTER_FILES = notes.xml LTTng.xml
 
 GENERATED_XML_FILES = DTRACE.xml SYSTEMTAP.xml
 
@@ -54,7 +60,8 @@ BOOK_FILES = book.xml
 XML_FILES = \
 	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
 	$(XML_PART_FILES) $(XML_REF3_FILES) \
-	$(XML_REF6_FILES) $(XML_APPLICATION_FILES)
+	$(XML_REF6_FILES) $(XML_APPLICATION_FILES) \
+	$(GENERATED_XML_FILES)
 
 GIF_FILES =
 
@@ -89,7 +96,6 @@ SPECS_FLAGS = -I../../include -I../../../kernel/src
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-$(XML_FILES): $(GENERATED_XML_FILES)
 
 %.xml: $(ERL_TOP)/HOWTO/%.md $(ERL_TOP)/make/emd2exml
 	$(ERL_TOP)/make/emd2exml $< $@
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index 8b4d437c26..74300ba3fc 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -32,6 +32,38 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
+<section><title>Runtime_Tools 1.12.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    New family of <c>erts_alloc</c> strategies: Age Order
+	    First Fit. Similar to "address order", but instead the
+	    oldest possible carrier is always chosen for allocation.</p>
+          <p>
+	    Own Id: OTP-14917 Aux Id: ERIERL-88 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Runtime_Tools 1.12.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Runtime_Tools 1.12.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/runtime_tools/doc/src/ref_man.xml b/lib/runtime_tools/doc/src/ref_man.xml
index d2fb7a29af..eb3a6f0f5c 100644
--- a/lib/runtime_tools/doc/src/ref_man.xml
+++ b/lib/runtime_tools/doc/src/ref_man.xml
@@ -37,6 +37,7 @@
   <xi:include href="dyntrace.xml"/>
   <xi:include href="erts_alloc_config.xml"/>
   <xi:include href="msacc.xml"/>
+  <xi:include href="scheduler.xml"/>
   <xi:include href="system_information.xml"/>
 </application>
 
diff --git a/lib/runtime_tools/doc/src/scheduler.xml b/lib/runtime_tools/doc/src/scheduler.xml
new file mode 100644
index 0000000000..dd8bf73bae
--- /dev/null
+++ b/lib/runtime_tools/doc/src/scheduler.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2018</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></title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno>1</docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev></rev>
+    <file>scheduler.xml</file>
+  </header>
+  <module>scheduler</module>
+  <modulesummary>Measure scheduler utilization</modulesummary>
+  <description>
+    <p>This module contains utility functions for easier measurement and
+    calculation of scheduler utilization, otherwise obtained from calling the
+    more primitive <seealso marker="erts:erlang#statistics_scheduler_wall_time">
+    <c>statistics(scheduler_wall_time)</c></seealso>.</p>
+    <p>The simplest usage is to call <seealso marker="#utilization-1">
+    <c>scheduler:utilization(Seconds)</c></seealso>.</p>
+  </description>
+
+  <datatypes>
+    <datatype>
+      <name name="sched_sample"/>
+    </datatype>
+    <datatype>
+      <name name="sched_type"/>
+    </datatype>
+    <datatype>
+      <name name="sched_id"/>
+    </datatype>
+    <datatype>
+      <name name="sched_util_result"/>
+      <desc>
+	<p>A list of tuples containing results for individual schedulers
+	as well as aggregated averages. <c>Util</c> is the scheduler utilization
+	as a floating point value between 0.0 and 1.0. <c>Percent</c> is the
+	same utilization as a more human readable string expressed in percent.</p>
+	<taglist>
+	  <tag><c>{normal, SchedulerId, Util, Percent}</c></tag>
+	  <item>Scheduler utilization of a normal scheduler with number
+	    <c>SchedulerId</c>.</item>
+	  <tag><c>{cpu, SchedulerId, Util, Percent}</c></tag>
+	  <item>Scheduler utilization of a dirty-cpu scheduler with number
+	    <c>SchedulerId</c>.</item>
+	  <tag><c>{io, SchedulerId, Util, Percent}</c></tag>
+	  <item>Scheduler utilization of a dirty-io scheduler with number
+	    <c>SchedulerId</c>. This tuple will only exist if both samples were
+	    taken with <seealso marker="#sample_all-0"><c>sample_all/0</c></seealso>.</item>
+	  <tag><c>{total, Util, Percent}</c></tag>
+	  <item>Total utilization of all normal and dirty-cpu schedulers.</item>
+	  <tag><c>{weighted, Util, Percent}</c></tag>
+	  <item>Total utilization of all normal and dirty-cpu schedulers,
+	  weighted against maximum amount of available CPU time.</item>
+	</taglist>
+      </desc>
+    </datatype>
+  </datatypes>
+
+  <funcs>
+
+    <func>
+      <name name="sample" arity="0"/>
+      <fsummary>Get scheduler utilization sample.</fsummary>
+      <desc>
+        <p>Return a scheduler utilization sample for normal and dirty-cpu
+	schedulers.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="sample_all" arity="0"/>
+      <fsummary>Get scheduler utilization sample.</fsummary>
+      <desc>
+        <p>Return a scheduler utilization sample for all schedulers,
+	including dirty-io schedulers.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="utilization" arity="1" clause_i="1"/>
+      <fsummary>Measure scheduler utilizations during a period of time.</fsummary>
+      <desc>
+        <p>Measure utilization for normal and dirty-cpu schedulers during
+	<c><anno>Seconds</anno></c> seconds, and then return the result.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="utilization" arity="1" clause_i="2"/>
+      <fsummary>Measure scheduler utilizations since sample.</fsummary>
+      <desc>
+        <p>Calculate scheduler utilizations for the time interval from when
+	<c><anno>Sample</anno></c> was taken and "now". The same as calling
+	<c>scheduler:utilization(Sample, scheduler:sample_all())</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="utilization" arity="2"/>
+      <fsummary>Measure scheduler utilizations between two samples.</fsummary>
+      <desc>
+	<p>Calculates scheduler utilizations for the time interval between
+	the two samples obtained from calling
+	<seealso marker="#sample-0"><c>sample/0</c></seealso> or
+	<seealso marker="#sample_all-0"><c>sample_all/0</c></seealso>.</p>
+      </desc>
+    </func>
+
+  </funcs>
+ </erlref>
diff --git a/lib/runtime_tools/doc/src/specs.xml b/lib/runtime_tools/doc/src/specs.xml
index 978bd39e55..33fe7fa370 100644
--- a/lib/runtime_tools/doc/src/specs.xml
+++ b/lib/runtime_tools/doc/src/specs.xml
@@ -2,4 +2,5 @@
 <specs xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="../specs/specs_system_information.xml"/>
   <xi:include href="../specs/specs_msacc.xml"/>
+  <xi:include href="../specs/specs_scheduler.xml"/>
 </specs>
diff --git a/lib/runtime_tools/examples/efile_drv.d b/lib/runtime_tools/examples/efile_drv.d
deleted file mode 100644
index a470518dd9..0000000000
--- a/lib/runtime_tools/examples/efile_drv.d
+++ /dev/null
@@ -1,105 +0,0 @@
-/* example usage: dtrace -q -s /path/to/efile_drv.d */
-/*
- * %CopyrightBegin%
- *
- * Copyright Scott Lystig Fritchie 2011-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%
- */
-
-BEGIN
-{
-    op_map[1] = "OPEN";
-    op_map[2] = "READ";
-    op_map[3] = "LSEEK";
-    op_map[4] = "WRITE";
-    op_map[5] = "FSTAT";
-    op_map[6] = "PWD";
-    op_map[7] = "READDIR";
-    op_map[8] = "CHDIR";
-    op_map[9] = "FSYNC";
-    op_map[10] = "MKDIR";
-    op_map[11] = "DELETE";
-    op_map[12] = "RENAME";
-    op_map[13] = "RMDIR";
-    op_map[14] = "TRUNCATE";
-    op_map[15] = "READ_FILE";
-    op_map[16] = "WRITE_INFO";
-    op_map[19] = "LSTAT";
-    op_map[20] = "READLINK";
-    op_map[21] = "LINK";
-    op_map[22] = "SYMLINK";
-    op_map[23] = "CLOSE";
-    op_map[24] = "PWRITEV";
-    op_map[25] = "PREADV";
-    op_map[26] = "SETOPT";
-    op_map[27] = "IPREAD";
-    op_map[28] = "ALTNAME";
-    op_map[29] = "READ_LINE";
-    op_map[30] = "FDATASYNC";
-    op_map[31] = "FADVISE";
-}
-
-erlang*:::aio_pool-add
-{
-    printf("async I/O pool port %s queue len %d\n", copyinstr(arg0), arg1);
-}
-
-erlang*:::aio_pool-get
-{
-    printf("async I/O pool port %s queue len %d\n", copyinstr(arg0), arg1);
-}
-
-erlang*:::efile_drv-entry
-{
-    printf("efile_drv enter tag={%d,%d} %s%s | %s (%d) | args: %s %s , %d %d (port %s)\n",
-	   arg0, arg1,
-           arg2 == NULL ? "" : "user tag ",
-           arg2 == NULL ? "" : copyinstr(arg2),
-           op_map[arg3], arg3,
-	   arg4 == NULL ? "" : copyinstr(arg4),
-	   arg5 == NULL ? "" : copyinstr(arg5), arg6, arg7,
-           /* NOTE: port name in args[10] is experimental */
-           (args[10] == NULL) ? 
-	       "?" : copyinstr((user_addr_t) args[10]));
-}
-
-erlang*:::efile_drv-int*
-{
-    printf("async I/O worker tag={%d,%d} | %s (%d) | %s\n",
-           arg0, arg1, op_map[arg2], arg2, probename);
-}
-
-/* efile_drv-return error case */
-erlang*:::efile_drv-return
-/arg4 == 0/
-{
-    printf("efile_drv return tag={%d,%d} %s%s | %s (%d) | errno %d\n",
-           arg0, arg1,
-           arg2 == NULL ? "" : "user tag ",
-           arg2 == NULL ? "" : copyinstr(arg2),
-           op_map[arg3], arg3,
-           arg5);
-}
-
-/* efile_drv-return success case */
-erlang*:::efile_drv-return
-/arg4 != 0/
-{
-    printf("efile_drv return tag={%d,%d} %s | %s (%d) ok\n",
-           arg0, arg1,
-           arg2 == NULL ? "" : copyinstr(arg2),
-           op_map[arg3], arg3);
-}
diff --git a/lib/runtime_tools/examples/efile_drv.systemtap b/lib/runtime_tools/examples/efile_drv.systemtap
deleted file mode 100644
index 29c3637e10..0000000000
--- a/lib/runtime_tools/examples/efile_drv.systemtap
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Scott Lystig Fritchie and Andreas Schultz, 2011-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%
- */
-/*
- * Note: This file assumes that you're using the non-SMP-enabled Erlang
- *       virtual machine, "beam".  The SMP-enabled VM is called "beam.smp".
- *       Note that other variations of the virtual machine also have
- *       different names, e.g. the debug build of the SMP-enabled VM
- *       is "beam.debug.smp".
- *
- *       To use a different virtual machine, replace each instance of
- *       "beam" with "beam.smp" or the VM name appropriate to your
- *       environment.
- */
-
-probe begin
-{
-    op_map[1] = "OPEN";
-    op_map[2] = "READ";
-    op_map[3] = "LSEEK";
-    op_map[4] = "WRITE";
-    op_map[5] = "FSTAT";
-    op_map[6] = "PWD";
-    op_map[7] = "READDIR";
-    op_map[8] = "CHDIR";
-    op_map[9] = "FSYNC";
-    op_map[10] = "MKDIR";
-    op_map[11] = "DELETE";
-    op_map[12] = "RENAME";
-    op_map[13] = "RMDIR";
-    op_map[14] = "TRUNCATE";
-    op_map[15] = "READ_FILE";
-    op_map[16] = "WRITE_INFO";
-    op_map[19] = "LSTAT";
-    op_map[20] = "READLINK";
-    op_map[21] = "LINK";
-    op_map[22] = "SYMLINK";
-    op_map[23] = "CLOSE";
-    op_map[24] = "PWRITEV";
-    op_map[25] = "PREADV";
-    op_map[26] = "SETOPT";
-    op_map[27] = "IPREAD";
-    op_map[28] = "ALTNAME";
-    op_map[29] = "READ_LINE";
-    op_map[30] = "FDATASYNC";
-    op_map[31] = "FADVISE";
-}
-
-probe process("beam").mark("aio_pool-add")
-{
-    printf("async I/O pool port %s queue len %d\n", user_string($arg1), $arg2);
-}
-
-probe process("beam").mark("aio_pool-get")
-{
-    printf("async I/O pool port %s queue len %d\n", user_string($arg1), $arg2);
-}
-
-probe process("beam").mark("efile_drv-entry")
-{
-    printf("efile_drv enter tag={%d,%d} %s%s | %s (%d) | args: %s %s , %d %d (port %s)\n",
-	   $arg1, $arg2,
-           $arg3 == NULL ? "" : "user tag ",
-           $arg3 == NULL ? "" : user_string($arg3),
-           op_map[$arg4], $arg4,
-	   $arg5 == NULL ? "" : user_string($arg5),
-	   $arg6 == NULL ? "" : user_string($arg6), $arg7, $arg8,
-           /* NOTE: port name in $arg[11] is experimental */
-           user_string($arg11))
-}
-
-probe process("beam").mark("efile_drv-int*")
-{
-    printf("async I/O worker tag={%d,%d} | %s (%d) | %s\n",
-           $arg1, $arg2, op_map[$arg3], $arg3, probefunc());
-}
-
-probe process("beam").mark("efile_drv-return")
-{
-    if ($arg5 == 0) {
-       /* efile_drv-return error case */
-       printf("efile_drv return tag={%d,%d} %s%s | %s (%d) | errno %d\n",
-           $arg1, $arg2,
-           $arg3 == NULL ? "" : "user tag ",
-           $arg3 == NULL ? "" : user_string($arg3),
-           op_map[$arg4], $arg4,
-           $arg6);
-    } else {
-       /* efile_drv-return success case */
-       printf("efile_drv return tag={%d,%d} %s | %s (%d) ok\n",
-           $arg1, $arg2,
-           $arg3 == NULL ? "" : user_string($arg3),
-           op_map[$arg4], $arg4);
-    }
-}
-
-global op_map;
diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
index 5a99c6e240..6faa9c2e35 100644
--- a/lib/runtime_tools/src/Makefile
+++ b/lib/runtime_tools/src/Makefile
@@ -45,6 +45,7 @@ MODULES= \
 	system_information \
 	observer_backend \
 	ttb_autostart\
+	scheduler\
 	msacc
 
 HRL_FILES= ../include/observer_backend.hrl
diff --git a/lib/runtime_tools/src/erts_alloc_config.erl b/lib/runtime_tools/src/erts_alloc_config.erl
index 342363d08d..6c1a945484 100644
--- a/lib/runtime_tools/src/erts_alloc_config.erl
+++ b/lib/runtime_tools/src/erts_alloc_config.erl
@@ -265,7 +265,13 @@ strategy_str(aoff) ->
 strategy_str(aoffcbf) ->
     "Address order first fit carrier best fit";
 strategy_str(aoffcaobf) ->
-    "Address order first fit carrier adress order best fit".
+    "Address order first fit carrier adress order best fit";
+strategy_str(ageffcaoff) ->
+    "Age order first fit carrier address order first fit";
+strategy_str(ageffcbf) ->
+    "Age order first fit carrier best fit";
+strategy_str(ageffcaobf) ->
+    "Age order first fit carrier adress order best fit".
 
 default_acul(A, S) ->
     case carrier_migration_support(S) of
diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index 1b075a507d..7ec3b38930 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -279,7 +279,7 @@ get_table_list(mnesia, Opts) ->
 			     end,
 		       [Tab|Acc]
 		   catch _:_What ->
-			   %% io:format("Skipped ~p: ~p ~p ~n",[Id, _What, erlang:get_stacktrace()]),
+			   %% io:format("Skipped ~p: ~p ~p ~n",[Id, _What, Stacktrace]),
 			   Acc
 		   end
 	   end,
@@ -293,7 +293,7 @@ fetch_stats_loop(Parent, Time) ->
     erlang:system_flag(scheduler_wall_time, true),
     receive
 	_Msg ->
-	    %% erlang:system_flag(scheduler_wall_time, false)
+	    erlang:system_flag(scheduler_wall_time, false),
 	    ok
     after Time ->
 	    _M = Parent ! {stats, 1,
@@ -340,7 +340,6 @@ etop_collect(Collector) ->
 
     case SchedulerWallTime of
 	undefined ->
-            erlang:system_flag(scheduler_wall_time,true),
             spawn(fun() -> flag_holder_proc(Collector) end),
             ok;
 	_ ->
@@ -348,10 +347,11 @@ etop_collect(Collector) ->
     end.
 
 flag_holder_proc(Collector) ->
+    erlang:system_flag(scheduler_wall_time,true),
     Ref = erlang:monitor(process,Collector),
     receive
 	{'DOWN',Ref,_,_,_} ->
-	    %% erlang:system_flag(scheduler_wall_time,false)
+	    erlang:system_flag(scheduler_wall_time,false),
 	    ok
     end.
 
diff --git a/lib/runtime_tools/src/runtime_tools.app.src b/lib/runtime_tools/src/runtime_tools.app.src
index 449532e5c4..09a9b447c2 100644
--- a/lib/runtime_tools/src/runtime_tools.app.src
+++ b/lib/runtime_tools/src/runtime_tools.app.src
@@ -23,6 +23,7 @@
     {modules,      [appmon_info, dbg,observer_backend,runtime_tools,
                     runtime_tools_sup,erts_alloc_config,
 		    ttb_autostart,dyntrace,system_information,
+                    scheduler,
                     msacc]},
     {registered,   [runtime_tools_sup]},
     {applications, [kernel, stdlib]},
diff --git a/lib/runtime_tools/src/scheduler.erl b/lib/runtime_tools/src/scheduler.erl
new file mode 100644
index 0000000000..c896b671ac
--- /dev/null
+++ b/lib/runtime_tools/src/scheduler.erl
@@ -0,0 +1,152 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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%
+%%
+
+%% @doc Utility functions for easier measurement of scheduler utilization
+%%      using erlang:statistics(scheduler_wall_time).
+
+-module(scheduler).
+
+-export([sample/0,
+         sample_all/0,
+         utilization/1,
+         utilization/2]).
+
+-export_type([sched_sample/0]).
+
+
+-opaque sched_sample() ::
+          {scheduler_wall_time | scheduler_wall_time_all,
+           [{sched_type(), sched_id(), ActiveTime::integer(), TotalTime::integer()}]}.
+
+-type sched_type() :: normal | cpu | io.
+
+-type sched_id() :: integer().
+
+-spec sample() -> sched_sample().
+sample() ->
+    sample(scheduler_wall_time).
+
+-spec sample_all() -> sched_sample().
+sample_all() ->
+    sample(scheduler_wall_time_all).
+
+sample(Stats) ->
+    case erlang:statistics(Stats) of
+        undefined ->
+            erlang:system_flag(scheduler_wall_time, true),
+            sample(Stats);
+        
+        List ->
+            Sorted = lists:sort(List),
+            Tagged = lists:map(fun({I, A, T}) -> {sched_tag(I), I, A, T} end,
+                               Sorted),
+            {Stats, Tagged}
+    end.
+
+-type sched_util_result() ::
+        [{sched_type(), sched_id(), float(), string()} |
+         {total, float(), string()} |
+         {weighted, float(), string()}].
+
+-spec utilization(Seconds) -> sched_util_result() when
+      Seconds :: pos_integer();
+                 (Sample) -> sched_util_result() when
+      Sample :: sched_sample().
+utilization(Seconds) when is_integer(Seconds), Seconds > 0 ->
+    OldFlag = erlang:system_flag(scheduler_wall_time, true),
+    T0 = sample(),
+    receive after Seconds*1000 -> ok end,
+    T1 = sample(),
+    case OldFlag of
+        false ->
+            erlang:system_flag(scheduler_wall_time, OldFlag);
+        true ->
+            ok
+    end,
+    utilization(T0,T1);
+
+utilization({Stats, _}=T0) when Stats =:= scheduler_wall_time;
+                                Stats =:= scheduler_wall_time_all ->
+    utilization(T0, sample(Stats)).
+
+-spec utilization(Sample1, Sample2) -> sched_util_result() when
+      Sample1 :: sched_sample(),
+      Sample2 :: sched_sample().
+utilization({Stats, Ts0}, {Stats, Ts1}) ->
+    Diffs = lists:map(fun({{Tag, I, A0, T0}, {Tag, I, A1, T1}}) ->
+                              {Tag, I, (A1 - A0), (T1 - T0)}
+                      end,
+                      lists:zip(Ts0,Ts1)),
+
+    {Lst0, {A, T, N}} = lists:foldl(fun({Tag, I, Adiff, Tdiff}, {Lst, Acc}) ->
+                                            R = safe_div(Adiff, Tdiff),
+                                            {[{Tag, I, R, percent(R)} | Lst],
+                                             acc(Tag, Adiff, Tdiff, Acc)}
+                                    end,
+                                    {[], {0, 0, 0}},
+                               Diffs),
+
+    Total = safe_div(A, T),
+    Lst1 = lists:reverse(Lst0),
+    Lst2 = case erlang:system_info(logical_processors_available) of
+               unknown -> Lst1;
+               LPA ->
+                   Weighted = Total * (N / LPA),
+                   [{weighted, Weighted, percent(Weighted)} | Lst1]
+           end,
+    [{total, Total, percent(Total)} | Lst2];
+
+utilization({scheduler_wall_time, _}=T0,
+            {scheduler_wall_time_all, Ts1}) ->
+    utilization(T0, {scheduler_wall_time, remove_io(Ts1)});
+
+utilization({scheduler_wall_time_all, Ts0},
+            {scheduler_wall_time, _}=T1) ->
+    utilization({scheduler_wall_time, remove_io(Ts0)}, T1).
+
+%% Do not include dirty-io in totals
+acc(io, _, _, Acc) ->
+    Acc;
+acc(Tag, Adiff, Tdiff, {Asum, Tsum, N}) when Tag =:= normal; Tag =:= cpu ->
+    {Adiff+Asum, Tdiff+Tsum, N+1}.
+
+
+remove_io(Ts) ->
+    lists:filter(fun({io,_,_,_}) -> false;
+                    (_) -> true end,
+                 Ts).
+
+safe_div(A, B) ->
+    if B == 0.0 -> 0.0;
+       true -> A / B
+    end.            
+
+sched_tag(Nr) ->
+    Normal = erlang:system_info(schedulers),
+    Cpu = Normal + erlang:system_info(dirty_cpu_schedulers),
+    case Nr of
+        _ when Nr =< Normal -> normal;
+        _ when Nr =< Cpu -> cpu;
+        _ -> io
+    end.
+
+
+percent(F) ->
+    float_to_list(F*100, [{decimals,1}]) ++ [$%].
diff --git a/lib/runtime_tools/src/system_information.erl b/lib/runtime_tools/src/system_information.erl
index 92109c9a74..136ee55b54 100644
--- a/lib/runtime_tools/src/system_information.erl
+++ b/lib/runtime_tools/src/system_information.erl
@@ -75,43 +75,37 @@ load_report(file, File)   -> load_report(data, from_file(File));
 load_report(data, Report) ->
     ok = start_internal(), gen_server:call(?SERVER, {load_report, Report}, infinity).
 
-report() -> [
-	{init_arguments,    init:get_arguments()},
-	{code_paths,        code:get_path()},
-	{code,              code()},
-	{system_info,       erlang_system_info()},
-	{erts_compile_info, erlang:system_info(compile_info)},
-	{beam_dynamic_libraries, get_dynamic_libraries()},
-	{environment_erts,  os_getenv_erts_specific()},
-	{environment,       [split_env(Env) || Env <- os:getenv()]},
-	{sanity_check,      sanity_check()}	     
-    ].
+report() ->
+    %% This is ugly but beats having to maintain two distinct implementations,
+    %% and we don't really care about memory use since it's internal and
+    %% undocumented.
+    {ok, Fd} = file:open([], [ram, read, write]),
+    to_fd(Fd),
+    {ok, _} = file:position(Fd, bof),
+    from_fd(Fd).
 
 -spec to_file(FileName) -> ok | {error, Reason} when
       FileName :: file:name_all(),
       Reason :: file:posix() | badarg | terminated | system_limit.
 
 to_file(File) ->
-    file:write_file(File, iolist_to_binary([
-		io_lib:format("{system_information_version, ~p}.~n", [
-			?REPORT_FILE_VSN
-		    ]),
-		io_lib:format("{system_information, ~p}.~n", [
-			report()
-		    ])
-	    ])).
+    case file:open(File, [raw, write, binary, delayed_write]) of
+        {ok, Fd} ->
+            try
+                to_fd(Fd)
+            after
+                file:close(Fd)
+            end;
+        {error, Reason} ->
+            {error, Reason}
+    end.
 
 from_file(File) ->
-    case file:consult(File) of
-	{ok, Data} ->
-	    case get_value([system_information_version], Data) of
-		?REPORT_FILE_VSN ->
-		    get_value([system_information], Data);
-		Vsn ->
-		    erlang:error({unknown_version, Vsn})
-	    end;
-	_ ->
-	    erlang:error(bad_report_file)
+    {ok, Fd} = file:open(File, [raw, read]),
+    try
+        from_fd(Fd)
+    after
+        file:close(Fd)
     end.
 
 applications() -> applications([]).
@@ -457,61 +451,151 @@ split_env([$=|Vs], Key) -> {lists:reverse(Key), Vs};
 split_env([I|Vs], Key)  -> split_env(Vs, [I|Key]);
 split_env([], KV)       -> lists:reverse(KV). % should not happen.
 
-%% get applications
+from_fd(Fd) ->
+    try
+        [{system_information_version, "1.0"},
+         {system_information, Data}] = consult_fd(Fd),
+        Data
+    catch
+        _:_ -> erlang:error(bad_report_file)
+    end.
 
-code() ->
-    % order is important
-    get_code_from_paths(code:get_path()).
+consult_fd(Fd) ->
+    consult_fd_1(Fd, [], {ok, []}).
+consult_fd_1(Fd, Cont0, ReadResult) ->
+    Data =
+        case ReadResult of
+            {ok, Characters} -> Characters;
+            eof -> eof
+        end,
+    case erl_scan:tokens(Cont0, Data, 1) of
+        {done, {ok, Tokens, _}, Next} ->
+            {ok, Term} = erl_parse:parse_term(Tokens),
+            [Term | consult_fd_1(Fd, [], {ok, Next})];
+        {more, Cont} ->
+            consult_fd_1(Fd, Cont, file:read(Fd, 1 bsl 20));
+        {done, {eof, _}, eof} -> []
+    end.
 
-get_code_from_paths([]) -> [];
-get_code_from_paths([Path|Paths]) ->
-    case is_application_path(Path) of
-	true -> 
-	    [{application, get_application_from_path(Path)}|get_code_from_paths(Paths)];
-	false ->
-	    [{code, [
-			{path,    Path},
-			{modules, get_modules_from_path(Path)}
-		    ]}|get_code_from_paths(Paths)]
+%%
+%% Dumps a system_information tuple to the given Fd, writing the term in chunks
+%% to avoid eating too much memory on large systems.
+%%
+
+to_fd(Fd) ->
+    EmitChunk =
+        fun(Format, Args) ->
+            ok = file:write(Fd, io_lib:format(Format, Args))
+        end,
+
+    EmitChunk("{system_information_version, ~w}.~n"
+              "{system_information,["
+                  "{init_arguments,~w},"
+                  "{code_paths,~w},",
+        [?REPORT_FILE_VSN,
+         init:get_arguments(),
+         code:get_path()]),
+
+    emit_code_info(EmitChunk),
+
+    EmitChunk(    ","  %% Note the leading comma!
+                  "{system_info,~w},"
+                  "{erts_compile_info,~w},"
+                  "{beam_dynamic_libraries,~w},"
+                  "{environment_erts,~w},"
+                  "{environment,~w},"
+                  "{sanity_check,~w}"
+              "]}.~n",
+        [erlang_system_info(),
+         erlang:system_info(compile_info),
+         get_dynamic_libraries(),
+         os_getenv_erts_specific(),
+         [split_env(Env) || Env <- os:getenv()],
+         sanity_check()]).
+
+%% Emits all modules/applications in the *code path order*
+emit_code_info(EmitChunk) ->
+    EmitChunk("{code, [", []),
+    comma_separated_foreach(EmitChunk,
+        fun(Path) ->
+            case is_application_path(Path) of
+                true -> emit_application_info(EmitChunk, Path);
+                false -> emit_code_path_info(EmitChunk, Path)
+            end
+        end, code:get_path()),
+    EmitChunk("]}", []).
+
+emit_application_info(EmitChunk, Path) ->
+    [Appfile|_] = filelib:wildcard(filename:join(Path, "*.app")),
+    case file:consult(Appfile) of
+        {ok, [{application, App, Info}]} ->
+            RtDeps = proplists:get_value(runtime_dependencies, Info, []),
+            Description = proplists:get_value(description, Info, []),
+            Version = proplists:get_value(vsn, Info, []),
+
+            EmitChunk("{application, {~w,["
+                          "{description,~w},"
+                          "{vsn,~w},"
+                          "{path,~w},"
+                          "{runtime_dependencies,~w},",
+                [App, Description, Version, Path, RtDeps]),
+            emit_module_info_from_path(EmitChunk, Path),
+            EmitChunk("]}}", [])
     end.
 
+emit_code_path_info(EmitChunk, Path) ->
+    EmitChunk("{code, ["
+                  "{path, ~w},", [Path]),
+    emit_module_info_from_path(EmitChunk, Path),
+    EmitChunk("]}", []).
+
+emit_module_info_from_path(EmitChunk, Path) ->
+    BeamFiles = filelib:wildcard(filename:join(Path, "*.beam")),
+
+    EmitChunk("{modules, [", []),
+    comma_separated_foreach(EmitChunk,
+        fun(Beam) ->
+            emit_module_info(EmitChunk, Beam)
+        end, BeamFiles),
+    EmitChunk("]}", []).
+
+emit_module_info(EmitChunk, Beam) ->
+    %% FIXME: The next three calls load *all* significant chunks onto the heap,
+    %% which may cause us to run out of memory if there's a huge module in the
+    %% code path.
+    {ok,{Mod, Md5}} = beam_lib:md5(Beam),
+
+    CompilerVersion = get_compiler_version(Beam),
+    Native = beam_is_native_compiled(Beam),
+
+    Loaded = case code:is_loaded(Mod) of
+        false -> false;
+        _     -> true
+    end,
+
+    EmitChunk("{~w,["
+                  "{loaded,~w},"
+                  "{native,~w},"
+                  "{compiler,~w},"
+                  "{md5,~w}"
+              "]}",
+        [Mod, Loaded, Native, CompilerVersion, hexstring(Md5)]).
+
+comma_separated_foreach(_EmitChunk, _Fun, []) ->
+    ok;
+comma_separated_foreach(_EmitChunk, Fun, [H]) ->
+    Fun(H);
+comma_separated_foreach(EmitChunk, Fun, [H | T]) ->
+    Fun(H),
+    EmitChunk(",", []),
+    comma_separated_foreach(EmitChunk, Fun, T).
+
 is_application_path(Path) ->
     case filelib:wildcard(filename:join(Path, "*.app")) of
 	[] -> false;
 	_  -> true
     end.
 
-get_application_from_path(Path) ->
-    [Appfile|_] = filelib:wildcard(filename:join(Path, "*.app")),
-    case file:consult(Appfile) of
-	{ok, [{application, App, Info}]} ->
-	    {App, [
-		    {description, proplists:get_value(description, Info, [])},
-		    {vsn,         proplists:get_value(vsn, Info, [])},
-		    {path,        Path},
-		    {runtime_dependencies,
-		     proplists:get_value(runtime_dependencies, Info, [])},
-		    {modules,     get_modules_from_path(Path)}
-		]}
-    end.
-
-get_modules_from_path(Path) ->
-    [ 
-	begin
-		{ok,{Mod, Md5}} = beam_lib:md5(Beam),
-		Loaded = case code:is_loaded(Mod) of
-		    false -> false;
-		    _     -> true
-		end,
-		{Mod, [
-			{loaded,   Loaded},
-			{native,   beam_is_native_compiled(Beam)},
-			{compiler, get_compiler_version(Beam)},
-			{md5,      hexstring(Md5)}
-		    ]}
-	end || Beam <- filelib:wildcard(filename:join(Path, "*.beam"))
-    ].
-
 hexstring(Bin) when is_binary(Bin) ->
     lists:flatten([io_lib:format("~2.16.0b", [V]) || <<V>> <= Bin]).
 
diff --git a/lib/runtime_tools/test/Makefile b/lib/runtime_tools/test/Makefile
index 61377ea09e..de37b2570d 100644
--- a/lib/runtime_tools/test/Makefile
+++ b/lib/runtime_tools/test/Makefile
@@ -9,6 +9,7 @@ MODULES =  \
 	system_information_SUITE \
 	dbg_SUITE \
 	erts_alloc_config_SUITE \
+	scheduler_SUITE \
 	msacc_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
diff --git a/lib/runtime_tools/test/scheduler_SUITE.erl b/lib/runtime_tools/test/scheduler_SUITE.erl
new file mode 100644
index 0000000000..1c80253371
--- /dev/null
+++ b/lib/runtime_tools/test/scheduler_SUITE.erl
@@ -0,0 +1,104 @@
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(scheduler_SUITE).
+
+-export([suite/0, all/0]).
+
+%% Test cases
+-export([basic/1]).
+
+all() -> [basic].
+
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+
+basic(_Config) ->
+    S1 = scheduler:sample(),
+    S2 = scheduler:sample_all(),
+
+    check(scheduler:utilization(1)),
+
+    check(scheduler:utilization(S1)),
+    check(scheduler:utilization(S2)),
+    check(scheduler:utilization(S1, scheduler:sample())),
+    check(scheduler:utilization(S2, scheduler:sample())),
+
+    S3 = scheduler:sample_all(),
+    U13 = scheduler:utilization(S1, S3),
+    U13 = scheduler:utilization(S1, remove_io(S3)),
+    check(U13),
+
+    U23all = scheduler:utilization(S2, S3),
+    check(U23all),
+    U23 = scheduler:utilization(S2, remove_io(S3)),
+    U23 = scheduler:utilization(remove_io(S2), S3),
+    U23 = remove_io(U23all),
+    check(U23),
+
+    ok.
+
+
+check([{total, Tf, Ts} | List]=U) ->
+    io:format("\nU = ~p\n", [U]),
+    check_values(Tf, Ts, true),
+
+    SchdList = case hd(List) of
+                   {weighted, Wf, Ws} ->
+                       check_values(Wf, Ws, false),
+                       tl(List);
+                   _ ->
+                       unknown = erlang:system_info(logical_processors_available),
+                       List
+               end,
+
+    lists:foreach(fun({Type, Id, F, S}) when ((Type =:= normal) or (Type =:= cpu) or (Type =:= io)),
+                                             is_integer(Id) ->
+                          check_values(F, S, true)
+                  end,
+                  SchdList),
+    ok.
+
+check_values(F, S, Max100) ->
+    true = is_float(F),
+    true = F >= 0.0,
+
+    $% = lists:last(S),
+    Sf = list_to_float(lists:droplast(S)),
+    true = Sf >= 0.0,
+    true = case Max100 of
+               true ->
+                   true = F =< 1.0,
+                   true = Sf =< 100.0;
+               false ->
+                   true
+           end,
+    MaxDiff = 0.055555555555555555,  %% change to 0.05 when float_to_list/2 is fixed
+    true = abs(F*100 - Sf) =< MaxDiff,
+    ok.
+
+
+remove_io({scheduler_wall_time_all,Lst}) ->
+    {scheduler_wall_time, remove_io(Lst)};
+remove_io(Lst) ->
+    lists:filter(fun({io,_,_,_}) -> false;
+                    (_) -> true end,
+                 Lst).
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index d8a4ede136..0dc6a48570 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.12.2
+RUNTIME_TOOLS_VSN = 1.12.4
diff --git a/lib/sasl/doc/src/Makefile b/lib/sasl/doc/src/Makefile
index 76746e44e7..baf563ca62 100644
--- a/lib/sasl/doc/src/Makefile
+++ b/lib/sasl/doc/src/Makefile
@@ -47,8 +47,7 @@ XML_REF6_FILES = sasl_app.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
 
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index b144122c4b..e532c3cd6f 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -31,6 +31,26 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
+<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>
diff --git a/lib/sasl/doc/src/release_handler.xml b/lib/sasl/doc/src/release_handler.xml
index 8f073807fb..975188f489 100644
--- a/lib/sasl/doc/src/release_handler.xml
+++ b/lib/sasl/doc/src/release_handler.xml
@@ -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/systools.xml b/lib/sasl/doc/src/systools.xml
index e7c3c499da..4842c732b1 100644
--- a/lib/sasl/doc/src/systools.xml
+++ b/lib/sasl/doc/src/systools.xml
@@ -349,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>
@@ -397,4 +398,3 @@ myapp-1/ebin/myapp.app
       <seealso marker="script"><c>script(4)</c></seealso></p>
   </section>
 </erlref>
-
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 391b1fb5cc..fa3182cc08 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -310,6 +310,7 @@ add_apply_upgrade(Script,Args) ->
 %%                  RelVsn/start.boot
 %%                         relup
 %%                         sys.config
+%%                         sys.config.src
 %%         erts-EVsn[/bin]
 %%-----------------------------------------------------------------
 
@@ -1501,7 +1502,7 @@ preloaded() ->
     [erl_prim_loader,erl_tracer,erlang,
      erts_code_purger,erts_dirty_process_code_checker,
      erts_internal,erts_literal_area_collector,
-     init,otp_ring0,prim_eval,prim_file,
+     init,otp_ring0,prim_buffer,prim_eval,prim_file,
      prim_inet,prim_zip,zlib].
 
 %%______________________________________________________________________
@@ -1552,6 +1553,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
@@ -1707,14 +1709,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]) ->
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 63b48e7a4e..edd2efdf05 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -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)).
@@ -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.
 
@@ -2568,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.
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index 07748d975f..c8b2f31120 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -67,7 +67,7 @@ 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,
+       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, [],
@@ -945,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
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index e980a42688..2488197ec5 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 3.1
+SASL_VSN = 3.1.1
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 6bdcae5dd7..1b5f94ed07 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,22 @@
   </header>
 
 
-  <section><title>SNMP 5.2.8</title>
+  <section><title>SNMP 5.2.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.2.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/snmp/doc/src/snmp_impl_example_agent.xml b/lib/snmp/doc/src/snmp_impl_example_agent.xml
index a86006a0a7..e576fa51f3 100644
--- a/lib/snmp/doc/src/snmp_impl_example_agent.xml
+++ b/lib/snmp/doc/src/snmp_impl_example_agent.xml
@@ -47,6 +47,7 @@
 EX1-MIB DEFINITIONS ::= BEGIN
  
           IMPORTS
+                  experimental   FROM RFC1155-SMI
                   RowStatus      FROM STANDARD-MIB
                   DisplayString  FROM RFC1213-MIB
                   OBJECT-TYPE    FROM RFC-1212
@@ -81,7 +82,7 @@ EX1-MIB DEFINITIONS ::= BEGIN
  
           FriendsEntry ::=
               SEQUENCE {
-            fIndex
+                   fIndex
                       INTEGER,
                    fName
                       DisplayString,
@@ -105,6 +106,7 @@ EX1-MIB DEFINITIONS ::= BEGIN
               DESCRIPTION
                       "Name of friend"
               ::= { friendsEntry 2 }
+
           fAddress OBJECT-TYPE
               SYNTAX  DisplayString (SIZE (0..255))
               ACCESS  read-write
@@ -112,6 +114,7 @@ EX1-MIB DEFINITIONS ::= BEGIN
               DESCRIPTION
                       "Address of friend"
               ::= { friendsEntry 3 }
+
            fStatus OBJECT-TYPE
               SYNTAX      RowStatus
               ACCESS      read-write
@@ -119,12 +122,13 @@ EX1-MIB DEFINITIONS ::= BEGIN
               DESCRIPTION
                       "The status of this conceptual row."
               ::= { friendsEntry 4 }
+
           fTrap TRAP-TYPE
               ENTERPRISE  example1
               VARIABLES   { myName, fIndex }
               DESCRIPTION
-                          "This trap is sent when something happens to
-         the friend specified by fIndex."
+                      "This trap is sent when something happens to
+                      the friend specified by fIndex."
               ::= 1
 END
     </code>
diff --git a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl b/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
index 24c14d86ea..6a3466b6e4 100644
--- a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
+++ b/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
@@ -88,8 +88,17 @@ groups() ->
     ].
 
 init_per_suite(Config) ->
-    [{agent_port, ?AGENT_PORT}, {manager_port, ?MANAGER_PORT} | Config].
-    
+    case re:run(os:cmd("snmpd -v"),"NET-SNMP", [{capture, first}]) of
+        nomatch ->
+            {skip, "snmpd is NOT NET-SNMP"};
+        {match, _} ->
+            case re:run(os:cmd("snmpd -v"),"5.4|5.6.2.1", [{capture, first}]) of
+                nomatch ->
+                    [{agent_port, ?AGENT_PORT}, {manager_port, ?MANAGER_PORT} | Config];
+                {match, _} ->
+                    {skip, "buggy snmpd"}
+            end
+    end.
 end_per_suite(_Config) ->
     ok.
 
@@ -322,7 +331,7 @@ snmpget(Oid, Transport, Config) ->
 
     Args =
 	["-c", "public", net_snmp_version(Versions),
-	 "-m", "",
+	 "-m", ":",
 	 "-Cf",
 	 net_snmp_addr_str(Transport),
 	 oid_str(Oid)],
@@ -353,11 +362,13 @@ start_snmpd(Community, SysDescr, Config) ->
 	["--rocommunity"++domain_suffix(Domain)++"="
 	 ++Community++" "++inet_parse:ntoa(Ip)
 	 || {Domain, {Ip, _}} <- Targets],
+
     SnmpdArgs =
-	["-f", "-r", %"-Dverbose",
-	 "-c", filename:join(DataDir, "snmpd.conf"),
-	 "-C", "-Lo",
-	 "-m", "",
+        ["-f", "-r", %"-Dverbose",
+         "-c", filename:join(DataDir, "snmpd.conf"),
+         "-C",
+         "-Lo",
+	 "-m", ":",
 	 "--sysDescr="++SysDescr,
 	 "--agentXSocket=tcp:localhost:"++integer_to_list(Port)]
 	++ CommunityArgs
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index ef48608bda..c195f9f5d9 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.2.8
+SNMP_VSN    = 5.2.9
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/Makefile b/lib/ssh/doc/src/Makefile
index e066b787f3..f54f5e0708 100644
--- a/lib/ssh/doc/src/Makefile
+++ b/lib/ssh/doc/src/Makefile
@@ -52,9 +52,9 @@ XML_PART_FILES = \
 		 usersguide.xml
 XML_CHAPTER_FILES = notes.xml \
 	introduction.xml \
-	ssh_protocol.xml \
 	using_ssh.xml \
 	configure_algos.xml
+#	ssh_protocol.xml \
 
 BOOK_FILES = book.xml
 
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index ef3e94a1e1..f5cb3ec254 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,8 +30,125 @@
     <file>notes.xml</file>
   </header>
 
-<section><title>Ssh 4.6.1</title>
+<section><title>Ssh 4.6.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Adjusted supervisor timeouts</p>
+          <p>
+	    Own Id: OTP-14907</p>
+        </item>
+        <item>
+          <p>
+	    Remove ERROR messages for slow process exits</p>
+          <p>
+	    Own Id: OTP-14930</p>
+        </item>
+      </list>
+    </section>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add option <c>save_accepted_host</c> to
+	    <c>ssh:connection</c>. This option, if set to false,
+	    inhibits saving host keys to e.g the file
+	    <c>known_hosts</c>.</p>
+          <p>
+	    Own Id: OTP-14935</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.6.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix problem with OpenSSH 7.2 (and later) clients that has
+	    used sha1 instead of sha2 for rsa-sha-256/512 user's
+	    public keys.</p>
+          <p>
+	    Own Id: OTP-14827 Aux Id: ERL-531 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.6.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Passphrase option for ecdsa public keys was missing.</p>
+          <p>
+	    Own Id: OTP-14602</p>
+        </item>
+      </list>
+    </section>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The host and user public key handling is hardened so that
+	    a faulty plugin can't deliver a key of wrong type.</p>
+          <p>
+	    Better checks in the server of the available hostkey's
+	    types at start and at each accept.</p>
+          <p>
+	    Better checks in the client of the available user public
+	    key types at connect.</p>
+          <p>
+	    Own Id: OTP-14676 Aux Id: ERIERL-52, OTP-14570 </p>
+        </item>
+        <item>
+          <p>
+	    SSH can now fetch the host key from the private keys
+	    stored in an Engine. See the crypto application for
+	    details about Engines.</p>
+          <p>
+	    Own Id: OTP-14757</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.6.2</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Trailing white space was removed at end of the
+	    hello-string. This caused interoperability problems with
+	    some other ssh-implementations (e.g OpenSSH 7.3p1 on
+	    Solaris 11)</p>
+          <p>
+	    Own Id: OTP-14763 Aux Id: ERIERL-74 </p>
+        </item>
+        <item>
+          <p>
+	    Fixes that tcp connections that was immediately closed
+	    (SYN, SYNACK, ACK, RST) by a client could be left in a
+	    zombie state.</p>
+          <p>
+	    Own Id: OTP-14778 Aux Id: ERIERL-104 </p>
+        </item>
+      </list>
+    </section>
 
+</section>
+
+<section><title>Ssh 4.6.1</title>
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
         <item>
@@ -286,6 +403,40 @@
 
 </section>
 
+
+<section><title>Ssh 4.4.2.2</title>
+    <section><title>Improvements and New Features</title>
+    <list>
+        <item>
+          <p>
+	    Default exec is disabled when a user-defined shell is
+	    enabled.</p>
+          <p>
+	    Own Id: OTP-14881</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+
+<section><title>Ssh 4.4.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Trailing white space was removed at end of the
+	    hello-string. This caused interoperability problems with
+	    some other ssh-implementations (e.g OpenSSH 7.3p1 on
+	    Solaris 11)</p>
+          <p>
+	    Own Id: OTP-14763 Aux Id: ERIERL-74 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -656,6 +807,93 @@
 
 </section>
 
+<section><title>Ssh 4.2.2.5</title>
+    <section><title>Improvements and New Features</title>
+    <list>
+        <item>
+          <p>
+	    Default exec is disabled when a user-defined shell is
+	    enabled.</p>
+          <p>
+	    Own Id: OTP-14881</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+
+<section><title>Ssh 4.2.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Trailing white space was removed at end of the
+	    hello-string. This caused interoperability problems with
+	    some other ssh-implementations (e.g OpenSSH 7.3p1 on
+	    Solaris 11)</p>
+          <p>
+	    Own Id: OTP-14763 Aux Id: ERIERL-74 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.2.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The key exchange algorithm
+	    diffie-hellman-group-exchange-sha* has a server-option
+	    <c>{dh_gex_limits,{Min,Max}}</c>. There was a hostkey
+	    signature validation error on the client side if the
+	    option was used and the <c>Min</c> or the <c>Max</c>
+	    differed from the corresponding values obtained from the
+	    client.</p>
+          <p>
+	    This bug is now corrected.</p>
+          <p>
+	    Own Id: OTP-14166</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Key exchange algorithms
+	    diffie-hellman-group-exchange-sha* optimized, up to a
+	    factor of 11 for the slowest ( = biggest and safest) one.</p>
+          <p>
+	    Own Id: OTP-14169 Aux Id: seq-13261 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.2.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Upgrade of an established client connection could crash
+	    because the ssh client supervisors children had wrong
+	    type. This is fixed now.</p>
+          <p>
+	    Own Id: OTP-13782 Aux Id: seq13158 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.2.2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 337f4094cc..acf94ff6af 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -227,6 +227,18 @@
               </item>
             </list>
 	  </item>
+
+	  <tag><c><![CDATA[{save_accepted_host, boolean()}]]></c></tag>
+	  <item>
+	    <p>If <c>true</c>, the client saves an accepted host key to avoid the
+	    accept question the next time the same host is connected. If the option
+	    <c>key_cb</c> is not present, the key is saved in the file "known_hosts".
+	    </p>
+	    <p>If <c>false</c>, the key is not saved and the key will still be unknown
+	    at the next access of the same host.
+	    </p>
+	  </item>
+
 	  <tag><c><![CDATA[{user_interaction, boolean()}]]></c></tag>
 	  <item>
 	    <p>If <c>false</c>, disables the client to connect to the server
diff --git a/lib/ssh/doc/src/ssh_client_key_api.xml b/lib/ssh/doc/src/ssh_client_key_api.xml
index a1cd9d4b02..98a1676ca4 100644
--- a/lib/ssh/doc/src/ssh_client_key_api.xml
+++ b/lib/ssh/doc/src/ssh_client_key_api.xml
@@ -56,11 +56,17 @@
       <tag><c>string() =</c></tag>
       <item><p><c>[byte()]</c></p></item>
       <tag><c>public_key() =</c></tag>
-      <item><p><c>#'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</c></p></item>
+      <item><p><c>#'RSAPublicKey'{} 
+      | {integer(),#'Dss-Parms'{}} 
+      | {#'ECPoint'{},{namedCurve,Curve::string()}}</c></p></item>
       <tag><c>private_key() =</c></tag>
-      <item><p><c>#'RSAPrivateKey'{} | #'DSAPrivateKey'{} | term()</c></p></item>
+      <item><p><c>#'RSAPrivateKey'{} 
+      | #'DSAPrivateKey'{} 
+      | #'ECPrivateKey'{}</c></p></item>      
       <tag><c>public_key_algorithm() =</c></tag>
-      <item><p><c>'ssh-rsa'| 'ssh-dss' | atom()</c></p></item>
+      <item><p><c>'ssh-rsa' | 'ssh-dss' 
+      | 'rsa-sha2-256' | 'rsa-sha2-384' | 'rsa-sha2-512' 
+      | 'ecdsa-sha2-nistp256' | 'ecdsa-sha2-nistp384' | 'ecdsa-sha2-nistp521' </c></p></item>
     </taglist>
   </section>
 
@@ -73,10 +79,11 @@
       <d>Description of the host that owns the <c>PublicKey</c>.</d>
 
       <v>Key = public_key()</v>
-      <d>Normally an RSA or DSA public key, but handling of other public keys can be added.</d>
+      <d>Normally an RSA, DSA or ECDSA public key, but handling of other public keys can be added.</d>
 
       <v>ConnectOptions = proplists:proplist()</v>
-      <d>Options provided to <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso></d>
+      <d>Options provided to <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso>. The option list given in
+	the <c>key_cb</c> option is available with the key <c>key_cb_private</c>.</d>
       <v>Reason = term().</v>
       </type>
       <desc>
@@ -89,17 +96,17 @@
       <fsummary>Checks if a host key is trusted.</fsummary>
       <type>
 	<v>Key = public_key() </v>
-	<d>Normally an RSA or DSA public key, but handling of other public keys can be added.</d>
+	<d>Normally an RSA, DSA or ECDSA public key, but handling of other public keys can be added.</d>
 
 	<v>Host = string()</v>
 	<d>Description of the host.</d>
 
 	<v>Algorithm = public_key_algorithm()</v>
-	<d>Host key algorithm. Is to support <c>'ssh-rsa'| 'ssh-dss'</c>, but more algorithms
-	can be handled.</d>
+	<d>Host key algorithm.</d>
 
 	<v>ConnectOptions = proplists:proplist() </v>
-	<d>Options provided to <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso>.</d>
+	<d>Options provided to <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso>. The option list given in
+	the <c>key_cb</c> option is available with the key <c>key_cb_private</c>.</d>
 
 	<v>Result = boolean()</v>
       </type>
@@ -110,15 +117,15 @@
 
     <func>
       <name>Module:user_key(Algorithm, ConnectOptions) ->
-      {ok,  PrivateKey}  | {error, Reason}</name>
+      {ok, PrivateKey}  | {error, Reason}</name>
       <fsummary>Fetches the users <em>public key</em> matching the <c>Algorithm</c>.</fsummary>
       <type>
 	<v>Algorithm = public_key_algorithm()</v>
-	<d>Host key algorithm. Is to support <c>'ssh-rsa'| 'ssh-dss'</c> but more algorithms
-	can be handled.</d>
+	<d>Host key algorithm.</d>
 
 	<v>ConnectOptions = proplists:proplist()</v>
-	<d>Options provided to <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso></d>
+	<d>Options provided to <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso>. The option list given in
+	the <c>key_cb</c> option is available with the key <c>key_cb_private</c>.</d>
 
 	<v>PrivateKey = private_key()</v>
 	<d>Private key of the user matching the <c>Algorithm</c>.</d>
diff --git a/lib/ssh/doc/src/ssh_server_key_api.xml b/lib/ssh/doc/src/ssh_server_key_api.xml
index a0694ca8d9..c6808b95d1 100644
--- a/lib/ssh/doc/src/ssh_server_key_api.xml
+++ b/lib/ssh/doc/src/ssh_server_key_api.xml
@@ -57,11 +57,17 @@
       <tag><c>string() =</c></tag>
       <item><p><c>[byte()]</c></p></item>
       <tag><c>public_key() =</c></tag>
-      <item><p><c>#'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</c></p></item>
+      <item><p><c>#'RSAPublicKey'{} 
+      | {integer(),#'Dss-Parms'{}} 
+      | {#'ECPoint'{},{namedCurve,Curve::string()}}</c></p></item>
       <tag><c>private_key() =</c></tag>
-      <item><p><c>#'RSAPrivateKey'{} | #'DSAPrivateKey'{} | term()</c></p></item>
+      <item><p><c>#'RSAPrivateKey'{} 
+      | #'DSAPrivateKey'{} 
+      | #'ECPrivateKey'{}</c></p></item>      
       <tag><c>public_key_algorithm() =</c></tag>
-      <item><p><c>'ssh-rsa'| 'ssh-dss' | atom()</c></p></item>
+      <item><p><c>'ssh-rsa' | 'ssh-dss' 
+      | 'rsa-sha2-256' | 'rsa-sha2-384' | 'rsa-sha2-512'
+      | 'ecdsa-sha2-nistp256' | 'ecdsa-sha2-nistp384' | 'ecdsa-sha2-nistp521' </c></p></item>
     </taglist>
   </section>
   
@@ -72,12 +78,13 @@
       <fsummary>Fetches the host’s private key.</fsummary>
       <type>
 	<v>Algorithm = public_key_algorithm()</v>
-	<d>Host key algorithm. Is to support <c>'ssh-rsa' | 'ssh-dss'</c>, but more algorithms
-	can be handled.</d>
+	<d>Host key algorithm.</d>
 	<v>DaemonOptions = proplists:proplist()</v>
-	<d>Options provided to <seealso marker="ssh#daemon-2">ssh:daemon/[2,3]</seealso>.</d>
-	<v>Key = private_key()</v>
-	<d>Private key of the host matching the <c>Algorithm</c>.</d>
+	<d>Options provided to <seealso marker="ssh#daemon-2">ssh:daemon/[2,3]</seealso>. The option list given in
+	the <c>key_cb</c> option is available with the key <c>key_cb_private</c>.</d>
+	<v>Key = private_key() | crypto:engine_key_ref()</v>
+	<d>Private key of the host matching the <c>Algorithm</c>.
+	It may be a reference to a 'ssh-rsa', rsa-sha2-* or 'ssh-dss' (NOT ecdsa) key stored in a loaded Engine.</d>
 	<v>Reason = term()</v>
       </type>
       <desc>
@@ -90,11 +97,12 @@
       <fsummary>Checks if the user key is authorized.</fsummary>
       <type>
 	<v>Key = public_key()</v>
-	<d>Normally an RSA or DSA public key, but handling of other public keys can be added</d>
+	<d>Normally an RSA, DSA or ECDSA public key, but handling of other public keys can be added</d>
 	<v>User = string()</v>
 	<d>User owning the public key.</d>
 	<v>DaemonOptions = proplists:proplist()</v>
-	<d>Options provided to  <seealso marker="ssh#daemon-2">ssh:daemon/[2,3]</seealso>.</d>
+	<d>Options provided to <seealso marker="ssh#daemon-2">ssh:daemon/[2,3]</seealso>. The option list given in
+	the <c>key_cb</c> option is available with the key <c>key_cb_private</c>.</d>
 	<v>Result = boolean()</v>
       </type>
       <desc>
diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml
index ed7fbf9cf3..129426a6d5 100644
--- a/lib/ssh/doc/src/ssh_sftp.xml
+++ b/lib/ssh/doc/src/ssh_sftp.xml
@@ -464,11 +464,16 @@
         <v>FileInfo = record()</v>
       </type>
       <desc>
-        <p>Returns a <c><![CDATA[file_info]]></c> record from the file specified by
+        <p>Returns a <c><![CDATA[file_info]]></c> record from the file system object specified by
           <c><![CDATA[Name]]></c> or <c><![CDATA[Handle]]></c>. See
 	<seealso marker="kernel:file#read_file_info-2">file:read_file_info/2</seealso>
 	for information about the record.
 	</p>
+	<p>
+	  Depending on the underlying OS:es links might be followed and info on the final file, directory
+	  etc is returned. See <seealso marker="#read_link_info-2">ssh_sftp::read_link_info/2</seealso>
+	  on how to get information on links instead.
+	</p>
       </desc>
     </func>
 
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 974292fde1..4a22322333 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -42,10 +42,10 @@
   {env, []},
   {mod, {ssh_app, []}},
   {runtime_dependencies, [
-			  "crypto-3.7.3",
+			  "crypto-4.2",
 			  "erts-6.0",
 			  "kernel-3.0",
-			  "public_key-1.4",
+			  "public_key-1.5.2",
 			  "stdlib-3.3"
 			 ]}]}.
 
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 032d87bdad..25d537c624 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -184,7 +184,6 @@ channel_info(ConnectionRef, ChannelId, Options) ->
 daemon(Port) ->
     daemon(Port, []).
 
-
 daemon(Socket, UserOptions) when is_port(Socket) ->
     try
         #{} = Options = ssh_options:handle_options(server, UserOptions),
@@ -267,8 +266,6 @@ daemon(Host0, Port0, UserOptions0) when 0 =< Port0, Port0 =< 65535,
 daemon(_, _, _) ->
     {error, badarg}.
 
-
-
 %%--------------------------------------------------------------------
 -spec daemon_info(daemon_ref()) -> ok_error( [{atom(), term()}] ).
 
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl
index d6d412db43..4711f54fb5 100644
--- a/lib/ssh/src/ssh.hrl
+++ b/lib/ssh/src/ssh.hrl
@@ -35,6 +35,8 @@
 
 -define(DEFAULT_TRANSPORT,  {tcp, gen_tcp, tcp_closed} ).
 
+-define(DEFAULT_SHELL, {shell, start, []} ).
+
 -define(MAX_RND_PADDING_LEN, 15).
 
 -define(SUPPORTED_AUTH_METHODS, "publickey,keyboard-interactive,password").
@@ -63,8 +65,8 @@
 -define(uint16(X), << ?UINT16(X) >> ).
 -define(uint32(X), << ?UINT32(X) >> ).
 -define(uint64(X), << ?UINT64(X) >> ).
--define(string(X), << ?STRING(list_to_binary(X)) >> ).
 -define(string_utf8(X), << ?STRING(unicode:characters_to_binary(X)) >> ).
+-define(string(X), ?string_utf8(X)).
 -define(binary(X), << ?STRING(X) >>).
 
 %% Cipher details
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl
index d66a34c58a..27d4242dd4 100644
--- a/lib/ssh/src/ssh_acceptor.erl
+++ b/lib/ssh/src/ssh_acceptor.erl
@@ -86,7 +86,8 @@ acceptor_init(Parent, Port, Address, Opts, AcceptTimeout) ->
                     acceptor_loop(Callback, Port, Address, Opts, LSock, AcceptTimeout);
 
                 {error,_} -> % Not open, a restart
-                    {ok,NewLSock} = listen(Port, Opts),
+                    %% Allow gen_tcp:listen to fail 4 times if eaddrinuse:
+                    {ok,NewLSock} = try_listen(Port, Opts, 4),
                     proc_lib:init_ack(Parent, {ok, self()}),
                     Opts1 = ?DELETE_INTERNAL_OPT(lsocket, Opts),
                     {_, Callback, _} =  ?GET_OPT(transport, Opts1),
@@ -98,6 +99,19 @@ acceptor_init(Parent, Port, Address, Opts, AcceptTimeout) ->
     end.
 
 
+try_listen(Port, Opts, NtriesLeft) ->
+    try_listen(Port, Opts, 1, NtriesLeft).
+
+try_listen(Port, Opts, N, Nmax) ->
+    case listen(Port, Opts) of
+        {error,eaddrinuse} when N<Nmax ->
+            timer:sleep(10*N), % Sleep 10, 20, 30,... ms
+            try_listen(Port, Opts, N+1, Nmax);
+        Other ->
+            Other
+    end.
+
+
 request_ownership(LSock, SockOwner) ->
     SockOwner ! {request_control,LSock,self()},
     receive
diff --git a/lib/ssh/src/ssh_acceptor_sup.erl b/lib/ssh/src/ssh_acceptor_sup.erl
index a24664793b..fc564a359b 100644
--- a/lib/ssh/src/ssh_acceptor_sup.erl
+++ b/lib/ssh/src/ssh_acceptor_sup.erl
@@ -86,10 +86,7 @@ child_spec(Address, Port, Profile, Options) ->
     Timeout = ?GET_INTERNAL_OPT(timeout, Options, ?DEFAULT_TIMEOUT),
     #{id       => id(Address, Port, Profile),
       start    => {ssh_acceptor, start_link, [Port, Address, Options, Timeout]},
-      restart  => transient,
-      shutdown => 5500, %brutal_kill,
-      type     => worker,
-      modules  => [ssh_acceptor]
+      restart  => transient % because a crashed listener could be replaced by a new one
      }.
 
 id(Address, Port, Profile) ->
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index 894877f8bf..03d264745b 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -304,11 +304,10 @@ handle_userauth_request(#ssh_msg_userauth_request{user = User,
 							   SigWLen/binary>>
 						 }, 
 			SessionId, 
-			#ssh{opts = Opts,
-			     userauth_supported_methods = Methods} = Ssh) ->
+			#ssh{userauth_supported_methods = Methods} = Ssh) ->
     
     case verify_sig(SessionId, User, "ssh-connection", 
-		    BAlg, KeyBlob, SigWLen, Opts) of
+		    BAlg, KeyBlob, SigWLen, Ssh) of
 	true ->
 	    {authorized, User, 
 	     ssh_transport:ssh_packet(
@@ -518,7 +517,7 @@ pre_verify_sig(User, KeyBlob, Opts) ->
 	    false
     end.
 
-verify_sig(SessionId, User, Service, AlgBin, KeyBlob, SigWLen, Opts) ->
+verify_sig(SessionId, User, Service, AlgBin, KeyBlob, SigWLen, #ssh{opts = Opts} = Ssh) ->
     try
         Alg = binary_to_list(AlgBin),
         {KeyCb,KeyCbOpts} = ?GET_OPT(key_cb, Opts),
@@ -529,7 +528,7 @@ verify_sig(SessionId, User, Service, AlgBin, KeyBlob, SigWLen, Opts) ->
         <<?UINT32(AlgSigLen), AlgSig:AlgSigLen/binary>> = SigWLen,
         <<?UINT32(AlgLen), _Alg:AlgLen/binary,
           ?UINT32(SigLen), Sig:SigLen/binary>> = AlgSig,
-        ssh_transport:verify(PlainText, ssh_transport:sha(Alg), Sig, Key)
+        ssh_transport:verify(PlainText, ssh_transport:sha(Alg), Sig, Key, Ssh)
     catch
 	_:_ ->
 	    false
diff --git a/lib/ssh/src/ssh_channel_sup.erl b/lib/ssh/src/ssh_channel_sup.erl
index 6b01dc334d..8444533fd1 100644
--- a/lib/ssh/src/ssh_channel_sup.erl
+++ b/lib/ssh/src/ssh_channel_sup.erl
@@ -26,7 +26,7 @@
 
 -behaviour(supervisor).
 
--export([start_link/1, start_child/2]).
+-export([start_link/1, start_child/5]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -37,7 +37,14 @@
 start_link(Args) ->
     supervisor:start_link(?MODULE, [Args]).
 
-start_child(Sup, ChildSpec) ->
+start_child(Sup, Callback, Id, Args, Exec) ->
+    ChildSpec =
+        #{id       => make_ref(),
+          start    => {ssh_channel, start_link, [self(), Id, Callback, Args, Exec]},
+          restart  => temporary,
+          type     => worker,
+          modules  => [ssh_channel]
+         },
     supervisor:start_child(Sup, ChildSpec).
 
 %%%=========================================================================
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index 62854346b0..958c342f5f 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -127,7 +127,8 @@ handle_ssh_msg({ssh_cm, ConnectionHandler,
 			cm = ConnectionHandler}};
 
 handle_ssh_msg({ssh_cm, ConnectionHandler,
-		{exec, ChannelId, WantReply, Cmd}}, #state{exec=undefined} = State) ->
+		{exec, ChannelId, WantReply, Cmd}}, #state{exec=undefined,
+                                                           shell=?DEFAULT_SHELL} = State) ->
     {Reply, Status} = exec(Cmd),
     write_chars(ConnectionHandler,
 		ChannelId, io_lib:format("~p\n", [Reply])),
@@ -136,6 +137,15 @@ handle_ssh_msg({ssh_cm, ConnectionHandler,
     ssh_connection:exit_status(ConnectionHandler, ChannelId, Status),
     ssh_connection:send_eof(ConnectionHandler, ChannelId),
     {stop, ChannelId, State#state{channel = ChannelId, cm = ConnectionHandler}};
+
+handle_ssh_msg({ssh_cm, ConnectionHandler,
+		{exec, ChannelId, WantReply, _Cmd}}, #state{exec = undefined} = State) ->
+    write_chars(ConnectionHandler, ChannelId, 1, "Prohibited.\n"),
+    ssh_connection:reply_request(ConnectionHandler, WantReply, success, ChannelId),
+    ssh_connection:exit_status(ConnectionHandler, ChannelId, 255),
+    ssh_connection:send_eof(ConnectionHandler, ChannelId),
+    {stop, ChannelId, State#state{channel = ChannelId, cm = ConnectionHandler}};
+
 handle_ssh_msg({ssh_cm, ConnectionHandler,
 		{exec, ChannelId, WantReply, Cmd}}, State) ->
     NewState = start_shell(ConnectionHandler, Cmd, State),
@@ -453,11 +463,14 @@ move_cursor(From, To, #ssh_pty{width=Width, term=Type}) ->
 %% %%% make sure that there is data to send
 %% %%% before calling ssh_connection:send
 write_chars(ConnectionHandler, ChannelId, Chars) ->
+    write_chars(ConnectionHandler, ChannelId, ?SSH_EXTENDED_DATA_DEFAULT, Chars).
+
+write_chars(ConnectionHandler, ChannelId, Type, Chars) ->
     case has_chars(Chars) of
         false -> ok;
         true -> ssh_connection:send(ConnectionHandler,
                                     ChannelId,
-                                    ?SSH_EXTENDED_DATA_DEFAULT,
+                                    Type,
                                     Chars)
     end.
 
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 7e9ee78fd2..946ae2967b 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -812,22 +812,20 @@ start_channel(Cb, Id, Args, SubSysSup, Opts) ->
     start_channel(Cb, Id, Args, SubSysSup, undefined, Opts).
 
 start_channel(Cb, Id, Args, SubSysSup, Exec, Opts) ->
-    ChildSpec = child_spec(Cb, Id, Args, Exec),
     ChannelSup = ssh_subsystem_sup:channel_supervisor(SubSysSup),
-    assert_limit_num_channels_not_exceeded(ChannelSup, Opts),
-    ssh_channel_sup:start_child(ChannelSup, ChildSpec).
+    case max_num_channels_not_exceeded(ChannelSup, Opts) of
+        true ->
+            ssh_channel_sup:start_child(ChannelSup, Cb, Id, Args, Exec);
+        false ->
+	    throw(max_num_channels_exceeded)
+    end.
     
-assert_limit_num_channels_not_exceeded(ChannelSup, Opts) ->
+max_num_channels_not_exceeded(ChannelSup, Opts) ->
     MaxNumChannels = ?GET_OPT(max_channels, Opts),
     NumChannels = length([x || {_,_,worker,[ssh_channel]} <- 
 				   supervisor:which_children(ChannelSup)]),
-    if 
-	%% Note that NumChannels is BEFORE starting a new one
-	NumChannels < MaxNumChannels ->
-	    ok;
-	true ->
-	    throw(max_num_channels_exceeded)
-    end.
+    %% Note that NumChannels is BEFORE starting a new one
+    NumChannels < MaxNumChannels.
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -874,14 +872,6 @@ check_subsystem(SsName, Options) ->
 	    Value
     end.
 
-child_spec(Callback, Id, Args, Exec) ->
-    Name = make_ref(),
-    StartFunc = {ssh_channel, start_link, [self(), Id, Callback, Args, Exec]},
-    Restart = temporary, 
-    Shutdown = 3600,
-    Type = worker,
-    {Name, StartFunc, Restart, Shutdown, Type, [ssh_channel]}.
-
 start_cli(#connection{cli_spec = no_cli}, _) ->
     {error, cli_disabled};
 start_cli(#connection{options = Options,
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 802bf62570..e11d3adee4 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -325,23 +325,32 @@ renegotiate_data(ConnectionHandler) ->
 %% Internal process state
 %%====================================================================
 -record(data, {
-	  starter                               :: pid(),
+	  starter                               :: pid()
+						 | undefined,
 	  auth_user                             :: string()
 						 | undefined,
 	  connection_state                      :: #connection{},
-	  latest_channel_id         = 0         :: non_neg_integer(),
+	  latest_channel_id         = 0         :: non_neg_integer()
+                                                 | undefined,
 	  idle_timer_ref                        :: undefined 
 						 | infinity
 						 | reference(),
 	  idle_timer_value          = infinity  :: infinity
 						 | pos_integer(),
-	  transport_protocol                    :: atom(),	% ex: tcp
-	  transport_cb                          :: atom(),	% ex: gen_tcp
-	  transport_close_tag                   :: atom(),	% ex: tcp_closed
-	  ssh_params                            :: #ssh{},
-	  socket                                :: inet:socket(),
-	  decrypted_data_buffer     = <<>>      :: binary(),
-	  encrypted_data_buffer     = <<>>      :: binary(),
+	  transport_protocol                    :: atom()
+                                                 | undefined,	% ex: tcp
+	  transport_cb                          :: atom()
+                                                 | undefined,	% ex: gen_tcp
+	  transport_close_tag                   :: atom()
+                                                 | undefined,	% ex: tcp_closed
+	  ssh_params                            :: #ssh{}
+                                                 | undefined,
+	  socket                                :: inet:socket()
+                                                 | undefined,
+	  decrypted_data_buffer     = <<>>      :: binary()
+                                                 | undefined,
+	  encrypted_data_buffer     = <<>>      :: binary()
+                                                 | undefined,
 	  undecrypted_packet_length             :: undefined | non_neg_integer(),
 	  key_exchange_init_msg                 :: #ssh_msg_kexinit{}
 						 | undefined,
@@ -370,16 +379,17 @@ init_connection_handler(Role, Socket, Opts) ->
                                   StartState,
                                   D);
 
-        {stop, enotconn} ->
-	    %% Handles the abnormal sequence:
-	    %%    SYN->
-	    %%            <-SYNACK
-	    %%    ACK->
-	    %%    RST->
-	    exit({shutdown, "TCP connection to server was prematurely closed by the client"});
-        
-	{stop, OtherError} ->
-	    exit({shutdown, {init,OtherError}})
+        {stop, Error} ->
+            Sups = ?GET_INTERNAL_OPT(supervisors, Opts),
+            C = #connection{system_supervisor =     proplists:get_value(system_sup,     Sups),
+                            sub_system_supervisor = proplists:get_value(subsystem_sup,  Sups),
+                            connection_supervisor = proplists:get_value(connection_sup, Sups)
+                           },
+            gen_statem:enter_loop(?MODULE,
+                                  [],
+                                  {init_error,Error},
+                                  #data{connection_state=C,
+                                        socket=Socket})
     end.
 
 
@@ -531,6 +541,21 @@ renegotiation(_) -> false.
 callback_mode() ->
     handle_event_function.
 
+
+handle_event(_, _Event, {init_error,Error}, _) ->
+    case Error of
+        enotconn ->
+           %% Handles the abnormal sequence:
+           %%    SYN->
+           %%            <-SYNACK
+           %%    ACK->
+           %%    RST->
+            {stop, {shutdown,"TCP connenction to server was prematurely closed by the client"}};
+
+        OtherError ->
+            {stop, {shutdown,{init,OtherError}}}
+    end;
+
 %%% ######## {hello, client|server} ####
 %% The very first event that is sent when the we are set as controlling process of Socket
 handle_event(_, socket_control, {hello,_}, D) ->
@@ -1149,17 +1174,25 @@ handle_event({call,_}, _, StateName, _) when not ?CONNECTED(StateName) ->
 
 handle_event({call,From}, {request, ChannelPid, ChannelId, Type, Data, Timeout}, StateName, D0) 
   when ?CONNECTED(StateName) ->
-    D = handle_request(ChannelPid, ChannelId, Type, Data, true, From, D0),
-    %% Note reply to channel will happen later when reply is recived from peer on the socket
-    start_channel_request_timer(ChannelId, From, Timeout),
-    {keep_state, cache_request_idle_timer_check(D)};
+    case handle_request(ChannelPid, ChannelId, Type, Data, true, From, D0) of
+        {error,Error} ->
+            {keep_state, D0, {reply,From,{error,Error}}};
+        D ->
+            %% Note reply to channel will happen later when reply is recived from peer on the socket
+            start_channel_request_timer(ChannelId, From, Timeout),
+            {keep_state, cache_request_idle_timer_check(D)}
+    end;
 
 handle_event({call,From}, {request, ChannelId, Type, Data, Timeout}, StateName, D0) 
   when ?CONNECTED(StateName) ->
-    D = handle_request(ChannelId, Type, Data, true, From, D0),
-    %% Note reply to channel will happen later when reply is recived from peer on the socket
-    start_channel_request_timer(ChannelId, From, Timeout),
-    {keep_state, cache_request_idle_timer_check(D)};
+    case handle_request(ChannelId, Type, Data, true, From, D0) of
+        {error,Error} ->
+            {keep_state, D0, {reply,From,{error,Error}}};
+        D ->
+            %% Note reply to channel will happen later when reply is recived from peer on the socket
+            start_channel_request_timer(ChannelId, From, Timeout),
+            {keep_state, cache_request_idle_timer_check(D)}
+    end;
 
 handle_event({call,From}, {data, ChannelId, Type, Data, Timeout}, StateName, D0) 
   when ?CONNECTED(StateName) ->
@@ -1435,13 +1468,12 @@ terminate(shutdown, StateName, State0) ->
 		     State0),
     finalize_termination(StateName, State);
 
-%% terminate({shutdown,Msg}, StateName, State0) when is_record(Msg,ssh_msg_disconnect)->
-%%     State = send_msg(Msg, State0),
-%%     finalize_termination(StateName, Msg, State);
-
 terminate({shutdown,_R}, StateName, State) ->
     finalize_termination(StateName, State);
 
+terminate(kill, StateName, State) ->
+    finalize_termination(StateName, State);
+
 terminate(Reason, StateName, State0) ->
     %% Others, e.g  undef, {badmatch,_}
     log_error(Reason),
@@ -1749,21 +1781,31 @@ is_usable_user_pubkey(A, Ssh) ->
 %%%----------------------------------------------------------------
 handle_request(ChannelPid, ChannelId, Type, Data, WantReply, From, D) ->
     case ssh_channel:cache_lookup(cache(D), ChannelId) of
-	#channel{remote_id = Id} = Channel ->
+	#channel{remote_id = Id,
+                 sent_close = false} = Channel ->
 	    update_sys(cache(D), Channel, Type, ChannelPid),
 	    send_msg(ssh_connection:channel_request_msg(Id, Type, WantReply, Data),
 		     add_request(WantReply, ChannelId, From, D));
-	undefined ->
-	    D
+
+        _ when WantReply==true ->
+            {error,closed};
+
+        _ ->
+            D
     end.
 
 handle_request(ChannelId, Type, Data, WantReply, From, D) ->
     case ssh_channel:cache_lookup(cache(D), ChannelId) of
-	#channel{remote_id = Id} ->
+	#channel{remote_id = Id,
+                 sent_close = false} ->
 	    send_msg(ssh_connection:channel_request_msg(Id, Type, WantReply, Data),
 		     add_request(WantReply, ChannelId, From, D));
-	undefined ->
-	    D
+
+	_ when WantReply==true ->
+            {error,closed};
+        
+        _ ->
+            D
     end.
 
 %%%----------------------------------------------------------------
diff --git a/lib/ssh/src/ssh_connection_sup.erl b/lib/ssh/src/ssh_connection_sup.erl
index 60ee8b7c73..2e8450090a 100644
--- a/lib/ssh/src/ssh_connection_sup.erl
+++ b/lib/ssh/src/ssh_connection_sup.erl
@@ -52,10 +52,7 @@ init(_) ->
                 },
     ChildSpecs = [#{id       => undefined, % As simple_one_for_one is used.
                     start    => {ssh_connection_handler, start_link, []},
-                    restart  => temporary,
-                    shutdown => 4000,
-                    type     => worker,
-                    modules  => [ssh_connection_handler]
+                    restart  => temporary % because there is no way to restart a crashed connection
                    }
                  ],
     {ok, {SupFlags,ChildSpecs}}.
diff --git a/lib/ssh/src/ssh_dbg.erl b/lib/ssh/src/ssh_dbg.erl
index af9ad52d68..eb2c2848f3 100644
--- a/lib/ssh/src/ssh_dbg.erl
+++ b/lib/ssh/src/ssh_dbg.erl
@@ -146,7 +146,26 @@ msg_formater(msg, {trace_ts,_Pid,return_from,{ssh_message,encode,1},_Res,_TS}, D
 msg_formater(msg, {trace_ts,_Pid,call,{ssh_message,decode,_},_TS}, D) ->
     D;
 msg_formater(msg, {trace_ts,Pid,return_from,{ssh_message,decode,1},Msg,TS}, D) -> 
-    fmt("~n~s ~p RECV ~s~n", [ts(TS),Pid,wr_record(shrink_bin(Msg))], D);
+    Extra =
+        case Msg of
+            #ssh_msg_userauth_info_request{data = D0} ->
+                try ssh_message:decode_keyboard_interactive_prompts(D0, [])
+                of
+                    Acc ->
+                        io_lib:format("  -- decoded data:~n", []) ++
+                        element(1,
+                                lists:mapfoldl(
+                                  fun({Prompt,Echo}, N) ->
+                                          {io_lib:format("     prompt[~p]: \"~s\" (echo=~p)~n",[N,Prompt,Echo]), N+1}
+                                  end, 1, Acc))
+                catch
+                    _:_ ->
+                        ""
+                end;
+            _ ->
+                ""
+        end,
+    fmt("~n~s ~p RECV ~s~s~n", [ts(TS),Pid,wr_record(shrink_bin(Msg)),Extra], D);
 
 msg_formater(_auth, {trace_ts,Pid,return_from,{ssh_message,decode,1},#ssh_msg_userauth_failure{authentications=As},TS}, D) -> 
     fmt("~n~s ~p Client login FAILURE. Try ~s~n", [ts(TS),Pid,As], D);
@@ -232,21 +251,22 @@ msg_formater(_, {trace_ts,Pid,return_from, {ssh_transport,known_host_key,3}, Res
     end;
 
 msg_formater(_, {trace_ts,Pid,call,{ssh_auth,publickey_msg,[[SigAlg,#ssh{user=User}]]},TS}, D) ->
-     fmt("~n~s ~p Client will try to login user ~p with public key algorithm ~p~n", [ts(TS),Pid,User,SigAlg], D);
+     fmt("~n~s ~p Client will try to login user ~p with method: public key algorithm ~p~n", [ts(TS),Pid,User,SigAlg], D);
 msg_formater(_, {trace_ts,Pid,return_from,{ssh_auth,publickey_msg,1},{not_ok,#ssh{user=User}},TS}, D) ->
-     fmt("~s ~p User ~p can't login with that kind of public key~n", [ts(TS),Pid,User], D);
-msg_formater(_, {trace_ts,Pid,return_from,{ssh_auth,publickey_msg,1},{_,#ssh{user=User}},TS}, D) ->
-     fmt("~s ~p User ~p logged in~n", [ts(TS),Pid,User], D);
+     fmt("~s ~p User ~p can't use that kind of public key~n", [ts(TS),Pid,User], D);
+msg_formater(_, {trace_ts,_Pid,return_from,{ssh_auth,publickey_msg,1},_,_TS}, D) -> D;
 
 msg_formater(_, {trace_ts,Pid,call,{ssh_auth,password_msg,[[#ssh{user=User}]]},TS}, D) ->
-     fmt("~n~s ~p Client will try to login user ~p with password~n", [ts(TS),Pid,User], D);
+     fmt("~n~s ~p Client will try to login user ~p with method: password~n", [ts(TS),Pid,User], D);
 msg_formater(_, {trace_ts,Pid,return_from,{ssh_auth,password_msg,1},{not_ok,#ssh{user=User}},TS}, D) ->
-     fmt("~s ~p User ~p can't login with password~n", [ts(TS),Pid,User], D);
+     fmt("~s ~p User ~p can't use method password as login method~n", [ts(TS),Pid,User], D);
+msg_formater(_, {trace_ts,_Pid,return_from,{ssh_auth,password_msg,1},_Result,_TS}, D) -> D;
 
 msg_formater(_, {trace_ts,Pid,call,{ssh_auth,keyboard_interactive_msg,[[#ssh{user=User}]]},TS}, D) ->
-     fmt("~n~s ~p Client will try to login user ~p with password~n", [ts(TS),Pid,User], D);
+     fmt("~n~s ~p Client will try to login user ~p with method: keyboard-interactive~n", [ts(TS),Pid,User], D);
 msg_formater(_, {trace_ts,Pid,return_from,{ssh_auth,keyboard_interactive_msg,1},{not_ok,#ssh{user=User}},TS}, D) ->
-     fmt("~s ~p User ~p can't login with keyboard_interactive password~n", [ts(TS),Pid,User], D);
+     fmt("~s ~p User ~p can't use method keyboard-interactive as login method~n", [ts(TS),Pid,User], D);
+msg_formater(_, {trace_ts,_Pid,return_from,{ssh_auth,keyboard_interactive_msg,1},_Result,_TS}, D) -> D;
 
 msg_formater(msg, {trace_ts,Pid,send,{tcp,Sock,Bytes},Pid,TS}, D) ->
     fmt("~n~s ~p TCP SEND on ~p~n ~p~n", [ts(TS),Pid,Sock, shrink_bin(Bytes)], D);
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl
index 68c99743ee..1e10f72956 100644
--- a/lib/ssh/src/ssh_options.erl
+++ b/lib/ssh/src/ssh_options.erl
@@ -268,7 +268,7 @@ default(server) ->
            },
 
       {shell, def} =>
-          #{default => {shell, start, []},
+          #{default => ?DEFAULT_SHELL,
             chk => fun({M,F,A}) -> is_atom(M) andalso is_atom(F) andalso is_list(A);
                       (V) -> check_function1(V) orelse check_function2(V)
                    end,
@@ -439,6 +439,12 @@ default(client) ->
             class => user_options
            },
 
+      {save_accepted_host, def} =>
+          #{default => true,
+            chk => fun erlang:is_boolean/1,
+            class => user_options
+           },
+
       {pref_public_key_algs, def} =>
           #{default => ssh_transport:default_algorithms(public_key),
             chk => fun check_pref_public_key_algs/1,
diff --git a/lib/ssh/src/ssh_subsystem_sup.erl b/lib/ssh/src/ssh_subsystem_sup.erl
index 8db051095c..77da240a66 100644
--- a/lib/ssh/src/ssh_subsystem_sup.erl
+++ b/lib/ssh/src/ssh_subsystem_sup.erl
@@ -74,18 +74,14 @@ ssh_connection_child_spec(Role, Address, Port, _Profile, Options) ->
     #{id       => id(Role, ssh_connection_sup, Address, Port),
       start    => {ssh_connection_sup, start_link, [Options]},
       restart  => temporary,
-      shutdown => 5000,
-      type     => supervisor,
-      modules  => [ssh_connection_sup]
+      type     => supervisor
      }.
 
 ssh_channel_child_spec(Role, Address, Port, _Profile, Options) ->
     #{id       => id(Role, ssh_channel_sup, Address, Port),
       start    => {ssh_channel_sup, start_link, [Options]},
       restart  => temporary,
-      shutdown => infinity,
-      type     => supervisor,
-      modules  => [ssh_channel_sup]
+      type     => supervisor
      }.
 
 id(Role, Sup, Address, Port) ->
diff --git a/lib/ssh/src/ssh_sup.erl b/lib/ssh/src/ssh_sup.erl
index eaec7a54e4..8183016ba5 100644
--- a/lib/ssh/src/ssh_sup.erl
+++ b/lib/ssh/src/ssh_sup.erl
@@ -36,15 +36,14 @@ init(_) ->
                  intensity =>   10,
                  period    => 3600
                 },
-    ChildSpecs = [#{id       => Module,
-                    start    => {Module, start_link, []},
-                    restart  => permanent,
-                    shutdown => 4000, %brutal_kill,
-                    type     => supervisor,
-                    modules  => [Module]
+    ChildSpecs = [#{id       => sshd_sup,
+                    start    => {sshd_sup, start_link, []},
+                    type     => supervisor
+                   },
+                  #{id       => sshc_sup,
+                    start    => {sshc_sup, start_link, []},
+                    type     => supervisor
                    }
-                  || Module <- [sshd_sup,
-                                sshc_sup]
                  ],
     {ok, {SupFlags,ChildSpecs}}.
 
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index e70abf59c2..17f990c5d8 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -63,9 +63,7 @@ init([Address, Port, Profile, Options]) ->
                 [#{id       => id(ssh_acceptor_sup, Address, Port, Profile),
                    start    => {ssh_acceptor_sup, start_link, [Address, Port, Profile, Options]},
                    restart  => transient,
-                   shutdown => infinity,
-                   type     => supervisor,
-                   modules  => [ssh_acceptor_sup]
+                   type     => supervisor
                   }];
             _ ->
                 []
@@ -124,9 +122,8 @@ start_subsystem(SystemSup, Role, Address, Port, Profile, Options) ->
         #{id       => make_ref(),
           start    => {ssh_subsystem_sup, start_link, [Role, Address, Port, Profile, Options]},
           restart  => temporary,
-          shutdown => infinity,
-          type     => supervisor,
-          modules  => [ssh_subsystem_sup]},
+          type     => supervisor
+         },
     supervisor:start_child(SystemSup, SubsystemSpec).
 
 stop_subsystem(SystemSup, SubSys) ->
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index d8f7a96c15..975053d301 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -51,10 +51,10 @@
 	 extract_public_key/1,
 	 ssh_packet/2, pack/2,
          valid_key_sha_alg/2,
-	 sha/1, sign/3, verify/4]).
+	 sha/1, sign/3, verify/5]).
 
 %%% For test suites
--export([pack/3]).
+-export([pack/3, adjust_algs_for_peer_version/2]).
 -export([decompress/2,  decrypt_blocks/3, is_valid_mac/3 ]). % FIXME: remove
 
 -define(Estring(X), ?STRING((if is_binary(X) -> X;
@@ -811,13 +811,21 @@ extract_public_key(#'DSAPrivateKey'{y = Y, p = P, q = Q, g = G}) ->
     {Y,  #'Dss-Parms'{p=P, q=Q, g=G}};
 extract_public_key(#'ECPrivateKey'{parameters = {namedCurve,OID},
 				   publicKey = Q}) ->
-    {#'ECPoint'{point=Q}, {namedCurve,OID}}.
+    {#'ECPoint'{point=Q}, {namedCurve,OID}};
+extract_public_key(#{engine:=_, key_id:=_, algorithm:=Alg} = M) ->
+    case {Alg, crypto:privkey_to_pubkey(Alg, M)} of
+        {rsa, [E,N]} ->
+            #'RSAPublicKey'{modulus = N, publicExponent = E};
+        {dss, [P,Q,G,Y]} ->
+            {Y, #'Dss-Parms'{p=P, q=Q, g=G}}
+    end.
+
 
 
 verify_host_key(#ssh{algorithms=Alg}=SSH, PublicKey, Digest, {AlgStr,Signature}) ->
     case atom_to_list(Alg#alg.hkey) of
         AlgStr ->
-            case verify(Digest, sha(Alg#alg.hkey), Signature, PublicKey) of
+            case verify(Digest, sha(Alg#alg.hkey), Signature, PublicKey, SSH) of
                 false ->
                     {error, bad_signature};
                 true ->
@@ -881,10 +889,13 @@ known_host_key(#ssh{opts = Opts, key_cb = {KeyCb,KeyCbOpts}, peer = {PeerName,_}
 	{_,true} ->
 	    ok;
 	{_,false} ->
+            DoAdd = ?GET_OPT(save_accepted_host, Opts),
 	    case accepted_host(Ssh, PeerName, Public, Opts) of
-		true ->
+		true when DoAdd == true ->
 		    {_,R} = add_host_key(KeyCb, PeerName, Public, [{key_cb_private,KeyCbOpts}|UserOpts]),
                     R;
+		true when DoAdd == false ->
+                    ok;
 		false ->
 		    {error, rejected_by_user};
                 {error,E} ->
@@ -1261,10 +1272,12 @@ payload(<<PacketLen:32, PaddingLen:8, PayloadAndPadding/binary>>) ->
     <<Payload:PayloadLen/binary, _/binary>> = PayloadAndPadding,
     Payload.
 
+sign(SigData, HashAlg, #{algorithm:=dss} = Key) ->
+    mk_dss_sig(crypto:sign(dss, HashAlg, SigData, Key));
+sign(SigData, HashAlg, #{algorithm:=SigAlg} = Key) ->
+    crypto:sign(SigAlg, HashAlg, SigData, Key);
 sign(SigData, HashAlg,  #'DSAPrivateKey'{} = Key) ->
-    DerSignature = public_key:sign(SigData, HashAlg, Key),
-    #'Dss-Sig-Value'{r = R, s = S} = public_key:der_decode('Dss-Sig-Value', DerSignature),
-    <<R:160/big-unsigned-integer, S:160/big-unsigned-integer>>;
+    mk_dss_sig(public_key:sign(SigData, HashAlg, Key));
 sign(SigData, HashAlg, Key = #'ECPrivateKey'{}) ->
     DerEncodedSign =  public_key:sign(SigData, HashAlg, Key),
     #'ECDSA-Sig-Value'{r=R, s=S} = public_key:der_decode('ECDSA-Sig-Value', DerEncodedSign),
@@ -1272,7 +1285,13 @@ sign(SigData, HashAlg, Key = #'ECPrivateKey'{}) ->
 sign(SigData, HashAlg, Key) ->
     public_key:sign(SigData, HashAlg, Key).
 
-verify(PlainText, HashAlg, Sig, {_,  #'Dss-Parms'{}} = Key) ->
+
+mk_dss_sig(DerSignature) ->
+    #'Dss-Sig-Value'{r = R, s = S} = public_key:der_decode('Dss-Sig-Value', DerSignature),
+    <<R:160/big-unsigned-integer, S:160/big-unsigned-integer>>.
+
+
+verify(PlainText, HashAlg, Sig, {_,  #'Dss-Parms'{}} = Key, _) ->
     case Sig of
         <<R:160/big-unsigned-integer, S:160/big-unsigned-integer>> ->
             Signature = public_key:der_encode('Dss-Sig-Value', #'Dss-Sig-Value'{r = R, s = S}),
@@ -1280,7 +1299,7 @@ verify(PlainText, HashAlg, Sig, {_,  #'Dss-Parms'{}} = Key) ->
         _ ->
             false
     end;
-verify(PlainText, HashAlg, Sig, {#'ECPoint'{},_} = Key) ->
+verify(PlainText, HashAlg, Sig, {#'ECPoint'{},_} = Key, _) ->
     case Sig of
         <<?UINT32(Rlen),R:Rlen/big-signed-integer-unit:8,
           ?UINT32(Slen),S:Slen/big-signed-integer-unit:8>> ->
@@ -1290,7 +1309,15 @@ verify(PlainText, HashAlg, Sig, {#'ECPoint'{},_} = Key) ->
         _ ->
             false
     end;
-verify(PlainText, HashAlg, Sig, Key) ->
+
+verify(PlainText, HashAlg, Sig, #'RSAPublicKey'{}=Key, #ssh{role = server,
+                                                            c_version = "SSH-2.0-OpenSSH_7."++_})
+  when HashAlg == sha256; HashAlg == sha512 ->
+    %% Public key signing bug in in OpenSSH >= 7.2
+    public_key:verify(PlainText, HashAlg, Sig, Key)
+        orelse public_key:verify(PlainText, sha, Sig, Key);
+
+verify(PlainText, HashAlg, Sig, Key, _) ->
     public_key:verify(PlainText, HashAlg, Sig, Key).
 
 
@@ -1823,6 +1850,8 @@ kex_alg_dependent({Min, NBits, Max, Prime, Gen, E, F, K}) ->
 
 %%%----------------------------------------------------------------
 
+valid_key_sha_alg(#{engine:=_, key_id:=_}, _Alg) -> true; % Engine key
+
 valid_key_sha_alg(#'RSAPublicKey'{}, 'rsa-sha2-512') -> true;
 valid_key_sha_alg(#'RSAPublicKey'{}, 'rsa-sha2-384') -> true;
 valid_key_sha_alg(#'RSAPublicKey'{}, 'rsa-sha2-256') -> true;
@@ -2009,12 +2038,6 @@ same(Algs) ->  [{client2server,Algs}, {server2client,Algs}].
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 trim_tail(Str) ->
-    lists:reverse(trim_head(lists:reverse(Str))).
-
-trim_head([$\s|Cs]) -> trim_head(Cs);
-trim_head([$\t|Cs]) -> trim_head(Cs);
-trim_head([$\n|Cs]) -> trim_head(Cs);
-trim_head([$\r|Cs]) -> trim_head(Cs);
-trim_head(Cs) -> Cs.
-
-
+    lists:takewhile(fun(C) -> 
+			    C=/=$\r andalso C=/=$\n
+		    end, Str).
diff --git a/lib/ssh/src/sshc_sup.erl b/lib/ssh/src/sshc_sup.erl
index 133b2c6450..fd4d8a3c07 100644
--- a/lib/ssh/src/sshc_sup.erl
+++ b/lib/ssh/src/sshc_sup.erl
@@ -60,10 +60,7 @@ init(_) ->
                 },
     ChildSpecs = [#{id       => undefined, % As simple_one_for_one is used.
                     start    => {ssh_connection_handler, start_link, []},
-                    restart  => temporary,
-                    shutdown => 4000,
-                    type     => worker,
-                    modules  => [ssh_connection_handler]
+                    restart  => temporary % because there is no way to restart a crashed connection
                    }
                  ],
     {ok, {SupFlags,ChildSpecs}}.
diff --git a/lib/ssh/src/sshd_sup.erl b/lib/ssh/src/sshd_sup.erl
index c23e65d955..779a861a54 100644
--- a/lib/ssh/src/sshd_sup.erl
+++ b/lib/ssh/src/sshd_sup.erl
@@ -90,10 +90,8 @@ init(_) ->
 child_spec(Address, Port, Profile, Options) ->
     #{id       => id(Address, Port, Profile),
       start    => {ssh_system_sup, start_link, [Address, Port, Profile, Options]},
-      restart  => temporary,
-      shutdown => infinity,
-      type     => supervisor,
-      modules  => [ssh_system_sup]
+      restart  => temporary, 
+      type     => supervisor
      }.
 
 id(Address, Port, Profile) ->
diff --git a/lib/ssh/test/Makefile b/lib/ssh/test/Makefile
index 5ea048a352..21359a0386 100644
--- a/lib/ssh/test/Makefile
+++ b/lib/ssh/test/Makefile
@@ -37,7 +37,9 @@ MODULES= \
 	ssh_renegotiate_SUITE \
 	ssh_basic_SUITE \
 	ssh_bench_SUITE \
+	ssh_compat_SUITE \
 	ssh_connection_SUITE \
+	ssh_engine_SUITE \
 	ssh_protocol_SUITE \
 	ssh_property_test_SUITE \
 	ssh_sftp_SUITE \
@@ -49,6 +51,7 @@ MODULES= \
 	ssh_test_lib \
 	ssh_key_cb \
 	ssh_key_cb_options \
+	ssh_key_cb_engine_keys \
 	ssh_trpt_test_lib \
 	ssh_echo_server \
 	ssh_bench_dev_null \
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 98964a2c8a..de6e448ebd 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -29,15 +29,13 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--define(TIMEOUT, 35000).
-
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,40}}].
+     {timetrap,{seconds,round(1.5*?TIMEOUT/1000)}}].
 
 all() -> 
     %% [{group,kex},{group,cipher}... etc
@@ -90,7 +88,7 @@ init_per_suite(Config) ->
 		  " -- Max num algorithms: ~p~n"
 		 ,[os:getenv("HOME"),
 		   init:get_argument(home),
-		   os:cmd("ssh -V"),
+		   ssh_test_lib:installed_ssh_version("TIMEOUT"),
 		   ssh:default_algorithms(),
 		   crypto:info_lib(),
 		   ssh_test_lib:default_algorithms(sshc),
@@ -318,10 +316,10 @@ sshc_simple_exec_os_cmd(Config) ->
 		    ok;
 		false ->
 		    ct:log("Bad result: ~p~nExpected: ~p~nMangled result: ~p", [RawResult,Expect,Lines]),
-		    {fail, "Bad result"}
+		    {fail, "Bad result (see log in testcase)"}
 	    end
     after ?TIMEOUT ->
-	    ct:fail("Did not receive answer")
+	    ct:fail("Did not receive answer (timeout)")
     end.
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 202b0afe57..365f25fabb 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -60,7 +60,7 @@
 	 login_bad_pwd_no_retry5/1,
 	 misc_ssh_options/1,
 	 openssh_zlib_basic_test/1,  
-	 packet_size_zero/1, 
+	 packet_size/1, 
 	 pass_phrase/1,
 	 peername_sockname/1, 
 	 send/1,
@@ -111,7 +111,7 @@ all() ->
      double_close,
      daemon_opt_fd,
      multi_daemon_opt_fd,
-     packet_size_zero,
+     packet_size,
      ssh_info_print,
      {group, login_bad_pwd_no_retry},
      shell_exit_status
@@ -764,11 +764,11 @@ cli(Config) when is_list(Config) ->
     
     {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
     ssh_connection:shell(ConnectionRef, ChannelId),
-    ok = ssh_connection:send(ConnectionRef, ChannelId, <<"q">>),
+    ssh_connection:send(ConnectionRef, ChannelId, <<"q">>),
     receive 
 	{ssh_cm, ConnectionRef,
 	 {data,0,0, <<"\r\nYou are accessing a dummy, type \"q\" to exit\r\n\n">>}} ->
-	    ok = ssh_connection:send(ConnectionRef, ChannelId, <<"q">>)
+	    ssh_connection:send(ConnectionRef, ChannelId, <<"q">>)
     after 
 	30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE])
     end,
@@ -1104,7 +1104,7 @@ multi_daemon_opt_fd(Config) ->
      end || {S,Pid,C} <- Tests].
 
 %%--------------------------------------------------------------------
-packet_size_zero(Config) ->
+packet_size(Config) ->
     SystemDir = proplists:get_value(data_dir, Config),
     PrivDir = proplists:get_value(priv_dir, Config), 
     UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
@@ -1119,21 +1119,31 @@ packet_size_zero(Config) ->
 					  {user_interaction, false},
 					  {user, "vego"},
 					  {password, "morot"}]),
-
-    {ok,Chan} = ssh_connection:session_channel(Conn, 1000, _MaxPacketSize=0, 60000),
-    ok = ssh_connection:shell(Conn, Chan),
+    lists:foreach(
+      fun(MaxPacketSize) ->
+              ct:log("Try max_packet_size=~p",[MaxPacketSize]),
+              {ok,Ch} = ssh_connection:session_channel(Conn, 1000, MaxPacketSize, 60000),
+              ok = ssh_connection:shell(Conn, Ch),
+              rec(Server, Conn, Ch, MaxPacketSize)
+      end, [0, 1, 10, 25]),
 
     ssh:close(Conn),
-    ssh:stop_daemon(Server),
+    ssh:stop_daemon(Server).
 
+rec(Server, Conn, Ch, MaxSz) ->
     receive
-	{ssh_cm,Conn,{data,Chan,_Type,_Msg1}} = M ->
-	    ct:log("Got ~p",[M]),
-	    ct:fail(doesnt_obey_max_packet_size_0)
-    after 5000 ->
-	    ok
-    end.    
-    
+        {ssh_cm,Conn,{data,Ch,_,M}} when size(M) =< MaxSz ->
+            ct:log("~p: ~p",[MaxSz,M]),
+            rec(Server, Conn, Ch, MaxSz);
+        {ssh_cm,Conn,{data,Ch,_,_}} = M ->
+            ct:log("Max pkt size=~p. Got ~p",[MaxSz,M]),
+            ssh:close(Conn),
+            ssh:stop_daemon(Server),
+            ct:fail("Does not obey max_packet_size=~p",[MaxSz])
+    after
+        2000 -> ok
+    end.
+
 %%--------------------------------------------------------------------
 shell_no_unicode(Config) ->
     new_do_shell(proplists:get_value(io,Config),
@@ -1491,7 +1501,7 @@ new_do_shell(IO, N, Ops=[{Order,Arg}|More]) ->
 		    ct:fail("*** Expected ~p, but got ~p",[string:strip(ExpStr),RecStr])
 	    end
     after 30000 ->
-	    ct:log("Meassage queue of ~p:~n~p",
+	    ct:log("Message queue of ~p:~n~p",
 		   [self(), erlang:process_info(self(), messages)]),
 	    case Order of
 		expect -> ct:fail("timeout, expected ~p",[string:strip(Arg)]);
diff --git a/lib/ssh/test/ssh_compat_SUITE.erl b/lib/ssh/test/ssh_compat_SUITE.erl
new file mode 100644
index 0000000000..f7eda1dc08
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE.erl
@@ -0,0 +1,1399 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-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.
+%% 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(ssh_compat_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("ssh/src/ssh_transport.hrl"). % #ssh_msg_kexinit{}
+-include_lib("kernel/include/inet.hrl"). % #hostent{}
+-include_lib("kernel/include/file.hrl"). % #file_info{}
+-include("ssh_test_lib.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-define(USER,"sshtester").
+-define(PASSWD, "foobar").
+-define(BAD_PASSWD, "NOT-"?PASSWD).
+-define(DOCKER_PFX, "ssh_compat_suite-ssh").
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+suite() ->
+    [%%{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,40}}].
+
+all() ->
+%%    [check_docker_present] ++
+    [{group,G} || G <- ssh_image_versions()].
+
+groups() ->
+    [{otp_client, [], [login_otp_is_client,
+                       all_algorithms_sftp_exec_reneg_otp_is_client,
+                       send_recv_big_with_renegotiate_otp_is_client
+                      ]},
+     {otp_server, [], [login_otp_is_server,
+                       all_algorithms_sftp_exec_reneg_otp_is_server
+                      ]} |
+     [{G, [], [{group,otp_client}, {group,otp_server}]} || G <- ssh_image_versions()]
+    ].
+
+
+ssh_image_versions() ->
+    try
+        %% Find all useful containers in such a way that undefined command, too low
+        %% priviliges, no containers and containers found give meaningful result:
+        L0 = ["REPOSITORY"++_|_] = string:tokens(os:cmd("docker images"), "\r\n"),
+        [["REPOSITORY","TAG"|_]|L1] = [string:tokens(E, " ") || E<-L0],
+        [list_to_atom(V) || [?DOCKER_PFX,V|_] <- L1]
+    of
+        Vs ->
+            lists:sort(Vs)
+    catch
+        error:{badmatch,_} ->
+            []
+    end.
+
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    ?CHECK_CRYPTO(
+       case os:find_executable("docker") of
+           false ->
+               {skip, "No docker"};
+           _ ->
+               ssh:start(),
+               ct:log("Crypto info: ~p",[crypto:info_lib()]),
+               Config
+       end).
+
+end_per_suite(Config) ->
+    %% Remove all containers that are not running:
+%%%    os:cmd("docker rm $(docker ps -aq -f status=exited)"),
+    %% Remove dangling images:
+%%%    os:cmd("docker rmi $(docker images -f dangling=true -q)"),
+    catch ssh:stop(),
+    Config.
+
+
+init_per_group(otp_server, Config) ->
+    case proplists:get_value(common_remote_client_algs, Config) of
+        undefined ->
+            SSHver = proplists:get_value(ssh_version, Config, ""),
+            {skip,"No "++SSHver++ " client found in docker"};
+        _ ->
+            Config
+    end;
+
+init_per_group(otp_client, Config) ->
+    Config;
+
+init_per_group(G, Config0) ->
+    case lists:member(G, ssh_image_versions()) of
+	true ->
+            %% This group is for one of the images
+            Vssh = atom_to_list(G),
+            Cmnt = io_lib:format("+++ ~s +++",[Vssh]),
+            ct:comment("~s",[Cmnt]),
+            try start_docker(G) of
+                {ok,ID} ->
+                    ct:log("==> ~p started",[G]),
+                    %% Find the algorithms that both client and server supports:
+                    {IP,Port} = ip_port([{id,ID}]),
+                    ct:log("Try contact ~p:~p",[IP,Port]),
+                    Config1 = [{id,ID},
+                               {ssh_version,Vssh}
+                               | Config0],
+                    try common_algs(Config1, IP, Port) of
+                        {ok, ServerHello, RemoteServerCommon, ClientHello, RemoteClientCommon} ->
+                            case chk_hellos([ServerHello,ClientHello], Cmnt) of
+                                Cmnt ->
+                                    ok;
+                                NewCmnt ->
+                                    ct:comment("~s",[NewCmnt])
+                            end,
+                            AuthMethods =
+                                %% This should be obtained by quering the peer, but that
+                                %% is a bit hard. It is possible with ssh_protocol_SUITE
+                                %% techniques, but it can wait.
+                                case Vssh of
+                                    "dropbear" ++ _ ->
+                                        [password, publickey];
+                                    _ ->
+                                        [password, 'keyboard-interactive', publickey]
+                                end,
+                            [{common_remote_server_algs,RemoteServerCommon},
+                             {common_remote_client_algs,RemoteClientCommon},
+                             {common_authmethods,AuthMethods}
+                             |Config1];
+                        Other ->
+                            ct:log("Error in init_per_group: ~p",[Other]),
+                            stop_docker(ID),
+                            {fail, "Can't contact docker sshd"}
+                    catch
+                        Class:Exc ->
+                            ST = erlang:get_stacktrace(),
+                            ct:log("common_algs: ~p:~p~n~p",[Class,Exc,ST]),
+                            stop_docker(ID),
+                            {fail, "Failed during setup"}
+                    end
+            catch
+                cant_start_docker ->
+                    {skip, "Can't start docker"};
+
+                C:E ->
+                    ST = erlang:get_stacktrace(),
+                    ct:log("No ~p~n~p:~p~n~p",[G,C,E,ST]),
+                    {skip, "Can't start docker"}
+            end;
+
+	false ->
+	    Config0
+    end.
+
+end_per_group(G, Config) ->
+    case lists:member(G, ssh_image_versions()) of
+        true ->
+            catch stop_docker(proplists:get_value(id,Config));
+        false ->
+            ok
+    end.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+check_docker_present(_Config) ->
+    ct:log("This testcase is just to show in Monitor that we have a test host with docker installed",[]),
+    {fail, "Test is OK: just showing docker is available"}.
+
+%%--------------------------------------------------------------------
+login_otp_is_client(Config) ->
+    {IP,Port} = ip_port(Config),
+    PublicKeyAlgs = [A || {public_key,A} <- proplists:get_value(common_remote_server_algs, Config)],
+    CommonAuths =
+        [{AuthMethod,Alg} || AuthMethod <- proplists:get_value(common_authmethods, Config),
+                             Alg <- case AuthMethod of
+                                        publickey ->
+                                            PublicKeyAlgs;
+                                        _ ->
+                                            [' ']
+                                    end
+        ],
+                                        
+    chk_all_algos(?FUNCTION_NAME, CommonAuths, Config,
+                  fun(AuthMethod,Alg) ->
+                          {Opts,Dir} =
+                              case AuthMethod of
+                                  publickey ->
+                                      {[], setup_remote_auth_keys_and_local_priv(Alg, Config)};
+                                  _ ->
+                                      {[{password,?PASSWD}], new_dir(Config)}
+                              end,
+                          ssh:connect(IP, Port, [{auth_methods, atom_to_list(AuthMethod)},
+                                                 {user,?USER},
+                                                 {user_dir, Dir},
+                                                 {silently_accept_hosts,true},
+                                                 {user_interaction,false}
+                                                 | Opts
+                                                ])
+                  end).
+    
+
+%%--------------------------------------------------------------------
+login_otp_is_server(Config) ->
+    PublicKeyAlgs = [A || {public_key,A} <- proplists:get_value(common_remote_client_algs, Config)],
+    CommonAuths =
+        [{AuthMethod,Alg} || AuthMethod <- proplists:get_value(common_authmethods, Config),
+                             Alg <- case AuthMethod of
+                                        publickey ->
+                                            PublicKeyAlgs;
+                                        _ ->
+                                            [' ']
+                                    end
+        ],
+    SysDir = setup_local_hostdir(hd(PublicKeyAlgs), Config),
+    chk_all_algos(?FUNCTION_NAME, CommonAuths, Config,
+                  fun(AuthMethod,Alg) ->
+                          {Opts,UsrDir} =
+                              case AuthMethod of
+                                  publickey ->
+                                      {[{user_passwords, [{?USER,?BAD_PASSWD}]}],
+                                       setup_remote_priv_and_local_auth_keys(Alg, Config)
+                                      };
+                                  _ ->
+                                      {[{user_passwords, [{?USER,?PASSWD}]}],
+                                       new_dir(Config)
+                                      }
+                              end,
+                          {Server, Host, HostPort} =
+                              ssh_test_lib:daemon(0,
+                                                  [{auth_methods, atom_to_list(AuthMethod)},
+                                                   {system_dir, SysDir},
+                                                   {user_dir, UsrDir},
+                                                   {failfun, fun ssh_test_lib:failfun/2}
+                                                   | Opts
+                                                  ]),
+                          R = exec_from_docker(Config, Host, HostPort,
+                                               "'lists:concat([\"Answer=\",1+3]).\r\n'",
+                                               [<<"Answer=4">>],
+                                               ""),
+                          ssh:stop_daemon(Server),
+                          R
+                  end).
+
+%%--------------------------------------------------------------------
+all_algorithms_sftp_exec_reneg_otp_is_client(Config) ->
+    CommonAlgs = proplists:get_value(common_remote_server_algs, Config),
+    {IP,Port} = ip_port(Config),
+    chk_all_algos(?FUNCTION_NAME, CommonAlgs, Config,
+                  fun(Tag, Alg) ->
+                          ConnRes =
+                              ssh:connect(IP, Port, 
+                                          [{user,?USER},
+                                           {password,?PASSWD},
+                                           {auth_methods, "password"},
+                                           {user_dir, new_dir(Config)},
+                                           {preferred_algorithms, [{Tag,[Alg]}]},
+                                           {silently_accept_hosts,true},
+                                           {user_interaction,false}
+                                          ])  ,
+                          test_erl_client_reneg(ConnRes, % Seems that max 10 channels may be open in sshd
+                                                [{exec,1},
+                                                 {sftp,5},
+                                                 {no_subsyst,1},
+                                                 {setenv, 1},
+                                                 {sftp_async,1}
+                                                ])
+                  end).
+
+%%--------------------------------------------------------------------
+all_algorithms_sftp_exec_reneg_otp_is_server(Config) ->
+    CommonAlgs = proplists:get_value(common_remote_client_algs, Config),
+    UserDir = setup_remote_priv_and_local_auth_keys('ssh-rsa', Config),
+    chk_all_algos(?FUNCTION_NAME, CommonAlgs, Config,
+                  fun(Tag,Alg) ->
+                          HostKeyAlg = case Tag of
+                                           public_key -> Alg;
+                                           _ -> 'ssh-rsa'
+                                       end,
+                          SftpRootDir = new_dir(Config),
+                          %% ct:log("Rootdir = ~p",[SftpRootDir]),
+                          {Server, Host, HostPort} =
+                              ssh_test_lib:daemon(0,
+                                                  [{preferred_algorithms, [{Tag,[Alg]}]},
+                                                   {system_dir, setup_local_hostdir(HostKeyAlg, Config)},
+                                                   {user_dir, UserDir},
+                                                   {user_passwords, [{?USER,?PASSWD}]},
+                                                   {failfun, fun ssh_test_lib:failfun/2},
+                                                   {subsystems,
+                                                    [ssh_sftpd:subsystem_spec([{cwd,SftpRootDir},
+                                                                               {root,SftpRootDir}]),
+                                                     {"echo_10",{ssh_echo_server,[10,[{dbg,true}]]}}
+                                                    ]}
+                                                  ]),
+                          R = do([fun() ->
+                                          exec_from_docker(Config, Host, HostPort,
+                                                           "hi_there.\r\n",
+                                                           [<<"hi_there">>],
+                                                           "")
+                                  end,
+                                  fun() ->
+                                          sftp_tests_erl_server(Config, Host, HostPort, SftpRootDir, UserDir)
+                                  end
+                                 ]),
+                          ssh:stop_daemon(Server),
+                          R
+                  end).
+
+%%--------------------------------------------------------------------
+send_recv_big_with_renegotiate_otp_is_client(Config) ->
+    %% Connect to the remote openssh server:
+    {IP,Port} = ip_port(Config),
+    {ok,C} = ssh:connect(IP, Port, [{user,?USER},
+                                    {password,?PASSWD},
+                                    {user_dir, setup_remote_auth_keys_and_local_priv('ssh-rsa', Config)},
+                                    {silently_accept_hosts,true},
+                                    {user_interaction,false}
+                                   ]),
+
+    %% Open a channel and exec the Linux 'cat' command at the openssh side.
+    %% This 'cat' will read stdin and write to stdout until an eof is read from stdin.
+    {ok, Ch1} = ssh_connection:session_channel(C, infinity),
+    success = ssh_connection:exec(C, Ch1, "cat", infinity),
+
+    %% Build big binary
+    HalfSizeBytes = 100*1000*1000,
+    Data = << <<X:32>> || X <- lists:seq(1, HalfSizeBytes div 4)>>,
+
+    %% Send the data. Must spawn a process to avoid deadlock. The client will block
+    %% until all is sent through the send window. But the server will stop receiveing
+    %% when the servers send-window towards the client is full.
+    %% Since the client can't receive before the server has received all but 655k from the client
+    %% ssh_connection:send/4 is blocking...
+    spawn_link(
+      fun() ->
+              ct:comment("Sending ~p Mbytes with renegotiation in the middle",[2*byte_size(Data)/1000000]),
+              %% ct:log("sending first ~p bytes",[byte_size(Data)]),
+              ok = ssh_connection:send(C, Ch1, Data, 10000),
+              %% ct:log("Init renegotiation test",[]),
+              Kex1 = renegotiate_test(init, C),
+              %% ct:log("sending next ~p bytes",[byte_size(Data)]),
+              ok = ssh_connection:send(C, Ch1, Data, 10000),
+              %% ct:log("Finnish renegotiation test",[]),
+              renegotiate_test(Kex1, C),
+              %% ct:log("sending eof",[]),
+              ok = ssh_connection:send_eof(C, Ch1)
+              %%, ct:log("READY, sent ~p bytes",[2*byte_size(Data)])
+      end),
+
+    {eof,ReceivedData} =
+        loop_until(fun({eof,_}) -> true;
+                      (_      ) -> false
+                   end,
+                   fun(Acc) ->
+                           %%ct:log("Get more ~p",[ ExpectedSize-byte_size(Acc) ]),
+                           receive
+                               {ssh_cm, C, {eof,Ch}} when Ch==Ch1 ->
+                                   %% ct:log("eof received",[]),
+                                   {eof,Acc};
+
+                               {ssh_cm, C, {data,Ch,0,B}} when Ch==Ch1,
+                                                               is_binary(B) ->
+                                   %% ct:log("(1) Received ~p bytes (total ~p), missing ~p bytes",
+                                   %%        [byte_size(B),
+                                   %%         byte_size(B)+byte_size(Acc),
+                                   %%         2*byte_size(Data)-(byte_size(B)+byte_size(Acc))]),
+                                   ssh_connection:adjust_window(C, Ch1, byte_size(B)),
+                                   <<Acc/binary, B/binary>>
+                           end
+                   end,
+                   <<>>),
+
+    ExpectedData = <<Data/binary, Data/binary>>,
+    case ReceivedData of
+        ExpectedData ->
+            %% ct:log("Correct data returned",[]),
+            %% receive close messages
+            loop_until(fun(Left) -> %% ct:log("Expect: ~p",[Left]),
+                                    Left == []
+                       end,
+                       fun([Next|Rest]) ->
+                               receive
+                                  {ssh_cm,C,Next} -> Rest
+                               end 
+                       end,
+                       [%% Already received: {eof, Ch1},
+                        {exit_status,Ch1,0},
+                        {closed,Ch1}]
+                      ),
+            ok;
+        _ when is_binary(ReceivedData) ->
+            ct:fail("~p bytes echoed but ~p expected", [byte_size(ReceivedData), 2*byte_size(Data)])
+    end.
+
+%%--------------------------------------------------------------------
+%% Utilities ---------------------------------------------------------
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%%
+%% A practical meta function
+%% 
+loop_until(CondFun, DoFun, Acc) ->
+    case CondFun(Acc) of
+        true ->
+            Acc;
+        false ->
+            loop_until(CondFun, DoFun, DoFun(Acc))
+    end.
+
+%%--------------------------------------------------------------------
+%%
+%% Exec the Command in the docker.  Add the arguments ExtraSshArg in the
+%% ssh command.
+%%
+%% If Expects is returned, then return 'ok', else return {fail,Msg}.
+%% 
+exec_from_docker(Config, HostIP, HostPort, Command, Expects, ExtraSshArg) when is_binary(hd(Expects)),
+                                                                               is_list(Config) ->
+    {DockerIP,DockerPort} = ip_port(Config),
+    {ok,C} = ssh:connect(DockerIP, DockerPort,
+                         [{user,?USER},
+                          {password,?PASSWD},
+                          {user_dir, new_dir(Config)},
+                          {silently_accept_hosts,true},
+                          {user_interaction,false}
+                         ]),
+    R = exec_from_docker(C, HostIP, HostPort, Command, Expects, ExtraSshArg, Config),
+    ssh:close(C),
+    R.
+
+exec_from_docker(C, DestIP, DestPort, Command, Expects, ExtraSshArg, Config) when is_binary(hd(Expects)) ->
+    ExecCommand =
+        lists:concat(
+          ["sshpass -p ",?PASSWD," "
+           | case proplists:get_value(ssh_version,Config) of
+                 "dropbear" ++ _ ->
+                     ["dbclient -y -y -p ",DestPort," ",ExtraSshArg," ",iptoa(DestIP)," "];
+
+                 _ -> %% OpenSSH or compatible
+                     ["/buildroot/ssh/bin/ssh -o 'CheckHostIP=no' -o 'StrictHostKeyChecking=no' ",
+                      ExtraSshArg," -p ",DestPort," ",iptoa(DestIP)," "]
+             end]) ++ Command,
+
+    case exec(C, ExecCommand) of
+        {ok,{ExitStatus,Result}} = R when ExitStatus == 0 ->
+            case binary:match(Result, Expects) of
+                nomatch ->
+                    ct:log("Result of~n    ~s~nis~n    ~p",[ExecCommand,R]),
+                    {fail, "Bad answer"};
+                _ ->
+                    ok
+            end;
+        {ok,_} = R ->
+            ct:log("Result of~n    ~s~nis~n    ~p",[ExecCommand,R]),
+            {fail, "Exit status =/= 0"};
+        R ->
+            ct:log("Result of~n    ~s~nis~n    ~p",[ExecCommand,R]),
+            {fail, "Couldn't login to host"}
+    end.
+
+
+exec(C, Cmd) ->
+    %% ct:log("~s",[Cmd]),
+    {ok,Ch} = ssh_connection:session_channel(C, 10000),
+    success = ssh_connection:exec(C, Ch, Cmd, 10000),
+    result_of_exec(C, Ch).
+
+
+result_of_exec(C, Ch) ->
+    result_of_exec(C, Ch, undefined, <<>>).
+
+result_of_exec(C, Ch, ExitStatus, Acc) ->
+    receive
+        {ssh_cm,C,{closed,Ch}} ->
+            %%ct:log("CHAN ~p got *closed*",[Ch]),
+            {ok, {ExitStatus, Acc}};
+
+        {ssh_cm,C,{exit_status,Ch,ExStat}} when ExitStatus == undefined ->
+            %%ct:log("CHAN ~p got *exit status ~p*",[Ch,ExStat]),
+            result_of_exec(C, Ch, ExStat, Acc);
+
+        {ssh_cm,C,{data,Ch,_,Data}=_X} when ExitStatus == undefined ->
+            %%ct:log("CHAN ~p got ~p",[Ch,_X]),
+            result_of_exec(C, Ch, ExitStatus, <<Acc/binary, Data/binary>>);
+
+        _Other ->
+            %%ct:log("OTHER: ~p",[_Other]),
+            result_of_exec(C, Ch, ExitStatus, Acc)
+
+    after 5000 ->
+            ct:log("NO MORE, received so far:~n~s",[Acc]),
+            {error, timeout}
+    end.
+
+
+%%--------------------------------------------------------------------
+%%
+%% Loop through all {Tag,Alg} pairs in CommonAlgs, call DoTestFun(Tag,Alg) which
+%% returns one of {ok,C}, ok, or Other.
+%%
+%% The chk_all_algos returns 'ok' or {fail,FaledAlgosList}
+%% 
+
+chk_all_algos(FunctionName, CommonAlgs, Config, DoTestFun) when is_function(DoTestFun,2) ->
+    ct:comment("~p algorithms",[length(CommonAlgs)]),
+    %% Check each algorithm
+    Failed =
+        lists:foldl(
+          fun({Tag,Alg}, FailedAlgos) ->
+                  %% ct:log("Try ~p",[Alg]),
+                  case DoTestFun(Tag,Alg) of
+                      {ok,C} ->
+                          ssh:close(C),
+                          FailedAlgos;
+                      ok ->
+                          FailedAlgos;
+                      Other ->
+                          ct:log("FAILED! ~p ~p: ~p",[Tag,Alg,Other]),
+                          [{Alg,Other}|FailedAlgos]
+                  end
+          end, [], CommonAlgs),
+    ct:pal("~s", [format_result_table_use_all_algos(FunctionName, Config, CommonAlgs, Failed)]),
+    case Failed of
+        [] ->
+            ok;
+        _ ->
+            {fail, Failed}
+    end.
+
+
+
+%%%----------------------------------------------------------------
+%%%
+%%% Call all Funs as Fun() which returns 'ok', {ok,C} or Other.
+%%% do/1 returns 'ok' or the first encountered value that is not
+%%% successful.
+%%%
+
+do(Funs) ->
+    do(Funs, 1).
+
+do([Fun|Funs], N) ->
+    case Fun() of
+        ok ->
+            %% ct:log("Fun ~p ok",[N]),
+            do(Funs, N-1);
+        {ok,C} ->
+            %% ct:log("Fun ~p {ok,C}",[N]),
+            ssh:close(C),
+            do(Funs, N-1);
+        Other ->
+            ct:log("Fun ~p FAILED:~n~p",[N, Other]),
+            Other
+    end;
+
+do([], _) ->
+    %% ct:log("All Funs ok",[]),
+    ok.
+
+%%--------------------------------------------------------------------
+%%
+%% Functions to set up local and remote host's and user's keys and directories
+%% 
+
+setup_local_hostdir(KeyAlg, Config) ->
+    setup_local_hostdir(KeyAlg, new_dir(Config), Config).
+setup_local_hostdir(KeyAlg, HostDir, Config) ->
+    {ok, {Priv,Publ}} = host_priv_pub_keys(Config, KeyAlg),
+    %% Local private and public key
+    DstFile = filename:join(HostDir, dst_filename(host,KeyAlg)),
+    ok = file:write_file(DstFile,         Priv),
+    ok = file:write_file(DstFile++".pub", Publ),
+    HostDir.
+
+
+setup_remote_auth_keys_and_local_priv(KeyAlg, Config) ->
+    {IP,Port} = ip_port(Config),
+    setup_remote_auth_keys_and_local_priv(KeyAlg, IP, Port, new_dir(Config), Config).
+
+setup_remote_auth_keys_and_local_priv(KeyAlg, UserDir, Config) ->
+    {IP,Port} = ip_port(Config),
+    setup_remote_auth_keys_and_local_priv(KeyAlg, IP, Port, UserDir, Config).
+
+setup_remote_auth_keys_and_local_priv(KeyAlg, IP, Port, Config) ->
+    setup_remote_auth_keys_and_local_priv(KeyAlg, IP, Port, new_dir(Config), Config).
+
+setup_remote_auth_keys_and_local_priv(KeyAlg, IP, Port, UserDir, Config) ->
+    {ok, {Priv,Publ}} = user_priv_pub_keys(Config, KeyAlg),
+    %% Local private and public keys
+    DstFile = filename:join(UserDir, dst_filename(user,KeyAlg)),
+    ok = file:write_file(DstFile,         Priv),
+    ok = file:write_file(DstFile++".pub", Publ),
+    %% Remote auth_methods with public key
+    {ok,Ch,Cc} = ssh_sftp:start_channel(IP, Port, [{user,     ?USER  },
+                                                   {password, ?PASSWD   },
+                                                   {auth_methods, "password"},
+                                                   {silently_accept_hosts,true},
+                                                   {user_interaction,false}
+                                                  ]),
+    _ = ssh_sftp:make_dir(Ch, ".ssh"),
+    ok = ssh_sftp:write_file(Ch, ".ssh/authorized_keys", Publ),
+    ok = ssh_sftp:write_file_info(Ch, ".ssh/authorized_keys",  #file_info{mode=8#700}),
+    ok = ssh_sftp:write_file_info(Ch, ".ssh",  #file_info{mode=8#700}),
+    ok = ssh_sftp:stop_channel(Ch),
+    ok = ssh:close(Cc),
+    UserDir.
+
+
+setup_remote_priv_and_local_auth_keys(KeyAlg, Config) ->
+    {IP,Port} = ip_port(Config),
+    setup_remote_priv_and_local_auth_keys(KeyAlg, IP, Port, new_dir(Config), Config).
+
+setup_remote_priv_and_local_auth_keys(KeyAlg, UserDir, Config) ->
+    {IP,Port} = ip_port(Config),
+    setup_remote_priv_and_local_auth_keys(KeyAlg, IP, Port, UserDir, Config).
+
+setup_remote_priv_and_local_auth_keys(KeyAlg, IP, Port, Config) ->
+    setup_remote_priv_and_local_auth_keys(KeyAlg, IP, Port, new_dir(Config), Config).
+
+setup_remote_priv_and_local_auth_keys(KeyAlg, IP, Port, UserDir, Config) ->
+    {ok, {Priv,Publ}} = user_priv_pub_keys(Config, KeyAlg),
+    %% Local auth_methods with public key
+    AuthKeyFile = filename:join(UserDir, "authorized_keys"),
+    ok = file:write_file(AuthKeyFile, Publ),
+    %% Remote private and public key
+    {ok,Ch,Cc} = ssh_sftp:start_channel(IP, Port, [{user,     ?USER  },
+                                                   {password, ?PASSWD   },
+                                                   {auth_methods, "password"},
+                                                   {silently_accept_hosts,true},
+                                                   {user_interaction,false}
+                                                  ]),
+    _ = ssh_sftp:make_dir(Ch, ".ssh"),
+    DstFile = filename:join(".ssh", dst_filename(user,KeyAlg)),
+    ok = ssh_sftp:write_file(Ch, DstFile, Priv),
+    ok = ssh_sftp:write_file_info(Ch, DstFile,  #file_info{mode=8#700}),
+    ok = ssh_sftp:write_file(Ch, DstFile++".pub", Publ),
+    ok = ssh_sftp:write_file_info(Ch, ".ssh",  #file_info{mode=8#700}),
+    ok = ssh_sftp:stop_channel(Ch),
+    ok = ssh:close(Cc),
+    UserDir.
+
+user_priv_pub_keys(Config, KeyAlg) -> priv_pub_keys("users_keys", user, Config, KeyAlg).
+host_priv_pub_keys(Config, KeyAlg) -> priv_pub_keys("host_keys",  host, Config, KeyAlg).
+
+priv_pub_keys(KeySubDir, Type, Config, KeyAlg) ->
+    KeyDir = filename:join(proplists:get_value(data_dir,Config), KeySubDir),
+    {ok,Priv} = file:read_file(filename:join(KeyDir,src_filename(Type,KeyAlg))),
+    {ok,Publ} = file:read_file(filename:join(KeyDir,src_filename(Type,KeyAlg)++".pub")),
+    {ok, {Priv,Publ}}.
+
+
+%%%---------------- The default filenames
+src_filename(user, 'ssh-rsa'            ) -> "id_rsa";
+src_filename(user, 'rsa-sha2-256'       ) -> "id_rsa";
+src_filename(user, 'rsa-sha2-512'       ) -> "id_rsa";
+src_filename(user, 'ssh-dss'            ) -> "id_dsa";
+src_filename(user, 'ecdsa-sha2-nistp256') -> "id_ecdsa256";
+src_filename(user, 'ecdsa-sha2-nistp384') -> "id_ecdsa384";
+src_filename(user, 'ecdsa-sha2-nistp521') -> "id_ecdsa521";
+src_filename(host, 'ssh-rsa'            ) -> "ssh_host_rsa_key";
+src_filename(host, 'rsa-sha2-256'       ) -> "ssh_host_rsa_key";
+src_filename(host, 'rsa-sha2-512'       ) -> "ssh_host_rsa_key";
+src_filename(host, 'ssh-dss'            ) -> "ssh_host_dsa_key";
+src_filename(host, 'ecdsa-sha2-nistp256') -> "ssh_host_ecdsa_key256";
+src_filename(host, 'ecdsa-sha2-nistp384') -> "ssh_host_ecdsa_key384";
+src_filename(host, 'ecdsa-sha2-nistp521') -> "ssh_host_ecdsa_key521".
+
+dst_filename(user, 'ssh-rsa'            ) -> "id_rsa";
+dst_filename(user, 'rsa-sha2-256'       ) -> "id_rsa";
+dst_filename(user, 'rsa-sha2-512'       ) -> "id_rsa";
+dst_filename(user, 'ssh-dss'            ) -> "id_dsa";
+dst_filename(user, 'ecdsa-sha2-nistp256') -> "id_ecdsa";
+dst_filename(user, 'ecdsa-sha2-nistp384') -> "id_ecdsa";
+dst_filename(user, 'ecdsa-sha2-nistp521') -> "id_ecdsa";
+dst_filename(host, 'ssh-rsa'            ) -> "ssh_host_rsa_key";
+dst_filename(host, 'rsa-sha2-256'       ) -> "ssh_host_rsa_key";
+dst_filename(host, 'rsa-sha2-512'       ) -> "ssh_host_rsa_key";
+dst_filename(host, 'ssh-dss'            ) -> "ssh_host_dsa_key";
+dst_filename(host, 'ecdsa-sha2-nistp256') -> "ssh_host_ecdsa_key";
+dst_filename(host, 'ecdsa-sha2-nistp384') -> "ssh_host_ecdsa_key";
+dst_filename(host, 'ecdsa-sha2-nistp521') -> "ssh_host_ecdsa_key".
+
+
+%%--------------------------------------------------------------------
+%%
+%% Format the result table for chk_all_algos/4
+%% 
+format_result_table_use_all_algos(FunctionName, Config, CommonAlgs, Failed) ->
+    %% Write a nice table with the result
+    AlgHead = 'Algorithm',
+    AlgWidth = lists:max([length(atom_to_list(A)) || {_,A} <- CommonAlgs]),
+    {ResultTable,_} =
+        lists:mapfoldl(
+          fun({T,A}, Tprev) ->
+                  Tag = case T of
+                            Tprev -> "";
+                            _ -> io_lib:format('~s~n',[T])
+                        end,
+                  {io_lib:format('~s     ~*s ~s~n',
+                                 [Tag, -AlgWidth, A,
+                                  case proplists:get_value(A,Failed) of
+                                      undefined -> "(ok)";
+                                      Err -> io_lib:format("<<<< FAIL <<<< ~p",[Err])
+                                  end]),
+                   T}
+          end, undefined, CommonAlgs),
+
+    Vssh = proplists:get_value(ssh_version,Config,""),
+    io_lib:format("~nResults of ~p, Peer version: ~s~n~n"
+                  "Tag  ~*s Result~n"
+                  "=====~*..=s=======~n~s"
+                 ,[FunctionName, Vssh,
+                   -AlgWidth, AlgHead,
+                   AlgWidth, "", ResultTable]).
+
+%%--------------------------------------------------------------------
+%%
+%% Docker handling: start_docker/1 and stop_docker/1
+%% 
+start_docker(Ver) ->
+    Cmnd = lists:concat(["docker run -itd --rm -p 1234 ",?DOCKER_PFX,":",Ver]),
+    Id0 = os:cmd(Cmnd),
+    ct:log("Ver = ~p, Cmnd ~p~n-> ~p",[Ver,Cmnd,Id0]),
+    case is_docker_sha(Id0) of
+        true ->
+            Id = hd(string:tokens(Id0, "\n")),
+            IP = ip(Id),
+            Port = 1234,
+            {ok, {Ver,{IP,Port},Id}};
+        false ->
+            throw(cant_start_docker)
+    end.
+
+
+stop_docker({_Ver,_,Id}) ->
+    Cmnd = lists:concat(["docker kill ",Id]),
+    os:cmd(Cmnd).
+
+is_docker_sha(L) ->
+    lists:all(fun(C) when $a =< C,C =< $z -> true;
+                 (C) when $0 =< C,C =< $9 -> true;
+                 ($\n) -> true;
+                 (_) -> false
+              end, L).
+
+%%--------------------------------------------------------------------
+%%
+%% Misc docker info functions
+
+ip_port(Config) ->
+    {_Ver,{IP,Port},_} = proplists:get_value(id,Config),
+    {IP,Port}.
+
+port_mapped_to(Id) ->
+    Cmnd = lists:concat(["docker ps --format \"{{.Ports}}\"  --filter id=",Id]),
+    [_, PortStr | _] = string:tokens(os:cmd(Cmnd), ":->/"),
+    list_to_integer(PortStr).
+
+ip(Id) ->
+    Cmnd = lists:concat(["docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ",
+			 Id]),
+    IPstr0 = os:cmd(Cmnd),
+    ct:log("Cmnd ~p~n-> ~p",[Cmnd,IPstr0]),
+    IPstr = hd(string:tokens(IPstr0, "\n")),
+    {ok,IP} = inet:parse_address(IPstr),
+    IP.
+
+%%--------------------------------------------------------------------
+%%
+%%  Normalize the host returned from ssh_test_lib
+
+iptoa({0,0,0,0}) -> inet_parse:ntoa(host_ip());
+iptoa(IP) -> inet_parse:ntoa(IP).
+
+host_ip() ->
+    {ok,Name} = inet:gethostname(),
+    {ok,#hostent{h_addr_list = [IP|_]}} = inet_res:gethostbyname(Name),
+    IP.
+
+%%--------------------------------------------------------------------
+%%
+%% Create a new fresh directory or clear an existing one
+%% 
+
+new_dir(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    SubDirName = integer_to_list(erlang:system_time()),
+    Dir = filename:join(PrivDir, SubDirName),
+    case file:read_file_info(Dir) of
+        {error,enoent} ->
+            ok = file:make_dir(Dir),
+            Dir;
+        _ ->
+            timer:sleep(25),
+            new_dir(Config)
+    end.
+
+clear_dir(Dir) ->
+    delete_all_contents(Dir),
+    {ok,[]} = file:list_dir(Dir),
+    Dir.
+
+delete_all_contents(Dir) ->
+    {ok,Fs} = file:list_dir(Dir),
+    lists:map(fun(F0) ->
+                      F = filename:join(Dir, F0),
+                      case filelib:is_file(F) of
+                          true ->
+                              file:delete(F);
+                          false ->
+                              case filelib:is_dir(F) of
+                                  true ->
+                                      delete_all_contents(F),
+                                      file:del_dir(F);
+                                  false ->
+                                      ct:log("Neither file nor dir: ~p",[F])
+                              end
+                      end
+              end, Fs).
+
+%%--------------------------------------------------------------------
+%%
+%% Find the intersection of algoritms for otp ssh and the docker ssh.
+%% Returns {ok, ServerHello, Server, ClientHello, Client} where Server are the algorithms common
+%% with the docker server and analogous for Client.
+%%
+%% Client may be undefined if no usable client is found.
+%%
+%% Both Server and Client are lists of {Tag,AlgName}.
+%% 
+
+common_algs(Config, IP, Port) ->
+    case remote_server_algs(IP, Port) of
+        {ok, {ServerHello, RemoteServerKexInit}} ->
+            RemoteServerAlgs = kexint_msg2default_algorithms(RemoteServerKexInit),
+            Server = find_common_algs(RemoteServerAlgs,
+                                      use_algorithms(ServerHello)),
+            ct:log("Remote server:~n~p~n~p",[ServerHello, RemoteServerAlgs]),
+            case remote_client_algs(Config) of
+                {ok,{ClientHello,RemoteClientKexInit}} ->
+                    RemoteClientAlgs = kexint_msg2default_algorithms(RemoteClientKexInit),
+                    Client = find_common_algs(RemoteClientAlgs,
+                                              use_algorithms(ClientHello)),
+                    ct:log("Remote client:~n~p~n~p",[ClientHello, RemoteClientAlgs]),
+                    {ok, ServerHello, Server, ClientHello, Client};
+                {error,_} =TO ->
+                    ct:log("Remote client algs can't be found: ~p",[TO]),
+                    {ok, ServerHello, Server, undefined, undefined};
+                Other ->
+                    Other
+            end;
+        Other ->
+            Other
+    end.
+
+
+chk_hellos(Hs, Str) ->
+    lists:foldl(
+      fun(H, Acc) ->
+              try binary:split(H, <<"-">>, [global])
+              of
+                  %% [<<"SSH">>,<<"2.0">>|_] ->
+                  %%     Acc;
+                  [<<"SSH">>,OldVer = <<"1.",_/binary>>|_] ->
+                      io_lib:format("~s, Old SSH ver ~s",[Acc,OldVer]);
+                  _ ->
+                      Acc
+              catch
+                  _:_ ->
+                      Acc
+              end
+      end, Str, Hs).
+              
+
+find_common_algs(Remote, Local) ->
+    [{T,V} || {T,Vs} <- ssh_test_lib:extract_algos(
+                          ssh_test_lib:intersection(Remote,
+                                                    Local)),
+              V <- Vs].
+
+
+use_algorithms(RemoteHelloBin) ->
+    MyAlgos = ssh:chk_algos_opts(
+                [{modify_algorithms,
+                  [{append,
+                    [{kex,['diffie-hellman-group1-sha1']}
+                    ]}
+                  ]}
+                ]),
+    ssh_transport:adjust_algs_for_peer_version(binary_to_list(RemoteHelloBin)++"\r\n",
+                                               MyAlgos).
+
+kexint_msg2default_algorithms(#ssh_msg_kexinit{kex_algorithms = Kex,
+                                               server_host_key_algorithms = PubKey,
+                                               encryption_algorithms_client_to_server = CipherC2S,
+                                               encryption_algorithms_server_to_client = CipherS2C,
+                                               mac_algorithms_client_to_server = MacC2S,
+                                               mac_algorithms_server_to_client = MacS2C,
+                                               compression_algorithms_client_to_server = CompC2S,
+                                               compression_algorithms_server_to_client = CompS2C
+                                              }) ->
+    [{kex,         ssh_test_lib:to_atoms(Kex)},
+     {public_key,  ssh_test_lib:to_atoms(PubKey)},
+     {cipher,      [{client2server,ssh_test_lib:to_atoms(CipherC2S)},
+                    {server2client,ssh_test_lib:to_atoms(CipherS2C)}]},
+     {mac,         [{client2server,ssh_test_lib:to_atoms(MacC2S)},
+                    {server2client,ssh_test_lib:to_atoms(MacS2C)}]},
+     {compression, [{client2server,ssh_test_lib:to_atoms(CompC2S)},
+                    {server2client,ssh_test_lib:to_atoms(CompS2C)}]}].
+
+
+%%--------------------------------------------------------------------
+%%
+%% Find the algorithms supported by the remote server
+%%
+%% Connect with tcp to the server, send a hello and read the returned
+%% server hello and kexinit message.
+%% 
+remote_server_algs(IP, Port) ->
+    case try_gen_tcp_connect(IP, Port, 5) of
+        {ok,S} ->
+            ok = gen_tcp:send(S, "SSH-2.0-CheckAlgs\r\n"),
+            receive_hello(S);
+        {error,Error} ->
+            {error,Error}
+    end.
+
+try_gen_tcp_connect(IP, Port, N) when N>0 ->
+    case gen_tcp:connect(IP, Port, [binary]) of
+        {ok,S} ->
+            {ok,S};
+        {error,_Error} when N>1 ->
+            receive after 1000 -> ok end,
+            try_gen_tcp_connect(IP, Port, N-1);
+        {error,Error} ->
+            {error,Error}
+    end;
+try_gen_tcp_connect(_, _, _) ->
+    {error, "No contact"}.
+
+
+%%--------------------------------------------------------------------
+%%
+%% Find the algorithms supported by the remote client
+%%
+%% Set up a fake ssh server and make the remote client connect to it. Use
+%% hello message and the kexinit message.
+%% 
+remote_client_algs(Config) ->
+    Parent = self(),
+    Ref = make_ref(),
+    spawn(
+      fun() ->
+              {ok,Sl} = gen_tcp:listen(0, [binary]),
+              {ok,{IP,Port}} = inet:sockname(Sl),
+              Parent ! {addr,Ref,IP,Port},
+              {ok,S} = gen_tcp:accept(Sl),
+              ok = gen_tcp:send(S, "SSH-2.0-CheckAlgs\r\n"),
+              Parent ! {Ref,receive_hello(S)}
+      end),
+    receive
+        {addr,Ref,IP,Port} ->
+            spawn(fun() ->
+                          exec_from_docker(Config, IP, Port,
+                                           "howdy.\r\n",
+                                           [<<"howdy">>],
+                                           "")
+                  end),
+            receive
+                {Ref, Result} ->
+                    Result
+            after 5000 ->
+                    {error, {timeout,2}}
+            end
+    after 5000 ->
+            {error, {timeout,1}}
+    end.
+
+
+%%% Receive a few packets from the remote server or client and find what is supported:
+
+receive_hello(S) ->
+    try
+        receive_hello(S, <<>>)
+    of
+        Result ->
+            Result
+    catch
+        Class:Error ->
+            ST = erlang:get_stacktrace(),
+            {error, {Class,Error,ST}}
+    end.
+        
+
+receive_hello(S, Ack) ->
+    %% The Ack is to collect bytes until the full message is received
+    receive
+        {tcp, S, Bin0} when is_binary(Bin0) ->
+            case binary:split(<<Ack/binary, Bin0/binary>>, [<<"\r\n">>,<<"\r">>,<<"\n">>]) of
+                [Hello = <<"SSH-2.0-",_/binary>>, NextPacket] ->
+                    %% ct:log("Got 2.0 hello (~p), ~p bytes to next msg",[Hello,size(NextPacket)]),
+                    {ok, {Hello, receive_kexinit(S, NextPacket)}};
+
+                [Hello = <<"SSH-1.99-",_/binary>>, NextPacket] ->
+                    %% ct:log("Got 1.99 hello (~p), ~p bytes to next msg",[Hello,size(NextPacket)]),
+                    {ok, {Hello, receive_kexinit(S, NextPacket)}};
+
+                [Bin] when size(Bin) < 256 ->
+                    %% ct:log("Got part of hello (~p chars):~n~s~n~s",[size(Bin),Bin,
+                    %%                                                 [io_lib:format('~2.16.0b ',[C])
+                    %%                                                  || C <- binary_to_list(Bin0)
+                    %%                                                 ]
+                    %%                                                ]),
+                    receive_hello(S, Bin0);
+
+                _ ->
+                    ct:log("Bad hello string (line ~p, ~p chars):~n~s~n~s",[?LINE,size(Bin0),Bin0,
+                                                                  [io_lib:format('~2.16.0b ',[C])
+                                                                   || C <- binary_to_list(Bin0)
+                                                                  ]
+                                                                 ]),
+                    ct:fail("Bad hello string received")
+            end;
+        Other ->
+            ct:log("Bad hello string (line ~p):~n~p",[?LINE,Other]),
+            ct:fail("Bad hello string received")
+
+    after 10000 ->
+            ct:log("Timeout waiting for hello!~n~s",[Ack]),
+            throw(timeout)
+    end.
+
+
+receive_kexinit(_S, <<PacketLen:32, PaddingLen:8, PayloadAndPadding/binary>>)
+  when PacketLen < 5000, % heuristic max len to stop huge attempts if packet decodeing get out of sync
+       size(PayloadAndPadding) >= (PacketLen-1) % Need more bytes?
+       ->
+    ct:log("Has all ~p packet bytes",[PacketLen]),
+    PayloadLen = PacketLen - PaddingLen - 1,
+    <<Payload:PayloadLen/binary, _Padding:PaddingLen/binary>> = PayloadAndPadding,
+    ssh_message:decode(Payload);
+
+receive_kexinit(S, Ack) ->
+    ct:log("Has ~p bytes, need more",[size(Ack)]),
+    receive
+        {tcp, S, Bin0} when is_binary(Bin0) ->
+            receive_kexinit(S, <<Ack/binary, Bin0/binary>>);
+        Other ->
+            ct:log("Bad hello string (line ~p):~n~p",[?LINE,Other]),
+            ct:fail("Bad hello string received")
+
+    after 10000 ->
+            ct:log("Timeout waiting for kexinit!~n~s",[Ack]),
+            throw(timeout)
+    end.
+
+%%%----------------------------------------------------------------
+%%% Test of sftp from the OpenSSH client side
+%%%
+
+sftp_tests_erl_server(Config, ServerIP, ServerPort, ServerRootDir, UserDir) ->
+    try
+        Cmnds = prepare_local_directory(ServerRootDir),
+        call_sftp_in_docker(Config, ServerIP, ServerPort, Cmnds, UserDir),
+        check_local_directory(ServerRootDir)
+    catch
+        Class:Error ->
+            ST = erlang:get_stacktrace(),
+            {error, {Class,Error,ST}}
+    end.
+
+
+prepare_local_directory(ServerRootDir) ->
+    file:write_file(filename:join(ServerRootDir,"tst1"),
+                    <<"Some test text">>
+                   ),
+    ["get tst1",
+     "put tst1 tst2",
+     "put tst1 tst3",
+     "rename tst1 ex_tst1",
+     "rm tst3",
+     "mkdir mydir",
+     "cd mydir",
+     "put tst1 file_1",
+     "put tst1 unreadable_file",
+     "chmod 222 unreadable_file",
+     "exit"].
+
+check_local_directory(ServerRootDir) ->
+    case lists:sort(ok(file:list_dir(ServerRootDir)) -- [".",".."]) of
+        ["ex_tst1","mydir","tst2"] ->
+            {ok,Expect} = file:read_file(filename:join(ServerRootDir,"ex_tst1")),
+            case file:read_file(filename:join(ServerRootDir,"tst2")) of
+                {ok,Expect} ->
+                    case lists:sort(ok(file:list_dir(filename:join(ServerRootDir,"mydir"))) -- [".",".."]) of
+                        ["file_1","unreadable_file"] ->
+                            case file:read_file(filename:join([ServerRootDir,"mydir","file_1"])) of
+                                {ok,Expect} ->
+                                    case file:read_file(filename:join([ServerRootDir,"mydir","unreadable_file"])) of
+                                        {error,_} ->
+                                            ok;
+                                        {ok,_} ->
+                                            {error, {could_read_unreadable,"mydir/unreadable_file"}}
+                                    end;
+                                {ok,Other} ->
+                                    ct:log("file_1:~n~s~nExpected:~n~s",[Other,Expect]),
+                                    {error, {bad_contents_in_file,"mydir/file_1"}}
+                            end;
+                        Other ->
+                            ct:log("Directory ~s~n~p",[filename:join(ServerRootDir,"mydir"),Other]),
+                            {error,{bad_dir_contents,"mydir"}}
+                    end;
+                {ok,Other} ->
+                    ct:log("tst2:~n~s~nExpected:~n~s",[Other,Expect]),
+                    {error, {bad_contents_in_file,"tst2"}}
+            end;
+        ["tst1"] ->
+            {error,{missing_file,"tst2"}};
+        Other ->
+            ct:log("Directory ~s~n~p",[ServerRootDir,Other]),
+            {error,{bad_dir_contents,"/"}}
+    end.
+
+call_sftp_in_docker(Config, ServerIP, ServerPort, Cmnds, UserDir) ->
+    {DockerIP,DockerPort} = ip_port(Config),
+    {ok,C} = ssh:connect(DockerIP, DockerPort,
+                         [{user,?USER},
+                          {password,?PASSWD},
+                          {user_dir, UserDir},
+                          {silently_accept_hosts,true},
+                          {user_interaction,false}
+                         ]),
+
+    %% Make commands for "expect" in the docker:
+    PreExpectCmnds = ["spawn /buildroot/ssh/bin/sftp -oPort="++integer_to_list(ServerPort)++
+                          " -oCheckHostIP=no -oStrictHostKeyChecking=no " ++
+                          iptoa(ServerIP)++"\n"
+                     ],
+    PostExpectCmnds= [],
+    ExpectCmnds = 
+        PreExpectCmnds ++
+        ["expect \"sftp>\" {send \""++Cmnd++"\n\"}\n" || Cmnd <- Cmnds] ++
+        PostExpectCmnds,
+    
+    %% Make an commands file in the docker
+    {ok,Ch} = ssh_sftp:start_channel(C, [{timeout,10000}]),
+    ok = ssh_sftp:write_file(Ch, "commands", erlang:iolist_to_binary(ExpectCmnds)),
+    ok = ssh_sftp:stop_channel(Ch),
+
+    %% Call expect in the docker
+    {ok, Ch1} = ssh_connection:session_channel(C, infinity),
+    Kex1 = renegotiate_test(init, C),
+    success = ssh_connection:exec(C, Ch1, "expect commands", infinity),
+
+    renegotiate_test(Kex1, C),
+    recv_log_msgs(C, Ch1),
+
+    %% Done.
+    ssh:close(C).
+
+recv_log_msgs(C, Ch) ->
+    receive
+        {ssh_cm,C,{closed,Ch}} ->
+            %% ct:log("Channel closed ~p",[{closed,1}]),
+            ok;
+        {ssh_cm,C,{data,Ch,1,Msg}} ->
+            ct:log("*** ERROR from docker:~n~s",[Msg]),
+            recv_log_msgs(C, Ch);
+        {ssh_cm,C,_Msg} ->
+            %% ct:log("Got ~p",[_Msg]),
+            recv_log_msgs(C, Ch)
+    end.
+
+%%%----------------------------------------------------------------
+%%%----------------------------------------------------------------
+%%%
+%%% Tests from the Erlang client side
+%%%
+%%%----------------------------------------------------------------
+%%%----------------------------------------------------------------
+test_erl_client_reneg({ok,C}, Spec) ->
+    %% Start the test processes on the connection C:
+    Parent = self(),
+    Pids = [spawn(
+              fun() ->
+                      Parent ! {self(), TestType, Id, one_test_erl_client(TestType,Id,C)}
+              end
+             ) 
+            || {TestType,N} <- Spec,
+               Id <- lists:seq(1,N)],
+
+    Kex1 = renegotiate_test(init, C),
+
+    %% Collect the results:
+    case lists:filter(
+           fun(R) -> R=/=ok end,
+           [receive
+                {Pid,_TestType,_Id,ok} ->
+                    %% ct:log("Test ~p:~p passed!", [_TestType,_Id]),
+                    ok;
+                {Pid,TestType,Id,OtherResult} ->
+                    ct:log("~p:~p ~p ~p~n~p",[?MODULE,?LINE,TestType,Id,OtherResult]),
+                    {error,TestType,Id}
+            end || Pid <- Pids])
+    of
+        [] ->
+            renegotiate_test(Kex1, C),
+            {ok,C};
+        Other ->
+            renegotiate_test(Kex1, C),
+            Other
+    end;
+
+test_erl_client_reneg(Error, _) ->
+    Error.
+
+
+one_test_erl_client(exec, Id, C) ->
+    {ok, Ch} = ssh_connection:session_channel(C, infinity),
+    success = ssh_connection:exec(C, Ch, "echo Hi there", 5000),
+    case loop_until(fun({eof,_}) -> true;
+                       (_      ) -> false
+                    end,
+                    fun(Acc) ->
+                            receive
+                                {ssh_cm, C, {eof,Ch}} ->
+                                    {eof,Acc};
+                                {ssh_cm, C, {data,Ch,0,B}} when is_binary(B) ->
+                                    <<Acc/binary, B/binary>>
+                            end
+                    end,
+                    <<>>) of
+        {eof,<<"Hi there\n">>} ->
+            ok;
+        Other ->
+            ct:pal("exec Got other ~p", [Other]),
+            {error, {exec,Id,bad_msg,Other,undefined}}
+    end;
+
+one_test_erl_client(no_subsyst, Id, C) ->
+    {ok, Ch} = ssh_connection:session_channel(C, infinity),
+    case ssh_connection:subsystem(C, Ch, "foo", infinity) of
+        failure ->
+            ok;
+        Other ->
+            ct:pal("no_subsyst Got other ~p", [Other]),
+            {error, {no_subsyst,Id,bad_ret,Other,undefined}}
+    end;
+
+one_test_erl_client(setenv, Id, C) ->
+    {ok, Ch} = ssh_connection:session_channel(C, infinity),
+    Var = "ENV_TEST",
+    Value = lists:concat(["env_test_",Id,"_",erlang:system_time()]),
+    Env = case ssh_connection:setenv(C, Ch, Var, Value, infinity) of
+	      success -> binary_to_list(Value++"\n");
+	      failure -> <<"\n">>
+	  end,
+    success = ssh_connection:exec(C, Ch, "echo $"++Var, 5000),
+    case loop_until(fun({eof,_}) -> true;
+                       (_      ) -> false
+                    end,
+                    fun(Acc) ->
+                            receive
+                                {ssh_cm, C, {eof,Ch}} ->
+                                    {eof,Acc};
+                                {ssh_cm, C, {data,Ch,0,B}} when is_binary(B) ->
+                                    <<Acc/binary, B/binary>>
+                            end
+                    end,
+                    <<>>) of
+        {eof,Env} ->
+            ok;
+        Other ->
+            ct:pal("setenv Got other ~p", [Other]),
+            {error, {setenv,Id,bad_msg,Other,undefined}}
+    end;
+
+one_test_erl_client(SFTP, Id, C) when SFTP==sftp ; SFTP==sftp_async ->
+    try
+        {ok,Ch} = ssh_sftp:start_channel(C, [{timeout,10000}]),
+        %% A new fresh name of a new file tree:
+        RootDir = lists:concat(["r_",Id,"_",erlang:system_time()]),
+        %% Check that it does not exist:
+        false = lists:member(RootDir, ok(ssh_sftp:list_dir(Ch, "."))),
+        %% Create it:
+        ok = ssh_sftp:make_dir(Ch, RootDir),
+        {ok, #file_info{type=directory, access=read_write}} = ssh_sftp:read_file_info(Ch, RootDir),
+        R = do_sftp_tests_erl_client(SFTP, C, Ch, Id, RootDir),
+        catch ssh_sftp:stop_channel(Ch),
+        R
+    catch
+        Class:Error ->
+            ST = erlang:get_stacktrace(),
+            {error, {SFTP,Id,Class,Error,ST}}
+    end.
+
+
+
+do_sftp_tests_erl_client(sftp_async, _C, Ch, _Id, RootDir) ->
+    FileName1 = "boring_name",
+    F1 = filename:join(RootDir, FileName1),
+    %% Open a new handle and start writing:
+    {ok,Handle1} = ssh_sftp:open(Ch, F1, [write,binary]),
+    {async,Aref1} = ssh_sftp:awrite(Ch, Handle1, <<0:250000/unsigned-unit:8>>),
+    wait_for_async_result(Aref1);
+
+do_sftp_tests_erl_client(sftp, _C, Ch, _Id, RootDir) ->
+    FileName0 = "f0",
+    F0 = filename:join(RootDir, FileName0),
+
+    %% Create and write a file:
+    ok = ssh_sftp:write_file(Ch,
+                             F0 = filename:join(RootDir, FileName0),
+                             Data0 = mkbin(1234,240)),
+    {ok,Data0} = ssh_sftp:read_file(Ch, F0),
+    {ok, #file_info{type=regular, access=read_write, size=1234}} = ssh_sftp:read_file_info(Ch, F0),
+
+    %% Re-write:
+    {ok,Handle0} = ssh_sftp:open(Ch, F0, [write,read,binary]),
+    ok = ssh_sftp:pwrite(Ch, Handle0, 16, Data0_1=mkbin(10,255)),
+
+    <<B1:16/binary, _:10/binary, B2:(1234-26)/binary>> = Data0,
+    FileContents = <<B1:16/binary, Data0_1:10/binary, B2:(1234-26)/binary>>,
+
+    <<_:1/binary, Part:25/binary, _/binary>> = FileContents,
+    {ok, Part} = ssh_sftp:pread(Ch, Handle0, 1, 25),
+
+    %% Check:
+    {ok, FileContents} = ssh_sftp:pread(Ch, Handle0, 0, 1234),
+    ok = ssh_sftp:close(Ch, Handle0),
+
+    %% Check in another way:
+    {ok, FileContents} = ssh_sftp:read_file(Ch, F0),
+
+    %% Remove write access rights and check that it can't be written:
+    ok = ssh_sftp:write_file_info(Ch, F0, #file_info{mode=8#400}), %read}),
+    {ok, #file_info{type=regular, access=read}} = ssh_sftp:read_file_info(Ch, F0),
+    {error,permission_denied} = ssh_sftp:write_file(Ch, F0, mkbin(10,14)),
+
+    %% Test deletion of file and dir:
+    [FileName0] = ok(ssh_sftp:list_dir(Ch, RootDir)) -- [".", ".."],
+    ok = ssh_sftp:delete(Ch, F0),
+    [] = ok(ssh_sftp:list_dir(Ch, RootDir)) -- [".", ".."],
+    ok = ssh_sftp:del_dir(Ch, RootDir),
+    false = lists:member(RootDir, ok(ssh_sftp:list_dir(Ch, "."))),
+    ok.
+
+
+wait_for_async_result(Aref) ->
+    receive
+        {async_reply, Aref, Result} ->
+            Result
+    after
+        60000 ->
+            timeout
+    end.
+
+
+mkbin(Size, Byte) ->
+    list_to_binary(lists:duplicate(Size,Byte)).
+
+ok({ok,X}) -> X.
+    
+%%%----------------------------------------------------------------
+renegotiate_test(init, ConnectionRef) ->
+    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
+    ssh_connection_handler:renegotiate(ConnectionRef),
+    %%ct:log("Renegotiate test initiated!",[]),
+    Kex1;
+
+renegotiate_test(Kex1, ConnectionRef) ->
+    case ssh_test_lib:get_kex_init(ConnectionRef) of
+        Kex1 ->
+            ct:log("Renegotiate test failed, Kex1 == Kex2!",[]),
+            error(renegotiate_failed);
+        _ ->
+            %% ct:log("Renegotiate test passed!",[]),
+            ok
+    end.
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-base-image b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-base-image
new file mode 100755
index 0000000000..1cb7bf33e1
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-base-image
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+UBUNTU_VER=${1:-16.04}
+
+USER=sshtester
+PWD=foobar
+
+docker build \
+    -t ubuntubuildbase \
+    --build-arg https_proxy=$HTTPS_PROXY \
+    --build-arg http_proxy=$HTTP_PROXY \
+    - <<EOF
+
+    FROM ubuntu:$UBUNTU_VER
+    WORKDIR /buildroot
+
+    # Prepare for installing OpenSSH
+    RUN apt-get update
+    RUN apt-get upgrade -y
+    RUN apt-get -y install apt-utils
+    RUN apt-get -y install build-essential zlib1g-dev
+    RUN apt-get -y install sudo iputils-ping tcptraceroute net-tools
+    RUN apt-get -y install sshpass expect
+    RUN apt-get -y install libpam0g-dev
+
+    # A user for the tests
+    RUN (echo $PWD; echo $PWD; echo; echo; echo; echo; echo; echo ) | adduser $USER
+    RUN adduser $USER sudo
+
+    # Prepare the privsep preauth environment for openssh
+    RUN  mkdir -p /var/empty
+    RUN  chown root:sys /var/empty
+    RUN  chmod 755 /var/empty
+    RUN  groupadd -f sshd
+    RUN  ls /bin/false
+    RUN  id -u sshd 2> /dev/null || useradd -g sshd -c 'sshd privsep' -d /var/empty -s /bin/false sshd
+
+EOF
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh
new file mode 100755
index 0000000000..85973081d0
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# ./create-dropbear-ssh
+
+# This way of fetching the tar-file separate from the docker commands makes
+# http-proxy handling way easier. The wget command handles the $https_proxy
+# variable while the docker command must have /etc/docker/something changed
+# and the docker server restarted. That is not possible without root access.
+
+# Make a Dockerfile. This method simplifies env variable handling considerably:
+cat - > TempDockerFile <<EOF
+
+    FROM ubuntubuildbase
+
+    WORKDIR /buildroot
+
+    RUN apt-get -y update
+    RUN apt-get -y upgrade
+    RUN apt-get -y install openssh-sftp-server
+%%    RUN echo 81 | apt-get -y install dropbear
+
+EOF
+
+# Build the image:
+docker build -t ssh_compat_suite-ssh-dropbear -f ./TempDockerFile .
+
+# Cleaning
+rm -fr ./TempDockerFile $TMP
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh-run b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh-run
new file mode 100755
index 0000000000..d98c0cfaa3
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh-run
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# ./create-dropbear-ssh-run
+
+VER=v2016.72
+
+# This way of fetching the tar-file separate from the docker commands makes
+# http-proxy handling way easier. The wget command handles the $https_proxy
+# variable while the docker command must have /etc/docker/something changed
+# and the docker server restarted. That is not possible without root access.
+
+# Make a Dockerfile. This method simplifies env variable handling considerably:
+cat - > TempDockerFile <<EOF
+
+    FROM ssh_compat_suite-ssh-dropbear-installed:${VER}
+
+    WORKDIR /buildroot
+
+    CMD dropbear -F -p 1234
+
+EOF
+
+# Build the image:
+docker build -t ssh_compat_suite-ssh:dropbear${VER} -f ./TempDockerFile .
+
+# Cleaning
+rm -fr ./TempDockerFile $TMP
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssh-image b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssh-image
new file mode 100755
index 0000000000..2e08408841
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssh-image
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# ./create-image openssh 7.3p1 openssl 1.0.2m
+
+set -x
+
+case $1 in
+    openssh)
+	FAMssh=openssh
+	VERssh=$2
+	PFX=https://ftp.eu.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-
+	SFX=.tar.gz
+	TMP=tmp.tar.gz
+	;;
+    *)
+	echo "Unsupported: $1"
+	exit
+esac
+
+FAMssl=$3
+VERssl=$4
+
+VER=${FAMssh}${VERssh}-${FAMssl}${VERssl}
+
+# This way of fetching the tar-file separate from the docker commands makes
+# http-proxy handling way easier. The wget command handles the $https_proxy
+# variable while the docker command must have /etc/docker/something changed
+# and the docker server restarted. That is not possible without root access.
+
+# Make a Dockerfile. This method simplifies env variable handling considerably:
+cat - > TempDockerFile <<EOF
+
+    FROM  ssh_compat_suite-${FAMssl}:${VERssl}
+
+    LABEL openssh-version=${VER}
+
+    WORKDIR /buildroot
+
+    COPY ${TMP} .
+    RUN  tar xf ${TMP}
+
+    # Build and install
+
+    WORKDIR ${FAMssh}-${VERssh}
+
+    # Probably VERY OpenSSH dependent...:
+    RUN ./configure --without-pie \
+                    --prefix=/buildroot/ssh \
+                    --with-ssl-dir=/buildroot/ssl \
+                    --with-pam \
+                    LDFLAGS=-Wl,-R/buildroot/ssl/lib
+    RUN  make
+    RUN  make install
+    RUN  echo UsePAM yes >> /buildroot/ssh/etc/sshd_config
+
+    RUN echo Built ${VER}
+
+    # Start the daemon, but keep it in foreground to avoid killing the container
+    CMD /buildroot/ssh/sbin/sshd -D -p 1234
+
+EOF
+
+# Fetch the tar file. This could be done in an "ADD ..." in the Dockerfile,
+# but then we hit the proxy problem...
+wget -O $TMP $PFX$VERssh$SFX
+
+# Build the image:
+docker build -t  ssh_compat_suite-ssh:$VER -f ./TempDockerFile .
+
+# Cleaning
+rm -fr ./TempDockerFile $TMP
+
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image
new file mode 100755
index 0000000000..4ab2a8bddc
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# ./create-image openssl 1.0.2m
+
+case "$1" in
+    "openssl")
+	FAM=openssl
+	VER=$2
+	PFX=https://www.openssl.org/source/openssl-
+	SFX=.tar.gz
+	TMP=tmp.tar.gz
+	;;
+    "libressl")
+	FAM=libressl
+	VER=$2
+	PFX=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-
+	SFX=.tar.gz
+	TMP=tmp.tar.gz
+	;;
+    *)
+	echo No lib type
+	exit
+	;;
+esac
+
+case $1$2 in
+    openssl0.9.8[a-l])
+        CONFIG_FLAGS=no-asm
+	;;
+    *)
+	CONFIG_FLAGS=
+	;;
+esac
+
+
+# This way of fetching the tar-file separate from the docker commands makes
+# http-proxy handling way easier. The wget command handles the $https_proxy
+# variable while the docker command must have /etc/docker/something changed
+# and the docker server restarted. That is not possible without root access.
+
+# Make a Dockerfile. This method simplifies env variable handling considerably:
+cat - > TempDockerFile <<EOF
+
+    FROM ubuntubuildbase
+
+    LABEL version=$FAM-$VER
+
+    WORKDIR /buildroot
+
+    COPY ${TMP} .
+    RUN  tar xf ${TMP}
+
+    WORKDIR ${FAM}-${VER}
+
+    RUN  ./config --prefix=/buildroot/ssl ${CONFIG_FLAGS}
+
+    RUN  make
+    RUN  make install_sw
+
+    RUN  echo Built ${FAM}-${VER}
+EOF
+
+# Fetch the tar file. This could be done in an "ADD ..." in the Dockerfile,
+# but then we hit the proxy problem...
+wget -O $TMP $PFX$VER$SFX
+
+# Build the image:
+docker build -t ssh_compat_suite-$FAM:$VER -f ./TempDockerFile .
+
+# Cleaning
+rm -fr ./TempDockerFile $TMP
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create_all b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create_all
new file mode 100755
index 0000000000..0dcf8cb570
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create_all
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+UBUNTU_VERSION=16.04
+
+SSH_SSL_VERSIONS=(\
+        openssh 4.4p1  openssl  0.9.8c  \
+        openssh 4.5p1  openssl  0.9.8m  \
+        openssh 5.0p1  openssl  0.9.8za \
+        openssh 6.2p2  openssl  0.9.8c  \
+        openssh 6.3p1  openssl  0.9.8zh \
+                                        \
+        openssh 7.1p1  openssl  1.0.0a  \
+                                        \
+        openssh 7.1p1  openssl  1.0.1p  \
+                                        \
+        openssh 6.6p1  openssl  1.0.2n  \
+        openssh 7.1p1  openssl  1.0.2n  \
+        openssh 7.6p1  openssl  1.0.2n  \
+                                        \
+        openssh 7.6p1  libressl 2.6.4   \
+	)
+
+if [ "x$1" == "x-b" ]
+then
+    shift
+    SKIP_CREATE_BASE=true
+fi
+
+WHAT_TO_DO=$1
+
+function create_one_image ()
+{
+    SSH_FAM=$1
+    SSH_VER=$2
+    SSL_FAM=$3
+    SSL_VER=$4
+
+    [ "x$SKIP_CREATE_BASE" == "xtrue" ] || ./create-base-image || (echo "Create base failed." >&2; exit 1)
+    ./create-ssl-image $SSL_FAM $SSL_VER  \
+	|| (echo "Create $SSL_FAM $SSL_VER failed." >&2; exit 2)
+
+    ./create-ssh-image $SSH_FAM $SSH_VER $SSL_FAM $SSL_VER  \
+	|| (echo "Create $SSH_FAM $SSH_VER on $SSL_FAM $SSL_VER failed." >&2; exit 3)
+}
+
+
+case ${WHAT_TO_DO} in
+    list)
+	;;
+    listatoms)
+	PRE="["
+	POST="]"
+	C=\'
+	COMMA=,
+	;;
+    build_one)
+	if [ $# != 5 ]
+	then
+	    echo "$0 build_one openssh SSH_ver  openssl SSL_ver " && exit 
+	else
+	    create_one_image $2 $3 $4 $5
+	    exit
+	fi
+	;;
+    build_all)
+	;;
+    *)
+	echo "$0 [-b] list | listatoms | build_one openssh SSH_ver openssl SSL_ver | build_all" && exit
+	;;
+esac
+ 
+
+echo -n $PRE
+i=0
+while [ "x${SSH_SSL_VERSIONS[i]}" != "x" ]
+do
+   case ${WHAT_TO_DO} in
+       list*)
+	   [ $i -eq  0 ] || echo $COMMA
+	   echo -n $C${SSH_SSL_VERSIONS[$i]}${SSH_SSL_VERSIONS[$(( $i + 1 ))]}-${SSH_SSL_VERSIONS[$(( $i + 2 ))]}${SSH_SSL_VERSIONS[$(( $i + 3 ))]}$C
+	   ;;
+       build_all)
+	   create_one_image ${SSH_SSL_VERSIONS[$i]} ${SSH_SSL_VERSIONS[$(( $i + 1 ))]} ${SSH_SSL_VERSIONS[$(( $i + 2 ))]} ${SSH_SSL_VERSIONS[$(( $i + 3 ))]}
+	   ;;
+   esac
+
+   i=$(( $i + 4 ))
+done
+echo $POST
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key
new file mode 100644
index 0000000000..8b2354a7ea
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBugIBAAKBgQDlXDEddxFbTtPsu2bRTbSONFVKMxe430iqBoXoKK2Gyhlqn7J8
+SRGlmvTN7T06+9iFqgJi+x+dlSJGlNEY/v67Z8C7rWfJynYuRier4TujLwP452RT
+YrsnCq47pGJXHb9xAWr7UGMv85uDrECUiIdK4xIrwpW/gMb5zPSThDGNiwIVANts
+B9nBX0NH/B0lXthVCg2jRSkpAoGAIS3vG8VmjQNYrGfdcdvQtGubFXs4jZJO6iDe
+9u9/O95dcnH4ZIL4y3ZPHbw73dCKXFe5NlqI/POmn3MyFdpyqH5FTHWB/aAFrma6
+qo00F1mv83DkQCEfg6fwE/SaaBjDecr5I14hWOtocpYqlY1/x1aspahwK6NLPp/D
+A4aAt78CgYAmNgr3dnHgMXrEsAeHswioAad3YLtnPvdFdHqd5j4oSbgKwFd7Xmyq
+blfeQ6rRo8dmUF0rkUU8cn71IqbhpsCJQEZPt9WBlhHiY95B1ELKYHoHCbZA8qrZ
+iEIcfwch85Da0/uzv4VE0UHTC0P3WRD3sZDfXd9dZLdc80n6ImYRpgIURgW8SZGj
+X0mMkMJv/Ltdt0gYx60=
+-----END DSA PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key.pub b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key.pub
new file mode 100644
index 0000000000..9116493472
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key.pub
@@ -0,0 +1 @@
+ssh-dss AAAAB3NzaC1kc3MAAACBAOVcMR13EVtO0+y7ZtFNtI40VUozF7jfSKoGhegorYbKGWqfsnxJEaWa9M3tPTr72IWqAmL7H52VIkaU0Rj+/rtnwLutZ8nKdi5GJ6vhO6MvA/jnZFNiuycKrjukYlcdv3EBavtQYy/zm4OsQJSIh0rjEivClb+AxvnM9JOEMY2LAAAAFQDbbAfZwV9DR/wdJV7YVQoNo0UpKQAAAIAhLe8bxWaNA1isZ91x29C0a5sVeziNkk7qIN7273873l1ycfhkgvjLdk8dvDvd0IpcV7k2Woj886afczIV2nKofkVMdYH9oAWuZrqqjTQXWa/zcORAIR+Dp/AT9JpoGMN5yvkjXiFY62hyliqVjX/HVqylqHAro0s+n8MDhoC3vwAAAIAmNgr3dnHgMXrEsAeHswioAad3YLtnPvdFdHqd5j4oSbgKwFd7XmyqblfeQ6rRo8dmUF0rkUU8cn71IqbhpsCJQEZPt9WBlhHiY95B1ELKYHoHCbZA8qrZiEIcfwch85Da0/uzv4VE0UHTC0P3WRD3sZDfXd9dZLdc80n6ImYRpg== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256 b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256
new file mode 100644
index 0000000000..5ed2b361cc
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEILwQIf+Jul+oygeJn7cBSvn2LGqnW1ZfiHDQMDXZ96mooAoGCCqGSM49
+AwEHoUQDQgAEJUo0gCIhXEPJYvxec23IAjq7BjV1xw8deI8JV9vL5BMCZNhyj5Vt
+NbFPbKPuL/Sikn8p4YP/5y336ug7szvYrg==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256.pub b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256.pub
new file mode 100644
index 0000000000..240387d901
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCVKNIAiIVxDyWL8XnNtyAI6uwY1dccPHXiPCVfby+QTAmTYco+VbTWxT2yj7i/0opJ/KeGD/+ct9+roO7M72K4= uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384 b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384
new file mode 100644
index 0000000000..9d31d75cd5
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384
@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDBw+P1sic2i41wTGQgjyUlBtxQfnY77L8TFcDngoRiVrbCugnDrioNo
+JogqymWhSC+gBwYFK4EEACKhZANiAATwaqEp3vyLzfb08kqgIZLv/mAYJyGD+JMt
+f11OswGs3uFkbHZOErFCgeLuBvarSTAFkOlMR9GZGaDEfcrPBTtvKj+jEaAvh6yr
+JxS97rtwk2uadDMem2x4w9Ga4jw4S8E=
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384.pub b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384.pub
new file mode 100644
index 0000000000..cca85bda72
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBPBqoSne/IvN9vTySqAhku/+YBgnIYP4ky1/XU6zAaze4WRsdk4SsUKB4u4G9qtJMAWQ6UxH0ZkZoMR9ys8FO28qP6MRoC+HrKsnFL3uu3CTa5p0Mx6bbHjD0ZriPDhLwQ== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521 b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521
new file mode 100644
index 0000000000..b698be1ec9
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521
@@ -0,0 +1,7 @@
+-----BEGIN EC PRIVATE KEY-----
+MIHcAgEBBEIBtGVvyn7kGX7BfWAYHK2ZXmhWscTOV0J0mAfab0u0ZMw0id2a3O9s
+sBjJoCqoAXTJ7d/OUw85qqQNDE5GDQpDFq6gBwYFK4EEACOhgYkDgYYABAHPWfUD
+tQ/JmfwmmSdWWjGm94hFqwaivI4H43acDdd71+vods4rN2Yh3X7fSUvJkeOhXFOJ
+yO9F+61ssKgS0a0nxQEvdXks3QyfKTPjYQuBUvY+AV/A4AskPBz731xCDmbYuWuh
+RPekZ7d5bF0U0pGlExbX+naQJMSbJSdZrPM9993EmA==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521.pub b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521.pub
new file mode 100644
index 0000000000..d181d30d69
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHPWfUDtQ/JmfwmmSdWWjGm94hFqwaivI4H43acDdd71+vods4rN2Yh3X7fSUvJkeOhXFOJyO9F+61ssKgS0a0nxQEvdXks3QyfKTPjYQuBUvY+AV/A4AskPBz731xCDmbYuWuhRPekZ7d5bF0U0pGlExbX+naQJMSbJSdZrPM9993EmA== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key
new file mode 100644
index 0000000000..84096298ca
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAuC6uxC0P8voYQCrwJzczo9iSiwsovPv4etd2BLnu8cKWdnjR
+34tWvtguw2kO+iDyt4hFGGfDBQf2SXl+ZEsE2N1RlSp5A73me2byw/L4MreX2rbU
+TwyNXF3TBvKb3Gbpx7PoiB9frcb9RCMxtypBvGQD6bx6h5UWKuSkYzARaRLv3kbB
+swcqfrA3PfWybkIoaa2RO1Ca86u6K0v+a4r0OfRxTnghuakZkH6CD7+uU3irliPI
+UFt2wTI/qWmnDrMFh4RffToHK0QZHXdkq4ama5kRZdZ0svSorxqkl8EWGPhReoUj
+Yrz0bCNevSlDxHCxLi8epRxuv+AhZHW0YdMCCwIDAQABAoIBAHUyj1aZbfqolWHP
+cL0jbSKnHqiHU0bd9sED9T8QqTEBJwj/3Fwop+wMV8VURol3CbsrZPwgmoHLDTa3
+rmtXKSBtxAns2tA8uDpxyaxSIQj0thYgHHyoehL6SNu06OSYP84pdp+XhyRm6KXA
+11O7+dRMuAi1PCql/VMR5mCPJ6T5qWAVYHFyEBvMm4q5yYSRSPaAaZHC6WbEsxHN
+jGzcyl3tvmOyN0+M7v0U86lQ+H2tSXH+nQg/Ig6hWgFGg8AYoos/9yUGOY+e9bUE
+serYdsuiyxBfo4CgoSeDsjwNp1lAZ5UOrIDdRqK9C8jGVkHDzwfmmtczWXkVVzGZ
+Bd05izECgYEA31yHzSA/umamyZAQbi/5psk1Fc5m6MzsgmJmB6jm7hUZ0EbpSV4C
+6b1nOrk/IAtA12rvDHgWy0zpkJbC5b03C77RnBgTRgLQyolrcpLDJ47+Kxf/AHGk
+m63KaCpwZEQ4f9ARBXySD/jNoW9gz5S6Xa3RnHOC70DsIIk5VOCjWk0CgYEA0xiM
+Ay27PJcbAG/4tnjH8DZfHb8SULfnfUj8kMe3V2SDPDWbhY8zheo45wTBDRflFU5I
+XyGmfuZ7PTTnFVrJz8ua3mAMOzkFn4MmdaRCX9XtuE4YWq3lFvxlrJvfXSjEL0km
+8UwlhJMixaEPqFQjsKc9BHwWKRiKcF4zFQ1DybcCgYB46yfdhYLaj23lmqc6b6Bw
+iWbCql2N1DqJj2l65hY2d5fk6C6s+EcNcOrsoJKq70yoEgzdrDlyz+11yBg0tU2S
+fzgMkAAHG8kajHBts0QRK1kvzSrQe7VITjpQUAFOVpxbnTFJzhloqiHwLlKzremC
+g3IBh4svqO7r4j32VDI61QKBgQCQL4gS872cWSncVp7vI/iNHtZBHy2HbNX1QVEi
+Iwgb7U+mZIdh5roukhlj0l96bgPPVbUhJX7v1sX+vI/KikSmZk/V7IzuNrich5xR
+ZmzfwOOqq8z+wyBjXuqjx6P9oca+9Zxf3L8Tmtx5WNW1CCOImfKXiZopX9XPgsgp
+bPIMaQKBgQCql4uTSacSQ5s6rEEdvR+y6nTohF3zxhOQ+6xivm3Hf1mgTk40lQ+t
+sr6HsSTv8j/ZbhhtaUUb2efro3pDztjlxXFvITar9ZDB2B4QMlpSsDR9UNk8xKGY
+J9aYLr4fJC6J6VA7Wf0yq6LpjSXRH/2GeNtmMl5rFRsHt+VU7GZK9g==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key.pub b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key.pub
new file mode 100644
index 0000000000..4ac6e7b124
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4Lq7ELQ/y+hhAKvAnNzOj2JKLCyi8+/h613YEue7xwpZ2eNHfi1a+2C7DaQ76IPK3iEUYZ8MFB/ZJeX5kSwTY3VGVKnkDveZ7ZvLD8vgyt5fattRPDI1cXdMG8pvcZunHs+iIH1+txv1EIzG3KkG8ZAPpvHqHlRYq5KRjMBFpEu/eRsGzByp+sDc99bJuQihprZE7UJrzq7orS/5rivQ59HFOeCG5qRmQfoIPv65TeKuWI8hQW3bBMj+paacOswWHhF99OgcrRBkdd2SrhqZrmRFl1nSy9KivGqSXwRYY+FF6hSNivPRsI169KUPEcLEuLx6lHG6/4CFkdbRh0wIL uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa
new file mode 100644
index 0000000000..01a88acea2
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBvAIBAAKBgQC97XncQDaa9PQYEWK7llBxZQ2suVYTz1eadw2HtY+Y8ZKdUBLd
+9LUQ2lymUC9yq66rb5pBBR13k/9Zcbu8I0nafrZT4wJ4H0YGD6Ob5O4HR4EHjO5q
+hgnMJ17e1XnzI31MW5xAuAHTLLClNvnG05T1jaU+tRAsVSCHin3+sOenowIVAMSe
+ANBvw7fm5+Lw+ziOAHPjeYzRAoGBALkWCGpKmlJ65F3Y/RcownHQvsrDAllzKF/a
+cSfriCVVP5qVZ3Ach28ZZ9BFEnRE2SKqVsyBAiceb/+ISlu8CqKEvvoNIMJAu5rU
+MwZh+PeHN4ES6tWTwBGAwu84ke6N4BgV+6Q4qkcyywHsT5oU0EdVbn2zzAZw8c7v
+BpbsJ1KsAoGABraHWqSFhaX4+GHmtKwXZFVRKh/4R6GR2LpkFzGm3Ixv+eo9K5CI
+TjiBYiVMrWH23G1LiDuJyMGqHEnIef+sorNfNzdnwq+8qRCTS6mbpRXkUt9p1arJ
+MIKmosS+GFhTN6Z85gCwC51S2EDC4GW7J4ViHKacr1FwJSw9RC9F+WsCFQCRJayH
+P4vM1XUOVEeX7u04K1EAFg==
+-----END DSA PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa.pub b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa.pub
new file mode 100644
index 0000000000..30661d5adf
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa.pub
@@ -0,0 +1 @@
+ssh-dss AAAAB3NzaC1kc3MAAACBAL3tedxANpr09BgRYruWUHFlDay5VhPPV5p3DYe1j5jxkp1QEt30tRDaXKZQL3KrrqtvmkEFHXeT/1lxu7wjSdp+tlPjAngfRgYPo5vk7gdHgQeM7mqGCcwnXt7VefMjfUxbnEC4AdMssKU2+cbTlPWNpT61ECxVIIeKff6w56ejAAAAFQDEngDQb8O35ufi8Ps4jgBz43mM0QAAAIEAuRYIakqaUnrkXdj9FyjCcdC+ysMCWXMoX9pxJ+uIJVU/mpVncByHbxln0EUSdETZIqpWzIECJx5v/4hKW7wKooS++g0gwkC7mtQzBmH494c3gRLq1ZPAEYDC7ziR7o3gGBX7pDiqRzLLAexPmhTQR1VufbPMBnDxzu8GluwnUqwAAACABraHWqSFhaX4+GHmtKwXZFVRKh/4R6GR2LpkFzGm3Ixv+eo9K5CITjiBYiVMrWH23G1LiDuJyMGqHEnIef+sorNfNzdnwq+8qRCTS6mbpRXkUt9p1arJMIKmosS+GFhTN6Z85gCwC51S2EDC4GW7J4ViHKacr1FwJSw9RC9F+Ws= uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa
new file mode 100644
index 0000000000..60e8f6eb6e
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIC557KPgmq+pWOAh1L8DV8GWW0u7W5vz6mim3FFB1l8koAoGCCqGSM49
+AwEHoUQDQgAEC3J5fQ8+8xQso0lhBdoLdvD14oSsQiMuweXq+Dy2+4Mjdw2/bbw0
+CvbE2+KWNcgwxRLycNGcMCBdf/cOgNyGkA==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256 b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256
new file mode 100644
index 0000000000..60e8f6eb6e
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIC557KPgmq+pWOAh1L8DV8GWW0u7W5vz6mim3FFB1l8koAoGCCqGSM49
+AwEHoUQDQgAEC3J5fQ8+8xQso0lhBdoLdvD14oSsQiMuweXq+Dy2+4Mjdw2/bbw0
+CvbE2+KWNcgwxRLycNGcMCBdf/cOgNyGkA==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256.pub b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256.pub
new file mode 100644
index 0000000000..b349d26da3
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAtyeX0PPvMULKNJYQXaC3bw9eKErEIjLsHl6vg8tvuDI3cNv228NAr2xNviljXIMMUS8nDRnDAgXX/3DoDchpA= sshtester@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384 b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384
new file mode 100644
index 0000000000..ece6c8f284
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384
@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDBdgJs/xThHiy/aY1ymtQ4B0URNnRCm8l2WZMFjua57+nvq4Duf+igN
+pN/5p/+azLKgBwYFK4EEACKhZANiAATUw6pT/UW2HvTW6lL2BGY7NfUGEX285XVi
+9AcTXH1K+TOekbGmcpSirlGzSb15Wycajpmaae5vAzH1nnvcVd3FYODVdDXTHgV/
+FeXQ+vaw7CZnEAKZsr8mjXRX3fEyO1E=
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384.pub b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384.pub
new file mode 100644
index 0000000000..fd81e220f7
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBNTDqlP9RbYe9NbqUvYEZjs19QYRfbzldWL0BxNcfUr5M56RsaZylKKuUbNJvXlbJxqOmZpp7m8DMfWee9xV3cVg4NV0NdMeBX8V5dD69rDsJmcQApmyvyaNdFfd8TI7UQ== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521 b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521
new file mode 100644
index 0000000000..21c000ea03
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521
@@ -0,0 +1,7 @@
+-----BEGIN EC PRIVATE KEY-----
+MIHbAgEBBEEhm0w3xcGILU8eP61mThVBwCJfyzrFktGf7cCa1ciL4YLsukd20Q3Z
+yp0YcEDLcEm36CZGabgkEvblJ1Rx2lPTu6AHBgUrgQQAI6GBiQOBhgAEAYep8cX2
+7wUPw5pNYwFkWQXrJ2GSkmO8iHwkWJ6srRay/sF3WoPF/dyDVymFgirtsSTJ+D0u
+ex4qphOOJxkd1Yf+ANHvDFN9LoBvbgtNLTRJlpuNLCdWQlt+mEnPMDGMV/HWHHiz
+7/mWE+XUVIcQjhm5uv0ObI/wroZEurXMGEhTis3L
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521.pub b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521.pub
new file mode 100644
index 0000000000..d9830da5de
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGHqfHF9u8FD8OaTWMBZFkF6ydhkpJjvIh8JFierK0Wsv7Bd1qDxf3cg1cphYIq7bEkyfg9LnseKqYTjicZHdWH/gDR7wxTfS6Ab24LTS00SZabjSwnVkJbfphJzzAxjFfx1hx4s+/5lhPl1FSHEI4Zubr9DmyP8K6GRLq1zBhIU4rNyw== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa
new file mode 100644
index 0000000000..2e50ac2304
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA7+C3gLoflKybq4I+clbg2SWf6cXyHpnLNDnZeMvIbOz2X/Ce
+XUm17DFeexTaVBs9Zq9WwDFOFkLQhbuXgpvB0shSY0nr+Em7InRM8AiRLxPe0txM
+mFFhL+v083dYwgaJOo1PthNM/tGRZJu+0sQDqrmN7CusFHdZg2NTzTzbwWqPiuP/
+mf3o7W4CWqDTBzbYTgpWlH7vRZf9FYwT4on5YWzLA8TvO2TwBGTfTMK5nswH++iO
+v4jKecoEwyBFMUSKqZ9UYHGw/kshHbltM65Ye/xjXEX0GxDdxu8ZyVKXd4acNbJJ
+P0tcxN4GzKJiR6zNYwCzDhjqDEbM5qCGhShhgQIDAQABAoIBAQCucdGBP9mvmUcs
+Fu+q3xttTztYGqfVMSrhtCA/BJOhA0K4ypegZ/Zw6gY3pBaSi6y/fEuuQSz0a2qR
+lra8OOFflGa15hBA4/2/NKyu8swCXITy+1qIesYev43HcMePcolhl1qcorSfq2/8
+pnbDd+Diy0Y2thvSVmk2b4mF+/gkUx3CHLhgRMcxCHLG1VeqIfLf+pa0jIw94tZ5
+CoIoI096pDTsneO9xhh1QxWQRRFVqdf3Q9zyiBgJCggpX+1fVsbQejuEK4hKRBKx
+SRPX/pX5aU+7+KSZ/DbtXGg1sCw9NUDFTIEV3UPmko4oWawNGv/CQAK80g3go28v
+UnVf11BBAoGBAP2amIFp+Ps33A5eesT7g/NNkGqBEi5W37K8qzYJxqXJvH0xmpFo
+8a3Je3PQRrzbTUJyISA6/XNnA62+bEvWiEXPiK3stQzNHoVz7ftCb19zgW4sLKRW
+Qhjq7QsGeRrdksJnZ7ekfzOv658vHJPElS1MdPu2WWhiNvAjtmdyFQulAoGBAPIk
+6831QAnCdp/ffH/K+cqV9vQYOFig8n4mQNNC+sLghrtZh9kbmTuuNKAhF56vdCCn
+ABD/+RiLXKVsF0PvQ5g9wRLKaiJubXI7XEBemCCLhjtESxGpWEV8GalslUgE1cKs
+d1pwSVjd0sYt0gOAf2VRhlbpSWhXA2xVll34xgetAoGAHaI089pYN7K9SgiMO/xP
+3NxRZcCTSUrpdM9LClN2HOVH2zEyqI8kvnPuswfBXEwb6QnBCS0bdKKy8Vhw+yOk
+ZNPtWrVwKoDFcj6rrlKDBRpQI3mR9doGezboYANvn04I2iKPIgxcuMNzuvQcWL/9
+1n86pDcYl3Pyi3kA1XGlN+kCgYEAz1boBxpqdDDsjGa8X1y5WUviAw8+KD3ghj5R
+IdTnjbjeBUxbc38bTawUac0MQZexE0iMWQImFGs4sHkGzufwdErkqSdjjAoMc1T6
+4C9fifaOwO7wbLYZ3J2wB4/vn5RsSV6OcIVXeN2wXnvbqZ38+A+/vWnSrqJbTwdW
+Uy7yup0CgYEA8M9vjpAoCr3XzNDwJyWRQcT7e+nRYUNDlXBl3jpQhHuJtnSnkoUv
+HXYXEwvp8peycNzeVz5OwFVMzCH8OG4WiGN4Pmo0rDWHED/W7eIRHIitHGTzZ+Qw
+gRxscoewblSLSkYMXidBLmQjr4U5bDBesRuGhm5NuLyMTa1f3Pc/90k=
+-----END RSA PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa.pub b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa.pub
new file mode 100644
index 0000000000..26e560d4f8
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDv4LeAuh+UrJurgj5yVuDZJZ/pxfIemcs0Odl4y8hs7PZf8J5dSbXsMV57FNpUGz1mr1bAMU4WQtCFu5eCm8HSyFJjSev4SbsidEzwCJEvE97S3EyYUWEv6/Tzd1jCBok6jU+2E0z+0ZFkm77SxAOquY3sK6wUd1mDY1PNPNvBao+K4/+Z/ejtbgJaoNMHNthOClaUfu9Fl/0VjBPiiflhbMsDxO87ZPAEZN9MwrmezAf76I6/iMp5ygTDIEUxRIqpn1RgcbD+SyEduW0zrlh7/GNcRfQbEN3G7xnJUpd3hpw1skk/S1zE3gbMomJHrM1jALMOGOoMRszmoIaFKGGB uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index 9bbd9da817..9587c0c251 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -45,6 +45,8 @@ all() ->
      {group, openssh},
      small_interrupted_send,
      interrupted_send,
+     exec_erlang_term,
+     exec_erlang_term_non_default_shell,
      start_shell,
      start_shell_exec,
      start_shell_exec_fun,
@@ -85,13 +87,14 @@ init_per_suite(Config) ->
     ?CHECK_CRYPTO(Config).
 
 end_per_suite(Config) ->
+    catch ssh:stop(),
     Config.
 
 %%--------------------------------------------------------------------
 init_per_group(openssh, Config) ->
     case ssh_test_lib:gen_tcp_connect("localhost", 22, []) of
 	{error,econnrefused} ->
-	    {skip,"No openssh deamon"};
+	    {skip,"No openssh deamon (econnrefused)"};
 	{ok, Socket} ->
 	    gen_tcp:close(Socket),
 	    ssh_test_lib:openssh_sanity_check(Config)
@@ -542,6 +545,79 @@ start_shell_exec(Config) when is_list(Config) ->
     ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
+exec_erlang_term(Config) when is_list(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = proplists:get_value(data_dir, Config),
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {password, "morot"}
+                                            ]),
+
+    ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+						      {user, "foo"},
+						      {password, "morot"},
+						      {user_interaction, true},
+						      {user_dir, UserDir}]),
+
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+
+    success = ssh_connection:exec(ConnectionRef, ChannelId0,
+				  "1+2.", infinity),
+    TestResult =
+        receive
+            {ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"3",_/binary>>}} = R ->
+                ct:log("Got expected ~p",[R]);
+            Other ->
+                ct:log("Got unexpected ~p",[Other])
+        after 5000 ->
+                {fail,"Exec Timeout"}
+        end,
+
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid),
+    TestResult.
+
+%%--------------------------------------------------------------------
+exec_erlang_term_non_default_shell(Config) when is_list(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = proplists:get_value(data_dir, Config),
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {password, "morot"},
+                                             {shell, fun(U, H) -> start_our_shell(U, H) end}
+                                            ]),
+
+    ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+						      {user, "foo"},
+						      {password, "morot"},
+						      {user_interaction, true},
+						      {user_dir, UserDir}
+                                                     ]),
+
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+
+    success = ssh_connection:exec(ConnectionRef, ChannelId0,
+				  "1+2.", infinity),
+    TestResult =
+        receive
+            {ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"3",_/binary>>}} = R ->
+                ct:log("Got unexpected ~p",[R]),
+                {fail,"Could exec erlang term although non-erlang shell"};
+            Other ->
+                ct:log("Got expected ~p",[Other])
+        after 5000 ->
+                {fail, "Exec Timeout"}
+        end,
+
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid),
+    TestResult.
+
+%%--------------------------------------------------------------------
 start_shell_exec_fun() ->
     [{doc, "start shell to exec command"}].
 
@@ -800,6 +876,8 @@ stop_listener(Config) when is_list(Config) ->
 	    ssh:stop_daemon(Pid0),
 	    ssh:stop_daemon(Pid1);
 	Error ->
+	    ssh:close(ConnectionRef0),
+	    ssh:stop_daemon(Pid0),
 	    ct:fail({unexpected, Error})
     end.
 
@@ -819,11 +897,22 @@ start_subsystem_on_closed_channel(Config) ->
 						      {user_interaction, false},
 						      {user_dir, UserDir}]),
 
-    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
 
-    ok = ssh_connection:close(ConnectionRef, ChannelId),
+    {ok, ChannelId1} = ssh_connection:session_channel(ConnectionRef, infinity),
+    ok = ssh_connection:close(ConnectionRef, ChannelId1),
+    {error, closed} = ssh_connection:ptty_alloc(ConnectionRef, ChannelId1, []),
+    {error, closed} = ssh_connection:subsystem(ConnectionRef, ChannelId1, "echo_n", 5000),
+    {error, closed} = ssh_connection:exec(ConnectionRef, ChannelId1, "testing1.\n", 5000),
+    {error, closed} = ssh_connection:send(ConnectionRef, ChannelId1, "exit().\n", 5000),
 
-    {error, closed} = ssh_connection:subsystem(ConnectionRef, ChannelId, "echo_n", infinity),
+    %% Test that there could be a gap between close and an operation (Bugfix OTP-14939):
+    {ok, ChannelId2} = ssh_connection:session_channel(ConnectionRef, infinity),
+    ok = ssh_connection:close(ConnectionRef, ChannelId2),
+    timer:sleep(2000),
+    {error, closed} = ssh_connection:ptty_alloc(ConnectionRef, ChannelId2, []),
+    {error, closed} = ssh_connection:subsystem(ConnectionRef, ChannelId2, "echo_n", 5000),
+    {error, closed} = ssh_connection:exec(ConnectionRef, ChannelId2, "testing1.\n", 5000),
+    {error, closed} = ssh_connection:send(ConnectionRef, ChannelId2, "exit().\n", 5000),
 
     ssh:close(ConnectionRef),
     ssh:stop_daemon(Pid).
diff --git a/lib/ssh/test/ssh_engine_SUITE.erl b/lib/ssh/test/ssh_engine_SUITE.erl
new file mode 100644
index 0000000000..c131a70973
--- /dev/null
+++ b/lib/ssh/test/ssh_engine_SUITE.erl
@@ -0,0 +1,146 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-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.
+%% 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(ssh_engine_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+-include("ssh_test_lib.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,40}}].
+
+all() -> 
+    [{group, dsa_key},
+     {group, rsa_key}
+    ].
+
+groups() ->
+    [{dsa_key, [], basic_tests()},
+     {rsa_key, [], basic_tests()}
+    ].
+
+basic_tests() ->
+    [simple_connect
+    ].
+
+
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    ssh:start(),
+    ?CHECK_CRYPTO(
+       case crypto:info_lib() of
+           [{_,_, <<"OpenSSL 1.0.1s-freebsd  1 Mar 2016">>}] ->
+               {skip, "Strange Engine stuff"};
+
+           _ ->
+               case load_engine() of
+                   {ok,E} ->
+                       [{engine,E}|Config];
+                   {error, notsup} ->
+                       {skip, "Engine not supported on this OpenSSL version"};
+                   {error, bad_engine_id} ->
+                       {skip, "Dynamic Engine not supported"};
+                   Other ->
+                       ct:log("Engine load failed: ~p",[Other]),
+                       {fail, "Engine load failed"}
+               end
+       end
+      ).
+
+end_per_suite(Config) ->
+    catch crypto:engine_unload( proplists:get_value(engine,Config) ),
+    ssh:stop().
+
+%%--------------------------------------------------------------------
+init_per_group(dsa_key, Config) ->
+    case lists:member('ssh-dss',
+		      ssh_transport:default_algorithms(public_key)) of
+	true ->
+            start_daemon(Config, 'ssh-dss', "dsa_private_key.pem");
+	false ->
+	    {skip, unsupported_pub_key}
+    end;
+init_per_group(rsa_key, Config) ->
+    case lists:member('ssh-rsa',
+		      ssh_transport:default_algorithms(public_key)) of
+	true ->
+            start_daemon(Config, 'ssh-rsa', "rsa_private_key.pem");
+	false ->
+	    {skip, unsupported_pub_key}
+    end.
+
+start_daemon(Config, KeyType, KeyId) ->
+    SystemDir = proplists:get_value(data_dir, Config),
+    FullKeyId = filename:join(SystemDir, KeyId),
+    KeyCBOpts = [{engine, proplists:get_value(engine,Config)},
+                 {KeyType, FullKeyId}
+                ],
+    Opts = [{key_cb, {ssh_key_cb_engine_keys, KeyCBOpts}}],
+    {Pid, Host, Port} = ssh_test_lib:std_daemon(Config, Opts),
+    [{host_port,{Host,Port}}, {daemon_pid,Pid}| Config].
+
+
+end_per_group(_, Config) ->
+    catch ssh:stop_daemon(proplists:get_value(daemon_pid,Config)),
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+%% A simple exec call
+simple_connect(Config) ->
+    {Host,Port} = proplists:get_value(host_port, Config),
+    CRef = ssh_test_lib:std_connect(Config, Host, Port, []),
+    ssh:close(CRef).
+
+%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+load_engine() ->
+    case crypto:get_test_engine() of
+        {ok, Engine} ->
+            try crypto:engine_load(<<"dynamic">>,
+                                   [{<<"SO_PATH">>, Engine},
+                                    <<"LOAD">>],
+                                   [])
+            catch
+                error:notsup ->
+                    {error, notsup}
+            end;
+
+        {error, Error} ->
+            {error, Error}
+    end.
+
+start_std_daemon(Opts, Config) ->
+    ct:log("starting std_daemon",[]),
+    {Pid, Host, Port} = ssh_test_lib:std_daemon(Config, Opts),
+    ct:log("started ~p:~p  ~p",[Host,Port,Opts]),
+    [{srvr_pid,Pid},{srvr_addr,{Host,Port}} | Config].
diff --git a/lib/ssh/test/ssh_engine_SUITE_data/dsa_private_key.pem b/lib/ssh/test/ssh_engine_SUITE_data/dsa_private_key.pem
new file mode 100644
index 0000000000..778ffac675
--- /dev/null
+++ b/lib/ssh/test/ssh_engine_SUITE_data/dsa_private_key.pem
@@ -0,0 +1,9 @@
+-----BEGIN PRIVATE KEY-----
+MIIBSwIBADCCASwGByqGSM44BAEwggEfAoGBAMyitTMR7vPbpqyAXJpqnB0AhFwQ
+F87IE+JKFl5bD/MSkhhRV5sM73HUU1ooXY0FjhZ+cdLUCATuZR5ta4ydANqWIcAB
+gX3IwF1B4zf5SXEKTWkUYneL9dOKtiZLtoG28swrk8xMxwX+0fLHkltCEj6FiTW9
+PFrv8GmIfV6DjcI9AhUAqXWbb3RtoN9Ld28fVMhGZrj3LJUCgYEAwnxGHGBMpJaF
+2w7zAw3jHjL8PMYlV6vnufGHQlwF0ZUXJxRsvagMb/X1qACTu2VPYEVoLQGM3cfH
+EhHoQmvSXGAyTfR7Bmn3gf1n/s/DcFbdZduUCZ/rAyIrfd0eSbc1I+kZk85UCsKK
+w/IYdlqcuYa4Cgm2TapT5uEMqH4jhzEEFgIULh8swEUWmU8aJNWsrWl4eCiuUUg=
+-----END PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_engine_SUITE_data/ecdsa_private_key.pem b/lib/ssh/test/ssh_engine_SUITE_data/ecdsa_private_key.pem
new file mode 100644
index 0000000000..a45522064f
--- /dev/null
+++ b/lib/ssh/test/ssh_engine_SUITE_data/ecdsa_private_key.pem
@@ -0,0 +1,8 @@
+-----BEGIN PRIVATE KEY-----
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIBparGjr0KcdNrVM2J
+G0mW5ltP1QyvxDqBMyWLWo3fruRZv6Qoohl5skd1u4O+KJoM/UrrSTOXI/MDR7NN
+i1yl7O+hgYkDgYYABAG8K2XVsK0ahG9+HIIPwCO0pJY8ulwSTXwIjkCGyB2lpglh
+8qJmRzuyGcfRTslv8wfv0sPlT9H9PKDvgrTUL7rvQQDdOODNgVPXSecUoXoPn+X+
+eqxs77bjx+A5x0t/i3m5PfkaNPh5MZ1H/bWuOOdj2ZXZw0R4rlVc0zVrgnPU8L8S
+BQ==
+-----END PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_engine_SUITE_data/rsa_private_key.pem b/lib/ssh/test/ssh_engine_SUITE_data/rsa_private_key.pem
new file mode 100644
index 0000000000..ea0e3d3958
--- /dev/null
+++ b/lib/ssh/test/ssh_engine_SUITE_data/rsa_private_key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCwwb0/ddXGXTFK
+4FLxXdV6a/WJMSoPPS55RvZIAHFsiTtvPLbJ8LxDsZ6wSVZLN0/UQ4wdWn9jftyj
+U5/IxBVG8XOtKimTMvm3/ZOzVLueGHBbrLYscRv9oL85ulTKHWgrZDu0lBX5JJTI
+v5UTCErzJRQbka9DG1GaBgDb1PlXfkzBWMwfsBZmwoC77KvCcIGCgbW/XCY03TP2
+3Tg8drvpByMStddP2FQ4fZ91qFUzPu8uhZEsqSQTFlmhgGEx7dLlky0xvu62RuAD
+RTpINpcWZtWDHTdssOqu653LwwqBY8lBopCZ/4Af8QR3ZYkQhen1YLEbVheXRuzI
+LSCZIiJNAgMBAAECggEBAJH4/fxpqQkvr2Shy33Pu1xlyhnpw01gfn/jrcKasxEq
+aC4eWup86E2TY3U8q4pkfIXU3uLi+O9HNpmflwargNLc1mY8uqb44ygiv5bLNEKE
+9k2PXcdoBfC4jxPyoNFl5cBn/7LK1TazEjiTl15na9ZPWcLG1pG5/vMPYCgsQ1sP
+8J3c4E3aaXIj9QceYxBprl490OCzieGyZlRipncz3g4UShRc/b4cycvDZOJpmAy4
+zbWTcBcSMPVPi5coF0K8UcimiqZkotfb/2RLc433i34IdsIXMM+brdq+g8rmjg5a
++oQPy02M6tFApBruEhAz8DGgaLtDY6MLtyZAt3SjXnUCgYEA1zLgamdTHOqrrmIi
+eIQBnAJiyIfcY8B9SX1OsLGYFCHiPVwgUY35B2c7MavMsGcExJhtE+uxU7o5djtM
+R6r9cRHOXJ6EQwa8OwzzPqbM17/YqNDeK39bc9WOFUqRWrhDhVMPy6z8rmZr73mG
+IUC7mBNx/1GBdVYXIlsXzC96dI8CgYEA0kUAhz6I5nyPa70NDEUYHLHf3IW1BCmE
+UoVbraSePJtIEY/IqFx7oDuFo30d4n5z+8ICCtyid1h/Cp3mf3akOiqltYUfgV1G
+JgcEjKKYWEnO7cfFyO7LB7Y3GYYDJNy6EzVWPiwTGk9ZTfFJEESmHC45Unxgd17m
+Dx/R58rFgWMCgYBQXQWFdtSI5fH7C1bIHrPjKNju/h2FeurOuObcAVZDnmu4cmD3
+U8d9xkVKxVeJQM99A1coq0nrdI3k4zwXP3mp8fZYjDHkPe2pN6rW6L9yiohEcsuk
+/siON1/5/4DMmidM8LnjW9R45HLGWWGHpX7oyco2iJ+Jy/6Tq+T1MX3PbQKBgQCm
+hdsbQJ0u3CrBSmFQ/E9SOlRt0r4+45pVuCOY6yweF2QF9HcXTtbhWQJHLclDHJ5C
+Ha18aKuKFN3XzKFFBPKe1jOSBDGlQ/dQGnKx5fr8wMdObM3oiaTlIJuWbRmEUgJT
+QARjDIi8Z2b0YUhZx+Q9oSXoe3PyVYehJrQX+/BavQKBgQCIr7Zp0rQPbfqcTL+M
+OYHUoNcb14f9f8hXeXHQOqVpsGwxGdRQAU9wbx/4+obKB5xIkzBsVNcJwavisNja
+hegnGjTB/9Hc4m+5bMGwH0bhS2eQO4o+YYM2ypDmFQqDLRfFUlZ5PVHffm/aA9+g
+GanNBCsmtoHtV6CJ1UZ7NmBuIA==
+-----END PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_engine_SUITE_data/rsa_private_key_pwd.pem b/lib/ssh/test/ssh_engine_SUITE_data/rsa_private_key_pwd.pem
new file mode 100644
index 0000000000..501662fc35
--- /dev/null
+++ b/lib/ssh/test/ssh_engine_SUITE_data/rsa_private_key_pwd.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIh888Iq6gxuMCAggA
+MBQGCCqGSIb3DQMHBAic/11YZ8Nt5gSCBMjG/Jb4qiMoBS50iQvHXqcETPE+0NBr
+jhsn9w94LkdRBstMPAsoKmY98Er96Rnde/NfmqlU9CupKTkd7Ce5poBf72Y6KMED
+cPURyjbGRFsu6x9skXB2obhyKYEqAEF2oQAg4Qbe5v1qXBIgDuC/NgiJnM+w2zCZ
+LkHSZB2/NmcnvDzcgPF7TM8pTO23xCJ33m37qjfWvHsgocVqZmL9wQ4+wr/NMYjJ
+pJvX1OHW1vBsZsXh40WchalYRSB1VeO368QfsE8coRJztqbMzdce9EQdMB6Q6jlO
+cetd3moLIoMP4I7HW0/SgokbycTbRiYSvRyU1TGc2WbW6BrFZV24IckcnnVUFatf
+6HKUcaYLG68dJcRgs5QMGkcmgVvlddENHFmHZlo0eym/xSiUl/AT8/5odscm6ML8
+wW5sneax+TF4J2eYmiN7yjAUCodXVTNYNDVKo6uUhntlymbM0o4UitVIbPIfTDHl
+sxJAEZ7vpuPqeNMxUk6G6zipuEjqsVbnuFSBSZmgKiGYcifRPUmqqINa3DdS4WVx
+xaPWdHbHVRD//ze3h/FsA+1lIE5q2kUE0xXseJA1ISog++kJp14XeaaL2j/tx3Ob
+OsbcaOAD/IUw/ItDt9kn0qzfnar7sS0Wov8AmJQxHmH7Lm93jHTLM05yE0AR/eBr
+Mig2ZdC+9OqVC+GPuBkRjSs8NpltQIDroz6EV9IMwPwXm0szSYoyoPLmlHJUdnLs
+ZUef+au6hYkEJBrvuisagnq5eT/fCV3hsjD7yODebNU2CmBTo6X2PRx/xsBHRMWl
+QkoM9PBdSCnKv6HpHl4pchuoqU2NpFjN0BCaad6aHfZSTnqgzK4bEh1oO6dI8/rB
+/eh71JyFFG5J4xbpaqz5Su01V1iwU5leK5bDwqals4M4+ZGHGciou7qnXUmX2fJl
+r6DlMUa/xy+A2ZG0NuZR05yk2oB3+KVNMgp6zFty3XaxwoNtc8GTLtLnBnIh2rlP
+mE1+I65LRWwrNQalPeOAUrYuEzhyp2Df7a8Ykas5PUH7MGR/S0Ge/dLxtE2bJuK4
+znbLAsGhvo/SbNxYqIp6D4iDtd3va6yUGncy41paA/vTKFVvXZDrXcwJQYYCVOGT
+OwdzNuozU8Dc7oxsd8oakfC46kvmVaOrGvZbm56PFfprcaL/Hslska5xxEni/eZe
+WRxZbCBhAVqS1pn5zkDQVUe9uFlR/x39Qi01HIlKLBsjpSs6qQsFArMe8hgXmXLG
+xP+dyVuOE18NzSewdEjeqSRKIM7Qi8EOjZsI4HdSRBY7bh9VhmaVXDZiCSf33TTE
+3y8nimzQAeuGoYg6WqHmWWC2Qnpki2HlaIH/ayXEyQWkP/qvg61e8ovdg9Fy8JOO
+0AacXVt5zj0q00AW5bKx7usi4NIjZedi86hUm6H19aBm7r86BKjwYTEI/GOcdrbV
+9HC/8ayOimgwiAG3gq+aLioWym+Z6KnsbVd7XReVbvM/InQx54WA2y5im0A+/c67
+oQFFPV84XGX9waeqv/K4Wzkm6HW+qVAEM67482VGOf0PVrlQMno6dOotT/Y7ljoZ
+2iz0LmN9yylJnLPDrr1i6gzbs5OhhUgbF5LI2YP2wWdCZTl/DrKSIvQZWl8U+tw3
+ciA=
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_key_cb_engine_keys.erl b/lib/ssh/test/ssh_key_cb_engine_keys.erl
new file mode 100644
index 0000000000..fc9cbfd49b
--- /dev/null
+++ b/lib/ssh/test/ssh_key_cb_engine_keys.erl
@@ -0,0 +1,62 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2015-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.
+%% 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%
+%%
+
+%%
+%%----------------------------------------------------------------------
+
+%% Note: This module is used by ssh_basic_SUITE
+
+-module(ssh_key_cb_engine_keys).
+-behaviour(ssh_server_key_api).
+-compile(export_all).
+
+host_key(SshAlg, Options) ->
+    KBopts = proplists:get_value(key_cb_private, Options, []),
+    Engine = proplists:get_value(engine, KBopts),
+    case proplists:get_value(SshAlg, KBopts) of
+        undefined ->
+            {error, {unknown_alg,SshAlg}};
+        KeyId ->
+            case crypto_alg(SshAlg) of
+                undefined ->
+                    {error, {unsupported_alg,SshAlg}};
+                CryptoAlg ->
+                    PrivKey = #{engine => Engine,
+                                key_id => KeyId,
+                                algorithm => CryptoAlg},
+                    %% Is there a key with this reference ?
+                    case crypto:privkey_to_pubkey(CryptoAlg, PrivKey) of
+                        [_|_] -> 
+                            {ok, PrivKey};
+                        _ ->
+                            {error, {no_hostkey,SshAlg}}
+                    end
+            end
+    end.
+
+is_auth_key(_PublicUserKey, _User, _Options) ->
+    false.
+
+
+
+crypto_alg('ssh-rsa') -> rsa;
+crypto_alg('ssh-dss') -> dss;
+crypto_alg(_) -> undefined.
+    
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index 8b454ffe5d..12a85c40aa 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -36,7 +36,9 @@
 	 id_string_no_opt_client/1, 
 	 id_string_no_opt_server/1, 
 	 id_string_own_string_client/1, 
+	 id_string_own_string_client_trail_space/1, 
 	 id_string_own_string_server/1, 
+	 id_string_own_string_server_trail_space/1, 
 	 id_string_random_client/1, 
 	 id_string_random_server/1, 
 	 max_sessions_sftp_start_channel_parallel/1, 
@@ -68,7 +70,8 @@
 	 hostkey_fingerprint_check_sha256/1,
 	 hostkey_fingerprint_check_sha384/1,
 	 hostkey_fingerprint_check_sha512/1,
-	 hostkey_fingerprint_check_list/1
+	 hostkey_fingerprint_check_list/1,
+         save_accepted_host_option/1
 	]).
 
 %%% Common test callbacks
@@ -116,10 +119,13 @@ all() ->
      hostkey_fingerprint_check_list,
      id_string_no_opt_client,
      id_string_own_string_client,
+     id_string_own_string_client_trail_space,
      id_string_random_client,
      id_string_no_opt_server,
      id_string_own_string_server,
+     id_string_own_string_server_trail_space,
      id_string_random_server,
+     save_accepted_host_option,
      {group, hardening_tests}
     ].
 
@@ -202,32 +208,23 @@ end_per_group(_, Config) ->
 %%--------------------------------------------------------------------
 init_per_testcase(_TestCase, Config) ->
     ssh:start(),
-    Config.
-
-end_per_testcase(TestCase, Config) when TestCase == server_password_option;
-					TestCase == server_userpassword_option;
-					TestCase == server_pwdfun_option;
-					TestCase == server_pwdfun_4_option ->
+    %% Create a clean user_dir
     UserDir = filename:join(proplists:get_value(priv_dir, Config), nopubkey),
     ssh_test_lib:del_dirs(UserDir),
-    end_per_testcase(Config);
-end_per_testcase(_TestCase, Config) ->
-    end_per_testcase(Config).
+    file:make_dir(UserDir),
+    [{user_dir,UserDir}|Config].
 
-end_per_testcase(_Config) ->    
+end_per_testcase(_TestCase, Config) ->
     ssh:stop(),
     ok.
 
 %%--------------------------------------------------------------------
 %% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
-%%--------------------------------------------------------------------
 
 %%% validate to server that uses the 'password' option
 server_password_option(Config) when is_list(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
 					     {user_dir, UserDir},
@@ -258,12 +255,10 @@ server_password_option(Config) when is_list(Config) ->
 
 %%% validate to server that uses the 'password' option
 server_userpassword_option(Config) when is_list(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),	  
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-					     {user_dir, PrivDir},
+					     {user_dir, UserDir},
 					     {user_passwords, [{"vego", "morot"}]}]),
 
     ConnectionRef =
@@ -293,15 +288,13 @@ server_userpassword_option(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 %%% validate to server that uses the 'pwdfun' option
 server_pwdfun_option(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),	  
     CHKPWD = fun("foo",Pwd) -> Pwd=="bar";
 		(_,_) -> false
 	     end,
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-					     {user_dir, PrivDir},
+					     {user_dir, UserDir},
 					     {pwdfun,CHKPWD}]),
     ConnectionRef =
 	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
@@ -331,9 +324,7 @@ server_pwdfun_option(Config) ->
 %%--------------------------------------------------------------------
 %%% validate to server that uses the 'pwdfun/4' option
 server_pwdfun_4_option(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),	  
     PWDFUN = fun("foo",Pwd,{_,_},undefined) -> Pwd=="bar";
 		("fie",Pwd,{_,_},undefined) -> {Pwd=="bar",new_state};
@@ -341,7 +332,7 @@ server_pwdfun_4_option(Config) ->
 		(_,_,_,_) -> false
 	     end,
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-					     {user_dir, PrivDir},
+					     {user_dir, UserDir},
 					     {pwdfun,PWDFUN}]),
     ConnectionRef1 =
 	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
@@ -391,9 +382,7 @@ server_pwdfun_4_option(Config) ->
     
 %%--------------------------------------------------------------------
 server_pwdfun_4_option_repeat(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),	  
     %% Test that the state works
     Parent = self(),
@@ -402,7 +391,7 @@ server_pwdfun_4_option_repeat(Config) ->
 		(_,P,_,S) -> Parent!{P,S},          {false,S+1}
 	     end,
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-					     {user_dir, PrivDir},
+					     {user_dir, UserDir},
 					     {auth_methods,"keyboard-interactive"},
 					     {pwdfun,PWDFUN}]),
 
@@ -486,9 +475,7 @@ user_dir_option(Config) ->
 %%--------------------------------------------------------------------
 %%% validate client that uses the 'ssh_msg_debug_fun' option
 ssh_msg_debug_fun_option_client(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
@@ -526,9 +513,7 @@ ssh_msg_debug_fun_option_client(Config) ->
 
 %%--------------------------------------------------------------------
 connectfun_disconnectfun_server(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -572,9 +557,7 @@ connectfun_disconnectfun_server(Config) ->
 
 %%--------------------------------------------------------------------
 connectfun_disconnectfun_client(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -603,9 +586,7 @@ connectfun_disconnectfun_client(Config) ->
 %%--------------------------------------------------------------------
 %%% validate client that uses the 'ssh_msg_debug_fun' option
 ssh_msg_debug_fun_option_server(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -647,9 +628,7 @@ ssh_msg_debug_fun_option_server(Config) ->
 
 %%--------------------------------------------------------------------
 disconnectfun_option_server(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -682,9 +661,7 @@ disconnectfun_option_server(Config) ->
 
 %%--------------------------------------------------------------------
 disconnectfun_option_client(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -716,9 +693,7 @@ disconnectfun_option_client(Config) ->
 
 %%--------------------------------------------------------------------
 unexpectedfun_option_server(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -759,9 +734,7 @@ unexpectedfun_option_server(Config) ->
 
 %%--------------------------------------------------------------------
 unexpectedfun_option_client(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -836,14 +809,9 @@ supported_hash(HashAlg) ->
 
 
 really_do_hostkey_fingerprint_check(Config, HashAlg) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDirServer = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDirServer),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
-    UserDirClient = 
-	ssh_test_lib:create_random_dir(Config), % Ensure no 'known_hosts' disturbs
-
     %% All host key fingerprints.  Trust that public_key has checked the ssh_hostkey_fingerprint
     %% function since that function is used by the ssh client...
     FPs0 = [case HashAlg of
@@ -869,7 +837,7 @@ really_do_hostkey_fingerprint_check(Config, HashAlg) ->
 
     %% Start daemon with the public keys that we got fingerprints from
     {Pid, Host0, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-					     {user_dir, UserDirServer},
+					     {user_dir, UserDir},
 					     {password, "morot"}]),
     Host = ssh_test_lib:ntoa(Host0),
     FP_check_fun = fun(PeerName, FP) ->
@@ -892,7 +860,8 @@ really_do_hostkey_fingerprint_check(Config, HashAlg) ->
 				       end},
 				      {user, "foo"},
 				      {password, "morot"},
-				      {user_dir, UserDirClient},
+				      {user_dir, UserDir},
+                                      {save_accepted_host, false}, % Ensure no 'known_hosts' disturbs
 				      {user_interaction, false}]),
     ssh:stop_daemon(Pid).
 
@@ -983,9 +952,7 @@ ms_passed(T0) ->
 %%--------------------------------------------------------------------
 ssh_daemon_minimal_remote_max_packet_size_option(Config) ->
     SystemDir = proplists:get_value(data_dir, Config),
-    PrivDir = proplists:get_value(priv_dir, Config), 
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config), 
     
     {Server, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
 						{user_dir, UserDir},
@@ -1035,6 +1002,19 @@ id_string_own_string_client(Config) ->
     end.
 
 %%--------------------------------------------------------------------
+id_string_own_string_client_trail_space(Config) ->
+    {Server, _Host, Port} = fake_daemon(Config),
+    {error,_} = ssh:connect("localhost", Port, [{id_string,"Pelle "}], 1000),
+    receive
+	{id,Server,"SSH-2.0-Pelle \r\n"} ->
+	    ok;
+	{id,Server,Other} ->
+	    ct:fail("Unexpected id: ~s.",[Other])
+    after 5000 ->
+	    {fail,timeout}
+    end.
+
+%%--------------------------------------------------------------------
 id_string_random_client(Config) ->
     {Server, _Host, Port} = fake_daemon(Config),
     {error,_} = ssh:connect("localhost", Port, [{id_string,random}], 1000),
@@ -1063,6 +1043,12 @@ id_string_own_string_server(Config) ->
     {ok,"SSH-2.0-Olle\r\n"} = gen_tcp:recv(S1, 0, 2000).
 
 %%--------------------------------------------------------------------
+id_string_own_string_server_trail_space(Config) ->
+    {_Server, Host, Port} = ssh_test_lib:std_daemon(Config, [{id_string,"Olle "}]),
+    {ok,S1}=ssh_test_lib:gen_tcp_connect(Host,Port,[{active,false},{packet,line}]),
+    {ok,"SSH-2.0-Olle \r\n"} = gen_tcp:recv(S1, 0, 2000).
+
+%%--------------------------------------------------------------------
 id_string_random_server(Config) ->
     {_Server, Host, Port} = ssh_test_lib:std_daemon(Config, [{id_string,random}]),
     {ok,S1}=ssh_test_lib:gen_tcp_connect(Host,Port,[{active,false},{packet,line}]),
@@ -1291,6 +1277,33 @@ try_to_connect(Connect, Host, Port, Pid, Tref, N) ->
      end.
 
 %%--------------------------------------------------------------------
+save_accepted_host_option(Config) ->
+    UserDir = proplists:get_value(user_dir, Config),
+    KnownHosts = filename:join(UserDir, "known_hosts"),
+    SysDir = proplists:get_value(data_dir, Config),	  
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {user_passwords, [{"vego", "morot"}]}
+                                            ]),
+    {error,enoent} = file:read_file(KnownHosts),
+
+    {ok,_C1} = ssh:connect(Host, Port, [{silently_accept_hosts, true},
+                                        {user, "vego"},
+                                        {password, "morot"},
+                                        {user_interaction, false},
+                                        {save_accepted_host, false},
+                                        {user_dir, UserDir}]),
+    {error,enoent} = file:read_file(KnownHosts),
+    
+    {ok,_C2} = ssh:connect(Host, Port, [{silently_accept_hosts, true},
+                                        {user, "vego"},
+                                        {password, "morot"},
+                                        {user_interaction, false},
+                                        {user_dir, UserDir}]),
+    {ok,_} = file:read_file(KnownHosts),
+    ssh:stop_daemon(Pid).
+
+%%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
   
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index 7aa3d8a00a..c2f9c0eba8 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -181,8 +181,9 @@ init_per_group(openssh_server, Config) ->
 	    [{peer, {fmt_host(IPx),Portx}}, {group, openssh_server} | Config];
 	{error,"Key exchange failed"} ->
 	    {skip, "openssh server doesn't support the tested kex algorithm"};
-	_ ->
-	    {skip, "No openssh server"} 
+	Other ->
+            ct:log("No openssh server. Cause:~n~p~n",[Other]),
+	    {skip, "No openssh daemon (see log in testcase)"} 
     end;
 
 init_per_group(remote_tar, Config) ->
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index 763649a12f..5fc948fbed 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -34,7 +34,7 @@
 -define(PASSWD, "Sesame").
 -define(XFER_PACKET_SIZE, 32768).
 -define(XFER_WINDOW_SIZE, 4*?XFER_PACKET_SIZE).
--define(TIMEOUT, 10000).
+-define(SSH_TIMEOUT, 10000).
 -define(REG_ATTERS, <<0,0,0,0,1>>).
 -define(UNIX_EPOCH,  62167219200).
 
@@ -161,9 +161,9 @@ init_per_testcase(TestCase, Config) ->
 			       {silently_accept_hosts, true}]),
     {ok, Channel} =
 	ssh_connection:session_channel(Cm, ?XFER_WINDOW_SIZE,
-				       ?XFER_PACKET_SIZE, ?TIMEOUT),
+				       ?XFER_PACKET_SIZE, ?SSH_TIMEOUT),
     
-    success = ssh_connection:subsystem(Cm, Channel, "sftp", ?TIMEOUT),
+    success = ssh_connection:subsystem(Cm, Channel, "sftp", ?SSH_TIMEOUT),
 
     ProtocolVer = case atom_to_list(TestCase) of
 		      "ver3_" ++ _ ->
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl
index 3920a1c592..1df55834b1 100644
--- a/lib/ssh/test/ssh_sup_SUITE.erl
+++ b/lib/ssh/test/ssh_sup_SUITE.erl
@@ -42,7 +42,9 @@ suite() ->
 
 all() -> 
     [default_tree, sshc_subtree, sshd_subtree, sshd_subtree_profile,
-     killed_acceptor_restarts].
+     killed_acceptor_restarts,
+     shell_channel_tree
+    ].
 
 groups() -> 
     [].
@@ -199,7 +201,7 @@ killed_acceptor_restarts(Config) ->
     Port2 = ssh_test_lib:daemon_port(DaemonPid2),
     true = (Port /= Port2),
 
-    ct:pal("~s",[lists:flatten(ssh_info:string())]),
+    ct:log("~s",[lists:flatten(ssh_info:string())]),
 
     {ok,[{AccPid,ListenAddr,Port}]} = acceptor_pid(DaemonPid),
     {ok,[{AccPid2,ListenAddr,Port2}]} = acceptor_pid(DaemonPid2),
@@ -216,11 +218,14 @@ killed_acceptor_restarts(Config) ->
 
     %% Make acceptor restart:
     exit(AccPid, kill),
+    ?wait_match(undefined, process_info(AccPid)),
 
     %% Check it is a new acceptor:
-    {ok,[{AccPid1,ListenAddr,Port}]} = acceptor_pid(DaemonPid),
-    true = (AccPid /= AccPid1),
-    true = (AccPid2 /= AccPid1),
+    ?wait_match({ok,[{AccPid1,ListenAddr,Port}]}, AccPid1=/=AccPid,
+                acceptor_pid(DaemonPid),
+                AccPid1,
+                500, 30),
+    AccPid1 =/= AccPid2,
 
     %% Connect second client and check it is alive:
     {ok,C2} = ssh:connect("localhost", Port, [{silently_accept_hosts, true},
@@ -230,21 +235,113 @@ killed_acceptor_restarts(Config) ->
                                               {user_dir, UserDir}]),
     [{client_version,_}] = ssh:connection_info(C2,[client_version]),
     
-    ct:pal("~s",[lists:flatten(ssh_info:string())]),
+    ct:log("~s",[lists:flatten(ssh_info:string())]),
 
     %% Check first client is still alive:
     [{client_version,_}] = ssh:connection_info(C1,[client_version]),
     
     ok = ssh:stop_daemon(DaemonPid2),
-    timer:sleep(15000),
+    ?wait_match(undefined, process_info(DaemonPid2), 1000, 30),
     [{client_version,_}] = ssh:connection_info(C1,[client_version]),
     [{client_version,_}] = ssh:connection_info(C2,[client_version]),
     
     ok = ssh:stop_daemon(DaemonPid),
-    timer:sleep(15000),
+    ?wait_match(undefined, process_info(DaemonPid), 1000, 30),
     {error,closed} = ssh:connection_info(C1,[client_version]),
     {error,closed} = ssh:connection_info(C2,[client_version]).
+
+%%-------------------------------------------------------------------------
+shell_channel_tree(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = proplists:get_value(data_dir, Config),
+    TimeoutShell =
+        fun() ->
+                io:format("TimeoutShell started!~n",[]),
+                timer:sleep(5000),
+                ct:log("~p TIMEOUT!",[self()])
+        end,
+    {Daemon, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+                                                {user_dir, UserDir},
+                                                {password, "morot"},
+                                                {shell, fun(_User) ->
+                                                                spawn(TimeoutShell)
+                                                        end
+                                                }
+                                            ]),
+    ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+						      {user, "foo"},
+						      {password, "morot"},
+						      {user_interaction, true},
+						      {user_dir, UserDir}]),
+
+    [ChannelSup|_] = Sups0 = chk_empty_con_daemon(Daemon),
     
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+    ok = ssh_connection:shell(ConnectionRef,ChannelId0),
+
+    ?wait_match([{_, GroupPid,worker,[ssh_channel]}],
+		supervisor:which_children(ChannelSup),
+               [GroupPid]),
+    {links,GroupLinks} = erlang:process_info(GroupPid, links),
+    [ShellPid] = GroupLinks--[ChannelSup],
+    ct:log("GroupPid = ~p, ShellPid = ~p",[GroupPid,ShellPid]),
+
+    receive
+        {ssh_cm,ConnectionRef, {data, ChannelId0, 0, <<"TimeoutShell started!\r\n">>}} ->
+            receive
+                %%---- wait for the subsystem to terminate
+                {ssh_cm,ConnectionRef,{closed,ChannelId0}} ->
+                    ct:log("Subsystem terminated",[]),
+                    case {chk_empty_con_daemon(Daemon),
+                          process_info(GroupPid),
+                          process_info(ShellPid)} of
+                        {Sups0, undefined, undefined} ->
+                            %% SUCCESS
+                            ssh:stop_daemon(Daemon);
+                        {Sups0, _, undefined}  ->
+                            ssh:stop_daemon(Daemon),
+                            ct:fail("Group proc lives!");
+                        {Sups0, undefined, _}  ->
+                            ssh:stop_daemon(Daemon),
+                            ct:fail("Shell proc lives!");
+                        _ ->
+                            ssh:stop_daemon(Daemon),
+                            ct:fail("Sup tree changed!")
+                    end
+            after 10000 ->
+                    ssh:close(ConnectionRef),
+                    ssh:stop_daemon(Daemon),
+                    ct:fail("CLI Timeout")
+            end
+    after 10000 ->
+            ssh:close(ConnectionRef),
+            ssh:stop_daemon(Daemon),
+            ct:fail("CLI Timeout")
+    end.
+
+
+chk_empty_con_daemon(Daemon) ->
+    ?wait_match([{_,SubSysSup, supervisor,[ssh_subsystem_sup]},
+		 {{ssh_acceptor_sup,_,_,_}, AccSup, supervisor,[ssh_acceptor_sup]}],
+		supervisor:which_children(Daemon),
+                [SubSysSup,AccSup]),
+    ?wait_match([{{server,ssh_connection_sup, _,_},
+		  ConnectionSup, supervisor,
+		  [ssh_connection_sup]},
+		 {{server,ssh_channel_sup,_ ,_},
+		  ChannelSup,supervisor,
+		  [ssh_channel_sup]}],
+		supervisor:which_children(SubSysSup),
+		[ConnectionSup,ChannelSup]),
+    ?wait_match([{{ssh_acceptor_sup,_,_,_},_,worker,[ssh_acceptor]}],
+		supervisor:which_children(AccSup)),
+    ?wait_match([{_, _, worker,[ssh_connection_handler]}],
+		supervisor:which_children(ConnectionSup)),
+    ?wait_match([], supervisor:which_children(ChannelSup)),
+    [ChannelSup, ConnectionSup, SubSysSup, AccSup].
+
 %%-------------------------------------------------------------------------
 %% Help functions
 %%-------------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 83819b97a5..57ae2dbac2 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -28,9 +28,7 @@
 -include_lib("public_key/include/public_key.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("ssh/src/ssh_transport.hrl").
-
-
--define(TIMEOUT, 50000).
+-include("ssh_test_lib.hrl").
 
 %%%----------------------------------------------------------------
 connect(Port, Options) when is_integer(Port) ->
@@ -58,7 +56,9 @@ daemon(Host, Port, Options) ->
     ct:log("~p:~p Calling ssh:daemon(~p, ~p, ~p)",[?MODULE,?LINE,Host,Port,Options]),
     case ssh:daemon(Host, Port, Options) of
 	{ok, Pid} ->
-            {ok,L} = ssh:daemon_info(Pid),
+            R = ssh:daemon_info(Pid),
+            ct:log("~p:~p ssh:daemon_info(~p) ->~n ~p",[?MODULE,?LINE,Pid,R]),
+            {ok,L} = R,
             ListenPort = proplists:get_value(port, L),
             ListenIP = proplists:get_value(ip, L),
 	    {Pid, ListenIP, ListenPort};
@@ -201,15 +201,17 @@ init_io_server(TestCase) ->
 
 loop_io_server(TestCase, Buff0) ->
      receive
-	 {input, TestCase, Line} ->
+	 {input, TestCase, Line} = _INP ->
+             %%ct:log("io_server ~p:~p ~p got ~p",[?MODULE,?LINE,self(),_INP]),
 	     loop_io_server(TestCase, Buff0 ++ [Line]);
-	 {io_request, From, ReplyAs, Request} ->
+	 {io_request, From, ReplyAs, Request} = _REQ->
+             %%ct:log("io_server ~p:~p ~p got ~p",[?MODULE,?LINE,self(),_REQ]),
 	     {ok, Reply, Buff} = io_request(Request, TestCase, From,
 					    ReplyAs, Buff0),
 	     io_reply(From, ReplyAs, Reply),
 	     loop_io_server(TestCase, Buff);
 	 {'EXIT',_, _} = _Exit ->
-%%	     ct:log("ssh_test_lib:loop_io_server/2 got ~p",[_Exit]),
+	     ct:log("ssh_test_lib:loop_io_server/2 got ~p",[_Exit]),
 	     ok
     after 
 	30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE])
@@ -600,6 +602,7 @@ check_ssh_client_support2(P) ->
 	{P, {data, _A}} ->
 	    check_ssh_client_support2(P);
 	{P, {exit_status, E}} ->
+            ct:log("~p:~p exit_status:~n~p",[?MODULE,?LINE,E]),
 	    E
     after 5000 ->
 	    ct:log("Openssh command timed out ~n"),
@@ -651,14 +654,14 @@ default_algorithms(sshc, DaemonOptions) ->
 	{hostport,Srvr,{_Host,Port}} ->
 	    spawn(fun()-> os:cmd(lists:concat(["ssh -o \"StrictHostKeyChecking no\" -p ",Port," localhost"])) end)
     after ?TIMEOUT ->
-	    ct:fail("No server respons 1")
+	    ct:fail("No server respons (timeout) 1")
     end,
 
     receive
 	{result,Srvr,L} ->
 	    L
     after ?TIMEOUT ->
-	    ct:fail("No server respons 2")
+	    ct:fail("No server respons (timeout) 2")
     end.
 
 run_fake_ssh({ok,InitialState}) ->
@@ -772,12 +775,12 @@ ssh_type1() ->
 		not_found;
 	    Path ->
 		ct:log("~p:~p Found \"ssh\" at ~p",[?MODULE,?LINE,Path]),
-		case os:cmd("ssh -V") of
+                case installed_ssh_version(timeout) of
 		    Version = "OpenSSH" ++ _ ->
                         ct:log("~p:~p Found OpenSSH  ~p",[?MODULE,?LINE,Version]),
 			openSSH;
-		    Str -> 
-			ct:log("ssh client ~p is unknown",[Str]),
+                    Other ->
+			ct:log("ssh client ~p is unknown",[Other]),
 			unknown
 		end
 	end
@@ -787,6 +790,20 @@ ssh_type1() ->
 	    not_found
     end.
 
+installed_ssh_version(TimeoutReturn) ->
+    Parent = self(),
+    Pid = spawn(fun() ->
+                        Parent ! {open_ssh_version, os:cmd("ssh -V")}
+                end),
+    receive
+        {open_ssh_version, V} ->
+            V
+    after ?TIMEOUT ->
+            exit(Pid, kill),
+            TimeoutReturn
+    end.
+
+
 		   
 
 algo_intersection([], _) -> [];
diff --git a/lib/ssh/test/ssh_test_lib.hrl b/lib/ssh/test/ssh_test_lib.hrl
index 54c93b7e87..4b6579bd71 100644
--- a/lib/ssh/test/ssh_test_lib.hrl
+++ b/lib/ssh/test/ssh_test_lib.hrl
@@ -1,4 +1,9 @@
 %%-------------------------------------------------------------------------
+%% Timeout time in ms
+%%-------------------------------------------------------------------------
+-define(TIMEOUT, 27000).
+
+%%-------------------------------------------------------------------------
 %% Check for usable crypt 
 %%-------------------------------------------------------------------------
 -define(CHECK_CRYPTO(Available),
@@ -11,12 +16,12 @@
 %%-------------------------------------------------------------------------
 %% Help macro
 %%-------------------------------------------------------------------------
--define(wait_match(Pattern, FunctionCall, Bind, Timeout, Ntries),
+-define(wait_match(Pattern, Guard, FunctionCall, Bind, Timeout, Ntries),
 	Bind =
 	    (fun() -> 
 		     F = fun(N, F1) ->
 				 case FunctionCall of
-				     Pattern -> Bind;
+				     Pattern when Guard -> Bind;
 				     _ when N>0 ->
 					 ct:pal("Must sleep ~p ms at ~p:~p",[Timeout,?MODULE,?LINE]),
 					 timer:sleep(Timeout),
@@ -29,6 +34,9 @@
 	     end)()
        ).
 
+-define(wait_match(Pattern, FunctionCall, Bind, Timeout, Ntries),
+        ?wait_match(Pattern, true, FunctionCall, Bind, Timeout, Ntries)).
+
 -define(wait_match(Pattern, FunctionCall, Timeout, Ntries),  ?wait_match(Pattern, FunctionCall, ok, Timeout, Ntries)).
 
 -define(wait_match(Pattern, FunctionCall, Bind),  ?wait_match(Pattern, FunctionCall, Bind, 500, 10) ).
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 75d5b5e296..9df404d7ed 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -27,7 +27,6 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--define(TIMEOUT, 50000).
 -define(SSH_DEFAULT_PORT, 22).
 -define(REKEY_DATA_TMO, 65000).
 
@@ -49,19 +48,9 @@ all() ->
     end.
 
 groups() -> 
-    [{erlang_client, [], [erlang_shell_client_openssh_server,
-			  erlang_client_openssh_server_exec_compressed,
-			  erlang_client_openssh_server_setenv,
-			  erlang_client_openssh_server_publickey_dsa,
-			  erlang_client_openssh_server_publickey_rsa,
-			  erlang_client_openssh_server_password,
-			  erlang_client_openssh_server_kexs,
-			  erlang_client_openssh_server_nonexistent_subsystem,
-			  erlang_client_openssh_server_renegotiate
+    [{erlang_client, [], [erlang_shell_client_openssh_server
 			 ]},
-     {erlang_server, [], [erlang_server_openssh_client_public_key_dsa,
-			  erlang_server_openssh_client_public_key_rsa,
-			  erlang_server_openssh_client_renegotiate
+     {erlang_server, [], [erlang_server_openssh_client_renegotiate
 			 ]}
     ].
 
@@ -69,7 +58,7 @@ init_per_suite(Config) ->
     ?CHECK_CRYPTO(
        case gen_tcp:connect("localhost", 22, []) of
 	   {error,econnrefused} ->
-	       {skip,"No openssh deamon"};
+	       {skip,"No openssh deamon (econnrefused)"};
 	   _ ->
 	       ssh_test_lib:openssh_sanity_check(Config)
        end
@@ -101,15 +90,6 @@ end_per_group(_, Config) ->
     Config.
 
 
-init_per_testcase(erlang_server_openssh_client_public_key_dsa, Config) ->
-    chk_key(sshc, 'ssh-dss', ".ssh/id_dsa", Config);
-init_per_testcase(erlang_server_openssh_client_public_key_rsa, Config) ->
-    chk_key(sshc, 'ssh-rsa', ".ssh/id_rsa", Config);
-init_per_testcase(erlang_client_openssh_server_publickey_dsa, Config) ->
-    chk_key(sshd, 'ssh-dss', ".ssh/id_dsa", Config);
-init_per_testcase(erlang_client_openssh_server_publickey_rsa, Config) ->
-    chk_key(sshd, 'ssh-rsa', ".ssh/id_rsa", Config);
-
 init_per_testcase(erlang_server_openssh_client_renegotiate, Config) ->
     case os:type() of
 	{unix,_} -> ssh:start(), Config;
@@ -123,27 +103,6 @@ end_per_testcase(_TestCase, _Config) ->
     ssh:stop(),
     ok.
 
-
-chk_key(Pgm, Name, File, Config) ->
-    case ssh_test_lib:openssh_supports(Pgm, public_key, Name) of
-	false ->
-	    {skip,lists:concat(["openssh client does not support ",Name])};
-	true ->
-	    {ok,[[Home]]} = init:get_argument(home),
-	    KeyFile =  filename:join(Home, File),
-	    case file:read_file(KeyFile) of
-		{ok, Pem} ->
-		    case public_key:pem_decode(Pem) of
-			[{_,_, not_encrypted}] ->
-			    init_per_testcase('__default__',Config);
-			_ ->
-			    {skip, {error, "Has pass phrase can not be used by automated test case"}} 
-		    end;
-		_ ->
-		    {skip, lists:concat(["no ~/",File])}  
-	    end
-    end.
-
 %%--------------------------------------------------------------------
 %% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
@@ -161,219 +120,6 @@ erlang_shell_client_openssh_server(Config) when is_list(Config) ->
     receive_logout(),
     receive_normal_exit(Shell).
    
-%--------------------------------------------------------------------
-erlang_client_openssh_server_exec() ->
-    [{doc, "Test api function ssh_connection:exec"}].
-
-erlang_client_openssh_server_exec(Config) when is_list(Config) ->
-    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
-							     {user_interaction, false}]),
-    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
-    success = ssh_connection:exec(ConnectionRef, ChannelId0,
-				  "echo testing", infinity),
-    Data0 = {ssh_cm, ConnectionRef, {data, ChannelId0, 0, <<"testing\n">>}},
-    case ssh_test_lib:receive_exec_result(Data0) of
-	expected ->
-	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId0);
-	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId0, 0}}
-	 = ExitStatus0} ->
-	    ct:log("0: Collected data ~p", [ExitStatus0]),
-	    ssh_test_lib:receive_exec_result(Data0,
-					     ConnectionRef, ChannelId0);
-	Other0 ->
-	    ct:fail(Other0)
-    end,
-
-    {ok, ChannelId1} = ssh_connection:session_channel(ConnectionRef, infinity),
-    success = ssh_connection:exec(ConnectionRef, ChannelId1,
-				  "echo testing1", infinity),
-    Data1 = {ssh_cm, ConnectionRef, {data, ChannelId1, 0, <<"testing1\n">>}},
-    case ssh_test_lib:receive_exec_result(Data1) of
-	expected ->
-	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId1);
-	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId1, 0}}
-	 = ExitStatus1} ->
-	    ct:log("0: Collected data ~p", [ExitStatus1]),
-	    ssh_test_lib:receive_exec_result(Data1,
-					     ConnectionRef, ChannelId1);
-	Other1 ->
-	    ct:fail(Other1)
-    end.
-
-%%--------------------------------------------------------------------
-erlang_client_openssh_server_exec_compressed() ->
-    [{doc, "Test that compression option works"}].
-
-erlang_client_openssh_server_exec_compressed(Config) when is_list(Config) ->
-    CompressAlgs = [zlib, '[email protected]',none],
-    case ssh_test_lib:ssh_supports(CompressAlgs, compression) of
-	{false,L} ->
-	    {skip, io_lib:format("~p compression is not supported",[L])};
-
-	true ->
-	    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
-								     {user_interaction, false},
-								     {preferred_algorithms,
-								      [{compression,CompressAlgs}]}]),
-	    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
-	    success = ssh_connection:exec(ConnectionRef, ChannelId,
-					  "echo testing", infinity),
-	    Data = {ssh_cm, ConnectionRef, {data, ChannelId, 0, <<"testing\n">>}},
-	    case ssh_test_lib:receive_exec_result(Data) of
-		expected ->
-		    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
-		{unexpected_msg,{ssh_cm, ConnectionRef,
-				 {exit_status, ChannelId, 0}} = ExitStatus} ->
-		    ct:log("0: Collected data ~p", [ExitStatus]),
-		    ssh_test_lib:receive_exec_result(Data,  ConnectionRef, ChannelId);
-		Other ->
-		    ct:fail(Other)
-	    end
-    end.
-
-%%--------------------------------------------------------------------
-erlang_client_openssh_server_kexs() ->
-    [{doc, "Test that we can connect with different KEXs."}].
-
-erlang_client_openssh_server_kexs(Config) when is_list(Config) ->
-    KexAlgos = try proplists:get_value(kex, proplists:get_value(common_algs,Config))
-	       catch _:_ -> []
-	       end,
-    comment(KexAlgos),
-    case KexAlgos of
-	[] -> {skip, "No common kex algorithms"};
-	_ ->
-	    Success =
-		lists:foldl(
-		  fun(Kex, Acc) ->
-			  ConnectionRef = 
-			      ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
-								       {user_interaction, false},
-								       {preferred_algorithms,
-									[{kex,[Kex]}]}]),
-
-			  {ok, ChannelId} =
-			      ssh_connection:session_channel(ConnectionRef, infinity),
-			  success =
-			      ssh_connection:exec(ConnectionRef, ChannelId,
-						  "echo testing", infinity),
-
-			  ExpectedData = {ssh_cm, ConnectionRef, {data, ChannelId, 0, <<"testing\n">>}},
-			  case ssh_test_lib:receive_exec_result(ExpectedData) of
-			      expected ->
-				  ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId),
-				  Acc;
-			      {unexpected_msg,{ssh_cm, ConnectionRef,
-					       {exit_status, ChannelId, 0}} = ExitStatus} ->
-				  ct:log("0: Collected data ~p", [ExitStatus]),
-				  ssh_test_lib:receive_exec_result(ExpectedData,  ConnectionRef, ChannelId),
-				  Acc;
-			      Other ->
-				  ct:log("~p failed: ~p",[Kex,Other]),
-				  false
-			  end
-		  end, true, KexAlgos),
-	    case Success of
-		true ->
-		    ok;
-		false ->
-		    {fail, "Kex failed for one or more algos"}
-	    end
-    end.
-
-%%--------------------------------------------------------------------
-erlang_client_openssh_server_setenv() ->
-    [{doc, "Test api function ssh_connection:setenv"}].
-
-erlang_client_openssh_server_setenv(Config) when is_list(Config) ->
-    ConnectionRef =
-	ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
-						 {user_interaction, false}]),
-    {ok, ChannelId} =
-	ssh_connection:session_channel(ConnectionRef, infinity),
-    Env = case ssh_connection:setenv(ConnectionRef, ChannelId,
-				     "ENV_TEST", "testing_setenv",
-				     infinity) of
-	      success ->
-		  <<"tesing_setenv\n">>;
-	      failure ->
-		  <<"\n">>
-	  end,
-    success = ssh_connection:exec(ConnectionRef, ChannelId,
-				  "echo $ENV_TEST", infinity),
-    Data = {ssh_cm, ConnectionRef, {data, ChannelId, 0, Env}},
-    case ssh_test_lib:receive_exec_result(Data) of
-	expected ->
-	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
-	{unexpected_msg,{ssh_cm, ConnectionRef,
-			 {data,0,1, UnxpectedData}}} ->
-	    %% Some os may return things as
-	    %% ENV_TEST: Undefined variable.\n"
-	    ct:log("UnxpectedData: ~p", [UnxpectedData]),
-	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
-	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId, 0}}
-	 = ExitStatus} ->
-	    ct:log("0: Collected data ~p", [ExitStatus]),
-	    ssh_test_lib:receive_exec_result(Data,
-					     ConnectionRef, ChannelId);
-	Other ->
-	    ct:fail(Other)
-    end.
-
-%%--------------------------------------------------------------------
-
-%% setenv not meaningfull on erlang ssh daemon!
-
-%%--------------------------------------------------------------------
-erlang_client_openssh_server_publickey_rsa(Config) ->
-    erlang_client_openssh_server_publickey_X(Config, 'ssh-rsa').
-    
-erlang_client_openssh_server_publickey_dsa(Config) ->
-    erlang_client_openssh_server_publickey_X(Config, 'ssh-dss').
-
-
-erlang_client_openssh_server_publickey_X(_Config, Alg) ->
-    ConnectionRef =
-        ssh_test_lib:connect(?SSH_DEFAULT_PORT,
-                             [{pref_public_key_algs, [Alg]},
-                              {user_interaction, false},
-                              {auth_methods, "publickey"},
-                              silently_accept_hosts]),
-    {ok, Channel} =
-        ssh_connection:session_channel(ConnectionRef, infinity),
-    ok = ssh_connection:close(ConnectionRef, Channel),
-    ok = ssh:close(ConnectionRef).
-
-%%--------------------------------------------------------------------
-erlang_server_openssh_client_public_key_dsa() ->
-    [{timetrap, {seconds,(?TIMEOUT div 1000)+10}}].
-erlang_server_openssh_client_public_key_dsa(Config) when is_list(Config) ->
-    erlang_server_openssh_client_public_key_X(Config, 'ssh-dss').
-
-erlang_server_openssh_client_public_key_rsa() -> 
-    [{timetrap, {seconds,(?TIMEOUT div 1000)+10}}].
-erlang_server_openssh_client_public_key_rsa(Config) when is_list(Config) ->
-    erlang_server_openssh_client_public_key_X(Config, 'ssh-rsa').
-
-
-erlang_server_openssh_client_public_key_X(Config, Alg) ->
-    SystemDir = proplists:get_value(data_dir, Config),
-    PrivDir = proplists:get_value(priv_dir, Config),
-    KnownHosts = filename:join(PrivDir, "known_hosts"),
-    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
-                                             {preferred_algorithms,[{public_key, [Alg]}]},
-                                             {auth_methods, "publickey"},
-					     {failfun, fun ssh_test_lib:failfun/2}]),
-    ct:sleep(500),
-
-    Cmd = ssh_test_lib:open_sshc_cmd(Host, Port,
-                                     [" -o UserKnownHostsFile=", KnownHosts,
-                                      " -o StrictHostKeyChecking=no"],
-                                     "1+1."),
-    OpenSsh = ssh_test_lib:open_port({spawn, Cmd}),
-    ssh_test_lib:rcv_expected({data,<<"2\n">>}, OpenSsh, ?TIMEOUT),
-    ssh:stop_daemon(Pid).
-
 %%--------------------------------------------------------------------
 %% Test that the Erlang/OTP server can renegotiate with openSSH
 erlang_server_openssh_client_renegotiate(Config) ->
@@ -431,108 +177,6 @@ erlang_server_openssh_client_renegotiate(Config) ->
     end.
 
 %%--------------------------------------------------------------------
-erlang_client_openssh_server_renegotiate(_Config) ->
-    process_flag(trap_exit, true),
-    IO = ssh_test_lib:start_io_server(),
-    Ref = make_ref(),
-    Parent = self(),
-
-    Shell = 
-	spawn_link(
-	  fun() ->
-		  Host = ssh_test_lib:hostname(),
-		  Options = [{user_interaction, false},
-			     {silently_accept_hosts,true}],
-		  group_leader(IO, self()),
-		  {ok, ConnRef} = ssh:connect(Host, ?SSH_DEFAULT_PORT, Options),
-                  ct:log("Parent = ~p, IO = ~p, Shell = ~p, ConnRef = ~p~n",[Parent, IO, self(), ConnRef]),
-		  case ssh_connection:session_channel(ConnRef, infinity) of
-		      {ok,ChannelId}  ->
-			  success = ssh_connection:ptty_alloc(ConnRef, ChannelId, []),
-			  Args = [{channel_cb, ssh_shell},
-				  {init_args,[ConnRef, ChannelId]},
-				  {cm, ConnRef}, {channel_id, ChannelId}],
-			  {ok, State} = ssh_channel:init([Args]),
-			  Parent ! {ok, Ref, ConnRef},
-			  ssh_channel:enter_loop(State);
-		      Error ->
-			  Parent ! {error, Ref, Error}
-		  end,
-		  receive
-		      nothing -> ok
-		  end
-	  end),
-
-    receive
-	{error, Ref, Error} ->
-	    ct:fail("Error=~p",[Error]);
-	{ok, Ref, ConnectionRef} ->
-	    IO ! {input, self(), "echo Hej1\n"},
-	    receive_data("Hej1", ConnectionRef),
-	    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
-	    ssh_connection_handler:renegotiate(ConnectionRef),
-	    IO ! {input, self(), "echo Hej2\n"},
-	    receive_data("Hej2", ConnectionRef),
-	    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
-	    IO ! {input, self(), "exit\n"},
-	    receive_logout(),
-	    receive_normal_exit(Shell),
-	    true = (Kex1 =/= Kex2)
-    end.
-
-%%--------------------------------------------------------------------
-erlang_client_openssh_server_password() ->
-    [{doc, "Test client password option"}].
-erlang_client_openssh_server_password(Config) when is_list(Config) ->
-    %% to make sure we don't public-key-auth
-    UserDir = proplists:get_value(data_dir, Config),
-    {error, Reason0} =
-	ssh:connect(any, ?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
-					     {user, "foo"},
-					     {password, "morot"},
-					     {user_interaction, false},
-					     {user_dir, UserDir}]),
-    
-    ct:log("Test of user foo that does not exist. "
-		       "Error msg: ~p~n", [Reason0]),
-
-    User = string:strip(os:cmd("whoami"), right, $\n),
-
-    case length(string:tokens(User, " ")) of
-	1 ->
-	    {error, Reason1} =
-		ssh:connect(any, ?SSH_DEFAULT_PORT,
-			    [{silently_accept_hosts, true},
-			     {user, User},
-			     {password, "foo"},
-			     {user_interaction, false},
-			     {user_dir, UserDir}]),
-	    ct:log("Test of wrong Pasword.  "
-			       "Error msg: ~p~n", [Reason1]);
-	_ ->
-	    ct:log("Whoami failed reason: ~n", [])
-	end.
-
-%%--------------------------------------------------------------------
-
-erlang_client_openssh_server_nonexistent_subsystem() ->
-    [{doc, "Test client password option"}].
-erlang_client_openssh_server_nonexistent_subsystem(Config) when is_list(Config) ->
-
-    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT,
-					 [{user_interaction, false},
-					  silently_accept_hosts]),
-
-    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
-
-    failure = ssh_connection:subsystem(ConnectionRef, ChannelId, "foo", infinity).
-
-%%--------------------------------------------------------------------
-%
-%% Not possible to send password with openssh without user interaction
-%%
-%%--------------------------------------------------------------------
-%%--------------------------------------------------------------------
 %%% Internal functions -----------------------------------------------
 %%--------------------------------------------------------------------
 receive_data(Data, Conn) ->
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 5154658e8a..480e955ec4 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.6.1
-
+SSH_VSN = 4.6.5
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile
index d54ef47461..f9128e8e45 100644
--- a/lib/ssl/doc/src/Makefile
+++ b/lib/ssl/doc/src/Makefile
@@ -43,9 +43,9 @@ XML_REF6_FILES = ssl_app.xml
 
 XML_PART_FILES = usersguide.xml
 XML_CHAPTER_FILES = \
+	ssl_introduction.xml \
 	ssl_protocol.xml \
 	using_ssl.xml \
-	pkix_certs.xml \
 	ssl_distribution.xml \
 	notes.xml
 
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 4c6a204e63..bdf8711b2f 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,136 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 8.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Packet options cannot be supported for unreliable
+	    transports, that is, packet option for DTLS over udp will
+	    not be supported.</p>
+          <p>
+	    Own Id: OTP-14664</p>
+        </item>
+        <item>
+          <p>
+	    Ensure data delivery before close if possible. This fix
+	    is related to fix in PR-1479.</p>
+          <p>
+	    Own Id: OTP-14794</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The crypto API is extended to use private/public keys
+	    stored in an Engine for sign/verify or encrypt/decrypt
+	    operations.</p>
+          <p>
+	    The ssl application provides an API to use this new
+	    engine concept in TLS.</p>
+          <p>
+	    Own Id: OTP-14448</p>
+        </item>
+        <item>
+          <p>
+	    Implemented renegotiation for DTLS</p>
+          <p>
+	    Own Id: OTP-14563</p>
+        </item>
+        <item>
+          <p>
+	    A new command line option <c>-ssl_dist_optfile</c> has
+	    been added to facilitate specifying the many options
+	    needed when using SSL as the distribution protocol.</p>
+          <p>
+	    Own Id: OTP-14657</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 8.2.2</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    TLS sessions must be registered with SNI if provided, so
+	    that sessions where client hostname verification would
+	    fail can not connect reusing a session created when the
+	    server name verification succeeded.</p>
+          <p>
+	    Own Id: OTP-14632</p>
+        </item>
+        <item>
+	    <p> An erlang TLS server configured with cipher suites
+	    using rsa key exchange, may be vulnerable to an Adaptive
+	    Chosen Ciphertext attack (AKA Bleichenbacher attack)
+	    against RSA, which when exploited, may result in
+	    plaintext recovery of encrypted messages and/or a
+	    Man-in-the-middle (MiTM) attack, despite the attacker not
+	    having gained access to the server’s private key
+	    itself. <url
+	    href="https://nvd.nist.gov/vuln/detail/CVE-2017-1000385">CVE-2017-1000385</url>
+	    </p> <p> Exploiting this vulnerability to perform
+	    plaintext recovery of encrypted messages will, in most
+	    practical cases, allow an attacker to read the plaintext
+	    only after the session has completed. Only TLS sessions
+	    established using RSA key exchange are vulnerable to this
+	    attack. </p> <p> Exploiting this vulnerability to conduct
+	    a MiTM attack requires the attacker to complete the
+	    initial attack, which may require thousands of server
+	    requests, during the handshake phase of the targeted
+	    session within the window of the configured handshake
+	    timeout. This attack may be conducted against any TLS
+	    session using RSA signatures, but only if cipher suites
+	    using RSA key exchange are also enabled on the server.
+	    The limited window of opportunity, limitations in
+	    bandwidth, and latency make this attack significantly
+	    more difficult to execute. </p> <p> RSA key exchange is
+	    enabled by default although least prioritized if server
+	    order is honored. For such a cipher suite to be chosen it
+	    must also be supported by the client and probably the
+	    only shared cipher suite. </p> <p> Captured TLS sessions
+	    encrypted with ephemeral cipher suites (DHE or ECDHE) are
+	    not at risk for subsequent decryption due to this
+	    vulnerability. </p> <p> As a workaround if default cipher
+	    suite configuration was used you can configure the server
+	    to not use vulnerable suites with the ciphers option like
+	    this: </p> <c> {ciphers, [Suite || Suite &lt;-
+	    ssl:cipher_suites(), element(1,Suite) =/= rsa]} </c> <p>
+	    that is your code will look somethingh like this: </p>
+	    <c> ssl:listen(Port, [{ciphers, [Suite || Suite &lt;-
+	    ssl:cipher_suites(), element(1,S) =/= rsa]} | Options]).
+	    </c> <p> Thanks to Hanno Böck, Juraj Somorovsky and
+	    Craig Young for reporting this vulnerability. </p>
+          <p>
+	    Own Id: OTP-14748</p>
+        </item>
+      </list>
+    </section>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    If no SNI is available and the hostname is an IP-address
+	    also check for IP-address match. This check is not as
+	    good as a DNS hostname check and certificates using
+	    IP-address are not recommended.</p>
+          <p>
+	    Own Id: OTP-14655</p>
+        </item>
+      </list>
+    </section>
+
+</section>
 
 <section><title>SSL 8.2.1</title>
 
@@ -175,9 +305,74 @@
         </item>
       </list>
     </section>
+</section>
+
+<section><title>SSL 8.1.3.1.1</title>
 
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix alert handling so that unexpected messages are logged
+	    and alerted correctly</p>
+          <p>
+	    Own Id: OTP-14929</p>
+        </item>
+      </list>
+    </section>
 </section>
 
+<section><title>SSL 8.1.3.1</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> An erlang TLS server configured with cipher suites
+	    using rsa key exchange, may be vulnerable to an Adaptive
+	    Chosen Ciphertext attack (AKA Bleichenbacher attack)
+	    against RSA, which when exploited, may result in
+	    plaintext recovery of encrypted messages and/or a
+	    Man-in-the-middle (MiTM) attack, despite the attacker not
+	    having gained access to the server’s private key
+	    itself. <url
+	    href="https://nvd.nist.gov/vuln/detail/CVE-2017-1000385">CVE-2017-1000385</url>
+	    </p> <p> Exploiting this vulnerability to perform
+	    plaintext recovery of encrypted messages will, in most
+	    practical cases, allow an attacker to read the plaintext
+	    only after the session has completed. Only TLS sessions
+	    established using RSA key exchange are vulnerable to this
+	    attack. </p> <p> Exploiting this vulnerability to conduct
+	    a MiTM attack requires the attacker to complete the
+	    initial attack, which may require thousands of server
+	    requests, during the handshake phase of the targeted
+	    session within the window of the configured handshake
+	    timeout. This attack may be conducted against any TLS
+	    session using RSA signatures, but only if cipher suites
+	    using RSA key exchange are also enabled on the server.
+	    The limited window of opportunity, limitations in
+	    bandwidth, and latency make this attack significantly
+	    more difficult to execute. </p> <p> RSA key exchange is
+	    enabled by default although least prioritized if server
+	    order is honored. For such a cipher suite to be chosen it
+	    must also be supported by the client and probably the
+	    only shared cipher suite. </p> <p> Captured TLS sessions
+	    encrypted with ephemeral cipher suites (DHE or ECDHE) are
+	    not at risk for subsequent decryption due to this
+	    vulnerability. </p> <p> As a workaround if default cipher
+	    suite configuration was used you can configure the server
+	    to not use vulnerable suites with the ciphers option like
+	    this: </p> <c> {ciphers, [Suite || Suite &lt;-
+	    ssl:cipher_suites(), element(1,Suite) =/= rsa]} </c> <p>
+	    that is your code will look somethingh like this: </p>
+	    <c> ssl:listen(Port, [{ciphers, [Suite || Suite &lt;-
+	    ssl:cipher_suites(), element(1,S) =/= rsa]} | Options]).
+	    </c> <p> Thanks to Hanno Böck, Juraj Somorovsky and
+	    Craig Young for reporting this vulnerability. </p>
+          <p>
+	    Own Id: OTP-14748</p>
+        </item>
+      </list>
+    </section>
+</section>
 <section><title>SSL 8.1.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -556,6 +751,60 @@
 
 </section>
 
+ <section><title>SSL 7.3.3.2</title>
+
+      <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+	<item>
+	  <p> An erlang TLS server configured with cipher suites
+	  using rsa key exchange, may be vulnerable to an Adaptive
+	  Chosen Ciphertext attack (AKA Bleichenbacher attack)
+	  against RSA, which when exploited, may result in
+	  plaintext recovery of encrypted messages and/or a
+	  Man-in-the-middle (MiTM) attack, despite the attacker not
+	  having gained access to the server’s private key
+	  itself. <url
+	  href="https://nvd.nist.gov/vuln/detail/CVE-2017-1000385">CVE-2017-1000385</url>
+	  </p> <p> Exploiting this vulnerability to perform
+	  plaintext recovery of encrypted messages will, in most
+	  practical cases, allow an attacker to read the plaintext
+	  only after the session has completed. Only TLS sessions
+	  established using RSA key exchange are vulnerable to this
+	  attack. </p> <p> Exploiting this vulnerability to conduct
+	  a MiTM attack requires the attacker to complete the
+	  initial attack, which may require thousands of server
+	  requests, during the handshake phase of the targeted
+	  session within the window of the configured handshake
+	  timeout. This attack may be conducted against any TLS
+	  session using RSA signatures, but only if cipher suites
+	  using RSA key exchange are also enabled on the server.
+	  The limited window of opportunity, limitations in
+	  bandwidth, and latency make this attack significantly
+	  more difficult to execute. </p> <p> RSA key exchange is
+	  enabled by default although least prioritized if server
+	  order is honored. For such a cipher suite to be chosen it
+	  must also be supported by the client and probably the
+	  only shared cipher suite. </p> <p> Captured TLS sessions
+	  encrypted with ephemeral cipher suites (DHE or ECDHE) are
+	  not at risk for subsequent decryption due to this
+	  vulnerability. </p> <p> As a workaround if default cipher
+	  suite configuration was used you can configure the server
+	  to not use vulnerable suites with the ciphers option like
+	  this: </p> <c> {ciphers, [Suite || Suite &lt;-
+	  ssl:cipher_suites(), element(1,Suite) =/= rsa]} </c> <p>
+	  that is your code will look somethingh like this: </p>
+	  <c> ssl:listen(Port, [{ciphers, [Suite || Suite &lt;-
+	  ssl:cipher_suites(), element(1,S) =/= rsa]} | Options]).
+	  </c> <p> Thanks to Hanno Böck, Juraj Somorovsky and
+	  Craig Young for reporting this vulnerability. </p>
+	  <p>
+	  Own Id: OTP-14748</p>
+	</item>
+	    </list>
+      </section>
+      
+  </section>
+
 <section><title>SSL 7.3.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -585,7 +834,59 @@
       </list>
     </section>
 
+ <section><title>SSL 7.3.3.0.1</title>
 
+      <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+	<item>
+	  <p> An erlang TLS server configured with cipher suites
+	  using rsa key exchange, may be vulnerable to an Adaptive
+	  Chosen Ciphertext attack (AKA Bleichenbacher attack)
+	  against RSA, which when exploited, may result in
+	  plaintext recovery of encrypted messages and/or a
+	  Man-in-the-middle (MiTM) attack, despite the attacker not
+	  having gained access to the server’s private key
+	  itself. <url
+	  href="https://nvd.nist.gov/vuln/detail/CVE-2017-1000385">CVE-2017-1000385</url>
+	  </p> <p> Exploiting this vulnerability to perform
+	  plaintext recovery of encrypted messages will, in most
+	  practical cases, allow an attacker to read the plaintext
+	  only after the session has completed. Only TLS sessions
+	  established using RSA key exchange are vulnerable to this
+	  attack. </p> <p> Exploiting this vulnerability to conduct
+	  a MiTM attack requires the attacker to complete the
+	  initial attack, which may require thousands of server
+	  requests, during the handshake phase of the targeted
+	  session within the window of the configured handshake
+	  timeout. This attack may be conducted against any TLS
+	  session using RSA signatures, but only if cipher suites
+	  using RSA key exchange are also enabled on the server.
+	  The limited window of opportunity, limitations in
+	  bandwidth, and latency make this attack significantly
+	  more difficult to execute. </p> <p> RSA key exchange is
+	  enabled by default although least prioritized if server
+	  order is honored. For such a cipher suite to be chosen it
+	  must also be supported by the client and probably the
+	  only shared cipher suite. </p> <p> Captured TLS sessions
+	  encrypted with ephemeral cipher suites (DHE or ECDHE) are
+	  not at risk for subsequent decryption due to this
+	  vulnerability. </p> <p> As a workaround if default cipher
+	  suite configuration was used you can configure the server
+	  to not use vulnerable suites with the ciphers option like
+	  this: </p> <c> {ciphers, [Suite || Suite &lt;-
+	  ssl:cipher_suites(), element(1,Suite) =/= rsa]} </c> <p>
+	  that is your code will look somethingh like this: </p>
+	  <c> ssl:listen(Port, [{ciphers, [Suite || Suite &lt;-
+	  ssl:cipher_suites(), element(1,S) =/= rsa]} | Options]).
+	  </c> <p> Thanks to Hanno Böck, Juraj Somorovsky and
+	  Craig Young for reporting this vulnerability. </p>
+	  <p>
+	  Own Id: OTP-14748</p>
+	</item>
+	    </list>
+      </section>
+      
+  </section>
     <section><title>Improvements and New Features</title>
       <list>
         <item>
diff --git a/lib/ssl/doc/src/pkix_certs.xml b/lib/ssl/doc/src/pkix_certs.xml
deleted file mode 100644
index f365acef4d..0000000000
--- a/lib/ssl/doc/src/pkix_certs.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2003</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>PKIX Certificates</title>
-    <prepared>UAB/F/P Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>2003-06-09</date>
-    <rev>A</rev>
-    <file>pkix_certs.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction to Certificates</title>
-    <p>Certificates were originally defined by ITU (CCITT) and the latest 
-      definitions are described in <cite id="X.509"></cite>, but those definitions
-      are (as always) not working. 
-    </p>
-    <p>Working certificate definitions for the Internet Community are found
-      in the the PKIX RFCs <cite id="rfc3279"></cite> and <cite id="rfc3280"></cite>. 
-      The parsing of certificates in the Erlang/OTP SSL application is
-      based on those RFCS. 
-    </p>
-    <p>Certificates are defined in terms of ASN.1 (<cite id="X.680"></cite>).
-      For an introduction to ASN.1 see <url href="http://asn1.elibel.tm.fr/">ASN.1 Information Site</url>.
-    </p>    
-  </section>
-
-  <section>
-    <title>PKIX Certificates</title>
-    <p>Certificate handling is now handled by the <c>public_key</c> application.</p>
-    <p>
-      DER encoded certificates returned by <c>ssl:peercert/1</c> can for example 
-      be decoded by the <c>public_key:pkix_decode_cert/2</c> function. 
-    </p>
-  </section>
-</chapter>
-
-
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index e80fd59a7f..7267083e32 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -32,7 +32,7 @@
   <modulesummary>Interface Functions for Secure Socket Layer</modulesummary>
   <description>
     <p>
-      This module contains interface functions for the SSL/TLS protocol.
+      This module contains interface functions for the SSL/TLS/DTLS protocol.
       For detailed information about the supported standards see 
       <seealso marker="ssl_app">ssl(6)</seealso>.
     </p>
@@ -40,7 +40,7 @@
     
   <section>
     <title>DATA TYPES</title>
-    <p>The following data types are used in the functions for SSL:</p>
+    <p>The following data types are used in the functions for SSL/TLS/DTLS:</p>
 
     <taglist>
 
@@ -56,9 +56,11 @@
       <p>The default socket options are
       <c>[{mode,list},{packet, 0},{header, 0},{active, true}]</c>.</p>
       <p>For valid options, see the
-      <seealso marker="kernel:inet">inet(3)</seealso> and
-      <seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso> manual pages
-      in Kernel.</p></item>
+      <seealso marker="kernel:inet">inet(3)</seealso>,
+      <seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso> and
+      <seealso marker="kernel:gen_tcp">gen_udp(3)</seealso> 
+      manual pages
+      in Kernel. Note that stream oriented options such as packet are only relevant for SSL/TLS and not DTLS</p></item>
 
       <tag><marker id="type-ssloption"/><c>ssl_option() =</c></tag>
       <item>
@@ -69,7 +71,9 @@
 	<p><c>| {cert, public_key:der_encoded()}</c></p>
 	<p><c>| {certfile, path()}</c></p>
 	<p><c>| {key, {'RSAPrivateKey'| 'DSAPrivateKey' | 'ECPrivateKey' 
-	| 'PrivateKeyInfo', public_key:der_encoded()}}</c></p>
+	| 'PrivateKeyInfo', public_key:der_encoded()} |
+	#{algorithm := rsa | dss | ecdsa,
+	engine := crypto:engine_ref(), key_id := crypto:key_id(), password => crypto:password()}</c></p>
 	<p><c>| {keyfile, path()}</c></p>
 	<p><c>| {password, string()}</c></p>
 	<p><c>| {cacerts, [public_key:der_encoded()]}</c></p>
@@ -93,13 +97,14 @@
       <item><p><c>{cb_info, {CallbackModule::atom(), DataTag::atom(),
 
       ClosedTag::atom(), ErrTag:atom()}}</c></p>
-      <p>Defaults to <c>{gen_tcp, tcp, tcp_closed, tcp_error}</c>. Can be used
-      to customize the transport layer. The callback module must implement a
+      <p>Defaults to <c>{gen_tcp, tcp, tcp_closed, tcp_error}</c> for TLS
+      and <c>{gen_udp, udp, udp_closed, udp_error}</c> for DTLS. Can be used
+      to customize the transport layer. For TLS the callback module must implement a
       reliable transport protocol, behave as <c>gen_tcp</c>, and have functions
       corresponding to <c>inet:setopts/2</c>, <c>inet:getopts/2</c>,
       <c>inet:peername/1</c>, <c>inet:sockname/1</c>, and <c>inet:port/1</c>.
       The callback <c>gen_tcp</c> is treated specially and calls <c>inet</c>
-      directly.</p>
+      directly. For DTLS this feature must be considered exprimental.</p>
       <taglist>
 	<tag><c>CallbackModule =</c></tag>
 	<item><p><c>atom()</c></p></item>
@@ -135,18 +140,26 @@
 
       <tag><c>sslsocket() =</c></tag>
       <item><p>opaque()</p></item>
-
-      <tag><marker id="type-protocol"/><c>protocol() =</c></tag>
+      
+      <tag><marker id="type-protocol"/><c> protocol_version() =</c></tag>
+      <item><p><c> ssl_tls_protocol() |  dtls_protocol() </c></p></item>
+      
       <item><p><c>sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2'</c></p></item>
 
+      <tag><marker id="type-protocol"/><c> dtls_protocol() =</c></tag>
+      <item><p><c>'dtlsv1' | 'dtlsv1.2'</c></p></item>
+
       <tag><c>ciphers() =</c></tag>
-      <item><p><c>= [ciphersuite()] | string()</c></p>
-      <p>According to old API.</p></item>
+      <item><p><c>= [ciphersuite()]</c></p>
+      <p>Tuples and string formats accepted by versions
+      before ssl-8.2.4 will be converted for backwards compatibility</p></item>
 
       <tag><c>ciphersuite() =</c></tag>
-
-      <item><p><c>{key_exchange(), cipher(), MAC::hash()} |
-      {key_exchange(), cipher(), MAC::hash(), PRF::hash()}</c></p></item>
+      <item><p><c>
+      #{key_exchange := key_exchange(),
+        cipher := cipher(),
+        mac := MAC::hash() | aead,
+        prf := PRF::hash() | default_prf} </c></p></item>
 
       <tag><c>key_exchange()=</c></tag>
       <item><p><c>rsa | dhe_dss | dhe_rsa | dh_anon | psk | dhe_psk
@@ -163,6 +176,12 @@
       <tag><c>prf_random() =</c></tag>
       <item><p><c>client_random | server_random</c></p></item>
 
+      <tag><c>cipher_filters() =</c></tag>
+      <item><p><c> [{key_exchange | cipher | mac | prf, algo_filter()}])</c></p></item>
+
+      <tag><c>algo_filter() =</c></tag>
+      <item><p>fun(key_exchange() | cipher() | hash() | aead | default_prf) -> true | false </p></item>
+
       <tag><c>srp_param_type() =</c></tag>
       <item><p><c>srp_1024 | srp_1536 | srp_2048 | srp_3072
       | srp_4096 | srp_6144 | srp_8192</c></p></item>
@@ -182,7 +201,7 @@
   </section>
 
   <section>
-    <title>SSL OPTION DESCRIPTIONS - COMMON for SERVER and CLIENT</title>
+    <title>TLS/DTLS OPTION DESCRIPTIONS - COMMON for SERVER and CLIENT</title>
 
     <p>The following options have the same meaning in the client and 
     the server:</p>
@@ -201,9 +220,15 @@
       <tag><c>{certfile, path()}</c></tag>
       <item><p>Path to a file containing the user certificate.</p></item>
       
-      <tag><c>{key, {'RSAPrivateKey'| 'DSAPrivateKey' | 'ECPrivateKey'
-      |'PrivateKeyInfo', public_key:der_encoded()}}</c></tag>
-      <item><p>The DER-encoded user's private key. If this option 
+      <tag>
+	<marker id="key_option_def"/>
+	<c>{key, {'RSAPrivateKey'| 'DSAPrivateKey' | 'ECPrivateKey'
+      |'PrivateKeyInfo', public_key:der_encoded()} |  #{algorithm := rsa | dss | ecdsa,
+	engine := crypto:engine_ref(), key_id :=  crypto:key_id(), password => crypto:password()}</c></tag>
+      <item><p>The DER-encoded user's private key or a map refering to a crypto
+      engine and its key reference that optionally can be password protected,
+      seealso <seealso marker="crypto:crypto#engine_load-4"> crypto:engine_load/4
+      </seealso> and  <seealso marker="crypto:engine_load"> Crypto's Users Guide</seealso>. If this option 
       is supplied, it overrides option <c>keyfile</c>.</p></item>
       
       <tag><c>{keyfile, path()}</c></tag>
@@ -239,8 +264,9 @@
       <item><p>Specifies if to reject renegotiation attempt that does
       not live up to 
       <url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url>. 
-      By default <c>secure_renegotiate</c> is set to <c>false</c>, 
-      that is, secure renegotiation is used if possible,
+      By default <c>secure_renegotiate</c> is set to <c>true</c>, 
+      that is, secure renegotiation is enforced. If set to <c>false</c> secure renegotiation
+      will still be used if possible,
       but it falls back to insecure renegotiation if the peer
       does not support 
       <url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url>.</p>
@@ -281,11 +307,11 @@ atom()}} |
 	<list type="bulleted">
 	  <item><p>If the verify callback fun returns <c>{fail, Reason}</c>,
 	  the verification process is immediately stopped, an alert is
-	  sent to the peer, and the TLS/SSL handshake terminates.</p></item>
+	  sent to the peer, and the TLS/DTLS handshake terminates.</p></item>
 	  <item><p>If the verify callback fun returns <c>{valid, UserState}</c>,
 	  the verification process continues.</p></item> 
 	  <item><p>If the verify callback fun always returns
-	  <c>{valid, UserState}</c>, the TLS/SSL handshake does not
+	  <c>{valid, UserState}</c>, the TLS/DTLS handshake does not
 	  terminate regarding verification failures and the connection is
 	  established.</p></item>
 	  <item><p>If called with an extension unknown to the user application,
@@ -448,15 +474,16 @@ marker="public_key:public_key#pkix_path_validation-3">public_key:pkix_path_valid
       marker="public_key:public_key#pkix_path_validation-3">public_key:pkix_path_validation/3</seealso>
       with the selected CA as trusted anchor and the rest of the chain.</p></item>
 
-      <tag><c>{versions, [protocol()]}</c></tag>
+      <tag><c>{versions, [protocol_version()]}</c></tag>
+
       <item><p>TLS protocol versions supported by started clients and servers.
       This option overrides the application environment option
-      <c>protocol_version</c>. If the environment option is not set, it defaults
+      <c>protocol_version</c> and  <c>dtls_protocol_version</c>. If the environment option is not set, it defaults
       to all versions, except SSL-3.0, supported by the SSL application.
       See also <seealso marker="ssl:ssl_app">ssl(6).</seealso></p></item>
 
       <tag><c>{hibernate_after, integer()|undefined}</c></tag>
-      <item><p>When an integer-value is specified, <c>ssl_connection</c>
+      <item><p>When an integer-value is specified, <c>TLS/DTLS-connection</c>
       goes into hibernation after the specified number of milliseconds
       of inactivity, thus reducing its memory footprint. When
       <c>undefined</c> is specified (this is the default), the process
@@ -516,7 +543,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
   </section>
   
   <section>
-    <title>SSL OPTION DESCRIPTIONS - CLIENT SIDE</title>
+    <title>TLS/DTLS OPTION DESCRIPTIONS - CLIENT SIDE</title>
 
     <p>The following options are client-specific or have a slightly different
     meaning in the client than in the server:</p>
@@ -656,7 +683,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
    </section>
    
   <section>
-    <title>SSL OPTION DESCRIPTIONS - SERVER SIDE</title>
+    <title>TLS/DTLS OPTION DESCRIPTIONS - SERVER SIDE</title>
 
     <p>The following options are server-specific or have a slightly different
     meaning in the server than in the client:</p>
@@ -694,7 +721,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
       </p></item>
 
       <tag><c>{fail_if_no_peer_cert, boolean()}</c></tag>
-      <item><p>Used together with <c>{verify, verify_peer}</c> by an SSL server.
+      <item><p>Used together with <c>{verify, verify_peer}</c> by an TLS/DTLS server.
       If set to <c>true</c>, the server fails if the client does not have
       a certificate to send, that is, sends an empty certificate. If set to
       <c>false</c>, it fails only if the client sends an invalid
@@ -708,7 +735,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
 
       <tag><c>{reuse_session, fun(SuggestedSessionId,
       PeerCert, Compression, CipherSuite) -> boolean()}</c></tag>
-      <item><p>Enables the SSL server to have a local policy
+      <item><p>Enables the TLS/DTLS server to have a local policy
       for deciding if a session is to be reused or not.
       Meaningful only if <c>reuse_sessions</c> is set to <c>true</c>.
       <c>SuggestedSessionId</c> is a <c>binary()</c>, <c>PeerCert</c> is
@@ -806,7 +833,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
   <section>
     <title>General</title>
       
-    <p>When an SSL socket is in active mode (the default), data from the
+    <p>When an TLS/DTLS socket is in active mode (the default), data from the
       socket is delivered to the owner of the socket in the form of
       messages:</p>
 
@@ -821,14 +848,34 @@ fun(srp, Username :: string(), UserState :: term()) ->
   </section>
   
   <funcs>
+
+    <func>
+      <name>append_cipher_suites(Deferred, Suites) -> ciphers() </name>
+      <fsummary></fsummary>
+      <type>
+           <v>Deferred = ciphers() | cipher_filters() </v>
+	   <v>Suites  = ciphers() </v>
+      </type>
+      <desc><p>Make <c>Deferred</c> suites become the least preferred
+      suites, that is put them at the end of the cipher suite list
+      <c>Suites</c> after removing them from <c>Suites</c> if
+      present. <c>Deferred</c> may be a list of cipher suits or a
+      list of filters in which case the filters are use on  <c>Suites</c> to
+      extract the Deferred cipher list.</p> 
+      </desc>
+    </func>
+    
     <func>
       <name>cipher_suites() -></name>
-      <name>cipher_suites(Type) -> ciphers()</name>
+      <name>cipher_suites(Type) -> old_ciphers()</name>
       <fsummary>Returns a list of supported cipher suites.</fsummary>
       <type>
         <v>Type = erlang | openssl | all</v>
       </type>
-      <desc><p>Returns a list of supported cipher suites.
+      <desc>
+	<p>Returns a list of supported cipher suites.
+	This function will become deprecated in OTP 21, and replaced
+	by <seealso marker="#cipher_suites-2">ssl:cipher-suites/2</seealso>
 	<c>cipher_suites()</c> is equivalent to <c>cipher_suites(erlang).</c>
 	Type <c>openssl</c> is provided for backwards compatibility with the
 	old SSL, which used OpenSSL. <c>cipher_suites(all)</c> returns
@@ -836,12 +883,26 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	in <c>cipher_suites(erlang)</c> but included in
 	<c>cipher_suites(all)</c> are not used unless explicitly configured
 	by the user.</p>
+      </desc>
+    </func>
+    
+   <func>
+      <name>cipher_suites(Supported, Version) ->  ciphers()</name>
+      <fsummary>Returns a list of all default or
+      all supported cipher suites.</fsummary>
+      <type>
+        <v> Supported = default | all | anonymous </v>
+	<v> Version = protocol_version() </v>
+      </type>
+      <desc><p>Returns all default or all supported (except anonymous),
+      or all anonymous cipher suites for a
+      TLS version</p>
     </desc>
     </func>
 
     <func>
       <name>eccs() -></name>
-      <name>eccs(protocol()) -> [named_curve()]</name>
+      <name>eccs(protocol_version()) -> [named_curve()]</name>
       <fsummary>Returns a list of supported ECCs.</fsummary>
 
       <desc><p>Returns a list of supported ECCs. <c>eccs()</c>
@@ -849,7 +910,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
       supported protocols and then deduplicating the output.</p>
       </desc>
     </func>
-
+    
     <func>
       <name>clear_pem_cache() -> ok </name>
       <fsummary> Clears the pem cache</fsummary>
@@ -864,20 +925,20 @@ fun(srp, Username :: string(), UserState :: term()) ->
    
     <func>
       <name>connect(Socket, SslOptions) -> </name>
-      <name>connect(Socket, SslOptions, Timeout) -> {ok, SslSocket}
+      <name>connect(Socket, SslOptions, Timeout) -> {ok, TLSSocket}
 	| {error, Reason}</name>
       <fsummary>Upgrades a <c>gen_tcp</c>, or
-	equivalent, connected socket to an SSL socket.</fsummary>
+	equivalent, connected socket to an TLS socket.</fsummary>
       <type>
 	<v>Socket = socket()</v>
 	<v>SslOptions = [ssl_option()]</v>
 	<v>Timeout = integer() | infinity</v>
-	<v>SslSocket = sslsocket()</v>
+	<v>TLSSocket = sslsocket()</v>
 	<v>Reason = term()</v>
       </type>
       <desc><p>Upgrades a <c>gen_tcp</c>, or equivalent,
-	  connected socket to an SSL socket, that is, performs the
-	  client-side ssl handshake.</p>
+	  connected socket to an TLS socket, that is, performs the
+	  client-side TLS handshake.</p>
 	  
 	  <note><p>If the option <c>verify</c> is set to <c>verify_peer</c>
 	  the option <c>server_name_indication</c> shall also be specified,
@@ -891,7 +952,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <name>connect(Host, Port, Options) -></name>
       <name>connect(Host, Port, Options, Timeout) ->
 	  {ok, SslSocket} | {error, Reason}</name>
-      <fsummary>Opens an SSL connection to <c>Host</c>, <c>Port</c>.</fsummary>
+      <fsummary>Opens an TLS/DTLS connection to <c>Host</c>, <c>Port</c>.</fsummary>
       <type>
 	  <v>Host = host()</v>
 	  <v>Port = integer()</v>
@@ -900,13 +961,13 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	  <v>SslSocket = sslsocket()</v>
 	  <v>Reason = term()</v>
       </type>
-      <desc><p>Opens an SSL connection to <c>Host</c>, <c>Port</c>.</p>
+      <desc><p>Opens an TLS/DTLS connection to <c>Host</c>, <c>Port</c>.</p>
       
       <p> When the option <c>verify</c> is set to <c>verify_peer</c> the check 
       <seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso> 
       will be performed in addition to the usual x509-path validation checks. If the check fails the error {bad_cert, hostname_check_failed} will
       be propagated to the path validation fun <seealso marker="#verify_fun">verify_fun</seealso>, where it is possible to do customized
-      checks by using the full possibilitis of the <seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso> API.
+      checks by using the full possibilities of the <seealso marker="public_key:public_key#pkix_verify_hostname-3">public_key:pkix_verify_hostname/3</seealso> API.
       
       When the option <c>server_name_indication</c> is provided, its value (the DNS name) will be used as <c>ReferenceID</c>
       to <seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso>.
@@ -922,24 +983,24 @@ fun(srp, Username :: string(), UserState :: term()) ->
 
     <func>
       <name>close(SslSocket) -> ok | {error, Reason}</name>
-      <fsummary>Closes an SSL connection.</fsummary>
+      <fsummary>Closes an TLS/DTLS connection.</fsummary>
       <type>
 	  <v>SslSocket = sslsocket()</v>
 	  <v>Reason = term()</v>
       </type>
-      <desc><p>Closes an SSL connection.</p>
+      <desc><p>Closes an TLS/DTLS connection.</p>
       </desc>
     </func>
 
     <func>
       <name>close(SslSocket, How) -> ok | {ok, port()} | {error, Reason}</name>
-      <fsummary>Closes an SSL connection.</fsummary>
+      <fsummary>Closes an TLS connection.</fsummary>
       <type>
 	  <v>SslSocket = sslsocket()</v>
 	  <v>How =  timeout() | {NewController::pid(), timeout()} </v>
 	  <v>Reason = term()</v>
       </type>
-      <desc><p>Closes or downgrades an SSL connection. In the latter case the transport
+      <desc><p>Closes or downgrades an TLS connection. In the latter case the transport
       connection will be handed over to the <c>NewController</c> process after receiving
       the TLS close alert from the peer. The returned transport socket will have
       the following options set: <c>[{active, false}, {packet, 0}, {mode, binary}]</c></p>
@@ -950,7 +1011,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <name>controlling_process(SslSocket, NewOwner) ->
 	ok | {error, Reason}</name>
 	<fsummary>Assigns a new controlling process to the
-	SSL socket.</fsummary>
+	TLS/DTLS socket.</fsummary>
 	<type>
 	  <v>SslSocket = sslsocket()</v>
 	  <v>NewOwner = pid()</v>
@@ -1000,6 +1061,21 @@ fun(srp, Username :: string(), UserState :: term()) ->
       </desc>
     </func>
 
+      <func>
+      <name>filter_cipher_suites(Suites, Filters) -> ciphers()</name>
+      <fsummary></fsummary>
+      <type>
+	<v> Suites = ciphers()</v>
+        <v> Filters = cipher_filters()</v>
+      </type>
+      <desc><p>Removes cipher suites if any of the filter functions
+      returns false for any part of the cipher suite. This function
+      also calls default filter functions to make sure the cipher
+      suites are supported by crypto. If no filter function is supplied for some
+      part the default behaviour is fun(Algorithm) -> true.</p>
+    </desc>
+    </func>
+    
     <func>
       <name>format_error(Reason) -> string()</name>
       <fsummary>Returns an error string.</fsummary>
@@ -1097,6 +1173,22 @@ fun(srp, Username :: string(), UserState :: term()) ->
         <p>Returns the address and port number of the peer.</p>
       </desc>
     </func>
+    
+      <func>
+      <name>prepend_cipher_suites(Preferred, Suites) -> ciphers()</name>
+      <fsummary></fsummary>
+      <type>
+        <v>Preferred = ciphers() | cipher_filters() </v>
+	<v>Suites = ciphers() </v>
+      </type>
+      <desc><p>Make <c>Preferred</c> suites become the most preferred
+      suites that is put them at the head of the cipher suite list
+      <c>Suites</c> after removing them from <c>Suites</c> if
+      present. <c>Preferred</c> may be a list of cipher suits or a
+      list of filters in which case the filters are use on <c>Suites</c> to
+      extract the preferred cipher list. </p>
+      </desc>
+    </func>
 
     <func>
       <name>prf(Socket, Secret, Label, Seed, WantedLength) -> {ok, binary()} | {error, reason()}</name>
@@ -1113,7 +1205,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	  extra key material. It either takes user-generated values for
 	  <c>Secret</c> and <c>Seed</c> or atoms directing it to use a specific
 	  value from the session security parameters.</p>
-        <p>Can only be used with TLS connections; <c>{error, undefined}</c>
+        <p>Can only be used with TLS/DTLS connections; <c>{error, undefined}</c>
 	  is returned for SSLv3 connections.</p>
       </desc>
     </func>
@@ -1213,7 +1305,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Performs the SSL/TLS server-side handshake.</p>
+        <p>Performs the SSL/TLS/DTLS server-side handshake.</p>
 	<p><c>Socket</c> is a socket as returned by
 	<seealso marker="#transport_accept-2">ssl:transport_accept/[1,2]</seealso>
 	</p>
@@ -1223,7 +1315,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
     <func>
       <name>ssl_accept(Socket, SslOptions) -> </name>
       <name>ssl_accept(Socket, SslOptions, Timeout) -> {ok, Socket} | ok | {error, Reason}</name>
-      <fsummary>Performs server-side SSL/TLS handshake.</fsummary>
+      <fsummary>Performs server-side SSL/TLS/DTLS handshake.</fsummary>
       <type>
         <v>Socket = socket() | sslsocket() </v>
 	<v>SslOptions = [ssl_option()]</v>
@@ -1240,10 +1332,10 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	by calling this function, else the upgrade succeeds or does not
 	succeed depending on timing.</p></warning>
 	
-	<p>If <c>Socket</c> is an <c>sslsocket()</c>: provides extra SSL/TLS
+	<p>If <c>Socket</c> is an <c>sslsocket()</c>: provides extra SSL/TLS/DTLS
 	options to those specified in
 	<seealso marker="#listen-2">ssl:listen/2 </seealso> and then performs
-	the SSL/TLS handshake.
+	the SSL/TLS/DTLS handshake.
 	</p>
       </desc>
     </func>
@@ -1302,7 +1394,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	The socket returned is to be passed to
 	<seealso marker="#ssl_accept-2"> ssl:ssl_accept[2,3]</seealso>
 	to complete handshaking, that is,
-	establishing the SSL/TLS connection.</p>
+	establishing the SSL/TLS/DTLS connection.</p>
         <warning>
           <p>The socket returned can only be used with
 	  <seealso marker="#ssl_accept-2"> ssl:ssl_accept[2,3]</seealso>.
@@ -1324,7 +1416,8 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <fsummary>Returns version information relevant for the
 	SSL application.</fsummary>
       <type>
-	<v>versions_info() = {app_vsn, string()} | {supported | available, [protocol()] </v>
+	<v>versions_info() = {app_vsn, string()} | {supported | available, [ssl_tls_protocol()]} |
+	{supported_dtls | available_dtls, [dtls_protocol()]}	</v>
       </type>
       <desc>
 	<p>Returns version information relevant for the SSL
@@ -1334,19 +1427,35 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	  <item>The application version of the SSL application.</item>
 
 	  <tag><c>supported</c></tag>
-	  <item>TLS/SSL versions supported by default.
+	  <item>SSL/TLS versions supported by default.
 	  Overridden by a version option on
 	  <seealso marker="#connect-2"> connect/[2,3,4]</seealso>,
 	  <seealso marker="#listen-2"> listen/2</seealso>, and <seealso
 	  marker="#ssl_accept-2">ssl_accept/[1,2,3]</seealso>.
-	  For the negotiated TLS/SSL version, see <seealso
+	  For the negotiated SSL/TLS version, see <seealso
 	  marker="#connection_information-1">ssl:connection_information/1
 	  </seealso>.</item>
-  
+	  
+	  <tag><c>supported_dtls</c></tag>
+	  <item>DTLS versions supported by default.
+	  Overridden by a version option on
+	  <seealso marker="#connect-2"> connect/[2,3,4]</seealso>,
+	  <seealso marker="#listen-2"> listen/2</seealso>, and <seealso
+	  marker="#ssl_accept-2">ssl_accept/[1,2,3]</seealso>.
+	  For the negotiated DTLS version, see <seealso
+	  marker="#connection_information-1">ssl:connection_information/1
+	  </seealso>.</item>
+
 	  <tag><c>available</c></tag>
-	  <item>All TLS/SSL versions supported by the SSL application.
+	  <item>All SSL/TLS versions supported by the SSL application.
 	  TLS 1.2 requires sufficient support from the Crypto
 	  application.</item>
+
+	  <tag><c>available_dtls</c></tag>
+	  <item>All DTLS versions supported by the SSL application.
+	  DTLS 1.2 requires sufficient support from the Crypto
+	  application.</item>
+	  
 	</taglist>
       </desc>
     </func>
@@ -1357,6 +1466,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
     <title>SEE ALSO</title>
     <p><seealso marker="kernel:inet">inet(3)</seealso> and
       <seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso>
+      <seealso marker="kernel:gen_udp">gen_udp(3)</seealso>
     </p>
   </section>
 
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index f317dfded4..51070bb083 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -35,16 +35,20 @@
 
   <description>
     <p>
-      The ssl application is an implementation of the SSL/TLS protocol in Erlang.
+      The ssl application is an implementation of the SSL/TLS/DTLS protocol in Erlang.
     </p>
     <list type="bulleted">
-      <item>Supported SSL/TLS-versions are SSL-3.0, TLS-1.0,
-      TLS-1.1, and TLS-1.2.</item>
+      <item>Supported SSL/TLS/DTLS-versions are SSL-3.0, TLS-1.0,
+      TLS-1.1, TLS-1.2, DTLS-1.0 (based on TLS-1.1), DTLS-1.2 (based on TLS-1.2)</item>
       <item>For security reasons SSL-2.0 is not supported.</item>
       <item>For security reasons SSL-3.0 is no longer supported by default,
-      but can be configured.</item>
+      but can be configured. (OTP 19) </item>
+      <item>For security reasons RSA key exchange cipher suites are no longer supported by default,
+      but can be configured. (OTP 21) </item>
       <item>For security reasons DES cipher suites are no longer supported by default,
-      but can be configured.</item>
+      but can be configured. (OTP 20) </item>
+    <item>For security reasons 3DES cipher suites are no longer supported by default,
+    but can be configured. (OTP 21) </item>
       <item> Renegotiation Indication Extension <url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url> is supported
       </item>
       <item>Ephemeral Diffie-Hellman cipher suites are supported,
@@ -72,7 +76,7 @@
 
   <section>
     <title>DEPENDENCIES</title>
-    <p>The SSL application uses the <c>public_key</c> and
+    <p>The SSL application uses the <c>public_key</c>, <c>asn1</c> and
     Crypto application to handle public keys and encryption, hence
     these applications must be loaded for the SSL application to work. 
     In an embedded environment this means they must be started with
@@ -94,13 +98,20 @@
     <p><c>erl -ssl protocol_version "['tlsv1.2', 'tlsv1.1']"</c></p>
 
     <taglist>
-      <tag><c>protocol_version = </c><seealso marker="ssl#type-protocol">ssl:protocol()</seealso><c><![CDATA[<optional>]]></c></tag>
+      <tag><c>protocol_version = </c><seealso marker="ssl#type-protocol">ssl:ssl_tls_protocol()</seealso><c><![CDATA[<optional>]]></c></tag>
       <item><p>Protocol supported by started clients and
       servers. If this option is not set, it defaults to all
-      protocols currently supported by the SSL application.
+      TLS protocols currently supported by the SSL application.
       This option can be overridden by the version option
       to <c>ssl:connect/[2,3]</c> and <c>ssl:listen/2</c>.</p></item>
 
+      <tag><c>dtls_protocol_version = </c><seealso marker="ssl#type-protocol">ssl:dtls_protocol()</seealso><c><![CDATA[<optional>]]></c></tag>
+      <item><p>Protocol supported by started clients and
+      servers. If this option is not set, it defaults to all
+      DTLS protocols currently supported by the SSL application.
+      This option can be overridden by the version option
+      to <c>ssl:connect/[2,3]</c> and <c>ssl:listen/2</c>.</p></item>
+      
       <tag><c><![CDATA[session_lifetime = integer() <optional>]]></c></tag>
       <item><p>Maximum lifetime of the session data in seconds. Defaults to 24 hours which is the maximum
       recommended lifetime by <url href="http://www.ietf.org/rfc/5246rfc.txt">RFC 5246</url>. However
@@ -123,14 +134,14 @@
       new client connections.  If the maximum number of sessions is
       reached, the current cache entries will be invalidated
       regardless of their remaining lifetime. Defaults to
-      1000.</p></item>
+      1000. Recommended ssl-8.2.1 or later for this option to work as intended.</p></item>
 
       <tag> <c><![CDATA[session_cache_server_max = integer() <optional>]]></c></tag>
       <item><p>Limits the growth of the servers session cache, that is
       how many client sessions are cached by the server. If the
       maximum number of sessions is reached, the current cache entries
       will be invalidated regardless of their remaining
-      lifetime. Defaults to 1000.</p></item>
+      lifetime. Defaults to 1000. Recommended ssl-8.2.1 or later for this option to work as intended.</p></item>
       
       <tag><c><![CDATA[ssl_pem_cache_clean = integer() <optional>]]></c></tag>
       <item>
@@ -145,9 +156,8 @@
       <tag><c><![CDATA[bypass_pem_cache = boolean() <optional>]]></c></tag>
       <item>
 	<p>Introduced in ssl-8.0.2. Disables the PEM-cache.
-	The PEM cache has proven to be a bottleneck, until the
-	implementation has been improved this can be used as
-	a workaround. Defaults to false.
+	Can be used as a workaround for the PEM-cache bottleneck
+	before ssl-8.1.1. Defaults to false.
 	</p>
       </item>
       
@@ -167,7 +177,7 @@
     <title>ERROR LOGGER AND EVENT HANDLERS</title>
     <p>The SSL application uses the default <seealso
     marker="kernel:error_logger">OTP error logger</seealso> to log
-    unexpected errors and TLS alerts. The logging of TLS alerts may be
+    unexpected errors and TLS/DTLS alerts. The logging of TLS/DTLS alerts may be
     turned off with the <c>log_alert</c> option. </p>
   </section>
 
diff --git a/lib/ssl/doc/src/ssl_crl_cache.xml b/lib/ssl/doc/src/ssl_crl_cache.xml
index 7a67de3971..738487759a 100644
--- a/lib/ssl/doc/src/ssl_crl_cache.xml
+++ b/lib/ssl/doc/src/ssl_crl_cache.xml
@@ -40,7 +40,7 @@
 	<name>delete(Entries) -> ok |  {error, Reason} </name>
 	<fsummary> </fsummary>
 	<type>
-	  <v> Entries =  <seealso marker="inets:http_uri">http_uri:uri() </seealso> | {file, string()} | {der, [<seealso
+	  <v> Entries =  <seealso marker="stdlib:uri_string">uri_string:uri_string()</seealso> | {file, string()} | {der, [<seealso
 	  marker="public_key:public_key"> public_key:der_encoded() </seealso>]}</v>
 	  <v> Reason = term()</v>
 	</type>
@@ -55,7 +55,7 @@
 	<type>
 	  <v> CRLSrc = {file, string()} | {der, [ <seealso
 	marker="public_key:public_key"> public_key:der_encoded() </seealso> ]}</v>
-	  <v> URI = <seealso marker="inets:http_uri">http_uri:uri() </seealso> </v>
+	  <v> URI = <seealso marker="stdlib:uri_string">uri_string:uri_string() </seealso> </v>
 	  <v> Reason = term()</v>
 	</type>
 	<desc>
@@ -63,4 +63,4 @@
 	</desc>
       </func>
     </funcs>
-</erlref>
\ No newline at end of file
+</erlref>
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index 61f88e3860..e14f3f90dc 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2016</year>
+      <year>2000</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,7 +22,7 @@
     
     </legalnotice>
 
-    <title>Using SSL for Erlang Distribution</title>
+    <title>Using TLS for Erlang Distribution</title>
     <prepared>P Nyblom</prepared>
     <responsible></responsible>
     <docno></docno>
@@ -33,7 +33,7 @@
     <file>ssl_distribution.xml</file>
   </header>
   <p>This section describes how the Erlang distribution can use 
-    SSL to get extra verification and security.</p>
+    TLS to get extra verification and security.</p>
 
     <p>The Erlang distribution can in theory use almost any 
       connection-based protocol as bearer. However, a module that 
@@ -45,16 +45,16 @@
 
       <p>In the SSL application, an extra distribution
       module, <c>inet_tls_dist</c>, can be used as an
-      alternative. All distribution connections will use SSL and
+      alternative. All distribution connections will use TLS and
       all participating Erlang nodes in a distributed system must use
       this distribution module.</p>
 
       <p>The security level depends on the parameters provided to the
-      SSL connection setup. Erlang node cookies are however always
+      TLS connection setup. Erlang node cookies are however always
       used, as they can be used to differentiate between two different
       Erlang networks.</p>
 
-    <p>To set up Erlang distribution over SSL:</p>
+    <p>To set up Erlang distribution over TLS:</p>
 
       <list type="bulleted">
       <item><em>Step 1:</em> Build boot scripts including the
@@ -63,13 +63,13 @@
       <c>net_kernel</c>.</item>
       <item><em>Step 3:</em> Specify the security options and other 
       SSL options.</item>
-      <item><em>Step 4:</em> Set up the environment to always use SSL.</item>
+      <item><em>Step 4:</em> Set up the environment to always use TLS.</item>
     </list>
 
     <p>The following sections describe these steps.</p>
 
   <section>
-    <title>Building Boot Scripts Including the ssl Application</title>
+    <title>Building Boot Scripts Including the SSL Application</title>
     <p>Boot scripts are built using the <c>systools</c> utility in the
       SASL application. For more information on <c>systools</c>,
       see the SASL documentation. This is only an example of
@@ -90,7 +90,7 @@
 	STDLIB application.</p></item>
       </list>
 
-    <p>The following shows an example <c>.rel</c> file with SSL 
+    <p>The following shows an example <c>.rel</c> file with TLS 
     added:</p>
     <code type="none">
       {release, {"OTP  APN 181 01","R15A"}, {erts, "5.9"},
@@ -154,7 +154,7 @@ Eshell V5.0  (abort with ^G)
 
   <section>
     <title>Specifying Distribution Module for net_kernel</title>
-    <p>The distribution module for SSL is named <c>inet_tls_dist</c>
+    <p>The distribution module for SSL/TLS is named <c>inet_tls_dist</c>
       and is specified on the command line with option <c>-proto_dist</c>.
       The argument to <c>-proto_dist</c> is to be the module
       name without suffix <c>_dist</c>. So, this distribution
@@ -174,21 +174,107 @@ Eshell V5.0  (abort with ^G)
 (ssl_test@myhost)1>     </code>
 
     <p>However, a node started in this way refuses to talk
-      to other nodes, as no SSL parameters are supplied
+      to other nodes, as no TLS parameters are supplied
       (see the next section).</p>
   </section>
 
   <section>
-    <title>Specifying SSL Options</title>
-    <p>For SSL to work, at least
-    a public key and a certificate must be specified for the server
-    side. In the following example, the PEM-files consist of two
-    entries, the server certificate and its private key.</p>
+    <title>Specifying SSL/TLS Options</title>
+
+    <p>
+      The SSL/TLS distribution options can be written into a file
+      that is consulted when the node is started.  This file name
+      is then specified with the command line argument
+      <c>-ssl_dist_optfile</c>.
+    </p>
+    <p>
+      Any available SSL/TLS option can be specified in an options file,
+      but note that options that take a <c>fun()</c> has to use
+      the syntax <c>fun Mod:Func/Arity</c> since a function
+      body can not be compiled when consulting a file.
+    </p>
+    <p>
+      Do not tamper with the socket options
+      <c>list</c>, <c>binary</c>, <c>active</c>, <c>packet</c>,
+      <c>nodelay</c> and <c>deliver</c> since they are used
+      by the distribution protocol handler itself.
+      Other raw socket options such as <c>packet_size</c> may
+      interfere severely, so beware!
+    </p>
+    <p>
+      For SSL/TLS to work, at least a public key and a certificate
+      must be specified for the server side.
+      In the following example, the PEM file
+      <c>"/home/me/ssl/erlserver.pem"</c> contains both
+      the server certificate and its private key.
+    </p>
+    <p>
+      Create a file named for example
+      <c>"/home/me/ssl/[email protected]"</c>:
+    </p>
+    <code type="none"><![CDATA[
+[{server,
+  [{certfile, "/home/me/ssl/erlserver.pem"},
+   {secure_renegotiate, true}]},
+ {client,
+  [{secure_renegotiate, true}]}].]]>
+    </code>
+    <p>
+      And then start the node like this
+      (line breaks in the command are for readability,
+      and shall not be there when typed):
+    </p>
+    <code type="none"><![CDATA[
+$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls
+  -ssl_dist_optfile "/home/me/ssl/[email protected]"
+  -sname ssl_test]]>
+    </code>
+    <p>
+      The options in the <c>{server, Opts}</c> tuple are used
+      when calling <c>ssl:ssl_accept/3</c>, and the options in the
+      <c>{client, Opts}</c> tuple are used when calling
+      <c>ssl:connect/4</c>.
+    </p>
+    <p>
+      For the client, the option
+      <c>{server_name_indication, atom_to_list(TargetNode)}</c>
+      is added when connecting.
+      This makes it possible to use the client option
+      <c>{verify, verify_peer}</c>,
+      and the client will verify that the certificate matches
+      the node name you are connecting to.
+      This only works if the the server certificate is issued
+      to the name <c>atom_to_list(TargetNode)</c>.
+    </p>
+    <p>
+      For the server it is also possible to use the option
+      <c>{verify, verify_peer}</c> and the server will only accept
+      client connections with certificates that are trusted by
+      a root certificate that the server knows.
+      A client that presents an untrusted certificate will be rejected.
+      This option is preferably combined with
+      <c>{fail_if_no_peer_cert, true}</c> or a client will
+      still be accepted if it does not present any certificate.
+    </p>
+    <p>
+      A node started in this way is fully functional, using TLS
+      as the distribution protocol.
+    </p>
+  </section>
+
+  <section>
+    <title>Specifying SSL/TLS Options (Legacy)</title>
+
+    <p>
+      As in the previous section the PEM file
+      <c>"/home/me/ssl/erlserver.pem"</c> contains both
+      the server certificate and its private key.
+    </p>
 
     <p>On the <c>erl</c> command line you can specify options that the
-    SSL distribution adds when creating a socket.</p>
+    SSL/TLS distribution adds when creating a socket.</p>
 
-    <p>The simplest SSL options in the following list can be specified 
+    <p>The simplest SSL/TLS options in the following list can be specified 
     by adding the 
     prefix <c>server_</c> or <c>client_</c> to the option name:</p>
     <list type="bulleted">
@@ -208,7 +294,7 @@ Eshell V5.0  (abort with ^G)
     </list>
 
     <p>Note that <c>verify_fun</c> needs to be written in a different
-    form than the corresponding SSL option, since funs are not
+    form than the corresponding SSL/TLS option, since funs are not
     accepted on the command line.</p>
 
     <p>The server can also take the options <c>dhfile</c> and
@@ -221,32 +307,34 @@ Eshell V5.0  (abort with ^G)
     <p>Raw socket options, such as <c>packet</c> and <c>size</c> must not 
     be specified on the command line.</p>
 
-    <p>The command-line argument for specifying the SSL options is named
+    <p>The command-line argument for specifying the SSL/TLS options is named
     <c>-ssl_dist_opt</c> and is to be followed by pairs of
     SSL options and their values. Argument <c>-ssl_dist_opt</c> can
     be repeated any number of times.</p>
 
-      <p>An example command line can now look as follows
+    <p>
+      An example command line doing the same as the example
+      in the previous section can now look as follows
       (line breaks in the command are for readability, 
-      and are not be there when typed):</p>
-    <code type="none">
+      and shall not be there when typed):
+    </p>
+    <code type="none"><![CDATA[
 $ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls
-  -ssl_dist_opt server_certfile "/home/me/ssl/erlserver.pem" 
+  -ssl_dist_opt server_certfile "/home/me/ssl/erlserver.pem"
   -ssl_dist_opt server_secure_renegotiate true client_secure_renegotiate true
   -sname ssl_test
 Erlang (BEAM) emulator version 5.0 [source]
- 
+
 Eshell V5.0  (abort with ^G)
-(ssl_test@myhost)1>     </code>
-    <p>A node started in this way is fully functional, using SSL
-      as the distribution protocol.</p>
+(ssl_test@myhost)1>]]>
+    </code>
   </section>
 
   <section>
-    <title>Setting up Environment to Always Use SSL</title>
+    <title>Setting up Environment to Always Use SSL/TLS (Legacy)</title>
     <p>A convenient way to specify arguments to Erlang is to use environment 
       variable <c>ERL_FLAGS</c>. All the flags needed to
-      use the SSL distribution can be specified in that variable and are
+      use the SSL/TLS distribution can be specified in that variable and are
       then interpreted as command-line arguments for all
       subsequent invocations of Erlang.</p>
 
@@ -277,25 +365,21 @@ Eshell V5.0  (abort with ^G)
   </section>
 
   <section>
-    <title>Using SSL distribution over IPv6</title>
-    <p>It is possible to use SSL distribution over IPv6 instead of
+    <title>Using SSL/TLS distribution over IPv6</title>
+    <p>It is possible to use SSL/TLS distribution over IPv6 instead of
     IPv4. To do this, pass the option <c>-proto_dist inet6_tls</c>
     instead of <c>-proto_dist inet_tls</c> when starting Erlang,
     either on the command line or in the <c>ERL_FLAGS</c> environment
     variable.</p>
 
     <p>An example command line with this option would look like this:</p>
-    <code type="none">
+    <code type="none"><![CDATA[
 $ erl -boot /home/me/ssl/start_ssl -proto_dist inet6_tls
-  -ssl_dist_opt server_certfile "/home/me/ssl/erlserver.pem"
-  -ssl_dist_opt server_secure_renegotiate true client_secure_renegotiate true
-  -sname ssl_test
-Erlang (BEAM) emulator version 5.0 [source]
-
-Eshell V5.0  (abort with ^G)
-(ssl_test@myhost)1>     </code>
+  -ssl_dist_optfile "/home/me/ssl/[email protected]"
+  -sname ssl_test]]>
+    </code>
 
     <p>A node started in this way will only be able to communicate with
-    other nodes using SSL distribution over IPv6.</p>
+    other nodes using SSL/TLS distribution over IPv6.</p>
   </section>
 </chapter>
diff --git a/lib/ssl/doc/src/ssl_introduction.xml b/lib/ssl/doc/src/ssl_introduction.xml
index d3e39dbb01..a416924eb1 100644
--- a/lib/ssl/doc/src/ssl_introduction.xml
+++ b/lib/ssl/doc/src/ssl_introduction.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2015</year>
-      <year>2015</year>
+      <year>2017</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -36,19 +36,20 @@
     <title>Purpose</title>
     <p>Transport Layer Security (TLS) and its predecessor, the Secure
     Sockets Layer (SSL), are cryptographic protocols designed to
-    provide communications security over a computer network. The protocols use
+    provide communications security over a computer network. The protocols
     use X.509 certificates and hence public key (asymmetric) cryptography to
     authenticate the counterpart with whom they communicate,
     and to exchange a symmetric key for payload encryption. The protocol provides
     data/message confidentiality (encryption), integrity (through message authentication code checks)
-    and host verification (through certificate path validation).</p>
+    and host verification (through certificate path validation). DTLS (Datagram Transport Layer Security) that
+    is based on TLS but datagram oriented instead of stream oriented.</p>
   </section>
 
   <section>
     <title>Prerequisites</title>
     <p>It is assumed that the reader is familiar with the Erlang
     programming language, the concepts of OTP, and has a basic
-    understanding of SSL/TLS.</p>
+    understanding of SSL/TLS/DTLS.</p>
   </section>
 
 </chapter>
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml
index 31a22db58b..0b12dc7dc5 100644
--- a/lib/ssl/doc/src/ssl_protocol.xml
+++ b/lib/ssl/doc/src/ssl_protocol.xml
@@ -22,7 +22,7 @@
       
     </legalnotice>
 
-    <title>TLS and its Predecessor, SSL</title>
+    <title>TLS/DTLS and TLS Predecessor, SSL</title>
     <prepared></prepared>
     <responsible></responsible>
     <docno></docno>
@@ -33,7 +33,7 @@
     <file>ssl_protocol.xml</file>
   </header>
   
-  <p>The Erlang SSL application implements the SSL/TLS protocol
+  <p>The Erlang SSL application implements the SSL/TLS/DTLS protocol
   for the currently supported versions,  see the
   <seealso marker="ssl">ssl(3)</seealso> manual page.
   </p>
@@ -41,20 +41,22 @@
   <p>By default SSL/TLS is run over the TCP/IP protocol even
   though you can plug in any other reliable transport protocol
   with the same Application Programming Interface (API) as the
-  <c>gen_tcp</c> module in Kernel.</p>
+  <c>gen_tcp</c> module in Kernel. DTLS is by default run over UDP/IP,
+  which means that application data has no delivery guarentees. Other 
+  transports, such as SCTP, may be supported in future releases.</p>
   
   <p>If a client and a server wants to use an upgrade mechanism, such as
-  defined by RFC 2817, to upgrade a regular TCP/IP connection to an SSL
+  defined by RFC 2817, to upgrade a regular TCP/IP connection to an TLS
   connection, this is supported by the Erlang SSL application API. This can be 
   useful for, for example, supporting HTTP and HTTPS on the same port and
-  implementing virtual hosting.
+  implementing virtual hosting. Note this is a TLS feature only.
   </p>
 
   <section>
     <title>Security Overview</title>
       
    <p>To achieve authentication and privacy, the client and server
-    perform a TLS handshake procedure before transmitting or receiving
+    perform a TLS/DTLS handshake procedure before transmitting or receiving
     any data. During the handshake, they agree on a protocol version and
     cryptographic algorithms, generate shared secrets using public
     key cryptographies, and optionally authenticate each other with
@@ -73,10 +75,10 @@
     
     <p>The keys for the symmetric encryption are generated uniquely
     for each connection and are based on a secret negotiated
-    in the TLS handshake.</p>
+    in the TLS/DTLS handshake.</p>
     
-    <p>The TLS handshake protocol and data transfer is run on top of
-    the TLS Record Protocol, which uses a keyed-hash Message
+    <p>The TLS/DTLS handshake protocol and data transfer is run on top of
+    the TLS/DTLS Record Protocol, which uses a keyed-hash Message
     Authenticity Code (MAC), or a Hash-based MAC (HMAC),
     to protect the message data
     integrity. From the TLS RFC: "A Message Authentication Code is a
@@ -152,8 +154,8 @@
      from it was saved, for security reasons. The amount of time the 
      session data is to be saved can be configured.</p>
 
-     <p>By default the SSL clients try to reuse an available session and 
-     by default the SSL servers agree to reuse sessions when clients
+     <p>By default the TLS/DTLS clients try to reuse an available session and 
+     by default the TLS/DTLS servers agree to reuse sessions when clients
      ask for it.</p>
 
    </section>
diff --git a/lib/ssl/doc/src/using_ssl.xml b/lib/ssl/doc/src/using_ssl.xml
index f84cd6e391..3ef33df719 100644
--- a/lib/ssl/doc/src/using_ssl.xml
+++ b/lib/ssl/doc/src/using_ssl.xml
@@ -22,7 +22,7 @@
     
     </legalnotice>
 
-    <title>Using SSL API</title>
+    <title>Using SSL application API</title>
     <prepared></prepared>
     <responsible></responsible>
     <docno></docno>
@@ -51,7 +51,7 @@
     <section>
       <title>Minimal Example</title>
       
-      <note><p> The minimal setup is not the most secure setup of SSL.</p>    
+      <note><p> The minimal setup is not the most secure setup of SSL/TLS/DTLS.</p>    
       </note>
 
       <p>To set up client/server connections:</p>
@@ -60,27 +60,27 @@
       <code type="erl">1 server> ssl:start().
 ok</code>
       
-      <p><em>Step 2:</em> Create an SSL listen socket:</p>
+      <p><em>Step 2:</em> Create an TLS listen socket: (To run DTLS add the option {protocol, dtls})</p>
       <code type="erl">2 server> {ok, ListenSocket} =
 ssl:listen(9999, [{certfile, "cert.pem"}, {keyfile, "key.pem"},{reuseaddr, true}]).
 {ok,{sslsocket, [...]}}</code>
       
-      <p><em>Step 3:</em> Do a transport accept on the SSL listen socket:</p>
+      <p><em>Step 3:</em> Do a transport accept on the TLS listen socket:</p>
       <code type="erl">3 server> {ok, Socket} = ssl:transport_accept(ListenSocket).
 {ok,{sslsocket, [...]}}</code>
 
-      <p><em>Step 4:</em> Start the client side:</p>
+      <p><em>Step 4:</em> Start the client side: </p>
       <code type="erl">1 client> ssl:start().
 ok</code>
-      
+      <p> To run DTLS add the option {protocol, dtls} to third argument.</p>
       <code type="erl">2 client> {ok, Socket} = ssl:connect("localhost", 9999,  [], infinity).
 {ok,{sslsocket, [...]}}</code>
       
-      <p><em>Step 5:</em> Do the SSL handshake:</p>
+      <p><em>Step 5:</em> Do the TLS handshake:</p>
       <code type="erl">4 server> ok = ssl:ssl_accept(Socket).
 ok</code>
       
-      <p><em>Step 6:</em> Send a message over SSL:</p>
+      <p><em>Step 6:</em> Send a message over TLS:</p>
       <code type="erl">5 server> ssl:send(Socket, "foo").
 ok</code>
       
@@ -92,7 +92,7 @@ ok</code>
     </section>
     
     <section>
-      <title>Upgrade Example</title>
+      <title>Upgrade Example - TLS only </title>
       
       <note><p>To upgrade a TCP/IP connection to an SSL connection, the
       client and server must agree to do so. The agreement
@@ -125,24 +125,24 @@ ok</code>
       <code type="erl">4 server> inet:setopts(Socket, [{active, false}]).
 ok</code>
       
-      <p><em>Step 6:</em> Do the SSL handshake:</p>
-      <code type="erl">5 server> {ok, SSLSocket} = ssl:ssl_accept(Socket, [{cacertfile, "cacerts.pem"},
+      <p><em>Step 6:</em> Do the TLS handshake:</p>
+      <code type="erl">5 server> {ok, TLSSocket} = ssl:ssl_accept(Socket, [{cacertfile, "cacerts.pem"},
 {certfile, "cert.pem"}, {keyfile, "key.pem"}]).
 {ok,{sslsocket,[...]}}</code>
       
-      <p><em>Step 7:</em> Upgrade to an SSL connection. The client and server
+      <p><em>Step 7:</em> Upgrade to an TLS connection. The client and server
       must agree upon the upgrade. The server must call
       <c>ssl:accept/2</c> before the client calls <c>ssl:connect/3.</c></p>
-      <code type="erl">3 client>{ok, SSLSocket} = ssl:connect(Socket, [{cacertfile, "cacerts.pem"},
+      <code type="erl">3 client>{ok, TLSSocket} = ssl:connect(Socket, [{cacertfile, "cacerts.pem"},
 {certfile, "cert.pem"}, {keyfile, "key.pem"}], infinity).
 {ok,{sslsocket,[...]}}</code>
       
-      <p><em>Step 8:</em> Send a message over SSL:</p>
-      <code type="erl">4 client> ssl:send(SSLSocket, "foo").
+      <p><em>Step 8:</em> Send a message over TLS:</p>
+      <code type="erl">4 client> ssl:send(TLSSocket, "foo").
 ok</code>
       
-      <p><em>Step 9:</em> Set <c>active true</c> on the SSL socket:</p>
-      <code type="erl">4 server> ssl:setopts(SSLSocket, [{active, true}]).
+      <p><em>Step 9:</em> Set <c>active true</c> on the TLS socket:</p>
+      <code type="erl">4 server> ssl:setopts(TLSSocket, [{active, true}]).
 ok</code>
       
       <p><em>Step 10:</em> Flush the shell message queue to see that the message
@@ -152,4 +152,85 @@ Shell got {ssl,{sslsocket,[...]},"foo"}
 ok</code>
     </section>
   </section>
+
+  <section>
+    <title>Customizing cipher suits</title>
+
+    <p>Fetch default cipher suite list for an TLS/DTLS version. Change default
+    to all to get all possible cipher suites.</p>
+    <code type="erl">1>  Default = ssl:cipher_suites(default, 'tlsv1.2').
+    [#{cipher => aes_256_gcm,key_exchange => ecdhe_ecdsa,
+    mac => aead,prf => sha384}, ....]
+</code>
+
+    <p>In OTP 20 it is desirable to remove all cipher suites
+    that uses rsa kexchange (removed from default in 21) </p>
+    <code type="erl">2> NoRSA =
+    ssl:filter_cipher_suites(Default,
+                            [{key_exchange, fun(rsa) -> false;
+			                       (_) -> true end}]).
+    [...]
+    </code>
+
+    <p> Pick just a few suites </p>
+    <code type="erl"> 3> Suites =
+    ssl:filter_cipher_suites(Default,
+                            [{key_exchange, fun(ecdh_ecdsa) -> true;
+			                       (_) -> false end},
+                             {cipher, fun(aes_128_cbc) ->true;
+			                  (_) ->false end}]).
+    [#{cipher => aes_128_cbc,key_exchange => ecdh_ecdsa,
+     mac => sha256,prf => sha256},
+     #{cipher => aes_128_cbc,key_exchange => ecdh_ecdsa,mac => sha,
+     prf => default_prf}]
+    </code>
+    
+    <p> Make some particular suites the most preferred, or least
+    preferred by changing prepend to append.</p>
+    <code type="erl"> 4>ssl:prepend_cipher_suites(Suites, Default).
+  [#{cipher => aes_128_cbc,key_exchange => ecdh_ecdsa,
+     mac => sha256,prf => sha256},
+   #{cipher => aes_128_cbc,key_exchange => ecdh_ecdsa,mac => sha,
+     prf => default_prf},
+   #{cipher => aes_256_cbc,key_exchange => ecdhe_ecdsa,
+     mac => sha384,prf => sha384}, ...]
+    </code>
+  </section>      
+
+  <section>
+    <title>Using an Engine Stored Key</title>
+    
+    <p>Erlang ssl application is able to use private keys provided
+    by OpenSSL engines using the following mechanism:</p>
+    
+    <code type="erl">1> ssl:start().
+ok</code>
+
+    <p>Load a crypto engine, should be done once per engine used. For example
+    dynamically load the engine called <c>MyEngine</c>:
+    </p>
+    <code type="erl">2> {ok, EngineRef} =
+crypto:engine_load(&lt;&lt;"dynamic">>,
+                   [{&lt;&lt;"SO_PATH">>, "/tmp/user/engines/MyEngine"},&lt;&lt;"LOAD">>],[]).
+{ok,#Ref&lt;0.2399045421.3028942852.173962>}
+    </code>
+    
+    <p>Create a map with the engine information and the algorithm used by the engine:</p>
+    <code type="erl">3> PrivKey =
+ #{algorithm => rsa,
+   engine => EngineRef,
+   key_id => "id of the private key in Engine"}.
+    </code>
+    <p>Use the map in the ssl key option:</p>
+    <code type="erl">4> {ok, SSLSocket} =
+ssl:connect("localhost", 9999,
+            [{cacertfile, "cacerts.pem"},
+             {certfile, "cert.pem"},
+             {key, PrivKey}], infinity).
+    </code>
+
+    <p>See also <seealso marker="crypto:engine_load#engine_load"> crypto documentation</seealso> </p>
+    
+     </section>      
+  
  </chapter>
diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl
index 387d632ef8..fb12a729b1 100644
--- a/lib/ssl/src/dtls_connection.erl
+++ b/lib/ssl/src/dtls_connection.erl
@@ -39,20 +39,18 @@
 -export([start_fsm/8, start_link/7, init/1]).
 
 %% State transition handling	 
--export([next_record/1, next_event/3, next_event/4]).
+-export([next_record/1, next_event/3, next_event/4,  handle_common_event/4]).
 
 %% Handshake handling
--export([renegotiate/2, 
-	 reinit_handshake_data/1, 
-	 send_handshake/2, queue_handshake/2, queue_change_cipher/2,
-	 select_sni_extension/1, empty_connection_state/2]).
+-export([renegotiate/2, send_handshake/2, 
+         queue_handshake/2, queue_change_cipher/2,
+         reinit_handshake_data/1, select_sni_extension/1, empty_connection_state/2]).
 
 %% Alert and close handling
 -export([encode_alert/3,send_alert/2, close/5, protocol_name/0]).
 
 %% Data handling
-
--export([encode_data/3, passive_receive/2,  next_record_if_active/1, handle_common_event/4,
+-export([encode_data/3, passive_receive/2, next_record_if_active/1,
 	 send/3, socket/5, setopts/3, getopts/3]).
 
 %% gen_statem state functions
@@ -64,6 +62,9 @@
 
 %%====================================================================
 %% Internal application API
+%%====================================================================	
+%%====================================================================
+%% Setup
 %%====================================================================	     
 start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_, Tracker} = Opts,
 	  User, {CbModule, _,_, _} = CbInfo, 
@@ -79,6 +80,224 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_, Tracker}
 	    Error
     end.
 
+%%--------------------------------------------------------------------
+-spec start_link(atom(), host(), inet:port_number(), port(), list(), pid(), tuple()) ->
+			{ok, pid()} | ignore |  {error, reason()}.
+%%
+%% Description: Creates a gen_statem process which calls Module:init/1 to
+%% initialize.
+%%--------------------------------------------------------------------
+start_link(Role, Host, Port, Socket, Options, User, CbInfo) ->
+    {ok, proc_lib:spawn_link(?MODULE, init, [[Role, Host, Port, Socket, Options, User, CbInfo]])}.
+
+init([Role, Host, Port, Socket, Options,  User, CbInfo]) ->
+    process_flag(trap_exit, true),
+    State0 =  initial_state(Role, Host, Port, Socket, Options, User, CbInfo),
+    try
+	State = ssl_connection:ssl_config(State0#state.ssl_options, Role, State0),
+	gen_statem:enter_loop(?MODULE, [], init, State)
+    catch
+	throw:Error ->
+	    gen_statem:enter_loop(?MODULE, [], error, {Error,State0})
+    end.
+%%====================================================================
+%% State transition handling
+%%====================================================================	     
+next_record(#state{unprocessed_handshake_events = N} = State) when N > 0 ->
+    {no_record, State#state{unprocessed_handshake_events = N-1}};
+					 
+next_record(#state{protocol_buffers =
+		       #protocol_buffers{dtls_cipher_texts = [#ssl_tls{epoch = Epoch} = CT | Rest]}
+		   = Buffers,
+		   connection_states = #{current_read := #{epoch := Epoch}} = ConnectionStates} = State) ->
+    CurrentRead = dtls_record:get_connection_state_by_epoch(Epoch, ConnectionStates, read),
+    case dtls_record:replay_detect(CT, CurrentRead) of
+        false ->
+            decode_cipher_text(State#state{connection_states = ConnectionStates}) ;
+        true ->
+            %% Ignore replayed record
+            next_record(State#state{protocol_buffers =
+                                        Buffers#protocol_buffers{dtls_cipher_texts = Rest},
+                                    connection_states = ConnectionStates})
+    end;
+next_record(#state{protocol_buffers =
+		       #protocol_buffers{dtls_cipher_texts = [#ssl_tls{epoch = Epoch} | Rest]}
+		   = Buffers,
+		   connection_states = #{current_read := #{epoch := CurrentEpoch}} = ConnectionStates} = State) 
+  when Epoch > CurrentEpoch ->
+    %% TODO Buffer later Epoch message, drop it for now
+    next_record(State#state{protocol_buffers =
+                                Buffers#protocol_buffers{dtls_cipher_texts = Rest},
+                            connection_states = ConnectionStates});
+next_record(#state{protocol_buffers =
+		       #protocol_buffers{dtls_cipher_texts = [ _ | Rest]}
+		   = Buffers,
+		   connection_states = ConnectionStates} = State) ->
+    %% Drop old epoch message
+    next_record(State#state{protocol_buffers =
+                                Buffers#protocol_buffers{dtls_cipher_texts = Rest},
+                            connection_states = ConnectionStates});
+next_record(#state{role = server,
+		   socket = {Listener, {Client, _}},
+		   transport_cb = gen_udp} = State) -> 
+    dtls_udp_listener:active_once(Listener, Client, self()),
+    {no_record, State};
+next_record(#state{role = client,
+		   socket = {_Server, Socket} = DTLSSocket,
+                   close_tag = CloseTag,
+		   transport_cb = Transport} = State) -> 
+    case dtls_socket:setopts(Transport, Socket, [{active,once}]) of
+        ok ->
+ 	    {no_record, State};
+ 	_ ->
+            self() ! {CloseTag, DTLSSocket},
+	    {no_record, State}
+    end;
+next_record(State) ->
+    {no_record, State}.
+
+next_event(StateName, Record, State) ->
+    next_event(StateName, Record, State, []).
+
+next_event(connection = StateName, no_record,
+	   #state{connection_states = #{current_read := #{epoch := CurrentEpoch}}} = State0, Actions) ->
+    case next_record_if_active(State0) of
+	{no_record, State} ->
+            ssl_connection:hibernate_after(StateName, State, Actions);
+        {#ssl_tls{epoch = CurrentEpoch,
+                  type = ?HANDSHAKE,
+                  version = Version} = Record, State1} ->
+            State = dtls_version(StateName, Version, State1), 
+	    {next_state, StateName, State,
+	     [{next_event, internal, {protocol_record, Record}} | Actions]};
+        {#ssl_tls{epoch = CurrentEpoch} = Record, State} ->
+	    {next_state, StateName, State, [{next_event, internal, {protocol_record, Record}} | Actions]};
+	{#ssl_tls{epoch = Epoch,
+		  type = ?HANDSHAKE,
+		  version = _Version}, State1} = _Record when Epoch == CurrentEpoch-1 ->
+	    {State2, MoreActions} = send_handshake_flight(State1, CurrentEpoch),
+            {NextRecord, State} = next_record(State2),
+            next_event(StateName, NextRecord, State, Actions ++ MoreActions);
+        %% From FLIGHT perspective CHANGE_CIPHER_SPEC is treated as a handshake
+        {#ssl_tls{epoch = Epoch,
+		  type = ?CHANGE_CIPHER_SPEC,
+		  version = _Version}, State1} = _Record when Epoch == CurrentEpoch-1 ->
+	    {State2, MoreActions} = send_handshake_flight(State1, CurrentEpoch),
+	    {NextRecord, State} = next_record(State2),
+            next_event(StateName, NextRecord, State, Actions ++ MoreActions);
+	{#ssl_tls{epoch = _Epoch,
+		  version = _Version}, State1} ->
+	    %% TODO maybe buffer later epoch
+            {Record, State} = next_record(State1),
+            next_event(StateName, Record, State, Actions); 
+	{#alert{} = Alert, State} ->
+	    {next_state, StateName, State, [{next_event, internal, Alert} | Actions]}
+    end;
+next_event(connection = StateName, Record,
+	   #state{connection_states = #{current_read := #{epoch := CurrentEpoch}}} = State0, Actions) ->
+    case Record of
+        #ssl_tls{epoch = CurrentEpoch,
+                 type = ?HANDSHAKE,
+                 version = Version} = Record ->
+            State = dtls_version(StateName, Version, State0), 
+	    {next_state, StateName, State,
+	     [{next_event, internal, {protocol_record, Record}} | Actions]};
+	#ssl_tls{epoch = CurrentEpoch} ->
+	    {next_state, StateName, State0, [{next_event, internal, {protocol_record, Record}} | Actions]};
+	#ssl_tls{epoch = Epoch,
+                 type = ?HANDSHAKE,
+                 version = _Version} when Epoch == CurrentEpoch-1 ->
+	    {State1, MoreActions} = send_handshake_flight(State0, CurrentEpoch),
+            {NextRecord, State} = next_record(State1),
+            next_event(StateName, NextRecord, State, Actions ++ MoreActions);
+        %% From FLIGHT perspective CHANGE_CIPHER_SPEC is treated as a handshake
+        #ssl_tls{epoch = Epoch,
+                 type = ?CHANGE_CIPHER_SPEC,
+                 version = _Version} when Epoch == CurrentEpoch-1 ->
+	    {State1, MoreActions} = send_handshake_flight(State0, CurrentEpoch),
+            {NextRecord, State} = next_record(State1),
+            next_event(StateName, NextRecord, State, Actions ++ MoreActions); 
+        _ -> 
+            next_event(StateName, no_record, State0, Actions) 
+    end;
+next_event(StateName, Record, 
+	   #state{connection_states = #{current_read := #{epoch := CurrentEpoch}}} = State0, Actions) ->
+    case Record of
+	no_record ->
+            {next_state, StateName, State0, Actions};
+        #ssl_tls{epoch = CurrentEpoch,
+                 version = Version} = Record ->
+            State = dtls_version(StateName, Version, State0),
+            {next_state, StateName, State, 
+             [{next_event, internal, {protocol_record, Record}} | Actions]};
+	#ssl_tls{epoch = _Epoch,
+		 version = _Version} = _Record ->
+	    %% TODO maybe buffer later epoch
+            {Record, State} = next_record(State0),
+            next_event(StateName, Record, State, Actions); 
+	#alert{} = Alert ->
+	    {next_state, StateName, State0, [{next_event, internal, Alert} | Actions]}
+    end.
+
+handle_common_event(internal, #alert{} = Alert, StateName, 
+		    #state{negotiated_version = Version} = State) ->
+    handle_own_alert(Alert, Version, StateName, State);
+%%% DTLS record protocol level handshake messages 
+handle_common_event(internal, #ssl_tls{type = ?HANDSHAKE,
+				       fragment = Data}, 
+		    StateName, 
+		    #state{protocol_buffers = Buffers0,
+			   negotiated_version = Version} = State0) ->
+    try
+	case dtls_handshake:get_dtls_handshake(Version, Data, Buffers0) of
+	    {[], Buffers} ->
+		{Record, State} = next_record(State0#state{protocol_buffers = Buffers}),
+		next_event(StateName, Record, State);
+	    {Packets, Buffers} ->
+		State = State0#state{protocol_buffers = Buffers},
+		Events = dtls_handshake_events(Packets),
+                {next_state, StateName, 
+                 State#state{unprocessed_handshake_events = unprocessed_events(Events)}, Events}
+	end
+    catch throw:#alert{} = Alert ->
+	    handle_own_alert(Alert, Version, StateName, State0)
+    end;
+%%% DTLS record protocol level application data messages 
+handle_common_event(internal, #ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, StateName, State) ->
+    {next_state, StateName, State, [{next_event, internal, {application_data, Data}}]};
+%%% DTLS record protocol level change cipher messages
+handle_common_event(internal, #ssl_tls{type = ?CHANGE_CIPHER_SPEC, fragment = Data}, StateName, State) ->
+    {next_state, StateName, State, [{next_event, internal, #change_cipher_spec{type = Data}}]};
+%%% DTLS record protocol level Alert messages
+handle_common_event(internal, #ssl_tls{type = ?ALERT, fragment = EncAlerts}, StateName,
+		    #state{negotiated_version = Version} = State) ->
+    case decode_alerts(EncAlerts) of
+	Alerts = [_|_] ->
+	    handle_alerts(Alerts,  {next_state, StateName, State});
+	#alert{} = Alert ->
+	    handle_own_alert(Alert, Version, StateName, State)
+    end;
+%% Ignore unknown TLS record level protocol messages
+handle_common_event(internal, #ssl_tls{type = _Unknown}, StateName, State) ->
+    {next_state, StateName, State}.
+
+%%====================================================================
+%% Handshake handling
+%%====================================================================	     
+
+renegotiate(#state{role = client} = State, Actions) ->
+    %% Handle same way as if server requested
+    %% the renegotiation
+    {next_state, connection, State,
+     [{next_event, internal, #hello_request{}} | Actions]};
+
+renegotiate(#state{role = server} = State0, Actions) ->
+    HelloRequest = ssl_handshake:hello_request(),
+    State1 = prepare_flight(State0),
+    {State2, MoreActions} = send_handshake(HelloRequest, State1),
+    {Record, State} = next_record(State2),
+    next_event(hello, Record, State, Actions ++ MoreActions).
+
 send_handshake(Handshake, #state{connection_states = ConnectionStates} = State) ->
     #{epoch := Epoch} = ssl_record:current_connection_state(ConnectionStates, write),
     send_handshake_flight(queue_handshake(Handshake, State), Epoch).
@@ -104,85 +323,12 @@ queue_handshake(Handshake0, #state{tls_handshake_history = Hist0,
 					 next_sequence => Seq +1},
 		tls_handshake_history = Hist}.
 
-
-send_handshake_flight(#state{socket = Socket,
-			     transport_cb = Transport,
-			     flight_buffer = #{handshakes := Flight,
-					       change_cipher_spec := undefined},
-			     negotiated_version = Version,
-			     connection_states = ConnectionStates0} = State0, Epoch) ->
-    %% TODO remove hardcoded Max size
-    {Encoded, ConnectionStates} =
-	encode_handshake_flight(lists:reverse(Flight), Version, 1400, Epoch, ConnectionStates0),
-    send(Transport, Socket, Encoded), 
-   {State0#state{connection_states = ConnectionStates}, []};
-
-send_handshake_flight(#state{socket = Socket,
-			     transport_cb = Transport,
-			     flight_buffer = #{handshakes := [_|_] = Flight0,
-					       change_cipher_spec := ChangeCipher,
-					       handshakes_after_change_cipher_spec := []},
-			     negotiated_version = Version,
-			     connection_states = ConnectionStates0} = State0, Epoch) ->      
-    {HsBefore, ConnectionStates1} =
-	encode_handshake_flight(lists:reverse(Flight0), Version, 1400, Epoch, ConnectionStates0),
-    {EncChangeCipher, ConnectionStates} = encode_change_cipher(ChangeCipher, Version, Epoch, ConnectionStates1),
-
-    send(Transport, Socket, [HsBefore, EncChangeCipher]),
-    {State0#state{connection_states = ConnectionStates}, []};
-
-send_handshake_flight(#state{socket = Socket,
-			     transport_cb = Transport,
-			     flight_buffer = #{handshakes := [_|_] = Flight0,
-					       change_cipher_spec := ChangeCipher,
-					       handshakes_after_change_cipher_spec := Flight1},
-			     negotiated_version = Version,
-			     connection_states = ConnectionStates0} = State0, Epoch) ->      
-    {HsBefore, ConnectionStates1} =
-	encode_handshake_flight(lists:reverse(Flight0), Version, 1400, Epoch-1, ConnectionStates0),
-    {EncChangeCipher, ConnectionStates2} = 
-	encode_change_cipher(ChangeCipher, Version, Epoch-1, ConnectionStates1),
-    {HsAfter, ConnectionStates} =
-	encode_handshake_flight(lists:reverse(Flight1), Version, 1400, Epoch, ConnectionStates2),
-    send(Transport, Socket, [HsBefore, EncChangeCipher, HsAfter]),
-    {State0#state{connection_states = ConnectionStates}, []};
-
-send_handshake_flight(#state{socket = Socket,
-			     transport_cb = Transport,
-			     flight_buffer = #{handshakes := [],
-					       change_cipher_spec := ChangeCipher,
-					       handshakes_after_change_cipher_spec := Flight1},
-			     negotiated_version = Version,
-			     connection_states = ConnectionStates0} = State0, Epoch) ->
-    {EncChangeCipher, ConnectionStates1} = 
-	encode_change_cipher(ChangeCipher, Version, Epoch-1, ConnectionStates0),
-    {HsAfter, ConnectionStates} =
-	encode_handshake_flight(lists:reverse(Flight1), Version, 1400, Epoch, ConnectionStates1),
-    send(Transport, Socket, [EncChangeCipher, HsAfter]),
-    {State0#state{connection_states = ConnectionStates}, []}.
-
 queue_change_cipher(ChangeCipher, #state{flight_buffer = Flight,
 					 connection_states = ConnectionStates0} = State) -> 
     ConnectionStates = 
 	dtls_record:next_epoch(ConnectionStates0, write), 
     State#state{flight_buffer = Flight#{change_cipher_spec => ChangeCipher},
 		connection_states = ConnectionStates}.
-
-send_alert(Alert, #state{negotiated_version = Version,
-			 socket = Socket,
-			 transport_cb = Transport,
-			 connection_states = ConnectionStates0} = State0) ->
-    {BinMsg, ConnectionStates} =
-	encode_alert(Alert, Version, ConnectionStates0),
-    send(Transport, Socket, BinMsg),
-    State0#state{connection_states = ConnectionStates}.
-
-close(downgrade, _,_,_,_) ->
-    ok;
-%% Other
-close(_, Socket, Transport, _,_) ->
-    dtls_socket:close(Transport,Socket).
-
 reinit_handshake_data(#state{protocol_buffers = Buffers} = State) ->
     State#state{premaster_secret = undefined,
 		public_key_info = undefined,
@@ -200,54 +346,81 @@ select_sni_extension(#client_hello{extensions = HelloExtensions}) ->
     HelloExtensions#hello_extensions.sni;
 select_sni_extension(_) ->
     undefined.
+
 empty_connection_state(ConnectionEnd, BeastMitigation) ->
     Empty = ssl_record:empty_connection_state(ConnectionEnd, BeastMitigation),
     dtls_record:empty_connection_state(Empty).
 
-socket(Pid,  Transport, Socket, Connection, _) ->
-    dtls_socket:socket(Pid, Transport, Socket, Connection).
+%%====================================================================
+%% Alert and close handling
+%%====================================================================	     
+encode_alert(#alert{} = Alert, Version, ConnectionStates) ->
+    dtls_record:encode_alert_record(Alert, Version, ConnectionStates).
 
-setopts(Transport, Socket, Other) ->
-    dtls_socket:setopts(Transport, Socket, Other).
-getopts(Transport, Socket, Tag) ->
-    dtls_socket:getopts(Transport, Socket, Tag).
+send_alert(Alert, #state{negotiated_version = Version,
+			 socket = Socket,
+			 transport_cb = Transport,
+			 connection_states = ConnectionStates0} = State0) ->
+    {BinMsg, ConnectionStates} =
+	encode_alert(Alert, Version, ConnectionStates0),
+    send(Transport, Socket, BinMsg),
+    State0#state{connection_states = ConnectionStates}.
+
+close(downgrade, _,_,_,_) ->
+    ok;
+%% Other
+close(_, Socket, Transport, _,_) ->
+    dtls_socket:close(Transport,Socket).
 
 protocol_name() ->
     "DTLS".
         
 %%====================================================================
-%% tls_connection_sup API
-%%====================================================================
+%% Data handling
+%%====================================================================	 
 
-%%--------------------------------------------------------------------
--spec start_link(atom(), host(), inet:port_number(), port(), list(), pid(), tuple()) ->
-			{ok, pid()} | ignore |  {error, reason()}.
-%%
-%% Description: Creates a gen_fsm process which calls Module:init/1 to
-%% initialize. To ensure a synchronized start-up procedure, this function
-%% does not return until Module:init/1 has returned.  
-%%--------------------------------------------------------------------
-start_link(Role, Host, Port, Socket, Options, User, CbInfo) ->
-    {ok, proc_lib:spawn_link(?MODULE, init, [[Role, Host, Port, Socket, Options, User, CbInfo]])}.
+encode_data(Data, Version, ConnectionStates0)->
+    dtls_record:encode_data(Data, Version, ConnectionStates0).
 
-init([Role, Host, Port, Socket, Options,  User, CbInfo]) ->
-    process_flag(trap_exit, true),
-    State0 =  initial_state(Role, Host, Port, Socket, Options, User, CbInfo),
-    try
-	State = ssl_connection:ssl_config(State0#state.ssl_options, Role, State0),
-	gen_statem:enter_loop(?MODULE, [], init, State)
-    catch
-	throw:Error ->
-	    gen_statem:enter_loop(?MODULE, [], error, {Error,State0})
+passive_receive(State0 = #state{user_data_buffer = Buffer}, StateName) ->
+    case Buffer of
+	<<>> ->
+	    {Record, State} = next_record(State0),
+	    next_event(StateName, Record, State);
+	_ ->
+	    {Record, State} = ssl_connection:read_application_data(<<>>, State0),
+	    next_event(StateName, Record, State)
     end.
+next_record_if_active(State =
+		      #state{socket_options =
+			     #socket_options{active = false}}) ->
+    {no_record ,State};
 
-callback_mode() ->
-    [state_functions, state_enter].
+next_record_if_active(State) ->
+    next_record(State).
+
+send(Transport, {_, {{_,_}, _} = Socket}, Data) ->
+    send(Transport, Socket, Data);
+send(Transport, Socket, Data) ->
+   dtls_socket:send(Transport, Socket, Data).
+
+socket(Pid,  Transport, Socket, Connection, _) ->
+    dtls_socket:socket(Pid, Transport, Socket, Connection).
+
+setopts(Transport, Socket, Other) ->
+    dtls_socket:setopts(Transport, Socket, Other).
+
+getopts(Transport, Socket, Tag) ->
+    dtls_socket:getopts(Transport, Socket, Tag).
 
 %%--------------------------------------------------------------------
 %% State functions 
 %%--------------------------------------------------------------------
-
+%%--------------------------------------------------------------------
+-spec init(gen_statem:event_type(),
+	   {start, timeout()} | term(), #state{}) ->
+		   gen_statem:state_function_result().
+%%--------------------------------------------------------------------
 init(enter, _, State) ->
     {keep_state, State};     
 init({call, From}, {start, Timeout}, 
@@ -277,28 +450,33 @@ init({call, From}, {start, Timeout},
     {Record, State} = next_record(State3),
     next_event(hello, Record, State, Actions);
 init({call, _} = Type, Event, #state{role = server, transport_cb = gen_udp} = State) ->
-    Result = ssl_connection:?FUNCTION_NAME(Type, Event, 
-                                           State#state{flight_state = {retransmit, ?INITIAL_RETRANSMIT_TIMEOUT},
-                                                       protocol_specific = #{current_cookie_secret => dtls_v1:cookie_secret(), 
-                                                                             previous_cookie_secret => <<>>,
-                                                                             ignored_alerts => 0,
-                                                                             max_ignored_alerts => 10}},
-                                           ?MODULE),
+    Result = gen_handshake(?FUNCTION_NAME, Type, Event, 
+                           State#state{flight_state = {retransmit, ?INITIAL_RETRANSMIT_TIMEOUT},
+                                       protocol_specific = #{current_cookie_secret => dtls_v1:cookie_secret(), 
+                                                             previous_cookie_secret => <<>>,
+                                                             ignored_alerts => 0,
+                                                             max_ignored_alerts => 10}}),
     erlang:send_after(dtls_v1:cookie_timeout(), self(), new_cookie_secret),
     Result;
 
 init({call, _} = Type, Event, #state{role = server} = State) ->
     %% I.E. DTLS over sctp
-    ssl_connection:?FUNCTION_NAME(Type, Event, State#state{flight_state = reliable}, ?MODULE);
+    gen_handshake(?FUNCTION_NAME, Type, Event, State#state{flight_state = reliable});
 init(Type, Event, State) ->
-    ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE).
- 
+   gen_handshake(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec error(gen_statem:event_type(),
+	   {start, timeout()} | term(), #state{}) ->
+		   gen_statem:state_function_result().
+%%--------------------------------------------------------------------
 error(enter, _, State) ->
     {keep_state, State};     
 error({call, From}, {start, _Timeout}, {Error, State}) ->
-    {stop_and_reply, normal, {reply, From, {error, Error}}, State};
-error({call, From}, Msg, State) ->
-    handle_call(Msg, From, ?FUNCTION_NAME, State);
+    ssl_connection:stop_and_reply(
+      normal, {reply, From, {error, Error}}, State);
+error({call, _} = Call, Msg, State) ->
+    gen_handshake(?FUNCTION_NAME, Call, Msg, State);
 error(_, _, _) ->
      {keep_state_and_data, [postpone]}.
 
@@ -393,49 +571,66 @@ hello(internal, {handshake, {#hello_verify_request{} = Handshake, _}}, State) ->
     %% hello_verify should not be in handshake history
     {next_state, ?FUNCTION_NAME, State, [{next_event, internal, Handshake}]};
 hello(info, Event, State) ->
-    handle_info(Event, ?FUNCTION_NAME, State);
+    gen_info(Event, ?FUNCTION_NAME, State);
 hello(state_timeout, Event, State) ->
     handle_state_timeout(Event, ?FUNCTION_NAME, State);
 hello(Type, Event, State) ->
-    ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE).
+    gen_handshake(?FUNCTION_NAME, Type, Event, State).
 
+%%--------------------------------------------------------------------
+-spec abbreviated(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
 abbreviated(enter, _, State0) ->
     {State, Actions} = handle_flight_timer(State0),
     {keep_state, State, Actions}; 
 abbreviated(info, Event, State) ->
-    handle_info(Event, ?FUNCTION_NAME, State);
+    gen_info(Event, ?FUNCTION_NAME, State);
 abbreviated(internal = Type, 
 	    #change_cipher_spec{type = <<1>>} = Event, 
 	    #state{connection_states = ConnectionStates0} = State) ->
     ConnectionStates1 = dtls_record:save_current_connection_state(ConnectionStates0, read),
     ConnectionStates = dtls_record:next_epoch(ConnectionStates1, read),
-    ssl_connection:?FUNCTION_NAME(Type, Event, State#state{connection_states = ConnectionStates}, ?MODULE);
+    gen_handshake(?FUNCTION_NAME, Type, Event, State#state{connection_states = ConnectionStates});
 abbreviated(internal = Type, #finished{} = Event, #state{connection_states = ConnectionStates} = State) ->
-    ssl_connection:?FUNCTION_NAME(Type, Event, 
-                                  prepare_flight(State#state{connection_states = ConnectionStates,
-                                                             flight_state = connection}), ?MODULE);
+    gen_handshake(?FUNCTION_NAME, Type, Event, 
+                  prepare_flight(State#state{connection_states = ConnectionStates,
+                                             flight_state = connection}));
 abbreviated(state_timeout, Event, State) ->
     handle_state_timeout(Event, ?FUNCTION_NAME, State);
 abbreviated(Type, Event, State) ->
-    ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE).
-
+    gen_handshake(?FUNCTION_NAME, Type, Event, State).
+%%--------------------------------------------------------------------
+-spec certify(gen_statem:event_type(), term(), #state{}) ->
+		     gen_statem:state_function_result().
+%%--------------------------------------------------------------------
 certify(enter, _, State0) ->
     {State, Actions} = handle_flight_timer(State0),
     {keep_state, State, Actions}; 
 certify(info, Event, State) ->
-    handle_info(Event, ?FUNCTION_NAME, State);
+    gen_info(Event, ?FUNCTION_NAME, State);
 certify(internal = Type, #server_hello_done{} = Event, State) ->
     ssl_connection:certify(Type, Event, prepare_flight(State), ?MODULE);
+certify(internal,  #change_cipher_spec{type = <<1>>}, State0) ->
+    {State1, Actions0} = send_handshake_flight(State0, retransmit_epoch(?FUNCTION_NAME, State0)),
+    {Record, State2} = next_record(State1),
+    {next_state, ?FUNCTION_NAME, State, Actions} = next_event(?FUNCTION_NAME, Record, State2, Actions0),
+    %% This will reset the retransmission timer by repeating the enter state event
+    {repeat_state, State, Actions};
 certify(state_timeout, Event, State) ->
     handle_state_timeout(Event, ?FUNCTION_NAME, State);
 certify(Type, Event, State) ->
-    ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE).
+    gen_handshake(?FUNCTION_NAME, Type, Event, State).
 
+%%--------------------------------------------------------------------
+-spec cipher(gen_statem:event_type(), term(), #state{}) ->
+		    gen_statem:state_function_result().
+%%--------------------------------------------------------------------
 cipher(enter, _, State0) ->
     {State, Actions} = handle_flight_timer(State0),
     {keep_state, State, Actions}; 
 cipher(info, Event, State) ->
-    handle_info(Event, ?FUNCTION_NAME, State);
+    gen_info(Event, ?FUNCTION_NAME, State);
 cipher(internal = Type, #change_cipher_spec{type = <<1>>} = Event,  
        #state{connection_states = ConnectionStates0} = State) ->
     ConnectionStates1 = dtls_record:save_current_connection_state(ConnectionStates0, read),
@@ -451,10 +646,15 @@ cipher(state_timeout, Event, State) ->
 cipher(Type, Event, State) ->
      ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE).
 
+%%--------------------------------------------------------------------
+-spec connection(gen_statem:event_type(),  
+		 #hello_request{} | #client_hello{}| term(), #state{}) ->
+			gen_statem:state_function_result().
+%%--------------------------------------------------------------------
 connection(enter, _, State) ->
     {keep_state, State};     
 connection(info, Event, State) ->
-    handle_info(Event, ?FUNCTION_NAME, State);
+    gen_info(Event, ?FUNCTION_NAME, State);
 connection(internal, #hello_request{}, #state{host = Host, port = Port,
                                               session = #session{own_certificate = Cert} = Session0,
                                               session_cache = Cache, session_cache_cb = CacheCb,
@@ -492,136 +692,24 @@ connection(Type, Event, State) ->
      ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE).
 
 %%TODO does this make sense for DTLS ?
+%%--------------------------------------------------------------------
+-spec downgrade(gen_statem:event_type(), term(), #state{}) ->
+		       gen_statem:state_function_result().
+%%--------------------------------------------------------------------
 downgrade(enter, _, State) ->
     {keep_state, State};
 downgrade(Type, Event, State) ->
      ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE).
 
 %%--------------------------------------------------------------------
-%% Description: This function is called by a gen_fsm when it receives any
-%% other message than a synchronous or asynchronous event
-%% (or a system message).
+%% gen_statem callbacks
 %%--------------------------------------------------------------------
+callback_mode() ->
+    [state_functions, state_enter].
 
-%% raw data from socket, unpack records
-handle_info({Protocol, _, _, _, Data}, StateName,
-            #state{data_tag = Protocol} = State0) ->
-    case next_dtls_record(Data, State0) of
-	{Record, State} ->
-	    next_event(StateName, Record, State);
-	#alert{} = Alert ->
-	    ssl_connection:handle_normal_shutdown(Alert, StateName, State0), 
-	    {stop, {shutdown, own_alert}}
-    end;
-handle_info({CloseTag, Socket}, StateName,
-	    #state{socket = Socket, 
-                   socket_options = #socket_options{active = Active},
-                   protocol_buffers = #protocol_buffers{dtls_cipher_texts = CTs},
-                   close_tag = CloseTag,
-		   negotiated_version = Version} = State) ->
-    %% Note that as of DTLS 1.2 (TLS 1.1),
-    %% failure to properly close a connection no longer requires that a
-    %% session not be resumed.	This is a change from DTLS 1.0 to conform
-    %% with widespread implementation practice.
-    case (Active == false) andalso (CTs =/= []) of
-        false ->
-            case Version of
-                {254, N} when N =< 253 ->
-                    ok;
-                _ ->
-                    %% As invalidate_sessions here causes performance issues,
-                    %% we will conform to the widespread implementation
-                    %% practice and go aginst the spec
-                    %%invalidate_session(Role, Host, Port, Session)
-                    ok
-            end,
-            ssl_connection:handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-            {stop, {shutdown, transport_closed}};
-        true ->
-            %% Fixes non-delivery of final DTLS record in {active, once}.
-            %% Basically allows the application the opportunity to set {active, once} again
-            %% and then receive the final message.
-            next_event(StateName, no_record, State)
-    end;
-
-handle_info(new_cookie_secret, StateName, 
-            #state{protocol_specific = #{current_cookie_secret := Secret} = CookieInfo} = State) ->
-    erlang:send_after(dtls_v1:cookie_timeout(), self(), new_cookie_secret),
-    {next_state, StateName, State#state{protocol_specific = 
-                                            CookieInfo#{current_cookie_secret => dtls_v1:cookie_secret(),
-                                                        previous_cookie_secret => Secret}}};
-handle_info(Msg, StateName, State) ->
-    ssl_connection:StateName(info, Msg, State, ?MODULE).
-
-handle_call(Event, From, StateName, State) ->
-    ssl_connection:handle_call(Event, From, StateName, State, ?MODULE).
-
-handle_common_event(internal, #alert{} = Alert, StateName, 
-		    #state{negotiated_version = Version} = State) ->
-    handle_own_alert(Alert, Version, StateName, State);
-%%% DTLS record protocol level handshake messages 
-handle_common_event(internal, #ssl_tls{type = ?HANDSHAKE,
-				       fragment = Data}, 
-		    StateName, 
-		    #state{protocol_buffers = Buffers0,
-			   negotiated_version = Version} = State0) ->
-    try
-	case dtls_handshake:get_dtls_handshake(Version, Data, Buffers0) of
-	    {[], Buffers} ->
-		{Record, State} = next_record(State0#state{protocol_buffers = Buffers}),
-		next_event(StateName, Record, State);
-	    {Packets, Buffers} ->
-		State = State0#state{protocol_buffers = Buffers},
-		Events = dtls_handshake_events(Packets),
-                {next_state, StateName, 
-                 State#state{unprocessed_handshake_events = unprocessed_events(Events)}, Events}
-	end
-    catch throw:#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, StateName, State0)
-    end;
-%%% DTLS record protocol level application data messages 
-handle_common_event(internal, #ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, StateName, State) ->
-    {next_state, StateName, State, [{next_event, internal, {application_data, Data}}]};
-%%% DTLS record protocol level change cipher messages
-handle_common_event(internal, #ssl_tls{type = ?CHANGE_CIPHER_SPEC, fragment = Data}, StateName, State) ->
-    {next_state, StateName, State, [{next_event, internal, #change_cipher_spec{type = Data}}]};
-%%% DTLS record protocol level Alert messages
-handle_common_event(internal, #ssl_tls{type = ?ALERT, fragment = EncAlerts}, StateName,
-		    #state{negotiated_version = Version} = State) ->
-    case decode_alerts(EncAlerts) of
-	Alerts = [_|_] ->
-	    handle_alerts(Alerts,  {next_state, StateName, State});
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, StateName, State)
-    end;
-%% Ignore unknown TLS record level protocol messages
-handle_common_event(internal, #ssl_tls{type = _Unknown}, StateName, State) ->
-    {next_state, StateName, State}.
-
-handle_state_timeout(flight_retransmission_timeout, StateName, 
-                    #state{flight_state = {retransmit, NextTimeout}} = State0) ->
-    {State1, Actions} = send_handshake_flight(State0#state{flight_state = {retransmit, NextTimeout}}, 
-                                              retransmit_epoch(StateName, State0)),
-    {Record, State} = next_record(State1),
-    next_event(StateName, Record, State, Actions).
-
-send(Transport, {_, {{_,_}, _} = Socket}, Data) ->
-    send(Transport, Socket, Data);
-send(Transport, Socket, Data) ->
-   dtls_socket:send(Transport, Socket, Data).
-%%--------------------------------------------------------------------
-%% Description:This function is called by a gen_fsm when it is about
-%% to terminate. It should be the opposite of Module:init/1 and do any
-%% necessary cleaning up. When it returns, the gen_fsm terminates with
-%% Reason. The return value is ignored.
-%%--------------------------------------------------------------------
 terminate(Reason, StateName, State) ->
     ssl_connection:terminate(Reason, StateName, State).
 
-%%--------------------------------------------------------------------
-%% code_change(OldVsn, StateName, State, Extra) -> {ok, StateName, NewState}
-%% Description: Convert process state when code is changed
-%%--------------------------------------------------------------------
 code_change(_OldVsn, StateName, State, _Extra) ->
     {ok, StateName, State}.
 
@@ -631,55 +719,6 @@ format_status(Type, Data) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-handle_client_hello(#client_hello{client_version = ClientVersion} = Hello,
-		    #state{connection_states = ConnectionStates0,
-			   port = Port, session = #session{own_certificate = Cert} = Session0,
-			   renegotiation = {Renegotiation, _},
-			   session_cache = Cache,
-			   session_cache_cb = CacheCb,
-			   negotiated_protocol = CurrentProtocol,
-			   key_algorithm = KeyExAlg,
-			   ssl_options = SslOpts} = State0) ->
-    
-    case dtls_handshake:hello(Hello, SslOpts, {Port, Session0, Cache, CacheCb,
-					       ConnectionStates0, Cert, KeyExAlg}, Renegotiation) of
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, ClientVersion, hello, State0);
-	{Version, {Type, Session},
-	 ConnectionStates, Protocol0, ServerHelloExt, HashSign} ->
-	    Protocol = case Protocol0 of
-			   undefined -> CurrentProtocol;
-			   _ -> Protocol0
-		       end,
-
-	    State = prepare_flight(State0#state{connection_states = ConnectionStates,
-						negotiated_version = Version,
-						hashsign_algorithm = HashSign,
-						session = Session,
-						negotiated_protocol = Protocol}),
-	    
-	    ssl_connection:hello(internal, {common_client_hello, Type, ServerHelloExt},
-				 State, ?MODULE)
-    end.
-
-encode_handshake_flight(Flight, Version, MaxFragmentSize, Epoch, ConnectionStates) ->
-    Fragments = lists:map(fun(Handshake) ->
-				  dtls_handshake:fragment_handshake(Handshake, MaxFragmentSize)
-			  end, Flight),
-    dtls_record:encode_handshake(Fragments, Version, Epoch, ConnectionStates).
-
-encode_change_cipher(#change_cipher_spec{}, Version, Epoch, ConnectionStates) ->
-    dtls_record:encode_change_cipher_spec(Version, Epoch, ConnectionStates).
-
-encode_data(Data, Version, ConnectionStates0)->
-    dtls_record:encode_data(Data, Version, ConnectionStates0).
-
-encode_alert(#alert{} = Alert, Version, ConnectionStates) ->
-    dtls_record:encode_alert_record(Alert, Version, ConnectionStates).
-
-decode_alerts(Bin) ->
-    ssl_alert:decode(Bin).
-
 initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions, _}, User,
 	      {CbModule, DataTag, CloseTag, ErrorTag}) ->
     #ssl_options{beast_mitigation = BeastMitigation} = SSLOptions,
@@ -720,10 +759,12 @@ initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions, _}, User,
            flight_state = {retransmit, ?INITIAL_RETRANSMIT_TIMEOUT}
 	  }.
 
-next_dtls_record(Data, #state{protocol_buffers = #protocol_buffers{
+next_dtls_record(Data, StateName, #state{protocol_buffers = #protocol_buffers{
 						   dtls_record_buffer = Buf0,
 						   dtls_cipher_texts = CT0} = Buffers} = State0) ->
-    case dtls_record:get_dtls_records(Data, Buf0) of
+    case dtls_record:get_dtls_records(Data,
+                                      acceptable_record_versions(StateName, State0), 
+                                      Buf0) of
 	{Records, Buf1} ->
 	    CT1 = CT0 ++ Records,
 	    next_record(State0#state{protocol_buffers =
@@ -733,153 +774,15 @@ next_dtls_record(Data, #state{protocol_buffers = #protocol_buffers{
 	    Alert
     end.
 
-next_record(#state{unprocessed_handshake_events = N} = State) when N > 0 ->
-    {no_record, State#state{unprocessed_handshake_events = N-1}};
-					 
-next_record(#state{protocol_buffers =
-		       #protocol_buffers{dtls_cipher_texts = [#ssl_tls{epoch = Epoch} = CT | Rest]}
-		   = Buffers,
-		   connection_states = #{current_read := #{epoch := Epoch}} = ConnectionStates} = State) ->
-    CurrentRead = dtls_record:get_connection_state_by_epoch(Epoch, ConnectionStates, read),
-    case dtls_record:replay_detect(CT, CurrentRead) of
-        false ->
-            decode_cipher_text(State#state{connection_states = ConnectionStates}) ;
-        true ->
-            %% Ignore replayed record
-            next_record(State#state{protocol_buffers =
-                                        Buffers#protocol_buffers{dtls_cipher_texts = Rest},
-                                    connection_states = ConnectionStates})
-    end;
-next_record(#state{protocol_buffers =
-		       #protocol_buffers{dtls_cipher_texts = [#ssl_tls{epoch = Epoch} | Rest]}
-		   = Buffers,
-		   connection_states = #{current_read := #{epoch := CurrentEpoch}} = ConnectionStates} = State) 
-  when Epoch > CurrentEpoch ->
-    %% TODO Buffer later Epoch message, drop it for now
-    next_record(State#state{protocol_buffers =
-                                Buffers#protocol_buffers{dtls_cipher_texts = Rest},
-                            connection_states = ConnectionStates});
-next_record(#state{protocol_buffers =
-		       #protocol_buffers{dtls_cipher_texts = [ _ | Rest]}
-		   = Buffers,
-		   connection_states = ConnectionStates} = State) ->
-    %% Drop old epoch message
-    next_record(State#state{protocol_buffers =
-                                Buffers#protocol_buffers{dtls_cipher_texts = Rest},
-                            connection_states = ConnectionStates});
-next_record(#state{role = server,
-		   socket = {Listener, {Client, _}},
-		   transport_cb = gen_udp} = State) -> 
-    dtls_udp_listener:active_once(Listener, Client, self()),
-    {no_record, State};
-next_record(#state{role = client,
-		   socket = {_Server, Socket},
-		   transport_cb = Transport} = State) -> 
-    dtls_socket:setopts(Transport, Socket, [{active,once}]),
-    {no_record, State};
-next_record(State) ->
-    {no_record, State}.
-
-next_record_if_active(State =
-		      #state{socket_options =
-			     #socket_options{active = false}}) ->
-    {no_record ,State};
-
-next_record_if_active(State) ->
-    next_record(State).
-
-passive_receive(State0 = #state{user_data_buffer = Buffer}, StateName) ->
-    case Buffer of
-	<<>> ->
-	    {Record, State} = next_record(State0),
-	    next_event(StateName, Record, State);
-	_ ->
-	    {Record, State} = ssl_connection:read_application_data(<<>>, State0),
-	    next_event(StateName, Record, State)
-    end.
-
-next_event(StateName, Record, State) ->
-    next_event(StateName, Record, State, []).
+acceptable_record_versions(hello, _) ->
+    [dtls_record:protocol_version(Vsn) || Vsn <- ?ALL_DATAGRAM_SUPPORTED_VERSIONS];
+acceptable_record_versions(_, #state{negotiated_version = Version}) ->
+    [Version].
 
-next_event(connection = StateName, no_record,
-	   #state{connection_states = #{current_read := #{epoch := CurrentEpoch}}} = State0, Actions) ->
-    case next_record_if_active(State0) of
-	{no_record, State} ->
-            ssl_connection:hibernate_after(StateName, State, Actions);
-        {#ssl_tls{epoch = CurrentEpoch,
-                  type = ?HANDSHAKE,
-                  version = Version} = Record, State1} ->
-            State = dtls_version(StateName, Version, State1), 
-	    {next_state, StateName, State,
-	     [{next_event, internal, {protocol_record, Record}} | Actions]};
-        {#ssl_tls{epoch = CurrentEpoch} = Record, State} ->
-	    {next_state, StateName, State, [{next_event, internal, {protocol_record, Record}} | Actions]};
-	{#ssl_tls{epoch = Epoch,
-		  type = ?HANDSHAKE,
-		  version = _Version}, State1} = _Record when Epoch == CurrentEpoch-1 ->
-	    {State2, MoreActions} = send_handshake_flight(State1, CurrentEpoch),
-            {NextRecord, State} = next_record(State2),
-            next_event(StateName, NextRecord, State, Actions ++ MoreActions);
-        %% From FLIGHT perspective CHANGE_CIPHER_SPEC is treated as a handshake
-        {#ssl_tls{epoch = Epoch,
-		  type = ?CHANGE_CIPHER_SPEC,
-		  version = _Version}, State1} = _Record when Epoch == CurrentEpoch-1 ->
-	    {State2, MoreActions} = send_handshake_flight(State1, CurrentEpoch),
-	    {NextRecord, State} = next_record(State2),
-            next_event(StateName, NextRecord, State, Actions ++ MoreActions);
-	{#ssl_tls{epoch = _Epoch,
-		  version = _Version}, State1} ->
-	    %% TODO maybe buffer later epoch
-            {Record, State} = next_record(State1),
-            next_event(StateName, Record, State, Actions); 
-	{#alert{} = Alert, State} ->
-	    {next_state, StateName, State, [{next_event, internal, Alert} | Actions]}
-    end;
-next_event(connection = StateName, Record,
-	   #state{connection_states = #{current_read := #{epoch := CurrentEpoch}}} = State0, Actions) ->
-    case Record of
-        #ssl_tls{epoch = CurrentEpoch,
-                 type = ?HANDSHAKE,
-                 version = Version} = Record ->
-            State = dtls_version(StateName, Version, State0), 
-	    {next_state, StateName, State,
-	     [{next_event, internal, {protocol_record, Record}} | Actions]};
-	#ssl_tls{epoch = CurrentEpoch} ->
-	    {next_state, StateName, State0, [{next_event, internal, {protocol_record, Record}} | Actions]};
-	#ssl_tls{epoch = Epoch,
-                 type = ?HANDSHAKE,
-                 version = _Version} when Epoch == CurrentEpoch-1 ->
-	    {State1, MoreActions} = send_handshake_flight(State0, CurrentEpoch),
-            {NextRecord, State} = next_record(State1),
-            next_event(StateName, NextRecord, State, Actions ++ MoreActions);
-        %% From FLIGHT perspective CHANGE_CIPHER_SPEC is treated as a handshake
-        #ssl_tls{epoch = Epoch,
-                 type = ?CHANGE_CIPHER_SPEC,
-                 version = _Version} when Epoch == CurrentEpoch-1 ->
-	    {State1, MoreActions} = send_handshake_flight(State0, CurrentEpoch),
-            {NextRecord, State} = next_record(State1),
-            next_event(StateName, NextRecord, State, Actions ++ MoreActions); 
-        _ -> 
-            next_event(StateName, no_record, State0, Actions) 
-    end;
-next_event(StateName, Record, 
-	   #state{connection_states = #{current_read := #{epoch := CurrentEpoch}}} = State0, Actions) ->
-    case Record of
-	no_record ->
-	    {next_state, StateName, State0, Actions};
-        #ssl_tls{epoch = CurrentEpoch,
-                 version = Version} = Record ->
-            State = dtls_version(StateName, Version, State0),
-            {next_state, StateName,  State,
-         [{next_event, internal, {protocol_record, Record}} | Actions]};
-	#ssl_tls{epoch = _Epoch,
-		 version = _Version} = _Record ->
-	    %% TODO maybe buffer later epoch
-            {Record, State} = next_record(State0),
-            next_event(StateName, Record, State, Actions); 
-	#alert{} = Alert ->
-	    {next_state, StateName, State0, [{next_event, internal, Alert} | Actions]}
-    end.
+dtls_handshake_events(Packets) ->
+    lists:map(fun(Packet) ->
+		      {next_event, internal, {handshake, Packet}}
+	      end, Packets).
 
 decode_cipher_text(#state{protocol_buffers = #protocol_buffers{dtls_cipher_texts = [ CT | Rest]} = Buffers,
                           connection_states = ConnStates0} = State) ->
@@ -897,6 +800,178 @@ dtls_version(hello, Version, #state{role = server} = State) ->
 dtls_version(_,_, State) ->
     State.
 
+handle_client_hello(#client_hello{client_version = ClientVersion} = Hello,
+		    #state{connection_states = ConnectionStates0,
+			   port = Port, session = #session{own_certificate = Cert} = Session0,
+			   renegotiation = {Renegotiation, _},
+			   session_cache = Cache,
+			   session_cache_cb = CacheCb,
+			   negotiated_protocol = CurrentProtocol,
+			   key_algorithm = KeyExAlg,
+			   ssl_options = SslOpts} = State0) ->
+    
+    case dtls_handshake:hello(Hello, SslOpts, {Port, Session0, Cache, CacheCb,
+					       ConnectionStates0, Cert, KeyExAlg}, Renegotiation) of
+	#alert{} = Alert ->
+	    handle_own_alert(Alert, ClientVersion, hello, State0);
+	{Version, {Type, Session},
+	 ConnectionStates, Protocol0, ServerHelloExt, HashSign} ->
+	    Protocol = case Protocol0 of
+			   undefined -> CurrentProtocol;
+			   _ -> Protocol0
+		       end,
+
+	    State = prepare_flight(State0#state{connection_states = ConnectionStates,
+						negotiated_version = Version,
+						hashsign_algorithm = HashSign,
+                                                client_hello_version = ClientVersion,
+						session = Session,
+						negotiated_protocol = Protocol}),
+	    
+	    ssl_connection:hello(internal, {common_client_hello, Type, ServerHelloExt},
+				 State, ?MODULE)
+    end.
+
+
+%% raw data from socket, unpack records
+handle_info({Protocol, _, _, _, Data}, StateName,
+            #state{data_tag = Protocol} = State0) ->
+    case next_dtls_record(Data, StateName, State0) of
+	{Record, State} ->
+	    next_event(StateName, Record, State);
+	#alert{} = Alert ->
+	    ssl_connection:handle_normal_shutdown(Alert, StateName, State0), 
+	    ssl_connection:stop({shutdown, own_alert}, State0)
+    end;
+handle_info({CloseTag, Socket}, StateName,
+	    #state{socket = Socket, 
+                   socket_options = #socket_options{active = Active},
+                   protocol_buffers = #protocol_buffers{dtls_cipher_texts = CTs},
+                   close_tag = CloseTag,
+		   negotiated_version = Version} = State) ->
+    %% Note that as of DTLS 1.2 (TLS 1.1),
+    %% failure to properly close a connection no longer requires that a
+    %% session not be resumed.	This is a change from DTLS 1.0 to conform
+    %% with widespread implementation practice.
+    case (Active == false) andalso (CTs =/= []) of
+        false ->
+            case Version of
+                {254, N} when N =< 253 ->
+                    ok;
+                _ ->
+                    %% As invalidate_sessions here causes performance issues,
+                    %% we will conform to the widespread implementation
+                    %% practice and go aginst the spec
+                    %%invalidate_session(Role, Host, Port, Session)
+                    ok
+            end,
+            ssl_connection:handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
+            ssl_connection:stop({shutdown, transport_closed}, State);
+        true ->
+            %% Fixes non-delivery of final DTLS record in {active, once}.
+            %% Basically allows the application the opportunity to set {active, once} again
+            %% and then receive the final message.
+            next_event(StateName, no_record, State)
+    end;
+
+handle_info(new_cookie_secret, StateName, 
+            #state{protocol_specific = #{current_cookie_secret := Secret} = CookieInfo} = State) ->
+    erlang:send_after(dtls_v1:cookie_timeout(), self(), new_cookie_secret),
+    {next_state, StateName, State#state{protocol_specific = 
+                                            CookieInfo#{current_cookie_secret => dtls_v1:cookie_secret(),
+                                                        previous_cookie_secret => Secret}}};
+handle_info(Msg, StateName, State) ->
+    ssl_connection:StateName(info, Msg, State, ?MODULE).
+
+handle_state_timeout(flight_retransmission_timeout, StateName,
+                     #state{flight_state = {retransmit, NextTimeout}} = State0) ->
+    {State1, Actions0} = send_handshake_flight(State0#state{flight_state = {retransmit, NextTimeout}}, 
+                                              retransmit_epoch(StateName, State0)),
+    {Record, State2} = next_record(State1),
+    {next_state, StateName, State, Actions} = next_event(StateName, Record, State2, Actions0),
+    %% This will reset the retransmission timer by repeating the enter state event
+    {repeat_state, State, Actions}.
+
+handle_alerts([], Result) ->
+    Result;
+handle_alerts(_, {stop, _, _} = Stop) ->
+    Stop;
+handle_alerts([Alert | Alerts], {next_state, StateName, State}) ->
+     handle_alerts(Alerts, ssl_connection:handle_alert(Alert, StateName, State));
+handle_alerts([Alert | Alerts], {next_state, StateName, State, _Actions}) ->
+     handle_alerts(Alerts, ssl_connection:handle_alert(Alert, StateName, State)).
+
+handle_own_alert(Alert, Version, StateName, #state{transport_cb = gen_udp,
+                                                   role = Role,
+                                                   ssl_options = Options} = State0) ->
+    case ignore_alert(Alert, State0) of
+        {true, State} ->
+            log_ignore_alert(Options#ssl_options.log_alert, StateName, Alert, Role),
+            {next_state, StateName, State};
+        {false, State} ->
+            ssl_connection:handle_own_alert(Alert, Version, StateName, State)
+    end;
+handle_own_alert(Alert, Version, StateName, State) ->
+    ssl_connection:handle_own_alert(Alert, Version, StateName, State).
+
+encode_handshake_flight(Flight, Version, MaxFragmentSize, Epoch, ConnectionStates) ->
+    Fragments = lists:map(fun(Handshake) ->
+				  dtls_handshake:fragment_handshake(Handshake, MaxFragmentSize)
+			  end, Flight),
+    dtls_record:encode_handshake(Fragments, Version, Epoch, ConnectionStates).
+
+encode_change_cipher(#change_cipher_spec{}, Version, Epoch, ConnectionStates) ->
+    dtls_record:encode_change_cipher_spec(Version, Epoch, ConnectionStates).
+
+decode_alerts(Bin) ->
+    ssl_alert:decode(Bin).
+
+gen_handshake(StateName, Type, Event, 
+	      #state{negotiated_version = Version} = State) ->
+    try ssl_connection:StateName(Type, Event, State, ?MODULE) of
+	Result ->
+	    Result
+    catch 
+	_:_ ->
+ 	    ssl_connection:handle_own_alert(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, 
+						       malformed_handshake_data),
+					    Version, StateName, State)  
+    end.
+
+gen_info(Event, connection = StateName,  #state{negotiated_version = Version} = State) ->
+    try handle_info(Event, StateName, State) of
+	Result ->
+	    Result
+    catch 
+	_:_ ->
+	    ssl_connection:handle_own_alert(?ALERT_REC(?FATAL, ?INTERNAL_ERROR, 
+						       malformed_data), 
+					    Version, StateName, State)  
+    end;
+
+gen_info(Event, StateName, #state{negotiated_version = Version} = State) ->
+    try handle_info(Event, StateName, State) of
+	Result ->
+	    Result
+    catch 
+        _:_ ->
+	    ssl_connection:handle_own_alert(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, 
+						       malformed_handshake_data), 
+					    Version, StateName, State)  
+    end.
+unprocessed_events(Events) ->
+    %% The first handshake event will be processed immediately
+    %% as it is entered first in the event queue and
+    %% when it is processed there will be length(Events)-1
+    %% handshake events left to process before we should
+    %% process more TLS-records received on the socket. 
+    erlang:length(Events)-1.
+
+update_handshake_history(#hello_verify_request{}, _, Hist) ->
+    Hist;
+update_handshake_history(_, Handshake, Hist) ->
+    %% DTLS never needs option "v2_hello_compatible" to be true
+    ssl_handshake:update_handshake_history(Hist, iolist_to_binary(Handshake), false).
 prepare_flight(#state{flight_buffer = Flight,
 		      connection_states = ConnectionStates0,
 		      protocol_buffers = 
@@ -937,67 +1012,67 @@ new_timeout(N) when N =< 30 ->
 new_timeout(_) -> 
     60.
 
-dtls_handshake_events(Packets) ->
-    lists:map(fun(Packet) ->
-		      {next_event, internal, {handshake, Packet}}
-	      end, Packets).
+send_handshake_flight(#state{socket = Socket,
+			     transport_cb = Transport,
+			     flight_buffer = #{handshakes := Flight,
+					       change_cipher_spec := undefined},
+			     negotiated_version = Version,
+			     connection_states = ConnectionStates0} = State0, Epoch) ->
+    %% TODO remove hardcoded Max size
+    {Encoded, ConnectionStates} =
+	encode_handshake_flight(lists:reverse(Flight), Version, 1400, Epoch, ConnectionStates0),
+    send(Transport, Socket, Encoded), 
+   {State0#state{connection_states = ConnectionStates}, []};
 
-renegotiate(#state{role = client} = State, Actions) ->
-    %% Handle same way as if server requested
-    %% the renegotiation
-    %%    Hs0 = ssl_handshake:init_handshake_history(),
-    {next_state, connection, State,
-     [{next_event, internal, #hello_request{}} | Actions]};
+send_handshake_flight(#state{socket = Socket,
+			     transport_cb = Transport,
+			     flight_buffer = #{handshakes := [_|_] = Flight0,
+					       change_cipher_spec := ChangeCipher,
+					       handshakes_after_change_cipher_spec := []},
+			     negotiated_version = Version,
+			     connection_states = ConnectionStates0} = State0, Epoch) ->      
+    {HsBefore, ConnectionStates1} =
+	encode_handshake_flight(lists:reverse(Flight0), Version, 1400, Epoch, ConnectionStates0),
+    {EncChangeCipher, ConnectionStates} = encode_change_cipher(ChangeCipher, Version, Epoch, ConnectionStates1),
 
-renegotiate(#state{role = server} = State0, Actions) ->
-    HelloRequest = ssl_handshake:hello_request(),
-    State1 = prepare_flight(State0),
-    {State2, MoreActions} = send_handshake(HelloRequest, State1),
-    {Record, State} = next_record(State2),
-    next_event(hello, Record, State, Actions ++ MoreActions).
+    send(Transport, Socket, [HsBefore, EncChangeCipher]),
+    {State0#state{connection_states = ConnectionStates}, []};
 
-handle_alerts([], Result) ->
-    Result;
-handle_alerts(_, {stop,_} = Stop) ->
-    Stop;
-handle_alerts([Alert | Alerts], {next_state, StateName, State}) ->
-     handle_alerts(Alerts, ssl_connection:handle_alert(Alert, StateName, State));
-handle_alerts([Alert | Alerts], {next_state, StateName, State, _Actions}) ->
-     handle_alerts(Alerts, ssl_connection:handle_alert(Alert, StateName, State)).
+send_handshake_flight(#state{socket = Socket,
+			     transport_cb = Transport,
+			     flight_buffer = #{handshakes := [_|_] = Flight0,
+					       change_cipher_spec := ChangeCipher,
+					       handshakes_after_change_cipher_spec := Flight1},
+			     negotiated_version = Version,
+			     connection_states = ConnectionStates0} = State0, Epoch) ->      
+    {HsBefore, ConnectionStates1} =
+	encode_handshake_flight(lists:reverse(Flight0), Version, 1400, Epoch-1, ConnectionStates0),
+    {EncChangeCipher, ConnectionStates2} = 
+	encode_change_cipher(ChangeCipher, Version, Epoch-1, ConnectionStates1),
+    {HsAfter, ConnectionStates} =
+	encode_handshake_flight(lists:reverse(Flight1), Version, 1400, Epoch, ConnectionStates2),
+    send(Transport, Socket, [HsBefore, EncChangeCipher, HsAfter]),
+    {State0#state{connection_states = ConnectionStates}, []};
+
+send_handshake_flight(#state{socket = Socket,
+			     transport_cb = Transport,
+			     flight_buffer = #{handshakes := [],
+					       change_cipher_spec := ChangeCipher,
+					       handshakes_after_change_cipher_spec := Flight1},
+			     negotiated_version = Version,
+			     connection_states = ConnectionStates0} = State0, Epoch) ->
+    {EncChangeCipher, ConnectionStates1} = 
+	encode_change_cipher(ChangeCipher, Version, Epoch-1, ConnectionStates0),
+    {HsAfter, ConnectionStates} =
+	encode_handshake_flight(lists:reverse(Flight1), Version, 1400, Epoch, ConnectionStates1),
+    send(Transport, Socket, [EncChangeCipher, HsAfter]),
+    {State0#state{connection_states = ConnectionStates}, []}.
 
 retransmit_epoch(_StateName, #state{connection_states = ConnectionStates}) ->
     #{epoch := Epoch} = 
 	ssl_record:current_connection_state(ConnectionStates, write),
     Epoch.
 	    
-update_handshake_history(#hello_verify_request{}, _, Hist) ->
-    Hist;
-update_handshake_history(_, Handshake, Hist) ->
-    %% DTLS never needs option "v2_hello_compatible" to be true
-    ssl_handshake:update_handshake_history(Hist, iolist_to_binary(Handshake), false).
-
-unprocessed_events(Events) ->
-    %% The first handshake event will be processed immediately
-    %% as it is entered first in the event queue and
-    %% when it is processed there will be length(Events)-1
-    %% handshake events left to process before we should
-    %% process more TLS-records received on the socket. 
-    erlang:length(Events)-1.
-
-handle_own_alert(Alert, Version, StateName, #state{transport_cb = gen_udp,
-                                                   role = Role,
-                                                   ssl_options = Options} = State0) ->
-    case ignore_alert(Alert, State0) of
-        {true, State} ->
-            log_ignore_alert(Options#ssl_options.log_alert, StateName, Alert, Role),
-            {next_state, StateName, State};
-        {false, State} ->
-            ssl_connection:handle_own_alert(Alert, Version, StateName, State)
-    end;
-handle_own_alert(Alert, Version, StateName, State) ->
-    ssl_connection:handle_own_alert(Alert, Version, StateName, State).
-
-
 ignore_alert(#alert{level = ?FATAL}, #state{protocol_specific = #{ignored_alerts := N,
                                                   max_ignored_alerts := N}} = State) ->
     {false, State};
diff --git a/lib/ssl/src/dtls_handshake.erl b/lib/ssl/src/dtls_handshake.erl
index 37a46b862e..6071eece13 100644
--- a/lib/ssl/src/dtls_handshake.erl
+++ b/lib/ssl/src/dtls_handshake.erl
@@ -16,6 +16,11 @@
 %% limitations under the License.
 %%
 %% %CopyrightEnd%
+
+%%----------------------------------------------------------------------
+%% Purpose: Help funtions for handling the DTLS (specific parts of)
+%%% SSL/TLS/DTLS handshake protocol
+%%----------------------------------------------------------------------
 -module(dtls_handshake).
 
 -include("dtls_connection.hrl").
@@ -24,15 +29,21 @@
 -include("ssl_internal.hrl").
 -include("ssl_alert.hrl").
 
+%% Handshake handling
 -export([client_hello/8, client_hello/9, cookie/4, hello/4, 
-	 hello_verify_request/2, get_dtls_handshake/3, fragment_handshake/2,
-	 handshake_bin/2, encode_handshake/3]).
+	 hello_verify_request/2]).
+        
+%% Handshake encoding
+-export([fragment_handshake/2, encode_handshake/3]).
+
+%% Handshake decodeing
+-export([get_dtls_handshake/3]). 
 
 -type dtls_handshake() :: #client_hello{} | #hello_verify_request{} | 
 			  ssl_handshake:ssl_handshake().
 
 %%====================================================================
-%% Internal application API
+%% Handshake handling
 %%====================================================================
 %%--------------------------------------------------------------------
 -spec client_hello(host(), inet:port_number(), ssl_record:connection_states(),
@@ -56,7 +67,8 @@ client_hello(Host, Port, ConnectionStates, SslOpts,
 %%--------------------------------------------------------------------
 client_hello(Host, Port, Cookie, ConnectionStates,
 	     #ssl_options{versions = Versions,
-			  ciphers = UserSuites
+			  ciphers = UserSuites,
+                          fallback = Fallback
 			 } = SslOpts,
 	     Cache, CacheCb, Renegotiation, OwnCert) ->
     Version =  dtls_record:highest_protocol_version(Versions),
@@ -66,12 +78,15 @@ client_hello(Host, Port, Cookie, ConnectionStates,
     CipherSuites = ssl_handshake:available_suites(UserSuites, TLSVersion),
 
     Extensions = ssl_handshake:client_hello_extensions(TLSVersion, CipherSuites,
-                                                       SslOpts, ConnectionStates, Renegotiation),
+                                                       SslOpts, ConnectionStates, 
+                                                       Renegotiation),
     Id = ssl_session:client_id({Host, Port, SslOpts}, Cache, CacheCb, OwnCert),
 
     #client_hello{session_id = Id,
 		  client_version = Version,
-		  cipher_suites = ssl_handshake:cipher_suites(CipherSuites, Renegotiation),
+		  cipher_suites = 
+                      ssl_handshake:cipher_suites(CipherSuites, 
+                                                  Renegotiation, Fallback),
 		  compression_methods = ssl_record:compressions(),
 		  random = SecParams#security_parameters.client_random,
 		  cookie = Cookie,
@@ -87,11 +102,11 @@ hello(#server_hello{server_version = Version, random = Random,
     case dtls_record:is_acceptable_version(Version, SupportedVersions) of
 	true ->
 	    handle_server_hello_extensions(Version, SessionId, Random, CipherSuite,
-					   Compression, HelloExt, SslOpt, ConnectionStates0, Renegotiation);
+					   Compression, HelloExt, SslOpt, 
+                                           ConnectionStates0, Renegotiation);
 	false ->
 	    ?ALERT_REC(?FATAL, ?PROTOCOL_VERSION)
     end;
-
 hello(#client_hello{client_version = ClientVersion} = Hello,
       #ssl_options{versions = Versions} = SslOpts,
       Info, Renegotiation) ->
@@ -107,7 +122,7 @@ cookie(Key, Address, Port, #client_hello{client_version = {Major, Minor},
 		  <<?BYTE(Major), ?BYTE(Minor)>>,
 		  Random, SessionId, CipherSuites, CompressionMethods],
     crypto:hmac(sha, Key, CookieData).
-
+%%--------------------------------------------------------------------
 -spec hello_verify_request(binary(),  dtls_record:dtls_version()) -> #hello_verify_request{}.
 %%
 %% Description: Creates a hello verify request message sent by server to
@@ -117,11 +132,8 @@ hello_verify_request(Cookie, Version) ->
     #hello_verify_request{protocol_version = Version, cookie = Cookie}.
 
 %%--------------------------------------------------------------------
-
-encode_handshake(Handshake, Version, Seq) ->
-    {MsgType, Bin} = enc_handshake(Handshake, Version),
-    Len = byte_size(Bin),
-    [MsgType, ?uint24(Len), ?uint16(Seq), ?uint24(0), ?uint24(Len), Bin].
+%%% Handshake encoding
+%%--------------------------------------------------------------------
 
 fragment_handshake(Bin, _) when is_binary(Bin)-> 
     %% This is the change_cipher_spec not a "real handshake" but part of the flight
@@ -129,10 +141,15 @@ fragment_handshake(Bin, _) when is_binary(Bin)->
 fragment_handshake([MsgType, Len, Seq, _, Len, Bin], Size) ->
     Bins = bin_fragments(Bin, Size),
     handshake_fragments(MsgType, Seq, Len, Bins, []).
+encode_handshake(Handshake, Version, Seq) ->
+    {MsgType, Bin} = enc_handshake(Handshake, Version),
+    Len = byte_size(Bin),
+    [MsgType, ?uint24(Len), ?uint16(Seq), ?uint24(0), ?uint24(Len), Bin].
+  
+%%--------------------------------------------------------------------
+%%% Handshake decodeing
+%%--------------------------------------------------------------------
 
-handshake_bin([Type, Length, Data], Seq) ->	
-    handshake_bin(Type, Length, Seq, Data).
-    
 %%--------------------------------------------------------------------
 -spec get_dtls_handshake(dtls_record:dtls_version(), binary(), #protocol_buffers{}) ->
                                 {[dtls_handshake()], #protocol_buffers{}}.                
@@ -147,16 +164,19 @@ get_dtls_handshake(Version, Fragment, ProtocolBuffers) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-handle_client_hello(Version, #client_hello{session_id = SugesstedId,
-					   cipher_suites = CipherSuites,
-					   compression_methods = Compressions,
-					   random = Random,
-					   extensions =
-					       #hello_extensions{elliptic_curves = Curves,
-								 signature_algs = ClientHashSigns} = HelloExt},
+handle_client_hello(Version, 
+                    #client_hello{session_id = SugesstedId,
+                                  cipher_suites = CipherSuites,
+                                  compression_methods = Compressions,
+                                  random = Random,
+                                  extensions =
+                                      #hello_extensions{elliptic_curves = Curves,
+                                                        signature_algs = ClientHashSigns} 
+                                  = HelloExt},
 		    #ssl_options{versions = Versions,
 				 signature_algs = SupportedHashSigns} = SslOpts,
-		    {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert, _}, Renegotiation) ->
+		    {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert, _}, 
+                    Renegotiation) ->
     case dtls_record:is_acceptable_version(Version, Versions) of
 	true ->
 	    TLSVersion = dtls_v1:corresponding_tls_version(Version),
@@ -164,14 +184,15 @@ handle_client_hello(Version, #client_hello{session_id = SugesstedId,
 				   ClientHashSigns, SupportedHashSigns, Cert,TLSVersion),
 	    ECCCurve = ssl_handshake:select_curve(Curves, ssl_handshake:supported_ecc(TLSVersion)),
 	    {Type, #session{cipher_suite = CipherSuite} = Session1}
-		= ssl_handshake:select_session(SugesstedId, CipherSuites, AvailableHashSigns, Compressions,
+		= ssl_handshake:select_session(SugesstedId, CipherSuites, 
+                                               AvailableHashSigns, Compressions,
 					       Port, Session0#session{ecc = ECCCurve}, TLSVersion,
 					       SslOpts, Cache, CacheCb, Cert),
 	    case CipherSuite of
 		no_suite ->
 		    ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY);
 		_ ->
-		    {KeyExAlg,_,_,_} = ssl_cipher:suite_definition(CipherSuite),
+		    #{key_exchange := KeyExAlg} = ssl_cipher:suite_definition(CipherSuite),
 		    case ssl_handshake:select_hashsign(ClientHashSigns, Cert, KeyExAlg, 
 						       SupportedHashSigns, TLSVersion) of
 			#alert{} = Alert ->
@@ -190,7 +211,8 @@ handle_client_hello_extensions(Version, Type, Random, CipherSuites,
 			HelloExt, SslOpts, Session0, ConnectionStates0, Renegotiation, HashSign) ->
     try ssl_handshake:handle_client_hello_extensions(dtls_record, Random, CipherSuites,
 						     HelloExt, dtls_v1:corresponding_tls_version(Version),
-						     SslOpts, Session0, ConnectionStates0, Renegotiation) of
+						     SslOpts, Session0, 
+                                                     ConnectionStates0, Renegotiation) of
 	#alert{} = Alert ->
 	    Alert;
 	{Session, ConnectionStates, Protocol, ServerHelloExt} ->
@@ -212,7 +234,7 @@ handle_server_hello_extensions(Version, SessionId, Random, CipherSuite,
     end.
 
 
-%%%%%%%  Encodeing   %%%%%%%%%%%%%
+%%--------------------------------------------------------------------
 
 enc_handshake(#hello_verify_request{protocol_version = {Major, Minor},
  				       cookie = Cookie}, _Version) ->
@@ -220,7 +242,6 @@ enc_handshake(#hello_verify_request{protocol_version = {Major, Minor},
     {?HELLO_VERIFY_REQUEST, <<?BYTE(Major), ?BYTE(Minor),
  			      ?BYTE(CookieLength),
  			      Cookie:CookieLength/binary>>};
-
 enc_handshake(#hello_request{}, _Version) ->
     {?HELLO_REQUEST, <<>>};
 enc_handshake(#client_hello{client_version = {Major, Minor},
@@ -243,19 +264,29 @@ enc_handshake(#client_hello{client_version = {Major, Minor},
 		      ?BYTE(CookieLength), Cookie/binary,
 		      ?UINT16(CsLength), BinCipherSuites/binary,
  		      ?BYTE(CmLength), BinCompMethods/binary, ExtensionsBin/binary>>};
-
 enc_handshake(#server_hello{} = HandshakeMsg, Version) ->
     {Type, <<?BYTE(Major), ?BYTE(Minor), Rest/binary>>} = 
 	ssl_handshake:encode_handshake(HandshakeMsg, Version),
     {DTLSMajor, DTLSMinor} = dtls_v1:corresponding_dtls_version({Major, Minor}),
     {Type,  <<?BYTE(DTLSMajor), ?BYTE(DTLSMinor), Rest/binary>>};
-
 enc_handshake(HandshakeMsg, Version) ->
     ssl_handshake:encode_handshake(HandshakeMsg, dtls_v1:corresponding_tls_version(Version)).
 
+handshake_bin(#handshake_fragment{
+		 type = Type,
+		 length = Len, 
+		 message_seq = Seq,
+		 fragment_length = Len,
+		 fragment_offset = 0,
+		 fragment = Fragment}) ->	    
+    handshake_bin(Type, Len, Seq, Fragment).
+handshake_bin(Type, Length, Seq, FragmentData) -> 
+    <<?BYTE(Type), ?UINT24(Length),
+      ?UINT16(Seq), ?UINT24(0), ?UINT24(Length),
+      FragmentData:Length/binary>>.  
+  
 bin_fragments(Bin, Size) ->
      bin_fragments(Bin, size(Bin), Size, 0, []).
-
 bin_fragments(Bin, BinSize,  FragSize, Offset, Fragments) ->
     case (BinSize - Offset - FragSize)  > 0 of
 	true ->
@@ -279,7 +310,7 @@ address_to_bin({A,B,C,D}, Port) ->
 address_to_bin({A,B,C,D,E,F,G,H}, Port) ->
     <<A:16,B:16,C:16,D:16,E:16,F:16,G:16,H:16,Port:16>>.
 
-%%%%%%%  Decodeing   %%%%%%%%%%%%%
+%%--------------------------------------------------------------------
 
 handle_fragments(Version, FragmentData, Buffers0, Acc) ->
     Fragments = decode_handshake_fragments(FragmentData),
@@ -322,7 +353,6 @@ decode_handshake(_Version, ?CLIENT_HELLO, <<?UINT24(_), ?UINT16(_),
        compression_methods = Comp_methods,
        extensions = DecodedExtensions
       };
-
 decode_handshake(_Version, ?HELLO_VERIFY_REQUEST, <<?UINT24(_), ?UINT16(_),
 						    ?UINT24(_),  ?UINT24(_),
 						    ?BYTE(Major), ?BYTE(Minor),
@@ -330,7 +360,6 @@ decode_handshake(_Version, ?HELLO_VERIFY_REQUEST, <<?UINT24(_), ?UINT16(_),
 						    Cookie:CookieLength/binary>>) ->
     #hello_verify_request{protocol_version = {Major, Minor},
 			  cookie = Cookie};
-
 decode_handshake(Version, Tag,  <<?UINT24(_), ?UINT16(_),
 				  ?UINT24(_),  ?UINT24(_), Msg/binary>>) -> 
     %% DTLS specifics stripped
@@ -370,9 +399,10 @@ reassemble(Version,  #handshake_fragment{message_seq = Seq} = Fragment,
     end;
 reassemble(_,  #handshake_fragment{message_seq = FragSeq} = Fragment, 
 	   #protocol_buffers{dtls_handshake_next_seq = Seq,
-			     dtls_handshake_later_fragments = LaterFragments} = Buffers0) when FragSeq > Seq-> 
-     {more_data,
-      Buffers0#protocol_buffers{dtls_handshake_later_fragments = [Fragment | LaterFragments]}};
+			     dtls_handshake_later_fragments = LaterFragments} 
+           = Buffers0) when FragSeq > Seq-> 
+    {more_data,
+     Buffers0#protocol_buffers{dtls_handshake_later_fragments = [Fragment | LaterFragments]}};
 reassemble(_, _, Buffers) -> 
     %% Disregard fragments FragSeq < Seq
     {more_data, Buffers}.
@@ -396,26 +426,6 @@ merge_fragment(Frag0, [Frag1 | Rest]) ->
 	Frag ->
 	    merge_fragment(Frag, Rest)
     end.
-
-is_complete_handshake(#handshake_fragment{length = Length, fragment_length = Length}) ->
-    true;
-is_complete_handshake(_) ->
-    false.
-
-next_fragments(LaterFragments) ->
-    case lists:keysort(#handshake_fragment.message_seq, LaterFragments) of
-	[] ->
-	    {[], []}; 
-	[#handshake_fragment{message_seq = Seq} | _] = Fragments ->
-	    split_frags(Fragments, Seq, [])
-    end.
-
-split_frags([#handshake_fragment{message_seq = Seq} = Frag | Rest], Seq, Acc) ->
-    split_frags(Rest, Seq, [Frag | Acc]);
-split_frags(Frags, _, Acc) ->
-    {lists:reverse(Acc), Frags}.
-
-
 %% Duplicate
 merge_fragments(#handshake_fragment{
 		   fragment_offset = PreviousOffSet, 
@@ -486,17 +496,26 @@ merge_fragments(#handshake_fragment{
 %% No merge there is a gap
 merge_fragments(Previous, Current) ->
     [Previous, Current].
-	    
-handshake_bin(#handshake_fragment{
-		 type = Type,
-		 length = Len, 
-		 message_seq = Seq,
-		 fragment_length = Len,
-		 fragment_offset = 0,
-		 fragment = Fragment}) ->	    
-    handshake_bin(Type, Len, Seq, Fragment).
 
-handshake_bin(Type, Length, Seq, FragmentData) -> 
-    <<?BYTE(Type), ?UINT24(Length),
-      ?UINT16(Seq), ?UINT24(0), ?UINT24(Length),
-      FragmentData:Length/binary>>.  
+next_fragments(LaterFragments) ->
+    case lists:keysort(#handshake_fragment.message_seq, LaterFragments) of
+	[] ->
+	    {[], []}; 
+	[#handshake_fragment{message_seq = Seq} | _] = Fragments ->
+	    split_frags(Fragments, Seq, [])
+    end.
+
+split_frags([#handshake_fragment{message_seq = Seq} = Frag | Rest], Seq, Acc) ->
+    split_frags(Rest, Seq, [Frag | Acc]);
+split_frags(Frags, _, Acc) ->
+    {lists:reverse(Acc), Frags}.
+
+is_complete_handshake(#handshake_fragment{length = Length, fragment_length = Length}) ->
+    true;
+is_complete_handshake(_) ->
+    false.
+
+
+
+
+	    
diff --git a/lib/ssl/src/dtls_record.erl b/lib/ssl/src/dtls_record.erl
index a8520717e5..316de05532 100644
--- a/lib/ssl/src/dtls_record.erl
+++ b/lib/ssl/src/dtls_record.erl
@@ -30,15 +30,17 @@
 -include("ssl_cipher.hrl").
 
 %% Handling of incoming data
--export([get_dtls_records/2,  init_connection_states/2, empty_connection_state/1]).
+-export([get_dtls_records/3,  init_connection_states/2, empty_connection_state/1]).
 
-%% Decoding
--export([decode_cipher_text/2]).
+-export([save_current_connection_state/2, next_epoch/2, get_connection_state_by_epoch/3, replay_detect/2,
+         init_connection_state_seq/2, current_connection_state_epoch/2]).
 
 %% Encoding
 -export([encode_handshake/4, encode_alert_record/3,
-	 encode_change_cipher_spec/3, encode_data/3]).
--export([encode_plain_text/5]).
+	 encode_change_cipher_spec/3, encode_data/3, encode_plain_text/5]).
+
+%% Decoding
+-export([decode_cipher_text/2]).
 
 %% Protocol version handling
 -export([protocol_version/1, lowest_protocol_version/1, lowest_protocol_version/2,
@@ -46,9 +48,6 @@
 	 is_higher/2, supported_protocol_versions/0,
 	 is_acceptable_version/2, hello_version/2]).
 
--export([save_current_connection_state/2, next_epoch/2, get_connection_state_by_epoch/3, replay_detect/2]).
-
--export([init_connection_state_seq/2, current_connection_state_epoch/2]).
 
 -export_type([dtls_version/0, dtls_atom_version/0]).
 
@@ -60,7 +59,7 @@
 -compile(inline).
 
 %%====================================================================
-%% Internal application API
+%%  Handling of incoming data
 %%====================================================================
 %%--------------------------------------------------------------------
 -spec init_connection_states(client | server, one_n_minus_one | zero_n | disabled) ->
@@ -86,7 +85,6 @@ init_connection_states(Role, BeastMitigation) ->
 empty_connection_state(Empty) ->    
     Empty#{epoch => undefined, replay_window => init_replay_window(?REPLAY_WINDOW_SIZE)}.
 
-
 %%--------------------------------------------------------------------
 -spec save_current_connection_state(ssl_record:connection_states(), read | write) ->
 				      ssl_record:connection_states().
@@ -137,67 +135,58 @@ set_connection_state_by_epoch(ReadState, Epoch, #{saved_read := #{epoch := Epoch
     States#{saved_read := ReadState}.
 
 %%--------------------------------------------------------------------
--spec get_dtls_records(binary(), binary()) -> {[binary()], binary()} | #alert{}.
+-spec init_connection_state_seq(dtls_version(), ssl_record:connection_states()) ->
+				       ssl_record:connection_state().
+%%
+%% Description: Copy the read sequence number to the write sequence number
+%% This is only valid for DTLS in the first client_hello
+%%--------------------------------------------------------------------
+init_connection_state_seq({254, _},
+			  #{current_read := #{epoch := 0, sequence_number := Seq},
+			    current_write := #{epoch := 0} = Write} = ConnnectionStates0) ->
+    ConnnectionStates0#{current_write => Write#{sequence_number => Seq}};
+init_connection_state_seq(_, ConnnectionStates) ->
+    ConnnectionStates.
+
+%%--------------------------------------------------------
+-spec current_connection_state_epoch(ssl_record:connection_states(), read | write) ->
+					    integer().
+%%
+%% Description: Returns the epoch the connection_state record
+%% that is currently defined as the current connection state.
+%%--------------------------------------------------------------------
+current_connection_state_epoch(#{current_read := #{epoch := Epoch}},
+			       read) ->
+    Epoch;
+current_connection_state_epoch(#{current_write := #{epoch := Epoch}},
+			       write) ->
+    Epoch.
+
+%%--------------------------------------------------------------------
+-spec get_dtls_records(binary(), [dtls_version()], binary()) -> {[binary()], binary()} | #alert{}.
 %%
 %% Description: Given old buffer and new data from UDP/SCTP, packs up a records
 %% and returns it as a list of tls_compressed binaries also returns leftover
 %% data
 %%--------------------------------------------------------------------
-get_dtls_records(Data, <<>>) ->
-    get_dtls_records_aux(Data, []);
-get_dtls_records(Data, Buffer) ->
-    get_dtls_records_aux(list_to_binary([Buffer, Data]), []).
-
-get_dtls_records_aux(<<?BYTE(?APPLICATION_DATA),?BYTE(MajVer),?BYTE(MinVer),
-		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
-		       ?UINT16(Length), Data:Length/binary, Rest/binary>>,
-		     Acc) ->
-    get_dtls_records_aux(Rest, [#ssl_tls{type = ?APPLICATION_DATA,
-					 version = {MajVer, MinVer},
-					 epoch = Epoch, sequence_number = SequenceNumber,
-					 fragment = Data} | Acc]);
-get_dtls_records_aux(<<?BYTE(?HANDSHAKE),?BYTE(MajVer),?BYTE(MinVer),
-		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
-		       ?UINT16(Length),
-		       Data:Length/binary, Rest/binary>>, Acc) when MajVer >= 128 ->
-    get_dtls_records_aux(Rest, [#ssl_tls{type = ?HANDSHAKE,
-					 version = {MajVer, MinVer},
-					 epoch = Epoch, sequence_number = SequenceNumber,
-					 fragment = Data} | Acc]);
-get_dtls_records_aux(<<?BYTE(?ALERT),?BYTE(MajVer),?BYTE(MinVer),
-		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
-		       ?UINT16(Length), Data:Length/binary,
-		       Rest/binary>>, Acc) ->
-    get_dtls_records_aux(Rest, [#ssl_tls{type = ?ALERT,
-					 version = {MajVer, MinVer},
-					 epoch = Epoch, sequence_number = SequenceNumber,
-					 fragment = Data} | Acc]);
-get_dtls_records_aux(<<?BYTE(?CHANGE_CIPHER_SPEC),?BYTE(MajVer),?BYTE(MinVer),
-		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
-		       ?UINT16(Length), Data:Length/binary, Rest/binary>>,
-		     Acc) ->
-    get_dtls_records_aux(Rest, [#ssl_tls{type = ?CHANGE_CIPHER_SPEC,
-					 version = {MajVer, MinVer},
-					 epoch = Epoch, sequence_number = SequenceNumber,
-					 fragment = Data} | Acc]);
-
-get_dtls_records_aux(<<0:1, _CT:7, ?BYTE(_MajVer), ?BYTE(_MinVer),
-		       ?UINT16(Length), _/binary>>,
-		     _Acc) when Length > ?MAX_CIPHER_TEXT_LENGTH ->
-    ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
-
-get_dtls_records_aux(<<1:1, Length0:15, _/binary>>,_Acc)
-  when Length0 > ?MAX_CIPHER_TEXT_LENGTH ->
-    ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
-
-get_dtls_records_aux(Data, Acc) ->
-    case size(Data) =< ?MAX_CIPHER_TEXT_LENGTH + ?INITIAL_BYTES of
-	true ->
-	    {lists:reverse(Acc), Data};
-	false ->
-	    ?ALERT_REC(?FATAL, ?UNEXPECTED_MESSAGE)
+get_dtls_records(Data, Versions, Buffer) ->
+    BinData = list_to_binary([Buffer, Data]),
+    case erlang:byte_size(BinData) of
+        N when N >= 3 ->
+            case assert_version(BinData, Versions) of
+                true ->
+                    get_dtls_records_aux(BinData, []);
+                false ->
+                    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+            end;
+        _ ->
+            get_dtls_records_aux(BinData, [])
     end.
 
+%%====================================================================
+%% Encoding DTLS records
+%%====================================================================
+
 %%--------------------------------------------------------------------
 -spec encode_handshake(iolist(), dtls_version(), integer(), ssl_record:connection_states()) ->
 			      {iolist(), ssl_record:connection_states()}.
@@ -245,11 +234,19 @@ encode_plain_text(Type, Version, Epoch, Data, ConnectionStates) ->
     {CipherText, Write} = encode_dtls_cipher_text(Type, Version, CipherFragment, Write1),
     {CipherText, set_connection_state_by_epoch(Write, Epoch, ConnectionStates, write)}.
 
+%%====================================================================
+%% Decoding 
+%%====================================================================
 
 decode_cipher_text(#ssl_tls{epoch = Epoch} = CipherText, ConnnectionStates0) ->
     ReadState = get_connection_state_by_epoch(Epoch, ConnnectionStates0, read),
     decode_cipher_text(CipherText, ReadState, ConnnectionStates0).
 
+
+%%====================================================================
+%% Protocol version handling
+%%====================================================================
+
 %%--------------------------------------------------------------------
 -spec protocol_version(dtls_atom_version() | dtls_version()) ->
 			      dtls_version() | dtls_atom_version().
@@ -381,35 +378,6 @@ supported_protocol_versions([_|_] = Vsns) ->
 is_acceptable_version(Version, Versions) ->
     lists:member(Version, Versions).
 
-
-%%--------------------------------------------------------------------
--spec init_connection_state_seq(dtls_version(), ssl_record:connection_states()) ->
-				       ssl_record:connection_state().
-%%
-%% Description: Copy the read sequence number to the write sequence number
-%% This is only valid for DTLS in the first client_hello
-%%--------------------------------------------------------------------
-init_connection_state_seq({254, _},
-			  #{current_read := #{epoch := 0, sequence_number := Seq},
-			    current_write := #{epoch := 0} = Write} = ConnnectionStates0) ->
-    ConnnectionStates0#{current_write => Write#{sequence_number => Seq}};
-init_connection_state_seq(_, ConnnectionStates) ->
-    ConnnectionStates.
-
-%%--------------------------------------------------------
--spec current_connection_state_epoch(ssl_record:connection_states(), read | write) ->
-					    integer().
-%%
-%% Description: Returns the epoch the connection_state record
-%% that is currently defined as the current connection state.
-%%--------------------------------------------------------------------
-current_connection_state_epoch(#{current_read := #{epoch := Epoch}},
-			       read) ->
-    Epoch;
-current_connection_state_epoch(#{current_write := #{epoch := Epoch}},
-			       write) ->
-    Epoch.
-
 -spec hello_version(dtls_version(), [dtls_version()]) -> dtls_version().
 hello_version(Version, Versions) ->
     case dtls_v1:corresponding_tls_version(Version) of
@@ -437,16 +405,92 @@ initial_connection_state(ConnectionEnd, BeastMitigation) ->
       client_verify_data => undefined,
       server_verify_data => undefined
      }.
+assert_version(<<?BYTE(_), ?BYTE(MajVer), ?BYTE(MinVer), _/binary>>, Versions) ->
+    is_acceptable_version({MajVer, MinVer}, Versions).
 
-lowest_list_protocol_version(Ver, []) ->
-    Ver;
-lowest_list_protocol_version(Ver1,  [Ver2 | Rest]) ->
-    lowest_list_protocol_version(lowest_protocol_version(Ver1, Ver2), Rest).
+get_dtls_records_aux(<<?BYTE(?APPLICATION_DATA),?BYTE(MajVer),?BYTE(MinVer),
+		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
+		       ?UINT16(Length), Data:Length/binary, Rest/binary>>,
+		     Acc) ->
+    get_dtls_records_aux(Rest, [#ssl_tls{type = ?APPLICATION_DATA,
+					 version = {MajVer, MinVer},
+					 epoch = Epoch, sequence_number = SequenceNumber,
+					 fragment = Data} | Acc]);
+get_dtls_records_aux(<<?BYTE(?HANDSHAKE),?BYTE(MajVer),?BYTE(MinVer),
+		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
+		       ?UINT16(Length),
+		       Data:Length/binary, Rest/binary>>, Acc) when MajVer >= 128 ->
+    get_dtls_records_aux(Rest, [#ssl_tls{type = ?HANDSHAKE,
+					 version = {MajVer, MinVer},
+					 epoch = Epoch, sequence_number = SequenceNumber,
+					 fragment = Data} | Acc]);
+get_dtls_records_aux(<<?BYTE(?ALERT),?BYTE(MajVer),?BYTE(MinVer),
+		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
+		       ?UINT16(Length), Data:Length/binary,
+		       Rest/binary>>, Acc) ->
+    get_dtls_records_aux(Rest, [#ssl_tls{type = ?ALERT,
+					 version = {MajVer, MinVer},
+					 epoch = Epoch, sequence_number = SequenceNumber,
+					 fragment = Data} | Acc]);
+get_dtls_records_aux(<<?BYTE(?CHANGE_CIPHER_SPEC),?BYTE(MajVer),?BYTE(MinVer),
+		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
+		       ?UINT16(Length), Data:Length/binary, Rest/binary>>,
+		     Acc) ->
+    get_dtls_records_aux(Rest, [#ssl_tls{type = ?CHANGE_CIPHER_SPEC,
+					 version = {MajVer, MinVer},
+					 epoch = Epoch, sequence_number = SequenceNumber,
+					 fragment = Data} | Acc]);
 
-highest_list_protocol_version(Ver, []) ->
-    Ver;
-highest_list_protocol_version(Ver1,  [Ver2 | Rest]) ->
-    highest_list_protocol_version(highest_protocol_version(Ver1, Ver2), Rest).
+get_dtls_records_aux(<<?BYTE(_), ?BYTE(_MajVer), ?BYTE(_MinVer),
+		       ?UINT16(Length), _/binary>>,
+		     _Acc) when Length > ?MAX_CIPHER_TEXT_LENGTH ->
+    ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
+
+get_dtls_records_aux(Data, Acc) ->
+    case size(Data) =< ?MAX_CIPHER_TEXT_LENGTH + ?INITIAL_BYTES of
+	true ->
+	    {lists:reverse(Acc), Data};
+	false ->
+	    ?ALERT_REC(?FATAL, ?UNEXPECTED_MESSAGE)
+    end.
+%%--------------------------------------------------------------------
+
+init_replay_window(Size) ->
+    #{size => Size,
+      top => Size,
+      bottom => 0,
+      mask => 0 bsl 64
+     }.
+
+replay_detect(#ssl_tls{sequence_number = SequenceNumber}, #{replay_window := Window}) ->
+    is_replay(SequenceNumber, Window).
+
+
+is_replay(SequenceNumber, #{bottom := Bottom}) when SequenceNumber < Bottom ->
+    true;
+is_replay(SequenceNumber, #{size := Size,
+                            top := Top,
+                            bottom := Bottom,
+                            mask :=  Mask})  when (SequenceNumber >= Bottom) andalso (SequenceNumber =< Top) ->
+    Index = (SequenceNumber rem Size),
+    (Index band Mask) == 1;
+
+is_replay(_, _) ->
+    false.
+
+update_replay_window(SequenceNumber,  #{replay_window := #{size := Size,
+                                                           top := Top,
+                                                           bottom := Bottom,
+                                                           mask :=  Mask0} = Window0} = ConnectionStates) ->
+    NoNewBits = SequenceNumber - Top,
+    Index = SequenceNumber rem Size,
+    Mask = (Mask0 bsl NoNewBits) bor Index,
+    Window =  Window0#{top => SequenceNumber,
+                       bottom => Bottom + NoNewBits,
+                       mask => Mask},
+    ConnectionStates#{replay_window := Window}.
+
+%%--------------------------------------------------------------------
 
 encode_dtls_cipher_text(Type, {MajVer, MinVer}, Fragment, 
 		       #{epoch := Epoch, sequence_number := Seq} = WriteState) ->
@@ -490,6 +534,7 @@ encode_plain_text(Type, Version, Fragment, #{compression_state := CompS0,
 	ssl_cipher:cipher(BulkCipherAlgo, CipherS0, MAC, Fragment, TLSVersion),
     {CipherFragment,  WriteState0#{cipher_state => CipherS1}}.
 
+%%--------------------------------------------------------------------
 decode_cipher_text(#ssl_tls{type = Type, version = Version,
 			    epoch = Epoch,
 			    sequence_number = Seq,
@@ -541,6 +586,7 @@ decode_cipher_text(#ssl_tls{type = Type, version = Version,
 	false ->
 	    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
     end.
+%%--------------------------------------------------------------------
 
 calc_mac_hash(Type, Version, #{mac_secret := MacSecret,
 			       security_parameters := #security_parameters{mac_algorithm = MacAlg}},
@@ -549,16 +595,6 @@ calc_mac_hash(Type, Version, #{mac_secret := MacSecret,
     mac_hash(Version, MacAlg, MacSecret, Epoch, SeqNo, Type,
 	     Length, Fragment).
 
-highest_protocol_version() ->
-    highest_protocol_version(supported_protocol_versions()).
-
-lowest_protocol_version() ->
-    lowest_protocol_version(supported_protocol_versions()).
-
-sufficient_dtlsv1_2_crypto_support() ->
-    CryptoSupport = crypto:supports(),
-    proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport)).
-
 mac_hash({Major, Minor}, MacAlg, MacSecret, Epoch, SeqNo, Type, Length, Fragment) ->
     Value = [<<?UINT16(Epoch), ?UINT48(SeqNo), ?BYTE(Type),
        ?BYTE(Major), ?BYTE(Minor), ?UINT16(Length)>>,
@@ -568,37 +604,25 @@ mac_hash({Major, Minor}, MacAlg, MacSecret, Epoch, SeqNo, Type, Length, Fragment
 calc_aad(Type, {MajVer, MinVer}, Epoch, SeqNo) ->
     <<?UINT16(Epoch), ?UINT48(SeqNo), ?BYTE(Type), ?BYTE(MajVer), ?BYTE(MinVer)>>.
 
-init_replay_window(Size) ->
-    #{size => Size,
-      top => Size,
-      bottom => 0,
-      mask => 0 bsl 64
-     }.
+%%--------------------------------------------------------------------
 
-replay_detect(#ssl_tls{sequence_number = SequenceNumber}, #{replay_window := Window}) ->
-    is_replay(SequenceNumber, Window).
+lowest_list_protocol_version(Ver, []) ->
+    Ver;
+lowest_list_protocol_version(Ver1,  [Ver2 | Rest]) ->
+    lowest_list_protocol_version(lowest_protocol_version(Ver1, Ver2), Rest).
 
+highest_list_protocol_version(Ver, []) ->
+    Ver;
+highest_list_protocol_version(Ver1,  [Ver2 | Rest]) ->
+    highest_list_protocol_version(highest_protocol_version(Ver1, Ver2), Rest).
 
-is_replay(SequenceNumber, #{bottom := Bottom}) when SequenceNumber < Bottom ->
-    true;
-is_replay(SequenceNumber, #{size := Size,
-                            top := Top,
-                            bottom := Bottom,
-                            mask :=  Mask})  when (SequenceNumber >= Bottom) andalso (SequenceNumber =< Top) ->
-    Index = (SequenceNumber rem Size),
-    (Index band Mask) == 1;
+highest_protocol_version() ->
+    highest_protocol_version(supported_protocol_versions()).
 
-is_replay(_, _) ->
-    false.
+lowest_protocol_version() ->
+    lowest_protocol_version(supported_protocol_versions()).
+
+sufficient_dtlsv1_2_crypto_support() ->
+    CryptoSupport = crypto:supports(),
+    proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport)).
 
-update_replay_window(SequenceNumber,  #{replay_window := #{size := Size,
-                                                           top := Top,
-                                                           bottom := Bottom,
-                                                           mask :=  Mask0} = Window0} = ConnectionStates) ->
-    NoNewBits = SequenceNumber - Top,
-    Index = SequenceNumber rem Size,
-    Mask = (Mask0 bsl NoNewBits) bor Index,
-    Window =  Window0#{top => SequenceNumber,
-                       bottom => Bottom + NoNewBits,
-                       mask => Mask},
-    ConnectionStates#{replay_window := Window}.
diff --git a/lib/ssl/src/dtls_udp_listener.erl b/lib/ssl/src/dtls_udp_listener.erl
index c9e04767aa..0608c6bd2b 100644
--- a/lib/ssl/src/dtls_udp_listener.erl
+++ b/lib/ssl/src/dtls_udp_listener.erl
@@ -84,7 +84,7 @@ init([Port, EmOpts, InetOptions, DTLSOptions]) ->
 		    listener = Socket,
                     close = false}}
     catch _:_ ->
-	    {error, closed}
+	    {stop, {shutdown, {error, closed}}}
     end.
 handle_call({accept, _}, _, #state{close = true} = State) ->
     {reply, {error, closed}, State};
@@ -153,15 +153,18 @@ handle_info({udp_error, Socket, Error}, #state{listener = Socket} = State) ->
 
 handle_info({'DOWN', _, process, Pid, _}, #state{clients = Clients,
 						 dtls_processes = Processes0,
+                                                 dtls_msq_queues = MsgQueues0,
                                                  close = ListenClosed} = State) ->
     Client = kv_get(Pid, Processes0),
     Processes = kv_delete(Pid, Processes0),
+    MsgQueues = kv_delete(Client, MsgQueues0),
     case ListenClosed andalso kv_empty(Processes) of
         true ->
             {stop, normal, State};
         false ->
             {noreply, State#state{clients = set_delete(Client, Clients),
-                                  dtls_processes = Processes}}
+                                  dtls_processes = Processes,
+                                  dtls_msq_queues = MsgQueues}}
     end.
 
 terminate(_Reason, _State) ->
diff --git a/lib/ssl/src/dtls_v1.erl b/lib/ssl/src/dtls_v1.erl
index 51ee8ec047..0f6344b6f7 100644
--- a/lib/ssl/src/dtls_v1.erl
+++ b/lib/ssl/src/dtls_v1.erl
@@ -21,7 +21,7 @@
 
 -include("ssl_cipher.hrl").
 
--export([suites/1, all_suites/1, hmac_hash/3, ecc_curves/1, 
+-export([suites/1, all_suites/1, anonymous_suites/1,hmac_hash/3, ecc_curves/1, 
          corresponding_tls_version/1, corresponding_dtls_version/1,
          cookie_secret/0, cookie_timeout/0]).
 
@@ -40,6 +40,12 @@ all_suites(Version) ->
                  end,
                  ssl_cipher:all_suites(corresponding_tls_version(Version))).
 
+anonymous_suites(Version) ->
+    lists:filter(fun(Cipher) -> 
+                         is_acceptable_cipher(ssl_cipher:suite_definition(Cipher)) 
+                 end, 
+                 ssl_cipher:anonymous_suites(corresponding_tls_version(Version))).
+                 
 hmac_hash(MacAlg, MacSecret, Value) ->
     tls_v1:hmac_hash(MacAlg, MacSecret, Value).
 
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl
index 96782dcfc0..8e605bec65 100644
--- a/lib/ssl/src/inet_tls_dist.erl
+++ b/lib/ssl/src/inet_tls_dist.erl
@@ -324,12 +324,13 @@ do_accept(Driver, Kernel, AcceptPid, DistCtrl, MyNode, Allowed, SetupTime) ->
                           timer = Timer,
                           this_flags = 0,
                           allowed = Allowed},
+                    link(DistCtrl),
 		    dist_util:handshake_other_started(trace(HSData));
 		{false,IP} ->
 		    error_logger:error_msg(
                       "** Connection attempt from "
                       "disallowed IP ~w ** ~n", [IP]),
-		    ?shutdown(trace(no_node))
+		    ?shutdown2(no_node, trace({disallowed, IP}))
 	    end
     end.
 
@@ -357,7 +358,11 @@ do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
 	    ErlEpmd = net_kernel:epmd_module(),
 	    case ErlEpmd:port_please(Name, Ip) of
 		{port, TcpPort, Version} ->
-                    Opts = trace(connect_options(get_ssl_options(client))),
+                    Opts =
+                        trace(
+                          connect_options(
+                            [{server_name_indication, atom_to_list(Node)}
+                             |get_ssl_options(client)])),
 		    dist_util:reset_timer(Timer),
                     case ssl:connect(
                            Address, TcpPort,
@@ -378,21 +383,26 @@ do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
                                   this_flags = 0,
                                   other_version = Version,
                                   request_type = Type},
+                            link(DistCtrl),
 			    dist_util:handshake_we_started(trace(HSData));
 			Other ->
 			    %% Other Node may have closed since 
 			    %% port_please !
 			    ?shutdown2(
                                Node,
-                               trace({shutdown, {connect_failed, Other}}))
+                               trace(
+                                 {ssl_connect_failed, Ip, TcpPort, Other}))
 		    end;
 		Other ->
 		    ?shutdown2(
                        Node,
-                       trace({shutdown, {port_please_failed, Other}}))
+                       trace(
+                         {port_please_failed, ErlEpmd, Name, Ip, Other}))
 	    end;
 	Other ->
-	    ?shutdown2(Node, trace({shutdown, {getaddr_failed, Other}}))
+	    ?shutdown2(
+               Node,
+               trace({getaddr_failed, Driver, Address, Other}))
     end.
 
 close(Socket) ->
@@ -411,8 +421,9 @@ check_ip(Driver, SslSocket) ->
 	    case get_ifs(SslSocket) of
 		{ok, IFs, IP} ->
 		    check_ip(Driver, IFs, IP);
-		_ ->
-		    ?shutdown(no_node)
+		Other ->
+		    ?shutdown2(
+                       no_node, trace({check_ip_failed, SslSocket, Other}))
 	    end;
 	_ ->
 	    true
@@ -441,23 +452,22 @@ get_ifs(#sslsocket{fd = {gen_tcp, Socket, _}}) ->
 
 %% If Node is illegal terminate the connection setup!!
 splitnode(Driver, Node, LongOrShortNames) ->
-    case split_node(atom_to_list(Node), $@, []) of
-	[Name|Tail] when Tail =/= [] ->
-	    Host = lists:append(Tail),
+    case string:split(atom_to_list(Node), "@") of
+	[Name, Host] when Host =/= [] ->
 	    check_node(Driver, Name, Node, Host, LongOrShortNames);
 	[_] ->
 	    error_logger:error_msg(
               "** Nodename ~p illegal, no '@' character **~n",
               [Node]),
-	    ?shutdown(Node);
+	    ?shutdown2(Node, trace({illegal_node_n@me, Node}));
 	_ ->
 	    error_logger:error_msg(
               "** Nodename ~p illegal **~n", [Node]),
-	    ?shutdown(Node)
+	    ?shutdown2(Node, trace({illegal_node_name, Node}))
     end.
 
 check_node(Driver, Name, Node, Host, LongOrShortNames) ->
-    case split_node(Host, $., []) of
+    case string:split(Host, ".") of
 	[_] when LongOrShortNames == longnames ->
 	    case Driver:parse_address(Host) of
 		{ok, _} ->
@@ -468,35 +478,28 @@ check_node(Driver, Name, Node, Host, LongOrShortNames) ->
                       "fully qualified hostnames **~n"
                       "** Hostname ~s is illegal **~n",
                       [Host]),
-		    ?shutdown(Node)
+		    ?shutdown2(Node, trace({not_longnames, Host}))
 	    end;
-	[_, _ | _] when LongOrShortNames == shortnames ->
+	[_, _] when LongOrShortNames == shortnames ->
 	    error_logger:error_msg(
               "** System NOT running to use "
               "fully qualified hostnames **~n"
               "** Hostname ~s is illegal **~n",
               [Host]),
-	    ?shutdown(Node);
+	    ?shutdown2(Node, trace({not_shortnames, Host}));
 	_ ->
 	    [Name, Host]
     end.
 
 split_node(Node) when is_atom(Node) ->
-    case split_node(atom_to_list(Node), $@, []) of
-        [_, Host] ->
+    case string:split(atom_to_list(Node), "@") of
+        [Name, Host] when Name =/= [], Host =/= [] ->
             Host;
         _ ->
             false
     end;
 split_node(_) ->
     false.
-%%
-split_node([Chr|T], Chr, Ack) -> 
-    [lists:reverse(Ack)|split_node(T, Chr, [])];
-split_node([H|T], Chr, Ack) -> 
-    split_node(T, Chr, [H|Ack]);
-split_node([], _, Ack) -> 
-    [lists:reverse(Ack)].
 
 %% -------------------------------------------------------------------------
 
@@ -524,6 +527,17 @@ nodelay() ->
 
 
 get_ssl_options(Type) ->
+    try ets:lookup(ssl_dist_opts, Type) of
+        [{Type, Opts}] ->
+            [{erl_dist, true} | Opts];
+        _ ->
+            get_ssl_dist_arguments(Type)
+    catch
+        error:badarg ->
+            get_ssl_dist_arguments(Type)
+    end.
+
+get_ssl_dist_arguments(Type) ->
     case init:get_argument(ssl_dist_opt) of
 	{ok, Args} ->
 	    [{erl_dist, true} | ssl_options(Type, lists:append(Args))];
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index c5b55641a1..3962d1fc2c 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -62,5 +62,5 @@
     {applications, [crypto, public_key, kernel, stdlib]},
     {env, []},
     {mod, {ssl_app, []}},
-    {runtime_dependencies, ["stdlib-3.2","public_key-1.5","kernel-6.0",
-			    "erts-10.0","crypto-3.3", "inets-5.10.7"]}]}.
+    {runtime_dependencies, ["stdlib-3.5","public_key-1.5","kernel-6.0",
+			    "erts-10.0","crypto-4.2", "inets-5.10.7"]}]}.
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 60118549e4..82f62b51b9 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -39,7 +39,9 @@
 	]).
 %% SSL/TLS protocol handling
 
--export([cipher_suites/0, cipher_suites/1, eccs/0, eccs/1, versions/0, 
+-export([cipher_suites/0, cipher_suites/1, cipher_suites/2, filter_cipher_suites/2,
+         prepend_cipher_suites/2, append_cipher_suites/2,
+         eccs/0, eccs/1, versions/0, 
          format_error/1, renegotiate/1, prf/5, negotiated_protocol/1, 
 	 connection_information/1, connection_information/2]).
 %% Misc
@@ -374,25 +376,98 @@ negotiated_protocol(#sslsocket{pid = Pid}) ->
     ssl_connection:negotiated_protocol(Pid).
 
 %%--------------------------------------------------------------------
--spec cipher_suites() -> [ssl_cipher:erl_cipher_suite()] | [string()].
+-spec cipher_suites() -> [ssl_cipher:old_erl_cipher_suite()] | [string()].
 %%--------------------------------------------------------------------
 cipher_suites() ->
     cipher_suites(erlang).
 %%--------------------------------------------------------------------
--spec cipher_suites(erlang | openssl | all) -> [ssl_cipher:erl_cipher_suite()] |
-					       [string()].
+-spec cipher_suites(erlang | openssl | all) -> 
+                           [ssl_cipher:old_erl_cipher_suite() | string()].
 %% Description: Returns all supported cipher suites.
 %%--------------------------------------------------------------------
 cipher_suites(erlang) ->
     [ssl_cipher:erl_suite_definition(Suite) || Suite <- available_suites(default)];
 
 cipher_suites(openssl) ->
-    [ssl_cipher:openssl_suite_name(Suite) || Suite <- available_suites(default)];
+    [ssl_cipher:openssl_suite_name(Suite) ||
+        Suite <- available_suites(default)];
 
 cipher_suites(all) ->
     [ssl_cipher:erl_suite_definition(Suite) || Suite <- available_suites(all)].
 
 %%--------------------------------------------------------------------
+-spec cipher_suites(default | all | anonymous, tls_record:tls_version() | dtls_record:dtls_version() |
+                    tls_record:tls_atom_version() |  dtls_record:dtls_atom_version()) -> 
+                           [ssl_cipher:erl_cipher_suite()].
+%% Description: Returns all default and all supported cipher suites for a
+%% TLS/DTLS version
+%%--------------------------------------------------------------------
+cipher_suites(Base, Version) when Version == 'tlsv1.2';
+                                  Version == 'tlsv1.1';
+                                  Version == tlsv1;
+                                  Version == sslv3 ->
+    cipher_suites(Base, tls_record:protocol_version(Version));
+cipher_suites(Base, Version)  when Version == 'dtlsv1.2';
+                                   Version == 'dtlsv1'->
+    cipher_suites(Base, dtls_record:protocol_version(Version));                   
+cipher_suites(Base, Version) ->
+    [ssl_cipher:suite_definition(Suite) || Suite <- supported_suites(Base, Version)].
+
+%%--------------------------------------------------------------------
+-spec filter_cipher_suites([ssl_cipher:erl_cipher_suite()], 
+                           [{key_exchange | cipher | mac | prf, fun()}] | []) -> 
+                                  [ssl_cipher:erl_cipher_suite()].
+%% Description: Removes cipher suites if any of the filter functions returns false
+%% for any part of the cipher suite. This function also calls default filter functions
+%% to make sure the cipher suite are supported by crypto.
+%%--------------------------------------------------------------------
+filter_cipher_suites(Suites, Filters0) ->
+    #{key_exchange_filters := KexF,
+      cipher_filters := CipherF,
+      mac_filters := MacF,
+      prf_filters := PrfF}
+        = ssl_cipher:crypto_support_filters(),
+    Filters = #{key_exchange_filters => add_filter(proplists:get_value(key_exchange, Filters0), KexF),
+                cipher_filters => add_filter(proplists:get_value(cipher, Filters0), CipherF),
+                mac_filters => add_filter(proplists:get_value(mac, Filters0), MacF),
+                prf_filters => add_filter(proplists:get_value(prf, Filters0), PrfF)},
+    ssl_cipher:filter_suites(Suites, Filters).
+%%--------------------------------------------------------------------
+-spec prepend_cipher_suites([ssl_cipher:erl_cipher_suite()] | 
+                            [{key_exchange | cipher | mac | prf, fun()}],
+                            [ssl_cipher:erl_cipher_suite()]) -> 
+                                   [ssl_cipher:erl_cipher_suite()].
+%% Description: Make <Preferred> suites become the most prefered
+%%      suites that is put them at the head of the cipher suite list
+%%      and remove them from <Suites> if present. <Preferred> may be a
+%%      list of cipher suits or a list of filters in which case the
+%%      filters are use on Suites to extract the the preferred
+%%      cipher list.
+%% --------------------------------------------------------------------
+prepend_cipher_suites([First | _] = Preferred, Suites0) when is_map(First) ->
+    Suites = Preferred ++ (Suites0 -- Preferred),
+    Suites;
+prepend_cipher_suites(Filters, Suites) ->
+    Preferred = filter_cipher_suites(Suites, Filters), 
+    Preferred ++ (Suites -- Preferred).
+%%--------------------------------------------------------------------
+-spec append_cipher_suites(Deferred :: [ssl_cipher:erl_cipher_suite()] | 
+                                       [{key_exchange | cipher | mac | prf, fun()}],
+                           [ssl_cipher:erl_cipher_suite()]) -> 
+                                  [ssl_cipher:erl_cipher_suite()].
+%% Description: Make <Deferred> suites suites become the 
+%% least prefered suites that is put them at the end of the cipher suite list
+%% and removed them from <Suites> if present.
+%%
+%%--------------------------------------------------------------------
+append_cipher_suites([First | _] = Deferred, Suites0) when is_map(First)->
+    Suites = (Suites0 -- Deferred) ++ Deferred,
+    Suites;
+append_cipher_suites(Filters, Suites) ->
+    Deferred = filter_cipher_suites(Suites, Filters), 
+    (Suites -- Deferred) ++  Deferred.
+
+%%--------------------------------------------------------------------
 -spec eccs() -> tls_v1:curves().
 %% Description: returns all supported curves across all versions
 %%--------------------------------------------------------------------
@@ -411,6 +486,11 @@ eccs({3,0}) ->
 eccs({3,_}) ->
     Curves = tls_v1:ecc_curves(all),
     eccs_filter_supported(Curves);
+eccs({_,_} = DTLSVersion) ->
+    eccs(dtls_v1:corresponding_tls_version(DTLSVersion));
+eccs(DTLSAtomVersion) when DTLSAtomVersion == 'dtlsv1';
+                           DTLSAtomVersion == 'dtlsv2' ->
+    eccs(dtls_record:protocol_version(DTLSAtomVersion));
 eccs(AtomVersion) when is_atom(AtomVersion) ->
     eccs(tls_record:protocol_version(AtomVersion)).
 
@@ -543,16 +623,23 @@ sockname(#sslsocket{pid = Pid, fd = {Transport, Socket, _, _}}) when is_pid(Pid)
 
 %%---------------------------------------------------------------
 -spec versions() -> [{ssl_app, string()} | {supported, [tls_record:tls_atom_version()]} |
-		     {available, [tls_record:tls_atom_version()]}].
+                     {supported_dtls, [dtls_record:dtls_atom_version()]} |
+		     {available, [tls_record:tls_atom_version()]} |
+                     {available_dtls, [dtls_record:dtls_atom_version()]}].
 %%
 %% Description: Returns a list of relevant versions.
 %%--------------------------------------------------------------------
 versions() ->
-    Vsns = tls_record:supported_protocol_versions(),
-    SupportedVsns = [tls_record:protocol_version(Vsn) || Vsn <- Vsns],
-    AvailableVsns = ?ALL_AVAILABLE_VERSIONS,
-    %% TODO Add DTLS versions when supported
-    [{ssl_app, ?VSN}, {supported, SupportedVsns}, {available, AvailableVsns}].
+    TLSVsns = tls_record:supported_protocol_versions(),
+    DTLSVsns = dtls_record:supported_protocol_versions(),
+    SupportedTLSVsns = [tls_record:protocol_version(Vsn) || Vsn <- TLSVsns],
+    SupportedDTLSVsns = [dtls_record:protocol_version(Vsn) || Vsn <- DTLSVsns],
+    AvailableTLSVsns = ?ALL_AVAILABLE_VERSIONS,
+    AvailableDTLSVsns = ?ALL_AVAILABLE_DATAGRAM_VERSIONS,
+    [{ssl_app, ?VSN}, {supported, SupportedTLSVsns}, 
+     {supported_dtls, SupportedDTLSVsns}, 
+     {available, AvailableTLSVsns}, 
+     {available_dtls, AvailableDTLSVsns}].
 
 
 %%---------------------------------------------------------------
@@ -632,16 +719,21 @@ tls_version({254, _} = Version) ->
 %%%--------------------------------------------------------------
 %%% Internal functions
 %%%--------------------------------------------------------------------
-
 %% Possible filters out suites not supported by crypto 
 available_suites(default) ->  
     Version = tls_record:highest_protocol_version([]),			  
     ssl_cipher:filter_suites(ssl_cipher:suites(Version));
-
 available_suites(all) ->  
     Version = tls_record:highest_protocol_version([]),			  
     ssl_cipher:filter_suites(ssl_cipher:all_suites(Version)).
 
+supported_suites(default, Version) ->  
+    ssl_cipher:suites(Version);
+supported_suites(all, Version) ->  
+    ssl_cipher:all_suites(Version);
+supported_suites(anonymous, Version) -> 
+    ssl_cipher:anonymous_suites(Version).
+
 do_listen(Port, #config{transport_info = {Transport, _, _, _}} = Config, tls_connection) ->
     tls_socket:listen(Transport, Port, Config);
 
@@ -751,7 +843,7 @@ handle_options(Opts0, Role, Host) ->
 		    %% Server side option
 		    reuse_session = handle_option(reuse_session, Opts, ReuseSessionFun),
 		    reuse_sessions = handle_option(reuse_sessions, Opts, true),
-		    secure_renegotiate = handle_option(secure_renegotiate, Opts, false),
+		    secure_renegotiate = handle_option(secure_renegotiate, Opts, true),
 		    client_renegotiation = handle_option(client_renegotiation, Opts, 
 							 default_option_role(server, true, Role), 
 							 server, Role),
@@ -896,7 +988,8 @@ validate_option(key, {KeyType, Value}) when is_binary(Value),
 					    KeyType == 'ECPrivateKey';
 					    KeyType == 'PrivateKeyInfo' ->
     {KeyType, Value};
-
+validate_option(key, #{algorithm := _} = Value) ->
+    Value;
 validate_option(keyfile, undefined) ->
    <<>>;
 validate_option(keyfile, Value) when is_binary(Value) ->
@@ -991,17 +1084,21 @@ validate_option(next_protocols_advertised, Value) when is_list(Value) ->
     Value;
 validate_option(next_protocols_advertised, undefined) ->
     undefined;
-validate_option(server_name_indication = Opt, Value) when is_list(Value) ->
+validate_option(server_name_indication, Value) when is_list(Value) ->
     %% RFC 6066, Section 3: Currently, the only server names supported are
     %% DNS hostnames
-     case inet_parse:domain(Value) of
-        false -> 
-           throw({error, {options, {{Opt, Value}}}});
-        true -> 
-            Value
-     end;
-validate_option(server_name_indication, undefined = Value) ->
+    %% case inet_parse:domain(Value) of
+    %%     false ->
+    %%         throw({error, {options, {{Opt, Value}}}});
+    %%     true ->
+    %%         Value
+    %% end;
+    %%
+    %% But the definition seems very diffuse, so let all strings through
+    %% and leave it up to public_key to decide...
     Value;
+validate_option(server_name_indication, undefined) ->
+    undefined;
 validate_option(server_name_indication, disable) ->
     disable;
 
@@ -1146,18 +1243,21 @@ handle_cipher_option(Value, Version)  when is_list(Value) ->
 binary_cipher_suites(Version, []) -> 
     %% Defaults to all supported suites that does
     %% not require explicit configuration
-    ssl_cipher:filter_suites(ssl_cipher:suites(tls_version(Version)));
-binary_cipher_suites(Version, [Tuple|_] = Ciphers0) when is_tuple(Tuple) ->
+    default_binary_suites(Version);
+binary_cipher_suites(Version, [Map|_] = Ciphers0) when is_map(Map) ->
     Ciphers = [ssl_cipher:suite(C) || C <- Ciphers0],
     binary_cipher_suites(Version, Ciphers);
-
+binary_cipher_suites(Version, [Tuple|_] = Ciphers0) when is_tuple(Tuple) ->
+    Ciphers = [ssl_cipher:suite(tuple_to_map(C)) || C <- Ciphers0],
+    binary_cipher_suites(Version, Ciphers);
 binary_cipher_suites(Version, [Cipher0 | _] = Ciphers0) when is_binary(Cipher0) ->
-    All = ssl_cipher:all_suites(tls_version(Version)),
+    All = ssl_cipher:all_suites(Version) ++ 
+        ssl_cipher:anonymous_suites(Version),
     case [Cipher || Cipher <- Ciphers0, lists:member(Cipher, All)] of
 	[] ->
 	    %% Defaults to all supported suites that does
 	    %% not require explicit configuration
-	    ssl_cipher:filter_suites(ssl_cipher:suites(tls_version(Version)));
+	    default_binary_suites(Version);
 	Ciphers ->
 	    Ciphers
     end;
@@ -1170,6 +1270,30 @@ binary_cipher_suites(Version, Ciphers0)  ->
     Ciphers = [ssl_cipher:openssl_suite(C) || C <- string:lexemes(Ciphers0, ":")],
     binary_cipher_suites(Version, Ciphers).
 
+default_binary_suites(Version) ->
+    ssl_cipher:filter_suites(ssl_cipher:suites(Version)).
+
+tuple_to_map({Kex, Cipher, Mac}) ->
+    #{key_exchange => Kex,
+      cipher => Cipher,
+      mac => Mac,
+      prf => default_prf};
+tuple_to_map({Kex, Cipher, Mac, Prf}) ->
+    #{key_exchange => Kex,
+      cipher => Cipher,
+      mac => tuple_to_map_mac(Cipher, Mac),
+      prf => Prf}.
+
+%% Backwards compatible
+tuple_to_map_mac(aes_128_gcm, _) -> 
+    aead;
+tuple_to_map_mac(aes_256_gcm, _) -> 
+    aead;
+tuple_to_map_mac(chacha20_poly1305, _) ->
+    aead;
+tuple_to_map_mac(_, MAC) ->
+    MAC.
+
 handle_eccs_option(Value, Version) when is_list(Value) ->
     {_Major, Minor} = tls_version(Version),
     try tls_v1:ecc_curves(Minor, Value) of
@@ -1448,3 +1572,8 @@ reject_alpn_next_prot_options([Opt| AlpnNextOpts], Opts) ->
         false ->
             reject_alpn_next_prot_options(AlpnNextOpts, Opts)
     end.
+
+add_filter(undefined, Filters) ->
+    Filters;
+add_filter(Filter, Filters) ->
+    [Filter | Filters].
diff --git a/lib/ssl/src/ssl_alert.erl b/lib/ssl/src/ssl_alert.erl
index 95ab955ad0..fc7b1e6d1c 100644
--- a/lib/ssl/src/ssl_alert.erl
+++ b/lib/ssl/src/ssl_alert.erl
@@ -48,7 +48,9 @@ decode(Bin) ->
     decode(Bin, [], 0).
 
 %%--------------------------------------------------------------------
--spec reason_code(#alert{}, client | server) -> closed | {essl, string()}.
+-spec reason_code(#alert{}, client | server) ->
+                         closed | {tls_alert, unicode:chardata()}.
+%-spec reason_code(#alert{}, client | server) -> closed | {essl, string()}.
 %%
 %% Description: Returns the error reason that will be returned to the
 %% user.
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index b6cd22dd13..6e436aa7c0 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -36,28 +36,31 @@
 -export([security_parameters/2, security_parameters/3, suite_definition/1,
 	 erl_suite_definition/1,
 	 cipher_init/3, decipher/6, cipher/5, decipher_aead/6, cipher_aead/6,
-	 suite/1, suites/1, all_suites/1, 
-	 ec_keyed_suites/0, anonymous_suites/1, psk_suites/1, srp_suites/0,
-	 rc4_suites/1, des_suites/1, openssl_suite/1, openssl_suite_name/1, filter/2, filter_suites/1,
+	 suite/1, suites/1, all_suites/1,  crypto_support_filters/0,
+	 ec_keyed_suites/0, chacha_suites/1, anonymous_suites/1, psk_suites/1, psk_suites_anon/1, 
+         srp_suites/0, srp_suites_anon/0,
+	 rc4_suites/1, des_suites/1, rsa_suites/1, openssl_suite/1, openssl_suite_name/1, 
+         filter/2, filter_suites/1, filter_suites/2,
 	 hash_algorithm/1, sign_algorithm/1, is_acceptable_hash/2, is_fallback/1,
 	 random_bytes/1, calc_mac_hash/4,
          is_stream_ciphersuite/1]).
 
 -export_type([cipher_suite/0,
-	      erl_cipher_suite/0, openssl_cipher_suite/0,
+	      erl_cipher_suite/0, old_erl_cipher_suite/0, openssl_cipher_suite/0,
 	      hash/0, key_algo/0, sign_algo/0]).
 
--type cipher()            :: null |rc4_128 | des_cbc | '3des_ede_cbc' 
-			   | aes_128_cbc |  aes_256_cbc | aes_128_gcm | aes_256_gcm | chacha20_poly1305.
+-type cipher()            :: null |rc4_128 | des_cbc | '3des_ede_cbc' | aes_128_cbc |  aes_256_cbc | aes_128_gcm | aes_256_gcm | chacha20_poly1305.
 -type hash()              :: null | md5 | sha | sha224 | sha256 | sha384 | sha512.
 -type sign_algo()         :: rsa | dsa | ecdsa.
--type key_algo()          :: null | rsa | dhe_rsa | dhe_dss | ecdhe_ecdsa| ecdh_ecdsa | ecdh_rsa| srp_rsa| srp_dss | 
-			     psk | dhe_psk | rsa_psk | dh_anon | ecdh_anon | srp_anon.
--type erl_cipher_suite()  :: {key_algo(), cipher(), hash()} % Pre TLS 1.2 
-			     %% TLS 1.2, internally PRE TLS 1.2 will use default_prf
-			   | {key_algo(), cipher(), hash(), hash() | default_prf}. 
-
- 
+-type key_algo()          :: null | rsa | dhe_rsa | dhe_dss | ecdhe_ecdsa| ecdh_ecdsa | ecdh_rsa| srp_rsa| srp_dss | psk | dhe_psk | rsa_psk | dh_anon | ecdh_anon | srp_anon.
+-type erl_cipher_suite()  :: #{key_exchange := key_algo(),
+                               cipher := cipher(),
+                               mac    := hash() | aead,
+                               prf    := hash() | default_prf %% Old cipher suites, version dependent
+                              }.  
+-type old_erl_cipher_suite() :: {key_algo(), cipher(), hash()} % Pre TLS 1.2 
+                                %% TLS 1.2, internally PRE TLS 1.2 will use default_prf
+                              | {key_algo(), cipher(), hash(), hash() | default_prf}. 
 -type cipher_suite()      :: binary().
 -type cipher_enum()        :: integer().
 -type openssl_cipher_suite()  :: string().
@@ -83,7 +86,8 @@ security_parameters(?TLS_NULL_WITH_NULL_NULL = CipherSuite, SecParams) ->
 %% cipher values has been updated according to <CipherSuite> 
 %%-------------------------------------------------------------------
 security_parameters(Version, CipherSuite, SecParams) ->
-    { _, Cipher, Hash, PrfHashAlg} = suite_definition(CipherSuite),
+    #{cipher := Cipher, mac := Hash, 
+      prf := PrfHashAlg} = suite_definition(CipherSuite),
     SecParams#security_parameters{
       cipher_suite = CipherSuite,
       bulk_cipher_algorithm = bulk_cipher_algorithm(Cipher),
@@ -92,7 +96,7 @@ security_parameters(Version, CipherSuite, SecParams) ->
       expanded_key_material_length = expanded_key_material(Cipher),
       key_material_length = key_material(Cipher),
       iv_size = iv_size(Cipher),
-      mac_algorithm = hash_algorithm(Hash),
+      mac_algorithm = mac_algorithm(Hash),
       prf_algorithm = prf_algorithm(PrfHashAlg, Version),
       hash_size = hash_size(Hash)}.
 
@@ -235,7 +239,7 @@ decipher(?AES_CBC, HashSz, CipherState, Fragment, Version, PaddingCheck) ->
 
 %%--------------------------------------------------------------------
 -spec decipher_aead(cipher_enum(),  #cipher_state{}, integer(), binary(), binary(), ssl_record:ssl_version()) ->
-			   {binary(), binary(), #cipher_state{}} | #alert{}.
+			   {binary(), #cipher_state{}} | #alert{}.
 %%
 %% Description: Decrypts the data and checks the associated data (AAD) MAC using
 %% cipher described by cipher_enum() and updating the cipher state.
@@ -318,13 +322,28 @@ suites({_, Minor}) ->
 
 all_suites({3, _} = Version) ->
     suites(Version)
-	++ anonymous_suites(Version)
+        ++ chacha_suites(Version)
 	++ psk_suites(Version)
 	++ srp_suites()
         ++ rc4_suites(Version)
-        ++ des_suites(Version);
+        ++ des_suites(Version)
+        ++ rsa_suites(Version);
+
 all_suites(Version) ->
     dtls_v1:all_suites(Version).
+%%--------------------------------------------------------------------
+-spec chacha_suites(ssl_record:ssl_version() | integer()) -> [cipher_suite()].
+%%
+%% Description: Returns list of the chacha cipher suites, only supported
+%% if explicitly set by user for now due to interop problems, proably need
+%% to be fixed in crypto.
+%%--------------------------------------------------------------------
+chacha_suites({3, _}) ->
+    [?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+     ?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
+     ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256];
+chacha_suites(_) ->
+    [].
 
 %%--------------------------------------------------------------------
 -spec anonymous_suites(ssl_record:ssl_version() | integer()) -> [cipher_suite()].
@@ -332,14 +351,13 @@ all_suites(Version) ->
 %% Description: Returns a list of the anonymous cipher suites, only supported
 %% if explicitly set by user. Intended only for testing.
 %%--------------------------------------------------------------------
-
 anonymous_suites({3, N}) ->
-    anonymous_suites(N);
+    srp_suites_anon() ++ anonymous_suites(N);
 anonymous_suites({254, _} = Version) ->
-    anonymous_suites(dtls_v1:corresponding_tls_version(Version))
-        -- [?TLS_DH_anon_WITH_RC4_128_MD5];
+    dtls_v1:anonymous_suites(Version);
 anonymous_suites(N)
   when N >= 3 ->
+    psk_suites_anon(N) ++
     [?TLS_DH_anon_WITH_AES_128_GCM_SHA256,
      ?TLS_DH_anon_WITH_AES_256_GCM_SHA384,
      ?TLS_DH_anon_WITH_AES_128_CBC_SHA256,
@@ -348,20 +366,20 @@ anonymous_suites(N)
      ?TLS_ECDH_anon_WITH_AES_256_CBC_SHA,
      ?TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA,
      ?TLS_DH_anon_WITH_RC4_128_MD5];
-
-anonymous_suites(2) ->
+anonymous_suites(2 = N) ->
+    psk_suites_anon(N) ++
     [?TLS_ECDH_anon_WITH_AES_128_CBC_SHA,
      ?TLS_ECDH_anon_WITH_AES_256_CBC_SHA,
      ?TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA,
      ?TLS_DH_anon_WITH_DES_CBC_SHA,
      ?TLS_DH_anon_WITH_RC4_128_MD5];
-
 anonymous_suites(N)  when N == 0;
 			  N == 1 ->
-    [?TLS_DH_anon_WITH_RC4_128_MD5,
-     ?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_DH_anon_WITH_DES_CBC_SHA
-    ].
+    psk_suites_anon(N) ++
+        [?TLS_DH_anon_WITH_RC4_128_MD5,
+         ?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA,
+         ?TLS_DH_anon_WITH_DES_CBC_SHA
+        ].
 
 %%--------------------------------------------------------------------
 -spec psk_suites(ssl_record:ssl_version() | integer()) -> [cipher_suite()].
@@ -371,46 +389,55 @@ anonymous_suites(N)  when N == 0;
 %%--------------------------------------------------------------------
 psk_suites({3, N}) ->
     psk_suites(N);
-
 psk_suites(N)
   when N >= 3 ->
     [
-     ?TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384,
-     ?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384,
      ?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384,
+     ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
+     ?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256,
+     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA256
+    ] ++ psk_suites(0);
+psk_suites(_) ->
+    [?TLS_RSA_PSK_WITH_AES_256_CBC_SHA,
+     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA,
+     ?TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_RSA_PSK_WITH_RC4_128_SHA].
+
+%%--------------------------------------------------------------------
+-spec psk_suites_anon(ssl_record:ssl_version() | integer()) -> [cipher_suite()].
+%%
+%% Description: Returns a list of the anonymous PSK cipher suites, only supported
+%% if explicitly set by user.
+%%--------------------------------------------------------------------
+psk_suites_anon({3, N}) ->
+    psk_suites_anon(N);
+psk_suites_anon(N)
+  when N >= 3 ->
+    [
+     ?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384,
      ?TLS_PSK_WITH_AES_256_GCM_SHA384,
      ?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
      ?TLS_DHE_PSK_WITH_AES_256_CBC_SHA384,
-     ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
      ?TLS_PSK_WITH_AES_256_CBC_SHA384,
      ?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256,
      ?TLS_DHE_PSK_WITH_AES_128_GCM_SHA256,
-     ?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256,
      ?TLS_PSK_WITH_AES_128_GCM_SHA256,
      ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
      ?TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
-     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA256,
      ?TLS_PSK_WITH_AES_128_CBC_SHA256
-    ] ++ psk_suites(0);
-
-psk_suites(_) ->
-	[?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA,
-	 ?TLS_DHE_PSK_WITH_AES_256_CBC_SHA,
-	 ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA,
+    ] ++ psk_suites_anon(0);
+psk_suites_anon(_) ->
+	[?TLS_DHE_PSK_WITH_AES_256_CBC_SHA,
 	 ?TLS_PSK_WITH_AES_256_CBC_SHA,
 	 ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA,
 	 ?TLS_DHE_PSK_WITH_AES_128_CBC_SHA,
-	 ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA,
 	 ?TLS_PSK_WITH_AES_128_CBC_SHA,
 	 ?TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA,
 	 ?TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA,
-	 ?TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
 	 ?TLS_PSK_WITH_3DES_EDE_CBC_SHA,
 	 ?TLS_ECDHE_PSK_WITH_RC4_128_SHA,
 	 ?TLS_DHE_PSK_WITH_RC4_128_SHA,
-	 ?TLS_RSA_PSK_WITH_RC4_128_SHA,
 	 ?TLS_PSK_WITH_RC4_128_SHA].
-
 %%--------------------------------------------------------------------
 -spec srp_suites() -> [cipher_suite()].
 %%
@@ -418,17 +445,26 @@ psk_suites(_) ->
 %% if explicitly set by user.
 %%--------------------------------------------------------------------
 srp_suites() ->
-    [?TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
+    [?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
      ?TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_SRP_SHA_WITH_AES_128_CBC_SHA,
      ?TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
      ?TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
-     ?TLS_SRP_SHA_WITH_AES_256_CBC_SHA,
      ?TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
      ?TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA].
+
 %%--------------------------------------------------------------------
--spec rc4_suites(Version::ssl_record:ssl_version()) -> [cipher_suite()].
+-spec srp_suites_anon() -> [cipher_suite()].
+%%
+%% Description: Returns a list of the SRP anonymous cipher suites, only supported
+%% if explicitly set by user.
+%%--------------------------------------------------------------------
+srp_suites_anon() ->
+    [?TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_SRP_SHA_WITH_AES_128_CBC_SHA,
+     ?TLS_SRP_SHA_WITH_AES_256_CBC_SHA].
+
+%%--------------------------------------------------------------------
+-spec rc4_suites(Version::ssl_record:ssl_version() | integer()) -> [cipher_suite()].
 %%
 %% Description: Returns a list of the RSA|(ECDH/RSA)| (ECDH/ECDSA) 
 %% with RC4 cipher suites, only supported if explicitly set by user. 
@@ -436,13 +472,15 @@ srp_suites() ->
 %% belonged to the user configured only category.
 %%--------------------------------------------------------------------
 rc4_suites({3, 0}) ->
+    rc4_suites(0);
+rc4_suites({3, Minor}) ->
+    rc4_suites(Minor) ++ rc4_suites(0);
+rc4_suites(0) ->
     [?TLS_RSA_WITH_RC4_128_SHA,
      ?TLS_RSA_WITH_RC4_128_MD5];
-rc4_suites({3, N}) when N =< 3 ->
+rc4_suites(N) when N =< 3 ->
     [?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
      ?TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-     ?TLS_RSA_WITH_RC4_128_SHA,
-     ?TLS_RSA_WITH_RC4_128_MD5,
      ?TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
      ?TLS_ECDH_RSA_WITH_RC4_128_SHA].
 %%--------------------------------------------------------------------
@@ -454,9 +492,39 @@ rc4_suites({3, N}) when N =< 3 ->
 %%--------------------------------------------------------------------
 des_suites(_)->
     [?TLS_DHE_RSA_WITH_DES_CBC_SHA,
-     ?TLS_RSA_WITH_DES_CBC_SHA].
+     ?TLS_RSA_WITH_DES_CBC_SHA,
+     ?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
+    ].
 
 %%--------------------------------------------------------------------
+-spec rsa_suites(Version::ssl_record:ssl_version() | integer()) -> [cipher_suite()].
+%%
+%% Description: Returns a list of the RSA key exchange 
+%% cipher suites, only supported if explicitly set by user. 
+%% Are not considered secure any more. 
+%%--------------------------------------------------------------------
+rsa_suites({3, 0}) ->
+    rsa_suites(0);
+rsa_suites({3, Minor}) ->
+    rsa_suites(Minor) ++ rsa_suites(0);
+rsa_suites(0) ->
+    [?TLS_RSA_WITH_AES_256_CBC_SHA,
+     ?TLS_RSA_WITH_AES_128_CBC_SHA,
+     ?TLS_RSA_WITH_3DES_EDE_CBC_SHA
+    ];  
+rsa_suites(N) when N =< 3 ->
+    [
+     ?TLS_RSA_WITH_AES_256_GCM_SHA384,
+     ?TLS_RSA_WITH_AES_256_CBC_SHA256,
+     ?TLS_RSA_WITH_AES_128_GCM_SHA256,
+     ?TLS_RSA_WITH_AES_128_CBC_SHA256
+    ].
+%%--------------------------------------------------------------------
 -spec suite_definition(cipher_suite()) -> erl_cipher_suite().
 %%
 %% Description: Return erlang cipher suite definition.
@@ -465,353 +533,740 @@ des_suites(_)->
 %%-------------------------------------------------------------------
 %% TLS v1.1 suites
 suite_definition(?TLS_NULL_WITH_NULL_NULL) ->
-    {null, null, null, null};
+    #{key_exchange => null,
+      cipher => null, 
+      mac => null, 
+      prf => null};
 %% RFC 5746 - Not a real cipher suite used to signal empty "renegotiation_info" extension
 %% to avoid handshake failure from old servers that do not ignore
 %% hello extension data as they should.
 suite_definition(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV) ->
-    {null, null, null, null};
-%% suite_definition(?TLS_RSA_WITH_NULL_MD5) ->
-%%     {rsa, null, md5, default_prf};
-%% suite_definition(?TLS_RSA_WITH_NULL_SHA) ->
-%%     {rsa, null, sha, default_prf};
+    #{key_exchange => null,
+      cipher => null, 
+      mac => null,
+      prf => null};
 suite_definition(?TLS_RSA_WITH_RC4_128_MD5) ->	
-    {rsa, rc4_128, md5, default_prf};
+    #{key_exchange => rsa,
+      cipher => rc4_128, 
+      mac => md5, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_WITH_RC4_128_SHA) ->
-    {rsa, rc4_128, sha, default_prf};
+    #{key_exchange => rsa,
+      cipher => rc4_128,
+      mac => sha,
+      prf => default_prf};
 suite_definition(?TLS_RSA_WITH_DES_CBC_SHA) ->
-    {rsa, des_cbc, sha, default_prf};
+    #{key_exchange => rsa,
+      cipher => des_cbc,
+      mac => sha,
+      prf => default_prf};
 suite_definition(?TLS_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    {rsa, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => rsa,
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_DSS_WITH_DES_CBC_SHA) ->
-    {dhe_dss, des_cbc, sha, default_prf};
+    #{key_exchange => dhe_dss, 
+      cipher => des_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA) ->
-    {dhe_dss, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => dhe_dss, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_RSA_WITH_DES_CBC_SHA) ->
-    {dhe_rsa, des_cbc, sha, default_prf};
+    #{key_exchange => dhe_rsa, 
+      cipher => des_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    {dhe_rsa, '3des_ede_cbc', sha, default_prf};
-
+    #{key_exchange => dhe_rsa, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 %%% TSL V1.1 AES suites
 suite_definition(?TLS_RSA_WITH_AES_128_CBC_SHA) -> 
-    {rsa, aes_128_cbc, sha, default_prf};
+    #{key_exchange => rsa,
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA) ->
-    {dhe_dss, aes_128_cbc, sha, default_prf};
+    #{key_exchange => dhe_dss, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_RSA_WITH_AES_128_CBC_SHA) ->
-    {dhe_rsa, aes_128_cbc, sha, default_prf};
+    #{key_exchange => dhe_rsa, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_WITH_AES_256_CBC_SHA) -> 
-    {rsa, aes_256_cbc, sha, default_prf};
+    #{key_exchange => rsa, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA) ->
-    {dhe_dss, aes_256_cbc, sha, default_prf};
+    #{key_exchange => dhe_dss, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA) ->
-    {dhe_rsa, aes_256_cbc, sha, default_prf};
-
+    #{key_exchange => dhe_rsa, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 %% TLS v1.2 suites
-
 %% suite_definition(?TLS_RSA_WITH_NULL_SHA) ->
 %%     {rsa, null, sha, default_prf};
 suite_definition(?TLS_RSA_WITH_AES_128_CBC_SHA256) ->
-    {rsa, aes_128_cbc, sha256, default_prf};
+    #{key_exchange => rsa, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_WITH_AES_256_CBC_SHA256) ->
-    {rsa, aes_256_cbc, sha256, default_prf};
+    #{key_exchange => rsa, 
+      cipher => aes_256_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256) ->
-    {dhe_dss, aes_128_cbc, sha256, default_prf};
+    #{key_exchange => dhe_dss, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256) ->
-    {dhe_rsa, aes_128_cbc, sha256, default_prf};
+    #{key_exchange => dhe_rsa, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256) ->
-    {dhe_dss, aes_256_cbc, sha256, default_prf};
+    #{key_exchange => dhe_dss, 
+      cipher => aes_256_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256) ->
-    {dhe_rsa, aes_256_cbc, sha256, default_prf};
-
+    #{key_exchange => dhe_rsa, 
+      cipher => aes_256_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 %% not defined YET:
 %%   TLS_DH_DSS_WITH_AES_128_CBC_SHA256      DH_DSS       AES_128_CBC  SHA256
 %%   TLS_DH_RSA_WITH_AES_128_CBC_SHA256      DH_RSA       AES_128_CBC  SHA256
 %%   TLS_DH_DSS_WITH_AES_256_CBC_SHA256      DH_DSS       AES_256_CBC  SHA256
 %%   TLS_DH_RSA_WITH_AES_256_CBC_SHA256      DH_RSA       AES_256_CBC  SHA256
-
 %%% DH-ANON deprecated by TLS spec and not available
 %%% by default, but good for testing purposes.
 suite_definition(?TLS_DH_anon_WITH_RC4_128_MD5) ->
-    {dh_anon, rc4_128, md5, default_prf};
+    #{key_exchange => dh_anon, 
+      cipher => rc4_128, 
+      mac => md5, 
+      prf => default_prf};
 suite_definition(?TLS_DH_anon_WITH_DES_CBC_SHA) ->
-    {dh_anon, des_cbc, sha, default_prf};
+    #{key_exchange => dh_anon, 
+      cipher => des_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA) ->
-    {dh_anon, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => dh_anon, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DH_anon_WITH_AES_128_CBC_SHA) ->
-    {dh_anon, aes_128_cbc, sha, default_prf};
+    #{key_exchange => dh_anon, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DH_anon_WITH_AES_256_CBC_SHA) ->
-    {dh_anon, aes_256_cbc, sha, default_prf};
+    #{key_exchange => dh_anon, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DH_anon_WITH_AES_128_CBC_SHA256) ->
-    {dh_anon, aes_128_cbc, sha256, default_prf};
+    #{key_exchange => dh_anon, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_DH_anon_WITH_AES_256_CBC_SHA256) ->
-    {dh_anon, aes_256_cbc, sha256, default_prf};
-
+    #{key_exchange => dh_anon, 
+      cipher => aes_256_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 %%% PSK Cipher Suites RFC 4279
-
 suite_definition(?TLS_PSK_WITH_RC4_128_SHA) ->
-    {psk, rc4_128, sha, default_prf};
+    #{key_exchange => psk, 
+      cipher => rc4_128, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_PSK_WITH_3DES_EDE_CBC_SHA) ->
-    {psk, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => psk, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_PSK_WITH_AES_128_CBC_SHA) ->
-    {psk, aes_128_cbc, sha, default_prf};
+    #{key_exchange => psk, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_PSK_WITH_AES_256_CBC_SHA) ->
-    {psk, aes_256_cbc, sha, default_prf};
+    #{key_exchange => psk, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_PSK_WITH_RC4_128_SHA) ->
-    {dhe_psk, rc4_128, sha, default_prf};
+    #{key_exchange => dhe_psk, 
+      cipher => rc4_128, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA) ->
-    {dhe_psk, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => dhe_psk, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_PSK_WITH_AES_128_CBC_SHA) ->
-    {dhe_psk, aes_128_cbc, sha, default_prf};
+    #{key_exchange => dhe_psk, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_PSK_WITH_AES_256_CBC_SHA) ->
-    {dhe_psk, aes_256_cbc, sha, default_prf};
+    #{key_exchange => dhe_psk, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_PSK_WITH_RC4_128_SHA) ->
-    {rsa_psk, rc4_128, sha, default_prf};
+    #{key_exchange => rsa_psk, 
+      cipher => rc4_128, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA) ->
-    {rsa_psk, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => rsa_psk, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_PSK_WITH_AES_128_CBC_SHA) ->
-    {rsa_psk, aes_128_cbc, sha, default_prf};
+    #{key_exchange => rsa_psk, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_PSK_WITH_AES_256_CBC_SHA) ->
-    {rsa_psk, aes_256_cbc, sha, default_prf};
-
+    #{key_exchange => rsa_psk, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 %%% PSK NULL Cipher Suites RFC 4785
-
 suite_definition(?TLS_PSK_WITH_NULL_SHA) ->
-    {psk, null, sha, default_prf};
+    #{key_exchange => psk, 
+      cipher => null, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_PSK_WITH_NULL_SHA) ->
-    {dhe_psk, null, sha, default_prf};
+    #{key_exchange => dhe_psk,
+      cipher => null, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_PSK_WITH_NULL_SHA) ->
-    {rsa_psk, null, sha, default_prf};
-
+    #{key_exchange => rsa_psk,
+      cipher => null, 
+      mac => sha, 
+      prf => default_prf};  
 %%% TLS 1.2 PSK Cipher Suites RFC 5487
-
 suite_definition(?TLS_PSK_WITH_AES_128_GCM_SHA256) ->
-    {psk, aes_128_gcm, null, sha256};
+    #{key_exchange => psk, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_PSK_WITH_AES_256_GCM_SHA384) ->
-    {psk, aes_256_gcm, null, sha384};
+    #{key_exchange => psk, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 suite_definition(?TLS_DHE_PSK_WITH_AES_128_GCM_SHA256) ->
-    {dhe_psk, aes_128_gcm, null, sha256};
+    #{key_exchange => dhe_psk, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384) ->
-    {dhe_psk, aes_256_gcm, null, sha384};
+    #{key_exchange => dhe_psk, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 suite_definition(?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256) ->
-    {rsa_psk, aes_128_gcm, null, sha256};
+    #{key_exchange => rsa_psk, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384) ->
-    {rsa_psk, aes_256_gcm, null, sha384};
-
+    #{key_exchange => rsa_psk, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 suite_definition(?TLS_PSK_WITH_AES_128_CBC_SHA256) ->
-    {psk, aes_128_cbc, sha256, default_prf};
+    #{key_exchange => psk, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_PSK_WITH_AES_256_CBC_SHA384) ->
-    {psk, aes_256_cbc, sha384, default_prf};
+    #{key_exchange => psk, 
+      cipher => aes_256_cbc, 
+      mac => sha384, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_PSK_WITH_AES_128_CBC_SHA256) ->
-    {dhe_psk, aes_128_cbc, sha256, default_prf};
+    #{key_exchange => dhe_psk, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_PSK_WITH_AES_256_CBC_SHA384) ->
-    {dhe_psk, aes_256_cbc, sha384, default_prf};
+    #{key_exchange => dhe_psk, 
+      cipher => aes_256_cbc, 
+      mac => sha384, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_PSK_WITH_AES_128_CBC_SHA256) ->
-    {rsa_psk, aes_128_cbc, sha256, default_prf};
+    #{key_exchange => rsa_psk, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384) ->
-    {rsa_psk, aes_256_cbc, sha384, default_prf};
-
+    #{key_exchange => rsa_psk, 
+      cipher => aes_256_cbc, 
+      mac => sha384, 
+      prf => default_prf};
 suite_definition(?TLS_PSK_WITH_NULL_SHA256) ->
-    {psk, null, sha256, default_prf};
+    #{key_exchange => psk, 
+      cipher => null, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_PSK_WITH_NULL_SHA384) ->
-    {psk, null, sha384, default_prf};
+    #{key_exchange => psk, 
+      cipher => null, 
+      mac => sha384, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_PSK_WITH_NULL_SHA256) ->
-    {dhe_psk, null, sha256, default_prf};
+    #{key_exchange => dhe_psk, 
+      cipher => null, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_DHE_PSK_WITH_NULL_SHA384) ->
-    {dhe_psk, null, sha384, default_prf};
+    #{key_exchange => dhe_psk, 
+      cipher => null, 
+      mac => sha384, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_PSK_WITH_NULL_SHA256) ->
-    {rsa_psk, null, sha256, default_prf};
+    #{key_exchange => rsa_psk, 
+      cipher => null, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_RSA_PSK_WITH_NULL_SHA384) ->
-    {rsa_psk, null, sha384, default_prf};
-
+    #{key_exchange => rsa_psk, 
+      cipher => null, 
+      mac => sha384, 
+      prf => default_prf};
 %%% ECDHE PSK Cipher Suites RFC 5489
-
 suite_definition(?TLS_ECDHE_PSK_WITH_RC4_128_SHA) ->
-    {ecdhe_psk, rc4_128, sha, default_prf};
+    #{key_exchange => ecdhe_psk, 
+      cipher => rc4_128, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA) ->
-    {ecdhe_psk, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => ecdhe_psk, 
+      cipher => '3des_ede_cbc',
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA) ->
-    {ecdhe_psk, aes_128_cbc, sha, default_prf};
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA) ->
-    {ecdhe_psk, aes_256_cbc, sha, default_prf};
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256) ->
-    {ecdhe_psk, aes_128_cbc, sha256, default_prf};
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384) ->
-    {ecdhe_psk, aes_256_cbc, sha384, default_prf};
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_256_cbc, 
+      mac => sha384, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_PSK_WITH_NULL_SHA256) ->
-    {ecdhe_psk, null, sha256, default_prf};
+    #{key_exchange => ecdhe_psk, 
+      cipher => null, 
+      mac => sha256, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_PSK_WITH_NULL_SHA384) ->
-    {ecdhe_psk, null, sha384, default_prf};
-
+    #{key_exchange => ecdhe_psk, 
+      cipher => null, mac => sha384, 
+      prf => default_prf};
 %%% ECDHE_PSK with AES-GCM and AES-CCM Cipher Suites, draft-ietf-tls-ecdhe-psk-aead-05
-
 suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256) ->
-    {ecdhe_psk, aes_128_gcm, null, sha256};
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_128_gcm, 
+      mac => null, 
+      prf => sha256};
 suite_definition(?TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384) ->
-    {ecdhe_psk, aes_256_gcm, null, sha384};
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_256_gcm, 
+      mac => null, 
+      prf => sha384};
 %% suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256) ->
-%%    {ecdhe_psk, aes_128_ccm, null, sha256};
+%%     #{key_exchange => ecdhe_psk, 
+%%       cipher => aes_128_ccm, 
+%%       mac => null, 
+%%       prf =>sha256};
 %% suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256) ->
-%%    {ecdhe_psk, aes_256_ccm, null, sha256};
-
+%%     #{key_exchange => ecdhe_psk, 
+%%       cipher => aes_256_ccm, 
+%%       mac => null, 
+%%       prf => sha256};
 %%% SRP Cipher Suites RFC 5054
-
 suite_definition(?TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA) ->
-    {srp_anon, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => srp_anon, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    {srp_rsa, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => srp_rsa, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA) ->
-    {srp_dss, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => srp_dss, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_SRP_SHA_WITH_AES_128_CBC_SHA) ->
-    {srp_anon, aes_128_cbc, sha, default_prf};
+    #{key_exchange => srp_anon, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA) ->
-    {srp_rsa, aes_128_cbc, sha, default_prf};
+    #{key_exchange => srp_rsa, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA) ->
-    {srp_dss, aes_128_cbc, sha, default_prf};
+    #{key_exchange => srp_dss, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_SRP_SHA_WITH_AES_256_CBC_SHA) ->
-    {srp_anon, aes_256_cbc, sha, default_prf};
+    #{key_exchange => srp_anon, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA) ->
-    {srp_rsa, aes_256_cbc, sha, default_prf};
+    #{key_exchange => srp_rsa, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA) ->
-    {srp_dss, aes_256_cbc, sha, default_prf};
-
+    #{key_exchange => srp_dss, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 %% RFC 4492 EC TLS suites
 suite_definition(?TLS_ECDH_ECDSA_WITH_NULL_SHA) ->
-    {ecdh_ecdsa, null, sha, default_prf};
+    #{key_exchange => ecdh_ecdsa, 
+      cipher => null, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_ECDSA_WITH_RC4_128_SHA) ->
-    {ecdh_ecdsa, rc4_128, sha, default_prf};
+    #{key_exchange => ecdh_ecdsa, 
+      cipher => rc4_128, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA) ->
-    {ecdh_ecdsa, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => ecdh_ecdsa, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA) ->
-    {ecdh_ecdsa, aes_128_cbc, sha, default_prf};
+    #{key_exchange => ecdh_ecdsa, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA) ->
-    {ecdh_ecdsa, aes_256_cbc, sha, default_prf};
-
+    #{key_exchange => ecdh_ecdsa, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_ECDSA_WITH_NULL_SHA) ->
-    {ecdhe_ecdsa, null, sha, default_prf};
+    #{key_exchange => ecdhe_ecdsa, 
+      cipher => null, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA) ->
-    {ecdhe_ecdsa, rc4_128, sha, default_prf};
+    #{key_exchange => ecdhe_ecdsa, 
+      cipher => rc4_128, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA) ->
-    {ecdhe_ecdsa, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => ecdhe_ecdsa, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA) ->
-    {ecdhe_ecdsa, aes_128_cbc, sha, default_prf};
+    #{key_exchange => ecdhe_ecdsa, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA) ->
-    {ecdhe_ecdsa, aes_256_cbc, sha, default_prf};
-
+    #{key_exchange => ecdhe_ecdsa, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_RSA_WITH_NULL_SHA) ->
-    {ecdh_rsa, null, sha, default_prf};
+    #{key_exchange => ecdh_rsa, 
+      cipher => null, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_RSA_WITH_RC4_128_SHA) ->
-    {ecdh_rsa, rc4_128, sha, default_prf};
+    #{key_exchange => ecdh_rsa, 
+      cipher => rc4_128, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    {ecdh_rsa, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => ecdh_rsa, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA) ->
-    {ecdh_rsa, aes_128_cbc, sha, default_prf};
+    #{key_exchange => ecdh_rsa, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA) ->
-    {ecdh_rsa, aes_256_cbc, sha, default_prf};
-
+    #{key_exchange => ecdh_rsa, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_RSA_WITH_NULL_SHA) ->
-    {ecdhe_rsa, null, sha, default_prf};
+    #{key_exchange => ecdhe_rsa, 
+      cipher => null, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_RSA_WITH_RC4_128_SHA) ->
-    {ecdhe_rsa, rc4_128, sha, default_prf};
+    #{key_exchange => ecdhe_rsa, 
+      cipher => rc4_128, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    {ecdhe_rsa, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => ecdhe_rsa, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) ->
-    {ecdhe_rsa, aes_128_cbc, sha, default_prf};
+    #{key_exchange => ecdhe_rsa, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) ->
-    {ecdhe_rsa, aes_256_cbc, sha, default_prf};
-
+    #{key_exchange => ecdhe_rsa, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_anon_WITH_NULL_SHA) ->
-    {ecdh_anon, null, sha, default_prf};
+    #{key_exchange => ecdh_anon, 
+      cipher => null, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_anon_WITH_RC4_128_SHA) ->
-    {ecdh_anon, rc4_128, sha, default_prf};
+    #{key_exchange => ecdh_anon, 
+      cipher => rc4_128, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA) ->
-    {ecdh_anon, '3des_ede_cbc', sha, default_prf};
+    #{key_exchange => ecdh_anon, 
+      cipher => '3des_ede_cbc', 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_anon_WITH_AES_128_CBC_SHA) ->
-    {ecdh_anon, aes_128_cbc, sha, default_prf};
+    #{key_exchange => ecdh_anon, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
 suite_definition(?TLS_ECDH_anon_WITH_AES_256_CBC_SHA) ->
-    {ecdh_anon, aes_256_cbc, sha, default_prf};
-
+    #{key_exchange => ecdh_anon, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
 %% RFC 5289 EC TLS suites
 suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256) ->
-    {ecdhe_ecdsa, aes_128_cbc, sha256, sha256};
+    #{key_exchange => ecdhe_ecdsa, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => sha256};
 suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384) ->
-    {ecdhe_ecdsa, aes_256_cbc, sha384, sha384};
+    #{key_exchange => ecdhe_ecdsa, 
+      cipher => aes_256_cbc, 
+      mac => sha384, 
+      prf => sha384};
 suite_definition(?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256) ->
-    {ecdh_ecdsa, aes_128_cbc, sha256, sha256};
+    #{key_exchange => ecdh_ecdsa, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => sha256};
 suite_definition(?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384) ->
-    {ecdh_ecdsa, aes_256_cbc, sha384, sha384};
+    #{key_exchange => ecdh_ecdsa, 
+      cipher => aes_256_cbc, 
+      mac => sha384, 
+      prf => sha384};
 suite_definition(?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) ->
-    {ecdhe_rsa, aes_128_cbc, sha256, sha256};
+    #{key_exchange => ecdhe_rsa, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => sha256};
 suite_definition(?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) ->
-    {ecdhe_rsa, aes_256_cbc, sha384, sha384};
+    #{key_exchange => ecdhe_rsa, 
+      cipher => aes_256_cbc, 
+      mac => sha384, 
+      prf => sha384};
 suite_definition(?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256) ->
-    {ecdh_rsa, aes_128_cbc, sha256, sha256};
+    #{key_exchange => ecdh_rsa, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => sha256};
 suite_definition(?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384) ->
-    {ecdh_rsa, aes_256_cbc, sha384, sha384};
-
+    #{key_exchange => ecdh_rsa, 
+      cipher => aes_256_cbc, 
+      mac => sha384, 
+      prf => sha384};
 %% RFC 5288 AES-GCM Cipher Suites
 suite_definition(?TLS_RSA_WITH_AES_128_GCM_SHA256) ->
-    {rsa, aes_128_gcm, null, sha256};
+    #{key_exchange => rsa, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_RSA_WITH_AES_256_GCM_SHA384) ->
-    {rsa, aes_256_gcm, null, sha384};
+    #{key_exchange => rsa, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 suite_definition(?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256) ->
-    {dhe_rsa, aes_128_gcm, null, sha256};
+    #{key_exchange => dhe_rsa, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384) ->
-    {dhe_rsa, aes_256_gcm, null, sha384};
+    #{key_exchange => dhe_rsa, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 suite_definition(?TLS_DH_RSA_WITH_AES_128_GCM_SHA256) ->
-    {dh_rsa, aes_128_gcm, null, sha256};
+    #{key_exchange => dh_rsa, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_DH_RSA_WITH_AES_256_GCM_SHA384) ->
-    {dh_rsa, aes_256_gcm, null, sha384};
+    #{key_exchange => dh_rsa, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 suite_definition(?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256) ->
-    {dhe_dss, aes_128_gcm, null, sha256};
+    #{key_exchange => dhe_dss, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384) ->
-    {dhe_dss, aes_256_gcm, null, sha384};
+    #{key_exchange => dhe_dss, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 suite_definition(?TLS_DH_DSS_WITH_AES_128_GCM_SHA256) ->
-    {dh_dss, aes_128_gcm, null, sha256};
+    #{key_exchange => dh_dss, 
+      cipher => aes_128_gcm, 
+      mac => null, 
+      prf => sha256};
 suite_definition(?TLS_DH_DSS_WITH_AES_256_GCM_SHA384) ->
-    {dh_dss, aes_256_gcm, null, sha384};
+    #{key_exchange => dh_dss, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 suite_definition(?TLS_DH_anon_WITH_AES_128_GCM_SHA256) ->
-    {dh_anon, aes_128_gcm, null, sha256};
+    #{key_exchange => dh_anon, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_DH_anon_WITH_AES_256_GCM_SHA384) ->
-    {dh_anon, aes_256_gcm, null, sha384};
-
+    #{key_exchange => dh_anon, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 %% RFC 5289 ECC AES-GCM Cipher Suites
 suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256) ->
-    {ecdhe_ecdsa, aes_128_gcm, null, sha256};
+    #{key_exchange => ecdhe_ecdsa, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384) ->
-    {ecdhe_ecdsa, aes_256_gcm, null, sha384};
+    #{key_exchange => ecdhe_ecdsa, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 suite_definition(?TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256) ->
-    {ecdh_ecdsa, aes_128_gcm, null, sha256};
+    #{key_exchange => ecdh_ecdsa, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384) ->
-    {ecdh_ecdsa, aes_256_gcm, null, sha384};
+    #{key_exchange => ecdh_ecdsa, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 suite_definition(?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) ->
-    {ecdhe_rsa, aes_128_gcm, null, sha256};
+    #{key_exchange => ecdhe_rsa, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) ->
-    {ecdhe_rsa, aes_256_gcm, null, sha384};
+    #{key_exchange => ecdhe_rsa, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 suite_definition(?TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256) ->
-    {ecdh_rsa, aes_128_gcm, null, sha256};
+    #{key_exchange => ecdh_rsa, 
+      cipher => aes_128_gcm, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384) ->
-    {ecdh_rsa, aes_256_gcm, null, sha384};
-
+    #{key_exchange => ecdh_rsa, 
+      cipher => aes_256_gcm, 
+      mac => aead, 
+      prf => sha384};
 %% draft-agl-tls-chacha20poly1305-04 Chacha20/Poly1305 Suites
 suite_definition(?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256) ->
-    {ecdhe_rsa, chacha20_poly1305, null, sha256};
+    #{key_exchange => ecdhe_rsa, 
+      cipher => chacha20_poly1305, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256) ->
-    {ecdhe_ecdsa, chacha20_poly1305, null, sha256};
+    #{key_exchange => ecdhe_ecdsa, 
+      cipher => chacha20_poly1305, 
+      mac => aead, 
+      prf => sha256};
 suite_definition(?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256) ->
-    {dhe_rsa, chacha20_poly1305, null, sha256}.
+    #{key_exchange => dhe_rsa, 
+      cipher => chacha20_poly1305, 
+      mac => aead, 
+      prf => sha256}.
 
 %%--------------------------------------------------------------------
--spec erl_suite_definition(cipher_suite()) -> erl_cipher_suite().
+-spec erl_suite_definition(cipher_suite() | erl_cipher_suite()) -> old_erl_cipher_suite().
 %%
 %% Description: Return erlang cipher suite definition. Filters last value
 %% for now (compatibility reasons).
 %%--------------------------------------------------------------------
-erl_suite_definition(S) ->
-    case suite_definition(S) of
-	{KeyExchange, Cipher, Hash, default_prf} ->
+erl_suite_definition(Bin) when is_binary(Bin) ->
+    erl_suite_definition(suite_definition(Bin));    
+erl_suite_definition(#{key_exchange := KeyExchange, cipher := Cipher,
+                       mac := Hash, prf := Prf}) ->
+    case Prf of
+        default_prf ->
 	    {KeyExchange, Cipher, Hash};
-	Suite ->
-	    Suite
+	_ ->
+            {KeyExchange, Cipher, Hash, Prf}
     end.
 
 %%--------------------------------------------------------------------
@@ -819,327 +1274,607 @@ erl_suite_definition(S) ->
 %%
 %% Description: Return TLS cipher suite definition.
 %%--------------------------------------------------------------------
-
 %% TLS v1.1 suites
-%%suite({rsa, null, md5}) ->
-%%    ?TLS_RSA_WITH_NULL_MD5;
-%%suite({rsa, null, sha}) ->
-%%    ?TLS_RSA_WITH_NULL_SHA;
-suite({rsa, rc4_128, md5}) ->
+suite(#{key_exchange := rsa, 
+        cipher := rc4_128, 
+        mac := md5}) ->
     ?TLS_RSA_WITH_RC4_128_MD5;
-suite({rsa, rc4_128, sha}) ->
+suite(#{key_exchange := rsa, 
+        cipher := rc4_128, 
+        mac := sha}) ->
     ?TLS_RSA_WITH_RC4_128_SHA;
-suite({rsa, des_cbc, sha}) ->
+suite(#{key_exchange := rsa, 
+        cipher := des_cbc, 
+        mac := sha}) ->
     ?TLS_RSA_WITH_DES_CBC_SHA; 
-suite({rsa, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := rsa, 
+        cipher :='3des_ede_cbc', 
+        mac := sha}) ->
     ?TLS_RSA_WITH_3DES_EDE_CBC_SHA; 
-suite({dhe_dss, des_cbc, sha}) ->
+suite(#{key_exchange := dhe_dss,  
+        cipher:= des_cbc, 
+        mac := sha}) ->
     ?TLS_DHE_DSS_WITH_DES_CBC_SHA;
-suite({dhe_dss, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := dhe_dss, 
+        cipher:= '3des_ede_cbc', 
+        mac := sha}) ->
     ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA;
-suite({dhe_rsa, des_cbc, sha}) ->
+suite(#{key_exchange := dhe_rsa, 
+        cipher:= des_cbc,
+        mac := sha}) ->
     ?TLS_DHE_RSA_WITH_DES_CBC_SHA;
-suite({dhe_rsa, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := dhe_rsa, 
+        cipher:= '3des_ede_cbc', 
+        mac := sha}) ->
     ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA; 
-suite({dh_anon, rc4_128, md5}) ->
+suite(#{key_exchange := dh_anon, 
+        cipher:= rc4_128,
+        mac := md5}) ->
     ?TLS_DH_anon_WITH_RC4_128_MD5;
-suite({dh_anon, des_cbc, sha}) ->
+suite(#{key_exchange := dh_anon, 
+        cipher:= des_cbc,  
+        mac := sha}) ->
     ?TLS_DH_anon_WITH_DES_CBC_SHA;
-suite({dh_anon, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := dh_anon, 
+        cipher:= '3des_ede_cbc',
+        mac := sha}) ->
     ?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA;
-
 %%% TSL V1.1 AES suites
-suite({rsa, aes_128_cbc, sha}) ->
+suite(#{key_exchange := rsa, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_RSA_WITH_AES_128_CBC_SHA; 
-suite({dhe_dss, aes_128_cbc, sha}) ->
+suite(#{key_exchange := dhe_dss, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA; 
-suite({dhe_rsa, aes_128_cbc, sha}) ->
+suite(#{key_exchange := dhe_rsa, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA;
-suite({dh_anon, aes_128_cbc, sha}) ->
+suite(#{key_exchange := dh_anon, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_DH_anon_WITH_AES_128_CBC_SHA;
-suite({rsa, aes_256_cbc, sha}) ->
+suite(#{key_exchange := rsa, 
+        cipher := aes_256_cbc,  
+        mac := sha}) ->
     ?TLS_RSA_WITH_AES_256_CBC_SHA;
-suite({dhe_dss, aes_256_cbc, sha}) ->
+suite(#{key_exchange := dhe_dss, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA;
-suite({dhe_rsa, aes_256_cbc, sha}) ->
+suite(#{key_exchange := dhe_rsa, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
-suite({dh_anon, aes_256_cbc, sha}) ->
+suite(#{key_exchange := dh_anon, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_DH_anon_WITH_AES_256_CBC_SHA;
-
 %% TLS v1.2 suites
-
-%% suite_definition(?TLS_RSA_WITH_NULL_SHA) ->
-%%     {rsa, null, sha, sha256};
-suite({rsa, aes_128_cbc, sha256}) ->
+suite(#{key_exchange := rsa, 
+        cipher := aes_128_cbc, 
+        mac := sha256}) ->
     ?TLS_RSA_WITH_AES_128_CBC_SHA256;
-suite({rsa, aes_256_cbc, sha256}) ->
+suite(#{key_exchange := rsa, 
+        cipher := aes_256_cbc, 
+        mac := sha256}) ->
     ?TLS_RSA_WITH_AES_256_CBC_SHA256;
-suite({dhe_dss, aes_128_cbc, sha256}) ->
+suite(#{key_exchange := dhe_dss, 
+        cipher := aes_128_cbc, 
+        mac := sha256}) ->
     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256;
-suite({dhe_rsa, aes_128_cbc, sha256}) ->
+suite(#{key_exchange := dhe_rsa, 
+        cipher := aes_128_cbc, 
+        mac := sha256}) ->
     ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256;
-suite({dhe_dss, aes_256_cbc, sha256}) ->
+suite(#{key_exchange := dhe_dss, 
+        cipher := aes_256_cbc, 
+        mac := sha256}) ->
     ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256;
-suite({dhe_rsa, aes_256_cbc, sha256}) ->
+suite(#{key_exchange := dhe_rsa, 
+        cipher := aes_256_cbc, 
+        mac := sha256}) ->
     ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256;
-suite({dh_anon, aes_128_cbc, sha256}) ->
+suite(#{key_exchange := dh_anon, 
+        cipher := aes_128_cbc, 
+        mac := sha256}) ->
     ?TLS_DH_anon_WITH_AES_128_CBC_SHA256;
-suite({dh_anon, aes_256_cbc, sha256}) ->
+suite(#{key_exchange := dh_anon, 
+        cipher := aes_256_cbc, 
+        mac := sha256}) ->
     ?TLS_DH_anon_WITH_AES_256_CBC_SHA256;
-
 %%% PSK Cipher Suites RFC 4279
-
-suite({psk, rc4_128,sha}) ->
+suite(#{key_exchange := psk, 
+        cipher := rc4_128,
+        mac := sha}) ->
     ?TLS_PSK_WITH_RC4_128_SHA;
-suite({psk, '3des_ede_cbc',sha}) ->
+suite(#{key_exchange := psk, 
+        cipher := '3des_ede_cbc', 
+        mac := sha}) ->
     ?TLS_PSK_WITH_3DES_EDE_CBC_SHA;
-suite({psk, aes_128_cbc,sha}) ->
+suite(#{key_exchange := psk, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_PSK_WITH_AES_128_CBC_SHA;
-suite({psk, aes_256_cbc,sha}) ->
+suite(#{key_exchange := psk, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_PSK_WITH_AES_256_CBC_SHA;
-suite({dhe_psk, rc4_128,sha}) ->
+suite(#{key_exchange := dhe_psk, 
+        cipher := rc4_128, 
+        mac := sha})  ->
     ?TLS_DHE_PSK_WITH_RC4_128_SHA;
-suite({dhe_psk, '3des_ede_cbc',sha}) ->
+suite(#{key_exchange := dhe_psk, 
+        cipher := '3des_ede_cbc', 
+        mac := sha}) ->
     ?TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA;
-suite({dhe_psk, aes_128_cbc,sha}) ->
+suite(#{key_exchange := dhe_psk, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_DHE_PSK_WITH_AES_128_CBC_SHA;
-suite({dhe_psk, aes_256_cbc,sha}) ->
+suite(#{key_exchange := dhe_psk, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_DHE_PSK_WITH_AES_256_CBC_SHA;
-suite({rsa_psk, rc4_128,sha}) ->
+suite(#{key_exchange := rsa_psk, 
+        cipher := rc4_128, 
+        mac := sha}) ->
     ?TLS_RSA_PSK_WITH_RC4_128_SHA;
-suite({rsa_psk, '3des_ede_cbc',sha}) ->
+suite(#{key_exchange := rsa_psk, 
+        cipher := '3des_ede_cbc', 
+        mac := sha}) ->
     ?TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA;
-suite({rsa_psk, aes_128_cbc,sha}) ->
+suite(#{key_exchange := rsa_psk, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA;
-suite({rsa_psk, aes_256_cbc,sha}) ->
+suite(#{key_exchange := rsa_psk, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA;
-
 %%% PSK NULL Cipher Suites RFC 4785
-
-suite({psk, null, sha}) ->
+suite(#{key_exchange := psk, 
+        cipher := null, 
+        mac := sha}) ->
     ?TLS_PSK_WITH_NULL_SHA;
-suite({dhe_psk, null, sha}) ->
+suite(#{key_exchange := dhe_psk, 
+        cipher := null, 
+        mac := sha}) ->
     ?TLS_DHE_PSK_WITH_NULL_SHA;
-suite({rsa_psk, null, sha}) ->
+suite(#{key_exchange := rsa_psk, 
+       cipher := null, 
+       mac := sha}) ->
     ?TLS_RSA_PSK_WITH_NULL_SHA;
-
 %%% TLS 1.2 PSK Cipher Suites RFC 5487
-
-suite({psk, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := psk, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_PSK_WITH_AES_128_GCM_SHA256;
-suite({psk, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := psk, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_PSK_WITH_AES_256_GCM_SHA384;
-suite({dhe_psk, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := dhe_psk, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_DHE_PSK_WITH_AES_128_GCM_SHA256;
-suite({dhe_psk, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := dhe_psk, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384;
-suite({rsa_psk, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := rsa_psk, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256;
-suite({rsa_psk, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := rsa_psk, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384;
-
-suite({psk, aes_128_cbc, sha256}) ->
+suite(#{key_exchange := psk, 
+        cipher := aes_128_cbc, 
+        mac := sha256}) ->
     ?TLS_PSK_WITH_AES_128_CBC_SHA256;
-suite({psk, aes_256_cbc, sha384}) ->
+suite(#{key_exchange := psk, 
+        cipher := aes_256_cbc, 
+        mac := sha384}) ->
     ?TLS_PSK_WITH_AES_256_CBC_SHA384;
-suite({dhe_psk, aes_128_cbc, sha256}) ->
+suite(#{key_exchange := dhe_psk, 
+        cipher := aes_128_cbc, 
+        mac := sha256}) ->
     ?TLS_DHE_PSK_WITH_AES_128_CBC_SHA256;
-suite({dhe_psk, aes_256_cbc, sha384}) ->
+suite(#{key_exchange := dhe_psk, 
+        cipher := aes_256_cbc, 
+        mac := sha384}) ->
     ?TLS_DHE_PSK_WITH_AES_256_CBC_SHA384;
-suite({rsa_psk, aes_128_cbc, sha256}) ->
+suite(#{key_exchange := rsa_psk, 
+        cipher := aes_128_cbc, 
+        mac := sha256}) ->
     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA256;
-suite({rsa_psk, aes_256_cbc, sha384}) ->
+suite(#{key_exchange := rsa_psk, 
+        cipher := aes_256_cbc, 
+        mac := sha384}) ->
     ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384;
-
-suite({psk, null, sha256}) ->
+suite(#{key_exchange := psk, 
+        cipher := null, 
+        mac := sha256}) ->
     ?TLS_PSK_WITH_NULL_SHA256;
-suite({psk, null, sha384}) ->
+suite(#{key_exchange := psk, 
+        cipher := null,
+        mac := sha384}) ->
     ?TLS_PSK_WITH_NULL_SHA384;
-suite({dhe_psk, null, sha256}) ->
+suite(#{key_exchange := dhe_psk, 
+        cipher := null, 
+        mac := sha256}) ->
     ?TLS_DHE_PSK_WITH_NULL_SHA256;
-suite({dhe_psk, null, sha384}) ->
+suite(#{key_exchange := dhe_psk, 
+        cipher := null, 
+        mac := sha384}) ->
     ?TLS_DHE_PSK_WITH_NULL_SHA384;
-suite({rsa_psk, null, sha256}) ->
+suite(#{key_exchange := rsa_psk, 
+        cipher := null,  
+        mac := sha256}) ->
     ?TLS_RSA_PSK_WITH_NULL_SHA256;
-suite({rsa_psk, null, sha384}) ->
+suite(#{key_exchange := rsa_psk, 
+       cipher := null, 
+       mac := sha384}) ->
     ?TLS_RSA_PSK_WITH_NULL_SHA384;
-
 %%% ECDHE PSK Cipher Suites RFC 5489
-
-suite({ecdhe_psk, rc4_128,sha}) ->
+suite(#{key_exchange := ecdhe_psk, 
+        cipher := rc4_128,
+        mac := sha}) ->
     ?TLS_ECDHE_PSK_WITH_RC4_128_SHA;
-suite({ecdhe_psk, '3des_ede_cbc',sha}) ->
+suite(#{key_exchange := ecdhe_psk, 
+        cipher :='3des_ede_cbc',
+        mac := sha}) ->
     ?TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA;
-suite({ecdhe_psk, aes_128_cbc,sha}) ->
+suite(#{key_exchange := ecdhe_psk, 
+        cipher := aes_128_cbc,
+        mac := sha}) ->
     ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA;
-suite({ecdhe_psk, aes_256_cbc,sha}) ->
+suite(#{key_exchange := ecdhe_psk, 
+        cipher := aes_256_cbc,
+        mac := sha}) ->
     ?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA;
-suite({ecdhe_psk, aes_128_cbc, sha256}) ->
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := aes_128_cbc, 
+       mac := sha256}) ->
     ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256;
-suite({ecdhe_psk, aes_256_cbc, sha384}) ->
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := aes_256_cbc, 
+       mac := sha384}) ->
     ?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384;
-suite({ecdhe_psk, null, sha256}) ->
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := null, 
+       mac := sha256}) ->
     ?TLS_ECDHE_PSK_WITH_NULL_SHA256;
-suite({ecdhe_psk, null, sha384}) ->
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := null, 
+       mac := sha384}) ->
     ?TLS_ECDHE_PSK_WITH_NULL_SHA384;
-
 %%% ECDHE_PSK with AES-GCM and AES-CCM Cipher Suites, draft-ietf-tls-ecdhe-psk-aead-05
-
-suite({ecdhe_psk, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := aes_128_gcm, 
+       mac := null, 
+       prf := sha256}) ->
     ?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256;
-suite({ecdhe_psk, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := aes_256_gcm, 
+       mac := null, 
+       prf := sha384}) ->
     ?TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384;
-%% suite({ecdhe_psk, aes_128_ccm, null, sha256}) ->
-%%     ?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256;
-%% suite({ecdhe_psk, aes_256_ccm, null, sha256}) ->
-%%     ?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256;
-
+ %% suite(#{key_exchange := ecdhe_psk, 
+ %%        cipher := aes_128_ccm, 
+ %%        mac := null, 
+ %%        prf := sha256}) ->
+ %%    ?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256;
+ %% suite(#{key_exchange := ecdhe_psk, 
+ %%         cipher := aes_256_ccm, 
+ %%         mac := null, 
+ %%         prf := sha256}) ->
+ %%    ?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256;
 %%% SRP Cipher Suites RFC 5054
-
-suite({srp_anon, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := srp_anon, 
+        cipher := '3des_ede_cbc',
+        mac :=  sha}) ->
     ?TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA;
-suite({srp_rsa, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := srp_rsa, 
+        cipher := '3des_ede_cbc',
+        mac := sha}) ->
     ?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA;
-suite({srp_dss, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := srp_dss, 
+        cipher := '3des_ede_cbc', 
+        mac := sha}) ->
     ?TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA;
-suite({srp_anon, aes_128_cbc, sha}) ->
+suite(#{key_exchange := srp_anon, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_SRP_SHA_WITH_AES_128_CBC_SHA;
-suite({srp_rsa, aes_128_cbc, sha}) ->
+suite(#{key_exchange := srp_rsa, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA;
-suite({srp_dss, aes_128_cbc, sha}) ->
+suite(#{key_exchange := srp_dss, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA;
-suite({srp_anon, aes_256_cbc, sha}) ->
+suite(#{key_exchange := srp_anon, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_SRP_SHA_WITH_AES_256_CBC_SHA;
-suite({srp_rsa, aes_256_cbc, sha}) ->
+suite(#{key_exchange := srp_rsa, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA;
-suite({srp_dss, aes_256_cbc, sha}) ->
+suite(#{key_exchange := srp_dss, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA;
-
 %%% RFC 4492 EC TLS suites
-suite({ecdh_ecdsa, null, sha}) ->
+suite(#{key_exchange := ecdh_ecdsa, 
+        cipher := null, 
+        mac := sha}) ->
     ?TLS_ECDH_ECDSA_WITH_NULL_SHA;
-suite({ecdh_ecdsa, rc4_128, sha}) ->
+suite(#{key_exchange := ecdh_ecdsa, 
+        cipher := rc4_128,  
+        mac := sha})  ->
     ?TLS_ECDH_ECDSA_WITH_RC4_128_SHA;
-suite({ecdh_ecdsa, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := ecdh_ecdsa, 
+        cipher := '3des_ede_cbc', 
+        mac := sha}) ->
     ?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA;
-suite({ecdh_ecdsa, aes_128_cbc, sha}) ->
+suite(#{key_exchange := ecdh_ecdsa, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA;
-suite({ecdh_ecdsa, aes_256_cbc, sha}) ->
+suite(#{key_exchange := ecdh_ecdsa, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA;
-
-suite({ecdhe_ecdsa, null, sha}) ->
+suite(#{key_exchange := ecdhe_ecdsa, 
+        cipher := null, 
+        mac := sha}) ->
     ?TLS_ECDHE_ECDSA_WITH_NULL_SHA;
-suite({ecdhe_ecdsa, rc4_128, sha}) ->
+suite(#{key_exchange := ecdhe_ecdsa, 
+        cipher := rc4_128, 
+        mac := sha}) ->
     ?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA;
-suite({ecdhe_ecdsa, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := ecdhe_ecdsa, 
+        cipher := '3des_ede_cbc', 
+        mac := sha}) ->
     ?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA;
-suite({ecdhe_ecdsa, aes_128_cbc, sha}) ->
+suite(#{key_exchange := ecdhe_ecdsa, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA;
-suite({ecdhe_ecdsa, aes_256_cbc, sha}) ->
+suite(#{key_exchange := ecdhe_ecdsa, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA;
-
-suite({ecdh_rsa, null, sha}) ->
+suite(#{key_exchange := ecdh_rsa, 
+        cipher := null, 
+        mac := sha}) ->
     ?TLS_ECDH_RSA_WITH_NULL_SHA;
-suite({ecdh_rsa, rc4_128, sha}) ->
+suite(#{key_exchange := ecdh_rsa, 
+        cipher := rc4_128, 
+        mac := sha}) ->
     ?TLS_ECDH_RSA_WITH_RC4_128_SHA;
-suite({ecdh_rsa, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := ecdh_rsa, 
+        cipher := '3des_ede_cbc', mac := sha}) ->
     ?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA;
-suite({ecdh_rsa, aes_128_cbc, sha}) ->
+suite(#{key_exchange := ecdh_rsa, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA;
-suite({ecdh_rsa, aes_256_cbc, sha}) ->
+suite(#{key_exchange := ecdh_rsa, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA;
-
-suite({ecdhe_rsa, null, sha}) ->
+suite(#{key_exchange := ecdhe_rsa, 
+        cipher := null, 
+        mac := sha}) ->
     ?TLS_ECDHE_RSA_WITH_NULL_SHA;
-suite({ecdhe_rsa, rc4_128, sha}) ->
+suite(#{key_exchange := ecdhe_rsa, 
+        cipher := rc4_128, 
+        mac := sha}) ->
     ?TLS_ECDHE_RSA_WITH_RC4_128_SHA;
-suite({ecdhe_rsa, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := ecdhe_rsa, 
+        cipher := '3des_ede_cbc', 
+        mac := sha}) ->
     ?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA;
-suite({ecdhe_rsa, aes_128_cbc, sha}) ->
+suite(#{key_exchange := ecdhe_rsa, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA;
-suite({ecdhe_rsa, aes_256_cbc, sha}) ->
+suite(#{key_exchange := ecdhe_rsa, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA;
-
-suite({ecdh_anon, null, sha}) ->
+suite(#{key_exchange := ecdh_anon, 
+        cipher := null, 
+        mac := sha}) ->
     ?TLS_ECDH_anon_WITH_NULL_SHA;
-suite({ecdh_anon, rc4_128, sha}) ->
+suite(#{key_exchange := ecdh_anon, 
+        cipher := rc4_128, 
+        mac := sha}) ->
     ?TLS_ECDH_anon_WITH_RC4_128_SHA;
-suite({ecdh_anon, '3des_ede_cbc', sha}) ->
+suite(#{key_exchange := ecdh_anon, 
+        cipher := '3des_ede_cbc', 
+        mac :=  sha}) ->
     ?TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA;
-suite({ecdh_anon, aes_128_cbc, sha}) ->
+suite(#{key_exchange := ecdh_anon, 
+        cipher := aes_128_cbc, 
+        mac := sha}) ->
     ?TLS_ECDH_anon_WITH_AES_128_CBC_SHA;
-suite({ecdh_anon, aes_256_cbc, sha}) ->
+suite(#{key_exchange := ecdh_anon, 
+        cipher := aes_256_cbc, 
+        mac := sha}) ->
     ?TLS_ECDH_anon_WITH_AES_256_CBC_SHA;
-
 %%% RFC 5289 EC TLS suites
-suite({ecdhe_ecdsa, aes_128_cbc, sha256, sha256}) ->
+suite(#{key_exchange := ecdhe_ecdsa, 
+        cipher := aes_128_cbc, 
+        mac:= sha256, 
+        prf := sha256}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256;
-suite({ecdhe_ecdsa, aes_256_cbc, sha384, sha384}) ->
+suite(#{key_exchange := ecdhe_ecdsa, 
+        cipher := aes_256_cbc, 
+        mac := sha384, 
+        prf := sha384}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384;
-suite({ecdh_ecdsa, aes_128_cbc, sha256, sha256}) ->
+suite(#{key_exchange := ecdh_ecdsa, 
+        cipher := aes_128_cbc, 
+        mac := sha256, 
+        prf := sha256}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256;
-suite({ecdh_ecdsa, aes_256_cbc, sha384, sha384}) ->
+suite(#{key_exchange := ecdh_ecdsa, 
+        cipher := aes_256_cbc, 
+        mac := sha384, 
+        prf := sha384}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384;
-suite({ecdhe_rsa, aes_128_cbc, sha256, sha256}) ->
+suite(#{key_exchange := ecdhe_rsa, 
+        cipher := aes_128_cbc, 
+        mac := sha256, 
+        prf := sha256}) ->
     ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256;
-suite({ecdhe_rsa, aes_256_cbc, sha384, sha384}) ->
+suite(#{key_exchange := ecdhe_rsa, 
+        cipher := aes_256_cbc, 
+        mac := sha384, 
+        prf := sha384}) ->
     ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384;
-suite({ecdh_rsa, aes_128_cbc, sha256, sha256}) ->
+suite(#{key_exchange := ecdh_rsa, 
+        cipher := aes_128_cbc, 
+        mac := sha256, 
+        prf := sha256}) ->
     ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256;
-suite({ecdh_rsa, aes_256_cbc, sha384, sha384}) ->
+suite(#{key_exchange := ecdh_rsa, 
+        cipher := aes_256_cbc, 
+        mac := sha384, 
+        prf := sha384}) ->
     ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384;
-
 %% RFC 5288 AES-GCM Cipher Suites
-suite({rsa, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := rsa, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_RSA_WITH_AES_128_GCM_SHA256;
-suite({rsa, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := rsa, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_RSA_WITH_AES_256_GCM_SHA384;
-suite({dhe_rsa, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := dhe_rsa, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256;
-suite({dhe_rsa, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := dhe_rsa, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384;
-suite({dh_rsa, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := dh_rsa, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_DH_RSA_WITH_AES_128_GCM_SHA256;
-suite({dh_rsa, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := dh_rsa, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_DH_RSA_WITH_AES_256_GCM_SHA384;
-suite({dhe_dss, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := dhe_dss, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256;
-suite({dhe_dss, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := dhe_dss, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384;
-suite({dh_dss, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := dh_dss, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_DH_DSS_WITH_AES_128_GCM_SHA256;
-suite({dh_dss, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := dh_dss, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_DH_DSS_WITH_AES_256_GCM_SHA384;
-suite({dh_anon, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := dh_anon, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_DH_anon_WITH_AES_128_GCM_SHA256;
-suite({dh_anon, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := dh_anon, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_DH_anon_WITH_AES_256_GCM_SHA384;
-
 %% RFC 5289 ECC AES-GCM Cipher Suites
-suite({ecdhe_ecdsa, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := ecdhe_ecdsa, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256;
-suite({ecdhe_ecdsa, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := ecdhe_ecdsa, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384;
-suite({ecdh_ecdsa, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := ecdh_ecdsa, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256;
-suite({ecdh_ecdsa, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := ecdh_ecdsa, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384;
-suite({ecdhe_rsa, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := ecdhe_rsa, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256;
-suite({ecdhe_rsa, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := ecdhe_rsa, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384;
-suite({ecdh_rsa, aes_128_gcm, null, sha256}) ->
+suite(#{key_exchange := ecdh_rsa, 
+        cipher := aes_128_gcm, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256;
-suite({ecdh_rsa, aes_256_gcm, null, sha384}) ->
+suite(#{key_exchange := ecdh_rsa, 
+        cipher := aes_256_gcm, 
+        mac := aead, 
+        prf := sha384}) ->
     ?TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384;
-
-
 %% draft-agl-tls-chacha20poly1305-04 Chacha20/Poly1305 Suites
-suite({ecdhe_rsa, chacha20_poly1305, null, sha256}) ->
+suite(#{key_exchange := ecdhe_rsa, 
+        cipher := chacha20_poly1305,  
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256;
-suite({ecdhe_ecdsa, chacha20_poly1305, null, sha256}) ->
+suite(#{key_exchange := ecdhe_ecdsa, 
+        cipher := chacha20_poly1305, 
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256;
-suite({dhe_rsa, chacha20_poly1305, null, sha256}) ->
+suite(#{key_exchange := dhe_rsa, 
+        cipher := chacha20_poly1305,  
+        mac := aead, 
+        prf := sha256}) ->
     ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256.
 
 %%--------------------------------------------------------------------
@@ -1298,9 +2033,9 @@ openssl_suite("ECDH-RSA-AES256-GCM-SHA384") ->
     ?TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384.
 
 %%--------------------------------------------------------------------
--spec openssl_suite_name(cipher_suite()) -> openssl_cipher_suite().
+-spec openssl_suite_name(cipher_suite()) -> openssl_cipher_suite() | erl_cipher_suite().
 %%
-%% Description: Return openssl cipher suite name.
+%% Description: Return openssl cipher suite name if possible
 %%-------------------------------------------------------------------
 openssl_suite_name(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA) ->
     "DHE-RSA-AES256-SHA";
@@ -1510,36 +2245,74 @@ filter(DerCert, Ciphers) ->
 	{_, ecdsa} ->
 	    Ciphers1 -- rsa_signed_suites()
     end.
-	
 %%--------------------------------------------------------------------
--spec filter_suites([cipher_suite()]) -> [cipher_suite()].
+-spec filter_suites([erl_cipher_suite()] | [cipher_suite()], map()) ->
+                           [erl_cipher_suite()] |  [cipher_suite()].
+%%
+%% Description: Filter suites using supplied filter funs
+%%-------------------------------------------------------------------	
+filter_suites(Suites, Filters) ->
+    ApplyFilters = fun(Suite) ->
+                           filter_suite(Suite, Filters)
+                   end,
+    lists:filter(ApplyFilters, Suites).
+    
+filter_suite(#{key_exchange := KeyExchange, 
+               cipher := Cipher, 
+               mac := Hash,
+               prf := Prf}, 
+             #{key_exchange_filters := KeyFilters,
+               cipher_filters := CipherFilters, 
+               mac_filters := HashFilters,
+               prf_filters := PrfFilters}) ->
+    all_filters(KeyExchange, KeyFilters) andalso
+        all_filters(Cipher, CipherFilters) andalso
+        all_filters(Hash, HashFilters) andalso
+        all_filters(Prf, PrfFilters);
+filter_suite(Suite, Filters) ->
+    filter_suite(suite_definition(Suite), Filters).
+
+%%--------------------------------------------------------------------
+-spec filter_suites([erl_cipher_suite()] | [cipher_suite()]) -> 
+                           [erl_cipher_suite()] | [cipher_suite()].
 %%
 %% Description: Filter suites for algorithms supported by crypto.
 %%-------------------------------------------------------------------
-filter_suites(Suites = [Value|_]) when is_tuple(Value) ->
-    Algos = crypto:supports(),
-    Hashs =  proplists:get_value(hashs, Algos),
-    lists:filter(fun({KeyExchange, Cipher, Hash}) ->
-			 is_acceptable_keyexchange(KeyExchange,  proplists:get_value(public_keys, Algos)) andalso
-			     is_acceptable_cipher(Cipher,  proplists:get_value(ciphers, Algos)) andalso
-			     is_acceptable_hash(Hash,  proplists:get_value(hashs, Algos));
-		    ({KeyExchange, Cipher, Hash, Prf}) ->
-			 is_acceptable_keyexchange(KeyExchange, proplists:get_value(public_keys, Algos)) andalso
-			     is_acceptable_cipher(Cipher, proplists:get_value(ciphers, Algos)) andalso
-			     is_acceptable_hash(Hash, Hashs) andalso
-			     is_acceptable_prf(Prf, Hashs)
-		 end, Suites);
-
 filter_suites(Suites) ->
+    Filters = crypto_support_filters(),
+    filter_suites(Suites, Filters).
+
+all_filters(_, []) ->
+    true;
+all_filters(Value, [Filter| Rest]) ->
+    case Filter(Value) of
+        true ->
+            all_filters(Value, Rest);
+        false ->
+            false
+    end.
+crypto_support_filters() ->
     Algos = crypto:supports(),
     Hashs =  proplists:get_value(hashs, Algos),
-    lists:filter(fun(Suite) ->
-			 {KeyExchange, Cipher, Hash, Prf} = ssl_cipher:suite_definition(Suite),
-			 is_acceptable_keyexchange(KeyExchange, proplists:get_value(public_keys, Algos)) andalso
-			     is_acceptable_cipher(Cipher,  proplists:get_value(ciphers, Algos)) andalso
-			     is_acceptable_hash(Hash, Hashs) andalso
-			     is_acceptable_prf(Prf, Hashs)
-		 end, Suites).
+    #{key_exchange_filters => 
+          [fun(KeyExchange) ->
+                  is_acceptable_keyexchange(KeyExchange,  
+                                            proplists:get_value(public_keys, Algos))
+           end],
+      cipher_filters => 
+          [fun(Cipher) ->
+                  is_acceptable_cipher(Cipher,  
+                                       proplists:get_value(ciphers, Algos))
+           end],
+      mac_filters => 
+          [fun(Hash) ->
+                  is_acceptable_hash(Hash, Hashs)
+          end],
+      prf_filters => 
+          [fun(Prf) ->
+                  is_acceptable_prf(Prf,  
+                                    proplists:get_value(hashs, Algos))
+          end]}.
 
 is_acceptable_keyexchange(KeyExchange, _Algos) when KeyExchange == psk;
                                                     KeyExchange == null ->
@@ -1630,7 +2403,7 @@ calc_mac_hash(Type, Version,
 	     MacSecret, SeqNo, Type,
 	     Length, PlainFragment).
 
-is_stream_ciphersuite({_, rc4_128, _, _}) ->
+is_stream_ciphersuite(#{cipher := rc4_128}) ->
     true;
 is_stream_ciphersuite(_) ->
     false.
@@ -1758,6 +2531,11 @@ prf_algorithm(default_prf, {3, _}) ->
 prf_algorithm(Algo, _) ->
     hash_algorithm(Algo).
 
+mac_algorithm(aead) ->
+    aead;
+mac_algorithm(Algo) ->
+    hash_algorithm(Algo).
+
 hash_algorithm(null)   -> ?NULL;
 hash_algorithm(md5)    -> ?MD5;
 hash_algorithm(sha)   -> ?SHA; %% Only sha always refers to "SHA-1"
@@ -1788,6 +2566,10 @@ sign_algorithm(Other) when is_integer(Other) andalso ((Other >= 224) and (Other
 
 hash_size(null) ->
     0;
+%% The AEAD MAC hash size is not used in the context 
+%% of calculating the master secret. See RFC 5246 Section 6.2.3.3.
+hash_size(aead) ->
+    0;
 hash_size(md5) ->
     16;
 hash_size(sha) ->
diff --git a/lib/ssl/src/ssl_config.erl b/lib/ssl/src/ssl_config.erl
index e4611995ec..022fb7eac0 100644
--- a/lib/ssl/src/ssl_config.erl
+++ b/lib/ssl/src/ssl_config.erl
@@ -91,7 +91,15 @@ init_certificates(undefined, #{pem_cache := PemCache} = Config, CertFile, server
     end;
 init_certificates(Cert, Config, _, _) ->
     {ok, Config#{own_certificate => Cert}}.
-        
+init_private_key(_, #{algorithm := Alg} = Key, <<>>, _Password, _Client) when Alg == ecdsa;
+                                                                              Alg == rsa;
+                                                                              Alg == dss ->
+    case maps:is_key(engine, Key) andalso maps:is_key(key_id, Key) of
+        true ->
+            Key;
+        false ->
+            throw({key, {invalid_key_id, Key}})
+    end;
 init_private_key(_, undefined, <<>>, _Password, _Client) ->
     undefined;
 init_private_key(DbHandle, undefined, KeyFile, Password, _) ->
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index d83c9cb59f..2031735a71 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -44,33 +44,35 @@
 -export([send/2, recv/3, close/2, shutdown/2,
 	 new_user/2, get_opts/2, set_opts/2, 
 	 peer_certificate/1, renegotiation/1, negotiated_protocol/1, prf/5,
-         get_sslsocket/1, handshake_complete/3,
-	 connection_information/2, handle_common_event/5
+	 connection_information/2
 	]).
 
+%% Alert and close handling
+-export([handle_own_alert/4, handle_alert/3, 
+	 handle_normal_shutdown/3, stop/2, stop_and_reply/3
+	]).
+
+%% Data handling
+-export([write_application_data/3, read_application_data/2]).
+
+%% Help functions for tls|dtls_connection.erl
+-export([handle_session/7, ssl_config/3,
+	 prepare_connection/2, hibernate_after/3]).
+
 %% General gen_statem state functions with extra callback argument 
 %% to determine if it is an SSL/TLS or DTLS gen_statem machine
--export([init/4, hello/4, abbreviated/4, certify/4, cipher/4,
+-export([init/4, error/4, hello/4, abbreviated/4, certify/4, cipher/4,
          connection/4, death_row/4, downgrade/4]).
 
 %% gen_statem callbacks
 -export([terminate/3, format_status/2]).
 
-%%
--export([handle_info/3, handle_call/5, handle_session/7, ssl_config/3,
-	 prepare_connection/2, hibernate_after/3]).
-
-%% Alert and close handling
--export([handle_own_alert/4,handle_alert/3, 
-	 handle_normal_shutdown/3 
-	]).
-
-%% Data handling
--export([write_application_data/3, read_application_data/2]).
+%% Erlang Distribution export
+-export([get_sslsocket/1, handshake_complete/3]).
 
 %%====================================================================
-%% Internal application API
-%%====================================================================	     
+%% Setup
+%%====================================================================
 %%--------------------------------------------------------------------
 -spec connect(tls_connection | dtls_connection,
 	      host(), inet:port_number(), 
@@ -166,6 +168,16 @@ socket_control(dtls_connection = Connection, {_, Socket}, Pid, Transport, Listen
 	{error, Reason}	->
 	    {error, Reason}
     end.
+
+start_or_recv_cancel_timer(infinity, _RecvFrom) ->
+    undefined;
+start_or_recv_cancel_timer(Timeout, RecvFrom) ->
+    erlang:send_after(Timeout, self(), {cancel_start_or_recv, RecvFrom}).
+
+%%====================================================================
+%% User events
+%%====================================================================
+
 %%--------------------------------------------------------------------
 -spec send(pid(), iodata()) -> ok | {error, reason()}.
 %%
@@ -281,6 +293,197 @@ handshake_complete(ConnectionPid, Node, DHandle) ->
 prf(ConnectionPid, Secret, Label, Seed, WantedLength) ->
     call(ConnectionPid, {prf, Secret, Label, Seed, WantedLength}).
 
+%%====================================================================
+%% Alert and close handling
+%%====================================================================
+handle_own_alert(Alert, Version, StateName, 
+		 #state{role = Role,
+                        transport_cb = Transport,
+                        socket = Socket,
+                        protocol_cb = Connection,
+                        connection_states = ConnectionStates,
+                        ssl_options = SslOpts} = State) ->
+    try %% Try to tell the other side
+	{BinMsg, _} =
+	Connection:encode_alert(Alert, Version, ConnectionStates),
+	Connection:send(Transport, Socket, BinMsg)
+    catch _:_ ->  %% Can crash if we are in a uninitialized state
+	    ignore
+    end,
+    try %% Try to tell the local user
+	log_alert(SslOpts#ssl_options.log_alert, Role, Connection:protocol_name(), StateName, Alert#alert{role = Role}),
+	handle_normal_shutdown(Alert,StateName, State)
+    catch _:_ ->
+	    ok
+    end,
+    stop({shutdown, own_alert}, State).
+
+handle_normal_shutdown(Alert, _, #state{socket = Socket,
+					transport_cb = Transport,
+					protocol_cb = Connection,
+					start_or_recv_from = StartFrom,
+					tracker = Tracker,
+					role = Role, renegotiation = {false, first}}) ->
+    alert_user(Transport, Tracker,Socket, StartFrom, Alert, Role, Connection);
+
+handle_normal_shutdown(Alert, StateName, #state{socket = Socket,
+						socket_options = Opts,
+						transport_cb = Transport,
+						protocol_cb = Connection,
+						user_application = {_Mon, Pid},
+						tracker = Tracker,
+						start_or_recv_from = RecvFrom, role = Role}) ->
+    alert_user(Transport, Tracker, Socket, StateName, Opts, Pid, RecvFrom, Alert, Role, Connection).
+
+handle_alert(#alert{level = ?FATAL} = Alert, StateName,
+	     #state{socket = Socket, transport_cb = Transport, 
+		    protocol_cb = Connection,
+		    ssl_options = SslOpts, start_or_recv_from = From, host = Host,
+		    port = Port, session = Session, user_application = {_Mon, Pid},
+		    role = Role, socket_options = Opts, tracker = Tracker} = State) ->
+    invalidate_session(Role, Host, Port, Session),
+    log_alert(SslOpts#ssl_options.log_alert, Role, Connection:protocol_name(), 
+              StateName, Alert#alert{role = opposite_role(Role)}),
+    alert_user(Transport, Tracker, Socket, StateName, Opts, Pid, From, Alert, Role, Connection),
+    stop(normal, State);
+
+handle_alert(#alert{level = ?WARNING, description = ?CLOSE_NOTIFY} = Alert, 
+	     StateName, State) -> 
+    handle_normal_shutdown(Alert, StateName, State),
+    stop({shutdown, peer_close}, State);
+
+handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert, StateName, 
+	     #state{role = Role, ssl_options = SslOpts, protocol_cb = Connection, renegotiation = {true, internal}} = State) ->
+    log_alert(SslOpts#ssl_options.log_alert, Role, 
+              Connection:protocol_name(), StateName, Alert#alert{role = opposite_role(Role)}),
+    handle_normal_shutdown(Alert, StateName, State),
+    stop({shutdown, peer_close}, State);
+
+handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert, StateName, 
+	     #state{role = Role,
+                    ssl_options = SslOpts, renegotiation = {true, From},
+		    protocol_cb = Connection} = State0) ->
+    log_alert(SslOpts#ssl_options.log_alert,  Role,
+              Connection:protocol_name(), StateName, Alert#alert{role = opposite_role(Role)}),
+    gen_statem:reply(From, {error, renegotiation_rejected}),
+    {Record, State1} = Connection:next_record(State0),
+    %% Go back to connection!
+    State = Connection:reinit_handshake_data(State1#state{renegotiation = undefined}),
+    Connection:next_event(connection, Record, State);
+
+%% Gracefully log and ignore all other warning alerts
+handle_alert(#alert{level = ?WARNING} = Alert, StateName,
+	     #state{ssl_options = SslOpts, protocol_cb = Connection, role = Role} = State0) ->
+    log_alert(SslOpts#ssl_options.log_alert,  Role,
+              Connection:protocol_name(), StateName, Alert#alert{role = opposite_role(Role)}),
+    {Record, State} = Connection:next_record(State0),
+    Connection:next_event(StateName, Record, State).
+
+%%====================================================================
+%% Data handling
+%%====================================================================
+write_application_data(Data0, {FromPid, _} = From,
+		       #state{socket = Socket,
+			      negotiated_version = Version,
+			      protocol_cb = Connection,
+			      transport_cb = Transport,
+			      connection_states = ConnectionStates0,
+			      socket_options = SockOpts,
+			      ssl_options = #ssl_options{renegotiate_at = RenegotiateAt}} = State) ->
+    Data = encode_packet(Data0, SockOpts),
+    
+    case time_to_renegotiate(Data, ConnectionStates0, RenegotiateAt) of
+	true ->
+	    Connection:renegotiate(State#state{renegotiation = {true, internal}}, 
+			[{next_event, {call, From}, {application_data, Data0}}]);
+	false ->
+	    {Msgs, ConnectionStates} =
+                Connection:encode_data(Data, Version, ConnectionStates0),
+            NewState = State#state{connection_states = ConnectionStates},
+	    case Connection:send(Transport, Socket, Msgs) of
+                ok when FromPid =:= self() ->
+                    hibernate_after(connection, NewState, []);
+                Error when FromPid =:= self() ->
+                    stop({shutdown, Error}, NewState);
+                ok ->
+                    hibernate_after(connection, NewState, [{reply, From, ok}]);
+                Result ->
+                    hibernate_after(connection, NewState, [{reply, From, Result}])
+            end
+    end.
+
+read_application_data(Data, #state{user_application = {_Mon, Pid},
+				   socket = Socket,
+				   protocol_cb = Connection,
+				   transport_cb = Transport,
+				   socket_options = SOpts,
+				   bytes_to_read = BytesToRead,
+				   start_or_recv_from = RecvFrom,
+				   timer = Timer,
+				   user_data_buffer = Buffer0,
+				   tracker = Tracker} = State0) ->
+    Buffer1 = if 
+		  Buffer0 =:= <<>> -> Data;
+		  Data =:= <<>> -> Buffer0;
+		  true -> <<Buffer0/binary, Data/binary>>
+	      end,
+    case get_data(SOpts, BytesToRead, Buffer1) of
+	{ok, ClientData, Buffer} -> % Send data
+            case State0 of
+                #state{
+                   ssl_options = #ssl_options{erl_dist = true},
+                  protocol_specific = #{d_handle := DHandle}} ->
+                    State =
+                        State0#state{
+                          user_data_buffer = Buffer,
+                          bytes_to_read = undefined},
+                    try erlang:dist_ctrl_put_data(DHandle, ClientData) of
+                        _
+                          when SOpts#socket_options.active =:= false;
+                               Buffer =:= <<>> ->
+                            %% Passive mode, wait for active once or recv
+                            %% Active and empty, get more data
+                            Connection:next_record_if_active(State);
+                        _ -> %% We have more data
+                            read_application_data(<<>>, State)
+                    catch error:_ ->
+                            death_row(State, disconnect)
+                    end;
+                _ ->
+                    SocketOpt =
+                        deliver_app_data(
+                          Transport, Socket, SOpts,
+                          ClientData, Pid, RecvFrom, Tracker, Connection),
+                    cancel_timer(Timer),
+                    State =
+                        State0#state{
+                          user_data_buffer = Buffer,
+                          start_or_recv_from = undefined,
+                          timer = undefined,
+                          bytes_to_read = undefined,
+                          socket_options = SocketOpt
+                         },
+                    if
+                        SocketOpt#socket_options.active =:= false;
+                        Buffer =:= <<>> ->
+                            %% Passive mode, wait for active once or recv
+                            %% Active and empty, get more data
+                            Connection:next_record_if_active(State);
+                        true -> %% We have more data
+                            read_application_data(<<>>, State)
+                    end
+            end;
+	{more, Buffer} -> % no reply, we need more data
+	    Connection:next_record(State0#state{user_data_buffer = Buffer});
+	{passive, Buffer} ->
+	    Connection:next_record_if_active(State0#state{user_data_buffer = Buffer});
+	{error,_Reason} -> %% Invalid packet in packet mode
+	    deliver_packet_error(Transport, Socket, SOpts, Buffer1, Pid, RecvFrom, Tracker, Connection),
+            stop(normal, State0)
+    end.
+%%====================================================================
+%% Help functions for tls|dtls_connection.erl
+%%====================================================================
 %%--------------------------------------------------------------------
 -spec handle_session(#server_hello{}, ssl_record:ssl_version(),
 		     binary(), ssl_record:connection_states(), _,_, #state{}) ->
@@ -292,7 +495,7 @@ handle_session(#server_hello{cipher_suite = CipherSuite,
 	       #state{session = #session{session_id = OldId},
 		      negotiated_version = ReqVersion,
 		      negotiated_protocol = CurrentProtocol} = State0) ->
-    {KeyAlgorithm, _, _, _} =
+    #{key_exchange := KeyAlgorithm} =
 	ssl_cipher:suite_definition(CipherSuite),
     
     PremasterSecret = make_premaster_secret(ReqVersion, KeyAlgorithm),
@@ -349,7 +552,7 @@ ssl_config(Opts, Role, State) ->
 		ssl_options = Opts}.
 
 %%====================================================================
-%% gen_statem state functions
+%% gen_statem general state functions with connection cb argument
 %%====================================================================	
 %%--------------------------------------------------------------------
 -spec init(gen_statem:event_type(),
@@ -378,7 +581,7 @@ init({call, From}, {start, {Opts, EmOpts}, Timeout},
 	init({call, From}, {start, Timeout}, 
 	     State#state{ssl_options = SslOpts, socket_options = new_emulated(EmOpts, SockOpts)}, Connection)
     catch throw:Error ->
-	    {stop_and_reply, normal, {reply, From, {error, Error}}}
+	    stop_and_reply(normal, {reply, From, {error, Error}}, State0)
     end;
 init({call, From}, Msg, State, Connection) ->
     handle_call(Msg, From, ?FUNCTION_NAME, State, Connection);
@@ -386,6 +589,15 @@ init(_Type, _Event, _State, _Connection) ->
     {keep_state_and_data, [postpone]}.
 	
 %%--------------------------------------------------------------------
+-spec error(gen_statem:event_type(),
+	   {start, timeout()} | term(), #state{},
+            tls_connection | dtls_connection) ->
+		   gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+error({call, From}, Msg, State, Connection) ->
+    handle_call(Msg, From, ?FUNCTION_NAME, State, Connection).
+
+%%--------------------------------------------------------------------
 -spec hello(gen_statem:event_type(),
 	    #hello_request{} | #server_hello{} | term(),
 	    #state{}, tls_connection | dtls_connection) ->
@@ -408,7 +620,6 @@ hello(Type, Msg, State, Connection) ->
 %%--------------------------------------------------------------------
 abbreviated({call, From}, Msg, State, Connection) ->
     handle_call(Msg, From, ?FUNCTION_NAME, State, Connection);
-
 abbreviated(internal, #finished{verify_data = Data} = Finished,
 	    #state{role = server,
 		   negotiated_version = Version,
@@ -429,7 +640,6 @@ abbreviated(internal, #finished{verify_data = Data} = Finished,
 	#alert{} = Alert ->
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State0)
     end;
-
 abbreviated(internal, #finished{verify_data = Data} = Finished,
 	    #state{role = client, tls_handshake_history = Handshake0,
 		   session = #session{master_secret = MasterSecret},
@@ -449,7 +659,6 @@ abbreviated(internal, #finished{verify_data = Data} = Finished,
 	#alert{} = Alert ->
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State0)
     end;
-
 %% only allowed to send next_protocol message after change cipher spec
 %% & before finished message and it is not allowed during renegotiation
 abbreviated(internal, #next_protocol{selected_protocol = SelectedProtocol},
@@ -490,7 +699,6 @@ certify(internal, #certificate{asn1_certificates = []},
 	    State, _) ->
     Alert =  ?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE),
     handle_own_alert(Alert, Version, ?FUNCTION_NAME, State);
-
 certify(internal, #certificate{asn1_certificates = []},
 	#state{role = server,
 	       ssl_options = #ssl_options{verify = verify_peer,
@@ -499,7 +707,6 @@ certify(internal, #certificate{asn1_certificates = []},
     {Record, State} = 
 	Connection:next_record(State0#state{client_certificate_requested = false}),
     Connection:next_event(?FUNCTION_NAME, Record, State);
-
 certify(internal, #certificate{},
 	#state{role = server,
 	       negotiated_version = Version,
@@ -507,7 +714,6 @@ certify(internal, #certificate{},
 	    State, _) ->
     Alert =  ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE, unrequested_certificate),
     handle_own_alert(Alert, Version, ?FUNCTION_NAME, State);
-
 certify(internal, #certificate{} = Cert,
         #state{negotiated_version = Version,
 	       role = Role,
@@ -524,7 +730,6 @@ certify(internal, #certificate{} = Cert,
 	#alert{} = Alert ->
             handle_own_alert(Alert, Version, ?FUNCTION_NAME, State)
     end;
-
 certify(internal, #server_key_exchange{exchange_keys = Keys},
         #state{role = client, negotiated_version = Version,
 	       key_algorithm = Alg,
@@ -557,7 +762,6 @@ certify(internal, #server_key_exchange{exchange_keys = Keys},
 						Version, ?FUNCTION_NAME, State)
 	    end
     end;
-
 certify(internal, #certificate_request{},
 	#state{role = client, negotiated_version = Version,
                key_algorithm = Alg} = State, _)
@@ -565,8 +769,7 @@ certify(internal, #certificate_request{},
        Alg == psk; Alg == dhe_psk; Alg == ecdhe_psk; Alg == rsa_psk;
        Alg == srp_dss; Alg == srp_rsa; Alg == srp_anon ->
     handle_own_alert(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE),
-                     Version, certify, State);
-
+                     Version, ?FUNCTION_NAME, State);
 certify(internal, #certificate_request{} = CertRequest,
 	#state{session = #session{own_certificate = Cert},
 	       role = client,
@@ -580,7 +783,6 @@ certify(internal, #certificate_request{} = CertRequest,
 	    Connection:next_event(?FUNCTION_NAME, Record,
 				  State#state{cert_hashsign_algorithm = NegotiatedHashSign})
     end;
-
 %% PSK and RSA_PSK might bypass the Server-Key-Exchange
 certify(internal, #server_hello_done{},
 	#state{session = #session{master_secret = undefined},
@@ -599,7 +801,6 @@ certify(internal, #server_hello_done{},
 				  State0#state{premaster_secret = PremasterSecret}),
 	    client_certify_and_key_exchange(State, Connection)
     end;
-
 certify(internal, #server_hello_done{},
 	#state{session = #session{master_secret = undefined},
 	       ssl_options = #ssl_options{user_lookup_fun = PSKLookup},
@@ -620,7 +821,6 @@ certify(internal, #server_hello_done{},
 				  State0#state{premaster_secret = RSAPremasterSecret}),
 	    client_certify_and_key_exchange(State, Connection)
     end;
-
 %% Master secret was determined with help of server-key exchange msg
 certify(internal, #server_hello_done{}, 
 	#state{session = #session{master_secret = MasterSecret} = Session,
@@ -636,7 +836,6 @@ certify(internal, #server_hello_done{},
 	#alert{} = Alert ->
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State0)
     end;
-
 %% Master secret is calculated from premaster_secret
 certify(internal, #server_hello_done{},
 	#state{session = Session0,
@@ -654,7 +853,6 @@ certify(internal, #server_hello_done{},
 	#alert{} = Alert ->
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State0)
     end;
-
 certify(internal = Type, #client_key_exchange{} = Msg,
 	#state{role = server,
 	       client_certificate_requested = true,
@@ -662,7 +860,6 @@ certify(internal = Type, #client_key_exchange{} = Msg,
 	Connection) ->
     %% We expect a certificate here
     handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection);
-
 certify(internal, #client_key_exchange{exchange_keys = Keys},
 	State = #state{key_algorithm = KeyAlg, negotiated_version = Version}, Connection) ->
     try
@@ -672,7 +869,6 @@ certify(internal, #client_key_exchange{exchange_keys = Keys},
 	#alert{} = Alert ->
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State)
     end;
-
 certify(Type, Msg, State, Connection) ->
     handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
  
@@ -684,10 +880,8 @@ certify(Type, Msg, State, Connection) ->
 %%--------------------------------------------------------------------
 cipher({call, From}, Msg, State, Connection) ->
     handle_call(Msg, From, ?FUNCTION_NAME, State, Connection);
-
 cipher(info, Msg, State, _) ->
     handle_info(Msg, ?FUNCTION_NAME, State);
-
 cipher(internal, #certificate_verify{signature = Signature, 
 				     hashsign_algorithm = CertHashSign},
        #state{role = server,
@@ -710,14 +904,12 @@ cipher(internal, #certificate_verify{signature = Signature,
 	#alert{} = Alert ->
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State0)
     end;
-
 %% client must send a next protocol message if we are expecting it
 cipher(internal, #finished{},
        #state{role = server, expecting_next_protocol_negotiation = true,
 	      negotiated_protocol = undefined, negotiated_version = Version} = State0,
        _Connection) ->
     handle_own_alert(?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE), Version, ?FUNCTION_NAME, State0);
-
 cipher(internal, #finished{verify_data = Data} = Finished,
        #state{negotiated_version = Version,
 	      host = Host,
@@ -740,7 +932,6 @@ cipher(internal, #finished{verify_data = Data} = Finished,
         #alert{} = Alert ->
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State)
     end;
-
 %% only allowed to send next_protocol message after change cipher spec
 %% & before finished message and it is not allowed during renegotiation
 cipher(internal, #next_protocol{selected_protocol = SelectedProtocol},
@@ -775,7 +966,7 @@ connection({call, {FromPid, _} = From}, {application_data, Data},
      catch throw:Error ->
              case self() of
                  FromPid ->
-                     {stop, {shutdown, Error}};
+                     stop({shutdown, Error}, State);
                  _ ->
                      hibernate_after(
                        ?FUNCTION_NAME, State, [{reply, From, Error}])
@@ -826,8 +1017,8 @@ connection(
                       ProtocolSpecific#{d_handle => DHandle}},
             {Record, NewerState} = Connection:next_record_if_active(NewState),
             Connection:next_event(connection, Record, NewerState, [{reply, From, ok}])
-    catch _:Reason ->
-            death_row(State, Reason)
+    catch error:_ ->
+            death_row(State, disconnect)
     end;
 connection({call, From}, Msg, State, Connection) ->
     handle_call(Msg, From, ?FUNCTION_NAME, State, Connection);
@@ -839,10 +1030,24 @@ connection(
   _) ->
     eat_msgs(Msg),
     try send_dist_data(?FUNCTION_NAME, State, DHandle, [])
-    catch _:Reason ->
-            death_row(State, Reason)
+    catch error:_ ->
+            death_row(State, disconnect)
     end;
 connection(
+  info, {send, From, Ref, Data},
+  #state{
+     ssl_options = #ssl_options{erl_dist = true},
+     protocol_specific = #{d_handle := _}},
+  _) ->
+    %% This is for testing only!
+    %%
+    %% Needed by some OTP distribution
+    %% test suites...
+    From ! {Ref, ok},
+    {keep_state_and_data,
+     [{next_event, {call, {self(), undefined}},
+       {application_data, iolist_to_binary(Data)}}]};
+connection(
   info, tick = Msg,
   #state{
      ssl_options = #ssl_options{erl_dist = true},
@@ -867,20 +1072,22 @@ connection(Type, Msg, State, Connection) ->
 %% or the socket may die too
 death_row(
   info, {'DOWN', MonitorRef, _, _, Reason},
-  #state{user_application={MonitorRef,_Pid} = State},
+  #state{user_application={MonitorRef,_Pid}},
   _) ->
-    {stop, {shutdown, Reason}, State};
+    {stop, {shutdown, Reason}};
 death_row(
-  info, {'EXIT', Socket, Reason}, #state{socket = Socket} = State, _) ->
-    {stop, {shutdown, Reason}, State};
+  info, {'EXIT', Socket, Reason}, #state{socket = Socket}, _) ->
+    {stop, {shutdown, Reason}};
 death_row(state_timeout, Reason, _State, _Connection) ->
     {stop, {shutdown,Reason}};
-death_row(_Type, _Msg, State, _Connection) ->
-    {keep_state, State, [postpone]}.
+death_row(_Type, _Msg, _State, _Connection) ->
+    %% Waste all other events
+    keep_state_and_data.
 
 %% State entry function
 death_row(State, Reason) ->
-    {next_state, death_row, State, [{state_timeout, 5000, Reason}]}.
+    {next_state, death_row, State,
+     [{state_timeout, 5000, Reason}]}.
 
 %%--------------------------------------------------------------------
 -spec downgrade(gen_statem:event_type(), term(), 
@@ -893,10 +1100,10 @@ downgrade(internal, #alert{description = ?CLOSE_NOTIFY},
     tls_socket:setopts(Transport, Socket, [{active, false}, {packet, 0}, {mode, binary}]),
     Transport:controlling_process(Socket, Pid),
     gen_statem:reply(From, {ok, Socket}),
-    stop_normal(State);
+    stop(normal, State);
 downgrade(timeout, downgrade, #state{downgrade = {_, From}} = State, _) ->
     gen_statem:reply(From, {error, timeout}),
-    stop_normal(State);
+    stop(normal, State);
 downgrade(Type, Event, State, Connection) ->
     handle_common_event(Type, Event, ?FUNCTION_NAME, State, Connection).
 
@@ -911,7 +1118,7 @@ handle_common_event(internal, {handshake, {#hello_request{} = Handshake, _}}, co
 handle_common_event(internal, {handshake, {#hello_request{}, _}}, StateName, #state{role = client}, _) 
   when StateName =/= connection ->
     {keep_state_and_data};
-handle_common_event(internal, {handshake, {Handshake, Raw}}, StateName, 
+handle_common_event(internal, {handshake, {Handshake, Raw}}, StateName,
 		    #state{tls_handshake_history = Hs0,
 			   ssl_options = #ssl_options{v2_hello_compatible = V2HComp}} = State0, 
 		    Connection) ->
@@ -930,8 +1137,8 @@ handle_common_event(timeout, hibernate, _, _, _) ->
     {keep_state_and_data, [hibernate]};
 handle_common_event(internal, {application_data, Data}, StateName, State0, Connection) ->
     case read_application_data(Data, State0) of
-	{stop, Reason, State} ->
-   	    {stop, Reason, State};
+	{stop, _, _} = Stop->
+            Stop;
 	{Record, State} ->
    	    Connection:next_event(StateName, Record, State)
     end;
@@ -941,8 +1148,8 @@ handle_common_event(internal, #change_cipher_spec{type = <<1>>}, StateName,
 				StateName, State);
 handle_common_event(_Type, Msg, StateName, #state{negotiated_version = Version} = State, 
 		    _) ->
-    Alert =  ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE),
-    handle_own_alert(Alert, Version, {StateName, Msg}, State).
+    Alert =  ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE, {unexpected_msg, Msg}),
+    handle_own_alert(Alert, Version, StateName, State).
 
 handle_call({application_data, _Data}, _, _, _, _) ->
     %% In renegotiation priorities handshake, send data when handshake is finished
@@ -960,8 +1167,9 @@ handle_call({close, _} = Close, From, StateName, State, Connection) ->
     %% Run terminate before returning so that the reuseaddr
     %% inet-option works properly
     Result = Connection:terminate(Close, StateName, State#state{terminated = true}),
-    {stop_and_reply, {shutdown, normal},  
-     {reply, From, Result}, State};
+    stop_and_reply(
+      {shutdown, normal},
+      {reply, From, Result}, State);
 handle_call({shutdown, How0}, From, _,
 	    #state{transport_cb = Transport,
 		   negotiated_version = Version,
@@ -982,7 +1190,7 @@ handle_call({shutdown, How0}, From, _,
 	    {keep_state_and_data, [{reply, From, ok}]};
 	Error ->
 	    gen_statem:reply(From, {error, Error}),
-            stop_normal(State)
+            stop(normal, State)
     end;
 handle_call({recv, _N, _Timeout}, From, _,  
 		  #state{socket_options = 
@@ -1062,43 +1270,55 @@ handle_info({ErrorTag, Socket, econnaborted}, StateName,
 		   tracker = Tracker} = State)  when StateName =/= connection ->
     alert_user(Transport, Tracker,Socket, 
 	       StartFrom, ?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), Role, Connection),
-    stop_normal(State);
+    stop(normal, State);
 
 handle_info({ErrorTag, Socket, Reason}, StateName, #state{socket = Socket,
 							  error_tag = ErrorTag} = State)  ->
     Report = io_lib:format("SSL: Socket error: ~p ~n", [Reason]),
     error_logger:error_report(Report),
     handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-    stop_normal(State);
+    stop(normal, State);
 
 handle_info(
+  {'DOWN', MonitorRef, _, _, Reason}, _,
+  #state{
+     user_application = {MonitorRef, _Pid},
+     ssl_options = #ssl_options{erl_dist = true}}) ->
+    {stop, {shutdown, Reason}};
+handle_info(
   {'DOWN', MonitorRef, _, _, _}, _,
-  #state{user_application={MonitorRef,_Pid}} = State) ->
-    stop_normal(State);
+  #state{user_application = {MonitorRef, _Pid}}) ->
+    {stop, normal};
+handle_info(
+  {'EXIT', Pid, _Reason}, StateName,
+  #state{user_application = {_MonitorRef, Pid}} = State) ->
+    %% It seems the user application has linked to us
+    %% - ignore that and let the monitor handle this
+    {next_state, StateName, State};
 
 %%% So that terminate will be run when supervisor issues shutdown
 handle_info({'EXIT', _Sup, shutdown}, _StateName, State) ->
-    {stop, shutdown, State};
+    stop(shutdown, State);
 handle_info({'EXIT', Socket, normal}, _StateName, #state{socket = Socket} = State) ->
     %% Handle as transport close"
-    {stop, {shutdown, transport_closed}, State};
+    stop({shutdown, transport_closed}, State);
 handle_info({'EXIT', Socket, Reason}, _StateName, #state{socket = Socket} = State) ->
-    {stop, {shutdown, Reason}, State};
+    stop({shutdown, Reason}, State);
 
 handle_info(allow_renegotiate, StateName, State) ->
     {next_state, StateName, State#state{allow_renegotiate = true}};
 
 handle_info({cancel_start_or_recv, StartFrom}, StateName,
 	    #state{renegotiation = {false, first}} = State) when StateName =/= connection ->
-    {stop_and_reply, {shutdown, user_timeout},  
-     {reply, StartFrom, {error, timeout}}, State#state{timer = undefined}};
-
+    stop_and_reply(
+      {shutdown, user_timeout},
+      {reply, StartFrom, {error, timeout}},
+      State#state{timer = undefined});
 handle_info({cancel_start_or_recv, RecvFrom}, StateName, 
 	    #state{start_or_recv_from = RecvFrom} = State) when RecvFrom =/= undefined ->
     {next_state, StateName, State#state{start_or_recv_from = undefined,
 					bytes_to_read = undefined,
 					timer = undefined}, [{reply, RecvFrom, {error, timeout}}]};
-
 handle_info({cancel_start_or_recv, _RecvFrom}, StateName, State) ->
     {next_state, StateName, State#state{timer = undefined}};
 
@@ -1107,41 +1327,9 @@ handle_info(Msg, StateName, #state{socket = Socket, error_tag = Tag} = State) ->
     error_logger:info_report(Report),
     {next_state, StateName, State}.
 
-
-
-send_dist_data(StateName, State, DHandle, Acc) ->
-    case erlang:dist_ctrl_get_data(DHandle) of
-        none ->
-            erlang:dist_ctrl_get_data_notification(DHandle),
-            hibernate_after(StateName, State, lists:reverse(Acc));
-        Data ->
-            send_dist_data(
-              StateName, State, DHandle,
-              [{next_event, {call, {self(), undefined}}, {application_data, Data}}
-               |Acc])
-    end.
-
-%% Overload mitigation
-eat_msgs(Msg) ->
-    receive Msg -> eat_msgs(Msg)
-    after 0 -> ok
-    end.
-
-%% When running with erl_dist the stop reason 'normal'
-%% would be too silent and prevent cleanup
-stop_normal(State) ->
-    Reason =
-        case State of
-            #state{ssl_options = #ssl_options{erl_dist = true}} ->
-                {shutdown, normal};
-            _ ->
-                normal
-        end,
-    {stop, Reason, State}.
-
-%%--------------------------------------------------------------------
-%% gen_statem callbacks
-%%--------------------------------------------------------------------
+%%====================================================================
+%% general gen_statem callbacks
+%%====================================================================
 terminate(_, _, #state{terminated = true}) ->
     %% Happens when user closes the connection using ssl:close/1
     %% we want to guarantee that Transport:close has been called
@@ -1150,7 +1338,6 @@ terminate(_, _, #state{terminated = true}) ->
     %% returning. In both cases terminate has been run manually
     %% before run by gen_statem which will end up here
     ok;
-
 terminate({shutdown, transport_closed} = Reason, 
 	  _StateName, #state{protocol_cb = Connection,
 			     socket = Socket, transport_cb = Transport} = State) ->
@@ -1177,7 +1364,6 @@ terminate(Reason, connection, #state{negotiated_version = Version,
     {BinAlert, ConnectionStates} = terminate_alert(Reason, Version, ConnectionStates0, Connection),
     Connection:send(Transport, Socket, BinAlert),
     Connection:close(Reason, Socket, Transport, ConnectionStates, Check);
-
 terminate(Reason, _StateName, #state{transport_cb = Transport, protocol_cb = Connection,
 				     socket = Socket 
 				    } = State) ->
@@ -1211,155 +1397,6 @@ format_status(terminate, [_, StateName, State]) ->
 		       }}]}].
 
 %%--------------------------------------------------------------------
-%%% 
-%%--------------------------------------------------------------------
-write_application_data(Data0, {FromPid, _} = From,
-		       #state{socket = Socket,
-			      negotiated_version = Version,
-			      protocol_cb = Connection,
-			      transport_cb = Transport,
-			      connection_states = ConnectionStates0,
-			      socket_options = SockOpts,
-			      ssl_options = #ssl_options{renegotiate_at = RenegotiateAt}} = State) ->
-    Data = encode_packet(Data0, SockOpts),
-    
-    case time_to_renegotiate(Data, ConnectionStates0, RenegotiateAt) of
-	true ->
-	    Connection:renegotiate(State#state{renegotiation = {true, internal}}, 
-			[{next_event, {call, From}, {application_data, Data0}}]);
-	false ->
-	    {Msgs, ConnectionStates} =
-                Connection:encode_data(Data, Version, ConnectionStates0),
-            NewState = State#state{connection_states = ConnectionStates},
-	    case Connection:send(Transport, Socket, Msgs) of
-                ok when FromPid =:= self() ->
-                    hibernate_after(connection, NewState, []);
-                Error when FromPid =:= self() ->
-                    {stop, {shutdown, Error}, NewState};
-                ok ->
-                    hibernate_after(connection, NewState, [{reply, From, ok}]);
-                Result ->
-                    hibernate_after(connection, NewState, [{reply, From, Result}])
-            end
-    end.
-
-read_application_data(Data, #state{user_application = {_Mon, Pid},
-				   socket = Socket,
-				   protocol_cb = Connection,
-				   transport_cb = Transport,
-				   socket_options = SOpts,
-				   bytes_to_read = BytesToRead,
-				   start_or_recv_from = RecvFrom,
-				   timer = Timer,
-				   user_data_buffer = Buffer0,
-				   tracker = Tracker} = State0) ->
-    Buffer1 = if 
-		  Buffer0 =:= <<>> -> Data;
-		  Data =:= <<>> -> Buffer0;
-		  true -> <<Buffer0/binary, Data/binary>>
-	      end,
-    case get_data(SOpts, BytesToRead, Buffer1) of
-	{ok, ClientData, Buffer} -> % Send data
-            case State0 of
-                #state{
-                   ssl_options = #ssl_options{erl_dist = true},
-                  protocol_specific = #{d_handle := DHandle}} ->
-                    State =
-                        State0#state{
-                          user_data_buffer = Buffer,
-                          bytes_to_read = undefined},
-                    try erlang:dist_ctrl_put_data(DHandle, ClientData) of
-                        _
-                          when SOpts#socket_options.active =:= false;
-                               Buffer =:= <<>> ->
-                            %% Passive mode, wait for active once or recv
-                            %% Active and empty, get more data
-                            Connection:next_record_if_active(State);
-                        _ -> %% We have more data
-                            read_application_data(<<>>, State)
-                    catch _:Reason ->
-                            death_row(State, Reason)
-                    end;
-                _ ->
-                    SocketOpt =
-                        deliver_app_data(
-                          Transport, Socket, SOpts,
-                          ClientData, Pid, RecvFrom, Tracker, Connection),
-                    cancel_timer(Timer),
-                    State =
-                        State0#state{
-                          user_data_buffer = Buffer,
-                          start_or_recv_from = undefined,
-                          timer = undefined,
-                          bytes_to_read = undefined,
-                          socket_options = SocketOpt
-                         },
-                    if
-                        SocketOpt#socket_options.active =:= false;
-                        Buffer =:= <<>> ->
-                            %% Passive mode, wait for active once or recv
-                            %% Active and empty, get more data
-                            Connection:next_record_if_active(State);
-                        true -> %% We have more data
-                            read_application_data(<<>>, State)
-                    end
-            end;
-	{more, Buffer} -> % no reply, we need more data
-	    Connection:next_record(State0#state{user_data_buffer = Buffer});
-	{passive, Buffer} ->
-	    Connection:next_record_if_active(State0#state{user_data_buffer = Buffer});
-	{error,_Reason} -> %% Invalid packet in packet mode
-	    deliver_packet_error(Transport, Socket, SOpts, Buffer1, Pid, RecvFrom, Tracker, Connection),
-            stop_normal(State0)
-    end.
-%%--------------------------------------------------------------------
-%%% 
-%%--------------------------------------------------------------------
-handle_alert(#alert{level = ?FATAL} = Alert, StateName,
-	     #state{socket = Socket, transport_cb = Transport, 
-		    protocol_cb = Connection,
-		    ssl_options = SslOpts, start_or_recv_from = From, host = Host,
-		    port = Port, session = Session, user_application = {_Mon, Pid},
-		    role = Role, socket_options = Opts, tracker = Tracker} = State) ->
-    invalidate_session(Role, Host, Port, Session),
-    log_alert(SslOpts#ssl_options.log_alert, Role, Connection:protocol_name(), 
-              StateName, Alert#alert{role = opposite_role(Role)}),
-    alert_user(Transport, Tracker, Socket, StateName, Opts, Pid, From, Alert, Role, Connection),
-    stop_normal(State);
-
-handle_alert(#alert{level = ?WARNING, description = ?CLOSE_NOTIFY} = Alert, 
-	     StateName, State) -> 
-    handle_normal_shutdown(Alert, StateName, State),
-    {stop, {shutdown, peer_close}};
-
-handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert, StateName, 
-	     #state{role = Role, ssl_options = SslOpts, protocol_cb = Connection, renegotiation = {true, internal}} = State) ->
-    log_alert(SslOpts#ssl_options.log_alert, Role, 
-              Connection:protocol_name(), StateName, Alert#alert{role = opposite_role(Role)}),
-    handle_normal_shutdown(Alert, StateName, State),
-    {stop, {shutdown, peer_close}};
-
-handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert, StateName, 
-	     #state{role = Role,
-                    ssl_options = SslOpts, renegotiation = {true, From},
-		    protocol_cb = Connection} = State0) ->
-    log_alert(SslOpts#ssl_options.log_alert,  Role,
-              Connection:protocol_name(), StateName, Alert#alert{role = opposite_role(Role)}),
-    gen_statem:reply(From, {error, renegotiation_rejected}),
-    {Record, State1} = Connection:next_record(State0),
-    %% Go back to connection!
-    State = Connection:reinit_handshake_data(State1#state{renegotiation = undefined}),
-    Connection:next_event(connection, Record, State);
-
-%% Gracefully log and ignore all other warning alerts
-handle_alert(#alert{level = ?WARNING} = Alert, StateName,
-	     #state{ssl_options = SslOpts, protocol_cb = Connection, role = Role} = State0) ->
-    log_alert(SslOpts#ssl_options.log_alert,  Role,
-              Connection:protocol_name(), StateName, Alert#alert{role = opposite_role(Role)}),
-    {Record, State} = Connection:next_record(State0),
-    Connection:next_event(StateName, Record, State).
-
-%%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
 connection_info(#state{sni_hostname = SNIHostname, 
@@ -1369,9 +1406,9 @@ connection_info(#state{sni_hostname = SNIHostname,
 		       negotiated_version =  {_,_} = Version, 
 		       ssl_options = Opts}) ->
     RecordCB = record_cb(Connection),
-    CipherSuiteDef = ssl_cipher:erl_suite_definition(CipherSuite),
-    IsNamedCurveSuite = lists:member(element(1,CipherSuiteDef),
-			      [ecdh_ecdsa, ecdhe_ecdsa, ecdh_anon]),
+    CipherSuiteDef = #{key_exchange := KexAlg} = ssl_cipher:suite_definition(CipherSuite),
+    IsNamedCurveSuite = lists:member(KexAlg,
+                                     [ecdh_ecdsa, ecdhe_ecdsa, ecdh_anon]),
     CurveInfo = case ECCCurve of
 		    {namedCurve, Curve} when IsNamedCurveSuite ->
 			[{ecc, {named_curve, pubkey_cert_records:namedCurves(Curve)}}];
@@ -1380,7 +1417,7 @@ connection_info(#state{sni_hostname = SNIHostname,
 		end,
     [{protocol, RecordCB:protocol_version(Version)},
      {session_id, SessionId},
-     {cipher_suite, CipherSuiteDef},
+     {cipher_suite, ssl_cipher:erl_suite_definition(CipherSuiteDef)},
      {sni_hostname, SNIHostname} | CurveInfo] ++ ssl_options_list(Opts).
 
 security_info(#state{connection_states = ConnectionStates}) ->
@@ -1448,7 +1485,7 @@ resumed_server_hello(#state{session = Session,
 
 server_hello(ServerHello, State0, Connection) ->
     CipherSuite = ServerHello#server_hello.cipher_suite,
-    {KeyAlgorithm, _, _, _} = ssl_cipher:suite_definition(CipherSuite),
+    #{key_exchange := KeyAlgorithm}  = ssl_cipher:suite_definition(CipherSuite),
     State = Connection:queue_handshake(ServerHello, State0),
     State#state{key_algorithm = KeyAlgorithm}.
 
@@ -1462,8 +1499,8 @@ handle_peer_cert(Role, PeerCert, PublicKeyInfo,
     State1 = State0#state{session =
 			 Session#session{peer_certificate = PeerCert},
 			 public_key_info = PublicKeyInfo},
-    {KeyAlg,_,_,_} = ssl_cipher:suite_definition(CipherSuite),
-    State2 = handle_peer_cert_key(Role, PeerCert, PublicKeyInfo, KeyAlg, State1),
+    #{key_exchange := KeyAlgorithm} = ssl_cipher:suite_definition(CipherSuite),
+    State2 = handle_peer_cert_key(Role, PeerCert, PublicKeyInfo, KeyAlgorithm, State1),
 
     {Record, State} = Connection:next_record(State2),
     Connection:next_event(certify, Record, State).
@@ -1476,7 +1513,6 @@ handle_peer_cert_key(client, _,
     ECDHKey = public_key:generate_key(PublicKeyParams),
     PremasterSecret = ssl_handshake:premaster_secret(PublicKey, ECDHKey),
     master_secret(PremasterSecret, State#state{diffie_hellman_keys = ECDHKey});
-
 %% We do currently not support cipher suites that use fixed DH.
 %% If we want to implement that the following clause can be used
 %% to extract DH parameters form cert.
@@ -1496,7 +1532,6 @@ certify_client(#state{client_certificate_requested = true, role = client,
 	       = State, Connection) ->
     Certificate = ssl_handshake:certificate(OwnCert, CertDbHandle, CertDbRef, client),
     Connection:queue_handshake(Certificate, State);
-
 certify_client(#state{client_certificate_requested = false} = State, _) ->
     State.
 
@@ -1546,10 +1581,26 @@ server_certify_and_key_exchange(State0, Connection) ->
     request_client_cert(State2, Connection).
 
 certify_client_key_exchange(#encrypted_premaster_secret{premaster_secret= EncPMS},
-			    #state{private_key = Key} = State, Connection) ->
-    PremasterSecret = ssl_handshake:premaster_secret(EncPMS, Key),
+			    #state{private_key = Key, client_hello_version = {Major, Minor} = Version} = State, Connection) ->
+    FakeSecret = make_premaster_secret(Version, rsa),
+    %% Countermeasure for Bleichenbacher attack always provide some kind of premaster secret
+    %% and fail handshake later.RFC 5246 section 7.4.7.1.
+    PremasterSecret =
+        try ssl_handshake:premaster_secret(EncPMS, Key) of
+            Secret when erlang:byte_size(Secret) == ?NUM_OF_PREMASTERSECRET_BYTES ->
+                case Secret of
+                    <<?BYTE(Major), ?BYTE(Minor), Rest/binary>> -> %% Correct
+                        <<?BYTE(Major), ?BYTE(Minor), Rest/binary>>;
+                    <<?BYTE(_), ?BYTE(_), Rest/binary>> -> %% Version mismatch
+                        <<?BYTE(Major), ?BYTE(Minor), Rest/binary>>
+                end;
+            _ -> %% erlang:byte_size(Secret) =/= ?NUM_OF_PREMASTERSECRET_BYTES
+                FakeSecret
+        catch 
+            #alert{description = ?DECRYPT_ERROR} ->
+                FakeSecret
+        end,    
     calculate_master_secret(PremasterSecret, State, Connection, certify, cipher);
-
 certify_client_key_exchange(#client_diffie_hellman_public{dh_public = ClientPublicDhKey},
 			    #state{diffie_hellman_params = #'DHParameter'{} = Params,
 				   diffie_hellman_keys = {_, ServerDhPrivateKey}} = State,
@@ -1561,14 +1612,12 @@ certify_client_key_exchange(#client_ec_diffie_hellman_public{dh_public = ClientP
 			    #state{diffie_hellman_keys = ECDHKey} = State, Connection) ->
     PremasterSecret = ssl_handshake:premaster_secret(#'ECPoint'{point = ClientPublicEcDhPoint}, ECDHKey),
     calculate_master_secret(PremasterSecret, State, Connection, certify, cipher);
-
 certify_client_key_exchange(#client_psk_identity{} = ClientKey,
 			    #state{ssl_options = 
 				       #ssl_options{user_lookup_fun = PSKLookup}} = State0,
 			    Connection) ->
     PremasterSecret = ssl_handshake:premaster_secret(ClientKey, PSKLookup),
     calculate_master_secret(PremasterSecret, State0, Connection, certify, cipher);
-
 certify_client_key_exchange(#client_dhe_psk_identity{} = ClientKey,
 			    #state{diffie_hellman_params = #'DHParameter'{} = Params,
 				   diffie_hellman_keys = {_, ServerDhPrivateKey},
@@ -1578,7 +1627,6 @@ certify_client_key_exchange(#client_dhe_psk_identity{} = ClientKey,
     PremasterSecret = 
 	ssl_handshake:premaster_secret(ClientKey, ServerDhPrivateKey, Params, PSKLookup),
     calculate_master_secret(PremasterSecret, State0, Connection, certify, cipher);
-
 certify_client_key_exchange(#client_ecdhe_psk_identity{} = ClientKey,
 			    #state{diffie_hellman_keys = ServerEcDhPrivateKey,
 				   ssl_options =
@@ -1587,7 +1635,6 @@ certify_client_key_exchange(#client_ecdhe_psk_identity{} = ClientKey,
     PremasterSecret =
 	ssl_handshake:premaster_secret(ClientKey, ServerEcDhPrivateKey, PSKLookup),
     calculate_master_secret(PremasterSecret, State, Connection, certify, cipher);
-
 certify_client_key_exchange(#client_rsa_psk_identity{} = ClientKey,
 			    #state{private_key = Key,
 				   ssl_options = 
@@ -1595,7 +1642,6 @@ certify_client_key_exchange(#client_rsa_psk_identity{} = ClientKey,
 			    Connection) ->
     PremasterSecret = ssl_handshake:premaster_secret(ClientKey, Key, PSKLookup),
     calculate_master_secret(PremasterSecret, State0, Connection, certify, cipher);
-
 certify_client_key_exchange(#client_srp_public{} = ClientKey,
 			    #state{srp_params = Params,
 				   srp_keys = Key
@@ -1610,7 +1656,6 @@ certify_server(#state{key_algorithm = Algo} = State, _) when Algo == dh_anon;
 							     Algo == ecdhe_psk; 
 							     Algo == srp_anon  ->
     State;
-
 certify_server(#state{cert_db = CertDbHandle,
 		      cert_db_ref = CertDbRef,
 		      session = #session{own_certificate = OwnCert}} = State, Connection) ->
@@ -1644,7 +1689,6 @@ key_exchange(#state{role = server, key_algorithm = Algo,
 					       PrivateKey}),
     State = Connection:queue_handshake(Msg, State0),
     State#state{diffie_hellman_keys = DHKeys};
-
 key_exchange(#state{role = server, private_key = Key, key_algorithm = Algo} = State, _)
   when Algo == ecdh_ecdsa; Algo == ecdh_rsa ->
     State#state{diffie_hellman_keys = Key};
@@ -1670,7 +1714,6 @@ key_exchange(#state{role = server, key_algorithm = Algo,
 				       PrivateKey}),
     State = Connection:queue_handshake(Msg, State0),
     State#state{diffie_hellman_keys = ECDHKeys};
-
 key_exchange(#state{role = server, key_algorithm = psk,
 		    ssl_options = #ssl_options{psk_identity = undefined}} = State, _) ->
     State;
@@ -1691,7 +1734,6 @@ key_exchange(#state{role = server, key_algorithm = psk,
 				      ServerRandom,
 						       PrivateKey}),
     Connection:queue_handshake(Msg, State0);
-
 key_exchange(#state{role = server, key_algorithm = dhe_psk,
 		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
 		    hashsign_algorithm = HashSignAlgo,
@@ -1713,7 +1755,6 @@ key_exchange(#state{role = server, key_algorithm = dhe_psk,
 				       PrivateKey}),
     State = Connection:queue_handshake(Msg, State0),
     State#state{diffie_hellman_keys = DHKeys};
-
 key_exchange(#state{role = server, key_algorithm = ecdhe_psk,
 		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
 		    hashsign_algorithm = HashSignAlgo,
@@ -1735,7 +1776,6 @@ key_exchange(#state{role = server, key_algorithm = ecdhe_psk,
 				       PrivateKey}),
     State = Connection:queue_handshake(Msg, State0),
     State#state{diffie_hellman_keys = ECDHKeys};
-
 key_exchange(#state{role = server, key_algorithm = rsa_psk,
 		    ssl_options = #ssl_options{psk_identity = undefined}} = State, _) ->
     State;
@@ -1756,7 +1796,6 @@ key_exchange(#state{role = server, key_algorithm = rsa_psk,
 				       ServerRandom,
 				       PrivateKey}),
     Connection:queue_handshake(Msg, State0);
-
 key_exchange(#state{role = server, key_algorithm = Algo,
 		    ssl_options = #ssl_options{user_lookup_fun = LookupFun},
 		    hashsign_algorithm = HashSignAlgo,
@@ -1787,7 +1826,6 @@ key_exchange(#state{role = server, key_algorithm = Algo,
     State = Connection:queue_handshake(Msg, State0),
     State#state{srp_params = SrpParams,
 		srp_keys = Keys};
-
 key_exchange(#state{role = client,
 		    key_algorithm = rsa,
 		    public_key_info = PublicKeyInfo,
@@ -1795,7 +1833,6 @@ key_exchange(#state{role = client,
 		    premaster_secret = PremasterSecret} = State0, Connection) ->
     Msg = rsa_key_exchange(ssl:tls_version(Version), PremasterSecret, PublicKeyInfo),
     Connection:queue_handshake(Msg, State0);
-
 key_exchange(#state{role = client,
 		    key_algorithm = Algorithm,
 		    negotiated_version = Version,
@@ -1816,7 +1853,6 @@ key_exchange(#state{role = client,
        Algorithm == ecdh_anon ->
     Msg = ssl_handshake:key_exchange(client, ssl:tls_version(Version), {ecdh, Keys}),
     Connection:queue_handshake(Msg, State0);
-
 key_exchange(#state{role = client,
 		    ssl_options = SslOpts,
 		    key_algorithm = psk,
@@ -1824,7 +1860,6 @@ key_exchange(#state{role = client,
     Msg =  ssl_handshake:key_exchange(client, ssl:tls_version(Version), 
 				      {psk, SslOpts#ssl_options.psk_identity}),
     Connection:queue_handshake(Msg, State0);
-
 key_exchange(#state{role = client,
 		    ssl_options = SslOpts,
 		    key_algorithm = dhe_psk,
@@ -1855,7 +1890,6 @@ key_exchange(#state{role = client,
     Msg = rsa_psk_key_exchange(ssl:tls_version(Version), SslOpts#ssl_options.psk_identity,
 			       PremasterSecret, PublicKeyInfo),
     Connection:queue_handshake(Msg, State0);
-
 key_exchange(#state{role = client,
 		    key_algorithm = Algorithm,
 		    negotiated_version = Version,
@@ -2244,10 +2278,7 @@ set_socket_opts(_,_, _, [{active, _} = Opt| _], SockOpts, _) ->
 set_socket_opts(ConnectionCb, Transport, Socket, [Opt | Opts], SockOpts, Other) ->
     set_socket_opts(ConnectionCb, Transport, Socket, Opts, SockOpts, [Opt | Other]).
 
-start_or_recv_cancel_timer(infinity, _RecvFrom) ->
-    undefined;
-start_or_recv_cancel_timer(Timeout, RecvFrom) ->
-    erlang:send_after(Timeout, self(), {cancel_start_or_recv, RecvFrom}).
+
 
 hibernate_after(connection = StateName, 
 		#state{ssl_options=#ssl_options{hibernate_after = HibernateAfter}} = State,
@@ -2426,8 +2457,8 @@ handle_active_option(_, connection = StateName0, To, Reply, #state{protocol_cb =
 	    hibernate_after(StateName, State, [{reply, To, Reply}]);
 	{next_state, StateName, State, Actions} -> 
 	    hibernate_after(StateName, State, [{reply, To, Reply} | Actions]);
-	{stop, Reason, State} ->
-	    {stop, Reason, State}
+	{stop, _, _} = Stop ->
+	    Stop
     end;
 handle_active_option(_, StateName, To, Reply, #state{user_data_buffer = <<>>} = State) ->
     %% Active once already set 
@@ -2436,8 +2467,8 @@ handle_active_option(_, StateName, To, Reply, #state{user_data_buffer = <<>>} =
 %% user_data_buffer =/= <<>>
 handle_active_option(_, StateName0, To, Reply, #state{protocol_cb = Connection} = State0) -> 
     case read_application_data(<<>>, State0) of
-	{stop, Reason, State} ->
-	    {stop, Reason, State};
+	{stop, _, _} = Stop ->
+	    Stop;
 	{Record, State1} ->
 	    %% Note: Renogotiation may cause StateName0 =/= StateName
 	    case Connection:next_event(StateName0, Record, State1) of
@@ -2595,7 +2626,8 @@ send_or_reply(_, Pid, _From, Data) ->
     send_user(Pid, Data).
 
 send_user(Pid, Msg) ->
-    Pid ! Msg.
+    Pid ! Msg,
+    ok.
 
 alert_user(Transport, Tracker, Socket, connection, Opts, Pid, From, Alert, Role, Connection) ->
     alert_user(Transport, Tracker, Socket, Opts#socket_options.active, Pid, From, Alert, Role, Connection);
@@ -2632,45 +2664,6 @@ log_alert(true, Role, ProtocolName, StateName, Alert) ->
 log_alert(false, _, _, _, _) ->
     ok.
 
-handle_own_alert(Alert, Version, StateName, 
-		 #state{role = Role,
-                        transport_cb = Transport,
-                        socket = Socket,
-                        protocol_cb = Connection,
-                        connection_states = ConnectionStates,
-                        ssl_options = SslOpts} = State) ->
-    try %% Try to tell the other side
-	{BinMsg, _} =
-	Connection:encode_alert(Alert, Version, ConnectionStates),
-	Connection:send(Transport, Socket, BinMsg)
-    catch _:_ ->  %% Can crash if we are in a uninitialized state
-	    ignore
-    end,
-    try %% Try to tell the local user
-	log_alert(SslOpts#ssl_options.log_alert, Role, Connection:protocol_name(), StateName, Alert#alert{role = Role}),
-	handle_normal_shutdown(Alert,StateName, State)
-    catch _:_ ->
-	    ok
-    end,
-    {stop, {shutdown, own_alert}}.
-
-handle_normal_shutdown(Alert, _, #state{socket = Socket,
-					transport_cb = Transport,
-					protocol_cb = Connection,
-					start_or_recv_from = StartFrom,
-					tracker = Tracker,
-					role = Role, renegotiation = {false, first}}) ->
-    alert_user(Transport, Tracker,Socket, StartFrom, Alert, Role, Connection);
-
-handle_normal_shutdown(Alert, StateName, #state{socket = Socket,
-						socket_options = Opts,
-						transport_cb = Transport,
-						protocol_cb = Connection,
-						user_application = {_Mon, Pid},
-						tracker = Tracker,
-						start_or_recv_from = RecvFrom, role = Role}) ->
-    alert_user(Transport, Tracker, Socket, StateName, Opts, Pid, RecvFrom, Alert, Role, Connection).
-
 invalidate_session(client, Host, Port, Session) ->
     ssl_manager:invalidate_session(Host, Port, Session);
 invalidate_session(server, _, Port, Session) ->
@@ -2727,3 +2720,42 @@ new_emulated([], EmOpts) ->
     EmOpts;
 new_emulated(NewEmOpts, _) ->
     NewEmOpts.
+%%---------------Erlang distribution --------------------------------------
+
+send_dist_data(StateName, State, DHandle, Acc) ->
+    case erlang:dist_ctrl_get_data(DHandle) of
+        none ->
+            erlang:dist_ctrl_get_data_notification(DHandle),
+            hibernate_after(StateName, State, lists:reverse(Acc));
+        Data ->
+            send_dist_data(
+              StateName, State, DHandle,
+              [{next_event, {call, {self(), undefined}}, {application_data, Data}}
+               |Acc])
+    end.
+
+%% Overload mitigation
+eat_msgs(Msg) ->
+    receive Msg -> eat_msgs(Msg)
+    after 0 -> ok
+    end.
+
+%% When acting as distribution controller map the exit reason
+%% to follow the documented nodedown_reason for net_kernel
+stop(Reason, State) ->
+    {stop, erl_dist_stop_reason(Reason, State), State}.
+
+stop_and_reply(Reason, Replies, State) ->
+    {stop_and_reply, erl_dist_stop_reason(Reason, State), Replies, State}.
+
+erl_dist_stop_reason(
+  Reason, #state{ssl_options = #ssl_options{erl_dist = true}}) ->
+    case Reason of
+        normal ->
+            %% We can not exit with normal since that will not bring
+            %% down the rest of the distribution processes
+            {shutdown, normal};
+        _ -> Reason
+    end;
+erl_dist_stop_reason(Reason, _State) ->
+    Reason.
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl
index 3e26f67de1..f9d2149170 100644
--- a/lib/ssl/src/ssl_connection.hrl
+++ b/lib/ssl/src/ssl_connection.hrl
@@ -57,6 +57,7 @@
 	  session_cache_cb      :: atom(),
 	  crl_db                :: term(), 
           negotiated_version    :: ssl_record:ssl_version() | 'undefined',
+          client_hello_version  :: ssl_record:ssl_version() | 'undefined',
           client_certificate_requested = false :: boolean(),
 	  key_algorithm         :: ssl_cipher:key_algo(),
 	  hashsign_algorithm = {undefined, undefined},
diff --git a/lib/ssl/src/ssl_crl_cache.erl b/lib/ssl/src/ssl_crl_cache.erl
index 8817b0c884..66f46da75f 100644
--- a/lib/ssl/src/ssl_crl_cache.erl
+++ b/lib/ssl/src/ssl_crl_cache.erl
@@ -92,8 +92,8 @@ delete({der, CRLs}) ->
     ssl_manager:delete_crls({?NO_DIST_POINT, CRLs});
 
 delete(URI) ->
-    case http_uri:parse(URI) of
-	{ok, {http, _, _ , _, Path,_}} -> 
+    case uri_string:normalize(URI, [return_map]) of
+	#{scheme := "http", path := Path} ->
 	    ssl_manager:delete_crls(string:trim(Path, leading, "/"));
 	_ ->
 	    {error, {only_http_distribution_points_supported, URI}}
@@ -103,8 +103,8 @@ delete(URI) ->
 %%% Internal functions
 %%--------------------------------------------------------------------
 do_insert(URI, CRLs) ->
-    case http_uri:parse(URI) of
-	{ok, {http, _, _ , _, Path,_}} -> 
+    case uri_string:normalize(URI, [return_map]) of
+	#{scheme := "http", path := Path} ->
 	    ssl_manager:insert_crls(string:trim(Path, leading, "/"), CRLs);
 	_ ->
 	    {error, {only_http_distribution_points_supported, URI}}
@@ -161,7 +161,7 @@ http_get(URL, Rest, CRLDbInfo, Timeout) ->
 cache_lookup(_, undefined) ->
     [];
 cache_lookup(URL, {{Cache, _}, _}) ->
-    {ok, {_, _, _ , _, Path,_}} = http_uri:parse(URL), 
+    #{path :=  Path} = uri_string:normalize(URL, [return_map]),
     case ssl_pkix_db:lookup(string:trim(Path, leading, "/"), Cache) of
 	undefined ->
 	    [];
diff --git a/lib/ssl/src/ssl_dist_sup.erl b/lib/ssl/src/ssl_dist_sup.erl
index c241a9bced..bea67935d8 100644
--- a/lib/ssl/src/ssl_dist_sup.erl
+++ b/lib/ssl/src/ssl_dist_sup.erl
@@ -30,6 +30,9 @@
 %% Supervisor callback
 -export([init/1]).
 
+%% Debug
+-export([consult/1]).
+
 %%%=========================================================================
 %%%  API
 %%%=========================================================================
@@ -37,7 +40,18 @@
 -spec start_link() -> {ok, pid()} | ignore | {error, term()}.
 			
 start_link() ->
-    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+    case init:get_argument(ssl_dist_optfile) of
+        {ok, [File]} ->
+            DistOpts = consult(File),
+            TabOpts = [set, protected, named_table],
+            Tab = ets:new(ssl_dist_opts, TabOpts),
+            true = ets:insert(Tab, DistOpts),
+            supervisor:start_link({local, ?MODULE}, ?MODULE, []);
+        {ok, BadArg} ->
+            error({bad_ssl_dist_optfile, BadArg});
+        error ->
+            supervisor:start_link({local, ?MODULE}, ?MODULE, [])
+    end.
 
 %%%=========================================================================
 %%%  Supervisor callback
@@ -68,3 +82,52 @@ ssl_connection_sup() ->
     Modules = [ssl_connection_sup],
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
+
+consult(File) ->
+    case erl_prim_loader:get_file(File) of
+        {ok, Binary, _FullName} ->
+            Encoding =
+                case epp:read_encoding_from_binary(Binary) of
+                    none -> latin1;
+                    Enc -> Enc
+                end,
+            case unicode:characters_to_list(Binary, Encoding) of
+                {error, _String, Rest} ->
+                    error(
+                      {bad_ssl_dist_optfile, {encoding_error, Rest}});
+                {incomplete, _String, Rest} ->
+                    error(
+                      {bad_ssl_dist_optfile, {encoding_incomplete, Rest}});
+                String when is_list(String) ->
+                    consult_string(String)
+            end;
+        error ->
+            error({bad_ssl_dist_optfile, File})
+    end.
+
+consult_string(String) ->
+    case erl_scan:string(String) of
+        {error, Info, Location} ->
+            error({bad_ssl_dist_optfile, {scan_error, Info, Location}});
+        {ok, Tokens, _EndLocation} ->
+            consult_tokens(Tokens)
+    end.
+
+consult_tokens(Tokens) ->
+    case erl_parse:parse_exprs(Tokens) of
+        {error, Info} ->
+            error({bad_ssl_dist_optfile, {parse_error, Info}});
+        {ok, [Expr]} ->
+            consult_expr(Expr);
+        {ok, Other} ->
+            error({bad_ssl_dist_optfile, {parse_error, Other}})
+    end.
+
+consult_expr(Expr) ->
+    {value, Value, Bs} = erl_eval:expr(Expr, erl_eval:new_bindings()),
+    case erl_eval:bindings(Bs) of
+        [] ->
+            Value;
+        Other ->
+            error({bad_ssl_dist_optfile, {bindings, Other}})
+    end.
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 81d38a38e4..9e2b12b186 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -44,46 +44,44 @@
 			 #client_key_exchange{} | #finished{} | #certificate_verify{} |
 			 #hello_request{} | #next_protocol{}.
 
-%% Handshake messages
+%% Create handshake messages
 -export([hello_request/0, server_hello/4, server_hello_done/0,
-	 certificate/4, certificate_request/5, key_exchange/3,
+	 certificate/4,  client_certificate_verify/6,  certificate_request/5, key_exchange/3,
 	 finished/5,  next_protocol/1]).
 
 %% Handle handshake messages
--export([certify/7, client_certificate_verify/6, certificate_verify/6, verify_signature/5,
+-export([certify/7, certificate_verify/6, verify_signature/5,
 	 master_secret/4, server_key_exchange_hash/2, verify_connection/6,
-	 init_handshake_history/0, update_handshake_history/3, verify_server_key/5
+	 init_handshake_history/0, update_handshake_history/3, verify_server_key/5,
+         select_version/3
 	]).
 
-%% Encode/Decode
+%% Encode
 -export([encode_handshake/2, encode_hello_extensions/1,
-	 encode_client_protocol_negotiation/2, encode_protocols_advertised_on_server/1,
-	 decode_handshake/3, decode_hello_extensions/1,
+	 encode_client_protocol_negotiation/2, encode_protocols_advertised_on_server/1]).
+%% Decode
+-export([decode_handshake/3, decode_hello_extensions/1,
 	 decode_server_key/3, decode_client_key/3,
 	 decode_suites/2
 	]).
 
 %% Cipher suites handling
--export([available_suites/2, available_signature_algs/2, cipher_suites/2,
-	 select_session/11, supported_ecc/1, available_signature_algs/4]).
+-export([available_suites/2, available_signature_algs/2,  available_signature_algs/4, 
+         cipher_suites/3, prf/6, select_session/11, supported_ecc/1,
+         premaster_secret/2, premaster_secret/3, premaster_secret/4]).
 
 %% Extensions handling
 -export([client_hello_extensions/5,
 	 handle_client_hello_extensions/9, %% Returns server hello extensions
-	 handle_server_hello_extensions/9, select_curve/2, select_curve/3
+	 handle_server_hello_extensions/9, select_curve/2, select_curve/3,
+         select_hashsign/4, select_hashsign/5,
+	 select_hashsign_algs/3
 	]).
 
-%% MISC
--export([select_version/3, prf/6,  select_hashsign/4, select_hashsign/5,
-	 select_hashsign_algs/3,
-	 premaster_secret/2, premaster_secret/3, premaster_secret/4]).
-
 %%====================================================================
-%% Internal application API
+%% Create handshake messages 
 %%====================================================================
 
-%% ---------- Create handshake messages  ----------
-
 %%--------------------------------------------------------------------
 -spec hello_request() -> #hello_request{}.
 %%
@@ -119,31 +117,6 @@ server_hello(SessionId, Version, ConnectionStates, Extensions) ->
 server_hello_done() ->
     #server_hello_done{}.
 
-client_hello_extensions(Version, CipherSuites, 
-			#ssl_options{signature_algs = SupportedHashSigns,
-				     eccs = SupportedECCs} = SslOpts, ConnectionStates, Renegotiation) ->
-    {EcPointFormats, EllipticCurves} =
-	case advertises_ec_ciphers(lists:map(fun ssl_cipher:suite_definition/1, CipherSuites)) of
-	    true ->
-		client_ecc_extensions(SupportedECCs);
-	    false ->
-		{undefined, undefined}
-	end,
-    SRP = srp_user(SslOpts),
-
-    #hello_extensions{
-       renegotiation_info = renegotiation_info(tls_record, client,
-					       ConnectionStates, Renegotiation),
-       srp = SRP,
-       signature_algs = available_signature_algs(SupportedHashSigns, Version),
-       ec_point_formats = EcPointFormats,
-       elliptic_curves = EllipticCurves,
-       alpn = encode_alpn(SslOpts#ssl_options.alpn_advertised_protocols, Renegotiation),
-       next_protocol_negotiation =
-	   encode_client_protocol_negotiation(SslOpts#ssl_options.next_protocol_selector,
-					      Renegotiation),
-       sni = sni(SslOpts#ssl_options.server_name_indication)}.
-
 %%--------------------------------------------------------------------
 -spec certificate(der_cert(), db_handle(), certdb_ref(), client | server) -> #certificate{} | #alert{}.
 %%
@@ -171,14 +144,6 @@ certificate(OwnCert, CertDbHandle, CertDbRef, server) ->
     end.
 
 %%--------------------------------------------------------------------
--spec next_protocol(binary()) -> #next_protocol{}.
-%%
-%% Description: Creates a next protocol message
-%%-------------------------------------------------------------------
-next_protocol(SelectedProtocol) ->
-  #next_protocol{selected_protocol = SelectedProtocol}.
-
-%%--------------------------------------------------------------------
 -spec client_certificate_verify(undefined | der_cert(), binary(),
 				ssl_record:ssl_version(), term(), public_key:private_key(),
 				ssl_handshake_history()) ->
@@ -224,12 +189,18 @@ certificate_request(CipherSuite, CertDbHandle, CertDbRef, HashSigns, Version) ->
 		   {dh, binary()} |
 		   {dh, {binary(), binary()}, #'DHParameter'{}, {HashAlgo::atom(), SignAlgo::atom()},
 		   binary(), binary(), public_key:private_key()} |
+		   {ecdh, _, _, _, _, _} |
 		   {ecdh, #'ECPrivateKey'{}} |
+		   {psk, _, _, _, _, _} |
 		   {psk, binary()} |
+		   {dhe_psk, _, _, _, _, _, _, _} |
 		   {dhe_psk, binary(), binary()} |
+		   {ecdhe_psk, _, _, _, _, _, _} |
 		   {ecdhe_psk, binary(), #'ECPrivateKey'{}} |
 		   {srp, {binary(), binary()}, #srp_user{}, {HashAlgo::atom(), SignAlgo::atom()},
-		   binary(), binary(), public_key:private_key()}) ->
+                    binary(), binary(), public_key:private_key()} |
+		   {srp, _} |
+                   {psk_premaster_secret, _, _, _}) ->
     #client_key_exchange{} | #server_key_exchange{}.
 
 %%
@@ -346,22 +317,51 @@ key_exchange(server, Version, {srp, {PublicKey, _},
 finished(Version, Role, PrfAlgo, MasterSecret, {Handshake, _}) -> % use the current handshake
     #finished{verify_data =
 	      calc_finished(Version, Role, PrfAlgo, MasterSecret, Handshake)}.
+%%--------------------------------------------------------------------
+-spec next_protocol(binary()) -> #next_protocol{}.
+%%
+%% Description: Creates a next protocol message
+%%-------------------------------------------------------------------
+next_protocol(SelectedProtocol) ->
+  #next_protocol{selected_protocol = SelectedProtocol}.
 
-%% ---------- Handle handshake messages  ----------
+%%====================================================================
+%% Handle handshake messages 
+%%====================================================================
+%%--------------------------------------------------------------------
+-spec certify(#certificate{}, db_handle(), certdb_ref(), #ssl_options{}, term(),
+	      client | server, inet:hostname() | inet:ip_address()) ->  {der_cert(), public_key_info()} | #alert{}.
+%%
+%% Description: Handles a certificate handshake message
+%%--------------------------------------------------------------------
+certify(#certificate{asn1_certificates = ASN1Certs}, CertDbHandle, CertDbRef,
+        Opts, CRLDbHandle, Role, Host) ->    
 
-verify_server_key(#server_key_params{params_bin = EncParams,
-				     signature = Signature},
-		  HashSign = {HashAlgo, _},
-		  ConnectionStates, Version, PubKeyInfo) ->
-    #{security_parameters := SecParams} =
-	ssl_record:pending_connection_state(ConnectionStates, read),
-    #security_parameters{client_random = ClientRandom,
-			 server_random = ServerRandom} = SecParams,
-    Hash = server_key_exchange_hash(HashAlgo,
-				    <<ClientRandom/binary,
-				      ServerRandom/binary,
-				      EncParams/binary>>),
-    verify_signature(Version, Hash, HashSign, Signature, PubKeyInfo).
+    ServerName = server_name(Opts#ssl_options.server_name_indication, Host, Role),
+    [PeerCert | _] = ASN1Certs,       
+    try
+	{TrustedCert, CertPath}  =
+	    ssl_certificate:trusted_cert_and_path(ASN1Certs, CertDbHandle, CertDbRef,  
+                                                  Opts#ssl_options.partial_chain),
+        ValidationFunAndState = validation_fun_and_state(Opts#ssl_options.verify_fun, Role, 
+                                                         CertDbHandle, CertDbRef, ServerName,
+                                                         Opts#ssl_options.crl_check, CRLDbHandle, CertPath),
+	case public_key:pkix_path_validation(TrustedCert,
+					     CertPath,
+					     [{max_path_length,  Opts#ssl_options.depth},
+					      {verify_fun, ValidationFunAndState}]) of
+	    {ok, {PublicKeyInfo,_}} ->
+		{PeerCert, PublicKeyInfo};
+	    {error, Reason} ->
+		path_validation_alert(Reason)
+	end
+    catch
+	error:{badmatch,{asn1, Asn1Reason}} ->
+	    %% ASN-1 decode of certificate somehow failed
+            ?ALERT_REC(?FATAL, ?CERTIFICATE_UNKNOWN, {failed_to_decode_certificate, Asn1Reason});
+        error:OtherReason ->
+            ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, {unexpected_error, OtherReason})
+    end.
 
 %%--------------------------------------------------------------------
 -spec certificate_verify(binary(), public_key_info(), ssl_record:ssl_version(), term(),
@@ -404,43 +404,55 @@ verify_signature(_, Hash, {HashAlgo, _SignAlg}, Signature,
 		 {?'id-ecPublicKey', PublicKey, PublicKeyParams}) ->
     public_key:verify({digest, Hash}, HashAlgo, Signature, {PublicKey, PublicKeyParams}).
 
-
 %%--------------------------------------------------------------------
--spec certify(#certificate{}, db_handle(), certdb_ref(), #ssl_options{}, term(),
-	      client | server, inet:hostname() | inet:ip_address()) ->  {der_cert(), public_key_info()} | #alert{}.
+-spec master_secret(ssl_record:ssl_version(), #session{} | binary(), ssl_record:connection_states(),
+		   client | server) -> {binary(), ssl_record:connection_states()} | #alert{}.
 %%
-%% Description: Handles a certificate handshake message
-%%--------------------------------------------------------------------
-certify(#certificate{asn1_certificates = ASN1Certs}, CertDbHandle, CertDbRef,
-        Opts, CRLDbHandle, Role, Host) ->    
+%% Description: Sets or calculates the master secret and calculate keys,
+%% updating the pending connection states. The Mastersecret and the update
+%% connection states are returned or an alert if the calculation fails.
+%%-------------------------------------------------------------------
+master_secret(Version, #session{master_secret = Mastersecret},
+	      ConnectionStates, Role) ->
+    #{security_parameters := SecParams} =
+	ssl_record:pending_connection_state(ConnectionStates, read),
+    try master_secret(Version, Mastersecret, SecParams,
+		      ConnectionStates, Role)
+    catch
+	exit:_ ->
+            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, key_calculation_failure)
+    end;
 
-    ServerName = server_name(Opts#ssl_options.server_name_indication, Host, Role),
-    [PeerCert | _] = ASN1Certs,       
-    try
-	{TrustedCert, CertPath}  =
-	    ssl_certificate:trusted_cert_and_path(ASN1Certs, CertDbHandle, CertDbRef,  
-                                                  Opts#ssl_options.partial_chain),
-        ValidationFunAndState = validation_fun_and_state(Opts#ssl_options.verify_fun, Role, 
-                                                         CertDbHandle, CertDbRef, ServerName,
-                                                         Opts#ssl_options.crl_check, CRLDbHandle, CertPath),
-	case public_key:pkix_path_validation(TrustedCert,
-					     CertPath,
-					     [{max_path_length,  Opts#ssl_options.depth},
-					      {verify_fun, ValidationFunAndState}]) of
-	    {ok, {PublicKeyInfo,_}} ->
-		{PeerCert, PublicKeyInfo};
-	    {error, Reason} ->
-		path_validation_alert(Reason)
-	end
+master_secret(Version, PremasterSecret, ConnectionStates, Role) ->
+    #{security_parameters := SecParams} =
+	ssl_record:pending_connection_state(ConnectionStates, read),
+    
+    #security_parameters{prf_algorithm = PrfAlgo,
+			 client_random = ClientRandom,
+			 server_random = ServerRandom} = SecParams,
+    try master_secret(Version,
+		      calc_master_secret(Version,PrfAlgo,PremasterSecret,
+					 ClientRandom, ServerRandom),
+		      SecParams, ConnectionStates, Role)
     catch
-	error:{badmatch,{asn1, Asn1Reason}} ->
-	    %% ASN-1 decode of certificate somehow failed
-            ?ALERT_REC(?FATAL, ?CERTIFICATE_UNKNOWN, {failed_to_decode_certificate, Asn1Reason});
-        error:OtherReason ->
-            ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, {unexpected_error, OtherReason})
+	exit:_ ->
+            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, master_secret_calculation_failure)
     end.
 
 %%--------------------------------------------------------------------
+-spec server_key_exchange_hash(md5sha | md5 | sha | sha224 |sha256 | sha384 | sha512, binary()) -> binary().
+%%
+%% Description: Calculate server key exchange hash
+%%--------------------------------------------------------------------
+server_key_exchange_hash(md5sha, Value) ->
+    MD5 = crypto:hash(md5, Value),
+    SHA = crypto:hash(sha, Value),
+    <<MD5/binary, SHA/binary>>;
+
+server_key_exchange_hash(Hash, Value) ->
+    crypto:hash(Hash, Value).
+
+%%--------------------------------------------------------------------
 -spec verify_connection(ssl_record:ssl_version(), #finished{}, client | server, integer(), binary(),
 			ssl_handshake_history()) -> verified | #alert{}.
 %%
@@ -487,292 +499,31 @@ update_handshake_history(Handshake, % special-case SSL2 client hello
 update_handshake_history({Handshake0, _Prev}, Data, _) ->
     {[Data|Handshake0], Handshake0}.
 
-%% %%--------------------------------------------------------------------
-%% -spec decrypt_premaster_secret(binary(), #'RSAPrivateKey'{}) -> binary().
-
-%% %%
-%% %% Description: Public key decryption using the private key.
-%% %%--------------------------------------------------------------------
-%% decrypt_premaster_secret(Secret, RSAPrivateKey) ->
-%%     try public_key:decrypt_private(Secret, RSAPrivateKey,
-%% 				   [{rsa_pad, rsa_pkcs1_padding}])
-%%     catch
-%% 	_:_ ->
-%% 	    throw(?ALERT_REC(?FATAL, ?DECRYPT_ERROR))
-%%     end.
-
-premaster_secret(OtherPublicDhKey, MyPrivateKey, #'DHParameter'{} = Params) ->
-    try 
-	public_key:compute_key(OtherPublicDhKey, MyPrivateKey, Params)  
-    catch 
-	error:computation_failed -> 
-	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
-    end;	   
-premaster_secret(PublicDhKey, PrivateDhKey, #server_dh_params{dh_p = Prime, dh_g = Base}) ->
-    try 
-	crypto:compute_key(dh, PublicDhKey, PrivateDhKey, [Prime, Base])
-    catch 
-	error:computation_failed -> 
-	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
-    end;
-premaster_secret(#client_srp_public{srp_a = ClientPublicKey}, ServerKey, #srp_user{prime = Prime,
-										   verifier = Verifier}) ->
-    case crypto:compute_key(srp, ClientPublicKey, ServerKey, {host, [Verifier, Prime, '6a']}) of
-	error ->
-	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER));
-	PremasterSecret ->
-	    PremasterSecret
-    end;
-premaster_secret(#server_srp_params{srp_n = Prime, srp_g = Generator, srp_s = Salt, srp_b = Public},
-		 ClientKeys, {Username, Password}) ->
-    case ssl_srp_primes:check_srp_params(Generator, Prime) of
-	ok ->
-	    DerivedKey = crypto:hash(sha, [Salt, crypto:hash(sha, [Username, <<$:>>, Password])]),
-	    case crypto:compute_key(srp, Public, ClientKeys, {user, [DerivedKey, Prime, Generator, '6a']}) of
-		error ->
-		    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER));
-		PremasterSecret ->
-		    PremasterSecret
-	    end;
-	_ ->
-	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
-    end;
-premaster_secret(#client_rsa_psk_identity{
-		    identity = PSKIdentity,
-		    exchange_keys = #encrypted_premaster_secret{premaster_secret = EncPMS}
-		   }, #'RSAPrivateKey'{} = Key, PSKLookup) ->
-    PremasterSecret = premaster_secret(EncPMS, Key),
-    psk_secret(PSKIdentity, PSKLookup, PremasterSecret);
-premaster_secret(#server_dhe_psk_params{
-		    hint = IdentityHint,
-		    dh_params =  #server_dh_params{dh_y = PublicDhKey} = Params},
-		    PrivateDhKey,
-		    LookupFun) ->
-    PremasterSecret = premaster_secret(PublicDhKey, PrivateDhKey, Params),
-    psk_secret(IdentityHint, LookupFun, PremasterSecret);
-
-premaster_secret(#server_ecdhe_psk_params{
-		    hint = IdentityHint,
-                    dh_params = #server_ecdh_params{
-                                   public = ECServerPubKey}},
-		    PrivateEcDhKey,
-		    LookupFun) ->
-    PremasterSecret = premaster_secret(#'ECPoint'{point = ECServerPubKey}, PrivateEcDhKey),
-    psk_secret(IdentityHint, LookupFun, PremasterSecret);
-
-premaster_secret({rsa_psk, PSKIdentity}, PSKLookup, RSAPremasterSecret) ->
-    psk_secret(PSKIdentity, PSKLookup, RSAPremasterSecret);
-
-premaster_secret(#client_ecdhe_psk_identity{
-		    identity =  PSKIdentity,
-		    dh_public = PublicEcDhPoint}, PrivateEcDhKey, PSKLookup) ->
-    PremasterSecret = premaster_secret(#'ECPoint'{point = PublicEcDhPoint}, PrivateEcDhKey),
-    psk_secret(PSKIdentity, PSKLookup, PremasterSecret).
-
-premaster_secret(#client_dhe_psk_identity{
-		    identity =  PSKIdentity,
-		    dh_public = PublicDhKey}, PrivateKey, #'DHParameter'{} = Params, PSKLookup) ->
-    PremasterSecret = premaster_secret(PublicDhKey, PrivateKey, Params),
-    psk_secret(PSKIdentity, PSKLookup, PremasterSecret).
-
-premaster_secret(#client_psk_identity{identity = PSKIdentity}, PSKLookup) ->
-    psk_secret(PSKIdentity, PSKLookup);
-premaster_secret({psk, PSKIdentity}, PSKLookup) ->
-    psk_secret(PSKIdentity, PSKLookup);
-premaster_secret(#'ECPoint'{} = ECPoint, #'ECPrivateKey'{} = ECDHKeys) ->
-    public_key:compute_key(ECPoint, ECDHKeys);
-premaster_secret(EncSecret, #'RSAPrivateKey'{} = RSAPrivateKey) ->
-    try public_key:decrypt_private(EncSecret, RSAPrivateKey,
-				   [{rsa_pad, rsa_pkcs1_padding}])
-    catch
-	_:_ ->
-	    throw(?ALERT_REC(?FATAL, ?DECRYPT_ERROR))
-    end.
-%%--------------------------------------------------------------------
--spec server_key_exchange_hash(md5sha | md5 | sha | sha224 |sha256 | sha384 | sha512, binary()) -> binary().
-%%
-%% Description: Calculate server key exchange hash
-%%--------------------------------------------------------------------
-server_key_exchange_hash(md5sha, Value) ->
-    MD5 = crypto:hash(md5, Value),
-    SHA = crypto:hash(sha, Value),
-    <<MD5/binary, SHA/binary>>;
-
-server_key_exchange_hash(Hash, Value) ->
-    crypto:hash(Hash, Value).
-%%--------------------------------------------------------------------
--spec prf(ssl_record:ssl_version(), non_neg_integer(), binary(), binary(), [binary()], non_neg_integer()) ->
-		 {ok, binary()} | {error, undefined}.
-%%
-%% Description: use the TLS PRF to generate key material
-%%--------------------------------------------------------------------
-prf({3,0}, _, _, _, _, _) ->
-    {error, undefined};
-prf({3,_N}, PRFAlgo, Secret, Label, Seed, WantedLength) ->
-    {ok, tls_v1:prf(PRFAlgo, Secret, Label, Seed, WantedLength)}.
-
-
-%%--------------------------------------------------------------------
--spec select_hashsign(#hash_sign_algos{} | undefined,  undefined | binary(), 
-		      atom(), [atom()], ssl_record:ssl_version()) ->
-			     {atom(), atom()} | undefined  | #alert{}.
-
-%%
-%% Description: Handles signature_algorithms hello extension (server)
-%%--------------------------------------------------------------------
-select_hashsign(_, undefined, _,  _, _Version) ->
-    {null, anon};
-%% The signature_algorithms extension was introduced with TLS 1.2. Ignore it if we have
-%% negotiated a lower version.
-select_hashsign(HashSigns, Cert, KeyExAlgo, 
-		undefined, {Major, Minor} = Version)  when Major >= 3 andalso Minor >= 3->
-    select_hashsign(HashSigns, Cert, KeyExAlgo, tls_v1:default_signature_algs(Version), Version);
-select_hashsign(#hash_sign_algos{hash_sign_algos = HashSigns}, Cert, KeyExAlgo, SupportedHashSigns,
-		{Major, Minor}) when Major >= 3 andalso Minor >= 3 ->
-    #'OTPCertificate'{tbsCertificate = TBSCert} = public_key:pkix_decode_cert(Cert, otp),
-    #'OTPCertificate'{tbsCertificate = TBSCert,
-		      signatureAlgorithm =  {_,SignAlgo, _}} = public_key:pkix_decode_cert(Cert, otp),
-    #'OTPSubjectPublicKeyInfo'{algorithm = {_, SubjAlgo, _}} = 
-     	TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
-
-    Sign = sign_algo(SignAlgo),
-    SubSing = sign_algo(SubjAlgo),
-
-    case lists:filter(fun({_, S} = Algos) when S == Sign ->
-			      is_acceptable_hash_sign(Algos, Sign,
-						      SubSing, KeyExAlgo, SupportedHashSigns);
-			 (_)  ->
-			      false
-		      end, HashSigns) of
-	[] ->
-            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_signature_algorithm);
-	[HashSign | _] ->
-	    HashSign
-    end;
-select_hashsign(_, Cert, _, _, Version) ->
-    #'OTPCertificate'{tbsCertificate = TBSCert} = public_key:pkix_decode_cert(Cert, otp),
-    #'OTPSubjectPublicKeyInfo'{algorithm = {_,Algo, _}} = TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
-    select_hashsign_algs(undefined, Algo, Version).
-%%--------------------------------------------------------------------
--spec select_hashsign(#certificate_request{},  binary(), 
-		      [atom()], ssl_record:ssl_version()) ->
-			     {atom(), atom()} | #alert{}.
-
-%%
-%% Description: Handles signature algorithms selection for certificate requests (client) 
-%%--------------------------------------------------------------------
-select_hashsign(#certificate_request{}, undefined, _, {Major, Minor})  when Major >= 3 andalso Minor >= 3->
-    %% There client does not have a certificate and will send an empty reply, the server may fail 
-    %% or accept the connection by its own preference. No signature algorihms needed as there is
-    %% no certificate to verify.
-    {undefined, undefined}; 
- 
-select_hashsign(#certificate_request{hashsign_algorithms = #hash_sign_algos{hash_sign_algos = HashSigns}, 
-				     certificate_types = Types}, Cert, SupportedHashSigns, 
-		{Major, Minor})  when Major >= 3 andalso Minor >= 3->
-    #'OTPCertificate'{tbsCertificate = TBSCert} = public_key:pkix_decode_cert(Cert, otp),
-    #'OTPCertificate'{tbsCertificate = TBSCert,
-		      signatureAlgorithm =  {_,SignAlgo, _}} = public_key:pkix_decode_cert(Cert, otp),
-    #'OTPSubjectPublicKeyInfo'{algorithm = {_, SubjAlgo, _}} = 
-     	TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
-
-    Sign = sign_algo(SignAlgo),
-    SubSign = sign_algo(SubjAlgo),
-    
-    case is_acceptable_cert_type(SubSign, HashSigns, Types) andalso is_supported_sign(Sign, HashSigns) of
-	true ->
-	    case lists:filter(fun({_, S} = Algos) when S == SubSign ->
-				 is_acceptable_hash_sign(Algos, SupportedHashSigns);
-			    (_)  ->
-				      false
-			      end, HashSigns) of
-		[] ->
-		    ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_signature_algorithm);
-		[HashSign | _] ->
-		    HashSign
-	    end;
-	false ->
-	    ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_signature_algorithm)
-    end;
-select_hashsign(#certificate_request{}, Cert, _, Version) ->
-    select_hashsign(undefined, Cert, undefined, [], Version).
-
-%%--------------------------------------------------------------------
--spec select_hashsign_algs({atom(), atom()}| undefined, oid(), ssl_record:ssl_version()) ->
-				  {atom(), atom()}.
-
-%% Description: For TLS 1.2 hash function and signature algorithm pairs can be
-%% negotiated with the signature_algorithms extension,
-%% for previous versions always use appropriate defaults.
-%% RFC 5246, Sect. 7.4.1.4.1.  Signature Algorithms
-%% If the client does not send the signature_algorithms extension, the
-%% server MUST do the following: (e.i defaults for TLS 1.2)
-%%
-%% -  If the negotiated key exchange algorithm is one of (RSA, DHE_RSA,
-%%    DH_RSA, RSA_PSK, ECDH_RSA, ECDHE_RSA), behave as if client had
-%%    sent the value {sha1,rsa}.
-%%
-%% -  If the negotiated key exchange algorithm is one of (DHE_DSS,
-%%    DH_DSS), behave as if the client had sent the value {sha1,dsa}.
-%%
-%% -  If the negotiated key exchange algorithm is one of (ECDH_ECDSA,
-%%    ECDHE_ECDSA), behave as if the client had sent value {sha1,ecdsa}.
-
-%%--------------------------------------------------------------------
-select_hashsign_algs(HashSign, _, {Major, Minor}) when HashSign =/= undefined andalso
-						       Major >= 3 andalso Minor >= 3 ->
-    HashSign;
-select_hashsign_algs(undefined, ?rsaEncryption, {Major, Minor}) when Major >= 3 andalso Minor >= 3 ->
-    {sha, rsa};
-select_hashsign_algs(undefined,?'id-ecPublicKey', _) ->
-    {sha, ecdsa};
-select_hashsign_algs(undefined, ?rsaEncryption, _) -> 
-    {md5sha, rsa};
-select_hashsign_algs(undefined, ?'id-dsa', _) ->
-    {sha, dsa}.
-
-
-%%--------------------------------------------------------------------
--spec master_secret(ssl_record:ssl_version(), #session{} | binary(), ssl_record:connection_states(),
-		   client | server) -> {binary(), ssl_record:connection_states()} | #alert{}.
-%%
-%% Description: Sets or calculates the master secret and calculate keys,
-%% updating the pending connection states. The Mastersecret and the update
-%% connection states are returned or an alert if the calculation fails.
-%%-------------------------------------------------------------------
-master_secret(Version, #session{master_secret = Mastersecret},
-	      ConnectionStates, Role) ->
-    #{security_parameters := SecParams} =
-	ssl_record:pending_connection_state(ConnectionStates, read),
-    try master_secret(Version, Mastersecret, SecParams,
-		      ConnectionStates, Role)
-    catch
-	exit:_ ->
-            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, key_calculation_failure)
-    end;
-
-master_secret(Version, PremasterSecret, ConnectionStates, Role) ->
+verify_server_key(#server_key_params{params_bin = EncParams,
+				     signature = Signature},
+		  HashSign = {HashAlgo, _},
+		  ConnectionStates, Version, PubKeyInfo) ->
     #{security_parameters := SecParams} =
 	ssl_record:pending_connection_state(ConnectionStates, read),
-    
-    #security_parameters{prf_algorithm = PrfAlgo,
-			 client_random = ClientRandom,
+    #security_parameters{client_random = ClientRandom,
 			 server_random = ServerRandom} = SecParams,
-    try master_secret(Version,
-		      calc_master_secret(Version,PrfAlgo,PremasterSecret,
-					 ClientRandom, ServerRandom),
-		      SecParams, ConnectionStates, Role)
-    catch
-	exit:_ ->
-            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, master_secret_calculation_failure)
-    end.
+    Hash = server_key_exchange_hash(HashAlgo,
+				    <<ClientRandom/binary,
+				      ServerRandom/binary,
+				      EncParams/binary>>),
+    verify_signature(Version, Hash, HashSign, Signature, PubKeyInfo).
+
+select_version(RecordCB, ClientVersion, Versions) ->
+    do_select_version(RecordCB, ClientVersion, Versions).
+
+%%====================================================================
+%% Encode handshake 
+%%====================================================================
 
-%%-------------Encode/Decode --------------------------------
 encode_handshake(#next_protocol{selected_protocol = SelectedProtocol}, _Version) ->
     PaddingLength = 32 - ((byte_size(SelectedProtocol) + 2) rem 32),
     {?NEXT_PROTOCOL, <<?BYTE((byte_size(SelectedProtocol))), SelectedProtocol/binary,
                          ?BYTE(PaddingLength), 0:(PaddingLength * 8)>>};
-
 encode_handshake(#server_hello{server_version = {Major, Minor},
 			       random = Random,
 			       session_id = Session_ID,
@@ -894,71 +645,6 @@ encode_hello_extensions([#sni{hostname = Hostname} | Rest], Acc) ->
 				    ?UINT16(HostLen), HostnameBin/binary,
 				    Acc/binary>>).
 
-enc_server_key_exchange(Version, Params, {HashAlgo, SignAlgo},
-			ClientRandom, ServerRandom, PrivateKey) ->
-    EncParams = encode_server_key(Params),
-    case HashAlgo of
-	null ->
-	    #server_key_params{params = Params,
-			       params_bin = EncParams,
-			       hashsign = {null, anon},
-			       signature = <<>>};
-	_ ->
-	    Hash =
-		server_key_exchange_hash(HashAlgo, <<ClientRandom/binary,
-						     ServerRandom/binary,
-						     EncParams/binary>>),
-	    Signature = digitally_signed(Version, Hash, HashAlgo, PrivateKey),
-	    #server_key_params{params = Params,
-			       params_bin = EncParams,
-			       hashsign = {HashAlgo, SignAlgo},
-			       signature = Signature}
-    end.
-
-%%--------------------------------------------------------------------
--spec decode_client_key(binary(), ssl_cipher:key_algo(), ssl_record:ssl_version()) ->
-			    #encrypted_premaster_secret{}
-			    | #client_diffie_hellman_public{}
-			    | #client_ec_diffie_hellman_public{}
-			    | #client_psk_identity{}
-			    | #client_dhe_psk_identity{}
-			    | #client_ecdhe_psk_identity{}
-			    | #client_rsa_psk_identity{}
-			    | #client_srp_public{}.
-%%
-%% Description: Decode client_key data and return appropriate type
-%%--------------------------------------------------------------------
-decode_client_key(ClientKey, Type, Version) ->
-    dec_client_key(ClientKey, key_exchange_alg(Type), Version).
-
-%%--------------------------------------------------------------------
--spec decode_server_key(binary(), ssl_cipher:key_algo(), ssl_record:ssl_version()) ->
-			       #server_key_params{}.
-%%
-%% Description: Decode server_key data and return appropriate type
-%%--------------------------------------------------------------------
-decode_server_key(ServerKey, Type, Version) ->
-    dec_server_key(ServerKey, key_exchange_alg(Type), Version).
-
-%%
-%% Description: Encode and decode functions for ALPN extension data.
-%%--------------------------------------------------------------------
-
-%% While the RFC opens the door to allow ALPN during renegotiation, in practice
-%% this does not work and it is recommended to ignore any ALPN extension during
-%% renegotiation, as done here.
-encode_alpn(_, true) ->
-    undefined;
-encode_alpn(undefined, _) ->
-    undefined;
-encode_alpn(Protocols, _) ->
-    #alpn{extension_data = lists:foldl(fun encode_protocol/2, <<>>, Protocols)}.
-
-decode_alpn(undefined) ->
-    undefined;
-decode_alpn(#alpn{extension_data=Data}) ->
-    decode_protocols(Data, []).
-
 encode_client_protocol_negotiation(undefined, _) ->
     undefined;
 encode_client_protocol_negotiation(_, false) ->
@@ -972,6 +658,10 @@ encode_protocols_advertised_on_server(undefined) ->
 encode_protocols_advertised_on_server(Protocols) ->
 	#next_protocol_negotiation{extension_data = lists:foldl(fun encode_protocol/2, <<>>, Protocols)}.
 
+%%====================================================================
+%% Decode handshake 
+%%====================================================================
+
 decode_handshake(_, ?HELLO_REQUEST, <<>>) ->
     #hello_request{};
 decode_handshake(_, ?NEXT_PROTOCOL, <<?BYTE(SelectedProtocolLength),
@@ -1004,7 +694,6 @@ decode_handshake(_Version, ?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:3
        cipher_suite = Cipher_suite,
        compression_method = Comp_method,
        extensions = HelloExtensions};
-
 decode_handshake(_Version, ?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>) ->
     #certificate{asn1_certificates = certs_to_list(ASN1Certs)};
 decode_handshake(_Version, ?SERVER_KEY_EXCHANGE, Keys) ->
@@ -1051,83 +740,30 @@ decode_hello_extensions({client, <<?UINT16(ExtLen), Extensions:ExtLen/binary>>})
 decode_hello_extensions(Extensions) ->
     dec_hello_extensions(Extensions, #hello_extensions{}).
 
-dec_server_key(<<?UINT16(PLen), P:PLen/binary,
-		 ?UINT16(GLen), G:GLen/binary,
-		 ?UINT16(YLen), Y:YLen/binary, _/binary>> = KeyStruct,
-	       ?KEY_EXCHANGE_DIFFIE_HELLMAN, Version) ->
-    Params = #server_dh_params{dh_p = P, dh_g = G, dh_y = Y},
-    {BinMsg, HashSign, Signature} = dec_server_key_params(PLen + GLen + YLen + 6, KeyStruct, Version),
-    #server_key_params{params = Params,
-		       params_bin = BinMsg,
-		       hashsign = HashSign,
-		       signature = Signature};
-%% ECParameters with named_curve
-%% TODO: explicit curve
-dec_server_key(<<?BYTE(?NAMED_CURVE), ?UINT16(CurveID),
-		 ?BYTE(PointLen), ECPoint:PointLen/binary,
-		 _/binary>> = KeyStruct,
-	       ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN, Version) ->
-    Params = #server_ecdh_params{curve = {namedCurve, tls_v1:enum_to_oid(CurveID)},
-				 public = ECPoint},
-    {BinMsg, HashSign, Signature} = dec_server_key_params(PointLen + 4, KeyStruct, Version),
-    #server_key_params{params = Params,
-		       params_bin = BinMsg,
-		       hashsign = HashSign,
-		       signature = Signature};
-dec_server_key(<<?UINT16(Len), PskIdentityHint:Len/binary, _/binary>> = KeyStruct,
-	       KeyExchange, Version)
-  when KeyExchange == ?KEY_EXCHANGE_PSK; KeyExchange == ?KEY_EXCHANGE_RSA_PSK ->
-    Params = #server_psk_params{
-		hint = PskIdentityHint},
-    {BinMsg, HashSign, Signature} = dec_server_key_params(Len + 2, KeyStruct, Version),
-    #server_key_params{params = Params,
-		       params_bin = BinMsg,
-		       hashsign = HashSign,
-		       signature = Signature};
+%%--------------------------------------------------------------------
+-spec decode_server_key(binary(), ssl_cipher:key_algo(), ssl_record:ssl_version()) ->
+			       #server_key_params{}.
+%%
+%% Description: Decode server_key data and return appropriate type
+%%--------------------------------------------------------------------
+decode_server_key(ServerKey, Type, Version) ->
+    dec_server_key(ServerKey, key_exchange_alg(Type), Version).
 
-dec_server_key(<<?UINT16(Len), IdentityHint:Len/binary,
-		 ?UINT16(PLen), P:PLen/binary,
-		 ?UINT16(GLen), G:GLen/binary,
-		 ?UINT16(YLen), Y:YLen/binary, _/binary>> = KeyStruct,
-	       ?KEY_EXCHANGE_DHE_PSK, Version) ->
-    DHParams = #server_dh_params{dh_p = P, dh_g = G, dh_y = Y},
-    Params = #server_dhe_psk_params{
-      hint = IdentityHint,
-      dh_params = DHParams},
-    {BinMsg, HashSign, Signature} = dec_server_key_params(Len + PLen + GLen + YLen + 8, KeyStruct, Version),
-    #server_key_params{params = Params,
-		       params_bin = BinMsg,
-		       hashsign = HashSign,
-		       signature = Signature};
-dec_server_key(<<?UINT16(Len), IdentityHint:Len/binary,
-		 ?BYTE(?NAMED_CURVE), ?UINT16(CurveID),
-		 ?BYTE(PointLen), ECPoint:PointLen/binary,
-		 _/binary>> = KeyStruct,
-	       ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN_PSK, Version) ->
-    DHParams = #server_ecdh_params{
-                  curve = {namedCurve, tls_v1:enum_to_oid(CurveID)},
-                  public = ECPoint},
-    Params = #server_ecdhe_psk_params{
-      hint = IdentityHint,
-      dh_params = DHParams},
-    {BinMsg, HashSign, Signature} = dec_server_key_params(Len + 2 + PointLen + 4, KeyStruct, Version),
-    #server_key_params{params = Params,
-		       params_bin = BinMsg,
-		       hashsign = HashSign,
-		       signature = Signature};
-dec_server_key(<<?UINT16(NLen), N:NLen/binary,
-		 ?UINT16(GLen), G:GLen/binary,
-		 ?BYTE(SLen), S:SLen/binary,
-		 ?UINT16(BLen), B:BLen/binary, _/binary>> = KeyStruct,
-	       ?KEY_EXCHANGE_SRP, Version) ->
-    Params = #server_srp_params{srp_n = N, srp_g = G, srp_s = S, srp_b = B},
-    {BinMsg, HashSign, Signature} = dec_server_key_params(NLen + GLen + SLen + BLen + 7, KeyStruct, Version),
-    #server_key_params{params = Params,
-		       params_bin = BinMsg,
-		       hashsign = HashSign,
-		       signature = Signature};
-dec_server_key(_, KeyExchange, _) ->
-    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, {unknown_or_malformed_key_exchange, KeyExchange})).
+%%--------------------------------------------------------------------
+-spec decode_client_key(binary(), ssl_cipher:key_algo(), ssl_record:ssl_version()) ->
+			    #encrypted_premaster_secret{}
+			    | #client_diffie_hellman_public{}
+			    | #client_ec_diffie_hellman_public{}
+			    | #client_psk_identity{}
+			    | #client_dhe_psk_identity{}
+			    | #client_ecdhe_psk_identity{}
+			    | #client_rsa_psk_identity{}
+			    | #client_srp_public{}.
+%%
+%% Description: Decode client_key data and return appropriate type
+%%--------------------------------------------------------------------
+decode_client_key(ClientKey, Type, Version) ->
+    dec_client_key(ClientKey, key_exchange_alg(Type), Version).
 
 %%--------------------------------------------------------------------
 -spec decode_suites('2_bytes'|'3_bytes', binary()) -> list().
@@ -1139,12 +775,13 @@ decode_suites('2_bytes', Dec) ->
 decode_suites('3_bytes', Dec) ->
     from_3bytes(Dec).
 
-%%-------------Cipeher suite handling --------------------------------
+%%====================================================================
+%% Cipher suite handling
+%%====================================================================
 
 available_suites(UserSuites, Version) ->
-    lists:filtermap(fun(Suite) ->
-			    lists:member(Suite, ssl_cipher:all_suites(Version))
-		    end, UserSuites).
+    VersionSuites = ssl_cipher:all_suites(Version) ++ ssl_cipher:anonymous_suites(Version),
+    lists:filtermap(fun(Suite) -> lists:member(Suite, VersionSuites) end, UserSuites).
 
 available_suites(ServerCert, UserSuites, Version, undefined, Curve) ->
     ssl_cipher:filter(ServerCert, available_suites(UserSuites, Version))
@@ -1152,61 +789,42 @@ available_suites(ServerCert, UserSuites, Version, undefined, Curve) ->
 available_suites(ServerCert, UserSuites, Version, HashSigns, Curve) ->
     Suites = available_suites(ServerCert, UserSuites, Version, undefined, Curve),
     filter_hashsigns(Suites, [ssl_cipher:suite_definition(Suite) || Suite <- Suites], HashSigns, []).
-filter_hashsigns([], [], _, Acc) ->
-    lists:reverse(Acc);
-filter_hashsigns([Suite | Suites], [{KeyExchange,_,_,_} | Algos], HashSigns,
-		 Acc) when KeyExchange == dhe_ecdsa;
-			   KeyExchange == ecdhe_ecdsa ->
-    do_filter_hashsigns(ecdsa, Suite, Suites, Algos, HashSigns, Acc);
-
-filter_hashsigns([Suite | Suites], [{KeyExchange,_,_,_} | Algos], HashSigns,
-		 Acc) when KeyExchange == rsa;
-			   KeyExchange == dhe_rsa;
-			   KeyExchange == ecdhe_rsa;
-			   KeyExchange == srp_rsa;
-			   KeyExchange == rsa_psk ->
-    do_filter_hashsigns(rsa, Suite, Suites, Algos, HashSigns, Acc);
-filter_hashsigns([Suite | Suites], [{KeyExchange,_,_,_} | Algos], HashSigns, Acc) when 
-      KeyExchange == dhe_dss;
-      KeyExchange == srp_dss ->							       
-    do_filter_hashsigns(dsa, Suite, Suites, Algos, HashSigns, Acc);
-filter_hashsigns([Suite | Suites], [{KeyExchange,_,_,_} | Algos], HashSigns, Acc) when 
-      KeyExchange == dh_dss; 
-      KeyExchange == dh_rsa; 
-      KeyExchange == dh_ecdsa;
-      KeyExchange == ecdh_rsa;    
-      KeyExchange == ecdh_ecdsa ->
-      %%  Fixed DH certificates MAY be signed with any hash/signature
-      %%  algorithm pair appearing in the hash_sign extension.  The names
-    %%  DH_DSS, DH_RSA, ECDH_ECDSA, and ECDH_RSA are historical.
-    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]);
-filter_hashsigns([Suite | Suites], [{KeyExchange,_,_,_} | Algos], HashSigns, Acc) when 
-      KeyExchange == dh_anon;
-      KeyExchange == ecdh_anon;
-      KeyExchange == srp_anon;
-      KeyExchange == psk;
-      KeyExchange == dhe_psk;
-      KeyExchange == ecdhe_psk ->
-    %% In this case hashsigns is not used as the kexchange is anonaymous
-    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]).
-
-do_filter_hashsigns(SignAlgo, Suite, Suites, Algos, HashSigns, Acc) ->
-    case lists:keymember(SignAlgo, 2, HashSigns) of
-	true ->
-	    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]);
-	false ->
-	    filter_hashsigns(Suites, Algos, HashSigns, Acc)
-    end.
 
-unavailable_ecc_suites(no_curve) ->
-    ssl_cipher:ec_keyed_suites();
-unavailable_ecc_suites(_) ->
-    [].
+available_signature_algs(undefined, _)  ->
+    undefined;
+available_signature_algs(SupportedHashSigns, Version) when Version >= {3, 3} ->
+    #hash_sign_algos{hash_sign_algos = SupportedHashSigns};
+available_signature_algs(_, _) ->
+    undefined.
+available_signature_algs(undefined, SupportedHashSigns, _, Version) when 
+      Version >= {3,3} ->
+    SupportedHashSigns;
+available_signature_algs(#hash_sign_algos{hash_sign_algos = ClientHashSigns}, SupportedHashSigns, 
+                         _, Version) when Version >= {3,3} ->
+    sets:to_list(sets:intersection(sets:from_list(ClientHashSigns), 
+				   sets:from_list(SupportedHashSigns)));
+available_signature_algs(_, _, _, _) -> 
+    undefined.
 
+cipher_suites(Suites, Renegotiation, true) ->
+    %% TLS_FALLBACK_SCSV should be placed last -RFC7507
+    cipher_suites(Suites, Renegotiation) ++ [?TLS_FALLBACK_SCSV];
+cipher_suites(Suites, Renegotiation, false) ->
+    cipher_suites(Suites, Renegotiation).
 cipher_suites(Suites, false) ->
     [?TLS_EMPTY_RENEGOTIATION_INFO_SCSV | Suites];
 cipher_suites(Suites, true) ->
     Suites.
+%%--------------------------------------------------------------------
+-spec prf(ssl_record:ssl_version(), non_neg_integer(), binary(), binary(), [binary()], non_neg_integer()) ->
+		 {ok, binary()} | {error, undefined}.
+%%
+%% Description: use the TLS PRF to generate key material
+%%--------------------------------------------------------------------
+prf({3,0}, _, _, _, _, _) ->
+    {error, undefined};
+prf({3,_N}, PRFAlgo, Secret, Label, Seed, WantedLength) ->
+    {ok, tls_v1:prf(PRFAlgo, Secret, Label, Seed, WantedLength)}.
 
 select_session(SuggestedSessionId, CipherSuites, HashSigns, Compressions, Port, #session{ecc = ECCCurve} = 
 		   Session, Version,
@@ -1227,68 +845,121 @@ select_session(SuggestedSessionId, CipherSuites, HashSigns, Compressions, Port,
 	    {resumed, Resumed}
     end.
 
-%% Deprecated?
 supported_ecc({Major, Minor}) when ((Major == 3) and (Minor >= 1)) orelse (Major > 3) ->
     Curves = tls_v1:ecc_curves(Minor),
     #elliptic_curves{elliptic_curve_list = Curves};
 supported_ecc(_) ->
     #elliptic_curves{elliptic_curve_list = []}.
 
-%%-------------certificate handling --------------------------------
-
-certificate_types(_, {N, M}) when N >= 3 andalso M >= 3 ->
-    case proplists:get_bool(ecdsa,  
-			    proplists:get_value(public_keys, crypto:supports())) of
-	true ->
-	    <<?BYTE(?ECDSA_SIGN), ?BYTE(?RSA_SIGN), ?BYTE(?DSS_SIGN)>>;
-	false ->
-	    <<?BYTE(?RSA_SIGN), ?BYTE(?DSS_SIGN)>>
+premaster_secret(OtherPublicDhKey, MyPrivateKey, #'DHParameter'{} = Params) ->
+    try 
+	public_key:compute_key(OtherPublicDhKey, MyPrivateKey, Params)  
+    catch 
+	error:computation_failed -> 
+	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
+    end;	   
+premaster_secret(PublicDhKey, PrivateDhKey, #server_dh_params{dh_p = Prime, dh_g = Base}) ->
+    try 
+	crypto:compute_key(dh, PublicDhKey, PrivateDhKey, [Prime, Base])
+    catch 
+	error:computation_failed -> 
+	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
     end;
+premaster_secret(#client_srp_public{srp_a = ClientPublicKey}, ServerKey, #srp_user{prime = Prime,
+										   verifier = Verifier}) ->
+    case crypto:compute_key(srp, ClientPublicKey, ServerKey, {host, [Verifier, Prime, '6a']}) of
+	error ->
+	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER));
+	PremasterSecret ->
+	    PremasterSecret
+    end;
+premaster_secret(#server_srp_params{srp_n = Prime, srp_g = Generator, srp_s = Salt, srp_b = Public},
+		 ClientKeys, {Username, Password}) ->
+    case ssl_srp_primes:check_srp_params(Generator, Prime) of
+	ok ->
+	    DerivedKey = crypto:hash(sha, [Salt, crypto:hash(sha, [Username, <<$:>>, Password])]),
+	    case crypto:compute_key(srp, Public, ClientKeys, {user, [DerivedKey, Prime, Generator, '6a']}) of
+		error ->
+		    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER));
+		PremasterSecret ->
+		    PremasterSecret
+	    end;
+	_ ->
+	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
+    end;
+premaster_secret(#client_rsa_psk_identity{
+		    identity = PSKIdentity,
+		    exchange_keys = #encrypted_premaster_secret{premaster_secret = EncPMS}
+		   }, #'RSAPrivateKey'{} = Key, PSKLookup) ->
+    PremasterSecret = premaster_secret(EncPMS, Key),
+    psk_secret(PSKIdentity, PSKLookup, PremasterSecret);
+premaster_secret(#server_dhe_psk_params{
+		    hint = IdentityHint,
+		    dh_params =  #server_dh_params{dh_y = PublicDhKey} = Params},
+		    PrivateDhKey,
+		    LookupFun) ->
+    PremasterSecret = premaster_secret(PublicDhKey, PrivateDhKey, Params),
+    psk_secret(IdentityHint, LookupFun, PremasterSecret);
+premaster_secret(#server_ecdhe_psk_params{
+		    hint = IdentityHint,
+                    dh_params = #server_ecdh_params{
+                                   public = ECServerPubKey}},
+		    PrivateEcDhKey,
+		    LookupFun) ->
+    PremasterSecret = premaster_secret(#'ECPoint'{point = ECServerPubKey}, PrivateEcDhKey),
+    psk_secret(IdentityHint, LookupFun, PremasterSecret);
+premaster_secret({rsa_psk, PSKIdentity}, PSKLookup, RSAPremasterSecret) ->
+    psk_secret(PSKIdentity, PSKLookup, RSAPremasterSecret);
+premaster_secret(#client_ecdhe_psk_identity{
+		    identity =  PSKIdentity,
+		    dh_public = PublicEcDhPoint}, PrivateEcDhKey, PSKLookup) ->
+    PremasterSecret = premaster_secret(#'ECPoint'{point = PublicEcDhPoint}, PrivateEcDhKey),
+    psk_secret(PSKIdentity, PSKLookup, PremasterSecret).
+premaster_secret(#client_dhe_psk_identity{
+		    identity =  PSKIdentity,
+		    dh_public = PublicDhKey}, PrivateKey, #'DHParameter'{} = Params, PSKLookup) ->
+    PremasterSecret = premaster_secret(PublicDhKey, PrivateKey, Params),
+    psk_secret(PSKIdentity, PSKLookup, PremasterSecret).
+premaster_secret(#client_psk_identity{identity = PSKIdentity}, PSKLookup) ->
+    psk_secret(PSKIdentity, PSKLookup);
+premaster_secret({psk, PSKIdentity}, PSKLookup) ->
+    psk_secret(PSKIdentity, PSKLookup);
+premaster_secret(#'ECPoint'{} = ECPoint, #'ECPrivateKey'{} = ECDHKeys) ->
+    public_key:compute_key(ECPoint, ECDHKeys);
+premaster_secret(EncSecret, #'RSAPrivateKey'{} = RSAPrivateKey) ->
+    try public_key:decrypt_private(EncSecret, RSAPrivateKey,
+				   [{rsa_pad, rsa_pkcs1_padding}])
+    catch
+	_:_ ->
+	    throw(?ALERT_REC(?FATAL, ?DECRYPT_ERROR))
+    end.
+%%====================================================================
+%% Extensions handling
+%%====================================================================
+client_hello_extensions(Version, CipherSuites, 
+			#ssl_options{signature_algs = SupportedHashSigns,
+				     eccs = SupportedECCs} = SslOpts, ConnectionStates, Renegotiation) ->
+    {EcPointFormats, EllipticCurves} =
+	case advertises_ec_ciphers(lists:map(fun ssl_cipher:suite_definition/1, CipherSuites)) of
+	    true ->
+		client_ecc_extensions(SupportedECCs);
+	    false ->
+		{undefined, undefined}
+	end,
+    SRP = srp_user(SslOpts),
 
-certificate_types({KeyExchange, _, _, _}, _) when KeyExchange == rsa;
-						  KeyExchange == dh_rsa;
-						  KeyExchange == dhe_rsa;
-						  KeyExchange == ecdhe_rsa ->
-    <<?BYTE(?RSA_SIGN)>>;
-
-certificate_types({KeyExchange, _, _, _}, _)  when KeyExchange == dh_dss; 
-						   KeyExchange == dhe_dss;
-						   KeyExchange == srp_dss ->
-    <<?BYTE(?DSS_SIGN)>>;
-
-certificate_types({KeyExchange, _, _, _}, _) when KeyExchange == dh_ecdsa;
-						  KeyExchange == dhe_ecdsa;
-						  KeyExchange == ecdh_ecdsa;
-						  KeyExchange == ecdhe_ecdsa ->
-    <<?BYTE(?ECDSA_SIGN)>>;
-
-certificate_types(_, _) ->
-    <<?BYTE(?RSA_SIGN)>>.
-
-certificate_authorities(CertDbHandle, CertDbRef) ->
-    Authorities = certificate_authorities_from_db(CertDbHandle, CertDbRef),
-    Enc = fun(#'OTPCertificate'{tbsCertificate=TBSCert}) ->
-		  OTPSubj = TBSCert#'OTPTBSCertificate'.subject,
-		  DNEncodedBin = public_key:pkix_encode('Name', OTPSubj, otp),
-		  DNEncodedLen = byte_size(DNEncodedBin),
-		  <<?UINT16(DNEncodedLen), DNEncodedBin/binary>>
-	  end,
-    list_to_binary([Enc(Cert) || {_, Cert} <- Authorities]).
-
-certificate_authorities_from_db(CertDbHandle, CertDbRef) when is_reference(CertDbRef) ->
-    ConnectionCerts = fun({{Ref, _, _}, Cert}, Acc) when Ref  == CertDbRef ->
-			      [Cert | Acc];
-			 (_, Acc) ->
-			      Acc
-		      end,
-    ssl_pkix_db:foldl(ConnectionCerts, [], CertDbHandle);
-certificate_authorities_from_db(_CertDbHandle, {extracted, CertDbData}) ->
-    %% Cache disabled, Ref contains data
-    lists:foldl(fun({decoded, {_Key,Cert}}, Acc) -> [Cert | Acc] end,
-		[], CertDbData).
-
-
-%%-------------Extension handling --------------------------------
+    #hello_extensions{
+       renegotiation_info = renegotiation_info(tls_record, client,
+					       ConnectionStates, Renegotiation),
+       srp = SRP,
+       signature_algs = available_signature_algs(SupportedHashSigns, Version),
+       ec_point_formats = EcPointFormats,
+       elliptic_curves = EllipticCurves,
+       alpn = encode_alpn(SslOpts#ssl_options.alpn_advertised_protocols, Renegotiation),
+       next_protocol_negotiation =
+	   encode_client_protocol_negotiation(SslOpts#ssl_options.next_protocol_selector,
+					      Renegotiation),
+       sni = sni(SslOpts#ssl_options.server_name_indication)}.
 
 handle_client_hello_extensions(RecordCB, Random, ClientCipherSuites,
 			       #hello_extensions{renegotiation_info = Info,
@@ -1365,233 +1036,208 @@ handle_server_hello_extensions(RecordCB, Random, CipherSuite, Compression,
             ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, too_many_protocols_in_server_hello)
     end.
 
-select_version(RecordCB, ClientVersion, Versions) ->
-    do_select_version(RecordCB, ClientVersion, Versions).
-
-do_select_version(_, ClientVersion, []) ->
-    ClientVersion;
-do_select_version(RecordCB, ClientVersion, [Version | Versions]) ->
-    case RecordCB:is_higher(Version, ClientVersion) of
-	true ->
-	    %% Version too high for client - keep looking
-	    do_select_version(RecordCB, ClientVersion, Versions);
-	false ->
-	    %% Version ok for client - look for a higher
-	    do_select_version(RecordCB, ClientVersion, Versions, Version)
-    end.
-%%
-do_select_version(_, _, [], GoodVersion) ->
-    GoodVersion;
-do_select_version(
-  RecordCB, ClientVersion, [Version | Versions], GoodVersion) ->
-    BetterVersion =
-	case RecordCB:is_higher(Version, ClientVersion) of
-	    true ->
-		%% Version too high for client
-		GoodVersion;
-	    false ->
-		%% Version ok for client
-		case RecordCB:is_higher(Version, GoodVersion) of
-		    true ->
-			%% Use higher version
-			Version;
-		    false ->
-			GoodVersion
-		end
-	end,
-    do_select_version(RecordCB, ClientVersion, Versions, BetterVersion).
+select_curve(Client, Server) ->
+    select_curve(Client, Server, false).
 
-renegotiation_info(_, client, _, false) ->
-    #renegotiation_info{renegotiated_connection = undefined};
-renegotiation_info(_RecordCB, server, ConnectionStates, false) ->
-    ConnectionState  = ssl_record:current_connection_state(ConnectionStates, read),
-    case maps:get(secure_renegotiation, ConnectionState) of
-	true ->
-	    #renegotiation_info{renegotiated_connection = ?byte(0)};
-	false ->
-	    #renegotiation_info{renegotiated_connection = undefined}
-    end;
-renegotiation_info(_RecordCB, client, ConnectionStates, true) ->
-    ConnectionState = ssl_record:current_connection_state(ConnectionStates, read),
-    case  maps:get(secure_renegotiation, ConnectionState) of
-	true ->
-	    Data = maps:get(client_verify_data, ConnectionState),
-	    #renegotiation_info{renegotiated_connection = Data};
-	false ->
-	    #renegotiation_info{renegotiated_connection = undefined}
+select_curve(#elliptic_curves{elliptic_curve_list = ClientCurves},
+	     #elliptic_curves{elliptic_curve_list = ServerCurves},
+	     ServerOrder) ->
+    case ServerOrder of
+        false ->
+            select_shared_curve(ClientCurves, ServerCurves);
+        true ->
+            select_shared_curve(ServerCurves, ClientCurves)
     end;
+select_curve(undefined, _, _) ->
+    %% Client did not send ECC extension use default curve if 
+    %% ECC cipher is negotiated
+    {namedCurve, ?secp256r1}.
 
-renegotiation_info(_RecordCB, server, ConnectionStates, true) ->
-    ConnectionState = ssl_record:current_connection_state(ConnectionStates, read),
-    case maps:get(secure_renegotiation, ConnectionState) of
-	true ->
-	    CData = maps:get(client_verify_data, ConnectionState),
-	    SData = maps:get(server_verify_data, ConnectionState),
-	    #renegotiation_info{renegotiated_connection = <<CData/binary, SData/binary>>};
-	false ->
-	    #renegotiation_info{renegotiated_connection = undefined}
-    end.
+%%--------------------------------------------------------------------
+-spec select_hashsign(#hash_sign_algos{} | undefined,  undefined | binary(), 
+		      atom(), [atom()], ssl_record:ssl_version()) ->
+			     {atom(), atom()} | undefined  | #alert{}.
 
-handle_renegotiation_info(_RecordCB, _, #renegotiation_info{renegotiated_connection = ?byte(0)},
-			  ConnectionStates, false, _, _) ->
-    {ok, ssl_record:set_renegotiation_flag(true, ConnectionStates)};
+%%
+%% Description: Handles signature_algorithms hello extension (server)
+%%--------------------------------------------------------------------
+select_hashsign(_, _, KeyExAlgo, _, _Version) when KeyExAlgo == dh_anon;
+                                                   KeyExAlgo == ecdh_anon;
+                                                   KeyExAlgo == srp_anon ->
+    {null, anon};
+%% The signature_algorithms extension was introduced with TLS 1.2. Ignore it if we have
+%% negotiated a lower version.
+select_hashsign(HashSigns, Cert, KeyExAlgo, 
+		undefined, {Major, Minor} = Version)  when Major >= 3 andalso Minor >= 3->
+    select_hashsign(HashSigns, Cert, KeyExAlgo, tls_v1:default_signature_algs(Version), Version);
+select_hashsign(#hash_sign_algos{hash_sign_algos = HashSigns}, Cert, KeyExAlgo, SupportedHashSigns,
+		{Major, Minor}) when Major >= 3 andalso Minor >= 3 ->
+    #'OTPCertificate'{tbsCertificate = TBSCert,
+		      signatureAlgorithm =  {_,SignAlgo, _}} = public_key:pkix_decode_cert(Cert, otp),
+    #'OTPSubjectPublicKeyInfo'{algorithm = {_, SubjAlgo, _}} = 
+     	TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
 
-handle_renegotiation_info(_RecordCB, server, undefined, ConnectionStates, _, _, CipherSuites) ->
-    case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
-	true ->
-	    {ok, ssl_record:set_renegotiation_flag(true, ConnectionStates)};
-	false ->
-	    {ok, ssl_record:set_renegotiation_flag(false, ConnectionStates)}
+    Sign = sign_algo(SignAlgo),
+    SubSing = sign_algo(SubjAlgo),
+
+    case lists:filter(fun({_, S} = Algos) when S == Sign ->
+			      is_acceptable_hash_sign(Algos, Sign,
+						      SubSing, KeyExAlgo, SupportedHashSigns);
+			 (_)  ->
+			      false
+		      end, HashSigns) of
+	[] ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_signature_algorithm);
+	[HashSign | _] ->
+	    HashSign
     end;
+select_hashsign(_, Cert, _, _, Version) ->
+    #'OTPCertificate'{tbsCertificate = TBSCert} = public_key:pkix_decode_cert(Cert, otp),
+    #'OTPSubjectPublicKeyInfo'{algorithm = {_,Algo, _}} = TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
+    select_hashsign_algs(undefined, Algo, Version).
+%%--------------------------------------------------------------------
+-spec select_hashsign(#certificate_request{},  binary(), 
+		      [atom()], ssl_record:ssl_version()) ->
+			     {atom(), atom()} | #alert{}.
 
-handle_renegotiation_info(_RecordCB, _, undefined, ConnectionStates, false, _, _) ->
-    {ok, ssl_record:set_renegotiation_flag(false, ConnectionStates)};
+%%
+%% Description: Handles signature algorithms selection for certificate requests (client) 
+%%--------------------------------------------------------------------
+select_hashsign(#certificate_request{}, undefined, _, {Major, Minor})  when Major >= 3 andalso Minor >= 3->
+    %% There client does not have a certificate and will send an empty reply, the server may fail 
+    %% or accept the connection by its own preference. No signature algorihms needed as there is
+    %% no certificate to verify.
+    {undefined, undefined}; 
+ 
+select_hashsign(#certificate_request{hashsign_algorithms = #hash_sign_algos{hash_sign_algos = HashSigns}, 
+				     certificate_types = Types}, Cert, SupportedHashSigns, 
+		{Major, Minor})  when Major >= 3 andalso Minor >= 3->
+    #'OTPCertificate'{tbsCertificate = TBSCert} = public_key:pkix_decode_cert(Cert, otp),
+    #'OTPCertificate'{tbsCertificate = TBSCert,
+		      signatureAlgorithm =  {_,SignAlgo, _}} = public_key:pkix_decode_cert(Cert, otp),
+    #'OTPSubjectPublicKeyInfo'{algorithm = {_, SubjAlgo, _}} = 
+     	TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
 
-handle_renegotiation_info(_RecordCB, client, #renegotiation_info{renegotiated_connection = ClientServerVerify},
-			  ConnectionStates, true, _, _) ->
-    ConnectionState = ssl_record:current_connection_state(ConnectionStates, read),
-    CData = maps:get(client_verify_data, ConnectionState),
-    SData = maps:get(server_verify_data, ConnectionState),
-    case <<CData/binary, SData/binary>> == ClientServerVerify of
+    Sign = sign_algo(SignAlgo),
+    SubSign = sign_algo(SubjAlgo),
+    
+    case is_acceptable_cert_type(SubSign, HashSigns, Types) andalso is_supported_sign(Sign, HashSigns) of
 	true ->
-	    {ok, ConnectionStates};
+	    case lists:filter(fun({_, S} = Algos) when S == SubSign ->
+				 is_acceptable_hash_sign(Algos, SupportedHashSigns);
+			    (_)  ->
+				      false
+			      end, HashSigns) of
+		[] ->
+		    ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_signature_algorithm);
+		[HashSign | _] ->
+		    HashSign
+	    end;
 	false ->
-            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, client_renegotiation)
+	    ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_signature_algorithm)
     end;
-handle_renegotiation_info(_RecordCB, server, #renegotiation_info{renegotiated_connection = ClientVerify},
-			  ConnectionStates, true, _, CipherSuites) ->
-
-      case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
-	  true ->
-              ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, {server_renegotiation, empty_renegotiation_info_scsv});
-	  false ->
-	      ConnectionState = ssl_record:current_connection_state(ConnectionStates, read),
-	      Data =  maps:get(client_verify_data, ConnectionState),
-	      case Data == ClientVerify of
-		  true ->
-		      {ok, ConnectionStates};
-		  false ->
-                      ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, server_renegotiation)
-	      end
-      end;
-
-handle_renegotiation_info(RecordCB, client, undefined, ConnectionStates, true, SecureRenegotation, _) ->
-    handle_renegotiation_info(RecordCB, ConnectionStates, SecureRenegotation);
+select_hashsign(#certificate_request{}, Cert, _, Version) ->
+    select_hashsign(undefined, Cert, undefined, [], Version).
 
-handle_renegotiation_info(RecordCB, server, undefined, ConnectionStates, true, SecureRenegotation, CipherSuites) ->
-     case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
-	  true ->
-             ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, {server_renegotiation, empty_renegotiation_info_scsv});
-	 false ->
-	     handle_renegotiation_info(RecordCB, ConnectionStates, SecureRenegotation)
-     end.
+%%--------------------------------------------------------------------
+-spec select_hashsign_algs({atom(), atom()}| undefined, oid(), ssl_record:ssl_version()) ->
+				  {atom(), atom()}.
 
-handle_renegotiation_info(_RecordCB, ConnectionStates, SecureRenegotation) ->
-    ConnectionState = ssl_record:current_connection_state(ConnectionStates, read),
-    case {SecureRenegotation, maps:get(secure_renegotiation, ConnectionState)} of
-	{_, true} ->
-            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, already_secure);
-	{true, false} ->
-	    ?ALERT_REC(?FATAL, ?NO_RENEGOTIATION);
-	{false, false} ->
-	    {ok, ConnectionStates}
-    end.
+%% Description: For TLS 1.2 hash function and signature algorithm pairs can be
+%% negotiated with the signature_algorithms extension,
+%% for previous versions always use appropriate defaults.
+%% RFC 5246, Sect. 7.4.1.4.1.  Signature Algorithms
+%% If the client does not send the signature_algorithms extension, the
+%% server MUST do the following: (e.i defaults for TLS 1.2)
+%%
+%% -  If the negotiated key exchange algorithm is one of (RSA, DHE_RSA,
+%%    DH_RSA, RSA_PSK, ECDH_RSA, ECDHE_RSA), behave as if client had
+%%    sent the value {sha1,rsa}.
+%%
+%% -  If the negotiated key exchange algorithm is one of (DHE_DSS,
+%%    DH_DSS), behave as if the client had sent the value {sha1,dsa}.
+%%
+%% -  If the negotiated key exchange algorithm is one of (ECDH_ECDSA,
+%%    ECDHE_ECDSA), behave as if the client had sent value {sha1,ecdsa}.
 
-hello_extensions_list(#hello_extensions{renegotiation_info = RenegotiationInfo,
-					srp = SRP,
-					signature_algs = HashSigns,
-					ec_point_formats = EcPointFormats,
-					elliptic_curves = EllipticCurves,
-                                        alpn = ALPN,
-					next_protocol_negotiation = NextProtocolNegotiation,
-					sni = Sni}) ->
-    [Ext || Ext <- [RenegotiationInfo, SRP, HashSigns,
-		    EcPointFormats, EllipticCurves, ALPN, NextProtocolNegotiation, Sni], Ext =/= undefined].
+%%--------------------------------------------------------------------
+select_hashsign_algs(HashSign, _, {Major, Minor}) when HashSign =/= undefined andalso
+						       Major >= 3 andalso Minor >= 3 ->
+    HashSign;
+select_hashsign_algs(undefined, ?rsaEncryption, {Major, Minor}) when Major >= 3 andalso Minor >= 3 ->
+    {sha, rsa};
+select_hashsign_algs(undefined,?'id-ecPublicKey', _) ->
+    {sha, ecdsa};
+select_hashsign_algs(undefined, ?rsaEncryption, _) -> 
+    {md5sha, rsa};
+select_hashsign_algs(undefined, ?'id-dsa', _) ->
+    {sha, dsa}.
 
 srp_user(#ssl_options{srp_identity = {UserName, _}}) ->
     #srp{username = UserName};
 srp_user(_) ->
     undefined.
 
-client_ecc_extensions(SupportedECCs) ->
-    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
-    case proplists:get_bool(ecdh, CryptoSupport) of
-	true ->
-	    EcPointFormats = #ec_point_formats{ec_point_format_list = [?ECPOINT_UNCOMPRESSED]},
-	    EllipticCurves = SupportedECCs,
-	    {EcPointFormats, EllipticCurves};
-	_ ->
-	    {undefined, undefined}
-    end.
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+%%------------- Create handshake messages ----------------------------
 
-server_ecc_extension(_Version, EcPointFormats) ->
-    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
-    case proplists:get_bool(ecdh, CryptoSupport) of
+int_to_bin(I) ->
+    L = (length(integer_to_list(I, 16)) + 1) div 2,
+    <<I:(L*8)>>.
+
+certificate_types(_, {N, M}) when N >= 3 andalso M >= 3 ->
+    case proplists:get_bool(ecdsa,  
+			    proplists:get_value(public_keys, crypto:supports())) of
 	true ->
-	    handle_ecc_point_fmt_extension(EcPointFormats);
+	    <<?BYTE(?ECDSA_SIGN), ?BYTE(?RSA_SIGN), ?BYTE(?DSS_SIGN)>>;
 	false ->
-	    undefined
-    end.
-
-handle_ecc_point_fmt_extension(undefined) ->
-    undefined;
-handle_ecc_point_fmt_extension(_) ->
-    #ec_point_formats{ec_point_format_list = [?ECPOINT_UNCOMPRESSED]}.
+	    <<?BYTE(?RSA_SIGN), ?BYTE(?DSS_SIGN)>>
+    end;
 
-advertises_ec_ciphers([]) ->
-    false;
-advertises_ec_ciphers([{ecdh_ecdsa, _,_,_} | _]) ->
-    true;
-advertises_ec_ciphers([{ecdhe_ecdsa, _,_,_} | _]) ->
-    true;
-advertises_ec_ciphers([{ecdh_rsa, _,_,_} | _]) ->
-    true;
-advertises_ec_ciphers([{ecdhe_rsa, _,_,_} | _]) ->
-    true;
-advertises_ec_ciphers([{ecdh_anon, _,_,_} | _]) ->
-    true;
-advertises_ec_ciphers([{ecdhe_psk, _,_,_} | _]) ->
-    true;
-advertises_ec_ciphers([_| Rest]) ->
-    advertises_ec_ciphers(Rest).
+certificate_types(#{key_exchange := KeyExchange}, _) when KeyExchange == rsa;
+                                                          KeyExchange == dh_rsa;
+                                                          KeyExchange == dhe_rsa;
+                                                          KeyExchange == ecdhe_rsa ->
+    <<?BYTE(?RSA_SIGN)>>;
 
-select_curve(Client, Server) ->
-    select_curve(Client, Server, false).
+certificate_types(#{key_exchange := KeyExchange}, _)  when KeyExchange == dh_dss; 
+                                                           KeyExchange == dhe_dss;
+                                                           KeyExchange == srp_dss ->
+    <<?BYTE(?DSS_SIGN)>>;
 
-select_curve(#elliptic_curves{elliptic_curve_list = ClientCurves},
-	     #elliptic_curves{elliptic_curve_list = ServerCurves},
-	     ServerOrder) ->
-    case ServerOrder of
-        false ->
-            select_shared_curve(ClientCurves, ServerCurves);
-        true ->
-            select_shared_curve(ServerCurves, ClientCurves)
-    end;
-select_curve(undefined, _, _) ->
-    %% Client did not send ECC extension use default curve if 
-    %% ECC cipher is negotiated
-    {namedCurve, ?secp256r1}.
+certificate_types(#{key_exchange := KeyExchange}, _) when KeyExchange == dh_ecdsa;
+                                                          KeyExchange == dhe_ecdsa;
+                                                          KeyExchange == ecdh_ecdsa;
+                                                          KeyExchange == ecdhe_ecdsa ->
+    <<?BYTE(?ECDSA_SIGN)>>;
+certificate_types(_, _) ->
+    <<?BYTE(?RSA_SIGN)>>.
 
-select_shared_curve([], _) ->
-    no_curve;
-select_shared_curve([Curve | Rest], Curves) ->
-    case lists:member(Curve, Curves) of
-	true ->
-	    {namedCurve, Curve};
-	false ->
-	    select_shared_curve(Rest, Curves)
-    end.
+certificate_authorities(CertDbHandle, CertDbRef) ->
+    Authorities = certificate_authorities_from_db(CertDbHandle, CertDbRef),
+    Enc = fun(#'OTPCertificate'{tbsCertificate=TBSCert}) ->
+		  OTPSubj = TBSCert#'OTPTBSCertificate'.subject,
+		  DNEncodedBin = public_key:pkix_encode('Name', OTPSubj, otp),
+		  DNEncodedLen = byte_size(DNEncodedBin),
+		  <<?UINT16(DNEncodedLen), DNEncodedBin/binary>>
+	  end,
+    list_to_binary([Enc(Cert) || {_, Cert} <- Authorities]).
 
-sni(undefined) ->
-    undefined;
-sni(disable) ->
-    undefined;
-sni(Hostname) ->
-    #sni{hostname = Hostname}.
+certificate_authorities_from_db(CertDbHandle, CertDbRef) when is_reference(CertDbRef) ->
+    ConnectionCerts = fun({{Ref, _, _}, Cert}, Acc) when Ref  == CertDbRef ->
+			      [Cert | Acc];
+			 (_, Acc) ->
+			      Acc
+		      end,
+    ssl_pkix_db:foldl(ConnectionCerts, [], CertDbHandle);
+certificate_authorities_from_db(_CertDbHandle, {extracted, CertDbData}) ->
+    %% Cache disabled, Ref contains data
+    lists:foldl(fun({decoded, {_Key,Cert}}, Acc) -> [Cert | Acc] end,
+		[], CertDbData).
 
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
+%%-------------Handle handshake messages --------------------------------
 validation_fun_and_state({Fun, UserState0}, Role,  CertDbHandle, CertDbRef, 
                          ServerNameIndication, CRLCheck, CRLDbHandle, CertPath) ->
     {fun(OtpCert, {extension, _} = Extension, {SslState, UserState}) ->
@@ -1683,17 +1329,6 @@ path_validation_alert({bad_cert, unknown_ca}) ->
 path_validation_alert(Reason) ->
     ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, Reason).
 
-encrypted_premaster_secret(Secret, RSAPublicKey) ->
-    try
-	PreMasterSecret = public_key:encrypt_public(Secret, RSAPublicKey,
-						    [{rsa_pad,
-						      rsa_pkcs1_padding}]),
-	#encrypted_premaster_secret{premaster_secret = PreMasterSecret}
-    catch
-        _:_->
-            throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, premaster_encryption_failed))
-    end.
-
 digitally_signed(Version, Hashes, HashAlgo, PrivateKey) ->
     try do_digitally_signed(Version, Hashes, HashAlgo, PrivateKey) of
 	Signature ->
@@ -1702,17 +1337,123 @@ digitally_signed(Version, Hashes, HashAlgo, PrivateKey) ->
 	error:badkey->
 	    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, bad_key(PrivateKey)))
     end.
-
+do_digitally_signed({3, Minor}, Hash, HashAlgo, #{algorithm := Alg} = Engine) 
+  when Minor >= 3 ->
+    crypto:sign(Alg, HashAlgo, {digest, Hash}, maps:remove(algorithm, Engine));
 do_digitally_signed({3, Minor}, Hash, HashAlgo, Key) when Minor >= 3 ->
     public_key:sign({digest, Hash}, HashAlgo, Key);
-do_digitally_signed(_Version, Hash, HashAlgo, #'DSAPrivateKey'{} = Key) ->
-    public_key:sign({digest, Hash}, HashAlgo, Key);
 do_digitally_signed(_Version, Hash, _HashAlgo, #'RSAPrivateKey'{} = Key) ->
     public_key:encrypt_private(Hash, Key,
 			       [{rsa_pad, rsa_pkcs1_padding}]);
+do_digitally_signed({3, _}, Hash, _, 
+                    #{algorithm := rsa} = Engine) ->
+    crypto:private_encrypt(rsa, Hash, maps:remove(algorithm, Engine),
+                           rsa_pkcs1_padding);
+do_digitally_signed({3, _}, Hash, HashAlgo, #{algorithm := Alg} = Engine) ->
+    crypto:sign(Alg, HashAlgo, {digest, Hash}, maps:remove(algorithm, Engine));
 do_digitally_signed(_Version, Hash, HashAlgo, Key) ->
     public_key:sign({digest, Hash}, HashAlgo, Key).
 
+bad_key(#'DSAPrivateKey'{}) ->
+    unacceptable_dsa_key;
+bad_key(#'RSAPrivateKey'{}) ->
+    unacceptable_rsa_key;
+bad_key(#'ECPrivateKey'{}) ->
+    unacceptable_ecdsa_key.
+
+crl_check(_, false, _,_,_, _, _) ->
+    valid;
+crl_check(_, peer, _, _,_, valid, _) -> %% Do not check CAs with this option.
+    valid;
+crl_check(OtpCert, Check, CertDbHandle, CertDbRef, {Callback, CRLDbHandle}, _, CertPath) ->
+    Options = [{issuer_fun, {fun(_DP, CRL, Issuer, DBInfo) ->
+				     ssl_crl:trusted_cert_and_path(CRL, Issuer, {CertPath,
+                                                                                 DBInfo})
+			     end, {CertDbHandle, CertDbRef}}}, 
+	       {update_crl, fun(DP, CRL) -> Callback:fresh_crl(DP, CRL) end},
+               {undetermined_details, true}
+	      ],
+    case dps_and_crls(OtpCert, Callback, CRLDbHandle, ext) of
+	no_dps ->
+	    crl_check_same_issuer(OtpCert, Check,
+				  dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer),
+				  Options);
+	DpsAndCRLs ->  %% This DP list may be empty if relevant CRLs existed 
+	    %% but could not be retrived, will result in {bad_cert, revocation_status_undetermined}
+	    case public_key:pkix_crls_validate(OtpCert, DpsAndCRLs, Options) of
+		{bad_cert, {revocation_status_undetermined, _}} ->
+		    crl_check_same_issuer(OtpCert, Check, dps_and_crls(OtpCert, Callback, 
+								       CRLDbHandle, same_issuer), Options);
+		Other ->
+		    Other
+	    end
+    end.
+
+crl_check_same_issuer(OtpCert, best_effort, Dps, Options) ->		
+    case public_key:pkix_crls_validate(OtpCert, Dps, Options) of 
+	{bad_cert, {revocation_status_undetermined, _}}   ->
+	    valid;
+	Other ->
+	    Other
+    end;
+crl_check_same_issuer(OtpCert, _, Dps, Options) ->    
+    public_key:pkix_crls_validate(OtpCert, Dps, Options).
+
+dps_and_crls(OtpCert, Callback, CRLDbHandle, ext) ->
+    case public_key:pkix_dist_points(OtpCert) of
+	[] ->
+	    no_dps;
+	DistPoints ->
+	    Issuer = OtpCert#'OTPCertificate'.tbsCertificate#'OTPTBSCertificate'.issuer,
+	    CRLs = distpoints_lookup(DistPoints, Issuer, Callback, CRLDbHandle),
+            dps_and_crls(DistPoints, CRLs, [])
+    end;
+
+dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer) ->    
+    DP = #'DistributionPoint'{distributionPoint = {fullName, GenNames}} = 
+	public_key:pkix_dist_point(OtpCert),
+    CRLs = lists:flatmap(fun({directoryName, Issuer}) -> 
+				 Callback:select(Issuer, CRLDbHandle);
+			    (_) ->
+				 []
+			 end, GenNames),
+    [{DP, {CRL, public_key:der_decode('CertificateList', CRL)}} ||  CRL <- CRLs].
+
+dps_and_crls([], _, Acc) ->
+    Acc;
+dps_and_crls([DP | Rest], CRLs, Acc) ->
+    DpCRL = [{DP, {CRL, public_key:der_decode('CertificateList', CRL)}} ||  CRL <- CRLs],
+    dps_and_crls(Rest, CRLs, DpCRL ++ Acc).
+    
+distpoints_lookup([],_, _, _) ->
+    [];
+distpoints_lookup([DistPoint | Rest], Issuer, Callback, CRLDbHandle) ->
+    Result =
+	try Callback:lookup(DistPoint, Issuer, CRLDbHandle)
+	catch
+	    error:undef ->
+		%% The callback module still uses the 2-argument
+		%% version of the lookup function.
+		Callback:lookup(DistPoint, CRLDbHandle)
+	end,
+    case Result of
+	not_available ->
+	    distpoints_lookup(Rest, Issuer, Callback, CRLDbHandle);
+	CRLs ->
+	    CRLs
+    end.
+
+encrypted_premaster_secret(Secret, RSAPublicKey) ->
+    try
+	PreMasterSecret = public_key:encrypt_public(Secret, RSAPublicKey,
+						    [{rsa_pad,
+						      rsa_pkcs1_padding}]),
+	#encrypted_premaster_secret{premaster_secret = PreMasterSecret}
+    catch
+        _:_->
+            throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, premaster_encryption_failed))
+    end.
+
 calc_certificate_verify({3, 0}, HashAlgo, MasterSecret, Handshake) ->
     ssl_v3:certificate_verify(HashAlgo, MasterSecret, lists:reverse(Handshake));
 calc_certificate_verify({3, N}, HashAlgo, _MasterSecret, Handshake) ->
@@ -1765,24 +1506,7 @@ calc_master_secret({3,0}, _PrfAlgo, PremasterSecret, ClientRandom, ServerRandom)
 
 calc_master_secret({3,_}, PrfAlgo, PremasterSecret, ClientRandom, ServerRandom) ->
     tls_v1:master_secret(PrfAlgo, PremasterSecret, ClientRandom, ServerRandom).
-
-handle_renegotiation_extension(Role, RecordCB, Version, Info, Random, NegotiatedCipherSuite, 
-			       ClientCipherSuites, Compression,
-			       ConnectionStates0, Renegotiation, SecureRenegotation) ->
-    case handle_renegotiation_info(RecordCB, Role, Info, ConnectionStates0,
-				   Renegotiation, SecureRenegotation,
-				   ClientCipherSuites) of
-	{ok, ConnectionStates} ->
-	    hello_pending_connection_states(RecordCB, Role,
-					    Version,
-					    NegotiatedCipherSuite,
-					    Random,
-					    Compression,
-					    ConnectionStates);
-	#alert{} = Alert ->
-	    throw(Alert)
-    end.
-
+	
 %% Update pending connection states with parameters exchanged via
 %% hello messages
 %% NOTE : Role is the role of the receiver of the hello message
@@ -1822,7 +1546,43 @@ hello_security_parameters(server, Version, #{security_parameters := SecParams},
       compression_algorithm = Compression
      }.
 
-%%-------------Encode/Decode --------------------------------
+select_compression(_CompressionMetodes) ->
+    ?NULL.
+
+do_select_version(_, ClientVersion, []) ->
+    ClientVersion;
+do_select_version(RecordCB, ClientVersion, [Version | Versions]) ->
+    case RecordCB:is_higher(Version, ClientVersion) of
+	true ->
+	    %% Version too high for client - keep looking
+	    do_select_version(RecordCB, ClientVersion, Versions);
+	false ->
+	    %% Version ok for client - look for a higher
+	    do_select_version(RecordCB, ClientVersion, Versions, Version)
+    end.
+%%
+do_select_version(_, _, [], GoodVersion) ->
+    GoodVersion;
+do_select_version(
+  RecordCB, ClientVersion, [Version | Versions], GoodVersion) ->
+    BetterVersion =
+	case RecordCB:is_higher(Version, ClientVersion) of
+	    true ->
+		%% Version too high for client
+		GoodVersion;
+	    false ->
+		%% Version ok for client
+		case RecordCB:is_higher(Version, GoodVersion) of
+		    true ->
+			%% Use higher version
+			Version;
+		    false ->
+			GoodVersion
+		end
+	end,
+    do_select_version(RecordCB, ClientVersion, Versions, BetterVersion).
+
+%%-------------Encode handshakes --------------------------------
 
 encode_server_key(#server_dh_params{dh_p = P, dh_g = G, dh_y = Y}) ->
     PLen = byte_size(P),
@@ -1928,6 +1688,126 @@ encode_protocol(Protocol, Acc) ->
 	Len = byte_size(Protocol),
 	<<Acc/binary, ?BYTE(Len), Protocol/binary>>.
 
+enc_server_key_exchange(Version, Params, {HashAlgo, SignAlgo},
+			ClientRandom, ServerRandom, PrivateKey) ->
+    EncParams = encode_server_key(Params),
+    case HashAlgo of
+	null ->
+	    #server_key_params{params = Params,
+			       params_bin = EncParams,
+			       hashsign = {null, anon},
+			       signature = <<>>};
+	_ ->
+	    Hash =
+		server_key_exchange_hash(HashAlgo, <<ClientRandom/binary,
+						     ServerRandom/binary,
+						     EncParams/binary>>),
+	    Signature = digitally_signed(Version, Hash, HashAlgo, PrivateKey),
+	    #server_key_params{params = Params,
+			       params_bin = EncParams,
+			       hashsign = {HashAlgo, SignAlgo},
+			       signature = Signature}
+    end.
+
+%% While the RFC opens the door to allow ALPN during renegotiation, in practice
+%% this does not work and it is recommended to ignore any ALPN extension during
+%% renegotiation, as done here.
+encode_alpn(_, true) ->
+    undefined;
+encode_alpn(undefined, _) ->
+    undefined;
+encode_alpn(Protocols, _) ->
+    #alpn{extension_data = lists:foldl(fun encode_protocol/2, <<>>, Protocols)}.
+
+hello_extensions_list(#hello_extensions{renegotiation_info = RenegotiationInfo,
+					srp = SRP,
+					signature_algs = HashSigns,
+					ec_point_formats = EcPointFormats,
+					elliptic_curves = EllipticCurves,
+                                        alpn = ALPN,
+					next_protocol_negotiation = NextProtocolNegotiation,
+					sni = Sni}) ->
+    [Ext || Ext <- [RenegotiationInfo, SRP, HashSigns,
+		    EcPointFormats, EllipticCurves, ALPN, NextProtocolNegotiation, Sni], Ext =/= undefined].
+
+%%-------------Decode handshakes---------------------------------
+dec_server_key(<<?UINT16(PLen), P:PLen/binary,
+		 ?UINT16(GLen), G:GLen/binary,
+		 ?UINT16(YLen), Y:YLen/binary, _/binary>> = KeyStruct,
+	       ?KEY_EXCHANGE_DIFFIE_HELLMAN, Version) ->
+    Params = #server_dh_params{dh_p = P, dh_g = G, dh_y = Y},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(PLen + GLen + YLen + 6, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+%% ECParameters with named_curve
+%% TODO: explicit curve
+dec_server_key(<<?BYTE(?NAMED_CURVE), ?UINT16(CurveID),
+		 ?BYTE(PointLen), ECPoint:PointLen/binary,
+		 _/binary>> = KeyStruct,
+	       ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN, Version) ->
+    Params = #server_ecdh_params{curve = {namedCurve, tls_v1:enum_to_oid(CurveID)},
+				 public = ECPoint},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(PointLen + 4, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+dec_server_key(<<?UINT16(Len), PskIdentityHint:Len/binary, _/binary>> = KeyStruct,
+	       KeyExchange, Version)
+  when KeyExchange == ?KEY_EXCHANGE_PSK; KeyExchange == ?KEY_EXCHANGE_RSA_PSK ->
+    Params = #server_psk_params{
+		hint = PskIdentityHint},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(Len + 2, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+dec_server_key(<<?UINT16(Len), IdentityHint:Len/binary,
+		 ?UINT16(PLen), P:PLen/binary,
+		 ?UINT16(GLen), G:GLen/binary,
+		 ?UINT16(YLen), Y:YLen/binary, _/binary>> = KeyStruct,
+	       ?KEY_EXCHANGE_DHE_PSK, Version) ->
+    DHParams = #server_dh_params{dh_p = P, dh_g = G, dh_y = Y},
+    Params = #server_dhe_psk_params{
+      hint = IdentityHint,
+      dh_params = DHParams},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(Len + PLen + GLen + YLen + 8, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+dec_server_key(<<?UINT16(Len), IdentityHint:Len/binary,
+		 ?BYTE(?NAMED_CURVE), ?UINT16(CurveID),
+		 ?BYTE(PointLen), ECPoint:PointLen/binary,
+		 _/binary>> = KeyStruct,
+	       ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN_PSK, Version) ->
+    DHParams = #server_ecdh_params{
+                  curve = {namedCurve, tls_v1:enum_to_oid(CurveID)},
+                  public = ECPoint},
+    Params = #server_ecdhe_psk_params{
+                hint = IdentityHint,
+                dh_params = DHParams},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(Len + 2 + PointLen + 4, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+dec_server_key(<<?UINT16(NLen), N:NLen/binary,
+		 ?UINT16(GLen), G:GLen/binary,
+		 ?BYTE(SLen), S:SLen/binary,
+		 ?UINT16(BLen), B:BLen/binary, _/binary>> = KeyStruct,
+	       ?KEY_EXCHANGE_SRP, Version) ->
+    Params = #server_srp_params{srp_n = N, srp_g = G, srp_s = S, srp_b = B},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(NLen + GLen + SLen + BLen + 7, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+dec_server_key(_, KeyExchange, _) ->
+    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, {unknown_or_malformed_key_exchange, KeyExchange})).
+
 dec_client_key(PKEPMS, ?KEY_EXCHANGE_RSA, {3, 0}) ->
     #encrypted_premaster_secret{premaster_secret = PKEPMS};
 dec_client_key(<<?UINT16(_), PKEPMS/binary>>, ?KEY_EXCHANGE_RSA, _) ->
@@ -2073,6 +1953,11 @@ dec_sni(<<?BYTE(?SNI_NAMETYPE_HOST_NAME), ?UINT16(Len),
 dec_sni(<<?BYTE(_), ?UINT16(Len), _:Len, Rest/binary>>) -> dec_sni(Rest);
 dec_sni(_) -> undefined.
 
+decode_alpn(undefined) ->
+    undefined;
+decode_alpn(#alpn{extension_data=Data}) ->
+    decode_protocols(Data, []).
+
 decode_next_protocols({next_protocol_negotiation, Protocols}) ->
     decode_protocols(Protocols, []).
 
@@ -2117,6 +2002,7 @@ from_2bytes(<<>>, Acc) ->
     lists:reverse(Acc);
 from_2bytes(<<?UINT16(N), Rest/binary>>, Acc) ->
     from_2bytes(Rest, [?uint16(N) | Acc]).
+
 key_exchange_alg(rsa) ->
     ?KEY_EXCHANGE_RSA;
 key_exchange_alg(Alg) when Alg == dhe_rsa; Alg == dhe_dss;
@@ -2140,8 +2026,123 @@ key_exchange_alg(Alg)
 key_exchange_alg(_) ->
     ?NULL.
 
+%%-------------Cipher suite handling -----------------------------
+select_cipher_suite(CipherSuites, Suites, false) ->
+    select_cipher_suite(CipherSuites, Suites);
+select_cipher_suite(CipherSuites, Suites, true) ->
+    select_cipher_suite(Suites, CipherSuites).
+
+select_cipher_suite([], _) ->
+   no_suite;
+select_cipher_suite([Suite | ClientSuites], SupportedSuites) ->
+    case is_member(Suite, SupportedSuites) of
+	true ->
+	    Suite;
+        false ->
+	    select_cipher_suite(ClientSuites, SupportedSuites)
+    end.
+
+is_member(Suite, SupportedSuites) ->
+    lists:member(Suite, SupportedSuites).
+
+psk_secret(PSKIdentity, PSKLookup) ->
+    case handle_psk_identity(PSKIdentity, PSKLookup) of
+	{ok, PSK} when is_binary(PSK) ->
+	    Len = erlang:byte_size(PSK),
+	    <<?UINT16(Len), 0:(Len*8), ?UINT16(Len), PSK/binary>>;
+	#alert{} = Alert ->
+	    Alert;
+	_ ->
+	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
+    end.
+
+psk_secret(PSKIdentity, PSKLookup, PremasterSecret) ->
+    case handle_psk_identity(PSKIdentity, PSKLookup) of
+	{ok, PSK} when is_binary(PSK) ->
+	    Len = erlang:byte_size(PremasterSecret),
+	    PSKLen = erlang:byte_size(PSK),
+	    <<?UINT16(Len), PremasterSecret/binary, ?UINT16(PSKLen), PSK/binary>>;
+	#alert{} = Alert ->
+	    Alert;
+	_ ->
+	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
+    end.
+
+handle_psk_identity(_PSKIdentity, LookupFun)
+  when LookupFun == undefined ->
+    error;
+handle_psk_identity(PSKIdentity, {Fun, UserState}) ->
+    Fun(psk, PSKIdentity, UserState).
+
+filter_hashsigns([], [], _, Acc) ->
+    lists:reverse(Acc);
+filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns,
+		 Acc) when KeyExchange == dhe_ecdsa;
+			   KeyExchange == ecdhe_ecdsa ->
+    do_filter_hashsigns(ecdsa, Suite, Suites, Algos, HashSigns, Acc);
+
+filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns,
+		 Acc) when KeyExchange == rsa;
+			   KeyExchange == dhe_rsa;
+			   KeyExchange == ecdhe_rsa;
+			   KeyExchange == srp_rsa;
+			   KeyExchange == rsa_psk ->
+    do_filter_hashsigns(rsa, Suite, Suites, Algos, HashSigns, Acc);
+filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns, Acc) when 
+      KeyExchange == dhe_dss;
+      KeyExchange == srp_dss ->							       
+    do_filter_hashsigns(dsa, Suite, Suites, Algos, HashSigns, Acc);
+filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns, Acc) when 
+      KeyExchange == dh_dss; 
+      KeyExchange == dh_rsa; 
+      KeyExchange == dh_ecdsa;
+      KeyExchange == ecdh_rsa;    
+      KeyExchange == ecdh_ecdsa ->
+      %%  Fixed DH certificates MAY be signed with any hash/signature
+      %%  algorithm pair appearing in the hash_sign extension.  The names
+    %%  DH_DSS, DH_RSA, ECDH_ECDSA, and ECDH_RSA are historical.
+    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]);
+filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns, Acc) when 
+      KeyExchange == dh_anon;
+      KeyExchange == ecdh_anon;
+      KeyExchange == srp_anon;
+      KeyExchange == psk;
+      KeyExchange == dhe_psk;
+      KeyExchange == ecdhe_psk ->
+    %% In this case hashsigns is not used as the kexchange is anonaymous
+    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]).
+
+do_filter_hashsigns(SignAlgo, Suite, Suites, Algos, HashSigns, Acc) ->
+    case lists:keymember(SignAlgo, 2, HashSigns) of
+	true ->
+	    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]);
+	false ->
+	    filter_hashsigns(Suites, Algos, HashSigns, Acc)
+    end.
+
+unavailable_ecc_suites(no_curve) ->
+    ssl_cipher:ec_keyed_suites();
+unavailable_ecc_suites(_) ->
+    [].
 %%-------------Extension handling --------------------------------
 
+handle_renegotiation_extension(Role, RecordCB, Version, Info, Random, NegotiatedCipherSuite, 
+			       ClientCipherSuites, Compression,
+			       ConnectionStates0, Renegotiation, SecureRenegotation) ->
+    case handle_renegotiation_info(RecordCB, Role, Info, ConnectionStates0,
+				   Renegotiation, SecureRenegotation,
+				   ClientCipherSuites) of
+	{ok, ConnectionStates} ->
+	    hello_pending_connection_states(RecordCB, Role,
+					    Version,
+					    NegotiatedCipherSuite,
+					    Random,
+					    Compression,
+					    ConnectionStates);
+	#alert{} = Alert ->
+	    throw(Alert)
+    end.
+
 %% Receive protocols, choose one from the list, return it.
 handle_alpn_extension(_, {error, Reason}) ->
     ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, Reason);
@@ -2204,150 +2205,6 @@ handle_srp_extension(undefined, Session) ->
 handle_srp_extension(#srp{username = Username}, Session) ->
     Session#session{srp_username = Username}.
 
-%%-------------Misc --------------------------------
-
-select_cipher_suite(CipherSuites, Suites, false) ->
-    select_cipher_suite(CipherSuites, Suites);
-select_cipher_suite(CipherSuites, Suites, true) ->
-    select_cipher_suite(Suites, CipherSuites).
-
-select_cipher_suite([], _) ->
-   no_suite;
-select_cipher_suite([Suite | ClientSuites], SupportedSuites) ->
-    case is_member(Suite, SupportedSuites) of
-	true ->
-	    Suite;
-        false ->
-	    select_cipher_suite(ClientSuites, SupportedSuites)
-    end.
-
-int_to_bin(I) ->
-    L = (length(integer_to_list(I, 16)) + 1) div 2,
-    <<I:(L*8)>>.
-
-is_member(Suite, SupportedSuites) ->
-    lists:member(Suite, SupportedSuites).
-
-select_compression(_CompressionMetodes) ->
-    ?NULL.
-
-available_signature_algs(undefined, _)  ->
-    undefined;
-available_signature_algs(SupportedHashSigns, Version) when Version >= {3, 3} ->
-    #hash_sign_algos{hash_sign_algos = SupportedHashSigns};
-available_signature_algs(_, _) ->
-    undefined.
-
-psk_secret(PSKIdentity, PSKLookup) ->
-    case handle_psk_identity(PSKIdentity, PSKLookup) of
-	{ok, PSK} when is_binary(PSK) ->
-	    Len = erlang:byte_size(PSK),
-	    <<?UINT16(Len), 0:(Len*8), ?UINT16(Len), PSK/binary>>;
-	#alert{} = Alert ->
-	    Alert;
-	_ ->
-	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
-    end.
-
-psk_secret(PSKIdentity, PSKLookup, PremasterSecret) ->
-    case handle_psk_identity(PSKIdentity, PSKLookup) of
-	{ok, PSK} when is_binary(PSK) ->
-	    Len = erlang:byte_size(PremasterSecret),
-	    PSKLen = erlang:byte_size(PSK),
-	    <<?UINT16(Len), PremasterSecret/binary, ?UINT16(PSKLen), PSK/binary>>;
-	#alert{} = Alert ->
-	    Alert;
-	_ ->
-	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
-    end.
-
-handle_psk_identity(_PSKIdentity, LookupFun)
-  when LookupFun == undefined ->
-    error;
-handle_psk_identity(PSKIdentity, {Fun, UserState}) ->
-    Fun(psk, PSKIdentity, UserState).
-
-crl_check(_, false, _,_,_, _, _) ->
-    valid;
-crl_check(_, peer, _, _,_, valid, _) -> %% Do not check CAs with this option.
-    valid;
-crl_check(OtpCert, Check, CertDbHandle, CertDbRef, {Callback, CRLDbHandle}, _, CertPath) ->
-    Options = [{issuer_fun, {fun(_DP, CRL, Issuer, DBInfo) ->
-				     ssl_crl:trusted_cert_and_path(CRL, Issuer, {CertPath,
-                                                                                 DBInfo})
-			     end, {CertDbHandle, CertDbRef}}}, 
-	       {update_crl, fun(DP, CRL) -> Callback:fresh_crl(DP, CRL) end},
-               {undetermined_details, true}
-	      ],
-    case dps_and_crls(OtpCert, Callback, CRLDbHandle, ext) of
-	no_dps ->
-	    crl_check_same_issuer(OtpCert, Check,
-				  dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer),
-				  Options);
-	DpsAndCRLs ->  %% This DP list may be empty if relevant CRLs existed 
-	    %% but could not be retrived, will result in {bad_cert, revocation_status_undetermined}
-	    case public_key:pkix_crls_validate(OtpCert, DpsAndCRLs, Options) of
-		{bad_cert, {revocation_status_undetermined, _}} ->
-		    crl_check_same_issuer(OtpCert, Check, dps_and_crls(OtpCert, Callback, 
-								       CRLDbHandle, same_issuer), Options);
-		Other ->
-		    Other
-	    end
-    end.
-
-crl_check_same_issuer(OtpCert, best_effort, Dps, Options) ->		
-    case public_key:pkix_crls_validate(OtpCert, Dps, Options) of 
-	{bad_cert, {revocation_status_undetermined, _}}   ->
-	    valid;
-	Other ->
-	    Other
-    end;
-crl_check_same_issuer(OtpCert, _, Dps, Options) ->    
-    public_key:pkix_crls_validate(OtpCert, Dps, Options).
-
-dps_and_crls(OtpCert, Callback, CRLDbHandle, ext) ->
-    case public_key:pkix_dist_points(OtpCert) of
-	[] ->
-	    no_dps;
-	DistPoints ->
-	    Issuer = OtpCert#'OTPCertificate'.tbsCertificate#'OTPTBSCertificate'.issuer,
-	    CRLs = distpoints_lookup(DistPoints, Issuer, Callback, CRLDbHandle),
-            dps_and_crls(DistPoints, CRLs, [])
-    end;
-
-dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer) ->    
-    DP = #'DistributionPoint'{distributionPoint = {fullName, GenNames}} = 
-	public_key:pkix_dist_point(OtpCert),
-    CRLs = lists:flatmap(fun({directoryName, Issuer}) -> 
-				 Callback:select(Issuer, CRLDbHandle);
-			    (_) ->
-				 []
-			 end, GenNames),
-    [{DP, {CRL, public_key:der_decode('CertificateList', CRL)}} ||  CRL <- CRLs].
-
-dps_and_crls([], _, Acc) ->
-    Acc;
-dps_and_crls([DP | Rest], CRLs, Acc) ->
-    DpCRL = [{DP, {CRL, public_key:der_decode('CertificateList', CRL)}} ||  CRL <- CRLs],
-    dps_and_crls(Rest, CRLs, DpCRL ++ Acc).
-    
-distpoints_lookup([],_, _, _) ->
-    [];
-distpoints_lookup([DistPoint | Rest], Issuer, Callback, CRLDbHandle) ->
-    Result =
-	try Callback:lookup(DistPoint, Issuer, CRLDbHandle)
-	catch
-	    error:undef ->
-		%% The callback module still uses the 2-argument
-		%% version of the lookup function.
-		Callback:lookup(DistPoint, CRLDbHandle)
-	end,
-    case Result of
-	not_available ->
-	    distpoints_lookup(Rest, Issuer, Callback, CRLDbHandle);
-	CRLs ->
-	    CRLs
-    end.	
 
 sign_algo(?rsaEncryption) ->
     rsa;
@@ -2398,7 +2255,6 @@ is_acceptable_hash_sign(_, _, _, KeyExAlgo, _) when
     true; 
 is_acceptable_hash_sign(_,_, _,_,_) ->
     false.					
-
 is_acceptable_hash_sign(Algos, SupportedHashSigns) ->
     lists:member(Algos, SupportedHashSigns).
 
@@ -2418,27 +2274,164 @@ sign_type(dsa) ->
 sign_type(ecdsa) ->
     ?ECDSA_SIGN.
 
-
-bad_key(#'DSAPrivateKey'{}) ->
-    unacceptable_dsa_key;
-bad_key(#'RSAPrivateKey'{}) ->
-    unacceptable_rsa_key;
-bad_key(#'ECPrivateKey'{}) ->
-    unacceptable_ecdsa_key.
-
-available_signature_algs(undefined, SupportedHashSigns, _, Version) when 
-      Version >= {3,3} ->
-    SupportedHashSigns;
-available_signature_algs(#hash_sign_algos{hash_sign_algos = ClientHashSigns}, SupportedHashSigns, 
-                         _, Version) when Version >= {3,3} ->
-    sets:to_list(sets:intersection(sets:from_list(ClientHashSigns), 
-				   sets:from_list(SupportedHashSigns)));
-available_signature_algs(_, _, _, _) -> 
-    undefined.
-
 server_name(_, _, server) ->
     undefined; %% Not interesting to check your own name.
 server_name(undefined, Host, client) ->
     {fallback, Host}; %% Fallback to Host argument to connect
 server_name(SNI, _, client) ->
     SNI. %% If Server Name Indication is available
+
+client_ecc_extensions(SupportedECCs) ->
+    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
+    case proplists:get_bool(ecdh, CryptoSupport) of
+	true ->
+	    EcPointFormats = #ec_point_formats{ec_point_format_list = [?ECPOINT_UNCOMPRESSED]},
+	    EllipticCurves = SupportedECCs,
+	    {EcPointFormats, EllipticCurves};
+	_ ->
+	    {undefined, undefined}
+    end.
+
+server_ecc_extension(_Version, EcPointFormats) ->
+    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
+    case proplists:get_bool(ecdh, CryptoSupport) of
+	true ->
+	    handle_ecc_point_fmt_extension(EcPointFormats);
+	false ->
+	    undefined
+    end.
+
+handle_ecc_point_fmt_extension(undefined) ->
+    undefined;
+handle_ecc_point_fmt_extension(_) ->
+    #ec_point_formats{ec_point_format_list = [?ECPOINT_UNCOMPRESSED]}.
+
+advertises_ec_ciphers([]) ->
+    false;
+advertises_ec_ciphers([#{key_exchange := ecdh_ecdsa} | _]) ->
+    true;
+advertises_ec_ciphers([#{key_exchange := ecdhe_ecdsa} | _]) ->
+    true;
+advertises_ec_ciphers([#{key_exchange := ecdh_rsa} | _]) ->
+    true;
+advertises_ec_ciphers([#{key_exchange := ecdhe_rsa} | _]) ->
+    true;
+advertises_ec_ciphers([#{key_exchange := ecdh_anon} | _]) ->
+    true;
+advertises_ec_ciphers([{ecdhe_psk, _,_,_} | _]) ->
+    true;
+advertises_ec_ciphers([_| Rest]) ->
+    advertises_ec_ciphers(Rest).
+
+select_shared_curve([], _) ->
+    no_curve;
+select_shared_curve([Curve | Rest], Curves) ->
+    case lists:member(Curve, Curves) of
+	true ->
+	    {namedCurve, Curve};
+	false ->
+	    select_shared_curve(Rest, Curves)
+    end.
+
+sni(undefined) ->
+    undefined;
+sni(disable) ->
+    undefined;
+sni(Hostname) ->
+    #sni{hostname = Hostname}.
+
+renegotiation_info(_, client, _, false) ->
+    #renegotiation_info{renegotiated_connection = undefined};
+renegotiation_info(_RecordCB, server, ConnectionStates, false) ->
+    ConnectionState  = ssl_record:current_connection_state(ConnectionStates, read),
+    case maps:get(secure_renegotiation, ConnectionState) of
+	true ->
+	    #renegotiation_info{renegotiated_connection = ?byte(0)};
+	false ->
+	    #renegotiation_info{renegotiated_connection = undefined}
+    end;
+renegotiation_info(_RecordCB, client, ConnectionStates, true) ->
+    ConnectionState = ssl_record:current_connection_state(ConnectionStates, read),
+    case  maps:get(secure_renegotiation, ConnectionState) of
+	true ->
+	    Data = maps:get(client_verify_data, ConnectionState),
+	    #renegotiation_info{renegotiated_connection = Data};
+	false ->
+	    #renegotiation_info{renegotiated_connection = undefined}
+    end;
+
+renegotiation_info(_RecordCB, server, ConnectionStates, true) ->
+    ConnectionState = ssl_record:current_connection_state(ConnectionStates, read),
+    case maps:get(secure_renegotiation, ConnectionState) of
+	true ->
+	    CData = maps:get(client_verify_data, ConnectionState),
+	    SData = maps:get(server_verify_data, ConnectionState),
+	    #renegotiation_info{renegotiated_connection = <<CData/binary, SData/binary>>};
+	false ->
+	    #renegotiation_info{renegotiated_connection = undefined}
+    end.
+
+handle_renegotiation_info(_RecordCB, _, #renegotiation_info{renegotiated_connection = ?byte(0)},
+			  ConnectionStates, false, _, _) ->
+    {ok, ssl_record:set_renegotiation_flag(true, ConnectionStates)};
+
+handle_renegotiation_info(_RecordCB, server, undefined, ConnectionStates, _, _, CipherSuites) ->
+    case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
+	true ->
+	    {ok, ssl_record:set_renegotiation_flag(true, ConnectionStates)};
+	false ->
+	    {ok, ssl_record:set_renegotiation_flag(false, ConnectionStates)}
+    end;
+
+handle_renegotiation_info(_RecordCB, _, undefined, ConnectionStates, false, _, _) ->
+    {ok, ssl_record:set_renegotiation_flag(false, ConnectionStates)};
+
+handle_renegotiation_info(_RecordCB, client, #renegotiation_info{renegotiated_connection = ClientServerVerify},
+			  ConnectionStates, true, _, _) ->
+    ConnectionState = ssl_record:current_connection_state(ConnectionStates, read),
+    CData = maps:get(client_verify_data, ConnectionState),
+    SData = maps:get(server_verify_data, ConnectionState),
+    case <<CData/binary, SData/binary>> == ClientServerVerify of
+	true ->
+	    {ok, ConnectionStates};
+	false ->
+            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, client_renegotiation)
+    end;
+handle_renegotiation_info(_RecordCB, server, #renegotiation_info{renegotiated_connection = ClientVerify},
+			  ConnectionStates, true, _, CipherSuites) ->
+
+      case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
+	  true ->
+              ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, {server_renegotiation, empty_renegotiation_info_scsv});
+	  false ->
+	      ConnectionState = ssl_record:current_connection_state(ConnectionStates, read),
+	      Data =  maps:get(client_verify_data, ConnectionState),
+	      case Data == ClientVerify of
+		  true ->
+		      {ok, ConnectionStates};
+		  false ->
+                      ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, server_renegotiation)
+	      end
+      end;
+
+handle_renegotiation_info(RecordCB, client, undefined, ConnectionStates, true, SecureRenegotation, _) ->
+    handle_renegotiation_info(RecordCB, ConnectionStates, SecureRenegotation);
+
+handle_renegotiation_info(RecordCB, server, undefined, ConnectionStates, true, SecureRenegotation, CipherSuites) ->
+     case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
+	  true ->
+             ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, {server_renegotiation, empty_renegotiation_info_scsv});
+	 false ->
+	     handle_renegotiation_info(RecordCB, ConnectionStates, SecureRenegotation)
+     end.
+
+handle_renegotiation_info(_RecordCB, ConnectionStates, SecureRenegotation) ->
+    ConnectionState = ssl_record:current_connection_state(ConnectionStates, read),
+    case {SecureRenegotation, maps:get(secure_renegotiation, ConnectionState)} of
+	{_, true} ->
+            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, already_secure);
+	{true, false} ->
+	    ?ALERT_REC(?FATAL, ?NO_RENEGOTIATION);
+	{false, false} ->
+	    {ok, ConnectionStates}
+    end.
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index 24ac34653e..bbe1374fec 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -73,6 +73,7 @@
 %% sslv3 is considered insecure due to lack of padding check (Poodle attack)
 %% Keep as interop with legacy software but do not support as default 
 -define(ALL_AVAILABLE_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]).
+-define(ALL_AVAILABLE_DATAGRAM_VERSIONS, ['dtlsv1.2', dtlsv1]).
 -define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1]).
 -define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1]).
 -define(ALL_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
@@ -95,7 +96,8 @@
 	  certfile             :: binary(),
 	  cert                 :: public_key:der_encoded() | secret_printout() | 'undefined',
 	  keyfile              :: binary(),
-	  key	               :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', public_key:der_encoded()} | secret_printout() | 'undefined',
+	  key	               :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', 
+                                   public_key:der_encoded()} | key_map() | secret_printout() | 'undefined',
 	  password	       :: string() | secret_printout() | 'undefined',
 	  cacerts              :: [public_key:der_encoded()] | secret_printout() | 'undefined',
 	  cacertfile           :: binary(),
@@ -164,7 +166,15 @@
 		 connection_cb
 		}).
 
-
+-type key_map()              :: #{algorithm := rsa | dss | ecdsa,
+                                  %% engine and key_id ought to 
+                                  %% be :=, but putting it in
+                                  %% the spec gives dialyzer warning
+                                  %% of correct code!
+                                  engine => crypto:engine_ref(),
+                                  key_id => crypto:key_id(),
+                                  password => crypto:password()
+                                 }.
 -type state_name()           :: hello | abbreviated | certify | cipher | connection.
 -type gen_fsm_state_return() :: {next_state, state_name(), term()} |
 				{next_state, state_name(), term(), timeout()} |
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index 003ad4994b..c0eee466ae 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -53,11 +53,11 @@
 -type ssl_atom_version() :: tls_record:tls_atom_version().
 -type connection_states() :: term(). %% Map
 -type connection_state() :: term(). %% Map
+
 %%====================================================================
-%% Internal application API
+%% Connection state handling
 %%====================================================================
 
-
 %%--------------------------------------------------------------------
 -spec current_connection_state(connection_states(), read | write) ->
 				      connection_state().
@@ -267,6 +267,9 @@ set_pending_cipher_state(#{pending_read := Read,
       pending_read => Read#{cipher_state => ServerState},
       pending_write => Write#{cipher_state => ClientState}}.
 
+%%====================================================================
+%% Compression
+%%====================================================================
 
 uncompress(?NULL, Data, CS) ->
     {Data, CS}.
@@ -282,6 +285,11 @@ compress(?NULL, Data, CS) ->
 compressions() ->
     [?byte(?NULL)].
 
+
+%%====================================================================
+%% Payload encryption/decryption
+%%====================================================================
+
 %%--------------------------------------------------------------------
 -spec cipher(ssl_version(), iodata(), connection_state(), MacHash::binary()) ->
 		    {CipherFragment::binary(), connection_state()}.
@@ -318,7 +326,7 @@ cipher_aead(Version, Fragment,
 
 %%--------------------------------------------------------------------
 -spec decipher(ssl_version(), binary(), connection_state(), boolean()) ->
-                      {binary(), binary(), connection_state} | #alert{}.
+                      {binary(), binary(), connection_state()} | #alert{}.
 %%
 %% Description: Payload decryption
 %%--------------------------------------------------------------------
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index 62452808ae..2872ca9fe5 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -45,10 +45,8 @@
 %% Setup
 -export([start_fsm/8, start_link/7, init/1]).
 
--export([encode_data/3, encode_alert/3]).
-
 %% State transition handling	 
--export([next_record/1, next_event/3, next_event/4]).
+-export([next_record/1, next_event/3, next_event/4, handle_common_event/4]).
 
 %% Handshake handling
 -export([renegotiate/2, send_handshake/2, 
@@ -56,11 +54,11 @@
 	 reinit_handshake_data/1,  select_sni_extension/1, empty_connection_state/2]).
 
 %% Alert and close handling
--export([send_alert/2, close/5, protocol_name/0]).
+-export([encode_alert/3, send_alert/2, close/5, protocol_name/0]).
 
 %% Data handling
--export([passive_receive/2, next_record_if_active/1, handle_common_event/4, send/3,
-        socket/5, setopts/3, getopts/3]).
+-export([encode_data/3, passive_receive/2, next_record_if_active/1, send/3,
+         socket/5, setopts/3, getopts/3]).
 
 %% gen_statem state functions
 -export([init/3, error/3, downgrade/3, %% Initiation and take down states
@@ -72,6 +70,9 @@
 %%====================================================================
 %% Internal application API
 %%====================================================================	     
+%%====================================================================
+%% Setup
+%%====================================================================
 start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_, Tracker} = Opts,
 	  User, {CbModule, _,_, _} = CbInfo, 
 	  Timeout) -> 
@@ -100,6 +101,165 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = true},_, Tracker} =
 	    Error
     end.
 
+%%--------------------------------------------------------------------
+-spec start_link(atom(), host(), inet:port_number(), port(), list(), pid(), tuple()) ->
+    {ok, pid()} | ignore |  {error, reason()}.
+%%
+%% Description: Creates a gen_statem process which calls Module:init/1 to
+%% initialize. 
+%%--------------------------------------------------------------------
+start_link(Role, Host, Port, Socket, Options, User, CbInfo) ->
+    {ok, proc_lib:spawn_link(?MODULE, init, [[Role, Host, Port, Socket, Options, User, CbInfo]])}.
+
+init([Role, Host, Port, Socket, Options,  User, CbInfo]) ->
+    process_flag(trap_exit, true),
+    State0 = initial_state(Role, Host, Port, Socket, Options, User, CbInfo),
+    try 
+	State = ssl_connection:ssl_config(State0#state.ssl_options, Role, State0),
+	gen_statem:enter_loop(?MODULE, [], init, State)
+    catch throw:Error ->
+	gen_statem:enter_loop(?MODULE, [], error, {Error, State0}) 
+    end.
+%%====================================================================
+%% State transition handling
+%%====================================================================
+next_record(#state{unprocessed_handshake_events = N} = State) when N > 0 ->
+    {no_record, State#state{unprocessed_handshake_events = N-1}};
+					 
+next_record(#state{protocol_buffers =
+		       #protocol_buffers{tls_packets = [], tls_cipher_texts = [CT | Rest]}
+		   = Buffers,
+		   connection_states = ConnStates0,
+		   ssl_options = #ssl_options{padding_check = Check}} = State) ->
+    case tls_record:decode_cipher_text(CT, ConnStates0, Check) of
+	{Plain, ConnStates} ->		      
+	    {Plain, State#state{protocol_buffers =
+				    Buffers#protocol_buffers{tls_cipher_texts = Rest},
+				connection_states = ConnStates}};
+	#alert{} = Alert ->
+	    {Alert, State}
+    end;
+next_record(#state{protocol_buffers = #protocol_buffers{tls_packets = [], tls_cipher_texts = []},
+		   socket = Socket,
+                   close_tag = CloseTag,
+		   transport_cb = Transport} = State) ->
+    case tls_socket:setopts(Transport, Socket, [{active,once}]) of
+	ok ->
+	    {no_record, State};
+	_ ->
+            self() ! {CloseTag, Socket},
+	    {no_record, State}
+    end;
+next_record(State) ->
+    {no_record, State}.
+
+next_event(StateName, Record, State) ->
+    next_event(StateName, Record, State, []).
+
+next_event(connection = StateName, no_record, State0, Actions) ->
+    case next_record_if_active(State0) of
+	{no_record, State} ->
+	    ssl_connection:hibernate_after(StateName, State, Actions);
+	{#ssl_tls{} = Record, State} ->
+	    {next_state, StateName, State, [{next_event, internal, {protocol_record, Record}} | Actions]};
+	{#alert{} = Alert, State} ->
+	    {next_state, StateName, State, [{next_event, internal, Alert} | Actions]}
+    end;
+next_event(StateName, Record, State, Actions) ->
+    case Record of
+	no_record ->
+	    {next_state, StateName, State, Actions};
+	#ssl_tls{} = Record ->
+	    {next_state, StateName, State, [{next_event, internal, {protocol_record, Record}} | Actions]};
+	#alert{} = Alert ->
+	    {next_state, StateName, State, [{next_event, internal, Alert} | Actions]}
+    end.
+
+handle_common_event(internal, #alert{} = Alert, StateName, 
+		    #state{negotiated_version = Version} = State) ->
+    ssl_connection:handle_own_alert(Alert, Version, StateName, State);
+%%% TLS record protocol level handshake messages 
+handle_common_event(internal,  #ssl_tls{type = ?HANDSHAKE, fragment = Data}, 
+		    StateName, #state{protocol_buffers =
+					  #protocol_buffers{tls_handshake_buffer = Buf0} = Buffers,
+				      negotiated_version = Version,
+				      ssl_options = Options} = State0) ->
+    try
+	{Packets, Buf} = tls_handshake:get_tls_handshake(Version,Data,Buf0, Options),
+	State1 =
+	    State0#state{protocol_buffers =
+			     Buffers#protocol_buffers{tls_handshake_buffer = Buf}},
+	case Packets of
+            [] -> 
+                assert_buffer_sanity(Buf, Options),
+                {Record, State} = next_record(State1),
+                next_event(StateName, Record, State);
+            _ ->                
+                Events = tls_handshake_events(Packets),
+                case StateName of
+                    connection ->
+                        ssl_connection:hibernate_after(StateName, State1, Events);
+                    _ ->
+                        {next_state, StateName, 
+                         State1#state{unprocessed_handshake_events = unprocessed_events(Events)}, Events}
+                end
+        end
+    catch throw:#alert{} = Alert ->
+            ssl_connection:handle_own_alert(Alert, Version, StateName, State0)
+    end;
+%%% TLS record protocol level application data messages 
+handle_common_event(internal, #ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, StateName, State) ->
+    {next_state, StateName, State, [{next_event, internal, {application_data, Data}}]};
+%%% TLS record protocol level change cipher messages
+handle_common_event(internal, #ssl_tls{type = ?CHANGE_CIPHER_SPEC, fragment = Data}, StateName, State) ->
+    {next_state, StateName, State, [{next_event, internal, #change_cipher_spec{type = Data}}]};
+%%% TLS record protocol level Alert messages
+handle_common_event(internal, #ssl_tls{type = ?ALERT, fragment = EncAlerts}, StateName,
+		    #state{negotiated_version = Version} = State) ->
+    try decode_alerts(EncAlerts) of	
+	Alerts = [_|_] ->
+	    handle_alerts(Alerts,  {next_state, StateName, State});
+	[] ->
+	    ssl_connection:handle_own_alert(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, empty_alert), 
+					    Version, StateName, State);
+	#alert{} = Alert ->
+	    ssl_connection:handle_own_alert(Alert, Version, StateName, State)
+    catch
+	_:_ ->
+	    ssl_connection:handle_own_alert(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, alert_decode_error),
+					    Version, StateName, State)  
+
+    end;
+%% Ignore unknown TLS record level protocol messages
+handle_common_event(internal, #ssl_tls{type = _Unknown}, StateName, State) ->
+    {next_state, StateName, State}.
+%%====================================================================
+%% Handshake handling
+%%====================================================================
+renegotiate(#state{role = client} = State, Actions) ->
+    %% Handle same way as if server requested
+    %% the renegotiation
+    Hs0 = ssl_handshake:init_handshake_history(),
+    {next_state, connection, State#state{tls_handshake_history = Hs0}, 
+     [{next_event, internal, #hello_request{}} | Actions]};
+
+renegotiate(#state{role = server,
+		   socket = Socket,
+		   transport_cb = Transport,
+		   negotiated_version = Version,
+		   connection_states = ConnectionStates0} = State0, Actions) ->
+    HelloRequest = ssl_handshake:hello_request(),
+    Frag = tls_handshake:encode_handshake(HelloRequest, Version),
+    Hs0 = ssl_handshake:init_handshake_history(),
+    {BinMsg, ConnectionStates} = 
+	tls_record:encode_handshake(Frag, Version, ConnectionStates0),
+    send(Transport, Socket, BinMsg),
+    State1 = State0#state{connection_states = 
+			     ConnectionStates,
+			 tls_handshake_history = Hs0},
+    {Record, State} = next_record(State1),
+    next_event(hello, Record, State, Actions).
+	     
 send_handshake(Handshake, State) ->
     send_handshake_flight(queue_handshake(Handshake, State)).
 
@@ -128,15 +288,6 @@ queue_change_cipher(Msg, #state{negotiated_version = Version,
     State0#state{connection_states = ConnectionStates,
 		 flight_buffer = Flight0 ++ [BinChangeCipher]}.
 
-send_alert(Alert, #state{negotiated_version = Version,
-			 socket = Socket,
-			 transport_cb = Transport,
-			 connection_states = ConnectionStates0} = State0) ->
-    {BinMsg, ConnectionStates} =
-	encode_alert(Alert, Version, ConnectionStates0),
-    send(Transport, Socket, BinMsg),
-    State0#state{connection_states = ConnectionStates}.
-
 reinit_handshake_data(State) ->
     %% premaster_secret, public_key_info and tls_handshake_info 
     %% are only needed during the handshake phase. 
@@ -155,8 +306,17 @@ select_sni_extension(_) ->
 empty_connection_state(ConnectionEnd, BeastMitigation) ->
     ssl_record:empty_connection_state(ConnectionEnd, BeastMitigation).
 
-encode_data(Data, Version, ConnectionStates0)->
-    tls_record:encode_data(Data, Version, ConnectionStates0).
+%%====================================================================
+%% Alert and close handling
+%%====================================================================	     
+send_alert(Alert, #state{negotiated_version = Version,
+			 socket = Socket,
+			 transport_cb = Transport,
+			 connection_states = ConnectionStates0} = State0) ->
+    {BinMsg, ConnectionStates} =
+	encode_alert(Alert, Version, ConnectionStates0),
+    send(Transport, Socket, BinMsg),
+    State0#state{connection_states = ConnectionStates}.
 
 %%--------------------------------------------------------------------
 -spec encode_alert(#alert{}, ssl_record:ssl_version(), ssl_record:connection_states()) -> 
@@ -166,42 +326,66 @@ encode_data(Data, Version, ConnectionStates0)->
 %%--------------------------------------------------------------------
 encode_alert(#alert{} = Alert, Version, ConnectionStates) ->
     tls_record:encode_alert_record(Alert, Version, ConnectionStates).
-
+%% User closes or recursive call!
+close({close, Timeout}, Socket, Transport = gen_tcp, _,_) ->
+    tls_socket:setopts(Transport, Socket, [{active, false}]),
+    Transport:shutdown(Socket, write),
+    _ = Transport:recv(Socket, 0, Timeout),
+    ok;
+%% Peer closed socket
+close({shutdown, transport_closed}, Socket, Transport = gen_tcp, ConnectionStates, Check) ->
+    close({close, 0}, Socket, Transport, ConnectionStates, Check);
+%% We generate fatal alert
+close({shutdown, own_alert}, Socket, Transport = gen_tcp, ConnectionStates, Check) ->
+    %% Standard trick to try to make sure all
+    %% data sent to the tcp port is really delivered to the
+    %% peer application before tcp port is closed so that the peer will
+    %% get the correct TLS alert message and not only a transport close.
+    %% Will return when other side has closed or after timout millisec
+    %% e.g. we do not want to hang if something goes wrong
+    %% with the network but we want to maximise the odds that
+    %% peer application gets all data sent on the tcp connection.
+    close({close, ?DEFAULT_TIMEOUT}, Socket, Transport, ConnectionStates, Check);
+close(downgrade, _,_,_,_) ->
+    ok;
+%% Other
+close(_, Socket, Transport, _,_) -> 
+    Transport:close(Socket).
 protocol_name() ->
     "TLS".
-%%====================================================================
-%% tls_connection_sup API
-%%====================================================================
 
-%%--------------------------------------------------------------------
--spec start_link(atom(), host(), inet:port_number(), port(), list(), pid(), tuple()) ->
-    {ok, pid()} | ignore |  {error, reason()}.
-%%
-%% Description: Creates a gen_fsm process which calls Module:init/1 to
-%% initialize. To ensure a synchronized start-up procedure, this function
-%% does not return until Module:init/1 has returned.  
-%%--------------------------------------------------------------------
-start_link(Role, Host, Port, Socket, Options, User, CbInfo) ->
-    {ok, proc_lib:spawn_link(?MODULE, init, [[Role, Host, Port, Socket, Options, User, CbInfo]])}.
+%%====================================================================
+%% Data handling
+%%====================================================================	     
+encode_data(Data, Version, ConnectionStates0)->
+    tls_record:encode_data(Data, Version, ConnectionStates0).
 
-init([Role, Host, Port, Socket, Options,  User, CbInfo]) ->
-    process_flag(trap_exit, true),
-    State0 = initial_state(Role, Host, Port, Socket, Options, User, CbInfo),
-    try 
-	State = ssl_connection:ssl_config(State0#state.ssl_options, Role, State0),
-	gen_statem:enter_loop(?MODULE, [], init, State)
-    catch throw:Error ->
-	gen_statem:enter_loop(?MODULE, [], error, {Error, State0}) 
+passive_receive(State0 = #state{user_data_buffer = Buffer}, StateName) -> 
+    case Buffer of
+	<<>> ->
+	    {Record, State} = next_record(State0),
+	    next_event(StateName, Record, State);
+	_ ->
+	    {Record, State} = ssl_connection:read_application_data(<<>>, State0),
+	    next_event(StateName, Record, State)
     end.
 
-callback_mode() ->
-    state_functions.
+next_record_if_active(State = 
+		      #state{socket_options = 
+			     #socket_options{active = false}}) -> 
+    {no_record ,State};
+next_record_if_active(State) ->
+    next_record(State).
+
+send(Transport, Socket, Data) ->
+   tls_socket:send(Transport, Socket, Data).
 
 socket(Pid,  Transport, Socket, Connection, Tracker) ->
     tls_socket:socket(Pid, Transport, Socket, Connection, Tracker).
 
 setopts(Transport, Socket, Other) ->
     tls_socket:setopts(Transport, Socket, Other).
+
 getopts(Transport, Socket, Tag) ->
     tls_socket:getopts(Transport, Socket, Tag).
 
@@ -244,7 +428,7 @@ init({call, From}, {start, Timeout},
     {Record, State} = next_record(State1),
     next_event(hello, Record, State);
 init(Type, Event, State) ->
-    gen_handshake(ssl_connection, ?FUNCTION_NAME, Type, Event, State).
+    gen_handshake(?FUNCTION_NAME, Type, Event, State).
  
 %%--------------------------------------------------------------------
 -spec error(gen_statem:event_type(),
@@ -253,9 +437,15 @@ init(Type, Event, State) ->
 %%--------------------------------------------------------------------
 
 error({call, From}, {start, _Timeout}, {Error, State}) ->
-    {stop_and_reply, normal, {reply, From, {error, Error}}, State};
-error({call, From}, Msg, State) ->
-    handle_call(Msg, From, ?FUNCTION_NAME, State);
+    ssl_connection:stop_and_reply(
+      normal, {reply, From, {error, Error}}, State);
+error({call, From}, {start, _Timeout}, 
+      #state{protocol_specific = #{error := Error}} = State) ->
+    ssl_connection:stop_and_reply(
+      normal, {reply, From, {error, Error}}, State);
+error({call, _} = Call, Msg, {Error, #state{protocol_specific = Map} = State}) ->
+    gen_handshake(?FUNCTION_NAME, Call, Msg, 
+                  State#state{protocol_specific = Map#{error => Error}});
 error(_, _, _) ->
      {keep_state_and_data, [postpone]}.
  
@@ -285,13 +475,13 @@ hello(internal, #client_hello{client_version = ClientVersion} = Hello,
 			   undefined -> CurrentProtocol;
 			   _ -> Protocol0
 		       end,
-	    
-	    gen_handshake(ssl_connection, hello, internal, {common_client_hello, Type, ServerHelloExt},
-				 State#state{connection_states  = ConnectionStates,
-					     negotiated_version = Version,
-					     hashsign_algorithm = HashSign,
-					     session = Session,
-					     negotiated_protocol = Protocol})
+            gen_handshake(?FUNCTION_NAME, internal, {common_client_hello, Type, ServerHelloExt},
+                          State#state{connection_states  = ConnectionStates,
+                                      negotiated_version = Version,
+                                      hashsign_algorithm = HashSign,
+                                      client_hello_version = ClientVersion,
+                                      session = Session,
+                                      negotiated_protocol = Protocol})
     end;
 hello(internal, #server_hello{} = Hello,
       #state{connection_states = ConnectionStates0,
@@ -309,7 +499,7 @@ hello(internal, #server_hello{} = Hello,
 hello(info, Event, State) ->
     gen_info(Event, ?FUNCTION_NAME, State);
 hello(Type, Event, State) ->
-    gen_handshake(ssl_connection, ?FUNCTION_NAME, Type, Event, State).
+    gen_handshake(?FUNCTION_NAME, Type, Event, State).
 
 %%--------------------------------------------------------------------
 -spec abbreviated(gen_statem:event_type(), term(), #state{}) ->
@@ -318,7 +508,7 @@ hello(Type, Event, State) ->
 abbreviated(info, Event, State) ->
     gen_info(Event, ?FUNCTION_NAME, State);
 abbreviated(Type, Event, State) ->
-    gen_handshake(ssl_connection, ?FUNCTION_NAME, Type, Event, State).
+    gen_handshake(?FUNCTION_NAME, Type, Event, State).
 
 %%--------------------------------------------------------------------
 -spec certify(gen_statem:event_type(), term(), #state{}) ->
@@ -327,7 +517,7 @@ abbreviated(Type, Event, State) ->
 certify(info, Event, State) ->
     gen_info(Event, ?FUNCTION_NAME, State);
 certify(Type, Event, State) ->
-    gen_handshake(ssl_connection, ?FUNCTION_NAME, Type, Event, State).
+    gen_handshake(?FUNCTION_NAME, Type, Event, State).
 
 %%--------------------------------------------------------------------
 -spec cipher(gen_statem:event_type(), term(), #state{}) ->
@@ -336,7 +526,7 @@ certify(Type, Event, State) ->
 cipher(info, Event, State) ->
     gen_info(Event, ?FUNCTION_NAME, State);
 cipher(Type, Event, State) ->
-     gen_handshake(ssl_connection, ?FUNCTION_NAME, Type, Event, State).
+     gen_handshake(?FUNCTION_NAME, Type, Event, State).
 
 %%--------------------------------------------------------------------
 -spec connection(gen_statem:event_type(),  
@@ -394,156 +584,24 @@ death_row(Type, Event, State) ->
 downgrade(Type, Event, State) ->
      ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE).
 
-%%--------------------------------------------------------------------
-%% Event handling functions called by state functions to handle
-%% common or unexpected events for the state.
-%%--------------------------------------------------------------------
-handle_call(Event, From, StateName, State) ->
-    ssl_connection:handle_call(Event, From, StateName, State, ?MODULE).
- 
-%% raw data from socket, unpack records
-handle_info({Protocol, _, Data}, StateName,
-            #state{data_tag = Protocol} = State0) ->
-    case next_tls_record(Data, State0) of
-	{Record, State} ->
-	    next_event(StateName, Record, State);
-	#alert{} = Alert ->
-	    ssl_connection:handle_normal_shutdown(Alert, StateName, State0), 
-	    {stop, {shutdown, own_alert}}
-    end;
-handle_info({CloseTag, Socket}, StateName,
-            #state{socket = Socket, close_tag = CloseTag,
-                   socket_options = #socket_options{active = Active},
-                   protocol_buffers = #protocol_buffers{tls_cipher_texts = CTs},
-		   negotiated_version = Version} = State) ->
-
-    %% Note that as of TLS 1.1,
-    %% failure to properly close a connection no longer requires that a
-    %% session not be resumed.  This is a change from TLS 1.0 to conform
-    %% with widespread implementation practice.
-
-    case (Active == false) andalso (CTs =/= []) of
-        false ->
-            case Version of
-                {1, N} when N >= 1 ->
-                    ok;
-                _ ->
-                    %% As invalidate_sessions here causes performance issues,
-                    %% we will conform to the widespread implementation
-                    %% practice and go aginst the spec
-                    %%invalidate_session(Role, Host, Port, Session)
-                    ok
-            end,
-
-            ssl_connection:handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-            {stop, {shutdown, transport_closed}};
-        true ->
-            %% Fixes non-delivery of final TLS record in {active, once}.
-            %% Basically allows the application the opportunity to set {active, once} again
-            %% and then receive the final message.
-            next_event(StateName, no_record, State)
-    end;
-handle_info(Msg, StateName, State) ->
-    ssl_connection:StateName(info, Msg, State, ?MODULE).
-
-handle_common_event(internal, #alert{} = Alert, StateName, 
-		    #state{negotiated_version = Version} = State) ->
-    ssl_connection:handle_own_alert(Alert, Version, StateName, State);
-
-%%% TLS record protocol level handshake messages 
-handle_common_event(internal,  #ssl_tls{type = ?HANDSHAKE, fragment = Data}, 
-		    StateName, #state{protocol_buffers =
-					  #protocol_buffers{tls_handshake_buffer = Buf0} = Buffers,
-				      negotiated_version = Version,
-				      ssl_options = Options} = State0) ->
-    try
-	{Packets, Buf} = tls_handshake:get_tls_handshake(Version,Data,Buf0, Options),
-	State1 =
-	    State0#state{protocol_buffers =
-			     Buffers#protocol_buffers{tls_handshake_buffer = Buf}},
-	case Packets of
-            [] -> 
-                assert_buffer_sanity(Buf, Options),
-                {Record, State} = next_record(State1),
-                next_event(StateName, Record, State);
-            _ ->                
-                Events = tls_handshake_events(Packets),
-                case StateName of
-                    connection ->
-                        ssl_connection:hibernate_after(StateName, State1, Events);
-                    _ ->
-                        {next_state, StateName, 
-                         State1#state{unprocessed_handshake_events = unprocessed_events(Events)}, Events}
-                end
-        end
-    catch throw:#alert{} = Alert ->
-            ssl_connection:handle_own_alert(Alert, Version, StateName, State0)
-    end;
-%%% TLS record protocol level application data messages 
-handle_common_event(internal, #ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, StateName, State) ->
-    {next_state, StateName, State, [{next_event, internal, {application_data, Data}}]};
-%%% TLS record protocol level change cipher messages
-handle_common_event(internal, #ssl_tls{type = ?CHANGE_CIPHER_SPEC, fragment = Data}, StateName, State) ->
-    {next_state, StateName, State, [{next_event, internal, #change_cipher_spec{type = Data}}]};
-%%% TLS record protocol level Alert messages
-handle_common_event(internal, #ssl_tls{type = ?ALERT, fragment = EncAlerts}, StateName,
-		    #state{negotiated_version = Version} = State) ->
-    try decode_alerts(EncAlerts) of	
-	Alerts = [_|_] ->
-	    handle_alerts(Alerts,  {next_state, StateName, State});
-	[] ->
-	    ssl_connection:handle_own_alert(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, empty_alert), 
-					    Version, StateName, State);
-	#alert{} = Alert ->
-	    ssl_connection:handle_own_alert(Alert, Version, StateName, State)
-    catch
-	_:_ ->
-	    ssl_connection:handle_own_alert(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, alert_decode_error),
-					    Version, StateName, State)  
-
-    end;
-%% Ignore unknown TLS record level protocol messages
-handle_common_event(internal, #ssl_tls{type = _Unknown}, StateName, State) ->
-    {next_state, StateName, State}.
-
-send(Transport, Socket, Data) ->
-   tls_socket:send(Transport, Socket, Data).
-
-%%--------------------------------------------------------------------
+%--------------------------------------------------------------------
 %% gen_statem callbacks
 %%--------------------------------------------------------------------
+callback_mode() ->
+    state_functions.
+
 terminate(Reason, StateName, State) ->
     catch ssl_connection:terminate(Reason, StateName, State).
 
 format_status(Type, Data) ->
     ssl_connection:format_status(Type, Data).
 
-%%--------------------------------------------------------------------
-%% code_change(OldVsn, StateName, State, Extra) -> {ok, StateName, NewState}
-%% Description: Convert process state when code is changed
-%%--------------------------------------------------------------------
-code_change(_OldVsn, StateName, State0, {Direction, From, To}) ->
-    State = convert_state(State0, Direction, From, To),
-    {ok, StateName, State};
 code_change(_OldVsn, StateName, State, _) ->
     {ok, StateName, State}.
 
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-encode_handshake(Handshake, Version, ConnectionStates0, Hist0, V2HComp) ->
-    Frag = tls_handshake:encode_handshake(Handshake, Version),
-    Hist = ssl_handshake:update_handshake_history(Hist0, Frag, V2HComp),
-    {Encoded, ConnectionStates} =
-        tls_record:encode_handshake(Frag, Version, ConnectionStates0),
-    {Encoded, ConnectionStates, Hist}.
-
-encode_change_cipher(#change_cipher_spec{}, Version, ConnectionStates) ->
-    tls_record:encode_change_cipher_spec(Version, ConnectionStates).
-
-decode_alerts(Bin) ->
-    ssl_alert:decode(Bin).
-
 initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions, Tracker}, User,
 	      {CbModule, DataTag, CloseTag, ErrorTag}) ->
     #ssl_options{beast_mitigation = BeastMitigation} = SSLOptions,
@@ -582,170 +640,109 @@ initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions, Tracker}, Us
 	   flight_buffer = []
 	  }.
 
-next_tls_record(Data, #state{protocol_buffers = #protocol_buffers{tls_record_buffer = Buf0,
-						tls_cipher_texts = CT0} = Buffers} = State0) ->
-    case tls_record:get_tls_records(Data, Buf0) of
+next_tls_record(Data, StateName, #state{protocol_buffers = 
+                                            #protocol_buffers{tls_record_buffer = Buf0,
+                                                              tls_cipher_texts = CT0} = Buffers}
+                                        = State0) ->
+    case tls_record:get_tls_records(Data, 
+                                    acceptable_record_versions(StateName, State0),
+                                    Buf0) of
 	{Records, Buf1} ->
 	    CT1 = CT0 ++ Records,
 	    next_record(State0#state{protocol_buffers =
 					 Buffers#protocol_buffers{tls_record_buffer = Buf1,
 								  tls_cipher_texts = CT1}});
 	#alert{} = Alert ->
-	    Alert
+	    handle_record_alert(Alert, State0)
     end.
-next_record(#state{unprocessed_handshake_events = N} = State) when N > 0 ->
-    {no_record, State#state{unprocessed_handshake_events = N-1}};
-					 
-next_record(#state{protocol_buffers =
-		       #protocol_buffers{tls_packets = [], tls_cipher_texts = [CT | Rest]}
-		   = Buffers,
-		   connection_states = ConnStates0,
-		   ssl_options = #ssl_options{padding_check = Check}} = State) ->
-    case tls_record:decode_cipher_text(CT, ConnStates0, Check) of
-	{Plain, ConnStates} ->		      
-	    {Plain, State#state{protocol_buffers =
-				    Buffers#protocol_buffers{tls_cipher_texts = Rest},
-				connection_states = ConnStates}};
-	#alert{} = Alert ->
-	    {Alert, State}
-    end;
-next_record(#state{protocol_buffers = #protocol_buffers{tls_packets = [], tls_cipher_texts = []},
-		   socket = Socket,
-		   transport_cb = Transport} = State) ->
-    case tls_socket:setopts(Transport, Socket, [{active,once}]) of
-	ok ->
-	    {no_record, State};
-	_ ->
-	    {socket_closed, State}
-    end;
-next_record(State) ->
-    {no_record, State}.
 
-next_record_if_active(State = 
-		      #state{socket_options = 
-			     #socket_options{active = false}}) -> 
-    {no_record ,State};
-
-next_record_if_active(State) ->
-    next_record(State).
-
-passive_receive(State0 = #state{user_data_buffer = Buffer}, StateName) -> 
-    case Buffer of
-	<<>> ->
-	    {Record, State} = next_record(State0),
-	    next_event(StateName, Record, State);
-	_ ->
-	    {Record, State} = ssl_connection:read_application_data(<<>>, State0),
-	    next_event(StateName, Record, State)
-    end.
-
-next_event(StateName, Record, State) ->
-    next_event(StateName, Record, State, []).
-
-next_event(StateName, socket_closed, State, _) ->
-    ssl_connection:handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-    {stop, {shutdown, transport_closed}, State};
-next_event(connection = StateName, no_record, State0, Actions) ->
-    case next_record_if_active(State0) of
-	{no_record, State} ->
-	    ssl_connection:hibernate_after(StateName, State, Actions);
-	{socket_closed, State} ->
-	    next_event(StateName, socket_closed, State, Actions);
-	{#ssl_tls{} = Record, State} ->
-	    {next_state, StateName, State, [{next_event, internal, {protocol_record, Record}} | Actions]};
-	{#alert{} = Alert, State} ->
-	    {next_state, StateName, State, [{next_event, internal, Alert} | Actions]}
-    end;
-next_event(StateName, Record, State, Actions) ->
-    case Record of
-	no_record ->
-	    {next_state, StateName, State, Actions};
-	#ssl_tls{} = Record ->
-	    {next_state, StateName, State, [{next_event, internal, {protocol_record, Record}} | Actions]};
-	#alert{} = Alert ->
-	    {next_state, StateName, State, [{next_event, internal, Alert} | Actions]}
-    end.
+acceptable_record_versions(hello, #state{ssl_options = #ssl_options{v2_hello_compatible = true}}) ->
+    [tls_record:protocol_version(Vsn) || Vsn <- ?ALL_AVAILABLE_VERSIONS ++ ['sslv2']];
+acceptable_record_versions(hello, _) ->
+    [tls_record:protocol_version(Vsn) || Vsn <- ?ALL_AVAILABLE_VERSIONS];
+acceptable_record_versions(_, #state{negotiated_version = Version}) ->
+    [Version].
+handle_record_alert(#alert{description = ?BAD_RECORD_MAC}, 
+                    #state{ssl_options = #ssl_options{v2_hello_compatible = true}}) ->
+    ?ALERT_REC(?FATAL, ?PROTOCOL_VERSION);
+handle_record_alert(Alert, _) ->
+    Alert.
 
 tls_handshake_events(Packets) ->
     lists:map(fun(Packet) ->
 		      {next_event, internal, {handshake, Packet}}
 	      end, Packets).
 
+%% raw data from socket, upack records
+handle_info({Protocol, _, Data}, StateName,
+            #state{data_tag = Protocol} = State0) ->
+    case next_tls_record(Data, StateName, State0) of
+	{Record, State} ->
+	    next_event(StateName, Record, State);
+	#alert{} = Alert ->
+	    ssl_connection:handle_normal_shutdown(Alert, StateName, State0), 
+	    ssl_connection:stop({shutdown, own_alert}, State0)
+    end;
+handle_info({CloseTag, Socket}, StateName,
+            #state{socket = Socket, close_tag = CloseTag,
+                   socket_options = #socket_options{active = Active},
+                   protocol_buffers = #protocol_buffers{tls_cipher_texts = CTs},
+		   negotiated_version = Version} = State) ->
 
-renegotiate(#state{role = client} = State, Actions) ->
-    %% Handle same way as if server requested
-    %% the renegotiation
-    Hs0 = ssl_handshake:init_handshake_history(),
-    {next_state, connection, State#state{tls_handshake_history = Hs0}, 
-     [{next_event, internal, #hello_request{}} | Actions]};
+    %% Note that as of TLS 1.1,
+    %% failure to properly close a connection no longer requires that a
+    %% session not be resumed.  This is a change from TLS 1.0 to conform
+    %% with widespread implementation practice.
 
-renegotiate(#state{role = server,
-		   socket = Socket,
-		   transport_cb = Transport,
-		   negotiated_version = Version,
-		   connection_states = ConnectionStates0} = State0, Actions) ->
-    HelloRequest = ssl_handshake:hello_request(),
-    Frag = tls_handshake:encode_handshake(HelloRequest, Version),
-    Hs0 = ssl_handshake:init_handshake_history(),
-    {BinMsg, ConnectionStates} = 
-	tls_record:encode_handshake(Frag, Version, ConnectionStates0),
-    send(Transport, Socket, BinMsg),
-    State1 = State0#state{connection_states = 
-			     ConnectionStates,
-			 tls_handshake_history = Hs0},
-    {Record, State} = next_record(State1),
-    next_event(hello, Record, State, Actions).
+    case (Active == false) andalso (CTs =/= []) of
+        false ->
+            case Version of
+                {1, N} when N >= 1 ->
+                    ok;
+                _ ->
+                    %% As invalidate_sessions here causes performance issues,
+                    %% we will conform to the widespread implementation
+                    %% practice and go aginst the spec
+                    %%invalidate_session(Role, Host, Port, Session)
+                    ok
+            end,
+
+            ssl_connection:handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
+            ssl_connection:stop({shutdown, transport_closed}, State);
+        true ->
+            %% Fixes non-delivery of final TLS record in {active, once}.
+            %% Basically allows the application the opportunity to set {active, once} again
+            %% and then receive the final message.
+            next_event(StateName, no_record, State)
+    end;
+handle_info(Msg, StateName, State) ->
+    ssl_connection:StateName(info, Msg, State, ?MODULE).
 
 handle_alerts([], Result) ->
     Result;
-handle_alerts(_, {stop,_} = Stop) ->
+handle_alerts(_, {stop, _, _} = Stop) ->
     Stop;
 handle_alerts([Alert | Alerts], {next_state, StateName, State}) ->
      handle_alerts(Alerts, ssl_connection:handle_alert(Alert, StateName, State));
 handle_alerts([Alert | Alerts], {next_state, StateName, State, _Actions}) ->
      handle_alerts(Alerts, ssl_connection:handle_alert(Alert, StateName, State)).
 
+encode_handshake(Handshake, Version, ConnectionStates0, Hist0, V2HComp) ->
+    Frag = tls_handshake:encode_handshake(Handshake, Version),
+    Hist = ssl_handshake:update_handshake_history(Hist0, Frag, V2HComp),
+    {Encoded, ConnectionStates} =
+        tls_record:encode_handshake(Frag, Version, ConnectionStates0),
+    {Encoded, ConnectionStates, Hist}.
 
-%% User closes or recursive call!
-close({close, Timeout}, Socket, Transport = gen_tcp, _,_) ->
-    tls_socket:setopts(Transport, Socket, [{active, false}]),
-    Transport:shutdown(Socket, write),
-    _ = Transport:recv(Socket, 0, Timeout),
-    ok;
-%% Peer closed socket
-close({shutdown, transport_closed}, Socket, Transport = gen_tcp, ConnectionStates, Check) ->
-    close({close, 0}, Socket, Transport, ConnectionStates, Check);
-%% We generate fatal alert
-close({shutdown, own_alert}, Socket, Transport = gen_tcp, ConnectionStates, Check) ->
-    %% Standard trick to try to make sure all
-    %% data sent to the tcp port is really delivered to the
-    %% peer application before tcp port is closed so that the peer will
-    %% get the correct TLS alert message and not only a transport close.
-    %% Will return when other side has closed or after timout millisec
-    %% e.g. we do not want to hang if something goes wrong
-    %% with the network but we want to maximise the odds that
-    %% peer application gets all data sent on the tcp connection.
-    close({close, ?DEFAULT_TIMEOUT}, Socket, Transport, ConnectionStates, Check);
-close(downgrade, _,_,_,_) ->
-    ok;
-%% Other
-close(_, Socket, Transport, _,_) -> 
-    Transport:close(Socket).
-
-convert_state(#state{ssl_options = Options} = State, up, "5.3.5", "5.3.6") ->
-    State#state{ssl_options = convert_options_partial_chain(Options, up)};
-convert_state(#state{ssl_options = Options} = State, down, "5.3.6", "5.3.5") ->
-    State#state{ssl_options = convert_options_partial_chain(Options, down)}.
+encode_change_cipher(#change_cipher_spec{}, Version, ConnectionStates) ->
+    tls_record:encode_change_cipher_spec(Version, ConnectionStates).
 
-convert_options_partial_chain(Options, up) ->
-    {Head, Tail} = lists:split(5, tuple_to_list(Options)),
-    list_to_tuple(Head ++ [{partial_chain, fun(_) -> unknown_ca end}] ++ Tail);
-convert_options_partial_chain(Options, down) ->
-    list_to_tuple(proplists:delete(partial_chain, tuple_to_list(Options))).
+decode_alerts(Bin) ->
+    ssl_alert:decode(Bin).
 
-gen_handshake(GenConnection, StateName, Type, Event, 
+gen_handshake(StateName, Type, Event, 
 	      #state{negotiated_version = Version} = State) ->
-    try GenConnection:StateName(Type, Event, State, ?MODULE) of
+    try ssl_connection:StateName(Type, Event, State, ?MODULE) of
 	Result ->
 	    Result
     catch 
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl
index b54540393a..8817418fb0 100644
--- a/lib/ssl/src/tls_handshake.erl
+++ b/lib/ssl/src/tls_handshake.erl
@@ -32,13 +32,19 @@
 -include("ssl_cipher.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
--export([client_hello/8, hello/4,
-	 get_tls_handshake/4, encode_handshake/2, decode_handshake/4]).
+%% Handshake handling
+-export([client_hello/8, hello/4]).
+
+%% Handshake encoding
+-export([encode_handshake/2]).
+
+%% Handshake decodeing
+-export([get_tls_handshake/4, decode_handshake/4]).
 
 -type tls_handshake() :: #client_hello{} | ssl_handshake:ssl_handshake().
 
 %%====================================================================
-%% Internal application API
+%% Handshake handling
 %%====================================================================
 %%--------------------------------------------------------------------
 -spec client_hello(host(), inet:port_number(), ssl_record:connection_states(),
@@ -54,18 +60,14 @@ client_hello(Host, Port, ConnectionStates,
 			 } = SslOpts,
 	     Cache, CacheCb, Renegotiation, OwnCert) ->
     Version = tls_record:highest_protocol_version(Versions),
-    #{security_parameters := SecParams} = ssl_record:pending_connection_state(ConnectionStates, read),
+    #{security_parameters := SecParams} = 
+        ssl_record:pending_connection_state(ConnectionStates, read),
     AvailableCipherSuites = ssl_handshake:available_suites(UserSuites, Version),     
     Extensions = ssl_handshake:client_hello_extensions(Version, 
 						       AvailableCipherSuites,
-						       SslOpts, ConnectionStates, Renegotiation),
-    CipherSuites = 
-	case Fallback of
-	    true ->
-	        [?TLS_FALLBACK_SCSV | ssl_handshake:cipher_suites(AvailableCipherSuites, Renegotiation)];
-	    false ->
-		ssl_handshake:cipher_suites(AvailableCipherSuites, Renegotiation)
-	end,
+						       SslOpts, ConnectionStates, 
+                                                       Renegotiation),
+    CipherSuites = ssl_handshake:cipher_suites(AvailableCipherSuites, Renegotiation, Fallback),
     Id = ssl_session:client_id({Host, Port, SslOpts}, Cache, CacheCb, OwnCert),    
     #client_hello{session_id = Id,
 		  client_version = Version,
@@ -85,8 +87,8 @@ client_hello(Host, Port, ConnectionStates,
 		    ssl_record:connection_states(), alpn | npn, binary() | undefined}|
 		   {tls_record:tls_version(), {resumed | new, #session{}}, 
 		    ssl_record:connection_states(), binary() | undefined, 
-		    #hello_extensions{}, {ssl_cipher:hash(), ssl_cipher:sign_algo()} | undefined} |
-		   #alert{}.
+		    #hello_extensions{}, {ssl_cipher:hash(), ssl_cipher:sign_algo()} | 
+                    undefined} | #alert{}.
 %%
 %% Description: Handles a received hello message
 %%--------------------------------------------------------------------
@@ -99,7 +101,8 @@ hello(#server_hello{server_version = Version, random = Random,
     case tls_record:is_acceptable_version(Version, SupportedVersions) of
 	true ->
 	    handle_server_hello_extensions(Version, SessionId, Random, CipherSuite,
-					   Compression, HelloExt, SslOpt, ConnectionStates0, Renegotiation);
+					   Compression, HelloExt, SslOpt, 
+                                           ConnectionStates0, Renegotiation);
 	false ->
 	    ?ALERT_REC(?FATAL, ?PROTOCOL_VERSION)
     end;
@@ -127,18 +130,29 @@ hello(#client_hello{client_version = ClientVersion,
 	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, malformed_handshake_data)
     end.  
 
+
+%%--------------------------------------------------------------------
+%%% Handshake encodeing
+%%--------------------------------------------------------------------
+
 %%--------------------------------------------------------------------
 -spec encode_handshake(tls_handshake(), tls_record:tls_version()) -> iolist().
 %%     
 %% Description: Encode a handshake packet
-%%--------------------------------------------------------------------x
+%%--------------------------------------------------------------------
 encode_handshake(Package, Version) ->
     {MsgType, Bin} = enc_handshake(Package, Version),
     Len = byte_size(Bin),
     [MsgType, ?uint24(Len), Bin].
 
+
+%%--------------------------------------------------------------------
+%%% Handshake decodeing
+%%--------------------------------------------------------------------
+
 %%--------------------------------------------------------------------
--spec get_tls_handshake(tls_record:tls_version(), binary(), binary() | iolist(), #ssl_options{}) ->
+-spec get_tls_handshake(tls_record:tls_version(), binary(), binary() | iolist(), 
+                        #ssl_options{}) ->
      {[tls_handshake()], binary()}.
 %%
 %% Description: Given buffered and new data from ssl_record, collects
@@ -153,37 +167,45 @@ get_tls_handshake(Version, Data, Buffer, Options) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-handle_client_hello(Version, #client_hello{session_id = SugesstedId,
-					   cipher_suites = CipherSuites,
-					   compression_methods = Compressions,
-					   random = Random,
-					   extensions = #hello_extensions{elliptic_curves = Curves,
-									  signature_algs = ClientHashSigns} = HelloExt},
+handle_client_hello(Version, 
+                    #client_hello{session_id = SugesstedId,
+                                  cipher_suites = CipherSuites,
+                                  compression_methods = Compressions,
+                                  random = Random,
+                                  extensions = 
+                                      #hello_extensions{elliptic_curves = Curves,
+                                                        signature_algs = ClientHashSigns} 
+                                  = HelloExt},
 		    #ssl_options{versions = Versions,
 				 signature_algs = SupportedHashSigns,
 				 eccs = SupportedECCs,
 				 honor_ecc_order = ECCOrder} = SslOpts,
-		    {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert, _}, Renegotiation) ->
+		    {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert, _}, 
+                    Renegotiation) ->
     case tls_record:is_acceptable_version(Version, Versions) of
 	true ->
 	    AvailableHashSigns = ssl_handshake:available_signature_algs(
 				   ClientHashSigns, SupportedHashSigns, Cert, Version),
 	    ECCCurve = ssl_handshake:select_curve(Curves, SupportedECCs, ECCOrder),
 	    {Type, #session{cipher_suite = CipherSuite} = Session1}
-		= ssl_handshake:select_session(SugesstedId, CipherSuites, AvailableHashSigns, Compressions,
-					       Port, Session0#session{ecc = ECCCurve}, Version,
-					       SslOpts, Cache, CacheCb, Cert),
+		= ssl_handshake:select_session(SugesstedId, CipherSuites, 
+                                               AvailableHashSigns, Compressions,
+					       Port, Session0#session{ecc = ECCCurve}, 
+                                               Version, SslOpts, Cache, CacheCb, Cert),
 	    case CipherSuite of 
 		no_suite ->
                     ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_ciphers);
 		_ ->
-		    {KeyExAlg,_,_,_} = ssl_cipher:suite_definition(CipherSuite),
-		    case ssl_handshake:select_hashsign(ClientHashSigns, Cert, KeyExAlg, SupportedHashSigns, Version) of
+		    #{key_exchange := KeyExAlg} = ssl_cipher:suite_definition(CipherSuite),
+		    case ssl_handshake:select_hashsign(ClientHashSigns, Cert, KeyExAlg, 
+                                                       SupportedHashSigns, Version) of
 			#alert{} = Alert ->
 			    Alert;
 			HashSign ->
-			    handle_client_hello_extensions(Version, Type, Random, CipherSuites, HelloExt,
-							   SslOpts, Session1, ConnectionStates0,
+			    handle_client_hello_extensions(Version, Type, Random, 
+                                                           CipherSuites, HelloExt,
+							   SslOpts, Session1, 
+                                                           ConnectionStates0,
 							   Renegotiation, HashSign)
 		    end
 	    end;
@@ -191,6 +213,59 @@ handle_client_hello(Version, #client_hello{session_id = SugesstedId,
 	    ?ALERT_REC(?FATAL, ?PROTOCOL_VERSION)
     end.
 
+handle_client_hello_extensions(Version, Type, Random, CipherSuites,
+                               HelloExt, SslOpts, Session0, ConnectionStates0, 
+                               Renegotiation, HashSign) ->
+    try ssl_handshake:handle_client_hello_extensions(tls_record, Random, CipherSuites,
+						     HelloExt, Version, SslOpts,
+						     Session0, ConnectionStates0, 
+                                                     Renegotiation) of
+	#alert{} = Alert ->
+	    Alert;
+	{Session, ConnectionStates, Protocol, ServerHelloExt} ->
+	    {Version, {Type, Session}, ConnectionStates, Protocol, 
+             ServerHelloExt, HashSign}
+    catch throw:Alert ->
+	    Alert
+    end.
+
+
+handle_server_hello_extensions(Version, SessionId, Random, CipherSuite,
+			Compression, HelloExt, SslOpt, ConnectionStates0, Renegotiation) ->
+    case ssl_handshake:handle_server_hello_extensions(tls_record, Random, CipherSuite,
+						      Compression, HelloExt, Version,
+						      SslOpt, ConnectionStates0, 
+                                                      Renegotiation) of
+	#alert{} = Alert ->
+	    Alert;
+	{ConnectionStates, ProtoExt, Protocol} ->
+	    {Version, SessionId, ConnectionStates, ProtoExt, Protocol}
+    end.
+%%--------------------------------------------------------------------
+enc_handshake(#hello_request{}, _Version) ->
+    {?HELLO_REQUEST, <<>>};
+enc_handshake(#client_hello{client_version = {Major, Minor},
+		     random = Random,
+		     session_id = SessionID,
+		     cipher_suites = CipherSuites,
+		     compression_methods = CompMethods, 
+		     extensions = HelloExtensions}, _Version) ->
+    SIDLength = byte_size(SessionID),
+    BinCompMethods = list_to_binary(CompMethods),
+    CmLength = byte_size(BinCompMethods),
+    BinCipherSuites = list_to_binary(CipherSuites),
+    CsLength = byte_size(BinCipherSuites),
+    ExtensionsBin = ssl_handshake:encode_hello_extensions(HelloExtensions),
+
+    {?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+		      ?BYTE(SIDLength), SessionID/binary,
+		      ?UINT16(CsLength), BinCipherSuites/binary,
+		      ?BYTE(CmLength), BinCompMethods/binary, ExtensionsBin/binary>>};
+
+enc_handshake(HandshakeMsg, Version) ->
+    ssl_handshake:encode_handshake(HandshakeMsg, Version).
+
+%%--------------------------------------------------------------------
 get_tls_handshake_aux(Version, <<?BYTE(Type), ?UINT24(Length),
 				 Body:Length/binary,Rest/binary>>, 
                       #ssl_options{v2_hello_compatible = V2Hello} = Opts,  Acc) ->
@@ -219,11 +294,12 @@ decode_handshake(_Version, ?CLIENT_HELLO, Bin, true) ->
 decode_handshake(_Version, ?CLIENT_HELLO, Bin, false) ->
     decode_hello(Bin);
 
-decode_handshake(_Version, ?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
-					    ?BYTE(SID_length), Session_ID:SID_length/binary,
-					    ?UINT16(Cs_length), CipherSuites:Cs_length/binary,
-					    ?BYTE(Cm_length), Comp_methods:Cm_length/binary,
-					    Extensions/binary>>, _) ->
+decode_handshake(_Version, ?CLIENT_HELLO, 
+                 <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+                   ?BYTE(SID_length), Session_ID:SID_length/binary,
+                   ?UINT16(Cs_length), CipherSuites:Cs_length/binary,
+                   ?BYTE(Cm_length), Comp_methods:Cm_length/binary,
+                   Extensions/binary>>, _) ->
     
     DecodedExtensions = ssl_handshake:decode_hello_extensions({client, Extensions}),
 
@@ -268,53 +344,3 @@ decode_v2_hello(<<?BYTE(Major), ?BYTE(Minor),
 		  compression_methods = [?NULL],
 		  extensions = #hello_extensions{}
 		 }.
-
-enc_handshake(#hello_request{}, _Version) ->
-    {?HELLO_REQUEST, <<>>};
-enc_handshake(#client_hello{client_version = {Major, Minor},
-		     random = Random,
-		     session_id = SessionID,
-		     cipher_suites = CipherSuites,
-		     compression_methods = CompMethods, 
-		     extensions = HelloExtensions}, _Version) ->
-    SIDLength = byte_size(SessionID),
-    BinCompMethods = list_to_binary(CompMethods),
-    CmLength = byte_size(BinCompMethods),
-    BinCipherSuites = list_to_binary(CipherSuites),
-    CsLength = byte_size(BinCipherSuites),
-    ExtensionsBin = ssl_handshake:encode_hello_extensions(HelloExtensions),
-
-    {?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
-		      ?BYTE(SIDLength), SessionID/binary,
-		      ?UINT16(CsLength), BinCipherSuites/binary,
-		      ?BYTE(CmLength), BinCompMethods/binary, ExtensionsBin/binary>>};
-
-enc_handshake(HandshakeMsg, Version) ->
-    ssl_handshake:encode_handshake(HandshakeMsg, Version).
-
-
-handle_client_hello_extensions(Version, Type, Random, CipherSuites,
-			HelloExt, SslOpts, Session0, ConnectionStates0, Renegotiation, HashSign) ->
-    try ssl_handshake:handle_client_hello_extensions(tls_record, Random, CipherSuites,
-						     HelloExt, Version, SslOpts,
-						     Session0, ConnectionStates0, Renegotiation) of
-	#alert{} = Alert ->
-	    Alert;
-	{Session, ConnectionStates, Protocol, ServerHelloExt} ->
-	    {Version, {Type, Session}, ConnectionStates, Protocol, ServerHelloExt, HashSign}
-    catch throw:Alert ->
-	    Alert
-    end.
-
-
-handle_server_hello_extensions(Version, SessionId, Random, CipherSuite,
-			Compression, HelloExt, SslOpt, ConnectionStates0, Renegotiation) ->
-    case ssl_handshake:handle_server_hello_extensions(tls_record, Random, CipherSuite,
-						      Compression, HelloExt, Version,
-						      SslOpt, ConnectionStates0, Renegotiation) of
-	#alert{} = Alert ->
-	    Alert;
-	{ConnectionStates, ProtoExt, Protocol} ->
-	    {Version, SessionId, ConnectionStates, ProtoExt, Protocol}
-    end.
-
diff --git a/lib/ssl/src/tls_record.erl b/lib/ssl/src/tls_record.erl
index 4ac6cdc6b5..188ec6809d 100644
--- a/lib/ssl/src/tls_record.erl
+++ b/lib/ssl/src/tls_record.erl
@@ -32,22 +32,22 @@
 -include("ssl_cipher.hrl").
 
 %% Handling of incoming data
--export([get_tls_records/2, init_connection_states/2]).
+-export([get_tls_records/3, init_connection_states/2]).
 
 %% Encoding TLS records
 -export([encode_handshake/3, encode_alert_record/3,
 	 encode_change_cipher_spec/2, encode_data/3]).
 -export([encode_plain_text/4]).
 
+%% Decoding
+-export([decode_cipher_text/3]).
+
 %% Protocol version handling
 -export([protocol_version/1,  lowest_protocol_version/1, lowest_protocol_version/2,
 	 highest_protocol_version/1, highest_protocol_version/2,
 	 is_higher/2, supported_protocol_versions/0,
 	 is_acceptable_version/1, is_acceptable_version/2, hello_version/2]).
 
-%% Decoding
--export([decode_cipher_text/3]).
-
 -export_type([tls_version/0, tls_atom_version/0]).
 
 -type tls_version()       :: ssl_record:ssl_version().
@@ -56,13 +56,12 @@
 -compile(inline).
 
 %%====================================================================
-%% Internal application API
+%% Handling of incoming data
 %%====================================================================
 %%--------------------------------------------------------------------
 -spec init_connection_states(client | server, one_n_minus_one | zero_n | disabled) ->
  				    ssl_record:connection_states().
-%% %
-						%
+%% 
 %% Description: Creates a connection_states record with appropriate
 %% values for the initial SSL connection setup.
 %%--------------------------------------------------------------------
@@ -76,16 +75,29 @@ init_connection_states(Role, BeastMitigation) ->
       pending_write => Pending}.
 
 %%--------------------------------------------------------------------
--spec get_tls_records(binary(), binary()) -> {[binary()], binary()} | #alert{}.
+-spec get_tls_records(binary(), [tls_version()], binary()) -> {[binary()], binary()} | #alert{}.
 %%			     
 %% and returns it as a list of tls_compressed binaries also returns leftover
 %% Description: Given old buffer and new data from TCP, packs up a records
 %% data
 %%--------------------------------------------------------------------
-get_tls_records(Data, <<>>) ->
-    get_tls_records_aux(Data, []);
-get_tls_records(Data, Buffer) ->
-    get_tls_records_aux(list_to_binary([Buffer, Data]), []).
+get_tls_records(Data, Versions, Buffer) ->
+    BinData = list_to_binary([Buffer, Data]),
+    case erlang:byte_size(BinData) of
+        N when N >= 3 ->
+            case assert_version(BinData, Versions) of
+                true ->
+                    get_tls_records_aux(BinData, []);
+                false ->
+                    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+            end;
+        _ ->
+            get_tls_records_aux(BinData, [])
+    end.
+
+%%====================================================================
+%% Encoding
+%%====================================================================
 
 %%--------------------------------------------------------------------
 -spec encode_handshake(iolist(), tls_version(), ssl_record:connection_states()) ->
@@ -141,6 +153,74 @@ encode_data(Frag, Version,
     Data = split_bin(Frag, ?MAX_PLAIN_TEXT_LENGTH, Version, BCA, BeastMitigation),
     encode_iolist(?APPLICATION_DATA, Data, Version, ConnectionStates).
 
+%%====================================================================
+%% Decoding
+%%====================================================================
+
+%%--------------------------------------------------------------------
+-spec decode_cipher_text(#ssl_tls{}, ssl_record:connection_states(), boolean()) ->
+				{#ssl_tls{}, ssl_record:connection_states()}| #alert{}.
+%%
+%% Description: Decode cipher text
+%%--------------------------------------------------------------------
+decode_cipher_text(#ssl_tls{type = Type, version = Version,
+			    fragment = CipherFragment} = CipherText,
+		   #{current_read :=
+			 #{compression_state := CompressionS0,
+			   sequence_number := Seq,
+                           cipher_state := CipherS0,
+			   security_parameters :=
+			       #security_parameters{
+				  cipher_type = ?AEAD,
+                                  bulk_cipher_algorithm =
+                                      BulkCipherAlgo,
+				  compression_algorithm = CompAlg}
+			  } = ReadState0} = ConnnectionStates0, _) ->
+    AAD = calc_aad(Type, Version, ReadState0),
+    case ssl_cipher:decipher_aead(BulkCipherAlgo, CipherS0, Seq, AAD, CipherFragment, Version) of
+	{PlainFragment, CipherS1} ->
+	    {Plain, CompressionS1} = ssl_record:uncompress(CompAlg,
+							   PlainFragment, CompressionS0),
+	    ConnnectionStates = ConnnectionStates0#{
+				  current_read => ReadState0#{
+                                                    cipher_state => CipherS1,
+                                                    sequence_number => Seq + 1,
+                                                    compression_state => CompressionS1}},
+	    {CipherText#ssl_tls{fragment = Plain}, ConnnectionStates};
+	#alert{} = Alert ->
+	    Alert
+    end;
+
+decode_cipher_text(#ssl_tls{type = Type, version = Version,
+			    fragment = CipherFragment} = CipherText,
+		   #{current_read :=
+			 #{compression_state := CompressionS0,
+			   sequence_number := Seq,
+			   security_parameters :=
+			       #security_parameters{compression_algorithm = CompAlg}
+			  } = ReadState0} = ConnnectionStates0, PaddingCheck) ->
+    case ssl_record:decipher(Version, CipherFragment, ReadState0, PaddingCheck) of
+	{PlainFragment, Mac, ReadState1} ->
+	    MacHash = ssl_cipher:calc_mac_hash(Type, Version, PlainFragment, ReadState1),
+	    case ssl_record:is_correct_mac(Mac, MacHash) of
+		true ->
+		    {Plain, CompressionS1} = ssl_record:uncompress(CompAlg,
+								   PlainFragment, CompressionS0),
+		    ConnnectionStates = ConnnectionStates0#{
+					  current_read => ReadState1#{
+							    sequence_number => Seq + 1,
+							    compression_state => CompressionS1}},
+		    {CipherText#ssl_tls{fragment = Plain}, ConnnectionStates};
+		false ->
+			?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+	    end;
+	    #alert{} = Alert ->
+	    Alert
+    end.
+
+%%====================================================================
+%% Protocol version handling
+%%====================================================================
 
 %%--------------------------------------------------------------------
 -spec protocol_version(tls_atom_version() | tls_version()) -> 
@@ -278,11 +358,6 @@ supported_protocol_versions([_|_] = Vsns) ->
 	    end
     end.
 
-%%--------------------------------------------------------------------
-%%     
-%% Description: ssl version 2 is not acceptable security risks are too big.
-%% 
-%%--------------------------------------------------------------------
 -spec is_acceptable_version(tls_version()) -> boolean().
 is_acceptable_version({N,_}) 
   when N >= ?LOWEST_MAJOR_SUPPORTED_VERSION ->
@@ -302,6 +377,7 @@ hello_version(Version, _) when Version >= {3, 3} ->
     Version;
 hello_version(_, Versions) ->
     lowest_protocol_version(Versions).
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
@@ -318,6 +394,19 @@ initial_connection_state(ConnectionEnd, BeastMitigation) ->
       server_verify_data => undefined
      }.
 
+assert_version(<<1:1, Length0:15, Data0:Length0/binary, _/binary>>, Versions) ->
+    case Data0 of
+        <<?BYTE(?CLIENT_HELLO), ?BYTE(Major), ?BYTE(Minor), _/binary>> ->
+            %% First check v2_hello_compatible mode is active 
+            lists:member({2,0}, Versions) andalso
+            %% andalso we want to negotiate higher version
+                lists:member({Major, Minor}, Versions -- [{2,0}]); 
+        _ ->
+            false
+    end;
+assert_version(<<?BYTE(_), ?BYTE(MajVer), ?BYTE(MinVer), _/binary>>, Versions) ->
+    is_acceptable_version({MajVer, MinVer}, Versions).
+                   
 get_tls_records_aux(<<?BYTE(?APPLICATION_DATA),?BYTE(MajVer),?BYTE(MinVer),
 		     ?UINT16(Length), Data:Length/binary, Rest/binary>>, 
 		    Acc) ->
@@ -361,10 +450,9 @@ get_tls_records_aux(<<1:1, Length0:15, Data0:Length0/binary, Rest/binary>>,
     end;
 
 get_tls_records_aux(<<0:1, _CT:7, ?BYTE(_MajVer), ?BYTE(_MinVer),
-                     ?UINT16(Length), _/binary>>,
+                      ?UINT16(Length), _/binary>>,
                     _Acc) when Length > ?MAX_CIPHER_TEXT_LENGTH ->
     ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
-
 get_tls_records_aux(<<1:1, Length0:15, _/binary>>,_Acc) 
   when Length0 > ?MAX_CIPHER_TEXT_LENGTH ->
     ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
@@ -376,37 +464,17 @@ get_tls_records_aux(Data, Acc) ->
 	false ->
 	    ?ALERT_REC(?FATAL, ?UNEXPECTED_MESSAGE)
 	end.
-
+%%--------------------------------------------------------------------
 encode_plain_text(Type, Version, Data, #{current_write := Write0} = ConnectionStates) ->
     {CipherFragment, Write1} = do_encode_plain_text(Type, Version, Data, Write0),
     {CipherText, Write} = encode_tls_cipher_text(Type, Version, CipherFragment, Write1),
     {CipherText, ConnectionStates#{current_write => Write}}.
 
-lowest_list_protocol_version(Ver, []) ->
-    Ver;
-lowest_list_protocol_version(Ver1,  [Ver2 | Rest]) ->
-    lowest_list_protocol_version(lowest_protocol_version(Ver1, Ver2), Rest).
-
-highest_list_protocol_version(Ver, []) ->
-    Ver;
-highest_list_protocol_version(Ver1,  [Ver2 | Rest]) ->
-    highest_list_protocol_version(highest_protocol_version(Ver1, Ver2), Rest).
-
 encode_tls_cipher_text(Type, {MajVer, MinVer}, Fragment, #{sequence_number := Seq} = Write) ->
     Length = erlang:iolist_size(Fragment),
     {[<<?BYTE(Type), ?BYTE(MajVer), ?BYTE(MinVer), ?UINT16(Length)>>, Fragment],
      Write#{sequence_number => Seq +1}}.
 
-highest_protocol_version() ->
-    highest_protocol_version(supported_protocol_versions()).
-
-lowest_protocol_version() ->
-    lowest_protocol_version(supported_protocol_versions()).
-
-sufficient_tlsv1_2_crypto_support() ->
-    CryptoSupport = crypto:supports(),
-    proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport)).
-
 encode_iolist(Type, Data, Version, ConnectionStates0) ->
     {ConnectionStates, EncodedMsg} =
         lists:foldl(fun(Text, {CS0, Encoded}) ->
@@ -415,6 +483,31 @@ encode_iolist(Type, Data, Version, ConnectionStates0) ->
 			    {CS1, [Enc | Encoded]}
 		    end, {ConnectionStates0, []}, Data),
     {lists:reverse(EncodedMsg), ConnectionStates}.
+%%--------------------------------------------------------------------
+do_encode_plain_text(Type, Version, Data, #{compression_state := CompS0,
+					 security_parameters :=
+					     #security_parameters{
+						cipher_type = ?AEAD,
+						compression_algorithm = CompAlg}
+					} = WriteState0) ->
+    {Comp, CompS1} = ssl_record:compress(CompAlg, Data, CompS0),
+    WriteState1 = WriteState0#{compression_state => CompS1},
+    AAD = calc_aad(Type, Version, WriteState1),
+    ssl_record:cipher_aead(Version, Comp, WriteState1, AAD);
+do_encode_plain_text(Type, Version, Data, #{compression_state := CompS0,
+					 security_parameters :=
+					     #security_parameters{compression_algorithm = CompAlg}
+					}= WriteState0) ->
+    {Comp, CompS1} = ssl_record:compress(CompAlg, Data, CompS0),
+    WriteState1 = WriteState0#{compression_state => CompS1},
+    MacHash = ssl_cipher:calc_mac_hash(Type, Version, Comp, WriteState1),
+    ssl_record:cipher(Version, Comp, WriteState1, MacHash);
+do_encode_plain_text(_,_,_,CS) ->
+    exit({cs, CS}).
+%%--------------------------------------------------------------------
+calc_aad(Type, {MajVer, MinVer},
+	 #{sequence_number := SeqNo}) ->
+    <<?UINT64(SeqNo), ?BYTE(Type), ?BYTE(MajVer), ?BYTE(MinVer)>>.
 
 %% 1/n-1 splitting countermeasure Rizzo/Duong-Beast, RC4 chiphers are
 %% not vulnerable to this attack.
@@ -440,89 +533,25 @@ do_split_bin(Bin, ChunkSize, Acc) ->
         _ ->
             lists:reverse(Acc, [Bin])
     end.
-
 %%--------------------------------------------------------------------
--spec decode_cipher_text(#ssl_tls{}, ssl_record:connection_states(), boolean()) ->
-				{#ssl_tls{}, ssl_record:connection_states()}| #alert{}.
-%%
-%% Description: Decode cipher text
-%%--------------------------------------------------------------------
-decode_cipher_text(#ssl_tls{type = Type, version = Version,
-			    fragment = CipherFragment} = CipherText,
-		   #{current_read :=
-			 #{compression_state := CompressionS0,
-			   sequence_number := Seq,
-                           cipher_state := CipherS0,
-			   security_parameters :=
-			       #security_parameters{
-				  cipher_type = ?AEAD,
-                                  bulk_cipher_algorithm =
-                                      BulkCipherAlgo,
-				  compression_algorithm = CompAlg}
-			  } = ReadState0} = ConnnectionStates0, _) ->
-    AAD = calc_aad(Type, Version, ReadState0),
-    case ssl_cipher:decipher_aead(BulkCipherAlgo, CipherS0, Seq, AAD, CipherFragment, Version) of
-	{PlainFragment, CipherS1} ->
-	    {Plain, CompressionS1} = ssl_record:uncompress(CompAlg,
-							   PlainFragment, CompressionS0),
-	    ConnnectionStates = ConnnectionStates0#{
-				  current_read => ReadState0#{
-                                                    cipher_state => CipherS1,
-                                                    sequence_number => Seq + 1,
-                                                    compression_state => CompressionS1}},
-	    {CipherText#ssl_tls{fragment = Plain}, ConnnectionStates};
-	#alert{} = Alert ->
-	    Alert
-    end;
+lowest_list_protocol_version(Ver, []) ->
+    Ver;
+lowest_list_protocol_version(Ver1,  [Ver2 | Rest]) ->
+    lowest_list_protocol_version(lowest_protocol_version(Ver1, Ver2), Rest).
 
-decode_cipher_text(#ssl_tls{type = Type, version = Version,
-			    fragment = CipherFragment} = CipherText,
-		   #{current_read :=
-			 #{compression_state := CompressionS0,
-			   sequence_number := Seq,
-			   security_parameters :=
-			       #security_parameters{compression_algorithm = CompAlg}
-			  } = ReadState0} = ConnnectionStates0, PaddingCheck) ->
-    case ssl_record:decipher(Version, CipherFragment, ReadState0, PaddingCheck) of
-	{PlainFragment, Mac, ReadState1} ->
-	    MacHash = ssl_cipher:calc_mac_hash(Type, Version, PlainFragment, ReadState1),
-	    case ssl_record:is_correct_mac(Mac, MacHash) of
-		true ->
-		    {Plain, CompressionS1} = ssl_record:uncompress(CompAlg,
-								   PlainFragment, CompressionS0),
-		    ConnnectionStates = ConnnectionStates0#{
-					  current_read => ReadState1#{
-							    sequence_number => Seq + 1,
-							    compression_state => CompressionS1}},
-		    {CipherText#ssl_tls{fragment = Plain}, ConnnectionStates};
-		false ->
-			?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
-	    end;
-	    #alert{} = Alert ->
-	    Alert
-    end.
+highest_list_protocol_version(Ver, []) ->
+    Ver;
+highest_list_protocol_version(Ver1,  [Ver2 | Rest]) ->
+    highest_list_protocol_version(highest_protocol_version(Ver1, Ver2), Rest).
+
+highest_protocol_version() ->
+    highest_protocol_version(supported_protocol_versions()).
+
+lowest_protocol_version() ->
+    lowest_protocol_version(supported_protocol_versions()).
+
+sufficient_tlsv1_2_crypto_support() ->
+    CryptoSupport = crypto:supports(),
+    proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport)).
 
-do_encode_plain_text(Type, Version, Data, #{compression_state := CompS0,
-					 security_parameters :=
-					     #security_parameters{
-						cipher_type = ?AEAD,
-						compression_algorithm = CompAlg}
-					} = WriteState0) ->
-    {Comp, CompS1} = ssl_record:compress(CompAlg, Data, CompS0),
-    WriteState1 = WriteState0#{compression_state => CompS1},
-    AAD = calc_aad(Type, Version, WriteState1),
-    ssl_record:cipher_aead(Version, Comp, WriteState1, AAD);
-do_encode_plain_text(Type, Version, Data, #{compression_state := CompS0,
-					 security_parameters :=
-					     #security_parameters{compression_algorithm = CompAlg}
-					}= WriteState0) ->
-    {Comp, CompS1} = ssl_record:compress(CompAlg, Data, CompS0),
-    WriteState1 = WriteState0#{compression_state => CompS1},
-    MacHash = ssl_cipher:calc_mac_hash(Type, Version, Comp, WriteState1),
-    ssl_record:cipher(Version, Comp, WriteState1, MacHash);
-do_encode_plain_text(_,_,_,CS) ->
-    exit({cs, CS}).
 
-calc_aad(Type, {MajVer, MinVer},
-	 #{sequence_number := SeqNo}) ->
-    <<?UINT64(SeqNo), ?BYTE(Type), ?BYTE(MajVer), ?BYTE(MinVer)>>.
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl
index a8fe119bf8..a31ab8d044 100644
--- a/lib/ssl/src/tls_v1.erl
+++ b/lib/ssl/src/tls_v1.erl
@@ -202,23 +202,13 @@ suites(Minor) when Minor == 1; Minor == 2 ->
       ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
       ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
       ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA,
-      ?TLS_RSA_WITH_AES_256_CBC_SHA,
 
       ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
       ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
       ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
       ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
       ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
-      ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
-      ?TLS_RSA_WITH_AES_128_CBC_SHA,
-
-      ?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_RSA_WITH_3DES_EDE_CBC_SHA
+      ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
     ];
 suites(3) ->
     [?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
@@ -230,16 +220,10 @@ suites(3) ->
      ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384,
      ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384,
 
-     ?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
-     ?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
-     ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
-
      ?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
      ?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384,
      ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
      ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,
-     ?TLS_RSA_WITH_AES_256_GCM_SHA384,
-     ?TLS_RSA_WITH_AES_256_CBC_SHA256,
 
      ?TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
      ?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
@@ -253,9 +237,7 @@ suites(3) ->
      ?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
      ?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256,
      ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
-     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,
-     ?TLS_RSA_WITH_AES_128_GCM_SHA256,
-     ?TLS_RSA_WITH_AES_128_CBC_SHA256
+     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256
 
      %% not supported
      %% ?TLS_DH_RSA_WITH_AES_256_GCM_SHA384,
@@ -264,8 +246,6 @@ suites(3) ->
      %% ?TLS_DH_DSS_WITH_AES_128_GCM_SHA256
     ] ++ suites(2).
 
-
-
 signature_algs({3, 3}, HashSigns) ->
     CryptoSupports =  crypto:supports(),
     Hashes = proplists:get_value(hashs, CryptoSupports),
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
index c7e2f402af..9347b56f39 100644
--- a/lib/ssl/test/Makefile
+++ b/lib/ssl/test/Makefile
@@ -37,6 +37,8 @@ VSN=$(GS_VSN)
 
 MODULES = \
 	ssl_test_lib \
+	ssl_bench_test_lib \
+	ssl_dist_test_lib \
 	ssl_alpn_handshake_SUITE \
 	ssl_basic_SUITE \
 	ssl_bench_SUITE \
@@ -44,6 +46,8 @@ MODULES = \
 	ssl_certificate_verify_SUITE\
 	ssl_crl_SUITE\
 	ssl_dist_SUITE \
+	ssl_dist_bench_SUITE \
+	ssl_engine_SUITE\
 	ssl_handshake_SUITE \
 	ssl_npn_hello_SUITE \
 	ssl_npn_handshake_SUITE \
@@ -61,7 +65,8 @@ MODULES = \
 
 ERL_FILES = $(MODULES:%=%.erl)
 
-HRL_FILES =
+HRL_FILES = \
+	ssl_dist_test_lib.hrl
 
 HRL_FILES_SRC = \
 	ssl_api.hrl\
diff --git a/lib/ssl/test/ssl.spec b/lib/ssl/test/ssl.spec
index 0ad94e22bc..cb54168d36 100644
--- a/lib/ssl/test/ssl.spec
+++ b/lib/ssl/test/ssl.spec
@@ -1,5 +1,4 @@
 {suites,"../ssl_test",all}.
-{skip_cases, "../ssl_test",
-    ssl_bench_SUITE, [setup_sequential, setup_concurrent, payload_simple,
-	use_pem_cache, bypass_pem_cache],
-    "Benchmarks run separately"}.
+{skip_suites, "../ssl_test",
+     [ssl_bench_SUITE, ssl_dist_bench_SUITE],
+     "Benchmarks run separately"}.
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 3b4ca40058..05979d3cfd 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -163,7 +163,8 @@ api_tests() ->
      server_name_indication_option,
      accept_pool,
      prf,
-     socket_options
+     socket_options,
+     cipher_suites
     ].
 
 api_tests_tls() ->
@@ -193,6 +194,7 @@ renegotiate_tests() ->
     [client_renegotiate,
      server_renegotiate,
      client_secure_renegotiate,
+     client_secure_renegotiate_fallback,
      client_renegotiate_reused_session,
      server_renegotiate_reused_session,
      client_no_wrap_sequence_number,
@@ -207,12 +209,14 @@ tls_cipher_tests() ->
      rc4_ecdsa_cipher_suites].
 
 cipher_tests() ->
-    [cipher_suites,
+    [old_cipher_suites,
      cipher_suites_mix,
      ciphers_rsa_signed_certs,
      ciphers_rsa_signed_certs_openssl_names,
      ciphers_dsa_signed_certs,
      ciphers_dsa_signed_certs_openssl_names,
+     chacha_rsa_cipher_suites,
+     chacha_ecdsa_cipher_suites,
      anonymous_cipher_suites,
      psk_cipher_suites,
      psk_with_hint_cipher_suites,
@@ -280,8 +284,11 @@ end_per_suite(_Config) ->
 
 init_per_group(GroupName, Config) when GroupName == basic_tls;
                                        GroupName == options_tls;
+                                       GroupName == options;
                                        GroupName == basic;
-                                       GroupName == options ->
+                                       GroupName == session;
+                                       GroupName == error_handling_tests_tls
+                                       ->
     ssl_test_lib:clean_tls_version(Config);                          
 init_per_group(GroupName, Config) ->
     case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of
@@ -381,12 +388,12 @@ init_per_testcase(TestCase, Config) when TestCase == psk_cipher_suites;
 					 TestCase == anonymous_cipher_suites;
 					 TestCase == psk_anon_cipher_suites;
 					 TestCase == psk_anon_with_hint_cipher_suites;
-                                         TestCase == srp_cipher_suites,
-                                         TestCase == srp_anon_cipher_suites,
-                                         TestCase == srp_dsa_cipher_suites,
-                                         TestCase == des_rsa_cipher_suites,
-                                         TestCase == des_ecdh_rsa_cipher_suites,
-					 TestCase == versions_option,
+                                         TestCase == srp_cipher_suites;
+                                         TestCase == srp_anon_cipher_suites;
+                                         TestCase == srp_dsa_cipher_suites;
+                                         TestCase == des_rsa_cipher_suites;
+                                         TestCase == des_ecdh_rsa_cipher_suites;
+					 TestCase == versions_option;
 					 TestCase == tls_tcp_connect_big ->
     ssl_test_lib:ct_log_supported_protocol_versions(Config),
     ct:timetrap({seconds, 60}),
@@ -427,6 +434,12 @@ init_per_testcase(rizzo_disabled, Config) ->
     ct:timetrap({seconds, 60}),
     rizzo_add_mitigation_option(disabled, Config);
 
+init_per_testcase(TestCase, Config) when TestCase == no_reuses_session_server_restart_new_cert_file;
+                                         TestCase == no_reuses_session_server_restart_new_cert ->
+    ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
+    ct:timetrap({seconds, 15}),
+    Config;
+
 init_per_testcase(prf, Config) ->
     ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
     ct:timetrap({seconds, 40}),
@@ -655,7 +668,7 @@ connection_info(Config) when is_list(Config) ->
 			   {from, self()}, 
 			   {mfa, {?MODULE, connection_info_result, []}},
 			   {options, 
-			    [{ciphers,[{rsa, aes_128_cbc, sha}]} | 
+			    [{ciphers,[{dhe_rsa, aes_128_cbc, sha}]} | 
 			     ClientOpts]}]),
     
     ct:log("Testcase ~p, Client ~p  Server ~p ~n",
@@ -663,7 +676,7 @@ connection_info(Config) when is_list(Config) ->
 
     Version = ssl_test_lib:protocol_version(Config),
     
-    ServerMsg = ClientMsg = {ok, {Version, {rsa, aes_128_cbc, sha}}},
+    ServerMsg = ClientMsg = {ok, {Version, {dhe_rsa, aes_128_cbc, sha}}},
 			   
     ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
     
@@ -693,8 +706,6 @@ secret_connection_info(Config) when is_list(Config) ->
     
     ct:log("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
-
-    Version = ssl_test_lib:protocol_version(Config),    
 			   
     ssl_test_lib:check_result(Server, true, Client, true),
     
@@ -1119,11 +1130,16 @@ fallback(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 cipher_format() ->
-    [{doc, "Test that cipher conversion from tuples to binarys works"}].
+    [{doc, "Test that cipher conversion from maps | tuples | stings to binarys works"}].
 cipher_format(Config) when is_list(Config) ->
-    {ok, Socket} = ssl:listen(0, [{ciphers, ssl:cipher_suites()}]),
-    ssl:close(Socket).
-
+    {ok, Socket0} = ssl:listen(0, [{ciphers, ssl:cipher_suites(default, 'tlsv1.2')}]),
+    ssl:close(Socket0),
+    %% Legacy
+    {ok, Socket1} = ssl:listen(0, [{ciphers, ssl:cipher_suites()}]),
+    ssl:close(Socket1),
+    {ok, Socket2} = ssl:listen(0, [{ciphers, ssl:cipher_suites(openssl)}]),
+    ssl:close(Socket2).
+   
 %%--------------------------------------------------------------------
 
 peername() ->
@@ -1274,22 +1290,83 @@ sockname_result(S) ->
     ssl:sockname(S).
 
 %%--------------------------------------------------------------------
+
 cipher_suites() ->
-    [{doc,"Test API function cipher_suites/0"}].
+    [{doc,"Test API function cipher_suites/2, filter_cipher_suites/2"
+      " and prepend|append_cipher_suites/2"}].
 
 cipher_suites(Config) when is_list(Config) -> 
-    MandatoryCipherSuite = {rsa,'3des_ede_cbc',sha},
+    MandatoryCipherSuiteTLS1_0TLS1_1 = #{key_exchange => rsa,
+                                         cipher => '3des_ede_cbc',
+                                         mac => sha,
+                                         prf => default_prf},
+    MandatoryCipherSuiteTLS1_0TLS1_2 = #{key_exchange =>rsa,
+                                         cipher => 'aes_128_cbc',
+                                         mac => sha,
+                                         prf => default_prf}, 
+    Version = ssl_test_lib:protocol_version(Config),
+    All = [_|_] = ssl:cipher_suites(all, Version),
+    Default = [_|_] = ssl:cipher_suites(default, Version),
+    Anonymous = [_|_] = ssl:cipher_suites(anonymous, Version),
+    true = length(Default) < length(All),
+    Filters = [{key_exchange, 
+                fun(dhe_rsa) -> 
+                        true;
+                   (_) -> 
+                        false
+                end
+               }, 
+               {cipher, 
+                fun(aes_256_cbc) ->
+                        true;
+                   (_) -> 
+                        false
+                end
+               },
+               {mac, 
+                fun(sha) ->
+                        true;
+                   (_) -> 
+                        false
+                end
+               }
+              ],
+    Cipher = #{cipher => aes_256_cbc,
+               key_exchange => dhe_rsa,
+               mac => sha,
+               prf => default_prf},
+    [Cipher] = ssl:filter_cipher_suites(All, Filters),    
+    [Cipher | Rest0] = ssl:prepend_cipher_suites([Cipher], Default),
+    [Cipher | Rest0] = ssl:prepend_cipher_suites(Filters, Default),
+    true = lists:member(Cipher, Default), 
+    false = lists:member(Cipher, Rest0), 
+    [Cipher | Rest1] = lists:reverse(ssl:append_cipher_suites([Cipher], Default)),
+    [Cipher | Rest1] = lists:reverse(ssl:append_cipher_suites(Filters, Default)),
+    true = lists:member(Cipher, Default),
+    false = lists:member(Cipher, Rest1),
+    [] = lists:dropwhile(fun(X) -> not lists:member(X, Default) end, Anonymous),
+    [] = lists:dropwhile(fun(X) -> not lists:member(X, All) end, Anonymous),        
+    true = lists:member(MandatoryCipherSuiteTLS1_0TLS1_1, All),
+    true = lists:member(MandatoryCipherSuiteTLS1_0TLS1_2, All).
+
+%%--------------------------------------------------------------------
+
+old_cipher_suites() ->
+    [{doc,"Test API function cipher_suites/0"}].
+
+old_cipher_suites(Config) when is_list(Config) -> 
+    MandatoryCipherSuite = {rsa, '3des_ede_cbc', sha},
     [_|_] = Suites = ssl:cipher_suites(),
-    true = lists:member(MandatoryCipherSuite, Suites),
     Suites = ssl:cipher_suites(erlang),
-    [_|_] =ssl:cipher_suites(openssl).
+    [_|_] = ssl:cipher_suites(openssl),
+    true = lists:member(MandatoryCipherSuite,  ssl:cipher_suites(all)).
 
 %%--------------------------------------------------------------------
 cipher_suites_mix() ->
     [{doc,"Test to have old and new cipher suites at the same time"}].
 
 cipher_suites_mix(Config) when is_list(Config) -> 
-    CipherSuites = [{ecdh_rsa,aes_128_cbc,sha256,sha256}, {rsa,aes_128_cbc,sha}],
+    CipherSuites = [{dhe_rsa,aes_128_cbc,sha256,sha256}, {dhe_rsa,aes_128_cbc,sha}],
     ClientOpts = ssl_test_lib:ssl_options(client_verification_opts, Config),
     ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, Config),
 
@@ -2357,7 +2434,24 @@ ciphers_dsa_signed_certs_openssl_names() ->
 ciphers_dsa_signed_certs_openssl_names(Config) when is_list(Config) ->
     Ciphers = ssl_test_lib:openssl_dsa_suites(),
     run_suites(Ciphers, Config, dsa).
+
 %%-------------------------------------------------------------------
+chacha_rsa_cipher_suites()->
+    [{doc,"Test the cacha with  ECDSA signed certs ciphersuites"}].
+chacha_rsa_cipher_suites(Config) when is_list(Config) ->
+    NVersion = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers = [S || {KeyEx,_,_} = S <- ssl_test_lib:chacha_suites(NVersion),
+                    KeyEx == ecdhe_rsa, KeyEx == dhe_rsa],
+    run_suites(Ciphers, Config, chacha_ecdsa).
+
+%%-------------------------------------------------------------------
+chacha_ecdsa_cipher_suites()->
+    [{doc,"Test the cacha with  ECDSA signed certs ciphersuites"}].
+chacha_ecdsa_cipher_suites(Config) when is_list(Config) ->
+    NVersion = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers = [S || {ecdhe_ecdsa,_,_} = S <- ssl_test_lib:chacha_suites(NVersion)],
+    run_suites(Ciphers, Config, chacha_rsa).
+%%-----------------------------------------------------------------
 anonymous_cipher_suites()->
     [{doc,"Test the anonymous ciphersuites"}].
 anonymous_cipher_suites(Config) when is_list(Config) ->
@@ -2437,14 +2531,15 @@ rc4_ecdsa_cipher_suites(Config) when is_list(Config) ->
 des_rsa_cipher_suites()->
     [{doc, "Test the des_rsa ciphersuites"}].
 des_rsa_cipher_suites(Config) when is_list(Config) ->
-    Ciphers = ssl_test_lib:des_suites(Config),
+    NVersion = tls_record:highest_protocol_version([]),
+    Ciphers = [S || {rsa,_,_} = S <- ssl_test_lib:des_suites(NVersion)],
     run_suites(Ciphers, Config, des_rsa).
 %-------------------------------------------------------------------
 des_ecdh_rsa_cipher_suites()->
     [{doc, "Test ECDH rsa signed ciphersuites"}].
 des_ecdh_rsa_cipher_suites(Config) when is_list(Config) ->
     NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:des_suites(NVersion),
+    Ciphers = [S || {dhe_rsa,_,_} = S <- ssl_test_lib:des_suites(NVersion)],
     run_suites(Ciphers, Config, des_dhe_rsa).
 
 %%--------------------------------------------------------------------
@@ -2804,6 +2899,36 @@ client_secure_renegotiate(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
+%%--------------------------------------------------------------------
+client_secure_renegotiate_fallback() ->
+    [{doc,"Test that we can set secure_renegotiate to false that is "
+      "fallback option, we however do not have a insecure server to test against!"}].
+client_secure_renegotiate_fallback(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From erlang to erlang",
+
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+				   {options, [{secure_renegotiate, false} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE,
+					       renegotiate, [Data]}},
+					{options, [{reuse_sessions, false},
+						   {secure_renegotiate, false}| ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Client, ok, Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
 server_renegotiate() ->
@@ -3137,18 +3262,25 @@ no_reuses_session_server_restart_new_cert_file(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 defaults(Config) when is_list(Config)->
-    [_, 
-     {supported, Supported},
-     {available, Available}]
-	= ssl:versions(),
-    true = lists:member(sslv3, Available),
-    false = lists:member(sslv3, Supported),
+    Versions = ssl:versions(),
+    true = lists:member(sslv3, proplists:get_value(available, Versions)),
+    false = lists:member(sslv3,  proplists:get_value(supported, Versions)),
+    true = lists:member('tlsv1', proplists:get_value(available, Versions)),
+    true = lists:member('tlsv1',  proplists:get_value(supported, Versions)),
+    true = lists:member('tlsv1.1', proplists:get_value(available, Versions)),
+    true = lists:member('tlsv1.1',  proplists:get_value(supported, Versions)),
+    true = lists:member('tlsv1.2', proplists:get_value(available, Versions)),
+    true = lists:member('tlsv1.2',  proplists:get_value(supported, Versions)),    
     false = lists:member({rsa,rc4_128,sha}, ssl:cipher_suites()),
     true = lists:member({rsa,rc4_128,sha}, ssl:cipher_suites(all)),
     false = lists:member({rsa,des_cbc,sha}, ssl:cipher_suites()),
     true = lists:member({rsa,des_cbc,sha}, ssl:cipher_suites(all)),
     false = lists:member({dhe_rsa,des_cbc,sha}, ssl:cipher_suites()),
-    true = lists:member({dhe_rsa,des_cbc,sha}, ssl:cipher_suites(all)).
+    true = lists:member({dhe_rsa,des_cbc,sha}, ssl:cipher_suites(all)),
+    true = lists:member('dtlsv1.2', proplists:get_value(available_dtls, Versions)),
+    true = lists:member('dtlsv1', proplists:get_value(available_dtls, Versions)),
+    true = lists:member('dtlsv1.2', proplists:get_value(supported_dtls, Versions)),
+    true = lists:member('dtlsv1', proplists:get_value(supported_dtls, Versions)).
 
 %%--------------------------------------------------------------------
 reuseaddr() ->
@@ -3234,16 +3366,16 @@ tls_tcp_reuseaddr(Config) when is_list(Config) ->
 honor_server_cipher_order() ->
     [{doc,"Test API honor server cipher order."}].
 honor_server_cipher_order(Config) when is_list(Config) ->
-    ClientCiphers = [{rsa, aes_128_cbc, sha}, {rsa, aes_256_cbc, sha}],
-    ServerCiphers = [{rsa, aes_256_cbc, sha}, {rsa, aes_128_cbc, sha}],
-honor_cipher_order(Config, true, ServerCiphers, ClientCiphers, {rsa, aes_256_cbc, sha}).
+    ClientCiphers = [{dhe_rsa, aes_128_cbc, sha}, {dhe_rsa, aes_256_cbc, sha}],
+    ServerCiphers = [{dhe_rsa, aes_256_cbc, sha}, {dhe_rsa, aes_128_cbc, sha}],
+honor_cipher_order(Config, true, ServerCiphers, ClientCiphers, {dhe_rsa, aes_256_cbc, sha}).
 
 honor_client_cipher_order() ->
     [{doc,"Test API honor server cipher order."}].
 honor_client_cipher_order(Config) when is_list(Config) ->
-    ClientCiphers = [{rsa, aes_128_cbc, sha}, {rsa, aes_256_cbc, sha}],
-    ServerCiphers = [{rsa, aes_256_cbc, sha}, {rsa, aes_128_cbc, sha}],
-honor_cipher_order(Config, false, ServerCiphers, ClientCiphers, {rsa, aes_128_cbc, sha}).
+    ClientCiphers = [{dhe_rsa, aes_128_cbc, sha}, {dhe_rsa, aes_256_cbc, sha}],
+    ServerCiphers = [{dhe_rsa, aes_256_cbc, sha}, {dhe_rsa, aes_128_cbc, sha}],
+honor_cipher_order(Config, false, ServerCiphers, ClientCiphers, {dhe_rsa, aes_128_cbc, sha}).
 
 honor_cipher_order(Config, Honor, ServerCiphers, ClientCiphers, Expected) ->
     ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
@@ -3759,9 +3891,23 @@ rizzo() ->
     vunrable to Rizzo/Dungon attack"}].
 
 rizzo(Config) when is_list(Config) ->
-    Ciphers  = [X || X ={_,Y,_} <- ssl:cipher_suites(), Y  =/= rc4_128],
     Prop = proplists:get_value(tc_group_properties, Config),
     Version = proplists:get_value(name, Prop),
+    NVersion = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers  = ssl:filter_cipher_suites(ssl:cipher_suites(all, NVersion),  
+                                        [{key_exchange, 
+                                          fun(Alg) when Alg == ecdh_rsa; Alg == ecdhe_rsa-> 
+                                                  true;
+                                             (_) -> 
+                                                  false 
+                                          end},
+                                         {cipher, 
+                                          fun(rc4_128) -> 
+                                                  false;
+                                             (_) -> 
+                                                  true 
+                                          end}]),
+
     run_send_recv_rizzo(Ciphers, Config, Version,
 			 {?MODULE, send_recv_result_active_rizzo, []}).
 %%--------------------------------------------------------------------
@@ -3773,8 +3919,13 @@ no_rizzo_rc4(Config) when is_list(Config) ->
     Version = proplists:get_value(name, Prop),
     NVersion = ssl_test_lib:protocol_version(Config, tuple),
     %% Test uses RSA certs
-    Ciphers  = ssl_test_lib:rc4_suites(NVersion) -- [{ecdhe_ecdsa,rc4_128,sha},
-                                                     {ecdh_ecdsa,rc4_128,sha}],
+    Ciphers  = ssl:filter_cipher_suites(ssl_test_lib:rc4_suites(NVersion),  
+                                        [{key_exchange, 
+                                          fun(Alg) when Alg == ecdh_rsa; Alg == ecdhe_rsa-> 
+                                                  true;
+                                             (_) -> 
+                                                  false 
+                                          end}]),
     run_send_recv_rizzo(Ciphers, Config, Version,
 			{?MODULE, send_recv_result_active_no_rizzo, []}).
 
@@ -3785,10 +3936,21 @@ rizzo_one_n_minus_one(Config) when is_list(Config) ->
     Prop = proplists:get_value(tc_group_properties, Config),
     Version = proplists:get_value(name, Prop),
     NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    AllSuites = ssl_test_lib:available_suites(NVersion),
-    Ciphers  = [X || X ={_,Y,_} <- AllSuites, Y  =/= rc4_128],
+    Ciphers  = ssl:filter_cipher_suites(ssl:cipher_suites(all, NVersion),
+                                        [{key_exchange, 
+                                          fun(Alg) when Alg == ecdh_rsa; Alg == ecdhe_rsa-> 
+                                                  true;
+                                             (_) -> 
+                                                  false 
+                                          end}, 
+                                         {cipher, 
+                                          fun(rc4_128) ->
+                                                  false;
+                                             (_) -> 
+                                                  true 
+                                          end}]),
     run_send_recv_rizzo(Ciphers, Config, Version,
-			 {?MODULE, send_recv_result_active_rizzo, []}).
+                        {?MODULE, send_recv_result_active_rizzo, []}).
 
 rizzo_zero_n() ->
     [{doc,"Test that the 0/n-split mitigation of Rizzo/Dungon attack can be explicitly selected"}].
@@ -3797,8 +3959,13 @@ rizzo_zero_n(Config) when is_list(Config) ->
     Prop = proplists:get_value(tc_group_properties, Config),
     Version = proplists:get_value(name, Prop),
     NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    AllSuites = ssl_test_lib:available_suites(NVersion),
-    Ciphers  = [X || X ={_,Y,_} <- AllSuites, Y  =/= rc4_128],
+    Ciphers  = ssl:filter_cipher_suites(ssl:cipher_suites(default, NVersion),
+                                        [{cipher, 
+                                          fun(rc4_128) ->
+                                                  false;
+                                             (_) -> 
+                                                  true 
+                                          end}]),
     run_send_recv_rizzo(Ciphers, Config, Version,
 			 {?MODULE, send_recv_result_active_no_rizzo, []}).
 
@@ -3806,9 +3973,16 @@ rizzo_disabled() ->
     [{doc,"Test that the mitigation of Rizzo/Dungon attack can be explicitly disabled"}].
 
 rizzo_disabled(Config) when is_list(Config) ->
-    Ciphers  = [X || X ={_,Y,_} <- ssl:cipher_suites(), Y  =/= rc4_128],
     Prop = proplists:get_value(tc_group_properties, Config),
     Version = proplists:get_value(name, Prop),
+    NVersion = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers  = ssl:filter_cipher_suites(ssl:cipher_suites(default, NVersion),
+                                        [{cipher, 
+                                          fun(rc4_128) ->
+                                                  false;
+                                             (_) -> 
+                                                  true 
+                                          end}]),
     run_send_recv_rizzo(Ciphers, Config, Version,
 			 {?MODULE, send_recv_result_active_no_rizzo, []}).
 
@@ -4583,55 +4757,58 @@ rizzo_test(Cipher, Config, Version, Mfa) ->
 	    [{Cipher, Error}]
     end.
 
-client_server_opts({KeyAlgo,_,_}, Config)
+client_server_opts(#{key_exchange := KeyAlgo}, Config)
   when KeyAlgo == rsa orelse
        KeyAlgo == dhe_rsa orelse
-       KeyAlgo == ecdhe_rsa ->
+       KeyAlgo == ecdhe_rsa orelse
+       KeyAlgo == rsa_psk orelse
+       KeyAlgo == srp_rsa ->
     {ssl_test_lib:ssl_options(client_opts, Config),
      ssl_test_lib:ssl_options(server_opts, Config)};
-client_server_opts({KeyAlgo,_,_}, Config) when KeyAlgo == dss orelse KeyAlgo == dhe_dss ->
+client_server_opts(#{key_exchange := KeyAlgo}, Config) when KeyAlgo == dss orelse KeyAlgo == dhe_dss ->
     {ssl_test_lib:ssl_options(client_dsa_opts, Config),
      ssl_test_lib:ssl_options(server_dsa_opts, Config)};
-client_server_opts({KeyAlgo,_,_}, Config) when KeyAlgo == ecdh_ecdsa orelse KeyAlgo == ecdhe_ecdsa ->
+client_server_opts(#{key_exchange := KeyAlgo}, Config) when KeyAlgo == ecdh_ecdsa orelse KeyAlgo == ecdhe_ecdsa ->
     {ssl_test_lib:ssl_options(client_opts, Config),
      ssl_test_lib:ssl_options(server_ecdsa_opts, Config)};
-client_server_opts({KeyAlgo,_,_}, Config) when KeyAlgo == ecdh_rsa ->
+client_server_opts(#{key_exchange := KeyAlgo}, Config) when KeyAlgo == ecdh_rsa ->
     {ssl_test_lib:ssl_options(client_opts, Config),
      ssl_test_lib:ssl_options(server_ecdh_rsa_opts, Config)}.
 
 run_suites(Ciphers, Config, Type) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
     Version = ssl_test_lib:protocol_version(Config),
     ct:log("Running cipher suites ~p~n", [Ciphers]),
     {ClientOpts, ServerOpts} =
 	case Type of
 	    rsa ->
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 ssl_test_lib:ssl_options(server_verification_opts, Config)};
+                 [{ciphers, Ciphers} |
+                  ssl_test_lib:ssl_options(server_verification_opts, Config)]};
 	    dsa ->
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 ssl_test_lib:ssl_options(server_dsa_opts, Config)};
+                 [{ciphers, Ciphers} |
+		 ssl_test_lib:ssl_options(server_dsa_opts, Config)]};
 	    anonymous ->
 		%% No certs in opts!
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 [{reuseaddr, true}, {ciphers, ssl_test_lib:anonymous_suites(NVersion)} |
+		 [{ciphers, Ciphers} |
                   ssl_test_lib:ssl_options([], Config)]};
 	    psk ->
 		{ssl_test_lib:ssl_options(client_psk, Config),
-                 [{ciphers, ssl_test_lib:psk_suites(NVersion)} | 
+                 [{ciphers, Ciphers} | 
                   ssl_test_lib:ssl_options(server_psk, Config)]};
 	    psk_with_hint ->
 		{ssl_test_lib:ssl_options(client_psk, Config),
-		 [{ciphers, ssl_test_lib:psk_suites(NVersion)} |
+		 [{ciphers, Ciphers} |
                   ssl_test_lib:ssl_options(server_psk_hint, Config)
                  ]};
 	    psk_anon ->
 		{ssl_test_lib:ssl_options(client_psk, Config),
-                 [{ciphers, ssl_test_lib:psk_anon_suites(NVersion)} |
+                 [{ciphers, Ciphers} |
                   ssl_test_lib:ssl_options(server_psk_anon, Config)]};
 	    psk_anon_with_hint ->
 		{ssl_test_lib:ssl_options(client_psk, Config),
-                 [{ciphers, ssl_test_lib:psk_anon_suites(NVersion)} |
+                 [{ciphers, Ciphers} |
 		 ssl_test_lib:ssl_options(server_psk_anon_hint, Config)]};
 	    srp ->
 		{ssl_test_lib:ssl_options(client_srp, Config),
@@ -4644,7 +4821,8 @@ run_suites(Ciphers, Config, Type) ->
 		 ssl_test_lib:ssl_options(server_srp_dsa, Config)};
 	    ecdsa ->
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 ssl_test_lib:ssl_options(server_ecdsa_opts, Config)};
+                 [{ciphers, Ciphers} |
+                  ssl_test_lib:ssl_options(server_ecdsa_opts, Config)]};
 	    ecdh_rsa ->
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
 		 ssl_test_lib:ssl_options(server_ecdh_rsa_opts, Config)};
@@ -4667,9 +4845,16 @@ run_suites(Ciphers, Config, Type) ->
 	    des_rsa ->
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
 		 [{ciphers, Ciphers} |
-		  ssl_test_lib:ssl_options(server_verification_opts, Config)]}
+		  ssl_test_lib:ssl_options(server_verification_opts, Config)]};
+            chacha_rsa ->
+                {ssl_test_lib:ssl_options(client_verification_opts, Config),
+                 [{ciphers, Ciphers} |
+                  ssl_test_lib:ssl_options(server_verification_opts, Config)]};
+            chacha_ecdsa ->
+               	{ssl_test_lib:ssl_options(client_verification_opts, Config),
+                 [{ciphers, Ciphers} |
+                  ssl_test_lib:ssl_options(server_ecdsa_opts, Config)]} 
 	end,
-
     Result =  lists:map(fun(Cipher) ->
 				cipher(Cipher, Version, Config, ClientOpts, ServerOpts) end,
 			ssl_test_lib:filter_suites(Ciphers, Version)),
diff --git a/lib/ssl/test/ssl_bench.spec b/lib/ssl/test/ssl_bench.spec
index d2f75b4203..8b746c5ca9 100644
--- a/lib/ssl/test/ssl_bench.spec
+++ b/lib/ssl/test/ssl_bench.spec
@@ -1 +1 @@
-{suites,"../ssl_test",[ssl_bench_SUITE]}.
+{suites,"../ssl_test",[ssl_bench_SUITE, ssl_dist_bench_SUITE]}.
diff --git a/lib/ssl/test/ssl_bench_SUITE.erl b/lib/ssl/test/ssl_bench_SUITE.erl
index ae2928b1c3..3fe6338d69 100644
--- a/lib/ssl/test/ssl_bench_SUITE.erl
+++ b/lib/ssl/test/ssl_bench_SUITE.erl
@@ -40,11 +40,11 @@ end_per_group(_GroupName, _Config) ->
     ok.
 
 init_per_suite(Config) ->
-    try
-	Server = setup(ssl, node()),
-	[{server_node, Server}|Config]
-    catch _:_ ->
-	    {skipped, "Benchmark machines only"}
+    case node() of
+        nonode@nohost ->
+            {skipped, "Node not distributed"};
+        _ ->
+            [{server_node, ssl_bench_test_lib:setup(perf_server)}|Config]
     end.
 
 end_per_suite(_Config) ->
@@ -132,10 +132,10 @@ bypass_pem_cache(_Config) ->
 
 
 ssl() ->
-    test(ssl, ?COUNT, node()).
+    test(ssl, ?COUNT).
 
-test(Type, Count, Host) ->
-    Server = setup(Type, Host),
+test(Type, Count) ->
+    Server = ssl_bench_test_lib:setup(perf_server),
     (do_test(Type, setup_connection, Count * 20, 1, Server)),
     (do_test(Type, setup_connection, Count, 100, Server)),
     (do_test(Type, payload, Count*300, 10, Server)),
@@ -294,47 +294,6 @@ msg() ->
       "asdlkjsafsdfoierwlejsdlkfjsdf">>.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-setup(_Type, nonode@nohost) ->
-    exit(dist_not_enabled);
-setup(Type, _This) ->
-    Host = case os:getenv(?remote_host) of
-	       false ->
-		   {ok, This} = inet:gethostname(),
-		   This;
-	       RemHost ->
-		   RemHost
-	   end,
-    Node = list_to_atom("perf_server@" ++ Host),
-    SlaveArgs = case init:get_argument(pa) of
-	       {ok, PaPaths} ->
-		   lists:append([" -pa " ++ P || [P] <- PaPaths]);
-	       _ -> []
-	   end,
-    %% io:format("Slave args: ~p~n",[SlaveArgs]),
-    Prog =
-	case os:find_executable("erl") of
-	    false -> "erl";
-	    P -> P
-	end,
-    io:format("Prog = ~p~n", [Prog]),
-
-    case net_adm:ping(Node) of
-	pong -> ok;
-	pang ->
-	    {ok, Node} = slave:start(Host, perf_server, SlaveArgs, no_link, Prog)
-    end,
-    Path = code:get_path(),
-    true = rpc:call(Node, code, set_path, [Path]),
-    ok = rpc:call(Node, ?MODULE, setup_server, [Type, node()]),
-    io:format("Client (~p) using ~s~n",[node(), code:which(ssl)]),
-    (Node =:= node()) andalso restrict_schedulers(client),
-    Node.
-
-setup_server(_Type, ClientNode) ->
-    (ClientNode =:= node()) andalso restrict_schedulers(server),
-    io:format("Server (~p) using ~s~n",[node(), code:which(ssl)]),
-    ok.
-
 
 ensure_all_started(App, Ack) ->
     case application:start(App) of
@@ -358,13 +317,6 @@ setup_server_init(Type, Tc, Loop, PC) ->
     unlink(Pid),
     Res.
 
-restrict_schedulers(Type) ->
-    %% We expect this to run on 8 core machine
-    Extra0 = 1,
-    Extra =  if (Type =:= server) -> -Extra0; true -> Extra0 end,
-    Scheds = erlang:system_info(schedulers),
-    erlang:system_flag(schedulers_online, (Scheds div 2) + Extra).
-
 tc(Fun, Mod, Line) ->
     case timer:tc(Fun) of
 	{_,{'EXIT',Reason}} ->
diff --git a/lib/ssl/test/ssl_bench_test_lib.erl b/lib/ssl/test/ssl_bench_test_lib.erl
new file mode 100644
index 0000000000..e5cbb911bd
--- /dev/null
+++ b/lib/ssl/test/ssl_bench_test_lib.erl
@@ -0,0 +1,75 @@
+%%%-------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(ssl_bench_test_lib).
+
+%% API
+-export([setup/1]).
+
+%% Internal exports
+-export([setup_server/1]).
+
+-define(remote_host, "NETMARKS_REMOTE_HOST").
+
+setup(Name) ->
+    Host = case os:getenv(?remote_host) of
+	       false ->
+		   {ok, This} = inet:gethostname(),
+		   This;
+	       RemHost ->
+		   RemHost
+	   end,
+    Node = list_to_atom(atom_to_list(Name) ++ "@" ++ Host),
+    SlaveArgs = case init:get_argument(pa) of
+	       {ok, PaPaths} ->
+		   lists:append([" -pa " ++ P || [P] <- PaPaths]);
+	       _ -> []
+	   end,
+    %% io:format("Slave args: ~p~n",[SlaveArgs]),
+    Prog =
+	case os:find_executable("erl") of
+	    false -> "erl";
+	    P -> P
+	end,
+    io:format("Prog = ~p~n", [Prog]),
+
+    case net_adm:ping(Node) of
+	pong -> ok;
+	pang ->
+	    {ok, Node} =
+                slave:start(Host, Name, SlaveArgs, no_link, Prog)
+    end,
+    Path = code:get_path(),
+    true = rpc:call(Node, code, set_path, [Path]),
+    ok = rpc:call(Node, ?MODULE, setup_server, [node()]),
+    io:format("Client (~p) using ~s~n",[node(), code:which(ssl)]),
+    (Node =:= node()) andalso restrict_schedulers(client),
+    Node.
+
+setup_server(ClientNode) ->
+    (ClientNode =:= node()) andalso restrict_schedulers(server),
+    io:format("Server (~p) using ~s~n",[node(), code:which(ssl)]),
+    ok.
+
+restrict_schedulers(Type) ->
+    %% We expect this to run on 8 core machine
+    Extra0 = 1,
+    Extra =  if (Type =:= server) -> -Extra0; true -> Extra0 end,
+    Scheds = erlang:system_info(schedulers),
+    erlang:system_flag(schedulers_online, (Scheds div 2) + Extra).
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 8740e8c8f0..c822a52d1f 100644
--- a/lib/ssl/test/ssl_dist_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-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.
@@ -22,6 +22,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("public_key/include/public_key.hrl").
+-include("ssl_dist_test_lib.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -30,12 +31,12 @@
 
 -define(AWAIT_SSL_NODE_UP_TIMEOUT, 30000).
 
--record(node_handle,
-	{connection_handler,
-	 socket,
-	 name,
-	 nodename}
-       ).
+-import(ssl_dist_test_lib,
+        [tstsrvr_format/2, send_to_tstcntrl/1,
+         apply_on_ssl_node/4, apply_on_ssl_node/2,
+         stop_ssl_node/1]).
+start_ssl_node_name(Name, Args) ->
+    ssl_dist_test_lib:start_ssl_node(Name, Args).
 
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
@@ -140,11 +141,14 @@ basic_test(NH1, NH2, _) ->
 		  apply_on_ssl_node(
 		    NH1,
 		    fun () ->
-			    tstsrvr_format("Hi from ~p!~n", [node()]),
-			    send_to_tstcntrl({Ref, self()}),
+			    tstsrvr_format(
+                              "Hi from ~p!~n", [node()]),
+			    send_to_tstcntrl(
+                              {Ref, self()}),
 			    receive
 				{From, ping} ->
-				    tstsrvr_format("Received ping ~p!~n", [node()]),
+				    tstsrvr_format(
+                                      "Received ping ~p!~n", [node()]),
 				    From ! {self(), pong}
 			    end
 		    end)
@@ -154,7 +158,8 @@ basic_test(NH1, NH2, _) ->
 	     ok = apply_on_ssl_node(
 		    NH2,
 		    fun () ->
-			    tstsrvr_format("Hi from ~p!~n", [node()]),
+			    tstsrvr_format(
+                              "Hi from ~p!~n", [node()]),
 			    SslPid ! {self(), ping},
 			    receive
 				{SslPid, pong} ->
@@ -183,7 +188,8 @@ payload_test(NH1, NH2, _) ->
 		  apply_on_ssl_node(
 		    NH1,
 		    fun () ->
-			    send_to_tstcntrl({Ref, self()}),
+			    send_to_tstcntrl(
+                              {Ref, self()}),
 			    receive
 				{From, Msg} ->
 				    From ! {self(), Msg}
@@ -616,12 +622,6 @@ gen_dist_test(Test, Config) ->
 %% ssl_node side api
 %%
 
-tstsrvr_format(Fmt, ArgList) ->
-    send_to_tstsrvr({format, Fmt, ArgList}).
-
-send_to_tstcntrl(Message) ->
-    send_to_tstsrvr({message, Message}).
-
 try_setting_priority(TestFun, Config) ->
     Prio = 1,
     case gen_udp:open(0, [{priority,Prio}]) of
@@ -653,44 +653,6 @@ inet_ports() ->
 %% test_server side api
 %%
 
-apply_on_ssl_node(Node, M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
-    Ref = make_ref(),
-    send_to_ssl_node(Node, {apply, self(), Ref, M, F, A}),
-    receive
-	{Ref, Result} ->
-	    Result
-    end.
-
-apply_on_ssl_node(Node, Fun) when is_function(Fun, 0) ->
-    Ref = make_ref(),
-    send_to_ssl_node(Node, {apply, self(), Ref, Fun}),
-    receive
-	{Ref, Result} ->
-	    Result
-    end.
-
-stop_ssl_node(#node_handle{connection_handler = Handler,
-			   socket = Socket,
-			   name = Name}) ->
-    ?t:format("Trying to stop ssl node ~s.~n", [Name]),
-    Mon = erlang:monitor(process, Handler),
-    unlink(Handler),
-    case gen_tcp:send(Socket, term_to_binary(stop)) of
-	ok ->
-	    receive
-		{'DOWN', Mon, process, Handler, Reason} ->
-		    case Reason of
-			normal ->
-			    ok;
-			_ -> 
-			    ct:pal("Down  ~p ~n", [Reason])
-		    end
-	    end;
-	Error ->
-	    erlang:demonitor(Mon, [flush]),
-	    ct:pal("Warning  ~p ~n", [Error])
-    end.
-
 start_ssl_node(Config) ->
     start_ssl_node(Config, "").
 
@@ -698,29 +660,8 @@ start_ssl_node(Config, XArgs) ->
     Name = mk_node_name(Config),
     SSL = proplists:get_value(ssl_opts, Config),
     SSLDistOpts = setup_dist_opts(Config),
-    start_ssl_node_raw(Name, SSL ++ " " ++ SSLDistOpts ++ XArgs).
-
-start_ssl_node_raw(Name, Args) ->
-    {ok, LSock} = gen_tcp:listen(0,
-				 [binary, {packet, 4}, {active, false}]),
-    {ok, ListenPort} = inet:port(LSock),
-    CmdLine = mk_node_cmdline(ListenPort, Name, Args),
-    ?t:format("Attempting to start ssl node ~ts: ~ts~n", [Name, CmdLine]),
-    case open_port({spawn, CmdLine}, []) of
-	Port when is_port(Port) ->
-	    unlink(Port),
-	    erlang:port_close(Port),
-	    case await_ssl_node_up(Name, LSock) of
-		#node_handle{} = NodeHandle ->
-		    ?t:format("Ssl node ~s started.~n", [Name]),
-		    NodeName = list_to_atom(Name ++ "@" ++ host_name()),
-		    NodeHandle#node_handle{nodename = NodeName};
-		Error ->
-		    exit({failed_to_start_node, Name, Error})
-	    end;
-	Error ->
-	    exit({failed_to_start_node, Name, Error})
-    end.
+    start_ssl_node_name(
+      Name, SSL ++ " " ++ SSLDistOpts ++ XArgs).
 
 cache_crls_on_ssl_nodes(PrivDir, CANames, NHs) ->
     [begin
@@ -739,11 +680,6 @@ cache_crls_on_ssl_nodes(PrivDir, CANames, NHs) ->
 %% command line creation
 %%
 
-host_name() ->
-    [$@ | Host] = lists:dropwhile(fun ($@) -> false; (_) -> true end,
-				  atom_to_list(node())),
-    Host.
-
 mk_node_name(Config) ->
     N = erlang:unique_integer([positive]),
     Case = proplists:get_value(testcase, Config),
@@ -753,225 +689,6 @@ mk_node_name(Config) ->
 	++ "_"
 	++ integer_to_list(N).
 
-mk_node_cmdline(ListenPort, Name, Args) ->
-    Static = "-detached -noinput",
-    Pa = filename:dirname(code:which(?MODULE)),
-    Prog = case catch init:get_argument(progname) of
-	       {ok,[[P]]} -> P;
-	       _ -> exit(no_progname_argument_found)
-	   end,
-    NameSw = case net_kernel:longnames() of
-		 false -> "-sname ";
-		 _ -> "-name "
-	     end,
-    {ok, Pwd} = file:get_cwd(),
-    "\"" ++ Prog ++ "\" "
-	++ Static ++ " "
-	++ NameSw ++ " " ++ Name ++ " "
-	++ "-pa " ++ Pa ++ " "
-	++ "-run application start crypto -run application start public_key "
-	++ "-eval 'net_kernel:verbose(1)' "
-	++ "-run " ++ atom_to_list(?MODULE) ++ " cnct2tstsrvr "
-	++ host_name() ++ " "
-	++ integer_to_list(ListenPort) ++ " "
-	++ Args ++ " "
-	++ "-env ERL_CRASH_DUMP " ++ Pwd ++ "/erl_crash_dump." ++ Name ++ " "
-	++ "-kernel error_logger \"{file,\\\"" ++ Pwd ++ "/error_log." ++ Name ++ "\\\"}\" "
-	++ "-setcookie " ++ atom_to_list(erlang:get_cookie()).
-
-%%
-%% Connection handler test_server side
-%%
-
-await_ssl_node_up(Name, LSock) ->
-    case gen_tcp:accept(LSock, ?AWAIT_SSL_NODE_UP_TIMEOUT) of
-	timeout ->
-	    gen_tcp:close(LSock),
-	    ?t:format("Timeout waiting for ssl node ~s to come up~n",
-		      [Name]),
-	    timeout;
-	{ok, Socket} ->
-	    gen_tcp:close(LSock),
-	    case gen_tcp:recv(Socket, 0) of
-		{ok, Bin} ->
-		    check_ssl_node_up(Socket, Name, Bin);
-		{error, closed} ->
-		    gen_tcp:close(Socket),
-		    exit({lost_connection_with_ssl_node_before_up, Name})
-	    end;
-	{error, Error} ->
-	    gen_tcp:close(LSock),
-	    exit({accept_failed, Error})
-    end.
-
-check_ssl_node_up(Socket, Name, Bin) ->
-    case catch binary_to_term(Bin) of
-	{'EXIT', _} ->
-	    gen_tcp:close(Socket),
-	    exit({bad_data_received_from_ssl_node, Name, Bin});
-	{ssl_node_up, NodeName} ->
-	    case list_to_atom(Name++"@"++host_name()) of
-		NodeName ->
-		    Parent = self(),
-		    Go = make_ref(),
-		    %% Spawn connection handler on test server side
-		    Pid = spawn_link(
-			    fun () ->
-				    receive Go -> ok end,
-				    tstsrvr_con_loop(Name, Socket, Parent)
-			    end),
-		    ok = gen_tcp:controlling_process(Socket, Pid),
-		    Pid ! Go,
-		    #node_handle{connection_handler = Pid,
-				 socket = Socket,
-				 name = Name};
-		_ ->
-		    exit({unexpected_ssl_node_connected, NodeName})
-	    end;
-	Msg ->
-	    exit({unexpected_msg_instead_of_ssl_node_up, Name, Msg})
-    end.
-
-send_to_ssl_node(#node_handle{connection_handler = Hndlr}, Term) ->
-    Hndlr ! {relay_to_ssl_node, term_to_binary(Term)},
-    ok.
-
-tstsrvr_con_loop(Name, Socket, Parent) ->
-    inet:setopts(Socket,[{active,once}]),
-    receive
-	{relay_to_ssl_node, Data} when is_binary(Data) ->
-	    case gen_tcp:send(Socket, Data) of
-		ok ->
-		    ok;
-		_Error ->
-		    gen_tcp:close(Socket),
-		    exit({failed_to_relay_data_to_ssl_node, Name, Data})
-	    end;
-	{tcp, Socket, Bin} ->
-	    case catch binary_to_term(Bin) of
-		{'EXIT', _} ->
-		    gen_tcp:close(Socket),
-		    exit({bad_data_received_from_ssl_node, Name, Bin});
-		{format, FmtStr, ArgList} ->
-		    ?t:format(FmtStr, ArgList);
-		{message, Msg} ->
-		    ?t:format("Got message ~p", [Msg]),
-		    Parent ! Msg;
-		{apply_res, To, Ref, Res} ->
-		    To ! {Ref, Res};
-		bye ->
-		    ?t:format("Ssl node ~s stopped.~n", [Name]),
-		    gen_tcp:close(Socket),
-		    exit(normal);
-		Unknown ->
-		    exit({unexpected_message_from_ssl_node, Name, Unknown})
-	    end;
-	{tcp_closed, Socket} ->
-	    gen_tcp:close(Socket),
-	    exit({lost_connection_with_ssl_node, Name})
-    end,
-    tstsrvr_con_loop(Name, Socket, Parent).
-
-%%
-%% Connection handler ssl_node side
-%%
-
-% cnct2tstsrvr() is called via command line arg -run ...
-cnct2tstsrvr([Host, Port]) when is_list(Host), is_list(Port) ->
-    %% Spawn connection handler on ssl node side
-    ConnHandler
-	= spawn(fun () ->
-			case catch gen_tcp:connect(Host,
-						   list_to_integer(Port),
-						   [binary,
-						    {packet, 4},
-						    {active, false}]) of
-			    {ok, Socket} ->
-				notify_ssl_node_up(Socket),
-				ets:new(test_server_info,
-					[set,
-					 public,
-					 named_table,
-					 {keypos, 1}]),
-				ets:insert(test_server_info,
-					   {test_server_handler, self()}),
-				ssl_node_con_loop(Socket);
-			    Error ->
-				halt("Failed to connect to test server " ++
-					 lists:flatten(io_lib:format("Host:~p ~n Port:~p~n Error:~p~n",
-								     [Host, Port, Error])))
-			end
-		end),
-    spawn(fun () ->
-		  Mon = erlang:monitor(process, ConnHandler),
-		  receive
-		      {'DOWN', Mon, process, ConnHandler, Reason} ->
-			  receive after 1000 -> ok end,
-			  halt("test server connection handler terminated: " ++
-				   lists:flatten(io_lib:format("~p", [Reason])))
-		  end
-	  end).
-
-notify_ssl_node_up(Socket) ->
-    case catch gen_tcp:send(Socket,
-			    term_to_binary({ssl_node_up, node()})) of
-	ok -> ok;
-	_ -> halt("Failed to notify test server that I'm up")
-    end.
-
-send_to_tstsrvr(Term) ->
-    case catch ets:lookup_element(test_server_info, test_server_handler, 2) of
-	Hndlr when is_pid(Hndlr) ->
-	    Hndlr ! {relay_to_test_server, term_to_binary(Term)}, ok;
-	_ ->
-	    receive after 200 -> ok end,
-	    send_to_tstsrvr(Term)
-    end.
-
-ssl_node_con_loop(Socket) ->
-    inet:setopts(Socket,[{active,once}]),
-    receive
-	{relay_to_test_server, Data} when is_binary(Data) ->
-	    case gen_tcp:send(Socket, Data) of
-		ok ->
-		    ok;
-		_Error ->
-		    gen_tcp:close(Socket),
-		    halt("Failed to relay data to test server")
-	    end;
-	{tcp, Socket, Bin} ->
-	    case catch binary_to_term(Bin) of
-		{'EXIT', _} ->
-		    gen_tcp:close(Socket),
-		    halt("test server sent me bad data");
-		{apply, From, Ref, M, F, A} ->
-		    spawn_link(
-		      fun () ->
-			      send_to_tstsrvr({apply_res,
-					       From,
-					       Ref,
-					       (catch apply(M, F, A))})
-			  end);
-		{apply, From, Ref, Fun} ->
-		    spawn_link(fun () ->
-				       send_to_tstsrvr({apply_res,
-							From,
-							Ref,
-							(catch Fun())})
-			       end);
-		stop ->
-		    gen_tcp:send(Socket, term_to_binary(bye)),
-		    gen_tcp:close(Socket),
-		    init:stop(),
-		    receive after infinity -> ok end;
-		_Unknown ->
-		    halt("test server sent me an unexpected message")
-	    end;
-	{tcp_closed, Socket} ->
-	    halt("Lost connection to test server")
-    end,
-    ssl_node_con_loop(Socket).
-
 %%
 %% Setup ssl dist info
 %%
diff --git a/lib/ssl/test/ssl_dist_bench_SUITE.erl b/lib/ssl/test/ssl_dist_bench_SUITE.erl
new file mode 100644
index 0000000000..4d27564319
--- /dev/null
+++ b/lib/ssl/test/ssl_dist_bench_SUITE.erl
@@ -0,0 +1,481 @@
+%%%-------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(ssl_dist_bench_SUITE).
+
+-include_lib("common_test/include/ct_event.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+%% CT meta
+-export([suite/0, all/0, groups/0,
+         init_per_suite/1, end_per_suite/1,
+         init_per_group/2, end_per_group/2,
+         init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases
+-export(
+   [setup/1,
+    roundtrip/1,
+    throughput_1024/1,
+    throughput_4096/1,
+    throughput_16384/1,
+    throughput_65536/1,
+    throughput_262144/1,
+    throughput_1048576/1]).
+
+%% Debug
+-export([payload/1]).
+
+%%%-------------------------------------------------------------------
+
+suite() -> [{ct_hooks, [{ts_install_cth, [{nodenames, 2}]}]}].
+
+all() -> [{group, ssl}, {group, plain}].
+
+groups() ->
+    [{ssl, all_groups()},
+     {plain, all_groups()},
+     %%
+     {setup, [{repeat, 1}], [setup]},
+     {roundtrip, [{repeat, 1}], [roundtrip]},
+     {throughput, [{repeat, 1}],
+      [throughput_1024,
+       throughput_4096,
+       throughput_16384,
+       throughput_65536,
+       throughput_262144,
+       throughput_1048576]}].
+
+all_groups() ->
+    [{group, setup},
+     {group, roundtrip},
+     {group, throughput}].
+
+init_per_suite(Config) ->
+    Digest = sha1,
+    ECCurve = secp521r1,
+    TLSVersion = 'tlsv1.2',
+    TLSCipher = {ecdhe_ecdsa,aes_128_cbc,sha256,sha256},
+    %%
+    Node = node(),
+    try
+        Node =/= nonode@nohost orelse
+            throw({skipped,"Node not distributed"}),
+        {supported, SSLVersions} =
+            lists:keyfind(supported, 1, ssl:versions()),
+        lists:member(TLSVersion, SSLVersions) orelse
+            throw(
+              {skipped,
+               "SSL does not support " ++ term_to_string(TLSVersion)}),
+        lists:member(ECCurve, ssl:eccs(TLSVersion)) orelse
+            throw(
+              {skipped,
+               "SSL does not support " ++ term_to_string(ECCurve)}),
+        lists:member(TLSCipher, ssl:cipher_suites()) orelse
+            throw(
+              {skipped,
+               "SSL does not support " ++ term_to_string(TLSCipher)})
+    of
+        _ ->
+            PrivDir = proplists:get_value(priv_dir, Config),
+            %%
+            [_, HostA] = string:split(atom_to_list(Node), "@"),
+            NodeAName = ?MODULE_STRING ++ "_node_a",
+            NodeAString = NodeAName ++ "@" ++ HostA,
+            NodeAConfFile = filename:join(PrivDir, NodeAString ++ ".conf"),
+            NodeA = list_to_atom(NodeAString),
+            %%
+            ServerNode = ssl_bench_test_lib:setup(dist_server),
+            [_, HostB] = string:split(atom_to_list(ServerNode), "@"),
+            NodeBName = ?MODULE_STRING ++ "_node_b",
+            NodeBString = NodeBName ++ "@" ++ HostB,
+            NodeBConfFile = filename:join(PrivDir, NodeBString ++ ".conf"),
+            NodeB = list_to_atom(NodeBString),
+            %%
+            CertOptions =
+                [{digest, Digest},
+                 {key, {namedCurve, ECCurve}}],
+            RootCert =
+                public_key:pkix_test_root_cert(
+                  ?MODULE_STRING ++ " ROOT CA", CertOptions),
+            SSLConf =
+                [{verify, verify_peer},
+                 {versions, [TLSVersion]},
+                 {ciphers, [TLSCipher]}],
+            %%
+            write_node_conf(
+              NodeAConfFile, NodeA,
+              [{fail_if_no_peer_cert, true} | SSLConf], SSLConf,
+              CertOptions, RootCert),
+            write_node_conf(
+              NodeBConfFile, NodeB,
+              [{fail_if_no_peer_cert, true} | SSLConf], SSLConf,
+              CertOptions, RootCert),
+            %%
+            [{node_a_name, NodeAName},
+             {node_a, NodeA},
+             {node_a_dist_args,
+              "-proto_dist inet_tls "
+              "-ssl_dist_optfile " ++ NodeAConfFile ++ " "},
+             {node_b_name, NodeBName},
+             {node_b, NodeB},
+             {node_b_dist_args,
+              "-proto_dist inet_tls "
+              "-ssl_dist_optfile " ++ NodeBConfFile ++ " "},
+             {server_node, ServerNode}
+             |Config]
+    catch
+        throw:Result ->
+            Result
+    end.
+
+end_per_suite(Config) ->
+    ServerNode = proplists:get_value(server_node, Config),
+    slave:stop(ServerNode).
+
+init_per_group(ssl, Config) ->
+    [{ssl_dist, true}, {ssl_dist_prefix, "SSL"}|Config];
+init_per_group(plain, Config) ->
+    [{ssl_dist, false}, {ssl_dist_prefix, "Plain"}|Config];
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+init_per_testcase(_Func, Conf) ->
+    Conf.
+
+end_per_testcase(_Func, _Conf) ->
+    ok.
+
+-define(COUNT, 400).
+
+%%%-------------------------------------------------------------------
+%%% CommonTest API helpers
+
+write_node_conf(
+  ConfFile, Node, ServerConf, ClientConf, CertOptions, RootCert) ->
+    Conf =
+        public_key:pkix_test_data(
+          #{root => RootCert,
+            peer =>
+                [{extensions,
+                  [#'Extension'{
+                      extnID = ?'id-ce-subjectAltName',
+                      extnValue = [{dNSName, atom_to_list(Node)}],
+                      critical = false}]} | CertOptions]}),
+    NodeConf =
+        [{server, ServerConf ++ Conf}, {client, ClientConf ++ Conf}],
+    {ok, Fd} = file:open(ConfFile, [write]),
+    ok = file:change_mode(ConfFile, 8#400),
+    io:format(Fd, "~p.~n", [NodeConf]),
+    ok = file:close(Fd).
+
+
+%%%-------------------------------------------------------------------
+%%% Test cases
+
+%%-----------------------
+%% Connection setup speed
+
+setup(Config) ->
+    run_nodepair_test(fun setup/5, Config).
+
+setup(A, B, Prefix, HA, HB) ->
+    Rounds = 10,
+    [] = ssl_apply(HA, erlang, nodes, []),
+    [] = ssl_apply(HB, erlang, nodes, []),
+    {SetupTime, CycleTime} =
+        ssl_apply(HA, fun () -> setup_runner(A, B, Rounds) end),
+    [] = ssl_apply(HA, erlang, nodes, []),
+    [] = ssl_apply(HB, erlang, nodes, []),
+    SetupSpeed = round((Rounds*1000000*1000) / SetupTime),
+    CycleSpeed = round((Rounds*1000000*1000) / CycleTime),
+    _ = report(Prefix++" Setup", SetupSpeed, "setups/1000s"),
+    report(Prefix++" Setup Cycle", CycleSpeed, "cycles/1000s").
+
+%% Runs on node A against rex in node B
+setup_runner(A, B, Rounds) ->
+    StartTime = start_time(),
+    SetupTime = setup_loop(A, B, 0, Rounds),
+    {microseconds(SetupTime), microseconds(elapsed_time(StartTime))}.
+
+setup_loop(_A, _B, T, 0) ->
+    T;
+setup_loop(A, B, T, N) ->
+    StartTime = start_time(),
+    [A] = rpc:block_call(B, erlang, nodes, []),
+    Time = elapsed_time(StartTime),
+    [B] = erlang:nodes(),
+    Mref = erlang:monitor(process, {rex,B}),
+    true = net_kernel:disconnect(B),
+    receive
+        {'DOWN',Mref,process,_,_} ->
+            [] = erlang:nodes(),
+            setup_loop(A, B, Time + T, N - 1)
+    end.
+
+
+%%----------------
+%% Roundtrip speed
+
+roundtrip(Config) ->
+    run_nodepair_test(fun roundtrip/5, Config).
+
+roundtrip(A, B, Prefix, HA, HB) ->
+    Rounds = 40000,
+    [] = ssl_apply(HA, erlang, nodes, []),
+    [] = ssl_apply(HB, erlang, nodes, []),
+    Time = ssl_apply(HA, fun () -> roundtrip_runner(A, B, Rounds) end),
+    [B] = ssl_apply(HA, erlang, nodes, []),
+    [A] = ssl_apply(HB, erlang, nodes, []),
+    Speed = round((Rounds*1000000) / Time),
+    report(Prefix++" Roundtrip", Speed, "pings/s").
+
+%% Runs on node A and spawns a server on node B
+roundtrip_runner(A, B, Rounds) ->
+    ClientPid = self(),
+    [A] = rpc:call(B, erlang, nodes, []),
+    ServerPid =
+        erlang:spawn(
+          B,
+          fun () -> roundtrip_server(ClientPid, Rounds) end),
+    ServerMon = erlang:monitor(process, ServerPid),
+    microseconds(
+      roundtrip_client(ServerPid, ServerMon, start_time(), Rounds)).
+
+roundtrip_server(_Pid, 0) ->
+    ok;
+roundtrip_server(Pid, N) ->
+    receive
+        N ->
+            Pid ! N,
+            roundtrip_server(Pid, N-1)
+    end.
+
+roundtrip_client(_Pid, Mon, StartTime, 0) ->
+    Time = elapsed_time(StartTime),
+    receive
+        {'DOWN', Mon, _, _, normal} ->
+            Time;
+        {'DOWN', Mon, _, _, Other} ->
+            exit(Other)
+    end;
+roundtrip_client(Pid, Mon, StartTime, N) ->
+    Pid ! N,
+    receive
+        N ->
+            roundtrip_client(Pid, Mon, StartTime, N - 1)
+    end.
+
+
+%%-----------------
+%% Throughput speed
+
+throughput_1024(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 100000, 1024)
+      end, Config).
+
+throughput_4096(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 50000, 4096)
+      end, Config).
+
+throughput_16384(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 10000, 16384)
+      end, Config).
+
+throughput_65536(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 2000, 65536)
+      end, Config).
+
+throughput_262144(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 500, 262144)
+      end, Config).
+
+throughput_1048576(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 200, 1048576)
+      end, Config).
+
+throughput(A, B, Prefix, HA, HB, Packets, Size) ->
+    [] = ssl_apply(HA, erlang, nodes, []),
+    [] = ssl_apply(HB, erlang, nodes, []),
+    Time =
+        ssl_apply(HA, fun () -> throughput_runner(A, B, Packets, Size) end),
+    [B] = ssl_apply(HA, erlang, nodes, []),
+    [A] = ssl_apply(HB, erlang, nodes, []),
+    Speed = round((Packets*Size*1000000) / (1024*Time)),
+    report(Prefix++" Throughput_"++integer_to_list(Size), Speed, "kB/s").
+
+%% Runs on node A and spawns a server on node B
+throughput_runner(A, B, Rounds, Size) ->
+    Payload = payload(Size),
+    ClientPid = self(),
+    [A] = rpc:call(B, erlang, nodes, []),
+    ServerPid =
+        erlang:spawn(
+          B,
+          fun () -> throughput_server(ClientPid, Rounds) end),
+    ServerMon = erlang:monitor(process, ServerPid),
+    microseconds(
+      throughput_client(
+        ServerPid, ServerMon, Payload, start_time(), Rounds)).
+
+throughput_server(_Pid, 0) ->
+    ok;
+throughput_server(Pid, N) ->
+    receive
+        [N|_] ->
+            throughput_server(Pid, N-1)
+    end.
+
+throughput_client(_Pid, Mon, _Payload, StartTime, 0) ->
+    receive
+        {'DOWN', Mon, _, _, normal} ->
+            elapsed_time(StartTime);
+        {'DOWN', Mon, _, _, Other} ->
+            exit(Other)
+    end;
+throughput_client(Pid, Mon, Payload, StartTime, N) ->
+    Pid ! [N|Payload],
+    throughput_client(Pid, Mon, Payload, StartTime, N - 1).
+
+%%%-------------------------------------------------------------------
+%%% Test cases helpers
+
+run_nodepair_test(TestFun, Config) ->
+    A = proplists:get_value(node_a, Config),
+    B = proplists:get_value(node_b, Config),
+    Prefix = proplists:get_value(ssl_dist_prefix, Config),
+    HA = start_ssl_node_a(Config),
+    HB = start_ssl_node_b(Config),
+    try TestFun(A, B, Prefix, HA, HB)
+    after
+        stop_ssl_node_a(HA),
+        stop_ssl_node_b(HB, Config),
+        ok
+    end.
+
+ssl_apply(Handle, M, F, Args) ->
+    case ssl_dist_test_lib:apply_on_ssl_node(Handle, M, F, Args) of
+        {'EXIT',Reason} ->
+            error(Reason);
+        Result ->
+            Result
+    end.
+
+ssl_apply(Handle, Fun) ->
+    case ssl_dist_test_lib:apply_on_ssl_node(Handle, Fun) of
+        {'EXIT',Reason} ->
+            error(Reason);
+        Result ->
+            Result
+    end.
+
+start_ssl_node_a(Config) ->
+    Name = proplists:get_value(node_a_name, Config),
+    Args = get_node_args(node_a_dist_args, Config),
+    ssl_dist_test_lib:start_ssl_node(Name, Args).
+
+start_ssl_node_b(Config) ->
+    Name = proplists:get_value(node_b_name, Config),
+    Args = get_node_args(node_b_dist_args, Config),
+    ServerNode = proplists:get_value(server_node, Config),
+    rpc:call(
+      ServerNode, ssl_dist_test_lib, start_ssl_node, [Name, Args]).
+
+stop_ssl_node_a(HA) ->
+    ssl_dist_test_lib:stop_ssl_node(HA).
+
+stop_ssl_node_b(HB, Config) ->
+    ServerNode = proplists:get_value(server_node, Config),
+    rpc:call(ServerNode, ssl_dist_test_lib, stop_ssl_node, [HB]).
+
+get_node_args(Tag, Config) ->
+    case proplists:get_value(ssl_dist, Config) of
+        true ->
+            proplists:get_value(Tag, Config);
+        false ->
+            ""
+    end.
+
+
+
+payload(Size) ->
+    iolist_to_binary(
+      [case Size bsr 8 of
+           0 ->
+               [];
+           Blocks ->
+               payload(Blocks, create_binary(256))
+       end | create_binary(Size band 255)]).
+%%
+payload(0, _) ->
+    [];
+payload(Blocks, Block) ->
+    Half = payload(Blocks bsr 1, Block),
+    [Half, Half |
+     if
+         Blocks band 1 =:= 1 ->
+             Block;
+         true ->
+             []
+     end].
+
+create_binary(Size) ->
+    create_binary(Size, <<>>).
+%%
+create_binary(0, Bin) ->
+    Bin;
+create_binary(Size, Bin) ->
+    NextSize = Size - 1,
+    create_binary(NextSize, <<Bin/binary, NextSize>>).
+
+start_time() ->
+    erlang:system_time().
+
+elapsed_time(StartTime) ->
+    erlang:system_time() - StartTime.
+
+microseconds(Time) ->
+    erlang:convert_time_unit(Time, native, microsecond).
+
+report(Name, Value, Unit) ->
+    ct:pal("~s: ~w ~s", [Name, Value, Unit]),
+    ct_event:notify(
+      #event{
+         name = benchmark_data,
+         data = [{value, Value}, {suite, "ssl_dist"}, {name, Name}]}),
+    {comment, term_to_string(Value) ++ " " ++ Unit}.
+
+term_to_string(Term) ->
+    unicode:characters_to_list(
+      io_lib:write(Term, [{encoding, unicode}])).
diff --git a/lib/ssl/test/ssl_dist_test_lib.erl b/lib/ssl/test/ssl_dist_test_lib.erl
new file mode 100644
index 0000000000..1b9c853fc4
--- /dev/null
+++ b/lib/ssl/test/ssl_dist_test_lib.erl
@@ -0,0 +1,343 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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(ssl_dist_test_lib).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("public_key/include/public_key.hrl").
+-include("ssl_dist_test_lib.hrl").
+
+-export([tstsrvr_format/2, send_to_tstcntrl/1]).
+-export([apply_on_ssl_node/4, apply_on_ssl_node/2]).
+-export([stop_ssl_node/1, start_ssl_node/2]).
+%%
+-export([cnct2tstsrvr/1]).
+
+-define(AWAIT_SSL_NODE_UP_TIMEOUT, 30000).
+
+
+
+%% ssl_node side api
+%%
+
+tstsrvr_format(Fmt, ArgList) ->
+    send_to_tstsrvr({format, Fmt, ArgList}).
+
+send_to_tstcntrl(Message) ->
+    send_to_tstsrvr({message, Message}).
+
+
+%%
+%% test_server side api
+%%
+
+apply_on_ssl_node(
+  #node_handle{connection_handler = Hndlr} = Node,
+  M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
+    Ref = erlang:monitor(process, Hndlr),
+    apply_on_ssl_node(Node, Ref, {apply, self(), Ref, M, F, A}).
+
+apply_on_ssl_node(
+  #node_handle{connection_handler = Hndlr} = Node,
+  Fun) when is_function(Fun, 0) ->
+    Ref = erlang:monitor(process, Hndlr),
+    apply_on_ssl_node(Node, Ref, {apply, self(), Ref, Fun}).
+
+apply_on_ssl_node(Node, Ref, Msg) ->
+    send_to_ssl_node(Node, Msg),
+    receive
+        {'DOWN', Ref, process, Hndlr, Reason} ->
+            exit({handler_died, Hndlr, Reason});
+	{Ref, Result} ->
+	    Result
+    end.
+
+stop_ssl_node(#node_handle{connection_handler = Handler,
+			   socket = Socket,
+			   name = Name}) ->
+    ?t:format("Trying to stop ssl node ~s.~n", [Name]),
+    Mon = erlang:monitor(process, Handler),
+    unlink(Handler),
+    case gen_tcp:send(Socket, term_to_binary(stop)) of
+	ok ->
+	    receive
+		{'DOWN', Mon, process, Handler, Reason} ->
+		    case Reason of
+			normal ->
+			    ok;
+			_ ->
+			    ct:pal(
+                              "stop_ssl_node/1 ~s Down  ~p ~n",
+                              [Name,Reason])
+		    end
+	    end;
+	Error ->
+	    erlang:demonitor(Mon, [flush]),
+	    ct:pal("stop_ssl_node/1 ~s Warning ~p ~n", [Name,Error])
+    end.
+
+start_ssl_node(Name, Args) ->
+    {ok, LSock} = gen_tcp:listen(0,
+				 [binary, {packet, 4}, {active, false}]),
+    {ok, ListenPort} = inet:port(LSock),
+    CmdLine = mk_node_cmdline(ListenPort, Name, Args),
+    ?t:format("Attempting to start ssl node ~ts: ~ts~n", [Name, CmdLine]),
+    case open_port({spawn, CmdLine}, []) of
+	Port when is_port(Port) ->
+	    unlink(Port),
+	    erlang:port_close(Port),
+	    case await_ssl_node_up(Name, LSock) of
+		#node_handle{} = NodeHandle ->
+		    ?t:format("Ssl node ~s started.~n", [Name]),
+		    NodeName = list_to_atom(Name ++ "@" ++ host_name()),
+		    NodeHandle#node_handle{nodename = NodeName};
+		Error ->
+		    exit({failed_to_start_node, Name, Error})
+	    end;
+	Error ->
+	    exit({failed_to_start_node, Name, Error})
+    end.
+
+host_name() ->
+    [_, Host] = string:split(atom_to_list(node()), "@"),
+    %% [$@ | Host] = lists:dropwhile(fun ($@) -> false; (_) -> true end,
+    %%     			  atom_to_list(node())),
+    Host.
+
+mk_node_cmdline(ListenPort, Name, Args) ->
+    Static = "-detached -noinput",
+    Pa = filename:dirname(code:which(?MODULE)),
+    Prog = case catch init:get_argument(progname) of
+	       {ok,[[P]]} -> P;
+	       _ -> exit(no_progname_argument_found)
+	   end,
+    NameSw = case net_kernel:longnames() of
+		 false -> "-sname ";
+		 _ -> "-name "
+	     end,
+    {ok, Pwd} = file:get_cwd(),
+    "\"" ++ Prog ++ "\" "
+	++ Static ++ " "
+	++ NameSw ++ " " ++ Name ++ " "
+	++ "-pa " ++ Pa ++ " "
+	++ "-run application start crypto -run application start public_key "
+	++ "-eval 'net_kernel:verbose(1)' "
+	++ "-run " ++ atom_to_list(?MODULE) ++ " cnct2tstsrvr "
+	++ host_name() ++ " "
+	++ integer_to_list(ListenPort) ++ " "
+	++ Args ++ " "
+	++ "-env ERL_CRASH_DUMP " ++ Pwd ++ "/erl_crash_dump." ++ Name ++ " "
+	++ "-kernel error_logger \"{file,\\\"" ++ Pwd ++ "/error_log." ++ Name ++ "\\\"}\" "
+	++ "-setcookie " ++ atom_to_list(erlang:get_cookie()).
+
+%%
+%% Connection handler test_server side
+%%
+
+await_ssl_node_up(Name, LSock) ->
+    case gen_tcp:accept(LSock, ?AWAIT_SSL_NODE_UP_TIMEOUT) of
+	{ok, Socket} ->
+	    gen_tcp:close(LSock),
+	    case gen_tcp:recv(Socket, 0) of
+		{ok, Bin} ->
+		    check_ssl_node_up(Socket, Name, Bin);
+		{error, closed} ->
+		    gen_tcp:close(Socket),
+		    exit({lost_connection_with_ssl_node_before_up, Name})
+	    end;
+	{error, Error} ->
+	    gen_tcp:close(LSock),
+            ?t:format("Accept failed for ssl node ~s: ~p~n", [Name,Error]),
+	    exit({accept_failed, Error})
+    end.
+
+check_ssl_node_up(Socket, Name, Bin) ->
+    case catch binary_to_term(Bin) of
+	{'EXIT', _} ->
+	    gen_tcp:close(Socket),
+	    exit({bad_data_received_from_ssl_node, Name, Bin});
+	{ssl_node_up, NodeName} ->
+	    case list_to_atom(Name++"@"++host_name()) of
+		NodeName ->
+		    Parent = self(),
+		    Go = make_ref(),
+		    %% Spawn connection handler on test server side
+		    Pid = spawn_link(
+			    fun () ->
+				    receive Go -> ok end,
+                                    process_flag(trap_exit, true),
+				    tstsrvr_con_loop(Name, Socket, Parent)
+			    end),
+		    ok = gen_tcp:controlling_process(Socket, Pid),
+		    Pid ! Go,
+		    #node_handle{connection_handler = Pid,
+				 socket = Socket,
+				 name = Name};
+		_ ->
+		    exit({unexpected_ssl_node_connected, NodeName})
+	    end;
+	Msg ->
+	    exit({unexpected_msg_instead_of_ssl_node_up, Name, Msg})
+    end.
+
+send_to_ssl_node(#node_handle{connection_handler = Hndlr}, Term) ->
+    Hndlr ! {relay_to_ssl_node, term_to_binary(Term)},
+    ok.
+
+tstsrvr_con_loop(Name, Socket, Parent) ->
+    ok = inet:setopts(Socket,[{active,once}]),
+    receive
+	{relay_to_ssl_node, Data} when is_binary(Data) ->
+	    case gen_tcp:send(Socket, Data) of
+		ok ->
+		    ok;
+		_Error ->
+		    gen_tcp:close(Socket),
+		    exit({failed_to_relay_data_to_ssl_node, Name, Data})
+	    end;
+	{tcp, Socket, Bin} ->
+	    try binary_to_term(Bin) of
+		{format, FmtStr, ArgList} ->
+		    ?t:format(FmtStr, ArgList);
+		{message, Msg} ->
+		    ?t:format("Got message ~p", [Msg]),
+		    Parent ! Msg;
+		{apply_res, To, Ref, Res} ->
+		    To ! {Ref, Res};
+		bye ->
+                    {error, closed} = gen_tcp:recv(Socket, 0),
+		    ?t:format("Ssl node ~s stopped.~n", [Name]),
+		    gen_tcp:close(Socket),
+		    exit(normal);
+		Unknown ->
+		    exit({unexpected_message_from_ssl_node, Name, Unknown})
+            catch
+                error : _ ->
+		    gen_tcp:close(Socket),
+		    exit({bad_data_received_from_ssl_node, Name, Bin})
+	    end;
+	{tcp_closed, Socket} ->
+	    gen_tcp:close(Socket),
+	    exit({lost_connection_with_ssl_node, Name});
+        {'EXIT', Parent, Reason} ->
+            exit({'EXIT', parent, Reason});
+        Unknown ->
+            exit({unknown, Unknown})
+    end,
+    tstsrvr_con_loop(Name, Socket, Parent).
+
+%%
+%% Connection handler ssl_node side
+%%
+
+% cnct2tstsrvr() is called via command line arg -run ...
+cnct2tstsrvr([Host, Port]) when is_list(Host), is_list(Port) ->
+    %% Spawn connection handler on ssl node side
+    ConnHandler
+	= spawn(fun () ->
+			case catch gen_tcp:connect(Host,
+						   list_to_integer(Port),
+						   [binary,
+						    {packet, 4},
+						    {active, false}]) of
+			    {ok, Socket} ->
+				notify_ssl_node_up(Socket),
+				ets:new(test_server_info,
+					[set,
+					 public,
+					 named_table,
+					 {keypos, 1}]),
+				ets:insert(test_server_info,
+					   {test_server_handler, self()}),
+				ssl_node_con_loop(Socket);
+			    Error ->
+				halt("Failed to connect to test server " ++
+					 lists:flatten(io_lib:format("Host:~p ~n Port:~p~n Error:~p~n",
+								     [Host, Port, Error])))
+			end
+		end),
+    spawn(fun () ->
+		  Mon = erlang:monitor(process, ConnHandler),
+		  receive
+		      {'DOWN', Mon, process, ConnHandler, Reason} ->
+			  receive after 1000 -> ok end,
+			  halt("test server connection handler terminated: " ++
+				   lists:flatten(io_lib:format("~p", [Reason])))
+		  end
+	  end).
+
+notify_ssl_node_up(Socket) ->
+    case catch gen_tcp:send(Socket,
+			    term_to_binary({ssl_node_up, node()})) of
+	ok -> ok;
+	_ -> halt("Failed to notify test server that I'm up")
+    end.
+
+send_to_tstsrvr(Term) ->
+    case catch ets:lookup_element(test_server_info, test_server_handler, 2) of
+	Hndlr when is_pid(Hndlr) ->
+	    Hndlr ! {relay_to_test_server, term_to_binary(Term)}, ok;
+	_ ->
+	    receive after 200 -> ok end,
+	    send_to_tstsrvr(Term)
+    end.
+
+ssl_node_con_loop(Socket) ->
+    inet:setopts(Socket,[{active,once}]),
+    receive
+	{relay_to_test_server, Data} when is_binary(Data) ->
+	    case gen_tcp:send(Socket, Data) of
+		ok ->
+		    ok;
+		_Error ->
+		    gen_tcp:close(Socket),
+		    halt("Failed to relay data to test server")
+	    end;
+	{tcp, Socket, Bin} ->
+	    case catch binary_to_term(Bin) of
+		{'EXIT', _} ->
+		    gen_tcp:close(Socket),
+		    halt("test server sent me bad data");
+		{apply, From, Ref, M, F, A} ->
+		    spawn_link(
+		      fun () ->
+			      send_to_tstsrvr({apply_res,
+					       From,
+					       Ref,
+					       (catch apply(M, F, A))})
+			  end);
+		{apply, From, Ref, Fun} ->
+		    spawn_link(fun () ->
+				       send_to_tstsrvr({apply_res,
+							From,
+							Ref,
+							(catch Fun())})
+			       end);
+		stop ->
+		    gen_tcp:send(Socket, term_to_binary(bye)),
+		    init:stop(),
+		    receive after infinity -> ok end;
+		_Unknown ->
+		    halt("test server sent me an unexpected message")
+	    end;
+	{tcp_closed, Socket} ->
+	    halt("Lost connection to test server")
+    end,
+    ssl_node_con_loop(Socket).
diff --git a/lib/ssl/test/ssl_dist_test_lib.hrl b/lib/ssl/test/ssl_dist_test_lib.hrl
new file mode 100644
index 0000000000..86b9b37026
--- /dev/null
+++ b/lib/ssl/test/ssl_dist_test_lib.hrl
@@ -0,0 +1,26 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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%
+%%
+
+-record(node_handle,
+	{connection_handler,
+	 socket,
+	 name,
+	 nodename}
+       ).
diff --git a/lib/ssl/test/ssl_engine_SUITE.erl b/lib/ssl/test/ssl_engine_SUITE.erl
new file mode 100644
index 0000000000..71891356e8
--- /dev/null
+++ b/lib/ssl/test/ssl_engine_SUITE.erl
@@ -0,0 +1,147 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-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.
+%% 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(ssl_engine_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+all() ->
+    [
+     private_key
+    ].
+
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+            case crypto:info_lib() of
+                [{_,_, <<"OpenSSL 1.0.1s-freebsd  1 Mar 2016">>}] ->
+                    {skip, "Problem with engine on OpenSSL 1.0.1s-freebsd"};
+                _ ->
+                    ssl_test_lib:clean_start(),
+                    case crypto:get_test_engine() of
+                         {ok, EngineName} ->
+                            try crypto:engine_load(<<"dynamic">>,
+                                                    [{<<"SO_PATH">>, EngineName},
+                                                     <<"LOAD">>],
+                                                   []) of
+                                {ok, Engine} ->
+                                    [{engine, Engine} |Config];
+                                {error, Reason} ->
+                                    ct:pal("Reason ~p", [Reason]),
+                                    {skip, "No dynamic engine support"}
+                            catch error:notsup ->
+                                    {skip, "No engine support in OpenSSL"}    
+                            end;
+                        {error, notexist} ->
+                            {skip, "Test engine not found"}
+                    end
+            end
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(Config) ->
+    Engine = proplists:get_value(engine, Config),
+    crypto:engine_unload(Engine),
+    ssl:stop(),
+    application:stop(crypto).
+
+
+init_per_testcase(_TestCase, Config) ->
+    ssl:stop(),
+    ssl:start(),
+    ssl_test_lib:ct_log_supported_protocol_versions(Config),
+    ct:timetrap({seconds, 10}),
+    Config.
+
+end_per_testcase(_TestCase, Config) ->     
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+private_key(Config) when is_list(Config) ->
+    ClientFileBase = filename:join([proplists:get_value(priv_dir, Config), "client_engine"]),
+    ServerFileBase = filename:join([proplists:get_value(priv_dir, Config), "server_engine"]),
+    #{server_config := ServerConf,
+      client_config := ClientConf} = GenCertData =
+        public_key:pkix_test_data(#{server_chain => 
+                                        #{root => [{key, ssl_test_lib:hardcode_rsa_key(1)}],
+                                          intermediates => [[{key, ssl_test_lib:hardcode_rsa_key(2)}]],
+                                          peer => [{key, ssl_test_lib:hardcode_rsa_key(3)}
+                                                  ]},
+                                    client_chain => 
+                                        #{root => [{key, ssl_test_lib:hardcode_rsa_key(4)}],
+                                          intermediates => [[{key, ssl_test_lib:hardcode_rsa_key(5)}]],
+                                          peer => [{key, ssl_test_lib:hardcode_rsa_key(6)}]}}),
+    [{server_config, FileServerConf}, 
+     {client_config, FileClientConf}] = 
+        x509_test:gen_pem_config_files(GenCertData, ClientFileBase, ServerFileBase),
+    
+    Engine = proplists:get_value(engine, Config),
+
+    ClientKey = engine_key(FileClientConf),
+    ServerKey = engine_key(FileServerConf),
+
+    EngineClientConf = [{key, #{algorithm => rsa,
+                                engine => Engine,
+                                key_id => ClientKey}} | proplists:delete(key, ClientConf)],
+    
+    EngineServerConf = [{key, #{algorithm => rsa,
+                                engine => Engine,
+                                key_id => ServerKey}} | proplists:delete(key, ServerConf)],
+    %% Test with engine
+    test_tls_connection(EngineServerConf, EngineClientConf, Config),
+    %% Test that sofware fallback is available
+    test_tls_connection(ServerConf, [{reuse_sessions, false} |ClientConf], Config).
+    
+engine_key(Conf) ->
+    FileStr = proplists:get_value(keyfile, Conf),
+    list_to_binary(FileStr).
+    
+
+test_tls_connection(ServerConf, ClientConf, Config) ->
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+                                        {mfa, {ssl_test_lib, send_recv_result_active, []}},
+                                        {options, [{verify, verify_peer}
+                                                   | ServerConf]}]),
+    Port  = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+                                        {from, self()},
+                                        {mfa, {ssl_test_lib, send_recv_result_active, []}},
+                                        {options,  [{verify, verify_peer} | ClientConf]}]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 4e7252f469..26ef311615 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1025,48 +1025,60 @@ string_regex_filter(_Str, _Search) ->
     false.
 
 anonymous_suites(Version) ->
-    Suites = [ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:anonymous_suites(Version)],
-    ssl_cipher:filter_suites(Suites).
-
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:anonymous_suites(Version)],[]).
 psk_suites(Version) ->
-    Suites = [ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:psk_suites(Version)],
-    ssl_cipher:filter_suites(Suites).
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:psk_suites(Version)], []).
 
 psk_anon_suites(Version) ->
-    Suites = [Suite || Suite <- psk_suites(Version), is_psk_anon_suite(Suite)],
-    ssl_cipher:filter_suites(Suites).
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:psk_suites_anon(Version)], 
+                             [{key_exchange, 
+                               fun(psk) -> 
+                                       true;
+                                  (psk_dhe) -> 
+                                       true;
+                                  (_) -> 
+                                       false 
+                               end}]).
 
 srp_suites() ->
-    Suites =
-	[{srp_anon, '3des_ede_cbc', sha},
-	 {srp_rsa, '3des_ede_cbc', sha},
-	 {srp_anon, aes_128_cbc, sha},
-	 {srp_rsa, aes_128_cbc, sha},
-	 {srp_anon, aes_256_cbc, sha},
-	 {srp_rsa, aes_256_cbc, sha}],
-    ssl_cipher:filter_suites(Suites).
-
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:srp_suites()],
+                             [{key_exchange, 
+                               fun(srp_rsa) -> 
+                                       true;
+                                  (_) -> 
+                                       false 
+                               end}]).
 srp_anon_suites() ->
-    Suites =
-	[{srp_anon, '3des_ede_cbc', sha},
-	 {srp_anon, aes_128_cbc, sha},
-	 {srp_anon, aes_256_cbc, sha}],
-    ssl_cipher:filter_suites(Suites).
-
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <-  ssl_cipher:srp_suites_anon()],
+                             []).
 srp_dss_suites() ->
-    Suites =
-	[{srp_dss, '3des_ede_cbc', sha},
-	 {srp_dss, aes_128_cbc, sha},
-	 {srp_dss, aes_256_cbc, sha}],
-    ssl_cipher:filter_suites(Suites).
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:srp_suites()], 
+                             [{key_exchange, 
+                               fun(srp_dss) -> 
+                                       true;
+                                  (_) -> 
+                                       false 
+                               end}]).
+chacha_suites(Version) ->
+    [ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:filter_suites(ssl_cipher:chacha_suites(Version))].
+
 
 rc4_suites(Version) ->
-    Suites = [ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:rc4_suites(Version)],
-    ssl_cipher:filter_suites(Suites).
+     ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <-ssl_cipher:rc4_suites(Version)], []).
 
 des_suites(Version) ->
-    Suites = ssl_cipher:des_suites(Version),
-    ssl_cipher:filter_suites(Suites).
+     ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <-ssl_cipher:des_suites(Version)], []).
+
+tuple_to_map({Kex, Cipher, Mac}) ->
+    #{key_exchange => Kex,
+      cipher => Cipher,
+      mac => Mac,
+      prf => default_prf};
+tuple_to_map({Kex, Cipher, Mac, Prf}) ->
+    #{key_exchange => Kex,
+      cipher => Cipher,
+      mac => Mac,
+      prf => Prf}.
 
 pem_to_der(File) ->
     {ok, PemBin} = file:read_file(File),
@@ -1292,6 +1304,32 @@ cipher_restriction(Config0) ->
 	    Config0
     end.
 
+openssl_dsa_support() ->
+    case os:cmd("openssl version") of
+        "LibreSSL 2.6.1" ++ _ ->
+            true;
+        "LibreSSL 2.6.2" ++ _ ->
+            true;
+        "LibreSSL 2.6" ++ _ ->
+            false;
+        "LibreSSL 2.4" ++ _ ->
+            true;
+        "LibreSSL 2.3" ++ _ ->
+            true;
+        "LibreSSL 2.2" ++ _ ->
+            true;
+        "LibreSSL 2.1" ++ _ ->
+            true;
+        "LibreSSL 2.0" ++ _ ->
+            true;
+        "LibreSSL"  ++ _ ->
+            false;
+        "OpenSSL 1.0.1" ++ Rest ->
+            hd(Rest) >= s;
+        _ ->
+            true
+    end.
+
 check_sane_openssl_version(Version) ->
     case supports_ssl_tls_version(Version) of 
 	true ->
@@ -1329,8 +1367,9 @@ enough_openssl_crl_support(_) -> true.
 
 wait_for_openssl_server(Port, tls) ->
     do_wait_for_openssl_tls_server(Port, 10);
-wait_for_openssl_server(Port, dtls) ->
-    do_wait_for_openssl_dtls_server(Port, 10).
+wait_for_openssl_server(_Port, dtls) ->
+    ok. %% No need to wait for DTLS over UDP server
+        %% client will retransmitt until it is up.
 
 do_wait_for_openssl_tls_server(_, 0) ->
     exit(failed_to_connect_to_openssl);
@@ -1343,21 +1382,6 @@ do_wait_for_openssl_tls_server(Port, N) ->
 	    do_wait_for_openssl_tls_server(Port, N-1)
     end.
 
-do_wait_for_openssl_dtls_server(_, 0) ->
-    %%exit(failed_to_connect_to_openssl);
-    ok;
-do_wait_for_openssl_dtls_server(Port, N) ->
-    %% case gen_udp:open(0) of
-    %%     {ok, S} ->
-    %%         gen_udp:connect(S, "localhost", Port),
-    %%         gen_udp:close(S);
-    %%     _  ->
-    %%         ct:sleep(?SLEEP),
-    %%         do_wait_for_openssl_dtls_server(Port, N-1)
-    %% end.
-    ct:sleep(500),
-    do_wait_for_openssl_dtls_server(Port, N-1).
-
 version_flag(tlsv1) ->
     "-tls1";
 version_flag('tlsv1.1') ->
@@ -1384,7 +1408,9 @@ filter_suites(Ciphers0, AtomVersion) ->
     Supported0 = ssl_cipher:suites(Version)
 	++ ssl_cipher:anonymous_suites(Version)
 	++ ssl_cipher:psk_suites(Version)
+        ++ ssl_cipher:psk_suites_anon(Version)
 	++ ssl_cipher:srp_suites() 
+        ++ ssl_cipher:srp_suites_anon() 
 	++ ssl_cipher:rc4_suites(Version),
     Supported1 = ssl_cipher:filter_suites(Supported0),
     Supported2 = [ssl_cipher:erl_suite_definition(S) || S <- Supported1],
@@ -1658,78 +1684,3 @@ hardcode_dsa_key(3) ->
        y =  48598545580251057979126570873881530215432219542526130654707948736559463436274835406081281466091739849794036308281564299754438126857606949027748889019480936572605967021944405048011118039171039273602705998112739400664375208228641666852589396502386172780433510070337359132965412405544709871654840859752776060358,
        x = 1457508827177594730669011716588605181448418352823}.
 
-dtls_hello() ->
-    [1,
-     <<0,1,4>>,
-     <<0,0>>,
-     <<0,0,0>>,
-     <<0,1,4>>,
-     <<254,253,88,
-       156,129,61,
-       131,216,15,
-       131,194,242,
-       46,154,190,
-       20,228,234,
-       234,150,44,
-       62,96,96,103,
-       127,95,103,
-       23,24,42,138,
-       13,142,32,57,
-       230,177,32,
-       210,154,152,
-       188,121,134,
-       136,53,105,
-       118,96,106,
-       103,231,223,
-       133,10,165,
-       50,32,211,
-       227,193,14,
-       181,143,48,
-       66,0,0,100,0,
-       255,192,44,
-       192,48,192,
-       36,192,40,
-       192,46,192,
-       50,192,38,
-       192,42,0,159,
-       0,163,0,107,
-       0,106,0,157,
-       0,61,192,43,
-       192,47,192,
-       35,192,39,
-       192,45,192,
-       49,192,37,
-       192,41,0,158,
-       0,162,0,103,
-       0,64,0,156,0,
-       60,192,10,
-       192,20,0,57,
-       0,56,192,5,
-       192,15,0,53,
-       192,8,192,18,
-       0,22,0,19,
-       192,3,192,13,
-       0,10,192,9,
-       192,19,0,51,
-       0,50,192,4,
-       192,14,0,47,
-       1,0,0,86,0,0,
-       0,14,0,12,0,
-       0,9,108,111,
-       99,97,108,
-       104,111,115,
-       116,0,10,0,
-       58,0,56,0,14,
-       0,13,0,25,0,
-       28,0,11,0,12,
-       0,27,0,24,0,
-       9,0,10,0,26,
-       0,22,0,23,0,
-       8,0,6,0,7,0,
-       20,0,21,0,4,
-       0,5,0,18,0,
-       19,0,1,0,2,0,
-       3,0,15,0,16,
-       0,17,0,11,0,
-       2,1,0>>].
-
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 9118e4b7e3..dcdea6beb5 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -70,6 +70,9 @@ all_versions_tests() ->
      erlang_server_openssl_client,
      erlang_client_openssl_server_dsa_cert,
      erlang_server_openssl_client_dsa_cert,
+     erlang_client_openssl_server_anon,
+     erlang_server_openssl_client_anon,
+     erlang_server_openssl_client_anon_with_cert,
      erlang_server_openssl_client_reuse_session,
      erlang_client_openssl_server_renegotiate,
      erlang_client_openssl_server_nowrap_seqnum,
@@ -89,6 +92,9 @@ dtls_all_versions_tests() ->
      erlang_server_openssl_client,
      erlang_client_openssl_server_dsa_cert,
      erlang_server_openssl_client_dsa_cert,
+     erlang_client_openssl_server_anon,
+     erlang_server_openssl_client_anon,
+     erlang_server_openssl_client_anon_with_cert,
      erlang_server_openssl_client_reuse_session,
      erlang_client_openssl_server_renegotiate,
      erlang_client_openssl_server_nowrap_seqnum,
@@ -143,10 +149,15 @@ init_per_suite(Config0) ->
 	    try crypto:start() of
 		ok ->
                     ssl_test_lib:clean_start(),
-                  
-                    Config1 = ssl_test_lib:make_rsa_cert(Config0),
-                    Config2 = ssl_test_lib:make_dsa_cert(Config1),
-                    ssl_test_lib:cipher_restriction(Config2)
+                    Config = 
+                        case ssl_test_lib:openssl_dsa_support() of
+                            true ->
+                                Config1 = ssl_test_lib:make_rsa_cert(Config0),
+                                ssl_test_lib:make_dsa_cert(Config1);
+                            false ->
+                                ssl_test_lib:make_rsa_cert(Config0)
+                        end,
+                    ssl_test_lib:cipher_restriction(Config)
 		catch _:_  ->
 		    {skip, "Crypto did not start"}
 	    end
@@ -199,15 +210,27 @@ init_per_testcase(expired_session, Config) ->
     ssl:start(),
     Config;
 
-init_per_testcase(TestCase, Config) when TestCase == ciphers_rsa_signed_certs;
-					 TestCase == ciphers_dsa_signed_certs ->
-    ct:timetrap({seconds, 60}),
-    special_init(TestCase, Config);
-
+init_per_testcase(TestCase, Config) when 
+      TestCase == ciphers_dsa_signed_certs;
+      TestCase ==  erlang_client_openssl_server_dsa_cert;
+      TestCase == erlang_server_openssl_client_dsa_cert;
+      TestCase == erlang_client_openssl_server_dsa_cert;
+      TestCase ==  erlang_server_openssl_client_dsa_cert ->
+    case ssl_test_lib:openssl_dsa_support() of
+        true ->
+            special_init(TestCase, Config);
+        false ->
+           {skip, "DSA not supported by OpenSSL"}
+    end; 
 init_per_testcase(TestCase, Config) ->
-    ct:timetrap({seconds, 20}),
+    ct:timetrap({seconds, 35}),
     special_init(TestCase, Config).
 
+special_init(TestCase, Config) when 
+      TestCase == ciphers_rsa_signed_certs;
+      TestCase == ciphers_dsa_signed_certs->
+    ct:timetrap({seconds, 90}),
+    Config;
 special_init(TestCase, Config)
   when TestCase == erlang_client_openssl_server_renegotiate;
        TestCase == erlang_client_openssl_server_nowrap_seqnum;
@@ -533,7 +556,121 @@ erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
     ssl_test_lib:close_port(OpenSslPort),
     process_flag(trap_exit, false).
 
-%%-------------------------------------------------------------------- 
+%%--------------------------------------------------------------------
+erlang_client_openssl_server_anon() ->
+    [{doc,"Test erlang client with openssl server, anonymous"}].
+erlang_client_openssl_server_anon(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    %% OpenSSL expects a certificate and key, even if the cipher spec
+    %% is restructed to aNULL, so we use 'server_rsa_opts' here
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_anon_opts, Config),
+    VersionTuple = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers = ssl_test_lib:anonymous_suites(VersionTuple),
+
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    Port = ssl_test_lib:inet_port(node()),
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    KeyFile = proplists:get_value(keyfile, ServerOpts),
+    Version = ssl_test_lib:protocol_version(Config),
+    Exe = "openssl",
+    Args = ["s_server", "-accept", integer_to_list(Port),
+	    ssl_test_lib:version_flag(Version),
+            "-cert", CertFile, "-key", KeyFile,
+	    "-cipher", "aNULL", "-msg"],
+
+    OpensslPort =  ssl_test_lib:portable_open_port(Exe, Args),
+
+    ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE,
+					       erlang_ssl_receive, [Data]}},
+					{options, [{ciphers, Ciphers} | ClientOpts]}]),
+
+    true = port_command(OpensslPort, Data),
+
+    ssl_test_lib:check_result(Client, ok),
+
+    %% Clean close down!   Server needs to be closed first !!
+    ssl_test_lib:close_port(OpensslPort),
+    ssl_test_lib:close(Client),
+    process_flag(trap_exit, false),
+    ok.
+%%--------------------------------------------------------------------
+erlang_server_openssl_client_anon() ->
+    [{doc,"Test erlang server with openssl client, anonymous"}].
+erlang_server_openssl_client_anon(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_anon_opts, Config),
+    VersionTuple = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers = ssl_test_lib:anonymous_suites(VersionTuple),
+
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                                       {from, self()},
+                                       {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+                                       {options, [{ciphers, Ciphers} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Version = ssl_test_lib:protocol_version(Config),
+    Exe = "openssl",
+    Args = ["s_client", "-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
+	    ssl_test_lib:version_flag(Version),
+	    "-cipher", "aNULL", "-msg"],
+
+    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),
+    true = port_command(OpenSslPort, Data),
+
+    ssl_test_lib:check_result(Server, ok),
+
+    %% Clean close down!   Server needs to be closed first !!
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close_port(OpenSslPort),
+    process_flag(trap_exit, false).
+
+  %%--------------------------------------------------------------------
+  erlang_server_openssl_client_anon_with_cert() ->
+    [{doc,"Test erlang server with openssl client, anonymous (with cert)"}].
+  erlang_server_openssl_client_anon_with_cert(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    VersionTuple = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers = ssl_test_lib:anonymous_suites(VersionTuple),
+
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                                       {from, self()},
+                                       {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+                                       {options, [{ciphers, Ciphers} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Version = ssl_test_lib:protocol_version(Config),
+    Exe = "openssl",
+    Args = ["s_client", "-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
+  	    ssl_test_lib:version_flag(Version),
+  	    "-cipher", "aNULL", "-msg"],
+
+    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),
+    true = port_command(OpenSslPort, Data),
+
+    ssl_test_lib:check_result(Server, ok),
+
+    %% Clean close down!   Server needs to be closed first !!
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close_port(OpenSslPort),
+    process_flag(trap_exit, false).
+
+%%--------------------------------------------------------------------
 
 erlang_server_openssl_client_reuse_session() ->
     [{doc, "Test erlang server with openssl client that reconnects with the"
@@ -1016,7 +1153,7 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
     
     ct:log("Ports ~p~n", [[erlang:port_info(P) || P <- erlang:ports()]]), 
     consume_port_exit(OpenSslPort),
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "handshake failure"}}),
+    ssl_test_lib:check_result(Server, {error, {tls_alert, "bad record mac"}}),
     process_flag(trap_exit, false).
 %%--------------------------------------------------------------------
 ssl2_erlang_server_openssl_client_comp() ->
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index bb77326751..2650399eea 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 8.2.1
+SSL_VSN = 8.2.3
diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile
index 93eac8220d..af27efa6c1 100644
--- a/lib/stdlib/doc/src/Makefile
+++ b/lib/stdlib/doc/src/Makefile
@@ -98,13 +98,15 @@ XML_REF3_FILES = \
 	sys.xml \
 	timer.xml \
 	unicode.xml \
+	uri_string.xml \
 	win32reg.xml \
 	zip.xml
 
 XML_REF6_FILES = stdlib_app.xml
 
 XML_PART_FILES = part.xml
-XML_CHAPTER_FILES = io_protocol.xml unicode_usage.xml notes.xml notes_history.xml assert_hrl.xml
+XML_CHAPTER_FILES = introduction.xml io_protocol.xml unicode_usage.xml \
+	notes.xml assert_hrl.xml
 
 BOOK_FILES = book.xml
 
diff --git a/lib/stdlib/doc/src/assert_hrl.xml b/lib/stdlib/doc/src/assert_hrl.xml
index ea23cca2ee..33f29f38da 100644
--- a/lib/stdlib/doc/src/assert_hrl.xml
+++ b/lib/stdlib/doc/src/assert_hrl.xml
@@ -93,7 +93,7 @@ erlc -DNOASSERT=true *.erl</code>
     <taglist>
       <tag><c>assert(BoolExpr)</c></tag>
       <item></item>
-      <tag><c>URKAassert(BoolExpr, Comment)</c></tag>
+      <tag><c>assert(BoolExpr, Comment)</c></tag>
       <item>
         <p>Tests that <c>BoolExpr</c> completes normally returning
           <c>true</c>.</p>
diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml
index 5332d7aba5..db96beed6c 100644
--- a/lib/stdlib/doc/src/digraph.xml
+++ b/lib/stdlib/doc/src/digraph.xml
@@ -170,6 +170,10 @@
         <p>If the edge would create a cycle in
           an <seealso marker="#acyclic_digraph">acyclic digraph</seealso>,
           <c>{error,&nbsp;{bad_edge,&nbsp;<anno>Path</anno>}}</c> is returned.
+          If <c><anno>G</anno></c> already has an edge with value
+          <c><anno>E</anno></c> connecting a different pair of vertices,
+          <c>{error,&nbsp;{bad_edge,&nbsp;[<anno>V1</anno>,&nbsp;<anno>V2</anno>]}}</c>
+          is returned.
           If either of <c><anno>V1</anno></c> or <c><anno>V2</anno></c> is not
           a vertex of digraph <c><anno>G</anno></c>,
           <c>{error,&nbsp;{bad_vertex,&nbsp;</c><anno>V</anno><c>}}</c> is
diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml
index 337028568a..14c543ee2b 100644
--- a/lib/stdlib/doc/src/erl_tar.xml
+++ b/lib/stdlib/doc/src/erl_tar.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2017</year>
+      <year>2003</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -136,6 +136,9 @@
         <v>Filename = filename()|{NameInArchive,FilenameOrBin}</v>
         <v>Options = [Option]</v>
         <v>Option = dereference|verbose|{chunks,ChunkSize}</v>
+           <v>|{atime,non_neg_integer()}|{mtime,non_neg_integer()}</v>
+           <v>|{ctime,non_neg_integer()}|{uid,non_neg_integer()}</v>
+           <v>|{gid,non_neg_integer()}</v>
         <v>ChunkSize = positive_integer()</v>
         <v>RetValue = ok|{error,{Filename,Reason}}</v>
         <v>Reason = term()</v>
@@ -167,6 +170,42 @@
               <seealso marker="ssh:ssh_sftp#open_tar/3">
               <c>ssh_sftp:open_tar/3</c></seealso>.</p>
           </item>
+          <tag><c>{atime,non_neg_integer()}</c></tag>
+          <item>
+            <p>Sets the last time, as
+	            <seealso marker="erts:time_correction#POSIX_Time">
+              POSIX time</seealso>, when the file was read. See also
+              <seealso marker="kernel:file#read_file_info/1">
+              <c>file:read_file_info/1</c></seealso>.</p>
+          </item>
+          <tag><c>{mtime,non_neg_integer()}</c></tag>
+          <item>
+            <p>Sets the last time, as
+	            <seealso marker="erts:time_correction#POSIX_Time">
+              POSIX time</seealso>, when the file was written. See also
+              <seealso marker="kernel:file#read_file_info/1">
+              <c>file:read_file_info/1</c></seealso>.</p>
+          </item>
+          <tag><c>{ctime,non_neg_integer()}</c></tag>
+          <item>
+            <p>Sets the time, as
+	            <seealso marker="erts:time_correction#POSIX_Time">
+              POSIX time</seealso>, when the file was created. See also
+              <seealso marker="kernel:file#read_file_info/1">
+              <c>file:read_file_info/1</c></seealso>.</p>
+          </item>
+          <tag><c>{uid,non_neg_integer()}</c></tag>
+          <item>
+            <p>Sets the file owner.
+              <seealso marker="kernel:file#read_file_info/1">
+              <c>file:read_file_info/1</c></seealso>.</p>
+          </item>
+          <tag><c>{gid,non_neg_integer()}</c></tag>
+          <item>
+            <p>Sets the group that the file owner belongs to.
+              <seealso marker="kernel:file#read_file_info/1">
+              <c>file:read_file_info/1</c></seealso>.</p>
+          </item>
         </taglist>
       </desc>
     </func>
@@ -378,7 +417,7 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Cconverts an error reason term to a human-readable error message
+        <p>Converts an error reason term to a human-readable error message
           string.</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 576959b1c8..305376a425 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -487,6 +487,11 @@ Error: fun containing local Erlang function calls
             <p>The pid of the heir of the table, or <c>none</c> if no heir
               is set.</p>
           </item>
+          <tag><c>{id,</c><seealso marker="#type-tid">
+              <c>tid()</c></seealso><c>}</c></tag>
+          <item>
+            <p>The table identifier.</p>
+          </item>
           <tag><c>{keypos, integer() >= 1}</c></tag>
           <item>
             <p>The key position.</p>
@@ -963,11 +968,11 @@ ets:is_compiled_ms(Broken).</code>
     <func>
       <name name="match_spec_run" arity="2"/>
       <fsummary>Perform matching, using a compiled match specification on a
-        list of tuples.</fsummary>
+        list of terms.</fsummary>
       <desc>
         <p>Executes the matching specified in a compiled
           <seealso marker="#match_spec">match specification</seealso> on a list
-          of tuples. Term <c><anno>CompiledMatchSpec</anno></c> is to be
+          of terms. Term <c><anno>CompiledMatchSpec</anno></c> is to be
           the result of a call to <seealso marker="#match_spec_compile/1">
           <c>match_spec_compile/1</c></seealso> and is hence the internal
           representation of the match specification one wants to use.</p>
@@ -985,7 +990,7 @@ Table = ets:new...
 MatchSpec = ...
 % The following call...
 ets:match_spec_run(ets:tab2list(Table),
-ets:match_spec_compile(MatchSpec)),
+                   ets:match_spec_compile(MatchSpec)),
 % ...gives the same result as the more common (and more efficient)
 ets:select(Table, MatchSpec),</code>
         <note>
@@ -1074,10 +1079,13 @@ ets:select(Table, MatchSpec),</code>
           </item>
           <tag><c>named_table</c></tag>
           <item>
-            <p>If this option is present, name <c><anno>Name</anno></c> is
-              associated with the table identifier. The name can then
-              be used instead of the table identifier in subsequent
-              operations.</p>
+            <p>If this option is present, the table is registered under its
+              <c><anno>Name</anno></c> which can then be used instead of the
+              table identifier in subsequent operations.</p>
+            <p>The function will also return the <c><anno>Name</anno></c>
+              instead of the table identifier. To get the table identifier of a
+              named table, use
+              <seealso marker="#whereis/1"><c>whereis/1</c></seealso>.</p>
           </item>
           <tag><c>{keypos,<anno>Pos</anno>}</c></tag>
           <item>
@@ -1961,7 +1969,7 @@ true</pre>
           The return value is a list of the new counter values from each 
           update operation in the same order as in the operation list. If an 
           empty list is specified, nothing is updated and an empty list is 
-          returned. If the function fails, no updates is done.</p>
+          returned. If the function fails, no updates are done.</p>
         <p>The specified <c><anno>Key</anno></c> is used to identify the object
           by either <em>matching</em> the key of an object in a <c>set</c>
           table, or <em>compare equal</em> to the key of an object in an
@@ -2037,6 +2045,21 @@ true</pre>
         </list>
       </desc>
     </func>
+
+    <func>
+      <name name="whereis" arity="1"/>
+      <fsummary>Retrieves the tid() of a named table.</fsummary>
+      <desc>
+        <p>This function returns the
+          <seealso marker="#type-tid"><c>tid()</c></seealso> of the named table
+          identified by <c><anno>TableName</anno></c>, or <c>undefined</c> if
+          no such table exists. The <c>tid()</c> can be used in place of the
+          table name in all operations, which is slightly faster since the name
+          does not have to be resolved on each call.</p>
+        <p>If the table is deleted, the <c>tid()</c> will be invalid even if
+          another named table is created with the same name.</p>
+      </desc>
+    </func>
   </funcs>
 </erlref>
 
diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml
index 5e631aac21..3b5be75bc0 100644
--- a/lib/stdlib/doc/src/filelib.xml
+++ b/lib/stdlib/doc/src/filelib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2017</year>
+      <year>2003</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -296,7 +296,7 @@ filelib:wildcard("lib/**/*.{erl,hrl}")</code>
         for a file with the extension <c>.beam</c>, the default rule is to
         look for a file with a corresponding extension <c>.erl</c> by
         replacing the suffix <c>"ebin"</c> of the object directory path with
-        <c>"src"</c>.
+        <c>"src"</c> or <c>"src/*"</c>.
         The file search is done through <seealso
         marker="#find_file/3"><c>find_file/3</c></seealso>. The directory of
         the object file is always tried before any other directory specified
diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml
index d2608ad542..ce19f70df0 100644
--- a/lib/stdlib/doc/src/filename.xml
+++ b/lib/stdlib/doc/src/filename.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2017</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -399,15 +399,18 @@ true
           tuples <c>{<anno>BinSuffix</anno>, <anno>SourceSuffix</anno>}</c> and
           is interpreted as follows: if the end of the directory name where the
           object is located matches <c><anno>BinSuffix</anno></c>, then the
-          source code directory has the same name, but with
-          <c><anno>BinSuffix</anno></c> replaced by
-          <c><anno>SourceSuffix</anno></c>. <c><anno>Rules</anno></c> defaults
+	  name created by replacing <c><anno>BinSuffix</anno></c> with
+          <c><anno>SourceSuffix</anno></c> is expanded by calling
+	  <seealso marker="filelib#wildcard/1">
+	  <c>filelib:wildcard/1</c></seealso>.
+	  If a regular file is found among the matches, the function
+	  returns that location together with <c><anno>Options</anno></c>.
+          Otherwise the next rule is tried, and so on.</p>
+        <p><c><anno>Rules</anno></c> defaults
           to:</p>
         <code type="none">
-[{"", ""}, {"ebin", "src"}, {"ebin", "esrc"}]</code>
-        <p>If the source file is found in the resulting directory, the function
-          returns that location together with <c><anno>Options</anno></c>.
-          Otherwise the next rule is tried, and so on.</p>
+[{"", ""}, {"ebin", "src"}, {"ebin", "esrc"},
+ {"ebin", "src/*"}, {"ebin", "esrc/*"}]</code>
         <p>The function returns <c>{<anno>SourceFile</anno>,
           <anno>Options</anno>}</c> if it succeeds.
           <c><anno>SourceFile</anno></c> is the absolute path to the source
diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index 4a824f073e..be0d64feba 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2016</year><year>2017</year>
+      <year>2016</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -543,7 +543,23 @@ handle_event(_, _, State, Data) ->
       <name name="event_type"/>
       <desc>
 	<p>
-	  External events are of three types:
+	  There are 3 categories of events:
+	  <seealso marker="#type-external_event_type">external</seealso>,
+	  <seealso marker="#type-timeout_event_type">timeout</seealso>,
+	  and <c>internal</c>.
+	</p>
+	<p>
+	  <c>internal</c> events can only be generated by the
+	  state machine itself through the state transition action
+	  <seealso marker="#type-action"><c>next_event</c></seealso>.
+	</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="external_event_type"/>
+      <desc>
+	<p>
+	  External events are of 3 types:
 	  <c>{call,<anno>From</anno>}</c>, <c>cast</c>, or <c>info</c>.
 	  <seealso marker="#call/2">Calls</seealso>
 	  (synchronous) and
@@ -551,12 +567,17 @@ handle_event(_, _, State, Data) ->
 	  originate from the corresponding API functions.
 	  For calls, the event contains whom to reply to.
 	  Type <c>info</c> originates from regular process messages sent
-	  to the <c>gen_statem</c>. The state machine
-	  implementation can, in addition to the above,
-	  generate
-	  <seealso marker="#type-event_type"><c>events of types</c></seealso>
-	  <c>timeout</c>, <c>{timeout,<anno>Name</anno>}</c>,
-	  <c>state_timeout</c>, and <c>internal</c> to itself.
+	  to the <c>gen_statem</c>.
+	</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="timeout_event_type"/>
+      <desc>
+	<p>
+	  There are 3 types of timeout events that the state machine
+	  can generate for itself with the corresponding
+	  <seealso marker="#type-timeout_action">timeout_action()</seealso>s.
 	</p>
       </desc>
     </datatype>
@@ -1026,6 +1047,25 @@ handle_event(_, _, State, Data) ->
 	      for this state transition.
 	    </p>
 	  </item>
+	</taglist>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="timeout_action"/>
+      <desc>
+	<p>
+	  These state transition actions can be invoked by
+	  returning them from the
+	  <seealso marker="#state callback">state callback</seealso>, from
+	  <seealso marker="#Module:init/1"><c>Module:init/1</c></seealso>
+	  or by giving them to
+	  <seealso marker="#enter_loop/5"><c>enter_loop/5,6</c></seealso>.
+	</p>
+	<p>
+	  These timeout actions sets timeout
+	  <seealso marker="#type-transition_option">transition options</seealso>.
+	</p>
+	<taglist>
 	  <tag><c>Timeout</c></tag>
 	  <item>
 	    <p>
diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml
index 64fcf4379f..f1037ec76b 100644
--- a/lib/stdlib/doc/src/io.xml
+++ b/lib/stdlib/doc/src/io.xml
@@ -137,11 +137,11 @@
 Hello world!
 ok</pre>
         <p>The general format of a control sequence is <c>~F.P.PadModC</c>.</p>
-        <p>Character <c>C</c> determines the type of control sequence
-          to be used, <c>F</c> and <c>P</c> are optional numeric
-          arguments. If <c>F</c>, <c>P</c>, or <c>Pad</c> is <c>*</c>,
-          the next argument in <c>Data</c> is used as the numeric value
-          of <c>F</c> or <c>P</c>.</p>
+        <p>The character <c>C</c> determines the type of control sequence
+          to be used. It is the only required field. All of <c>F</c>,
+          <c>P</c>, <c>Pad</c>, and <c>Mod</c> are optional. For example,
+          to use a <c>#</c> for <c>Pad</c> but use the default values for
+          <c>F</c> and <c>P</c>, you can write <c>~..#C</c>.</p>
         <list type="bulleted">
         <item>
           <p><c>F</c> is the <c>field width</c> of the printed argument. A
@@ -167,13 +167,26 @@ ok</pre>
             The default padding character is <c>' '</c> (space).</p>
         </item>
         <item>
-          <p><c>Mod</c> is the control sequence modifier. It is either a
-            single character (<c>t</c>, for Unicode
-            translation, and <c>l</c>, for stopping <c>p</c> and
-            <c>P</c> from detecting printable characters)
-            that changes the interpretation of <c>Data</c>.</p>
+          <p><c>Mod</c> is the control sequence modifier. This is
+            one or more characters that change the interpretation of
+            <c>Data</c>. The current modifiers are <c>t</c>, for Unicode
+            translation, and <c>l</c>, for stopping <c>p</c> and <c>P</c>
+            from detecting printable characters.</p>
         </item>
       </list>
+        <p>If <c>F</c>, <c>P</c>, or <c>Pad</c> is a <c>*</c> character,
+        the next argument in <c>Data</c> is used as the value.
+        For example:</p>
+        <pre>
+1> <input>io:fwrite("~*.*.0f~n",[9, 5, 3.14159265]).</input>
+003.14159
+ok</pre>
+        <p>To use a literal <c>*</c> character as <c>Pad</c>, it must be
+          passed as an argument:</p>
+        <pre>
+2> <input>io:fwrite("~*.*.*f~n",[9, 5, $*, 3.14159265]).</input>
+**3.14159
+ok</pre>
         <p><em>Available control sequences:</em></p>
         <taglist>
           <tag><c>~</c></tag>
@@ -257,8 +270,9 @@ ok</pre>
 \x{400}
 ok
 5> <input>io:fwrite("~s~n",[[1024]]).</input>
-** exception exit: {badarg,[{io,format,[&lt;0.26.0&gt;,"~s~n",[[1024]]]},
-   ...</pre>
+** exception error: bad argument
+     in function  io:format/3
+        called as io:format(&lt;0.53.0>,"~s~n",[[1024]])</pre>
           </item>
           <tag><c>w</c></tag>
           <item>
@@ -276,10 +290,9 @@ ok
               <c>~w</c>, but breaks terms whose printed representation
               is longer than one line into many lines and indents each
               line sensibly. Left-justification is not supported.
-              It also tries to detect lists of
-              printable characters and to output these as strings. The
-              Unicode translation modifier is used for determining
-              what characters are printable, for example:</p>
+              It also tries to detect flat lists of
+              printable characters and output these as strings.
+              For example:</p>
             <pre>
 1> <input>T = [{attributes,[[{id,age,1.50000},{mode,explicit},</input>
 <input>{typename,"INTEGER"}], [{id,cho},{mode,explicit},{typename,'Cho'}]]},</input>
@@ -301,7 +314,7 @@ ok
  {mode,implicit}]
 ok</pre>
             <p>The field width specifies the maximum line length.
-              Defaults to 80. The precision specifies the initial
+              It defaults to 80. The precision specifies the initial
               indentation of the term. It defaults to the number of
               characters printed on this line in the <em>same</em> call to
               <seealso marker="#write/1"><c>write/1</c></seealso> or
@@ -331,18 +344,53 @@ ok
 [{a,[97]},
  {b,[98]}]
 ok</pre>
-            <p>Binaries that look like UTF-8 encoded strings are
-              output with the string syntax if the Unicode translation
-              modifier is specified:</p>
+            <p>The Unicode translation modifier <c>t</c> specifies how to treat
+              characters outside the Latin-1 range of codepoints, in
+              atoms, strings, and binaries. For example, printing an atom
+              containing a character &gt; 255:</p>
+            <pre>
+8> <input>io:fwrite("~p~n",[list_to_atom([1024])]).</input>
+'\x{400}'
+ok
+9> <input>io:fwrite("~tp~n",[list_to_atom([1024])]).</input>
+'Ѐ'
+ok</pre>
+            <p>By default, Erlang only detects lists of characters
+              in the Latin-1 range as strings, but the <c>+pc unicode</c>
+              flag can be used to change this (see <seealso
+              marker="#printable_range/0">
+              <c>printable_range/0</c></seealso> for details). For example:</p>
+            <pre>
+10> <input>io:fwrite("~p~n",[[214]]).</input>
+"Ö"
+ok
+11> <input>io:fwrite("~p~n",[[1024]]).</input>
+[1024]
+ok
+12> <input>io:fwrite("~tp~n",[[1024]]).</input>
+[1024]
+ok
+</pre>
+            <p>but if Erlang was started with <c>+pc unicode</c>:</p>
             <pre>
-9> <input>io:fwrite("~p~n",[[1024]]).</input>
+13> <input>io:fwrite("~p~n",[[1024]]).</input>
 [1024]
-10> <input>io:fwrite("~tp~n",[[1024]]).</input>
-"\x{400}"
-11> <input>io:fwrite("~tp~n", [&lt;&lt;128,128&gt;&gt;]).</input>
+ok
+14> <input>io:fwrite("~tp~n",[[1024]]).</input>
+"Ѐ"
+ok</pre>
+            <p>Similarly, binaries that look like UTF-8 encoded strings
+              are output with the binary string syntax if the <c>t</c>
+              modifier is specified:</p>
+            <pre>
+15> <input>io:fwrite("~p~n", [&lt;&lt;208,128&gt;&gt;]).</input>
+&lt;&lt;208,128&gt;&gt;
+ok
+16> <input>io:fwrite("~tp~n", [&lt;&lt;208,128&gt;&gt;]).</input>
+&lt;&lt;"Ѐ"/utf8&gt;&gt;
+ok
+17> <input>io:fwrite("~tp~n", [&lt;&lt;128,128&gt;&gt;]).</input>
 &lt;&lt;128,128&gt;&gt;
-12> <input>io:fwrite("~tp~n", [&lt;&lt;208,128&gt;&gt;]).</input>
-&lt;&lt;"\x{400}"/utf8&gt;&gt;
 ok</pre>
           </item>
           <tag><c>W</c></tag>
@@ -454,12 +502,9 @@ ok</pre>
 abc def 'abc def'  {foo,1} A
 ok
 2> <input>io:fwrite("~s", [65]).</input>
-** exception exit: {badarg,[{io,format,[&lt;0.22.0>,"~s","A"]},
-                            {erl_eval,do_apply,5},
-                            {shell,exprs,6},
-                            {shell,eval_exprs,6},
-                            {shell,eval_loop,3}]}
-     in function  io:o_request/2</pre>
+** exception error: bad argument
+     in function  io:format/3
+        called as io:format(&lt;0.53.0>,"~s","A")</pre>
         <p>In this example, an attempt was made to output the single
           character 65 with the aid of the string formatting directive
           <c>"~s"</c>.</p>
diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml
index 8c7270816b..987d92989d 100644
--- a/lib/stdlib/doc/src/maps.xml
+++ b/lib/stdlib/doc/src/maps.xml
@@ -33,16 +33,31 @@
     <p>This module contains functions for maps processing.</p>
   </description>
 
+  <datatypes>
+    <datatype>
+      <name name="iterator"/>
+      <desc>
+        <p>An iterator representing the key value associations in a map.</p>
+        <p>Created using <seealso marker="#iterator-1"><c>maps:iterator/1</c></seealso>.</p>
+        <p>Consumed by <seealso marker="#next-1"><c>maps:next/1</c></seealso>,
+          <seealso marker="#filter-2"><c>maps:filter/2</c></seealso>,
+          <seealso marker="#fold-3"><c>maps:fold/3</c></seealso> and
+          <seealso marker="#map-2"><c>maps:map/2</c></seealso>.</p>
+      </desc>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
       <name name="filter" arity="2"/>
       <fsummary>Select pairs that satisfy a predicate.</fsummary>
       <desc>
-        <p>Returns a map <c><anno>Map2</anno></c> for which predicate
-          <c><anno>Pred</anno></c> holds true in <c><anno>Map1</anno></c>.</p>
+        <p>Returns a map <c><anno>Map</anno></c> for which predicate
+          <c><anno>Pred</anno></c> holds true in <c><anno>MapOrIter</anno></c>.</p>
         <p>The call fails with a <c>{badmap,Map}</c> exception if
-          <c><anno>Map1</anno></c> is not a map, or with <c>badarg</c> if
-          <c><anno>Pred</anno></c> is not a function of arity 2.</p>
+          <c><anno>MapOrIter</anno></c> is not a map or valid iterator,
+          or with <c>badarg</c> if <c><anno>Pred</anno></c> is not a
+          function of arity 2.</p>
         <p><em>Example:</em></p>
         <code type="none">
 > M = #{a => 2, b => 3, c=> 4, "a" => 1, "b" => 2, "c" => 4},
@@ -76,12 +91,16 @@
       <fsummary></fsummary>
       <desc>
         <p>Calls <c>F(K, V, AccIn)</c> for every <c><anno>K</anno></c> to value
-          <c><anno>V</anno></c> association in <c><anno>Map</anno></c> in
+          <c><anno>V</anno></c> association in <c><anno>MapOrIter</anno></c> in
           any order. Function <c>fun F/3</c> must return a new
           accumulator, which is passed to the next successive call.
           This function returns the final value of the accumulator. The initial
           accumulator value <c><anno>Init</anno></c> is returned if the map is
           empty.</p>
+        <p>The call fails with a <c>{badmap,Map}</c> exception if
+          <c><anno>MapOrIter</anno></c> is not a map or valid iterator,
+          or with <c>badarg</c> if <c><anno>Fun</anno></c> is not a
+          function of arity 3.</p>
         <p><em>Example:</em></p>
         <code type="none">
 > Fun = fun(K,V,AccIn) when is_list(K) -> AccIn + V end,
@@ -169,6 +188,32 @@ false</code>
     </func>
 
     <func>
+      <name name="iterator" arity="1"/>
+      <fsummary>Create a map iterator.</fsummary>
+      <desc>
+        <p>Returns a map iterator <c><anno>Iterator</anno></c> that can
+          be used by <seealso marker="#next-1"><c>maps:next/1</c></seealso>
+          to traverse the key-value associations in a map. When iterating
+          over a map, the memory usage is guaranteed to be bounded no matter
+          the size of the map.</p>
+        <p>The call fails with a <c>{badmap,Map}</c> exception if
+          <c><anno>Map</anno></c> is not a map.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> M = #{ a => 1, b => 2 }.
+#{a => 1,b => 2}
+> I = maps:iterator(M).
+[{a,1},{b,2}]
+> {K1, V1, I2} = maps:next(I).
+{a,1,[{b,2}]}
+> {K2, V2, I3} = maps:next(I2).
+{b,2,[]}
+> maps:next(I3).
+none</code>
+      </desc>
+    </func>
+
+    <func>
       <name name="keys" arity="1"/>
       <fsummary></fsummary>
       <desc>
@@ -188,12 +233,16 @@ false</code>
       <name name="map" arity="2"/>
       <fsummary></fsummary>
       <desc>
-        <p>Produces a new map <c><anno>Map2</anno></c> by calling function
+        <p>Produces a new map <c><anno>Map</anno></c> by calling function
           <c>fun F(K, V1)</c> for every <c><anno>K</anno></c> to value
-          <c><anno>V1</anno></c> association in <c><anno>Map1</anno></c> in
+          <c><anno>V1</anno></c> association in <c><anno>MapOrIter</anno></c> in
           any order. Function <c>fun F/2</c> must return value
           <c><anno>V2</anno></c> to be associated with key <c><anno>K</anno></c>
-          for the new map <c><anno>Map2</anno></c>.</p>
+          for the new map <c><anno>Map</anno></c>.</p>
+        <p>The call fails with a <c>{badmap,Map}</c> exception if
+          <c><anno>MapOrIter</anno></c> is not a map or valid iterator,
+          or with <c>badarg</c> if <c><anno>Fun</anno></c> is not a
+          function of arity 2.</p>
         <p><em>Example:</em></p>
         <code type="none">
 > Fun = fun(K,V1) when is_list(K) -> V1*2 end,
@@ -234,6 +283,35 @@ false</code>
     </func>
 
     <func>
+      <name name="next" arity="1"/>
+      <fsummary>Get the next key and value from an iterator.</fsummary>
+      <desc>
+        <p>Returns the next key-value association in
+          <c><anno>Iterator</anno></c> and a new iterator for the
+          remaining associations in the iterator.
+        </p>
+        <p>
+          If there are no more associations in the iterator,
+          <c>none</c> is returned.
+        </p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> Map = #{a => 1, b => 2, c => 3}.
+#{a => 1,b => 2,c => 3}
+> Iter = maps:iterator(Map).
+[{a,1},{b,2},{c,3}]
+> {_, _, Iter1} = maps:next(Iter).
+{a,1,[{b,2},{c,3}]}
+> {_, _, Iter2} = maps:next(Iter1).
+{b,2,[{c,3}]}
+> {_, _, Iter3} = maps:next(Iter2).
+{c,3,[]}
+> maps:next(Iter3).
+none</code>
+      </desc>
+    </func>
+
+    <func>
       <name name="put" arity="3"/>
       <fsummary></fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index d396f1de8f..b61e5b9b9e 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,49 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 3.4.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Make <c>ets:i/1</c> exit cleaner when ^D is input
+	    while browsing a table. Only the old Erlang shell is
+	    affected (<c>erl(1)</c> flag <c>-oldshell</c>). </p>
+          <p>
+	    Own Id: OTP-14663</p>
+        </item>
+        <item>
+          <p>
+	    Fixed handling of windows UNC paths in module
+	    <c>filename</c>.</p>
+          <p>
+	    Own Id: OTP-14693</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improve performance of the new string functionality when
+	    handling ASCII characters.</p>
+          <p>
+	    Own Id: OTP-14670</p>
+        </item>
+        <item>
+          <p>
+	    Added a clarification to the documentation of
+	    <c>unicode:characters_to_list/2</c>.</p>
+          <p>
+	    Own Id: OTP-14798</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml
index 878a3babc5..68bfddbc71 100644
--- a/lib/stdlib/doc/src/ref_man.xml
+++ b/lib/stdlib/doc/src/ref_man.xml
@@ -93,6 +93,7 @@
   <xi:include href="sys.xml"/>
   <xi:include href="timer.xml"/>
   <xi:include href="unicode.xml"/>
+  <xi:include href="uri_string.xml"/>
   <xi:include href="win32reg.xml"/>
   <xi:include href="zip.xml"/>
 </application>
diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml
index 45b207b13d..d559adf9b6 100644
--- a/lib/stdlib/doc/src/specs.xml
+++ b/lib/stdlib/doc/src/specs.xml
@@ -60,6 +60,7 @@
   <xi:include href="../specs/specs_sys.xml"/>
   <xi:include href="../specs/specs_timer.xml"/>
   <xi:include href="../specs/specs_unicode.xml"/>
+  <xi:include href="../specs/specs_uri_string.xml"/>
   <xi:include href="../specs/specs_win32reg.xml"/>
   <xi:include href="../specs/specs_zip.xml"/>
 </specs>
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index fcaccdb2cb..350847bf7d 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -270,7 +270,7 @@
           <item>
             <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
               <anno>Arguments</anno>)</c> and measures the elapsed real time as 
-              reported by <seealso marker="os:timestamp/0">
+              reported by <seealso marker="kernel:os#timestamp/0">
               <c>os:timestamp/0</c></seealso>.</p>
             <p>Returns <c>{<anno>Time</anno>, <anno>Value</anno>}</c>, where
               <c><anno>Time</anno></c> is the elapsed real time in
diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml
index e86f45431f..d822aca89c 100644
--- a/lib/stdlib/doc/src/unicode.xml
+++ b/lib/stdlib/doc/src/unicode.xml
@@ -239,8 +239,13 @@
               <c><anno>InEncoding</anno></c>.</p>
           </item>
         </list>
-        <p>Only when <c><anno>InEncoding</anno></c> is one of the UTF
-          encodings, integers in the list are allowed to be &gt; 255.</p>
+	<p>
+	  Note that integers in the list always represent code points
+	  regardless of <c><anno>InEncoding</anno></c> passed. If
+	  <c><anno>InEncoding</anno> latin1</c> is passed, only code
+	  points &lt; 256 are allowed; otherwise, all valid unicode code
+	  points are allowed.
+	</p>
         <p>If <c><anno>InEncoding</anno></c> is <c>latin1</c>, parameter
           <c><anno>Data</anno></c> corresponds to the <c>iodata()</c> type,
           but for <c>unicode</c>, parameter <c><anno>Data</anno></c> can
diff --git a/lib/stdlib/doc/src/uri_string.xml b/lib/stdlib/doc/src/uri_string.xml
new file mode 100644
index 0000000000..88d4600611
--- /dev/null
+++ b/lib/stdlib/doc/src/uri_string.xml
@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2017</year><year>2018</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>uri_string</title>
+    <prepared>Péter Dimitrov</prepared>
+    <docno>1</docno>
+    <date>2018-02-07</date>
+    <rev>A</rev>
+  </header>
+  <module>uri_string</module>
+  <modulesummary>URI processing functions.</modulesummary>
+  <description>
+    <p>This module contains functions for parsing and handling URIs
+    (<url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>) and
+    form-urlencoded query strings (<url href="https://www.w3.org/TR/html52/">HTML 5.2</url>).
+    </p>
+    <p>
+    Parsing and serializing non-UTF-8 form-urlencoded query strings are also supported
+    (<url href="https://www.w3.org/TR/html50/">HTML 5.0</url>).
+    </p>
+    <p>A URI is an identifier consisting of a sequence of characters   matching the syntax
+    rule named <em>URI</em> in <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>.
+    </p>
+    <p>  The generic URI syntax consists of a hierarchical sequence of components referred
+    to as the scheme, authority, path, query, and fragment:</p>
+    <pre>
+    URI         = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+    hier-part   = "//" authority path-abempty
+                   / path-absolute
+                   / path-rootless
+                   / path-empty
+    scheme      = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+    authority   = [ userinfo "@" ] host [ ":" port ]
+    userinfo    = *( unreserved / pct-encoded / sub-delims / ":" )
+
+    reserved    = gen-delims / sub-delims
+    gen-delims  = ":" / "/" / "?" / "#" / "[" / "]" / "@"
+    sub-delims  = "!" / "$" / "&amp;" / "'" / "(" / ")"
+                / "*" / "+" / "," / ";" / "="
+
+    unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
+    </pre><br></br>
+    <p>The interpretation of a URI depends only on the characters used and not on how those
+    characters are represented in a network protocol.</p>
+    <p>The functions implemented by this module cover the following use cases:</p>
+    <list type="bulleted">
+      <item>Parsing URIs into its components and returing a map<br></br>
+      <seealso marker="#parse/1"><c>parse/1</c></seealso>
+      </item>
+      <item>Recomposing a map of URI components into a URI string<br></br>
+      <seealso marker="#recompose/1"><c>recompose/1</c></seealso>
+      </item>
+      <item>Changing inbound binary and percent-encoding of URIs<br></br>
+      <seealso marker="#transcode/2"><c>transcode/2</c></seealso>
+      </item>
+      <item>Transforming URIs into a normalized form<br></br>
+      <seealso marker="#normalize/1"><c>normalize/1</c></seealso><br></br>
+      <seealso marker="#normalize/2"><c>normalize/2</c></seealso>
+      </item>
+      <item>Composing form-urlencoded query strings from a list of key-value pairs<br></br>
+      <seealso marker="#compose_query/1"><c>compose_query/1</c></seealso><br></br>
+      <seealso marker="#compose_query/2"><c>compose_query/2</c></seealso>
+      </item>
+      <item>Dissecting form-urlencoded query strings into a list of key-value pairs<br></br>
+      <seealso marker="#dissect_query/1"><c>dissect_query/1</c></seealso>
+      </item>
+    </list>
+    <p>There are four different encodings present during the handling of URIs:</p>
+    <list type="bulleted">
+      <item>Inbound binary encoding in binaries</item>
+      <item>Inbound percent-encoding in lists and binaries</item>
+      <item>Outbound binary encoding in binaries</item>
+      <item>Outbound percent-encoding in lists and binaries</item>
+    </list>
+    <p>Functions with <c>uri_string()</c> argument accept lists, binaries and
+    mixed lists (lists with binary elements) as input type. All of the functions but
+    <c>transcode/2</c> expects input as lists of unicode codepoints, UTF-8 encoded binaries
+    and UTF-8 percent-encoded URI parts ("%C3%B6" corresponds to the unicode character "ö").</p>
+    <p>Unless otherwise specified the return value type and encoding are the same as the input
+    type and encoding. That is, binary input returns binary output, list input returns a list
+    output but mixed input returns list output.</p>
+    <p>In case of lists there is only percent-encoding. In binaries, however, both binary encoding
+    and percent-encoding shall be considered. <c>transcode/2</c> provides the means to convert
+    between the supported encodings, it takes a <c>uri_string()</c> and a list of options
+    specifying inbound and outbound encodings.</p>
+    <p><url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url> does not mandate any specific
+    character encoding and it is usually defined by the protocol or surrounding text. This library
+    takes the same assumption, binary and percent-encoding are handled as one configuration unit,
+    they cannot be set to different values.</p>
+  </description>
+
+  <datatypes>
+    <datatype>
+      <name name="error"/>
+      <desc>
+        <p>Error tuple indicating the type of error. Possible values of the second component:</p>
+	<list type="bulleted">
+	  <item><c>invalid_character</c></item>
+	  <item><c>invalid_encoding</c></item>
+	  <item><c>invalid_input</c></item>
+	  <item><c>invalid_map</c></item>
+	  <item><c>invalid_percent_encoding</c></item>
+	  <item><c>invalid_scheme</c></item>
+	  <item><c>invalid_uri</c></item>
+	  <item><c>invalid_utf8</c></item>
+	  <item><c>missing_value</c></item>
+	</list>
+	<p>The third component is a term providing additional information about the
+	cause of the error.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="uri_map"/>
+      <desc>
+        <p>Map holding the main components of a URI.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="uri_string"/>
+      <desc>
+        <p>List of unicode codepoints, a UTF-8 encoded binary, or a mix of the two,
+        representing an <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>
+	compliant URI (<em>percent-encoded form</em>).
+        A URI is a sequence of characters from a very limited set: the letters of
+        the basic Latin alphabet, digits, and a few special characters.</p>
+      </desc>
+    </datatype>
+  </datatypes>
+
+  <funcs>
+
+    <func>
+      <name name="compose_query" arity="1"/>
+      <fsummary>Compose urlencoded query string.</fsummary>
+      <desc>
+        <p>Composes a form-urlencoded <c><anno>QueryString</anno></c> based on a
+	<c><anno>QueryList</anno></c>, a list of non-percent-encoded key-value pairs.
+        Form-urlencoding is defined in section
+	4.10.21.6 of the <url href="https://www.w3.org/TR/html52/">HTML 5.2</url>
+	specification and in section 4.10.22.6 of the
+	<url href="https://www.w3.org/TR/html50/">HTML 5.0</url> specification for
+	non-UTF-8 encodings.
+	</p>
+	<p>See also the opposite operation <seealso marker="#dissect_query/1">
+	<c>dissect_query/1</c></seealso>.
+	</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>uri_string:compose_query([{"foo bar","1"},{"city","örebro"}]).</input>
+<![CDATA["foo+bar=1&city=%C3%B6rebro"]]>
+2> <![CDATA[uri_string:compose_query([{<<"foo bar">>,<<"1">>},
+2> {<<"city">>,<<"örebro"/utf8>>}]).]]>
+<![CDATA[<<"foo+bar=1&city=%C3%B6rebro">>]]>
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="compose_query" arity="2"/>
+      <fsummary>Compose urlencoded query string.</fsummary>
+      <desc>
+        <p>Same as <c>compose_query/1</c> but with an additional
+	<c><anno>Options</anno></c> parameter, that controls the encoding ("charset")
+	used by the encoding algorithm. There are two supported encodings: <c>utf8</c>
+	(or <c>unicode</c>) and <c>latin1</c>.
+	</p>
+	<p>Each character in the entry's name and value that cannot be expressed using
+	the selected character encoding, is replaced by a string consisting of a U+0026
+	AMPERSAND character (<![CDATA[&]]>), a "#" (U+0023) character, one or more ASCII
+	digits representing the Unicode code point of the character in base ten, and
+	finally	a ";" (U+003B) character.
+	</p>
+	<p>Bytes that are out of the range 0x2A, 0x2D, 0x2E, 0x30 to 0x39, 0x41 to 0x5A, 0x5F,
+	0x61 to 0x7A, are percent-encoded (U+0025 PERCENT SIGN character (%) followed by
+	uppercase ASCII hex digits representing the hexadecimal value of the byte).
+	</p>
+	<p>See also the opposite operation <seealso marker="#dissect_query/1">
+	<c>dissect_query/1</c></seealso>.
+	</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>uri_string:compose_query([{"foo bar","1"},{"city","örebro"}],</input>
+1> [{encoding, latin1}]).
+<![CDATA["foo+bar=1&city=%F6rebro"
+2> uri_string:compose_query([{<<"foo bar">>,<<"1">>},
+2> {<<"city">>,<<"東京"/utf8>>}], [{encoding, latin1}]).]]>
+<![CDATA[<<"foo+bar=1&city=%26%2326481%3B%26%2320140%3B">>]]>
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="dissect_query" arity="1"/>
+      <fsummary>Dissect query string.</fsummary>
+      <desc>
+        <p>Dissects an urlencoded <c><anno>QueryString</anno></c> and returns a
+	<c><anno>QueryList</anno></c>, a list of non-percent-encoded key-value pairs.
+        Form-urlencoding is defined in section
+	4.10.21.6 of the <url href="https://www.w3.org/TR/html52/">HTML 5.2</url>
+	specification and in section 4.10.22.6 of the
+	<url href="https://www.w3.org/TR/html50/">HTML 5.0</url> specification for
+	non-UTF-8 encodings.
+	</p>
+	<p>See also the opposite operation <seealso marker="#compose_query/1">
+	<c>compose_query/1</c></seealso>.
+	</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input><![CDATA[uri_string:dissect_query("foo+bar=1&city=%C3%B6rebro").]]></input>
+[{"foo bar","1"},{"city","örebro"}]
+2> <![CDATA[uri_string:dissect_query(<<"foo+bar=1&city=%26%2326481%3B%26%2320140%3B">>).]]>
+<![CDATA[[{<<"foo bar">>,<<"1">>},
+ {<<"city">>,<<230,157,177,228,186,172>>}] ]]>
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="normalize" arity="1"/>
+      <fsummary>Syntax-based normalization.</fsummary>
+      <desc>
+        <p>Transforms an <c><anno>URI</anno></c> into a normalized form
+	using Syntax-Based Normalization as defined by
+	<url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>.</p>
+	<p>This function implements case normalization, percent-encoding
+	normalization, path segment normalization and scheme based normalization
+	for HTTP(S) with basic support for FTP, SSH, SFTP and TFTP.</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>uri_string:normalize("/a/b/c/./../../g").</input>
+"/a/g"
+2> <![CDATA[uri_string:normalize(<<"mid/content=5/../6">>).]]>
+<![CDATA[<<"mid/6">>]]>
+3> uri_string:normalize("http://localhost:80").
+"https://localhost/"
+4> <input>uri_string:normalize(#{scheme => "http",port => 80,path => "/a/b/c/./../../g",</input>
+4> host => "localhost-örebro"}).
+"http://localhost-%C3%B6rebro/a/g"
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="normalize" arity="2"/>
+      <fsummary>Syntax-based normalization.</fsummary>
+      <desc>
+	<p>Same as <c>normalize/1</c> but with an additional
+	<c><anno>Options</anno></c> parameter, that controls if the normalized URI
+	shall be returned as an uri_map().
+	There is one supported option: <c>return_map</c>.
+	</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>uri_string:normalize("/a/b/c/./../../g", [return_map]).</input>
+#{path => "/a/g"}
+2> <![CDATA[uri_string:normalize(<<"mid/content=5/../6">>, [return_map]).]]>
+<![CDATA[#{path => <<"mid/6">>}]]>
+3> uri_string:normalize("http://localhost:80", [return_map]).
+#{scheme => "http",path => "/",host => "localhost"}
+4> <input>uri_string:normalize(#{scheme => "http",port => 80,path => "/a/b/c/./../../g",</input>
+4> host => "localhost-örebro"}, [return_map]).
+#{scheme => "http",path => "/a/g",host => "localhost-örebro"}
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="parse" arity="1"/>
+      <fsummary>Parse URI into a map.</fsummary>
+      <desc>
+        <p>Parses an <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>
+	compliant <c>uri_string()</c> into a <c>uri_map()</c>, that holds the parsed
+	components of the <c>URI</c>.
+	If parsing fails, an error tuple is returned.</p>
+	<p>See also the opposite operation <seealso marker="#recompose/1">
+	<c>recompose/1</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>uri_string:parse("foo://[email protected]:8042/over/there?name=ferret#nose").</input>
+#{fragment => "nose",host => "example.com",
+  path => "/over/there",port => 8042,query => "name=ferret",
+  scheme => foo,userinfo => "user"}
+2> <![CDATA[uri_string:parse(<<"foo://[email protected]:8042/over/there?name=ferret">>).]]>
+<![CDATA[#{host => <<"example.com">>,path => <<"/over/there">>,
+  port => 8042,query => <<"name=ferret">>,scheme => <<"foo">>,
+  userinfo => <<"user">>}]]>
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="recompose" arity="1"/>
+      <fsummary>Recompose URI.</fsummary>
+      <desc>
+        <p>Creates an <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url> compliant
+	<c><anno>URIString</anno></c> (percent-encoded), based on the components of
+	<c><anno>URIMap</anno></c>.
+	If the <c><anno>URIMap</anno></c> is invalid, an error tuple is returned.</p>
+	<p>See also the opposite operation <seealso marker="#parse/1">
+	<c>parse/1</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>URIMap = #{fragment => "nose", host => "example.com", path => "/over/there",</input>
+1> port => 8042, query => "name=ferret", scheme => "foo", userinfo => "user"}.
+#{fragment => "top",host => "example.com",
+  path => "/over/there",port => 8042,query => "?name=ferret",
+  scheme => foo,userinfo => "user"}
+
+2> <input>uri_string:recompose(URIMap).</input>
+"foo://example.com:8042/over/there?name=ferret#nose"</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="transcode" arity="2"/>
+      <fsummary>Transcode URI.</fsummary>
+      <desc>
+        <p>Transcodes an <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>
+	compliant <c><anno>URIString</anno></c>,
+	where <c><anno>Options</anno></c> is a list of tagged tuples, specifying the inbound
+	(<c>in_encoding</c>) and outbound (<c>out_encoding</c>) encodings. <c>in_encoding</c>
+	and <c>out_encoding</c> specifies both binary encoding and percent-encoding for the
+	input and output data. Mixed encoding, where binary encoding is not the same as
+	percent-encoding, is not supported.
+	If an argument is invalid, an error tuple is returned.</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input><![CDATA[uri_string:transcode(<<"foo%00%00%00%F6bar"/utf32>>,]]></input>
+1> [{in_encoding, utf32},{out_encoding, utf8}]).
+<![CDATA[<<"foo%C3%B6bar"/utf8>>]]>
+2> uri_string:transcode("foo%F6bar", [{in_encoding, latin1},
+2> {out_encoding, utf8}]).
+"foo%C3%B6bar"
+	</pre>
+      </desc>
+    </func>
+
+  </funcs>
+</erlref>
diff --git a/lib/stdlib/include/assert.hrl b/lib/stdlib/include/assert.hrl
index 2fbaeba0b2..2ec89e7d8a 100644
--- a/lib/stdlib/include/assert.hrl
+++ b/lib/stdlib/include/assert.hrl
@@ -309,7 +309,7 @@
                                        {unexpected_success, __V}]})
             catch
                 Class:Term -> ok;
-                __C:__T ->
+                __C:__T:__S ->
                     erlang:error({assertException,
                                   [{module, ?MODULE},
                                    {line, ?LINE},
@@ -318,8 +318,7 @@
                                     "{ "++(??Class)++" , "++(??Term)
                                     ++" , [...] }"},
                                    {unexpected_exception,
-                                    {__C, __T,
-                                     erlang:get_stacktrace()}}]})
+                                    {__C, __T, __S}}]})
             end
           end)())
         end).
@@ -338,7 +337,7 @@
                                        {unexpected_success, __V}]})
             catch
                 Class:Term -> ok;
-                __C:__T ->
+                __C:__T:__S ->
                     erlang:error({assertException,
                                   [{module, ?MODULE},
                                    {line, ?LINE},
@@ -348,8 +347,7 @@
                                     "{ "++(??Class)++" , "++(??Term)
                                     ++" , [...] }"},
                                    {unexpected_exception,
-                                    {__C, __T,
-                                     erlang:get_stacktrace()}}]})
+                                    {__C, __T, __S}}]})
             end
           end)())
         end).
@@ -378,7 +376,7 @@
             try (Expr) of
                 _ -> ok
             catch
-                __C:__T ->
+                __C:__T:__S ->
                     case __C of
                         Class ->
                             case __T of
@@ -391,9 +389,7 @@
                                                     "{ "++(??Class)++" , "
                                                     ++(??Term)++" , [...] }"},
                                                    {unexpected_exception,
-                                                    {__C, __T,
-                                                     erlang:get_stacktrace()
-                                                    }}]});
+                                                    {__C, __T, __S}}]});
                                 _ -> ok
                             end;
                         _ -> ok
@@ -407,7 +403,7 @@
             try (Expr) of
                 _ -> ok
             catch
-                __C:__T ->
+                __C:__T:__S ->
                     case __C of
                         Class ->
                             case __T of
@@ -421,9 +417,7 @@
                                                     "{ "++(??Class)++" , "
                                                     ++(??Term)++" , [...] }"},
                                                    {unexpected_exception,
-                                                    {__C, __T,
-                                                     erlang:get_stacktrace()
-                                                    }}]});
+                                                    {__C, __T, __S}}]});
                                 _ -> ok
                             end;
                         _ -> ok
diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
index bf836203ec..8b156929d7 100644
--- a/lib/stdlib/src/Makefile
+++ b/lib/stdlib/src/Makefile
@@ -121,6 +121,7 @@ MODULES= \
 	timer \
 	unicode \
 	unicode_util \
+	uri_string \
 	win32reg \
 	zip
 
diff --git a/lib/stdlib/src/base64.erl b/lib/stdlib/src/base64.erl
index c8cf6fdffe..6ea4147abf 100644
--- a/lib/stdlib/src/base64.erl
+++ b/lib/stdlib/src/base64.erl
@@ -24,22 +24,11 @@
 -export([encode/1, decode/1, mime_decode/1,
 	 encode_to_string/1, decode_to_string/1, mime_decode_to_string/1]).
 
-%%-------------------------------------------------------------------------
 %% The following type is a subtype of string() for return values
 %% of (some) functions of this module.
-%%-------------------------------------------------------------------------
-
 -type ascii_string() :: [1..255].
 -type ascii_binary() :: binary().
 
-%%-------------------------------------------------------------------------
-%% encode_to_string(ASCII) -> Base64String
-%%	ASCII - string() | binary()
-%%	Base64String - string()
-%%                                   
-%% Description: Encodes a plain ASCII string (or binary) into base64.
-%%-------------------------------------------------------------------------
-
 -spec encode_to_string(Data) -> Base64String when
       Data :: ascii_string() | ascii_binary(),
       Base64String :: ascii_string().
@@ -47,66 +36,67 @@
 encode_to_string(Bin) when is_binary(Bin) ->
     encode_to_string(binary_to_list(Bin));
 encode_to_string(List) when is_list(List) ->
-    encode_l(List).
-
-%%-------------------------------------------------------------------------
-%% encode(ASCII) -> Base64
-%%	ASCII - string() | binary()
-%%	Base64 - binary()
-%%                                   
-%% Description: Encodes a plain ASCII string (or binary) into base64.
-%%-------------------------------------------------------------------------
+    encode_list_to_string(List).
 
 -spec encode(Data) -> Base64 when
       Data :: ascii_string() | ascii_binary(),
       Base64 :: ascii_binary().
 
 encode(Bin) when is_binary(Bin) ->
-    encode_binary(Bin);
+    encode_binary(Bin, <<>>);
 encode(List) when is_list(List) ->
-    list_to_binary(encode_l(List)).
-
--spec encode_l(ascii_string()) -> ascii_string().
+    encode_list(List, <<>>).
 
-encode_l([]) ->
+encode_list_to_string([]) ->
     [];
-encode_l([A]) ->
-    [b64e(A bsr 2),
-     b64e((A band 3) bsl 4), $=, $=];
-encode_l([A,B]) ->
-    [b64e(A bsr 2),
-     b64e(((A band 3) bsl 4) bor (B bsr 4)), 
-     b64e((B band 15) bsl 2), $=];
-encode_l([A,B,C|Ls]) ->
-    BB = (A bsl 16) bor (B bsl 8) bor C,
+encode_list_to_string([B1]) ->
+    [b64e(B1 bsr 2),
+     b64e((B1 band 3) bsl 4), $=, $=];
+encode_list_to_string([B1,B2]) ->
+    [b64e(B1 bsr 2),
+     b64e(((B1 band 3) bsl 4) bor (B2 bsr 4)),
+     b64e((B2 band 15) bsl 2), $=];
+encode_list_to_string([B1,B2,B3|Ls]) ->
+    BB = (B1 bsl 16) bor (B2 bsl 8) bor B3,
     [b64e(BB bsr 18),
      b64e((BB bsr 12) band 63), 
      b64e((BB bsr 6) band 63),
-     b64e(BB band 63) | encode_l(Ls)].
-
-encode_binary(Bin) ->
-    Split = 3*(byte_size(Bin) div 3),
-    <<Main0:Split/binary,Rest/binary>> = Bin,
-    Main = << <<(b64e(C)):8>> || <<C:6>> <= Main0 >>,
-    case Rest of
-	<<A:6,B:6,C:4>> ->
-	    <<Main/binary,(b64e(A)):8,(b64e(B)):8,(b64e(C bsl 2)):8,$=:8>>;
-	<<A:6,B:2>> ->
-	    <<Main/binary,(b64e(A)):8,(b64e(B bsl 4)):8,$=:8,$=:8>>;
-	<<>> ->
-	    Main
-    end.
+     b64e(BB band 63) | encode_list_to_string(Ls)].
 
-%%-------------------------------------------------------------------------
-%% mime_decode(Base64) -> ASCII
-%% decode(Base64) -> ASCII
-%%	Base64 - string() | binary()
-%%	ASCII - binary()
-%%                                    
-%% Description: Decodes an base64 encoded string to plain ASCII.
-%% mime_decode strips away all characters not Base64 before converting,
-%% whereas decode crashes if an illegal character is found
-%%-------------------------------------------------------------------------
+encode_binary(<<>>, A) ->
+    A;
+encode_binary(<<B1:8>>, A) ->
+    <<A/bits,(b64e(B1 bsr 2)):8,(b64e((B1 band 3) bsl 4)):8,$=:8,$=:8>>;
+encode_binary(<<B1:8, B2:8>>, A) ->
+    <<A/bits,(b64e(B1 bsr 2)):8,
+      (b64e(((B1 band 3) bsl 4) bor (B2 bsr 4))):8,
+      (b64e((B2 band 15) bsl 2)):8, $=:8>>;
+encode_binary(<<B1:8, B2:8, B3:8, Ls/bits>>, A) ->
+    BB = (B1 bsl 16) bor (B2 bsl 8) bor B3,
+    encode_binary(Ls,
+                  <<A/bits,(b64e(BB bsr 18)):8,
+                    (b64e((BB bsr 12) band 63)):8,
+                    (b64e((BB bsr 6) band 63)):8,
+                    (b64e(BB band 63)):8>>).
+
+encode_list([], A) ->
+    A;
+encode_list([B1], A) ->
+    <<A/bits,(b64e(B1 bsr 2)):8,(b64e((B1 band 3) bsl 4)):8,$=:8,$=:8>>;
+encode_list([B1,B2], A) ->
+    <<A/bits,(b64e(B1 bsr 2)):8,
+      (b64e(((B1 band 3) bsl 4) bor (B2 bsr 4))):8,
+      (b64e((B2 band 15) bsl 2)):8, $=:8>>;
+encode_list([B1,B2,B3|Ls], A) ->
+    BB = (B1 bsl 16) bor (B2 bsl 8) bor B3,
+    encode_list(Ls,
+                <<A/bits,(b64e(BB bsr 18)):8,
+                  (b64e((BB bsr 12) band 63)):8,
+                  (b64e((BB bsr 6) band 63)):8,
+                  (b64e(BB band 63)):8>>).
+
+%% mime_decode strips away all characters not Base64 before
+%% converting, whereas decode crashes if an illegal character is found
 
 -spec decode(Base64) -> Data when
       Base64 :: ascii_string() | ascii_binary(),
@@ -122,32 +112,13 @@ decode(List) when is_list(List) ->
       Data :: ascii_binary().
 
 mime_decode(Bin) when is_binary(Bin) ->
-    mime_decode_binary(<<>>, Bin);
+    mime_decode_binary(Bin, <<>>);
 mime_decode(List) when is_list(List) ->
-    mime_decode(list_to_binary(List)).
+    mime_decode_list(List, <<>>).
 
--spec decode_l(ascii_string()) -> ascii_string().
-
-decode_l(List) ->
-    L = strip_spaces(List, []),
-    decode(L, []).
-
--spec mime_decode_l(ascii_string()) -> ascii_string().
-
-mime_decode_l(List) ->
-    L = strip_illegal(List, [], 0),
-    decode(L, []).
-
-%%-------------------------------------------------------------------------
-%% mime_decode_to_string(Base64) -> ASCII
-%% decode_to_string(Base64) -> ASCII
-%%	Base64 - string() | binary()
-%%	ASCII - binary()
-%%
-%% Description: Decodes an base64 encoded string to plain ASCII.
-%% mime_decode strips away all characters not Base64 before converting,
-%% whereas decode crashes if an illegal character is found
-%%-------------------------------------------------------------------------
+%% mime_decode_to_string strips away all characters not Base64 before
+%% converting, whereas decode_to_string crashes if an illegal
+%% character is found
 
 -spec decode_to_string(Base64) -> DataString when
       Base64 :: ascii_string() | ascii_binary(),
@@ -156,7 +127,7 @@ mime_decode_l(List) ->
 decode_to_string(Bin) when is_binary(Bin) ->
     decode_to_string(binary_to_list(Bin));
 decode_to_string(List) when is_list(List) ->
-    decode_l(List).
+    decode_list_to_string(List).
 
 -spec mime_decode_to_string(Base64) -> DataString when
       Base64 :: ascii_string() | ascii_binary(),
@@ -165,115 +136,195 @@ decode_to_string(List) when is_list(List) ->
 mime_decode_to_string(Bin) when is_binary(Bin) ->
     mime_decode_to_string(binary_to_list(Bin));
 mime_decode_to_string(List) when is_list(List) ->
-    mime_decode_l(List).
-
-%% One-based decode map.
--define(DECODE_MAP,
-	{bad,bad,bad,bad,bad,bad,bad,bad,ws,ws,bad,bad,ws,bad,bad, %1-15
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad, %16-31
-	 ws,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,62,bad,bad,bad,63, %32-47
-	 52,53,54,55,56,57,58,59,60,61,bad,bad,bad,eq,bad,bad, %48-63
-	 bad,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,
-	 15,16,17,18,19,20,21,22,23,24,25,bad,bad,bad,bad,bad,
-	 bad,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
-	 41,42,43,44,45,46,47,48,49,50,51,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad}).
+    mime_decode_list_to_string(List).
 
-decode_binary(<<C1:8, Cs/bits>>, A) ->
-    case element(C1, ?DECODE_MAP) of
-        ws -> decode_binary(Cs, A);
-        B1 -> decode_binary(Cs, A, B1)
+%% Skipping pad character if not at end of string. Also liberal about
+%% excess padding and skipping of other illegal (non-base64 alphabet)
+%% characters. See section 3.3 of RFC4648
+mime_decode_list([0 | Cs], A) ->
+    mime_decode_list(Cs, A);
+mime_decode_list([C1 | Cs], A) ->
+    case b64d(C1) of
+        B1 when is_integer(B1) -> mime_decode_list(Cs, A, B1);
+        _ -> mime_decode_list(Cs, A)  % eq is padding
     end;
-decode_binary(<<>>, A) ->
+mime_decode_list([], A) ->
     A.
 
-decode_binary(<<C2:8, Cs/bits>>, A, B1) ->
-    case element(C2, ?DECODE_MAP) of
-        ws -> decode_binary(Cs, A, B1);
-        B2 -> decode_binary(Cs, A, B1, B2)
+mime_decode_list([0 | Cs], A, B1) ->
+    mime_decode_list(Cs, A, B1);
+mime_decode_list([C2 | Cs], A, B1) ->
+    case b64d(C2) of
+        B2 when is_integer(B2) ->
+            mime_decode_list(Cs, A, B1, B2);
+        _ -> mime_decode_list(Cs, A, B1) % eq is padding
     end.
 
-decode_binary(<<C3:8, Cs/bits>>, A, B1, B2) ->
-    case element(C3, ?DECODE_MAP) of
-        ws -> decode_binary(Cs, A, B1, B2);
-        B3 -> decode_binary(Cs, A, B1, B2, B3)
+mime_decode_list([0 | Cs], A, B1, B2) ->
+    mime_decode_list(Cs, A, B1, B2);
+mime_decode_list([C3 | Cs], A, B1, B2) ->
+    case b64d(C3) of
+        B3 when is_integer(B3) ->
+            mime_decode_list(Cs, A, B1, B2, B3);
+        eq=B3 ->
+            mime_decode_list_after_eq(Cs, A, B1, B2, B3);
+        _ -> mime_decode_list(Cs, A, B1, B2)
     end.
 
-decode_binary(<<C4:8, Cs/bits>>, A, B1, B2, B3) ->
-    case element(C4, ?DECODE_MAP) of
-        ws                -> decode_binary(Cs, A, B1, B2, B3);
-        eq when B3 =:= eq -> only_ws_binary(Cs, <<A/binary,B1:6,(B2 bsr 4):2>>);
-        eq                -> only_ws_binary(Cs, <<A/binary,B1:6,B2:6,(B3 bsr 2):4>>);
-        B4                -> decode_binary(Cs, <<A/binary,B1:6,B2:6,B3:6,B4:6>>)
+mime_decode_list([0 | Cs], A, B1, B2, B3) ->
+    mime_decode_list(Cs, A, B1, B2, B3);
+mime_decode_list([C4 | Cs], A, B1, B2, B3) ->
+    case b64d(C4) of
+        B4 when is_integer(B4) ->
+            mime_decode_list(Cs, <<A/bits,B1:6,B2:6,B3:6,B4:6>>);
+        eq ->
+            mime_decode_list_after_eq(Cs, A, B1, B2, B3);
+        _ -> mime_decode_list(Cs, A, B1, B2, B3)
     end.
 
-only_ws_binary(<<>>, A) ->
-    A;
-only_ws_binary(<<C:8, Cs/bits>>, A) ->
-    case element(C, ?DECODE_MAP) of
-        ws -> only_ws_binary(Cs, A);
-        _ -> erlang:error(function_clause)
+mime_decode_list_after_eq([0 | Cs], A, B1, B2, B3) ->
+    mime_decode_list_after_eq(Cs, A, B1, B2, B3);
+mime_decode_list_after_eq([C | Cs], A, B1, B2, B3) ->
+    case b64d(C) of
+        B when is_integer(B) ->
+            %% More valid data, skip the eq as invalid
+            case B3 of
+                eq -> mime_decode_list(Cs, A, B1, B2, B);
+                _ -> mime_decode_list(Cs, <<A/bits,B1:6,B2:6,B3:6,B:6>>)
+            end;
+        _ -> mime_decode_list_after_eq(Cs, A, B1, B2, B3)
+    end;
+mime_decode_list_after_eq([], A, B1, B2, eq) ->
+    <<A/bits,B1:6,(B2 bsr 4):2>>;
+mime_decode_list_after_eq([], A, B1, B2, B3) ->
+    <<A/bits,B1:6,B2:6,(B3 bsr 2):4>>.
+
+mime_decode_binary(<<0:8, Cs/bits>>, A) ->
+    mime_decode_binary(Cs, A);
+mime_decode_binary(<<C1:8, Cs/bits>>, A) ->
+    case b64d(C1) of
+        B1 when is_integer(B1) -> mime_decode_binary(Cs, A, B1);
+        _ -> mime_decode_binary(Cs, A)  % eq is padding
+    end;
+mime_decode_binary(<<>>, A) ->
+    A.
+
+mime_decode_binary(<<0:8, Cs/bits>>, A, B1) ->
+    mime_decode_binary(Cs, A, B1);
+mime_decode_binary(<<C2:8, Cs/bits>>, A, B1) ->
+    case b64d(C2) of
+        B2 when is_integer(B2) ->
+            mime_decode_binary(Cs, A, B1, B2);
+        _ -> mime_decode_binary(Cs, A, B1) % eq is padding
     end.
 
-%% Skipping pad character if not at end of string. Also liberal about
-%% excess padding and skipping of other illegal (non-base64 alphabet)
-%% characters. See section 3.3 of RFC4648
-mime_decode_binary(Result, <<0:8,T/bits>>) ->
-    mime_decode_binary(Result, T);
-mime_decode_binary(Result0, <<C:8,T/bits>>) ->
-    case element(C, ?DECODE_MAP) of
-        Bits when is_integer(Bits) ->
-            mime_decode_binary(<<Result0/bits,Bits:6>>, T);
+mime_decode_binary(<<0:8, Cs/bits>>, A, B1, B2) ->
+    mime_decode_binary(Cs, A, B1, B2);
+mime_decode_binary(<<C3:8, Cs/bits>>, A, B1, B2) ->
+    case b64d(C3) of
+        B3 when is_integer(B3) ->
+            mime_decode_binary(Cs, A, B1, B2, B3);
+        eq=B3 ->
+            mime_decode_binary_after_eq(Cs, A, B1, B2, B3);
+        _ -> mime_decode_binary(Cs, A, B1, B2)
+    end.
+
+mime_decode_binary(<<0:8, Cs/bits>>, A, B1, B2, B3) ->
+    mime_decode_binary(Cs, A, B1, B2, B3);
+mime_decode_binary(<<C4:8, Cs/bits>>, A, B1, B2, B3) ->
+    case b64d(C4) of
+        B4 when is_integer(B4) ->
+            mime_decode_binary(Cs, <<A/bits,B1:6,B2:6,B3:6,B4:6>>);
         eq ->
-            mime_decode_binary_after_eq(Result0, T, false);
-        _ ->
-            mime_decode_binary(Result0, T)
+            mime_decode_binary_after_eq(Cs, A, B1, B2, B3);
+        _ -> mime_decode_binary(Cs, A, B1, B2, B3)
+    end.
+
+mime_decode_binary_after_eq(<<0:8, Cs/bits>>, A, B1, B2, B3) ->
+    mime_decode_binary_after_eq(Cs, A, B1, B2, B3);
+mime_decode_binary_after_eq(<<C:8, Cs/bits>>, A, B1, B2, B3) ->
+    case b64d(C) of
+        B when is_integer(B) ->
+            %% More valid data, skip the eq as invalid
+            case B3 of
+                eq -> mime_decode_binary(Cs, A, B1, B2, B);
+                _ -> mime_decode_binary(Cs, <<A/bits,B1:6,B2:6,B3:6,B:6>>)
+            end;
+        _ -> mime_decode_binary_after_eq(Cs, A, B1, B2, B3)
     end;
-mime_decode_binary(Result, _) ->
-    true = is_binary(Result),
-    Result.
-
-mime_decode_binary_after_eq(Result, <<0:8,T/bits>>, Eq) ->
-    mime_decode_binary_after_eq(Result, T, Eq);
-mime_decode_binary_after_eq(Result0, <<C:8,T/bits>>, Eq) ->
-    case element(C, ?DECODE_MAP) of
-        bad ->
-            mime_decode_binary_after_eq(Result0, T, Eq);
-        ws ->
-            mime_decode_binary_after_eq(Result0, T, Eq);
+mime_decode_binary_after_eq(<<>>, A, B1, B2, eq) ->
+    <<A/bits,B1:6,(B2 bsr 4):2>>;
+mime_decode_binary_after_eq(<<>>, A, B1, B2, B3) ->
+    <<A/bits,B1:6,B2:6,(B3 bsr 2):4>>.
+
+mime_decode_list_to_string([0 | Cs]) ->
+    mime_decode_list_to_string(Cs);
+mime_decode_list_to_string([C1 | Cs]) ->
+    case b64d(C1) of
+        B1 when is_integer(B1) -> mime_decode_list_to_string(Cs, B1);
+        _ -> mime_decode_list_to_string(Cs) % eq is padding
+    end;
+mime_decode_list_to_string([]) ->
+    [].
+
+mime_decode_list_to_string([0 | Cs], B1) ->
+    mime_decode_list_to_string(Cs, B1);
+mime_decode_list_to_string([C2 | Cs], B1) ->
+    case b64d(C2) of
+        B2 when is_integer(B2) ->
+            mime_decode_list_to_string(Cs, B1, B2);
+        _ -> mime_decode_list_to_string(Cs, B1) % eq is padding
+    end.
+
+mime_decode_list_to_string([0 | Cs], B1, B2) ->
+    mime_decode_list_to_string(Cs, B1, B2);
+mime_decode_list_to_string([C3 | Cs], B1, B2) ->
+    case b64d(C3) of
+        B3 when is_integer(B3) ->
+            mime_decode_list_to_string(Cs, B1, B2, B3);
+        eq=B3 -> mime_decode_list_to_string_after_eq(Cs, B1, B2, B3);
+        _ -> mime_decode_list_to_string(Cs, B1, B2)
+    end.
+
+mime_decode_list_to_string([0 | Cs], B1, B2, B3) ->
+    mime_decode_list_to_string(Cs, B1, B2, B3);
+mime_decode_list_to_string([C4 | Cs], B1, B2, B3) ->
+    case b64d(C4) of
+        B4 when is_integer(B4) ->
+            Bits4x6 = (B1 bsl 18) bor (B2 bsl 12) bor (B3 bsl 6) bor B4,
+            Octet1 = Bits4x6 bsr 16,
+            Octet2 = (Bits4x6 bsr 8) band 16#ff,
+            Octet3 = Bits4x6 band 16#ff,
+            [Octet1, Octet2, Octet3 | mime_decode_list_to_string(Cs)];
         eq ->
-            mime_decode_binary_after_eq(Result0, T, true);
-        Bits when is_integer(Bits) ->
+            mime_decode_list_to_string_after_eq(Cs, B1, B2, B3);
+        _ -> mime_decode_list_to_string(Cs, B1, B2, B3)
+    end.
+
+mime_decode_list_to_string_after_eq([0 | Cs], B1, B2, B3) ->
+    mime_decode_list_to_string_after_eq(Cs, B1, B2, B3);
+mime_decode_list_to_string_after_eq([C | Cs], B1, B2, B3) ->
+    case b64d(C) of
+        B when is_integer(B) ->
             %% More valid data, skip the eq as invalid
-            mime_decode_binary(<<Result0/bits,Bits:6>>, T)
+            case B3 of
+                eq -> mime_decode_list_to_string(Cs, B1, B2, B);
+                _ ->
+                    Bits4x6 = (B1 bsl 18) bor (B2 bsl 12) bor (B3 bsl 6) bor B,
+                    Octet1 = Bits4x6 bsr 16,
+                    Octet2 = (Bits4x6 bsr 8) band 16#ff,
+                    Octet3 = Bits4x6 band 16#ff,
+                    [Octet1, Octet2, Octet3 | mime_decode_list_to_string(Cs)]
+            end;
+        _ -> mime_decode_list_to_string_after_eq(Cs, B1, B2, B3)
     end;
-mime_decode_binary_after_eq(Result0, <<>>, Eq) ->
-    %% No more valid data.
-    case bit_size(Result0) rem 8 of
-        0 ->
-            %% '====' is not uncommon.
-            Result0;
-        4 when Eq ->
-            %% enforce at least one more '=' only ignoring illegals and spacing
-            Split = byte_size(Result0) - 1,
-            <<Result:Split/bytes,_:4>> = Result0,
-            Result;
-        2 ->
-            %% remove 2 bits
-            Split = byte_size(Result0) - 1,
-            <<Result:Split/bytes,_:2>> = Result0,
-            Result
-    end.
+mime_decode_list_to_string_after_eq([], B1, B2, eq) ->
+    binary_to_list(<<B1:6,(B2 bsr 4):2>>);
+mime_decode_list_to_string_after_eq([], B1, B2, B3) ->
+    binary_to_list(<<B1:6,B2:6,(B3 bsr 2):4>>).
 
 decode_list([C1 | Cs], A) ->
-    case element(C1, ?DECODE_MAP) of
+    case b64d(C1) of
         ws -> decode_list(Cs, A);
         B1 -> decode_list(Cs, A, B1)
     end;
@@ -281,122 +332,130 @@ decode_list([], A) ->
     A.
 
 decode_list([C2 | Cs], A, B1) ->
-    case element(C2, ?DECODE_MAP) of
+    case b64d(C2) of
         ws -> decode_list(Cs, A, B1);
         B2 -> decode_list(Cs, A, B1, B2)
     end.
 
 decode_list([C3 | Cs], A, B1, B2) ->
-    case element(C3, ?DECODE_MAP) of
+    case b64d(C3) of
         ws -> decode_list(Cs, A, B1, B2);
         B3 -> decode_list(Cs, A, B1, B2, B3)
     end.
 
 decode_list([C4 | Cs], A, B1, B2, B3) ->
-    case element(C4, ?DECODE_MAP) of
+    case b64d(C4) of
         ws                -> decode_list(Cs, A, B1, B2, B3);
-        eq when B3 =:= eq -> only_ws(Cs, <<A/binary,B1:6,(B2 bsr 4):2>>);
-        eq                -> only_ws(Cs, <<A/binary,B1:6,B2:6,(B3 bsr 2):4>>);
-        B4                -> decode_list(Cs, <<A/binary,B1:6,B2:6,B3:6,B4:6>>)
+        eq when B3 =:= eq -> only_ws(Cs, <<A/bits,B1:6,(B2 bsr 4):2>>);
+        eq                -> only_ws(Cs, <<A/bits,B1:6,B2:6,(B3 bsr 2):4>>);
+        B4                -> decode_list(Cs, <<A/bits,B1:6,B2:6,B3:6,B4:6>>)
     end.
 
-only_ws([], A) ->
-    A;
-only_ws([C | Cs], A) ->
-    case element(C, ?DECODE_MAP) of
-        ws -> only_ws(Cs, A);
-        _ -> erlang:error(function_clause)
-    end.
+decode_binary(<<C1:8, Cs/bits>>, A) ->
+    case b64d(C1) of
+        ws -> decode_binary(Cs, A);
+        B1 -> decode_binary(Cs, A, B1)
+    end;
+decode_binary(<<>>, A) ->
+    A.
 
-decode([], A) -> A;
-decode([$=,$=,C2,C1|Cs], A) ->
-    Bits2x6 = (b64d(C1) bsl 18) bor (b64d(C2) bsl 12),
-    Octet1 = Bits2x6 bsr 16,
-    decode(Cs, [Octet1|A]);
-decode([$=,C3,C2,C1|Cs], A) ->
-    Bits3x6 = (b64d(C1) bsl 18) bor (b64d(C2) bsl 12)
-	bor (b64d(C3) bsl 6),
-    Octet1 = Bits3x6 bsr 16,
-    Octet2 = (Bits3x6 bsr 8) band 16#ff,
-    decode(Cs, [Octet1,Octet2|A]);
-decode([C4,C3,C2,C1| Cs], A) ->
-    Bits4x6 = (b64d(C1) bsl 18) bor (b64d(C2) bsl 12)
-	bor (b64d(C3) bsl 6) bor b64d(C4),
-    Octet1 = Bits4x6 bsr 16,
-    Octet2 = (Bits4x6 bsr 8) band 16#ff,
-    Octet3 = Bits4x6 band 16#ff,
-    decode(Cs, [Octet1,Octet2,Octet3|A]).
+decode_binary(<<C2:8, Cs/bits>>, A, B1) ->
+    case b64d(C2) of
+        ws -> decode_binary(Cs, A, B1);
+        B2 -> decode_binary(Cs, A, B1, B2)
+    end.
 
-%%%========================================================================
-%%% Internal functions
-%%%========================================================================
+decode_binary(<<C3:8, Cs/bits>>, A, B1, B2) ->
+    case b64d(C3) of
+        ws -> decode_binary(Cs, A, B1, B2);
+        B3 -> decode_binary(Cs, A, B1, B2, B3)
+    end.
 
-strip_spaces([], A) -> A;
-strip_spaces([$\s|Cs], A) -> strip_spaces(Cs, A);
-strip_spaces([$\t|Cs], A) -> strip_spaces(Cs, A);
-strip_spaces([$\r|Cs], A) -> strip_spaces(Cs, A);
-strip_spaces([$\n|Cs], A) -> strip_spaces(Cs, A);
-strip_spaces([C|Cs], A) -> strip_spaces(Cs, [C | A]).
+decode_binary(<<C4:8, Cs/bits>>, A, B1, B2, B3) ->
+    case b64d(C4) of
+        ws                -> decode_binary(Cs, A, B1, B2, B3);
+        eq when B3 =:= eq -> only_ws_binary(Cs, <<A/bits,B1:6,(B2 bsr 4):2>>);
+        eq                -> only_ws_binary(Cs, <<A/bits,B1:6,B2:6,(B3 bsr 2):4>>);
+        B4                -> decode_binary(Cs, <<A/bits,B1:6,B2:6,B3:6,B4:6>>)
+    end.
 
-%% Skipping pad character if not at end of string. Also liberal about
-%% excess padding and skipping of other illegal (non-base64 alphabet)
-%% characters. See section 3.3 of RFC4648
-strip_illegal([], A, _Cnt) ->
+only_ws_binary(<<>>, A) ->
     A;
-strip_illegal([0|Cs], A, Cnt) ->
-    strip_illegal(Cs, A, Cnt);
-strip_illegal([C|Cs], A, Cnt) ->
-    case element(C, ?DECODE_MAP) of
-	bad ->
-	    strip_illegal(Cs, A, Cnt);
-	ws ->
-	    strip_illegal(Cs, A, Cnt);
-	eq ->
-	    case {tail_contains_more(Cs, false), Cnt rem 4} of
-		{{[], _}, 0} ->
-		    A;            %% Ignore extra =
-		{{[], true}, 2} ->
-		    [$=|[$=|A]];  %% 'XX=='
-		{{[], _}, 3} ->
-		    [$=|A];       %% 'XXX='
-		{{[H|T], _}, _} ->
-		    %% more data, skip equals
-		    strip_illegal(T, [H|A], Cnt+1)
-	    end;
-	_ ->
-	    strip_illegal(Cs, [C|A], Cnt+1)
+only_ws_binary(<<C:8, Cs/bits>>, A) ->
+    case b64d(C) of
+        ws -> only_ws_binary(Cs, A)
     end.
 
-%% Search the tail for more valid data and remember if we saw
-%% another equals along the way.
-tail_contains_more([], Eq) ->
-    {[], Eq};
-tail_contains_more(<<>>, Eq) ->
-    {<<>>, Eq};
-tail_contains_more([C|T]=More, Eq) ->
-    case element(C, ?DECODE_MAP) of
-	bad ->
-	    tail_contains_more(T, Eq);
-	ws ->
-	    tail_contains_more(T, Eq);
-	eq ->
-	    tail_contains_more(T, true);
-	_ ->
-	    {More, Eq}
+decode_list_to_string([C1 | Cs]) ->
+    case b64d(C1) of
+        ws -> decode_list_to_string(Cs);
+        B1 -> decode_list_to_string(Cs, B1)
     end;
-tail_contains_more(<<C:8,T/bits>> =More, Eq) ->
-    case element(C, ?DECODE_MAP) of
-	bad ->
-	    tail_contains_more(T, Eq);
-	ws ->
-	    tail_contains_more(T, Eq);
-	eq ->
-	    tail_contains_more(T, true);
-	_ ->
-	    {More, Eq}
+decode_list_to_string([]) ->
+    [].
+
+decode_list_to_string([C2 | Cs], B1) ->
+    case b64d(C2) of
+        ws -> decode_list_to_string(Cs, B1);
+        B2 -> decode_list_to_string(Cs, B1, B2)
+    end.
+
+decode_list_to_string([C3 | Cs], B1, B2) ->
+    case b64d(C3) of
+        ws -> decode_list_to_string(Cs, B1, B2);
+        B3 -> decode_list_to_string(Cs, B1, B2, B3)
+    end.
+
+decode_list_to_string([C4 | Cs], B1, B2, B3) ->
+    case b64d(C4) of
+        ws ->
+            decode_list_to_string(Cs, B1, B2, B3);
+        eq when B3 =:= eq ->
+            only_ws(Cs, binary_to_list(<<B1:6,(B2 bsr 4):2>>));
+        eq ->
+            only_ws(Cs, binary_to_list(<<B1:6,B2:6,(B3 bsr 2):4>>));
+        B4 ->
+            Bits4x6 = (B1 bsl 18) bor (B2 bsl 12) bor (B3 bsl 6) bor B4,
+            Octet1 = Bits4x6 bsr 16,
+            Octet2 = (Bits4x6 bsr 8) band 16#ff,
+            Octet3 = Bits4x6 band 16#ff,
+            [Octet1, Octet2, Octet3 | decode_list_to_string(Cs)]
+    end.
+
+only_ws([], A) ->
+    A;
+only_ws([C | Cs], A) ->
+    case b64d(C) of
+        ws -> only_ws(Cs, A)
     end.
-    
+
+%%%========================================================================
+%%% Internal functions
+%%%========================================================================
+
 %% accessors 
+-compile({inline, [{b64d, 1}]}).
+%% One-based decode map.
+b64d(X) ->
+    element(X,
+            {bad,bad,bad,bad,bad,bad,bad,bad,ws,ws,bad,bad,ws,bad,bad, %1-15
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad, %16-31
+             ws,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,62,bad,bad,bad,63, %32-47
+             52,53,54,55,56,57,58,59,60,61,bad,bad,bad,eq,bad,bad, %48-63
+             bad,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,
+             15,16,17,18,19,20,21,22,23,24,25,bad,bad,bad,bad,bad,
+             bad,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
+             41,42,43,44,45,46,47,48,49,50,51,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad}).
+
+-compile({inline, [{b64e, 1}]}).
 b64e(X) ->
     element(X+1,
 	    {$A, $B, $C, $D, $E, $F, $G, $H, $I, $J, $K, $L, $M, $N,
@@ -404,9 +463,3 @@ b64e(X) ->
 	     $a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l, $m, $n,
 	     $o, $p, $q, $r, $s, $t, $u, $v, $w, $x, $y, $z,
 	     $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $+, $/}).
-
-
-b64d(X) ->
-    b64d_ok(element(X, ?DECODE_MAP)).
-
-b64d_ok(I) when is_integer(I) -> I.
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index 06c15fceda..24349c74e8 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -148,7 +148,8 @@ chunks(File, Chunks, Options) ->
     try read_chunk_data(File, Chunks, Options)
     catch Error -> Error end.
 
--spec all_chunks(beam()) -> {'ok', 'beam_lib', [{chunkid(), dataB()}]}.
+-spec all_chunks(beam()) ->
+           {'ok', 'beam_lib', [{chunkid(), dataB()}]} | {'error', 'beam_lib', info_rsn()}.
 
 all_chunks(File) ->
     read_all_chunks(File).
diff --git a/lib/stdlib/src/binary.erl b/lib/stdlib/src/binary.erl
index 6a64133b45..7d0e42489e 100644
--- a/lib/stdlib/src/binary.erl
+++ b/lib/stdlib/src/binary.erl
@@ -47,23 +47,39 @@ at(_, _) ->
 -spec bin_to_list(Subject) -> [byte()] when
       Subject :: binary().
 
-bin_to_list(_) ->
-    erlang:nif_error(undef).
+bin_to_list(Subject) ->
+    binary_to_list(Subject).
 
 -spec bin_to_list(Subject, PosLen) -> [byte()] when
       Subject :: binary(),
       PosLen :: part().
 
-bin_to_list(_, _) ->
-    erlang:nif_error(undef).
+bin_to_list(Subject, {Pos, Len}) ->
+    bin_to_list(Subject, Pos, Len);
+bin_to_list(_Subject, _BadArg) ->
+    erlang:error(badarg).
 
 -spec bin_to_list(Subject, Pos, Len) -> [byte()] when
       Subject :: binary(),
       Pos :: non_neg_integer(),
       Len :: integer().
 
-bin_to_list(_, _, _) ->
-    erlang:nif_error(undef).
+bin_to_list(Subject, Pos, Len) when not is_binary(Subject);
+                                    not is_integer(Pos);
+                                    not is_integer(Len) ->
+    %% binary_to_list/3 allows bitstrings as long as the slice fits, and we
+    %% want to badarg when Pos/Len aren't integers instead of raising badarith
+    %% when adjusting args for binary_to_list/3.
+    erlang:error(badarg);
+bin_to_list(Subject, Pos, 0) when Pos >= 0, Pos =< byte_size(Subject) ->
+    %% binary_to_list/3 doesn't handle this case.
+    [];
+bin_to_list(_Subject, _Pos, 0) ->
+    erlang:error(badarg);
+bin_to_list(Subject, Pos, Len) when Len < 0 ->
+    bin_to_list(Subject, Pos + Len, -Len);
+bin_to_list(Subject, Pos, Len) when Len > 0 ->
+    binary_to_list(Subject, Pos + 1, Pos + Len).
 
 -spec compile_pattern(Pattern) -> cp() when
       Pattern :: binary() | [binary()].
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index 9a447af5b7..3597e61c26 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -1034,8 +1034,8 @@ appcall(App, M, F, Args) ->
     try
 	apply(M, F, Args)
     catch
-	error:undef ->
-	    case erlang:get_stacktrace() of
+	error:undef:S ->
+	    case S of
 		[{M,F,Args,_}|_] ->
 		    Arity = length(Args),
 		    io:format("Call to ~w:~w/~w in application ~w failed.\n",
diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index 4e3fe0e5c1..e1a36abc70 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -1288,8 +1288,8 @@ init(Parent, Server) ->
             catch
                 exit:normal ->
                     exit(normal);
-                _:Bad ->
-                    bug_found(no_name, Op, Bad, From),
+                _:Bad:Stacktrace ->
+                    bug_found(no_name, Op, Bad, Stacktrace, From),
                     exit(Bad) % give up
             end
     end.
@@ -1371,8 +1371,8 @@ do_apply_op(Op, From, Head, N) ->
     catch 
         exit:normal -> 
             exit(normal);
-        _:Bad -> 
-            bug_found(Head#head.name, Op, Bad, From),
+        _:Bad:Stacktrace -> 
+            bug_found(Head#head.name, Op, Bad, Stacktrace, From),
             open_file_loop(Head, N)
     end.
 
@@ -1581,7 +1581,7 @@ apply_op(Op, From, Head, N) ->
 	    ok
     end.
 
-bug_found(Name, Op, Bad, From) ->
+bug_found(Name, Op, Bad, Stacktrace, From) ->
     case dets_utils:debug_mode() of
         true ->
             %% If stream_op/5 found more requests, this is not
@@ -1590,7 +1590,7 @@ bug_found(Name, Op, Bad, From) ->
               ("** dets: Bug was found when accessing table ~tw,~n"
                "** dets: operation was ~tp and reply was ~tw.~n"
                "** dets: Stacktrace: ~tw~n",
-               [Name, Op, Bad, erlang:get_stacktrace()]);
+               [Name, Op, Bad, Stacktrace]);
         false ->
             error_logger:format
               ("** dets: Bug was found when accessing table ~tw~n",
diff --git a/lib/stdlib/src/dets_utils.erl b/lib/stdlib/src/dets_utils.erl
index 17f55ebdc2..4c8ea9e82b 100644
--- a/lib/stdlib/src/dets_utils.erl
+++ b/lib/stdlib/src/dets_utils.erl
@@ -377,7 +377,8 @@ corrupt_reason(Head, Reason0) ->
                  no_disk_map -> 
                      Reason0;
                  DM ->
-                    ST = erlang:get_stacktrace(),
+                    {current_stacktrace, ST} =
+                         erlang:process_info(self(), current_stacktrace),
                     PD = get(),
                     {Reason0, ST, PD, DM}
              end,
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index 00e6a10d8a..77cc88eb08 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -1197,21 +1197,21 @@ skip_else(_Else, From, St, Sis) ->
 %% macro_expansion(Tokens, Anno)
 %%  Extract the macro parameters and the expansion from a macro definition.
 
-macro_pars([{')',_Lp}, {',',Ld}|Ex], Args) ->
-    {ok, {lists:reverse(Args), macro_expansion(Ex, Ld)}};
-macro_pars([{var,_,Name}, {')',_Lp}, {',',Ld}|Ex], Args) ->
+macro_pars([{')',_Lp}, {',',_Ld}=Comma|Ex], Args) ->
+    {ok, {lists:reverse(Args), macro_expansion(Ex, Comma)}};
+macro_pars([{var,_,Name}, {')',_Lp}, {',',_Ld}=Comma|Ex], Args) ->
     false = lists:member(Name, Args),		%Prolog is nice
-    {ok, {lists:reverse([Name|Args]), macro_expansion(Ex, Ld)}};
+    {ok, {lists:reverse([Name|Args]), macro_expansion(Ex, Comma)}};
 macro_pars([{var,_L,Name}, {',',_}|Ts], Args) ->
     false = lists:member(Name, Args),
     macro_pars(Ts, [Name|Args]).
 
-macro_expansion([{')',_Lp},{dot,_Ld}], _Anno0) -> [];
-macro_expansion([{dot,_}=Dot], _Anno0) ->
+macro_expansion([{')',_Lp},{dot,_Ld}], _T0) -> [];
+macro_expansion([{dot,_}=Dot], _T0) ->
     throw({error,loc(Dot),missing_parenthesis});
-macro_expansion([T|Ts], _Anno0) ->
+macro_expansion([T|Ts], _T0) ->
     [T|macro_expansion(Ts, T)];
-macro_expansion([], Anno0) -> throw({error,loc(Anno0),premature_end}).
+macro_expansion([], T0) -> throw({error,loc(T0),premature_end}).
 
 %% expand_macros(Tokens, St)
 %% expand_macro(Tokens, MacroToken, RestTokens)
diff --git a/lib/stdlib/src/erl_compile.erl b/lib/stdlib/src/erl_compile.erl
index 18d7548fdc..f781312ca2 100644
--- a/lib/stdlib/src/erl_compile.erl
+++ b/lib/stdlib/src/erl_compile.erl
@@ -188,6 +188,8 @@ parse_dep_option("", T) ->
     {[makedep,{makedep_output,standard_io}],T};
 parse_dep_option("D", T) ->
     {[makedep],T};
+parse_dep_option("MD", T) ->
+    {[makedep_side_effect],T};
 parse_dep_option("F"++Opt, T0) ->
     {File,T} = get_option("MF", Opt, T0),
     {[makedep,{makedep_output,File}],T};
@@ -221,6 +223,7 @@ usage() ->
 	  "the dependencies"},
 	 {"-MP","add a phony target for each dependency"},
 	 {"-MD","same as -M -MT file (with default 'file')"},
+	 {"-MMD","generate dependencies as a side-effect"},
 	 {"-o name","name output directory or file"},
 	 {"-pa path","add path to the front of Erlang's code path"},
 	 {"-pz path","add path to the end of Erlang's code path"},
diff --git a/lib/stdlib/src/erl_eval.erl b/lib/stdlib/src/erl_eval.erl
index eafee346eb..4ee11383da 100644
--- a/lib/stdlib/src/erl_eval.erl
+++ b/lib/stdlib/src/erl_eval.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.
@@ -69,6 +69,9 @@
 -type(non_local_function_handler() :: {value, nlfun_handler()}
                                     | none).
 
+-define(STACKTRACE,
+        element(2, erlang:process_info(self(), current_stacktrace))).
+
 %% exprs(ExpressionSeq, Bindings)
 %% exprs(ExpressionSeq, Bindings, LocalFuncHandler)
 %% exprs(ExpressionSeq, Bindings, LocalFuncHandler, ExternalFuncHandler)
@@ -90,7 +93,7 @@ exprs(Exprs, Bs) ->
         ok -> 
             exprs(Exprs, Bs, none, none, none);
         {error,{_Line,_Mod,Error}} ->
-	    erlang:raise(error, Error, [{?MODULE,exprs,2}])
+	    erlang:raise(error, Error, ?STACKTRACE)
     end.
 
 -spec(exprs(Expressions, Bindings, LocalFunctionHandler) ->
@@ -141,7 +144,7 @@ expr(E, Bs) ->
         ok -> 
             expr(E, Bs, none, none, none);
         {error,{_Line,_Mod,Error}} ->
-	    erlang:raise(error, Error, [{?MODULE,expr,2}])
+	    erlang:raise(error, Error, ?STACKTRACE)
     end.
 
 -spec(expr(Expression, Bindings, LocalFunctionHandler) ->
@@ -182,7 +185,7 @@ check_command(Es, Bs) ->
 
 fun_data(F) when is_function(F) ->
     case erlang:fun_info(F, module) of
-        {module,erl_eval} ->
+        {module,?MODULE} ->
             case erlang:fun_info(F, env) of
                 {env,[{FBs,_FLf,_FEf,FCs}]} ->
                     {fun_data,FBs,FCs};
@@ -209,8 +212,8 @@ expr({var,_,V}, Bs, _Lf, _Ef, RBs) ->
     case binding(V, Bs) of
 	{value,Val} ->
             ret_expr(Val, Bs, RBs);
-	unbound -> % Should not happen.
-	    erlang:raise(error, {unbound,V}, stacktrace())
+	unbound -> % Cannot not happen if checked by erl_lint
+	    erlang:raise(error, {unbound,V}, ?STACKTRACE)
     end;
 expr({char,_,C}, Bs, _Lf, _Ef, RBs) ->
     ret_expr(C, Bs, RBs);
@@ -236,13 +239,13 @@ expr({tuple,_,Es}, Bs0, Lf, Ef, RBs) ->
     {Vs,Bs} = expr_list(Es, Bs0, Lf, Ef),
     ret_expr(list_to_tuple(Vs), Bs, RBs);
 expr({record_field,_,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, {undef_record,Name}, stacktrace());
+    erlang:raise(error, {undef_record,Name}, ?STACKTRACE);
 expr({record_index,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, {undef_record,Name}, stacktrace());
+    erlang:raise(error, {undef_record,Name}, ?STACKTRACE);
 expr({record,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, {undef_record,Name}, stacktrace());
+    erlang:raise(error, {undef_record,Name}, ?STACKTRACE);
 expr({record,_,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, {undef_record,Name}, stacktrace());
+    erlang:raise(error, {undef_record,Name}, ?STACKTRACE);
 
 %% map
 expr({map,_,Binding,Es}, Bs0, Lf, Ef, RBs) ->
@@ -281,7 +284,7 @@ expr({'fun',_Line,{function,Mod0,Name0,Arity0}}, Bs0, Lf, Ef, RBs) ->
     ret_expr(F, Bs, RBs);    
 expr({'fun',_Line,{function,Name,Arity}}, _Bs0, _Lf, _Ef, _RBs) -> % R8
     %% Don't know what to do...
-    erlang:raise(error, undef, [{erl_eval,Name,Arity}|stacktrace()]);
+    erlang:raise(error, undef, [{?MODULE,Name,Arity}|?STACKTRACE]);
 expr({'fun',Line,{clauses,Cs}} = Ex, Bs, Lf, Ef, RBs) ->
     %% Save only used variables in the function environment.
     %% {value,L,V} are hidden while lint finds used variables.
@@ -326,7 +329,7 @@ expr({'fun',Line,{clauses,Cs}} = Ex, Bs, Lf, Ef, RBs) ->
            eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T], Info) end;
 	_Other ->
 	    erlang:raise(error, {'argument_limit',{'fun',Line,Cs}},
-			 stacktrace())
+			 ?STACKTRACE)
     end,
     ret_expr(F, Bs, RBs);
 expr({named_fun,Line,Name,Cs} = Ex, Bs, Lf, Ef, RBs) ->
@@ -378,7 +381,7 @@ expr({named_fun,Line,Name,Cs} = Ex, Bs, Lf, Ef, RBs) ->
                           RF, Info) end;
         _Other ->
             erlang:raise(error, {'argument_limit',{named_fun,Line,Name,Cs}},
-                         stacktrace())
+                         ?STACKTRACE)
     end,
     ret_expr(F, Bs, RBs);
 expr({call,_,{remote,_,{atom,_,qlc},{atom,_,q}},[{lc,_,_E,_Qs}=LC | As0]}, 
@@ -422,25 +425,28 @@ expr({call,_,Func0,As0}, Bs0, Lf, Ef, RBs) -> % function or {Mod,Fun}
     {As,Bs2} = expr_list(As0, Bs1, Lf, Ef),
     case Func of
 	{M,F} when is_atom(M), is_atom(F) ->
-	    erlang:raise(error, {badfun,Func}, stacktrace());
+	    erlang:raise(error, {badfun,Func}, ?STACKTRACE);
 	_ ->
 	    do_apply(Func, As, Bs2, Ef, RBs)
     end;
 expr({'catch',_,Expr}, Bs0, Lf, Ef, RBs) ->
-    Ref = make_ref(),
-    case catch {Ref,expr(Expr, Bs0, Lf, Ef, none)} of
-	{Ref,{value,V,Bs}} ->	  % Nothing was thrown (guaranteed).
-            ret_expr(V, Bs, RBs);
-	Other ->
-            ret_expr(Other, Bs0, RBs)
+    try expr(Expr, Bs0, Lf, Ef, none) of
+        {value,V,Bs} ->
+            ret_expr(V, Bs, RBs)
+    catch
+        throw:Term ->
+            ret_expr(Term, Bs0, RBs);
+        exit:Reason ->
+            ret_expr({'EXIT',Reason}, Bs0, RBs);
+        error:Reason:Stacktrace ->
+            ret_expr({'EXIT',{Reason,Stacktrace}}, Bs0, RBs)
     end;
 expr({match,_,Lhs,Rhs0}, Bs0, Lf, Ef, RBs) ->
     {value,Rhs,Bs1} = expr(Rhs0, Bs0, Lf, Ef, none),
     case match(Lhs, Rhs, Bs1) of
 	{match,Bs} ->
             ret_expr(Rhs, Bs, RBs);
-	nomatch ->
-	    erlang:raise(error, {badmatch,Rhs}, stacktrace())
+	nomatch -> erlang:raise(error, {badmatch,Rhs}, ?STACKTRACE)
     end;
 expr({op,_,Op,A0}, Bs0, Lf, Ef, RBs) ->
     {value,A,Bs} = expr(A0, Bs0, Lf, Ef, none),
@@ -452,7 +458,7 @@ expr({op,_,'andalso',L0,R0}, Bs0, Lf, Ef, RBs) ->
 		{value,R,_} = expr(R0, Bs1, Lf, Ef, none),
 		R;
 	    false -> false;
-	    _ -> erlang:raise(error, {badarg,L}, stacktrace())
+	    _ -> erlang:raise(error, {badarg,L}, ?STACKTRACE)
 	end,
     ret_expr(V, Bs1, RBs);
 expr({op,_,'orelse',L0,R0}, Bs0, Lf, Ef, RBs) ->
@@ -462,7 +468,7 @@ expr({op,_,'orelse',L0,R0}, Bs0, Lf, Ef, RBs) ->
 	    false ->
 		{value,R,_} = expr(R0, Bs1, Lf, Ef, none),
 		R;
-	    _ -> erlang:raise(error, {badarg,L}, stacktrace())
+	    _ -> erlang:raise(error, {badarg,L}, ?STACKTRACE)
 	end,
     ret_expr(V, Bs1, RBs);
 expr({op,_,Op,L0,R0}, Bs0, Lf, Ef, RBs) ->
@@ -474,7 +480,7 @@ expr({bin,_,Fs}, Bs0, Lf, Ef, RBs) ->
     {value,V,Bs} = eval_bits:expr_grp(Fs, Bs0, EvalFun),
     ret_expr(V, Bs, RBs);
 expr({remote,_,_,_}, _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, {badexpr,':'}, stacktrace());
+    erlang:raise(error, {badexpr,':'}, ?STACKTRACE);
 expr({value,_,Val}, Bs, _Lf, _Ef, RBs) ->    % Special case straight values.
     ret_expr(Val, Bs, RBs).
 
@@ -570,7 +576,7 @@ local_func(Func, As, _Bs, {M,F,Eas}, _Ef, RBs) ->
     local_func2(apply(M, F, [Func,As|Eas]), RBs);
 %% Default unknown function handler to undefined function.
 local_func(Func, As0, _Bs0, none, _Ef, _RBs) ->
-    erlang:raise(error, undef, [{erl_eval,Func,length(As0)}|stacktrace()]).
+    erlang:raise(error, undef, [{?MODULE,Func,length(As0)}|?STACKTRACE]).
 
 local_func2({value,V,Bs}, RBs) ->
     ret_expr(V, Bs, RBs);
@@ -637,7 +643,7 @@ do_apply(Func, As, Bs0, Ef, RBs) ->
                 {{arity, Arity}, Arity} ->
                     eval_fun(FCs, As, FBs, FLf, FEf, NRBs);
                 _ ->
-                    erlang:raise(error, {badarity,{Func,As}},stacktrace())
+                    erlang:raise(error, {badarity,{Func,As}},?STACKTRACE)
             end;
         {{env,[{FBs,FLf,FEf,FCs,FName}]},_} ->
             NRBs = if
@@ -648,7 +654,7 @@ do_apply(Func, As, Bs0, Ef, RBs) ->
                 {{arity, Arity}, Arity} ->
                     eval_named_fun(FCs, As, FBs, FLf, FEf, FName, Func, NRBs);
                 _ ->
-                    erlang:raise(error, {badarity,{Func,As}},stacktrace())
+                    erlang:raise(error, {badarity,{Func,As}},?STACKTRACE)
             end;
         {no_env,none} when RBs =:= value ->
             %% Make tail recursive calls when possible.
@@ -730,7 +736,7 @@ eval_generate([V|Rest], P, Bs0, Lf, Ef, CompFun, Acc) ->
 eval_generate([], _P, _Bs0, _Lf, _Ef, _CompFun, Acc) ->
     Acc;
 eval_generate(Term, _P, _Bs0, _Lf, _Ef, _CompFun, _Acc) ->
-    erlang:raise(error, {bad_generator,Term}, stacktrace()).
+    erlang:raise(error, {bad_generator,Term}, ?STACKTRACE).
 
 eval_b_generate(<<_/bitstring>>=Bin, P, Bs0, Lf, Ef, CompFun, Acc) ->
     Mfun = match_fun(Bs0),
@@ -746,7 +752,7 @@ eval_b_generate(<<_/bitstring>>=Bin, P, Bs0, Lf, Ef, CompFun, Acc) ->
 	    Acc
     end;
 eval_b_generate(Term, _P, _Bs0, _Lf, _Ef, _CompFun, _Acc) ->
-    erlang:raise(error, {bad_generator,Term}, stacktrace()).
+    erlang:raise(error, {bad_generator,Term}, ?STACKTRACE).
 
 eval_filter(F, Bs0, Lf, Ef, CompFun, Acc) ->
     case erl_lint:is_guard_test(F) of
@@ -760,7 +766,7 @@ eval_filter(F, Bs0, Lf, Ef, CompFun, Acc) ->
 		{value,true,Bs1} -> CompFun(Bs1);
 		{value,false,_} -> Acc;
 		{value,V,_} -> 
-                    erlang:raise(error, {bad_filter,V}, stacktrace())
+                    erlang:raise(error, {bad_filter,V}, ?STACKTRACE)
 	    end
     end.
 
@@ -816,7 +822,7 @@ eval_fun([{clause,_,H,G,B}|Cs], As, Bs0, Lf, Ef, RBs) ->
     end;
 eval_fun([], As, _Bs, _Lf, _Ef, _RBs) ->
     erlang:raise(error, function_clause, 
-		 [{?MODULE,'-inside-an-interpreted-fun-',As}|stacktrace()]).
+		 [{?MODULE,'-inside-an-interpreted-fun-',As}|?STACKTRACE]).
 
 
 eval_named_fun(As, Fun, {Bs0,Lf,Ef,Cs,Name}) ->
@@ -836,7 +842,7 @@ eval_named_fun([{clause,_,H,G,B}|Cs], As, Bs0, Lf, Ef, Name, Fun, RBs) ->
     end;
 eval_named_fun([], As, _Bs, _Lf, _Ef, _Name, _Fun, _RBs) ->
     erlang:raise(error, function_clause,
-                 [{?MODULE,'-inside-an-interpreted-fun-',As}|stacktrace()]).
+                 [{?MODULE,'-inside-an-interpreted-fun-',As}|?STACKTRACE]).
 
 
 %% expr_list(ExpressionList, Bindings)
@@ -894,13 +900,13 @@ if_clauses([{clause,_,[],G,B}|Cs], Bs, Lf, Ef, RBs) ->
 	false -> if_clauses(Cs, Bs, Lf, Ef, RBs)
     end;
 if_clauses([], _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, if_clause, stacktrace()).
+    erlang:raise(error, if_clause, ?STACKTRACE).
 
 %% try_clauses(Body, CaseClauses, CatchClauses, AfterBody, Bindings, 
 %%             LocalFuncHandler, ExtFuncHandler, RBs)
-%% When/if variable bindings between the different parts of a
-%% try-catch expression are introduced this will have to be rewritten.
+
 try_clauses(B, Cases, Catches, AB, Bs, Lf, Ef, RBs) ->
+    check_stacktrace_vars(Catches, Bs),
     try exprs(B, Bs, Lf, Ef, none) of
 	{value,V,Bs1} when Cases =:= [] ->
 	    ret_expr(V, Bs1, RBs);
@@ -909,23 +915,18 @@ try_clauses(B, Cases, Catches, AB, Bs, Lf, Ef, RBs) ->
 		{B2,Bs2} ->
 		    exprs(B2, Bs2, Lf, Ef, RBs);
 		nomatch ->
-		    erlang:raise(error, {try_clause,V}, stacktrace())
+		    erlang:raise(error, {try_clause,V}, ?STACKTRACE)
 	    end
     catch
-	Class:Reason when Catches =:= [] ->
-	    %% Rethrow
-	    erlang:raise(Class, Reason, stacktrace());
-	Class:Reason ->
-%%% 	    %% Set stacktrace
-%%% 	    try erlang:raise(Class, Reason, stacktrace())
-%%% 	    catch _:_ -> ok 
-%%% 	    end,
-            V = {Class,Reason,erlang:get_stacktrace()},
-	    case match_clause(Catches, [V],Bs, Lf, Ef) of
+	Class:Reason:Stacktrace when Catches =:= [] ->
+	    erlang:raise(Class, Reason, Stacktrace);
+	Class:Reason:Stacktrace ->
+            V = {Class,Reason,Stacktrace},
+	    case match_clause(Catches, [V], Bs, Lf, Ef) of
 		{B2,Bs2} ->
 		    exprs(B2, Bs2, Lf, Ef, RBs);
 		nomatch ->
-		    erlang:raise(Class, Reason, stacktrace())
+		    erlang:raise(Class, Reason, Stacktrace)
 	    end
     after
 	if AB =:= [] -> 
@@ -935,6 +936,23 @@ try_clauses(B, Cases, Catches, AB, Bs, Lf, Ef, RBs) ->
 	end
     end.
 
+check_stacktrace_vars([{clause,_,[{tuple,_,[_,_,STV]}],_,_}|Cs], Bs) ->
+    case STV of
+        {var,_,V} ->
+            case binding(V, Bs) of
+                {value, _} ->
+                    erlang:raise(error, stacktrace_bound, ?STACKTRACE);
+                unbound ->
+                    check_stacktrace_vars(Cs, Bs)
+            end;
+        _ ->
+            erlang:raise(error,
+                         {illegal_stacktrace_variable,STV},
+                         ?STACKTRACE)
+    end;
+check_stacktrace_vars([], _Bs) ->
+    ok.
+
 %% case_clauses(Value, Clauses, Bindings, LocalFuncHandler, ExtFuncHandler, 
 %%              RBs)
 
@@ -943,7 +961,7 @@ case_clauses(Val, Cs, Bs, Lf, Ef, RBs) ->
 	{B, Bs1} ->
 	    exprs(B, Bs1, Lf, Ef, RBs);
 	nomatch ->
-	    erlang:raise(error, {case_clause,Val}, stacktrace())
+	    erlang:raise(error, {case_clause,Val}, ?STACKTRACE)
     end.
 
 %%
@@ -1018,7 +1036,7 @@ guard0([G|Gs], Bs0, Lf, Ef) ->
                 {value,false,_} -> false
 	    end;
 	false ->
-	    erlang:raise(error, guard_expr, stacktrace())
+	    erlang:raise(error, guard_expr, ?STACKTRACE)
     end;
 guard0([], _Bs, _Lf, _Ef) -> true.
 
@@ -1073,7 +1091,7 @@ match(Pat, Term, Bs) ->
 match(Pat, Term, Bs, BBs) ->
     case catch match1(Pat, Term, Bs, BBs) of
 	invalid ->
-	    erlang:raise(error, {illegal_pattern,Pat}, stacktrace());
+	    erlang:raise(error, {illegal_pattern,Pat}, ?STACKTRACE);
 	Other ->
 	    Other
     end.
@@ -1254,7 +1272,7 @@ merge_bindings(Bs1, Bs2) ->
 		  case orddict:find(Name, Bs) of
 		      {ok,Val} -> Bs;		%Already with SAME value
 		      {ok,V1} -> 
-			  erlang:raise(error, {badmatch,V1}, stacktrace());
+			  erlang:raise(error, {badmatch,V1}, ?STACKTRACE);
 		      error -> orddict:store(Name, Val, Bs)
 		  end end,
 	  Bs2, orddict:to_list(Bs1)).
@@ -1264,7 +1282,7 @@ merge_bindings(Bs1, Bs2) ->
 %%       fun (Name, Val, Bs) ->
 %% 	      case orddict:find(Name, Bs) of
 %% 		  {ok,Val} -> orddict:erase(Name, Bs);
-%% 		  {ok,V1} -> erlang:raise(error,{badmatch,V1},stacktrace());
+%% 		  {ok,V1} -> erlang:raise(error,{badmatch,V1},?STACKTRACE);
 %% 		  error -> Bs
 %% 	      end
 %%       end, Bs2, Bs1).
@@ -1326,7 +1344,3 @@ ret_expr(_Old, New) ->
     New.
 
 line(Expr) -> element(2, Expr).
-
-%% {?MODULE,expr,3} is still the stacktrace, despite the
-%% fact that expr() now takes two, three or four arguments...
-stacktrace() -> [{?MODULE,expr,3}].
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index f58cb35cea..9a62d21d34 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -144,6 +144,7 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
                    :: dict:dict(ta(), #typeinfo{}),
                exp_types=gb_sets:empty()        %Exported types
                    :: gb_sets:set(ta()),
+               in_try_head=false :: boolean(),  %In a try head.
                catch_scope = none               %Inside/outside try or catch
                    :: catch_scope()
               }).
@@ -312,6 +313,10 @@ format_error({unused_var, V}) ->
     io_lib:format("variable ~w is unused", [V]);
 format_error({variable_in_record_def,V}) ->
     io_lib:format("variable ~w in record definition", [V]);
+format_error({stacktrace_guard,V}) ->
+    io_lib:format("stacktrace variable ~w must not be used in a guard", [V]);
+format_error({stacktrace_bound,V}) ->
+    io_lib:format("stacktrace variable ~w must not be previously bound", [V]);
 %% --- binaries ---
 format_error({undefined_bittype,Type}) ->
     io_lib:format("bit type ~tw undefined", [Type]);
@@ -3218,11 +3223,11 @@ is_module_dialyzer_option(Option) ->
 
 try_clauses(Scs, Ccs, In, Vt, St0) ->
     {Csvt0,St1} = icrt_clauses(Scs, Vt, St0),
-    St2 = St1#lint{catch_scope=try_catch},
+    St2 = St1#lint{catch_scope=try_catch,in_try_head=true},
     {Csvt1,St3} = icrt_clauses(Ccs, Vt, St2),
     Csvt = Csvt0 ++ Csvt1,
     UpdVt = icrt_export(Csvt, Vt, In, St3),
-    {UpdVt,St3}.
+    {UpdVt,St3#lint{in_try_head=false}}.
 
 %% icrt_clauses(Clauses, In, ImportVarTable, State) ->
 %%      {UpdVt,State}.
@@ -3239,12 +3244,29 @@ icrt_clauses(Cs, Vt, St) ->
     mapfoldl(fun (C, St0) -> icrt_clause(C, Vt, St0) end, St, Cs).
 
 icrt_clause({clause,_Line,H,G,B}, Vt0, #lint{catch_scope=Scope}=St0) ->
-    {Hvt,Binvt,St1} = head(H, Vt0, St0),
-    Vt1 = vtupdate(Hvt, Binvt),
-    {Gvt,St2} = guard(G, vtupdate(Vt1, Vt0), St1),
-    Vt2 = vtupdate(Gvt, Vt1),
-    {Bvt,St3} = exprs(B, vtupdate(Vt2, Vt0), St2),
-    {vtupdate(Bvt, Vt2),St3#lint{catch_scope=Scope}}.
+    Vt1 = taint_stack_var(Vt0, H, St0),
+    {Hvt,Binvt,St1} = head(H, Vt1, St0),
+    Vt2 = vtupdate(Hvt, Binvt),
+    Vt3 = taint_stack_var(Vt2, H, St0),
+    {Gvt,St2} = guard(G, vtupdate(Vt3, Vt0), St1#lint{in_try_head=false}),
+    Vt4 = vtupdate(Gvt, Vt2),
+    {Bvt,St3} = exprs(B, vtupdate(Vt4, Vt0), St2),
+    {vtupdate(Bvt, Vt4),St3#lint{catch_scope=Scope}}.
+
+taint_stack_var(Vt, Pat, #lint{in_try_head=true}) ->
+    [{tuple,_,[_,_,{var,_,Stk}]}] = Pat,
+    case Stk of
+        '_' ->
+            Vt;
+        _ ->
+            lists:map(fun({V,{bound,Used,Lines}}) when V =:= Stk ->
+                              {V,{stacktrace,Used,Lines}};
+                         (B) ->
+                              B
+                      end, Vt)
+    end;
+taint_stack_var(Vt, _Pat, #lint{in_try_head=false}) ->
+    Vt.
 
 icrt_export(Vts, Vt, {Tag,Attrs}, St) ->
     {_File,Loc} = loc(Attrs, St),
@@ -3484,6 +3506,9 @@ pat_var(V, Line, Vt, Bvt, St) ->
                     {[{V,{bound,used,Ls}}],[],
                      %% As this is matching, exported vars are risky.
                      add_warning(Line, {exported_var,V,From}, St)};
+                {ok,{stacktrace,_Usage,Ls}} ->
+                    {[{V,{bound,used,Ls}}],[],
+                     add_error(Line, {stacktrace_bound,V}, St)};
                 error when St#lint.recdef_top ->
                     {[],[{V,{bound,unused,[Line]}}],
                      add_error(Line, {variable_in_record_def,V}, St)};
@@ -3541,6 +3566,9 @@ expr_var(V, Line, Vt, St) ->
                 false ->
                     {[{V,{{export,From},used,Ls}}],St}
             end;
+        {ok,{stacktrace,_Usage,Ls}} ->
+            {[{V,{bound,used,Ls}}],
+             add_error(Line, {stacktrace_guard,V}, St)};
         error ->
             {[{V,{bound,used,[Line]}}],
              add_error(Line, {unbound_var,V}, St)}
@@ -3943,6 +3971,8 @@ extract_sequence(3, [$.,_|Fmt], Need) ->
     extract_sequence(4, Fmt, Need);
 extract_sequence(3, Fmt, Need) ->
     extract_sequence(4, Fmt, Need);
+extract_sequence(4, [$t, $l | Fmt], Need) ->
+    extract_sequence(4, [$l, $t | Fmt], Need);
 extract_sequence(4, [$t, $c | Fmt], Need) ->
     extract_sequence(5, [$c|Fmt], Need);
 extract_sequence(4, [$t, $s | Fmt], Need) ->
@@ -3959,8 +3989,14 @@ extract_sequence(4, [$t, C | _Fmt], _Need) ->
     {error,"invalid control ~t" ++ [C]};
 extract_sequence(4, [$l, $p | Fmt], Need) ->
     extract_sequence(5, [$p|Fmt], Need);
+extract_sequence(4, [$l, $t, $p | Fmt], Need) ->
+    extract_sequence(5, [$p|Fmt], Need);
 extract_sequence(4, [$l, $P | Fmt], Need) ->
     extract_sequence(5, [$P|Fmt], Need);
+extract_sequence(4, [$l, $t, $P | Fmt], Need) ->
+    extract_sequence(5, [$P|Fmt], Need);
+extract_sequence(4, [$l, $t, C | _Fmt], _Need) ->
+    {error,"invalid control ~lt" ++ [C]};
 extract_sequence(4, [$l, C | _Fmt], _Need) ->
     {error,"invalid control ~l" ++ [C]};
 extract_sequence(4, Fmt, Need) ->
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index 6e72d64acc..14ca24362e 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -29,6 +29,10 @@ clause_args clause_guard clause_body
 expr expr_100 expr_150 expr_160 expr_200 expr_300 expr_400 expr_500
 expr_600 expr_700 expr_800
 expr_max
+pat_expr pat_expr_200 pat_expr_300 pat_expr_400 pat_expr_500
+pat_expr_600 pat_expr_700 pat_expr_800
+pat_expr_max map_pat_expr record_pat_expr
+pat_argument_list pat_exprs
 list tail
 list_comprehension lc_expr lc_exprs
 binary_comprehension
@@ -37,7 +41,7 @@ record_expr record_tuple record_field record_fields
 map_expr map_tuple map_field map_field_assoc map_field_exact map_fields map_key
 if_expr if_clause if_clauses case_expr cr_clause cr_clauses receive_expr
 fun_expr fun_clause fun_clauses atom_or_var integer_or_var
-try_expr try_catch try_clause try_clauses
+try_expr try_catch try_clause try_clauses try_opt_stacktrace
 function_call argument_list
 exprs guard
 atomic strings
@@ -66,7 +70,7 @@ char integer float atom string var
 'spec' 'callback' % helper
 dot.
 
-Expect 2.
+Expect 0.
 
 Rootsymbol form.
 
@@ -210,7 +214,7 @@ function_clause -> atom clause_args clause_guard clause_body :
 	{clause,?anno('$1'),element(3, '$1'),'$2','$3','$4'}.
 
 
-clause_args -> argument_list : element(1, '$1').
+clause_args -> pat_argument_list : element(1, '$1').
 
 clause_guard -> 'when' guard : '$2'.
 clause_guard -> '$empty' : [].
@@ -275,6 +279,53 @@ expr_max -> receive_expr : '$1'.
 expr_max -> fun_expr : '$1'.
 expr_max -> try_expr : '$1'.
 
+pat_expr -> pat_expr_200 '=' pat_expr : {match,?anno('$2'),'$1','$3'}.
+pat_expr -> pat_expr_200 : '$1'.
+
+pat_expr_200 -> pat_expr_300 comp_op pat_expr_300 :
+	?mkop2('$1', '$2', '$3').
+pat_expr_200 -> pat_expr_300 : '$1'.
+
+pat_expr_300 -> pat_expr_400 list_op pat_expr_300 :
+	?mkop2('$1', '$2', '$3').
+pat_expr_300 -> pat_expr_400 : '$1'.
+
+pat_expr_400 -> pat_expr_400 add_op pat_expr_500 :
+	?mkop2('$1', '$2', '$3').
+pat_expr_400 -> pat_expr_500 : '$1'.
+
+pat_expr_500 -> pat_expr_500 mult_op pat_expr_600 :
+	?mkop2('$1', '$2', '$3').
+pat_expr_500 -> pat_expr_600 : '$1'.
+
+pat_expr_600 -> prefix_op pat_expr_700 :
+	?mkop1('$1', '$2').
+pat_expr_600 -> map_pat_expr : '$1'.
+pat_expr_600 -> pat_expr_700 : '$1'.
+
+pat_expr_700 -> record_pat_expr : '$1'.
+pat_expr_700 -> pat_expr_800 : '$1'.
+
+pat_expr_800 -> pat_expr_max : '$1'.
+
+pat_expr_max -> var : '$1'.
+pat_expr_max -> atomic : '$1'.
+pat_expr_max -> list : '$1'.
+pat_expr_max -> binary : '$1'.
+pat_expr_max -> tuple : '$1'.
+pat_expr_max -> '(' pat_expr ')' : '$2'.
+
+map_pat_expr -> '#' map_tuple :
+	{map, ?anno('$1'),'$2'}.
+map_pat_expr -> pat_expr_max '#' map_tuple :
+	{map, ?anno('$2'),'$1','$3'}.
+map_pat_expr -> map_pat_expr '#' map_tuple :
+	{map, ?anno('$2'),'$1','$3'}.
+
+record_pat_expr -> '#' atom '.' atom :
+	{record_index,?anno('$1'),element(3, '$2'),'$4'}.
+record_pat_expr -> '#' atom record_tuple :
+	{record,?anno('$1'),element(3, '$2'),'$3'}.
 
 list -> '[' ']' : {nil,?anno('$1')}.
 list -> '[' expr tail : {cons,?anno('$1'),'$2','$3'}.
@@ -397,6 +448,10 @@ case_expr -> 'case' expr 'of' cr_clauses 'end' :
 cr_clauses -> cr_clause : ['$1'].
 cr_clauses -> cr_clause ';' cr_clauses : ['$1' | '$3'].
 
+%% FIXME: merl in syntax_tools depends on patterns in a 'case' being
+%% full expressions. Therefore, we can't use pat_expr here. There
+%% should be a better way.
+
 cr_clause -> expr clause_guard clause_body :
 	{clause,?anno('$1'),['$1'],'$2','$3'}.
 
@@ -424,11 +479,11 @@ integer_or_var -> var : '$1'.
 fun_clauses -> fun_clause : ['$1'].
 fun_clauses -> fun_clause ';' fun_clauses : ['$1' | '$3'].
 
-fun_clause -> argument_list clause_guard clause_body :
+fun_clause -> pat_argument_list clause_guard clause_body :
 	{Args,Anno} = '$1',
 	{clause,Anno,'fun',Args,'$2','$3'}.
 
-fun_clause -> var argument_list clause_guard clause_body :
+fun_clause -> var pat_argument_list clause_guard clause_body :
 	{clause,element(2, '$1'),element(3, '$1'),element(1, '$2'),'$3','$4'}.
 
 try_expr -> 'try' exprs 'of' cr_clauses try_catch :
@@ -446,24 +501,31 @@ try_catch -> 'after' exprs 'end' :
 try_clauses -> try_clause : ['$1'].
 try_clauses -> try_clause ';' try_clauses : ['$1' | '$3'].
 
-try_clause -> expr clause_guard clause_body :
+try_clause -> pat_expr clause_guard clause_body :
 	A = ?anno('$1'),
 	{clause,A,[{tuple,A,[{atom,A,throw},'$1',{var,A,'_'}]}],'$2','$3'}.
-try_clause -> atom ':' expr clause_guard clause_body :
+try_clause -> atom ':' pat_expr try_opt_stacktrace clause_guard clause_body :
 	A = ?anno('$1'),
-	{clause,A,[{tuple,A,['$1','$3',{var,A,'_'}]}],'$4','$5'}.
-try_clause -> var ':' expr clause_guard clause_body :
+	{clause,A,[{tuple,A,['$1','$3',{var,A,'$4'}]}],'$5','$6'}.
+try_clause -> var ':' pat_expr try_opt_stacktrace clause_guard clause_body :
 	A = ?anno('$1'),
-	{clause,A,[{tuple,A,['$1','$3',{var,A,'_'}]}],'$4','$5'}.
+	{clause,A,[{tuple,A,['$1','$3',{var,A,'$4'}]}],'$5','$6'}.
 
+try_opt_stacktrace -> ':' var : element(3, '$2').
+try_opt_stacktrace -> '$empty' : '_'.
 
 argument_list -> '(' ')' : {[],?anno('$1')}.
 argument_list -> '(' exprs ')' : {'$2',?anno('$1')}.
 
+pat_argument_list -> '(' ')' : {[],?anno('$1')}.
+pat_argument_list -> '(' pat_exprs ')' : {'$2',?anno('$1')}.
 
 exprs -> expr : ['$1'].
 exprs -> expr ',' exprs : ['$1' | '$3'].
 
+pat_exprs -> pat_expr : ['$1'].
+pat_exprs -> pat_expr ',' pat_exprs : ['$1' | '$3'].
+
 guard -> exprs : ['$1'].
 guard -> exprs ';' guard : ['$1'|'$3'].
 
diff --git a/lib/stdlib/src/erl_tar.erl b/lib/stdlib/src/erl_tar.erl
index 76f0b38108..d8b8f466b1 100644
--- a/lib/stdlib/src/erl_tar.erl
+++ b/lib/stdlib/src/erl_tar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -189,7 +189,7 @@ table(Name) ->
 %% Returns a list of names of the files in the tar file Name.
 %% Options accepted: compressed, verbose, cooked.
 -spec table(open_handle(), [compressed | verbose | cooked]) ->
-                   {ok, [tar_entry()]} | {error, term()}.
+                   {ok, [string() | tar_entry()]} | {error, term()}.
 table(Name, Opts) when is_list(Opts) ->
     foldl_read(Name, fun table1/4, [], table_opts(Opts)).
 
@@ -457,26 +457,61 @@ add(Reader, NameOrBin, NameInArchive, Options)
 
 do_add(#reader{access=write}=Reader, Name, NameInArchive, Options)
   when is_list(NameInArchive), is_list(Options) ->
-    RF = fun(F) -> file:read_link_info(F, [{time, posix}]) end,
+    RF = apply_file_info_opts_fun(Options, read_link_info),
     Opts = #add_opts{read_info=RF},
-    add1(Reader, Name, NameInArchive, add_opts(Options, Opts));
+    add1(Reader, Name, NameInArchive, add_opts(Options, Options, Opts));
 do_add(#reader{access=read},_,_,_) ->
     {error, eacces};
 do_add(Reader,_,_,_) ->
     {error, {badarg, Reader}}.
 
-add_opts([dereference|T], Opts) ->
-    RF = fun(F) -> file:read_file_info(F, [{time, posix}]) end,
-    add_opts(T, Opts#add_opts{read_info=RF});
-add_opts([verbose|T], Opts) ->
-    add_opts(T, Opts#add_opts{verbose=true});
-add_opts([{chunks,N}|T], Opts) ->
-    add_opts(T, Opts#add_opts{chunk_size=N});
-add_opts([_|T], Opts) ->
-    add_opts(T, Opts);
-add_opts([], Opts) ->
+add_opts([dereference|T], AllOptions, Opts) ->
+    RF = apply_file_info_opts_fun(AllOptions, read_file_info),
+    add_opts(T, AllOptions, Opts#add_opts{read_info=RF});
+add_opts([verbose|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{verbose=true});
+add_opts([{chunks,N}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{chunk_size=N});
+add_opts([{atime,Value}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{atime=Value});
+add_opts([{mtime,Value}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{mtime=Value});
+add_opts([{ctime,Value}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{ctime=Value});
+add_opts([{uid,Value}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{uid=Value});
+add_opts([{gid,Value}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{gid=Value});
+add_opts([_|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts);
+add_opts([], _AllOptions, Opts) ->
     Opts.
 
+apply_file_info_opts(Opts, {ok, FileInfo}) ->
+    {ok, do_apply_file_info_opts(Opts, FileInfo)};
+apply_file_info_opts(_Opts, Other) ->
+    Other.
+
+do_apply_file_info_opts([{atime,Value}|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo#file_info{atime=Value});
+do_apply_file_info_opts([{mtime,Value}|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo#file_info{mtime=Value});
+do_apply_file_info_opts([{ctime,Value}|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo#file_info{ctime=Value});
+do_apply_file_info_opts([{uid,Value}|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo#file_info{uid=Value});
+do_apply_file_info_opts([{gid,Value}|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo#file_info{gid=Value});
+do_apply_file_info_opts([_|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo);
+do_apply_file_info_opts([], FileInfo) ->
+    FileInfo.
+
+apply_file_info_opts_fun(Options, InfoFunction) ->
+   fun(F) ->
+       apply_file_info_opts(Options, file:InfoFunction(F, [{time, posix}]))
+   end.
+
 add1(#reader{}=Reader, Name, NameInArchive, #add_opts{read_info=ReadInfo}=Opts)
   when is_list(Name) ->
     Res = case ReadInfo(Name) of
@@ -515,9 +550,11 @@ add1(Reader, Bin, NameInArchive, Opts) when is_binary(Bin) ->
                 name = NameInArchive,
                 size = byte_size(Bin),
                 typeflag = ?TYPE_REGULAR,
-                atime = Now,
-                mtime = Now,
-                ctime = Now,
+                atime = add_opts_time(Opts#add_opts.atime, Now),
+                mtime = add_opts_time(Opts#add_opts.mtime, Now),
+                ctime = add_opts_time(Opts#add_opts.ctime, Now),
+                uid = Opts#add_opts.uid,
+                gid = Opts#add_opts.gid,
                 mode = 8#100644},
     {ok, Reader2} = add_header(Reader, Header, Opts),
     Padding = skip_padding(byte_size(Bin)),
@@ -527,6 +564,9 @@ add1(Reader, Bin, NameInArchive, Opts) when is_binary(Bin) ->
         {error, Reason} -> {error, {NameInArchive, Reason}}
     end.
 
+add_opts_time(undefined, Now) -> Now;
+add_opts_time(Time, _Now) -> Time.
+
 add_directory(Reader, DirName, NameInArchive, Info, Opts) ->
     case file:list_dir(DirName) of
         {ok, []} ->
@@ -1650,8 +1690,12 @@ write_file(Name, Bin) ->
     case file:write_file(Name, Bin) of
         ok -> ok;
         {error,enoent} ->
-            ok = make_dirs(Name, file),
-            write_file(Name, Bin);
+            case make_dirs(Name, file) of
+                ok ->
+                    write_file(Name, Bin);
+                {error,Reason} ->
+                    throw({error, Reason})
+            end;
         {error,Reason} ->
             throw({error, Reason})
     end.
diff --git a/lib/stdlib/src/erl_tar.hrl b/lib/stdlib/src/erl_tar.hrl
index cff0c2f500..5d6cecbb66 100644
--- a/lib/stdlib/src/erl_tar.hrl
+++ b/lib/stdlib/src/erl_tar.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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,7 +21,12 @@
 -record(add_opts, {
 	 read_info,          %% Fun to use for read file/link info.
 	 chunk_size = 0,     %% For file reading when sending to sftp. 0=do not chunk
-         verbose = false}).  %% Verbose on/off.
+         verbose = false,    %% Verbose on/off.
+         atime = undefined,
+         mtime = undefined,
+         ctime = undefined,
+         uid = 0,
+         gid = 0}).
 -type add_opts() :: #add_opts{}.
 
 %% Options used when reading a tar archive.
@@ -36,7 +41,12 @@
 
 -type add_opt() :: dereference |
                    verbose |
-                   {chunks, pos_integer()}.
+                   {chunks, pos_integer()} |
+                   {atime, non_neg_integer()} |
+                   {mtime, non_neg_integer()} |
+                   {ctime, non_neg_integer()} |
+                   {uid, non_neg_integer()} |
+                   {gid, non_neg_integer()}.
 
 -type extract_opt() :: {cwd, string()} |
                        {files, [string()]} |
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index 132f8efbbe..beea9927d2 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -283,8 +283,7 @@ start(EscriptOptions) ->
         throw:Str ->
             io:format("escript: ~ts\n", [Str]),
             my_halt(127);
-        _:Reason ->
-            Stk = erlang:get_stacktrace(),
+        _:Reason:Stk ->
             io:format("escript: Internal error: ~tp\n", [Reason]),
             io:format("~tp\n", [Stk]),
             my_halt(127)
@@ -759,8 +758,8 @@ run(Module, Args) ->
         Module:main(Args),
         my_halt(0)
     catch
-        Class:Reason ->
-            fatal(format_exception(Class, Reason))
+        Class:Reason:StackTrace ->
+            fatal(format_exception(Class, Reason, StackTrace))
     end.
 
 -spec interpret(_, _, _, _) -> no_return().
@@ -793,8 +792,8 @@ interpret(Forms, HasRecs,  File, Args) ->
                                  end}),
         my_halt(0)
     catch
-        Class:Reason ->
-            fatal(format_exception(Class, Reason))
+        Class:Reason:StackTrace ->
+            fatal(format_exception(Class, Reason, StackTrace))
     end.
 
 report_errors(Errors) ->
@@ -873,7 +872,7 @@ eval_exprs([E|Es], Bs0, Lf, Ef, RBs) ->
     {value,_V,Bs} = erl_eval:expr(E, Bs0, Lf, Ef, RBs1),
     eval_exprs(Es, Bs, Lf, Ef, RBs).
 
-format_exception(Class, Reason) ->
+format_exception(Class, Reason, StackTrace) ->
     Enc = encoding(),
     P = case Enc of
             latin1 -> "P";
@@ -882,7 +881,6 @@ format_exception(Class, Reason) ->
     PF = fun(Term, I) ->
                  io_lib:format("~." ++ integer_to_list(I) ++ P, [Term, 50])
          end,
-    StackTrace = erlang:get_stacktrace(),
     StackFun = fun(M, _F, _A) -> (M =:= erl_eval) or (M =:= ?MODULE) end,
     lib:format_exception(1, Class, Reason, StackTrace, StackFun, PF, Enc).
 
@@ -916,8 +914,8 @@ hidden_apply(App, M, F, Args) ->
     try
 	apply(fun() -> M end(), F, Args)
     catch
-	error:undef ->
-	    case erlang:get_stacktrace() of
+	error:undef:StackTrace ->
+	    case StackTrace of
 		[{M,F,Args,_} | _] ->
 		    Arity = length(Args),
 		    Text = io_lib:format("Call to ~w:~w/~w in application ~w failed.\n",
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index b6548626f3..6a559f0be5 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -73,7 +73,8 @@
          select_count/2, select_delete/2, select_replace/2, select_reverse/1,
          select_reverse/2, select_reverse/3, setopts/2, slot/2,
          take/2,
-         update_counter/3, update_counter/4, update_element/3]).
+         update_counter/3, update_counter/4, update_element/3,
+         whereis/1]).
 
 %% internal exports
 -export([internal_request_all/0]).
@@ -145,6 +146,7 @@ give_away(_, _, _) ->
       InfoList :: [InfoTuple],
       InfoTuple :: {compressed, boolean()}
                  | {heir, pid() | none}
+                 | {id, tid()}
                  | {keypos, pos_integer()}
                  | {memory, non_neg_integer()}
                  | {name, atom()}
@@ -162,7 +164,7 @@ info(_) ->
 
 -spec info(Tab, Item) -> Value | undefined when
       Tab :: tab(),
-      Item :: compressed | fixed | heir | keypos | memory
+      Item :: compressed | fixed | heir | id | keypos | memory
             | name | named_table | node | owner | protection
             | safe_fixed | safe_fixed_monotonic_time | size | stats | type
 	    | write_concurrency | read_concurrency,
@@ -277,7 +279,7 @@ match_spec_compile(_) ->
     erlang:nif_error(undef).
 
 -spec match_spec_run_r(List, CompiledMatchSpec, list()) -> list() when
-      List :: [tuple()],
+      List :: [term()],
       CompiledMatchSpec :: comp_match_spec().
 
 match_spec_run_r(_, _, _) ->
@@ -512,12 +514,17 @@ update_counter(_, _, _, _) ->
 update_element(_, _, _) ->
     erlang:nif_error(undef).
 
+-spec whereis(TableName) -> tid() | undefined when
+    TableName :: atom().
+whereis(_) ->
+    erlang:nif_error(undef).
+
 %%% End of BIFs
 
 -opaque comp_match_spec() :: reference().
 
 -spec match_spec_run(List, CompiledMatchSpec) -> list() when
-      List :: [tuple()],
+      List :: [term()],
       CompiledMatchSpec :: comp_match_spec().
 
 match_spec_run(List, CompiledMS) ->
@@ -882,10 +889,10 @@ tab2file(Tab, File, Options) ->
 		_ = disk_log:close(Name),
 		_ = file:delete(File),
 		exit(ExReason);
-	    error:ErReason ->
+	    error:ErReason:StackTrace ->
 		_ = disk_log:close(Name),
 		_ = file:delete(File),
-	        erlang:raise(error,ErReason,erlang:get_stacktrace())
+	        erlang:raise(error,ErReason,StackTrace)
 	end
     catch
 	throw:TReason2 ->
@@ -1060,9 +1067,9 @@ file2tab(File, Opts) ->
 		exit:ExReason ->
 		    ets:delete(Tab),
 		    exit(ExReason);
-		error:ErReason ->
+		error:ErReason:StackTrace ->
 		    ets:delete(Tab),
-		    erlang:raise(error,ErReason,erlang:get_stacktrace())
+		    erlang:raise(error,ErReason,StackTrace)
 	    end
 	after
 	    _ = disk_log:close(Name)
diff --git a/lib/stdlib/src/eval_bits.erl b/lib/stdlib/src/eval_bits.erl
index 631faa3be5..bb86a65c72 100644
--- a/lib/stdlib/src/eval_bits.erl
+++ b/lib/stdlib/src/eval_bits.erl
@@ -2,7 +2,7 @@
 %%
 %% %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.
@@ -25,6 +25,9 @@
 -export([expr_grp/3,expr_grp/5,match_bits/6, 
 	 match_bits/7,bin_gen/6]).
 
+-define(STACKTRACE,
+        element(2, erlang:process_info(self(), current_stacktrace))).
+
 %% Types used in this module:
 %% @type bindings(). An abstract structure for bindings between
 %% variables and values (the environment)
@@ -93,9 +96,9 @@ eval_exp_field1(V, Size, Unit, Type, Endian, Sign) ->
 	eval_exp_field(V, Size, Unit, Type, Endian, Sign)
     catch
 	error:system_limit ->
-	    error(system_limit);
+	    erlang:raise(error, system_limit, ?STACKTRACE);
 	error:_ ->
-	    error(badarg)
+	    erlang:raise(error, badarg, ?STACKTRACE)
     end.
 
 eval_exp_field(Val, Size, Unit, integer, little, signed) ->
@@ -131,7 +134,7 @@ eval_exp_field(Val, all, Unit, binary, _, _) ->
 	Size when Size rem Unit =:= 0 ->
 	    <<Val:Size/binary-unit:1>>;
 	_ ->
-	    error(badarg)
+	    erlang:raise(error, badarg, ?STACKTRACE)
     end;
 eval_exp_field(Val, Size, Unit, binary, _, _) ->
     <<Val:(Size*Unit)/binary-unit:1>>.
@@ -377,12 +380,12 @@ make_bit_type(Line, default, Type0) ->
         {ok,all,Bt} -> {{atom,Line,all},erl_bits:as_list(Bt)};
 	{ok,undefined,Bt} -> {{atom,Line,undefined},erl_bits:as_list(Bt)};
         {ok,Size,Bt} -> {{integer,Line,Size},erl_bits:as_list(Bt)};
-        {error,Reason} -> error(Reason)
+        {error,Reason} -> erlang:raise(error, Reason, ?STACKTRACE)
     end;
 make_bit_type(_Line, Size, Type0) -> %Size evaluates to an integer or 'all'
     case erl_bits:set_bit_type(Size, Type0) of
         {ok,Size,Bt} -> {Size,erl_bits:as_list(Bt)};
-        {error,Reason} -> error(Reason)
+        {error,Reason} -> erlang:raise(error, Reason, ?STACKTRACE)
     end.
 
 match_check_size(Mfun, Size, Bs) ->
@@ -405,9 +408,3 @@ match_check_size(_, {value,_,_}, _Bs, _AllowAll) ->
     ok;	%From the debugger.
 match_check_size(_, _, _Bs, _AllowAll) ->
     throw(invalid).
-
-%% error(Reason) -> exception thrown
-%%  Throw a nice-looking exception, similar to exceptions from erl_eval.
-error(Reason) ->
-    erlang:raise(error, Reason, [{erl_eval,expr,3}]).
-
diff --git a/lib/stdlib/src/file_sorter.erl b/lib/stdlib/src/file_sorter.erl
index 3aeaff8dc4..7f74e71136 100644
--- a/lib/stdlib/src/file_sorter.erl
+++ b/lib/stdlib/src/file_sorter.erl
@@ -1314,9 +1314,9 @@ infun(W) ->
             {cont, W#w{in = NFun}, Objs};
         Error ->
             error(Error, W1)
-    catch Class:Reason ->
+    catch Class:Reason:Stacktrace ->
         cleanup(W1),
-        erlang:raise(Class, Reason, erlang:get_stacktrace())
+        erlang:raise(Class, Reason, Stacktrace)
     end.
 
 outfun(A, #w{inout_value = Val} = W) when Val =/= no_value ->
@@ -1336,9 +1336,9 @@ outfun(A, W) ->
             W#w{out = NF};
         Error ->
             error(Error, W1)
-    catch Class:Reason ->
+    catch Class:Reason:Stacktrace ->
         cleanup(W1),
-        erlang:raise(Class, Reason, erlang:get_stacktrace())
+        erlang:raise(Class, Reason, Stacktrace)
     end.
 
 is_keypos(Keypos) when is_integer(Keypos), Keypos > 0 ->
diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl
index 0f90b3fc33..de839be5cf 100644
--- a/lib/stdlib/src/filelib.erl
+++ b/lib/stdlib/src/filelib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -582,17 +582,16 @@ default_search_rules() ->
      {"", ".c", c_source_search_rules()},
      {"", ".in", basic_source_search_rules()},
      %% plain old directory rules, backwards compatible
-     {"", ""},
-     {"ebin","src"},
-     {"ebin","esrc"}
-    ].
+     {"", ""}] ++ erl_source_search_rules().
 
 basic_source_search_rules() ->
     (erl_source_search_rules()
      ++ c_source_search_rules()).
 
 erl_source_search_rules() ->
-    [{"ebin","src"}, {"ebin","esrc"}].
+    [{"ebin","src"}, {"ebin","esrc"},
+     {"ebin",filename:join("src", "*")},
+     {"ebin",filename:join("esrc", "*")}].
 
 c_source_search_rules() ->
     [{"priv","c_src"}, {"priv","src"}, {"bin","c_src"}, {"bin","src"}, {"", "src"}].
@@ -672,8 +671,16 @@ try_dir_rule(Dir, Filename, From, To) ->
 	    Src = filename:join(NewDir, Filename),
 	    case is_regular(Src) of
 		true -> {ok, Src};
-		false -> error
+		false -> find_regular_file(wildcard(Src))
 	    end;
 	false ->
 	    error
     end.
+
+find_regular_file([]) ->
+    error;
+find_regular_file([File|Files]) ->
+    case is_regular(File) of
+        true -> {ok, File};
+        false -> find_regular_file(Files)
+    end.
diff --git a/lib/stdlib/src/gen.erl b/lib/stdlib/src/gen.erl
index 33af0aed8f..2e6223d2bb 100644
--- a/lib/stdlib/src/gen.erl
+++ b/lib/stdlib/src/gen.erl
@@ -49,6 +49,7 @@
                     | {'logfile', string()}.
 -type option()     :: {'timeout', timeout()}
 		    | {'debug', [debug_flag()]}
+		    | {'hibernate_after', timeout()}
 		    | {'spawn_opt', [proc_lib:spawn_option()]}.
 -type options()    :: [option()].
 
@@ -147,57 +148,36 @@ init_it2(GenMod, Starter, Parent, Name, Mod, Args, Options) ->
 call(Process, Label, Request) -> 
     call(Process, Label, Request, ?default_timeout).
 
+%% Optimize a common case.
+call(Process, Label, Request, Timeout) when is_pid(Process),
+  Timeout =:= infinity orelse is_integer(Timeout) andalso Timeout >= 0 ->
+    do_call(Process, Label, Request, Timeout);
 call(Process, Label, Request, Timeout)
   when Timeout =:= infinity; is_integer(Timeout), Timeout >= 0 ->
     Fun = fun(Pid) -> do_call(Pid, Label, Request, Timeout) end,
     do_for_proc(Process, Fun).
 
-do_call(Process, Label, Request, Timeout) ->
-    try erlang:monitor(process, Process) of
-	Mref ->
-	    %% If the monitor/2 call failed to set up a connection to a
-	    %% remote node, we don't want the '!' operator to attempt
-	    %% to set up the connection again. (If the monitor/2 call
-	    %% failed due to an expired timeout, '!' too would probably
-	    %% have to wait for the timeout to expire.) Therefore,
-	    %% use erlang:send/3 with the 'noconnect' option so that it
-	    %% will fail immediately if there is no connection to the
-	    %% remote node.
-
-	    catch erlang:send(Process, {Label, {self(), Mref}, Request},
-		  [noconnect]),
-	    receive
-		{Mref, Reply} ->
-		    erlang:demonitor(Mref, [flush]),
-		    {ok, Reply};
-		{'DOWN', Mref, _, _, noconnection} ->
-		    Node = get_node(Process),
-		    exit({nodedown, Node});
-		{'DOWN', Mref, _, _, Reason} ->
-		    exit(Reason)
-	    after Timeout ->
-		    erlang:demonitor(Mref, [flush]),
-		    exit(timeout)
-	    end
-    catch
-	error:_ ->
-	    %% Node (C/Java?) is not supporting the monitor.
-	    %% The other possible case -- this node is not distributed
-	    %% -- should have been handled earlier.
-	    %% Do the best possible with monitor_node/2.
-	    %% This code may hang indefinitely if the Process 
-	    %% does not exist. It is only used for featureweak remote nodes.
-	    Node = get_node(Process),
-	    monitor_node(Node, true),
-	    receive
-		{nodedown, Node} -> 
-		    monitor_node(Node, false),
-		    exit({nodedown, Node})
-	    after 0 -> 
-		    Tag = make_ref(),
-		    Process ! {Label, {self(), Tag}, Request},
-		    wait_resp(Node, Tag, Timeout)
-	    end
+do_call(Process, Label, Request, Timeout) when is_atom(Process) =:= false ->
+    Mref = erlang:monitor(process, Process),
+
+    %% OTP-21:
+    %% Auto-connect is asynchronous. But we still use 'noconnect' to make sure
+    %% we send on the monitored connection, and not trigger a new auto-connect.
+    %%
+    erlang:send(Process, {Label, {self(), Mref}, Request}, [noconnect]),
+
+    receive
+        {Mref, Reply} ->
+            erlang:demonitor(Mref, [flush]),
+            {ok, Reply};
+        {'DOWN', Mref, _, _, noconnection} ->
+            Node = get_node(Process),
+            exit({nodedown, Node});
+        {'DOWN', Mref, _, _, Reason} ->
+            exit(Reason)
+    after Timeout ->
+            erlang:demonitor(Mref, [flush]),
+            exit(timeout)
     end.
 
 get_node(Process) ->
@@ -212,19 +192,6 @@ get_node(Process) ->
 	    node(Process)
     end.
 
-wait_resp(Node, Tag, Timeout) ->
-    receive
-	{Tag, Reply} ->
-	    monitor_node(Node, false),
-	    {ok, Reply};
-	{nodedown, Node} ->
-	    monitor_node(Node, false),
-	    exit({nodedown, Node})
-    after Timeout ->
-	    monitor_node(Node, false),
-	    exit(timeout)
-    end.
-
 %%
 %% Send a reply to the client.
 %%
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl
index a9b98911e2..73e4457bd0 100644
--- a/lib/stdlib/src/gen_event.erl
+++ b/lib/stdlib/src/gen_event.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -125,7 +125,8 @@
                     | {'logfile', string()}.
 -type option() :: {'timeout', timeout()}
                 | {'debug', [debug_flag()]}
-                | {'spawn_opt', [proc_lib:spawn_option()]}.
+                | {'spawn_opt', [proc_lib:spawn_option()]}
+                | {'hibernate_after', timeout()}.
 -type emgr_ref()  :: atom() | {atom(), atom()} |  {'global', atom()}
                    | {'via', atom(), term()} | pid().
 -type start_ret() :: {'ok', pid()} | {'error', term()}.
diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl
index 96a53426e2..8c7db65563 100644
--- a/lib/stdlib/src/gen_fsm.erl
+++ b/lib/stdlib/src/gen_fsm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -198,7 +198,7 @@
 %%% start(Name, Mod, Args, Options)
 %%% start_link(Mod, Args, Options)
 %%% start_link(Name, Mod, Args, Options) where:
-%%%    Name ::= {local, atom()} | {global, atom()} | {via, atom(), term()}
+%%%    Name ::= {local, atom()} | {global, term()} | {via, atom(), term()}
 %%%    Mod  ::= atom(), callback module implementing the 'real' fsm
 %%%    Args ::= term(), init arguments (to Mod:init/1)
 %%%    Options ::= [{debug, [Flag]}]
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index ac172325b5..f29314d0a2 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -109,7 +109,7 @@
 
 -define(
    STACKTRACE(),
-   try throw(ok) catch _ -> erlang:get_stacktrace() end).
+   element(2, erlang:process_info(self(), current_stacktrace))).
 
 %%%=========================================================================
 %%%  API
@@ -369,7 +369,7 @@ init_it(Mod, Args) ->
 	{ok, Mod:init(Args)}
     catch
 	throw:R -> {ok, R};
-	Class:R -> {'EXIT', Class, R, erlang:get_stacktrace()}
+	Class:R:S -> {'EXIT', Class, R, S}
     end.
 
 %%%========================================================================
@@ -437,12 +437,11 @@ decode_msg(Msg, Parent, Name, State, Mod, Time, HibernateAfterTimeout, Debug, Hi
 %%% Send/receive functions
 %%% ---------------------------------------------------
 do_send(Dest, Msg) ->
-    case catch erlang:send(Dest, Msg, [noconnect]) of
-	noconnect ->
-	    spawn(erlang, send, [Dest,Msg]);
-	Other ->
-	    Other
-    end.
+    try erlang:send(Dest, Msg)
+    catch
+        error:_ -> ok
+    end,
+    ok.
 
 do_multi_call(Nodes, Name, Req, infinity) ->
     Tag = make_ref(),
@@ -634,7 +633,7 @@ try_dispatch(Mod, Func, Msg, State) ->
     catch
 	throw:R ->
 	    {ok, R};
-        error:undef = R when Func == handle_info ->
+        error:undef = R:Stacktrace when Func == handle_info ->
             case erlang:function_exported(Mod, handle_info, 2) of
                 false ->
                     error_logger:warning_msg("** Undefined handle_info in ~p~n"
@@ -642,10 +641,10 @@ try_dispatch(Mod, Func, Msg, State) ->
                                              [Mod, Msg]),
                     {ok, {noreply, State}};
                 true ->
-                    {'EXIT', error, R, erlang:get_stacktrace()}
+                    {'EXIT', error, R, Stacktrace}
             end;
-	Class:R ->
-	    {'EXIT', Class, R, erlang:get_stacktrace()}
+	Class:R:Stacktrace ->
+	    {'EXIT', Class, R, Stacktrace}
     end.
 
 try_handle_call(Mod, Msg, From, State) ->
@@ -654,8 +653,8 @@ try_handle_call(Mod, Msg, From, State) ->
     catch
 	throw:R ->
 	    {ok, R};
-	Class:R ->
-	    {'EXIT', Class, R, erlang:get_stacktrace()}
+	Class:R:Stacktrace ->
+	    {'EXIT', Class, R, Stacktrace}
     end.
 
 try_terminate(Mod, Reason, State) ->
@@ -666,8 +665,8 @@ try_terminate(Mod, Reason, State) ->
 	    catch
 		throw:R ->
 		    {ok, R};
-		Class:R ->
-		    {'EXIT', Class, R, erlang:get_stacktrace()}
+		Class:R:Stacktrace ->
+		    {'EXIT', Class, R, Stacktrace}
 	   end;
 	false ->
 	    {ok, ok}
diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index cd6312855d..9dc360a289 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2016-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2016-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.
@@ -78,9 +78,11 @@
 -type data() :: term().
 
 -type event_type() ::
-	{'call',From :: from()} | 'cast' | 'info' |
-	'timeout' | {'timeout', Name :: term()} | 'state_timeout' |
-	'internal'.
+        external_event_type() | timeout_event_type() | 'internal'.
+-type external_event_type() ::
+        {'call',From :: from()} | 'cast' | 'info'.
+-type timeout_event_type() ::
+        'timeout' | {'timeout', Name :: term()} | 'state_timeout'.
 
 -type callback_mode_result() ::
 	callback_mode() | [callback_mode() | state_enter()].
@@ -138,7 +140,9 @@
 -type enter_action() ::
 	'hibernate' | % Set the hibernate option
 	{'hibernate', Hibernate :: hibernate()} |
-	%%
+        timeout_action() |
+	reply_action().
+-type timeout_action() ::
 	(Timeout :: event_timeout()) | % {timeout,Timeout}
 	{'timeout', % Set the event_timeout option
 	 Time :: event_timeout(), EventContent :: term()} |
@@ -159,9 +163,7 @@
 	{'state_timeout', % Set the state_timeout option
 	 Time :: state_timeout(),
 	 EventContent :: term(),
-	 Options :: (timeout_option() | [timeout_option()])} |
-	%%
-	reply_action().
+	 Options :: (timeout_option() | [timeout_option()])}.
 -type reply_action() ::
 	{'reply', % Reply to a caller
 	 From :: from(), Reply :: term()}.
@@ -320,7 +322,13 @@
     handle_event/4 % For callback_mode() =:= handle_event_function
    ]).
 
+
+
 %% Type validation functions
+-compile(
+   {inline,
+    [callback_mode/1, state_enter/1, from/1, event_type/1]}).
+%%
 callback_mode(CallbackMode) ->
     case CallbackMode of
 	state_functions -> true;
@@ -328,6 +336,14 @@ callback_mode(CallbackMode) ->
 	_ -> false
     end.
 %%
+state_enter(StateEnter) ->
+    case StateEnter of
+        state_enter ->
+            true;
+        _ ->
+            false
+    end.
+%%
 from({Pid,_}) when is_pid(Pid) -> true;
 from(_) -> false.
 %%
@@ -349,7 +365,49 @@ event_type(Type) ->
 
 -define(
    STACKTRACE(),
-   try throw(ok) catch _ -> erlang:get_stacktrace() end).
+   element(2, erlang:process_info(self(), current_stacktrace))).
+
+-define(not_sys_debug, []).
+%%
+%% This is a macro to only evaluate arguments if Debug =/= [].
+%% Debug is evaluated multiple times.
+-define(
+   sys_debug(Debug, NameState, Entry),
+   case begin Debug end of
+       ?not_sys_debug ->
+           begin Debug end;
+       _ ->
+           sys_debug(begin Debug end, begin NameState end, begin Entry end)
+    end).
+
+-record(state,
+        {callback_mode = undefined :: callback_mode() | undefined,
+         state_enter = false :: boolean(),
+         module :: atom(),
+         name :: atom(),
+         state :: term(),
+         data :: term(),
+         postponed = [] :: [{event_type(),term()}],
+         %%
+         timer_refs = #{} :: % timer ref => the timer's event type
+           #{reference() => timeout_event_type()},
+         timer_types = #{} ::  % timer's event type => timer ref
+           #{timeout_event_type() => reference()},
+         cancel_timers = 0 :: non_neg_integer(),
+         %% We add a timer to both timer_refs and timer_types
+         %% when we start it.  When we request an asynchronous
+         %% timer cancel we remove it from timer_types.  When
+         %% the timer cancel message arrives we remove it from
+         %% timer_refs.
+         %%
+         hibernate = false :: boolean(),
+         hibernate_after = infinity :: timeout()}).
+
+-record(trans_opts,
+        {hibernate = false,
+         postpone = false,
+         timeouts_r = [],
+         next_events_r = []}).
 
 %%%==========================================================================
 %%% API
@@ -422,6 +480,10 @@ stop(ServerRef, Reason, Timeout) ->
 
 %% Send an event to a state machine that arrives with type 'event'
 -spec cast(ServerRef :: server_ref(), Msg :: term()) -> ok.
+cast(ServerRef, Msg) when is_pid(ServerRef) ->
+    send(ServerRef, wrap_cast(Msg));
+cast(ServerRef, Msg) when is_atom(ServerRef) ->
+    send(ServerRef, wrap_cast(Msg));
 cast({global,Name}, Msg) ->
     try	global:send(Name, wrap_cast(Msg)) of
 	_ -> ok
@@ -435,10 +497,6 @@ cast({via,RegMod,Name}, Msg) ->
 	_:_ -> ok
     end;
 cast({Name,Node} = ServerRef, Msg) when is_atom(Name), is_atom(Node) ->
-    send(ServerRef, wrap_cast(Msg));
-cast(ServerRef, Msg) when is_atom(ServerRef) ->
-    send(ServerRef, wrap_cast(Msg));
-cast(ServerRef, Msg) when is_pid(ServerRef) ->
     send(ServerRef, wrap_cast(Msg)).
 
 %% Call a state machine (synchronous; a reply is expected) that
@@ -455,73 +513,16 @@ call(ServerRef, Request) ->
 	  {'clean_timeout',T :: timeout()} |
 	  {'dirty_timeout',T :: timeout()}) ->
 		  Reply :: term().
+call(ServerRef, Request, infinity = T = Timeout) ->
+    call_dirty(ServerRef, Request, Timeout, T);
+call(ServerRef, Request, {dirty_timeout, T} = Timeout) ->
+    call_dirty(ServerRef, Request, Timeout, T);
+call(ServerRef, Request, {clean_timeout, T} = Timeout) ->
+    call_clean(ServerRef, Request, Timeout, T);
+call(ServerRef, Request, {_, _} = Timeout) ->
+    erlang:error(badarg, [ServerRef,Request,Timeout]);
 call(ServerRef, Request, Timeout) ->
-    case parse_timeout(Timeout) of
-	{dirty_timeout,T} ->
-	    try gen:call(ServerRef, '$gen_call', Request, T) of
-		{ok,Reply} ->
-		    Reply
-	    catch
-		Class:Reason ->
-		    erlang:raise(
-		      Class,
-		      {Reason,{?MODULE,call,[ServerRef,Request,Timeout]}},
-		      erlang:get_stacktrace())
-	    end;
-	{clean_timeout,T} ->
-	    %% Call server through proxy process to dodge any late reply
-	    Ref = make_ref(),
-	    Self = self(),
-	    Pid = spawn(
-		    fun () ->
-			    Self !
-				try gen:call(
-				      ServerRef, '$gen_call', Request, T) of
-				    Result ->
-					{Ref,Result}
-				catch Class:Reason ->
-					{Ref,Class,Reason,
-					 erlang:get_stacktrace()}
-				end
-		    end),
-	    Mref = monitor(process, Pid),
-	    receive
-		{Ref,Result} ->
-		    demonitor(Mref, [flush]),
-		    case Result of
-			{ok,Reply} ->
-			    Reply
-		    end;
-		{Ref,Class,Reason,Stacktrace} ->
-		    demonitor(Mref, [flush]),
-		    erlang:raise(
-		      Class,
-		      {Reason,{?MODULE,call,[ServerRef,Request,Timeout]}},
-		      Stacktrace);
-		{'DOWN',Mref,_,_,Reason} ->
-		    %% There is a theoretical possibility that the
-		    %% proxy process gets killed between try--of and !
-		    %% so this clause is in case of that
-		    exit(Reason)
-	    end;
-	Error when is_atom(Error) ->
-	    erlang:error(Error, [ServerRef,Request,Timeout])
-    end.
-
-parse_timeout(Timeout) ->
-    case Timeout of
-	{clean_timeout,_} ->
-	    Timeout;
-	{dirty_timeout,_} ->
-	    Timeout;
-	{_,_} ->
-	    %% Be nice and throw a badarg for speling errors
-	    badarg;
-	infinity ->
-	    {dirty_timeout,infinity};
-	T ->
-	    {clean_timeout,T}
-    end.
+    call_clean(ServerRef, Request, Timeout, Timeout).
 
 %% Reply from a state machine callback to whom awaits in call/2
 -spec reply([reply_action()] | reply_action()) -> ok.
@@ -530,6 +531,7 @@ reply({reply,From,Reply}) ->
 reply(Replies) when is_list(Replies) ->
     replies(Replies).
 %%
+-compile({inline, [reply/2]}).
 -spec reply(From :: from(), Reply :: term()) -> ok.
 reply({To,Tag}, Reply) when is_pid(To) ->
     Msg = {Tag,Reply},
@@ -579,9 +581,58 @@ enter_loop(Module, Opts, State, Data, Server, Actions) ->
 %%---------------------------------------------------------------------------
 %% API helpers
 
+-compile({inline, [wrap_cast/1]}).
 wrap_cast(Event) ->
     {'$gen_cast',Event}.
 
+call_dirty(ServerRef, Request, Timeout, T) ->
+    try gen:call(ServerRef, '$gen_call', Request, T) of
+        {ok,Reply} ->
+            Reply
+    catch
+        Class:Reason:Stacktrace ->
+            erlang:raise(
+              Class,
+              {Reason,{?MODULE,call,[ServerRef,Request,Timeout]}},
+              Stacktrace)
+    end.
+
+call_clean(ServerRef, Request, Timeout, T) ->
+    %% Call server through proxy process to dodge any late reply
+    Ref = make_ref(),
+    Self = self(),
+    Pid = spawn(
+            fun () ->
+                    Self !
+                        try gen:call(
+                              ServerRef, '$gen_call', Request, T) of
+                            Result ->
+                                {Ref,Result}
+                        catch Class:Reason:Stacktrace ->
+                                {Ref,Class,Reason,Stacktrace}
+                        end
+            end),
+    Mref = monitor(process, Pid),
+    receive
+        {Ref,Result} ->
+            demonitor(Mref, [flush]),
+            case Result of
+                {ok,Reply} ->
+                    Reply
+            end;
+        {Ref,Class,Reason,Stacktrace} ->
+            demonitor(Mref, [flush]),
+            erlang:raise(
+              Class,
+              {Reason,{?MODULE,call,[ServerRef,Request,Timeout]}},
+              Stacktrace);
+        {'DOWN',Mref,_,_,Reason} ->
+            %% There is a theoretical possibility that the
+            %% proxy process gets killed between try--of and !
+            %% so this clause is in case of that
+            exit(Reason)
+    end.
+
 replies([{reply,From,Reply}|Replies]) ->
     reply(From, Reply),
     replies(Replies);
@@ -590,76 +641,39 @@ replies([]) ->
 
 %% Might actually not send the message in case of caught exception
 send(Proc, Msg) ->
-    try erlang:send(Proc, Msg, [noconnect]) of
-	noconnect ->
-	    _ = spawn(erlang, send, [Proc,Msg]),
-	    ok;
-	ok ->
-	    ok
+    try erlang:send(Proc, Msg)
     catch
-	_:_ ->
-	    ok
-    end.
+        error:_ -> ok
+    end,
+    ok.
 
 %% Here the init_it/6 and enter_loop/5,6,7 functions converge
 enter(Module, Opts, State, Data, Server, Actions, Parent) ->
     %% The values should already have been type checked
     Name = gen:get_proc_name(Server),
     Debug = gen:debug_options(Name, Opts),
-	HibernateAfterTimeout = gen:hibernate_after(Opts),
-	Events = [],
-    P = [],
+    HibernateAfterTimeout = gen:hibernate_after(Opts),
+    Events = [],
     Event = {internal,init_state},
     %% We enforce {postpone,false} to ensure that
     %% our fake Event gets discarded, thought it might get logged
-    NewActions =
-	if
-	    is_list(Actions) ->
-		Actions ++ [{postpone,false}];
-	    true ->
-		[Actions,{postpone,false}]
-	end,
-    TimerRefs = #{},
-    %% Key: timer ref
-    %% Value: the timer type i.e the timer's event type
-    %%
-    TimerTypes = #{},
-    %% Key: timer type i.e the timer's event type
-    %% Value: timer ref
-    %%
-    %% We add a timer to both timer_refs and timer_types
-    %% when we start it.  When we request an asynchronous
-    %% timer cancel we remove it from timer_types.  When
-    %% the timer cancel message arrives we remove it from
-    %% timer_refs.
-    %%
-    Hibernate = false,
-    CancelTimers = 0,
-    S =	#{
-      callback_mode => undefined,
-      state_enter => false,
-      module => Module,
-      name => Name,
-      state => State,
-      data => Data,
-      postponed => P,
-      %%
-      %% The following fields are finally set from to the arguments to
-      %% loop_event_actions/9 when it finally loops back to loop/3
-      %% in loop_event_result/11
-      timer_refs => TimerRefs,
-      timer_types => TimerTypes,
-      hibernate => Hibernate,
-	  hibernate_after => HibernateAfterTimeout,
-      cancel_timers => CancelTimers
-     },
-    NewDebug = sys_debug(Debug, S, State, {enter,Event,State}),
+    NewActions = listify(Actions) ++ [{postpone,false}],
+    S =
+        #state{
+           module = Module,
+           name = Name,
+           state = State,
+           data = Data,
+           hibernate_after = HibernateAfterTimeout},
+    CallEnter = true,
+    NewDebug = ?sys_debug(Debug, {Name,State}, {enter,Event,State}),
     case call_callback_mode(S) of
-	{ok,NewS} ->
+	#state{} = NewS ->
 	    loop_event_actions(
 	      Parent, NewDebug, NewS,
-	      Events, Event, State, Data, NewActions, true);
-	{Class,Reason,Stacktrace} ->
+	      Events, Event, State, Data, #trans_opts{},
+              NewActions, CallEnter);
+	[Class,Reason,Stacktrace] ->
 	    terminate(
 	      Class, Reason, Stacktrace, NewDebug,
 	      S, [Event|Events])
@@ -677,17 +691,14 @@ init_it(Starter, Parent, ServerRef, Module, Args, Opts) ->
     catch
 	Result ->
 	    init_result(Starter, Parent, ServerRef, Module, Result, Opts);
-	Class:Reason ->
-	    Stacktrace = erlang:get_stacktrace(),
+	Class:Reason:Stacktrace ->
 	    Name = gen:get_proc_name(ServerRef),
 	    gen:unregister_name(ServerRef),
 	    proc_lib:init_ack(Starter, {error,Reason}),
 	    error_info(
 	      Class, Reason, Stacktrace,
-	      #{name => Name,
-		callback_mode => undefined,
-		state_enter => false},
-	      [], [], undefined),
+	      #state{name = Name},
+	      [], undefined),
 	    erlang:raise(Class, Reason, Stacktrace)
     end.
 
@@ -717,10 +728,8 @@ init_result(Starter, Parent, ServerRef, Module, Result, Opts) ->
 	    proc_lib:init_ack(Starter, {error,Error}),
 	    error_info(
 	      error, Error, ?STACKTRACE(),
-	      #{name => Name,
-		callback_mode => undefined,
-		state_enter => false},
-	      [], [], undefined),
+	      #state{name = Name},
+	      [], undefined),
 	    exit(Error)
     end.
 
@@ -734,9 +743,10 @@ system_terminate(Reason, _Parent, Debug, S) ->
     terminate(exit, Reason, ?STACKTRACE(), Debug, S, []).
 
 system_code_change(
-  #{module := Module,
-    state := State,
-    data := Data} = S,
+  #state{
+     module = Module,
+     state = State,
+     data = Data} = S,
   _Mod, OldVsn, Extra) ->
     case
 	try Module:code_change(OldVsn, State, Data, Extra)
@@ -746,29 +756,31 @@ system_code_change(
     of
 	{ok,NewState,NewData} ->
 	    {ok,
-	     S#{callback_mode := undefined,
-		state := NewState,
-		data := NewData}};
+	     S#state{
+               callback_mode = undefined,
+               state = NewState,
+               data = NewData}};
 	{ok,_} = Error ->
 	    error({case_clause,Error});
 	Error ->
 	    Error
     end.
 
-system_get_state(#{state := State, data := Data}) ->
+system_get_state(#state{state = State, data = Data}) ->
     {ok,{State,Data}}.
 
 system_replace_state(
   StateFun,
-  #{state := State,
-    data := Data} = S) ->
+  #state{
+     state = State,
+     data = Data} = S) ->
     {NewState,NewData} = Result = StateFun({State,Data}),
-    {ok,Result,S#{state := NewState, data := NewData}}.
+    {ok,Result,S#state{state = NewState, data = NewData}}.
 
 format_status(
   Opt,
   [PDict,SysState,Parent,Debug,
-   #{name := Name, postponed := P} = S]) ->
+   #state{name = Name, postponed = P} = S]) ->
     Header = gen:format_status_header("Status for state machine", Name),
     Log = sys:get_debug(log, Debug, []),
     [{header,Header},
@@ -787,6 +799,9 @@ format_status(
 %% them, not as the real erlang messages.  Use trace for that.
 %%---------------------------------------------------------------------------
 
+sys_debug(Debug, NameState, Entry) ->
+  sys:handle_debug(Debug, fun print_event/3, NameState, Entry).
+
 print_event(Dev, {in,Event}, {Name,State}) ->
     io:format(
       Dev, "*DBG* ~tp receive ~ts in state ~tp~n",
@@ -819,15 +834,6 @@ event_string(Event) ->
 	    io_lib:format("~tw ~tp", [EventType,EventContent])
     end.
 
-sys_debug(Debug, #{name := Name}, State, Entry) ->
-    case Debug of
-	[] ->
-	    Debug;
-	_ ->
-	    sys:handle_debug(
-	      Debug, fun print_event/3, {Name,State}, Entry)
-    end.
-
 %%%==========================================================================
 %%% Internal callbacks
 
@@ -842,14 +848,16 @@ wakeup_from_hibernate(Parent, Debug, S) ->
 %% and detours through sys:handle_system_message/7 and proc_lib:hibernate/3
 
 %% Entry point for system_continue/3
-loop(Parent, Debug, #{hibernate := true, cancel_timers := 0} = S) ->
+loop(Parent, Debug, #state{hibernate = true, cancel_timers = 0} = S) ->
     loop_hibernate(Parent, Debug, S);
 loop(Parent, Debug, S) ->
     loop_receive(Parent, Debug, S).
 
 loop_hibernate(Parent, Debug, S) ->
+    %%
     %% Does not return but restarts process at
     %% wakeup_from_hibernate/3 that jumps to loop_receive/3
+    %%
     proc_lib:hibernate(
       ?MODULE, wakeup_from_hibernate, [Parent,Debug,S]),
     error(
@@ -857,17 +865,18 @@ loop_hibernate(Parent, Debug, S) ->
        {wakeup_from_hibernate,3}}).
 
 %% Entry point for wakeup_from_hibernate/3
-loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
+loop_receive(
+  Parent, Debug, #state{hibernate_after = HibernateAfterTimeout} = S) ->
+    %%
     receive
 	Msg ->
 	    case Msg of
 		{system,Pid,Req} ->
-		    #{hibernate := Hibernate} = S,
 		    %% Does not return but tail recursively calls
 		    %% system_continue/3 that jumps to loop/3
 		    sys:handle_system_msg(
 		      Req, Pid, Parent, ?MODULE, Debug, S,
-		      Hibernate);
+		      S#state.hibernate);
 		{'EXIT',Parent,Reason} = EXIT ->
 		    %% EXIT is not a 2-tuple therefore
 		    %% not an event but this will stand out
@@ -875,9 +884,9 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 		    Q = [EXIT],
 		    terminate(exit, Reason, ?STACKTRACE(), Debug, S, Q);
 		{timeout,TimerRef,TimerMsg} ->
-		    #{timer_refs := TimerRefs,
-		      timer_types := TimerTypes,
-		      hibernate := Hibernate} = S,
+		    #state{
+                       timer_refs = TimerRefs,
+                       timer_types = TimerTypes} = S,
 		    case TimerRefs of
 			#{TimerRef := TimerType} ->
 			    %% We know of this timer; is it a running
@@ -887,7 +896,6 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 				#{TimerType := TimerRef} ->
 				    %% The timer type maps back to this
 				    %% timer ref, so it was a running timer
-				    Event = {TimerType,TimerMsg},
 				    %% Unregister the triggered timeout
 				    NewTimerRefs =
 					maps:remove(TimerRef, TimerRefs),
@@ -895,11 +903,10 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 					maps:remove(TimerType, TimerTypes),
 				    loop_receive_result(
 				      Parent, Debug,
-				      S#{
-					timer_refs := NewTimerRefs,
-					timer_types := NewTimerTypes},
-				      Hibernate,
-				      Event);
+				      S#state{
+					timer_refs = NewTimerRefs,
+					timer_types = NewTimerTypes},
+				      TimerType, TimerMsg);
 				_ ->
 				    %% This was a late timeout message
 				    %% from timer being cancelled, so
@@ -909,14 +916,13 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 			    end;
 			_ ->
 			    %% Not our timer; present it as an event
-			    Event = {info,Msg},
-			    loop_receive_result(
-			      Parent, Debug, S, Hibernate, Event)
+			    loop_receive_result(Parent, Debug, S, info, Msg)
 		    end;
 		{cancel_timer,TimerRef,_} ->
-		    #{timer_refs := TimerRefs,
-		      cancel_timers := CancelTimers,
-		      hibernate := Hibernate} = S,
+		    #state{
+                       timer_refs = TimerRefs,
+                       cancel_timers = CancelTimers,
+                       hibernate = Hibernate} = S,
 		    case TimerRefs of
 			#{TimerRef := _} ->
 			    %% We must have requested a cancel
@@ -926,9 +932,9 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 				maps:remove(TimerRef, TimerRefs),
 			    NewCancelTimers = CancelTimers - 1,
 			    NewS =
-				S#{
-				  timer_refs := NewTimerRefs,
-				  cancel_timers := NewCancelTimers},
+				S#state{
+				  timer_refs = NewTimerRefs,
+				  cancel_timers = NewCancelTimers},
 			    if
 				Hibernate =:= true, NewCancelTimers =:= 0 ->
 				    %% No more cancel_timer msgs to expect;
@@ -940,297 +946,677 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 			_ ->
 			    %% Not our cancel_timer msg;
 			    %% present it as an event
-			    Event = {info,Msg},
-			    loop_receive_result(
-			      Parent, Debug, S, Hibernate, Event)
+			    loop_receive_result(Parent, Debug, S, info, Msg)
 		    end;
 		_ ->
 		    %% External msg
-		    #{hibernate := Hibernate} = S,
-		    Event =
-			case Msg of
-			    {'$gen_call',From,Request} ->
-				{{call,From},Request};
-			    {'$gen_cast',E} ->
-				{cast,E};
-			    _ ->
-				{info,Msg}
-			end,
-		    loop_receive_result(
-		      Parent, Debug, S, Hibernate, Event)
+                    case Msg of
+                        {'$gen_call',From,Request} ->
+                            loop_receive_result(
+                              Parent, Debug, S, {call,From}, Request);
+                        {'$gen_cast',Cast} ->
+                            loop_receive_result(Parent, Debug, S, cast, Cast);
+                        _ ->
+                            loop_receive_result(Parent, Debug, S, info, Msg)
+                    end
 	    end
     after
 	    HibernateAfterTimeout ->
 		    loop_hibernate(Parent, Debug, S)
     end.
 
+loop_receive_result(Parent, ?not_sys_debug, S, Type, Content) ->
+    %% Here is the queue of not yet handled events created
+    Events = [],
+    loop_event(Parent, ?not_sys_debug, S, Events, Type, Content);
 loop_receive_result(
-  Parent, Debug,
-  #{state := State,
-    timer_types := TimerTypes, cancel_timers := CancelTimers} = S,
-  Hibernate, Event) ->
-    %% From now the 'hibernate' field in S is invalid
-    %% and will be restored when looping back
-    %% in loop_event_result/11
-    NewDebug = sys_debug(Debug, S, State, {in,Event}),
+  Parent, Debug, #state{name = Name, state = State} = S, Type, Content) ->
+    NewDebug = sys_debug(Debug, {Name,State}, {in,{Type,Content}}),
     %% Here is the queue of not yet handled events created
     Events = [],
-    %% Cancel any running event timer
-    case
-	cancel_timer_by_type(timeout, TimerTypes, CancelTimers)
-    of
-	{_,CancelTimers} ->
-	    %% No timer cancelled
-	    loop_event(Parent, NewDebug, S, Events, Event, Hibernate);
-	{NewTimerTypes,NewCancelTimers} ->
-	    %% The timer is removed from NewTimerTypes but
-	    %% remains in TimerRefs until we get
-	    %% the cancel_timer msg
-	    NewS =
-		S#{
-		  timer_types := NewTimerTypes,
-		  cancel_timers := NewCancelTimers},
-	    loop_event(Parent, NewDebug, NewS, Events, Event, Hibernate)
-    end.
+    loop_event(Parent, NewDebug, S, Events, Type, Content).
 
 %% Entry point for handling an event, received or enqueued
 loop_event(
+  Parent, Debug, #state{hibernate = Hibernate} = S,
+  Events, Type, Content) ->
+    %%
+    case Hibernate of
+        true ->
+            %%
+            %% If (this old) Hibernate is true here it can only be
+            %% because it was set from an event action
+            %% and we did not go into hibernation since there were
+            %% events in queue, so we do what the user
+            %% might rely on i.e collect garbage which
+            %% would have happened if we actually hibernated
+            %% and immediately was awakened.
+            %%
+            _ = garbage_collect(),
+            loop_event_state_function(
+              Parent, Debug, S, Events, Type, Content);
+        false ->
+            loop_event_state_function(
+              Parent, Debug, S, Events, Type, Content)
+    end.
+
+%% Call the state function
+loop_event_state_function(
   Parent, Debug,
-  #{state := State, data := Data} = S,
-  Events, {Type,Content} = Event, Hibernate) ->
+  #state{state = State, data = Data} = S,
+  Events, Type, Content) ->
     %%
-    %% If (this old) Hibernate is true here it can only be
-    %% because it was set from an event action
-    %% and we did not go into hibernation since there were
-    %% events in queue, so we do what the user
-    %% might rely on i.e collect garbage which
-    %% would have happened if we actually hibernated
-    %% and immediately was awakened
-    Hibernate andalso garbage_collect(),
+    %% The field 'hibernate' in S is now invalid and will be
+    %% restored when looping back to loop/3 or loop_event/6.
+    %%
+    Event = {Type,Content},
+    TransOpts = false,
     case call_state_function(S, Type, Content, State, Data) of
-	{ok,Result,NewS} ->
-	    {NextState,NewData,Actions,EnterCall} =
-		parse_event_result(
-		  true, Debug, NewS,
-		  Events, Event, State, Data, Result),
-	    loop_event_actions(
-	      Parent, Debug, NewS,
-	      Events, Event, NextState, NewData, Actions, EnterCall);
-	{Class,Reason,Stacktrace} ->
+        {Result, NewS} ->
+            loop_event_result(
+              Parent, Debug, NewS,
+              Events, Event, State, Data, TransOpts, Result);
+	[Class,Reason,Stacktrace] ->
 	    terminate(
-	      Class, Reason, Stacktrace, Debug, S,
-	      [Event|Events])
+	      Class, Reason, Stacktrace, Debug, S, [Event|Events])
     end.
 
-loop_event_actions(
-  Parent, Debug,
-  #{state := State, state_enter := StateEnter} = S,
-  Events, Event, NextState, NewData,
-  Actions, EnterCall) ->
-    %% Hibernate is reborn here as false being
-    %% the default value from parse_actions/4
-    case parse_actions(Debug, S, State, Actions) of
-	{ok,NewDebug,Hibernate,TimeoutsR,Postpone,NextEventsR} ->
-	    if
-		StateEnter, EnterCall ->
-		    loop_event_enter(
-		      Parent, NewDebug, S,
-		      Events, Event, NextState, NewData,
-		      Hibernate, TimeoutsR, Postpone, NextEventsR);
-		true ->
-		    loop_event_result(
-		      Parent, NewDebug, S,
-		      Events, Event, NextState, NewData,
-		      Hibernate, TimeoutsR, Postpone, NextEventsR)
-	    end;
-	{Class,Reason,Stacktrace} ->
+%% Make a state enter call to the state function
+loop_event_state_enter(
+  Parent, Debug, #state{state = PrevState} = S,
+  Events, Event, NextState, NewData, TransOpts) ->
+    %%
+    case call_state_function(S, enter, PrevState, NextState, NewData) of
+        {Result, NewS} ->
+            loop_event_result(
+              Parent, Debug, NewS,
+              Events, Event, NextState, NewData, TransOpts, Result);
+	[Class,Reason,Stacktrace] ->
 	    terminate(
-	      Class, Reason, Stacktrace, Debug, S,
-	      [Event|Events])
+	      Class, Reason, Stacktrace, Debug, S, [Event|Events])
     end.
 
-loop_event_enter(
-  Parent, Debug, #{state := State} = S,
-  Events, Event, NextState, NewData,
-  Hibernate, TimeoutsR, Postpone, NextEventsR) ->
-    case call_state_function(S, enter, State, NextState, NewData) of
-	{ok,Result,NewS} ->
-	    case parse_event_result(
-		   false, Debug, NewS,
-		   Events, Event, NextState, NewData, Result) of
-		{_,NewerData,Actions,EnterCall} ->
-		    loop_event_enter_actions(
-		      Parent, Debug, NewS,
-		      Events, Event, NextState, NewerData,
-		      Hibernate, TimeoutsR, Postpone, NextEventsR,
-		      Actions, EnterCall)
-	    end;
-	{Class,Reason,Stacktrace} ->
-	    terminate(
-	      Class, Reason, Stacktrace, Debug,
-	      S#{
-		state := NextState,
-		data := NewData,
-		hibernate := Hibernate},
-	      [Event|Events])
+%% Process the result from the state function.
+%% When TransOpts =:= false it was a state function call,
+%% otherwise it is an option tuple and it was a state enter call.
+%%
+loop_event_result(
+  Parent, Debug, S,
+  Events, Event, State, Data, TransOpts, Result) ->
+    %%
+    case Result of
+	{next_state,State,NewData} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              [], false);
+	{next_state,NextState,NewData}
+          when TransOpts =:= false ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, NextState, NewData, TransOpts,
+              [], true);
+	{next_state,State,NewData,Actions} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              Actions, false);
+	{next_state,NextState,NewData,Actions}
+          when TransOpts =:= false ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, NextState, NewData, TransOpts,
+              Actions, true);
+        %%
+        {keep_state,NewData} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              [], false);
+        {keep_state,NewData,Actions} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              Actions, false);
+        %%
+        keep_state_and_data ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, Data, TransOpts,
+              [], false);
+        {keep_state_and_data,Actions} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, Data, TransOpts,
+              Actions, false);
+        %%
+        {repeat_state,NewData} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              [], true);
+        {repeat_state,NewData,Actions} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              Actions, true);
+        %%
+        repeat_state_and_data ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, Data, TransOpts,
+              [], true);
+        {repeat_state_and_data,Actions} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, Data, TransOpts,
+              Actions, true);
+        %%
+	stop ->
+            terminate(
+              exit, normal, ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = Data,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events]);
+	{stop,Reason} ->
+            terminate(
+              exit, Reason, ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = Data,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events]);
+	{stop,Reason,NewData} ->
+            terminate(
+              exit, Reason, ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = NewData,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events]);
+	%%
+	{stop_and_reply,Reason,Replies} ->
+            reply_then_terminate(
+              exit, Reason, ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = Data,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events], Replies);
+	{stop_and_reply,Reason,Replies,NewData} ->
+            reply_then_terminate(
+              exit, Reason, ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = NewData,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events], Replies);
+	%%
+	_ ->
+            terminate(
+              error,
+              {bad_return_from_state_function,Result},
+              ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = Data,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events])
     end.
 
-loop_event_enter_actions(
-  Parent, Debug, #{state_enter := StateEnter} = S,
-  Events, Event, NextState, NewData,
-  Hibernate, TimeoutsR, Postpone, NextEventsR,
-  Actions, EnterCall) ->
-    case
-	parse_enter_actions(
-	  Debug, S, NextState, Actions, Hibernate, TimeoutsR)
-    of
-	{ok,NewDebug,NewHibernate,NewTimeoutsR,_,_} ->
-	    if
-		StateEnter, EnterCall ->
-		    loop_event_enter(
-		      Parent, NewDebug, S,
-		      Events, Event, NextState, NewData,
-		      NewHibernate, NewTimeoutsR, Postpone, NextEventsR);
-		true ->
-		    loop_event_result(
-		      Parent, NewDebug, S,
-		      Events, Event, NextState, NewData,
-		      NewHibernate, NewTimeoutsR, Postpone, NextEventsR)
-	    end;
-	{Class,Reason,Stacktrace} ->
-	    terminate(
-	      Class, Reason, Stacktrace, Debug,
-	      S#{
-		state := NextState,
-		data := NewData,
-		hibernate := Hibernate},
-	      [Event|Events])
+-compile({inline, [hibernate_in_trans_opts/1]}).
+hibernate_in_trans_opts(false) ->
+    (#trans_opts{})#trans_opts.hibernate;
+hibernate_in_trans_opts(#trans_opts{hibernate = Hibernate}) ->
+    Hibernate.
+
+%% Ensure that Actions are a list
+loop_event_actions(
+  Parent, Debug, S,
+  Events, Event, NextState, NewerData, TransOpts,
+  Actions, CallEnter) ->
+    loop_event_actions_list(
+      Parent, Debug, S,
+      Events, Event, NextState, NewerData, TransOpts,
+      listify(Actions), CallEnter).
+
+%% Process actions from the state function
+loop_event_actions_list(
+  Parent, Debug, #state{state_enter = StateEnter} = S,
+  Events, Event, NextState, NewerData, TransOpts,
+  Actions, CallEnter) ->
+    %%
+    case parse_actions(TransOpts, Debug, S, Actions) of
+        {NewDebug,NewTransOpts}
+          when StateEnter, CallEnter ->
+            loop_event_state_enter(
+              Parent, NewDebug, S,
+              Events, Event, NextState, NewerData, NewTransOpts);
+        {NewDebug,NewTransOpts} ->
+            loop_event_done(
+              Parent, NewDebug, S,
+              Events, Event, NextState, NewerData, NewTransOpts);
+        [Class,Reason,Stacktrace,NewDebug] ->
+            terminate(
+              Class, Reason, Stacktrace, NewDebug,
+              S#state{
+                state = NextState,
+                data = NewerData,
+                hibernate = TransOpts#trans_opts.hibernate},
+              [Event|Events])
     end.
 
-loop_event_result(
+parse_actions(false, Debug, S, Actions) ->
+    parse_actions(true, Debug, S, Actions, #trans_opts{});
+parse_actions(TransOpts, Debug, S, Actions) ->
+    parse_actions(false, Debug, S, Actions, TransOpts).
+%%
+parse_actions(_StateCall, Debug, _S, [], TransOpts) ->
+    {Debug,TransOpts};
+parse_actions(StateCall, Debug, S, [Action|Actions], TransOpts) ->
+    case Action of
+	%% Actual actions
+	{reply,From,Reply} ->
+            parse_actions_reply(
+              StateCall, Debug, S, Actions, TransOpts, From, Reply);
+	%%
+	%% Actions that set options
+	{hibernate,NewHibernate} when is_boolean(NewHibernate) ->
+            parse_actions(
+              StateCall, Debug, S, Actions,
+              TransOpts#trans_opts{hibernate = NewHibernate});
+	hibernate ->
+            parse_actions(
+              StateCall, Debug, S, Actions,
+              TransOpts#trans_opts{hibernate = true});
+	%%
+	{postpone,NewPostpone} when not NewPostpone orelse StateCall ->
+            parse_actions(
+              StateCall, Debug, S, Actions,
+              TransOpts#trans_opts{postpone = NewPostpone});
+	postpone when StateCall ->
+            parse_actions(
+              StateCall, Debug, S, Actions,
+              TransOpts#trans_opts{postpone = true});
+	%%
+	{next_event,Type,Content} ->
+            parse_actions_next_event(
+              StateCall, Debug, S, Actions, TransOpts, Type, Content);
+	%%
+        _ ->
+            parse_actions_timeout(
+              StateCall, Debug, S, Actions, TransOpts, Action)
+    end.
+
+parse_actions_reply(
+  StateCall, ?not_sys_debug, S, Actions, TransOpts,
+  From, Reply) ->
+    %%
+    case from(From) of
+        true ->
+            reply(From, Reply),
+            parse_actions(StateCall, ?not_sys_debug, S, Actions, TransOpts);
+        false ->
+            [error,
+             {bad_action_from_state_function,{reply,From,Reply}},
+             ?STACKTRACE(),
+             ?not_sys_debug]
+    end;
+parse_actions_reply(
+  StateCall, Debug, #state{name = Name, state = State} = S,
+  Actions, TransOpts, From, Reply) ->
+    %%
+    case from(From) of
+        true ->
+            reply(From, Reply),
+            NewDebug = sys_debug(Debug, {Name,State}, {out,Reply,From}),
+            parse_actions(StateCall, NewDebug, S, Actions, TransOpts);
+        false ->
+            [error,
+             {bad_action_from_state_function,{reply,From,Reply}},
+             ?STACKTRACE(),
+             Debug]
+    end.
+
+parse_actions_next_event(
+  StateCall, ?not_sys_debug, S,
+  Actions, TransOpts, Type, Content) ->
+    case event_type(Type) of
+        true when StateCall ->
+            NextEventsR = TransOpts#trans_opts.next_events_r,
+            parse_actions(
+              StateCall, ?not_sys_debug, S, Actions,
+              TransOpts#trans_opts{
+                next_events_r = [{Type,Content}|NextEventsR]});
+        _ ->
+            [error,
+             {bad_action_from_state_function,{next_events,Type,Content}},
+             ?STACKTRACE(),
+             ?not_sys_debug]
+    end;
+parse_actions_next_event(
+  StateCall, Debug, #state{name = Name, state = State} = S,
+  Actions, TransOpts, Type, Content) ->
+    case event_type(Type) of
+        true when StateCall ->
+            NewDebug = sys_debug(Debug, {Name,State}, {in,{Type,Content}}),
+            NextEventsR = TransOpts#trans_opts.next_events_r,
+            parse_actions(
+              StateCall, NewDebug, S, Actions,
+              TransOpts#trans_opts{
+                next_events_r = [{Type,Content}|NextEventsR]});
+        _ ->
+            [error,
+             {bad_action_from_state_function,{next_events,Type,Content}},
+             ?STACKTRACE(),
+             Debug]
+    end.
+
+parse_actions_timeout(
+  StateCall, Debug, S, Actions, TransOpts,
+  {TimerType,Time,TimerMsg,TimerOpts} = AbsoluteTimeout) ->
+    %%
+    case classify_timer(Time, listify(TimerOpts)) of
+        absolute ->
+            parse_actions_timeout_add(
+              StateCall, Debug, S, Actions,
+              TransOpts, AbsoluteTimeout);
+        relative ->
+            RelativeTimeout = {TimerType,Time,TimerMsg},
+            parse_actions_timeout_add(
+              StateCall, Debug, S, Actions,
+              TransOpts, RelativeTimeout);
+        badarg ->
+            [error,
+             {bad_action_from_state_function,AbsoluteTimeout},
+             ?STACKTRACE(),
+             Debug]
+    end;
+parse_actions_timeout(
+  StateCall, Debug, S, Actions, TransOpts,
+  {_,Time,_} = RelativeTimeout) ->
+    case classify_timer(Time, []) of
+        relative ->
+            parse_actions_timeout_add(
+              StateCall, Debug, S, Actions,
+              TransOpts, RelativeTimeout);
+        badarg ->
+            [error,
+             {bad_action_from_state_function,RelativeTimeout},
+             ?STACKTRACE(),
+             Debug]
+    end;
+parse_actions_timeout(
+  StateCall, Debug, S, Actions, TransOpts,
+  Timeout) ->
+    case classify_timer(Timeout, []) of
+        relative ->
+            parse_actions_timeout_add(
+              StateCall, Debug, S, Actions, TransOpts, Timeout);
+        badarg ->
+            [error,
+             {bad_action_from_state_function,Timeout},
+             ?STACKTRACE(),
+             Debug]
+    end.
+
+parse_actions_timeout_add(
+  StateCall, Debug, S, Actions,
+  #trans_opts{timeouts_r = TimeoutsR} = TransOpts, Timeout) ->
+    parse_actions(
+      StateCall, Debug, S, Actions,
+      TransOpts#trans_opts{timeouts_r = [Timeout|TimeoutsR]}).
+
+%% Do the state transition
+loop_event_done(
+  Parent, ?not_sys_debug,
+  #state{postponed = P} = S,
+  Events, Event, NextState, NewData,
+  #trans_opts{
+     postpone = Postpone, hibernate = Hibernate,
+     timeouts_r = [], next_events_r = []}) ->
+    %%
+    %% Optimize the simple cases
+    %% i.e no timer changes, no inserted events and no debug,
+    %% by duplicate stripped down code
+    %%
+    %% Fast path
+    %%
+    case Postpone of
+        true ->
+            loop_event_done_fast(
+              Parent, Hibernate,
+              S,
+              Events, [Event|P], NextState, NewData);
+        false ->
+            loop_event_done_fast(
+              Parent, Hibernate,
+              S,
+              Events, P, NextState, NewData)
+    end;
+loop_event_done(
   Parent, Debug_0,
-  #{state := State, postponed := P_0,
-    timer_refs := TimerRefs_0, timer_types := TimerTypes_0,
-    cancel_timers := CancelTimers_0} = S_0,
+  #state{
+     state = State, postponed = P_0,
+     timer_refs = TimerRefs_0, timer_types = TimerTypes_0,
+     cancel_timers = CancelTimers_0} = S,
   Events_0, Event_0, NextState, NewData,
-  Hibernate, TimeoutsR, Postpone, NextEventsR) ->
+  #trans_opts{
+     hibernate = Hibernate, timeouts_r = TimeoutsR,
+     postpone = Postpone, next_events_r = NextEventsR}) ->
     %%
     %% All options have been collected and next_events are buffered.
     %% Do the actual state transition.
     %%
-    {Debug_1,P_1} = % Move current event to postponed if Postpone
+    %% Full feature path
+    %%
+    [Debug_1|P_1] = % Move current event to postponed if Postpone
 	case Postpone of
 	    true ->
-		{sys_debug(Debug_0, S_0, State, {postpone,Event_0,State}),
-		 [Event_0|P_0]};
+		[?sys_debug(
+                    Debug_0,
+                    {S#state.name,State},
+                    {postpone,Event_0,State}),
+		 Event_0|P_0];
 	    false ->
-		{sys_debug(Debug_0, S_0, State, {consume,Event_0,State}),
-		 P_0}
+		[?sys_debug(
+                    Debug_0,
+                    {S#state.name,State},
+                    {consume,Event_0,State})|P_0]
 	end,
-    {Events_1,P_2,{TimerTypes_1,CancelTimers_1}} =
-	%% Move all postponed events to queue and cancel the
-	%% state timeout if the state changes
+    {Events_2,P_2,Timers_2} =
+	%% Move all postponed events to queue,
+        %% cancel the event timer,
+        %% and cancel the state timeout if the state changes
 	if
 	    NextState =:= State ->
-		{Events_0,P_1,{TimerTypes_0,CancelTimers_0}};
+		{Events_0,P_1,
+                 cancel_timer_by_type(
+                   timeout, {TimerTypes_0,CancelTimers_0})};
 	    true ->
 		{lists:reverse(P_1, Events_0),
 		 [],
 		 cancel_timer_by_type(
-		   state_timeout, TimerTypes_0, CancelTimers_0)}
-		    %% The state timer is removed from TimerTypes_1
-		    %% but remains in TimerRefs_0 until we get
+		   state_timeout,
+                   cancel_timer_by_type(
+                     timeout, {TimerTypes_0,CancelTimers_0}))}
+		    %% The state timer is removed from TimerTypes
+		    %% but remains in TimerRefs until we get
 		    %% the cancel_timer msg
 	end,
-    {TimerRefs_2,TimerTypes_2,CancelTimers_2,TimeoutEvents} =
-	%% Stop and start non-event timers
-	parse_timers(TimerRefs_0, TimerTypes_1, CancelTimers_1, TimeoutsR),
+    {TimerRefs_3,{TimerTypes_3,CancelTimers_3},TimeoutEvents} =
+	%% Stop and start timers
+	parse_timers(TimerRefs_0, Timers_2, TimeoutsR),
     %% Place next events last in reversed queue
-    Events_2R = lists:reverse(Events_1, NextEventsR),
-    %% Enqueue immediate timeout events and start event timer
-    Events_3R =	prepend_timeout_events(TimeoutEvents, Events_2R),
-    S_1 =
-	S_0#{
-	  state := NextState,
-	  data := NewData,
-	  postponed := P_2,
-	  timer_refs := TimerRefs_2,
-	  timer_types := TimerTypes_2,
-	  cancel_timers := CancelTimers_2,
-	  hibernate := Hibernate},
-    case lists:reverse(Events_3R) of
-	[] ->
-	    %% Get a new event
-	    loop(Parent, Debug_1, S_1);
-	[Event|Events] ->
+    Events_3R = lists:reverse(Events_2, NextEventsR),
+    %% Enqueue immediate timeout events
+    Events_4R =	prepend_timeout_events(TimeoutEvents, Events_3R),
+    loop_event_done(
+      Parent, Debug_1,
+      S#state{
+        state = NextState,
+        data = NewData,
+        postponed = P_2,
+        timer_refs = TimerRefs_3,
+        timer_types = TimerTypes_3,
+        cancel_timers = CancelTimers_3,
+        hibernate = Hibernate},
+      lists:reverse(Events_4R)).
+
+%% Fast path
+%%
+loop_event_done_fast(
+  Parent, Hibernate,
+  #state{
+     state = NextState,
+     timer_types = #{timeout := _} = TimerTypes,
+     cancel_timers = CancelTimers} = S,
+  Events, P, NextState, NewData) ->
+    %%
+    %% Same state, event timeout active
+    %%
+    loop_event_done_fast(
+      Parent, Hibernate, S,
+      Events, P, NextState, NewData,
+      cancel_timer_by_type(
+        timeout, {TimerTypes,CancelTimers}));
+loop_event_done_fast(
+  Parent, Hibernate,
+  #state{state = NextState} = S,
+  Events, P, NextState, NewData) ->
+    %%
+    %% Same state
+    %%
+    loop_event_done(
+      Parent, ?not_sys_debug,
+      S#state{
+        data = NewData,
+        postponed = P,
+        hibernate = Hibernate},
+      Events);
+loop_event_done_fast(
+  Parent, Hibernate,
+  #state{
+     timer_types = #{timeout := _} = TimerTypes,
+     cancel_timers = CancelTimers} = S,
+  Events, P, NextState, NewData) ->
+    %%
+    %% State change, event timeout active
+    %%
+    loop_event_done_fast(
+      Parent, Hibernate, S,
+      lists:reverse(P, Events), [], NextState, NewData,
+        cancel_timer_by_type(
+          state_timeout,
+          cancel_timer_by_type(
+            timeout, {TimerTypes,CancelTimers})));
+loop_event_done_fast(
+  Parent, Hibernate,
+  #state{
+     timer_types = #{state_timeout := _} = TimerTypes,
+     cancel_timers = CancelTimers} = S,
+  Events, P, NextState, NewData) ->
+    %%
+    %% State change, state timeout active
+    %%
+    loop_event_done_fast(
+      Parent, Hibernate, S,
+      lists:reverse(P, Events), [], NextState, NewData,
+        cancel_timer_by_type(
+          state_timeout,
+          cancel_timer_by_type(
+            timeout, {TimerTypes,CancelTimers})));
+loop_event_done_fast(
+  Parent, Hibernate,
+  #state{} = S,
+  Events, P, NextState, NewData) ->
+    %%
+    %% State change, no timeout to automatically cancel
+    %%
+    loop_event_done(
+      Parent, ?not_sys_debug,
+      S#state{
+        state = NextState,
+        data = NewData,
+        postponed = [],
+        hibernate = Hibernate},
+      lists:reverse(P, Events)).
+%%
+%% Fast path
+%%
+loop_event_done_fast(
+  Parent, Hibernate, S,
+  Events, P, NextState, NewData,
+  {TimerTypes,CancelTimers}) ->
+    %%
+    loop_event_done(
+      Parent, ?not_sys_debug,
+      S#state{
+        state = NextState,
+        data = NewData,
+        postponed = P,
+        timer_types = TimerTypes,
+        cancel_timers = CancelTimers,
+        hibernate = Hibernate},
+      Events).
+
+loop_event_done(Parent, Debug, S, Q) ->
+    case Q of
+        [] ->
+            %% Get a new event
+            loop(Parent, Debug, S);
+        [{Type,Content}|Events] ->
 	    %% Loop until out of enqueued events
-	    loop_event(Parent, Debug_1, S_1, Events, Event, Hibernate)
+	    loop_event(Parent, Debug, S, Events, Type, Content)
     end.
 
 
 %%---------------------------------------------------------------------------
 %% Server loop helpers
 
-call_callback_mode(#{module := Module} = S) ->
+call_callback_mode(#state{module = Module} = S) ->
     try Module:callback_mode() of
 	CallbackMode ->
 	    callback_mode_result(S, CallbackMode)
     catch
 	CallbackMode ->
 	    callback_mode_result(S, CallbackMode);
-	Class:Reason ->
-	    {Class,Reason,erlang:get_stacktrace()}
+	Class:Reason:Stacktrace ->
+	    [Class,Reason,Stacktrace]
     end.
 
 callback_mode_result(S, CallbackMode) ->
-    case
-	parse_callback_mode(
-	  if
-	      is_atom(CallbackMode) ->
-		  [CallbackMode];
-	      true ->
-		  CallbackMode
-	  end, undefined, false)
-    of
-	{undefined,_} ->
-	    {error,
-	     {bad_return_from_callback_mode,CallbackMode},
-	     ?STACKTRACE()};
-	{CBMode,StateEnter} ->
-	    {ok,
-	     S#{
-	       callback_mode := CBMode,
-	       state_enter := StateEnter}}
-    end.
-
-parse_callback_mode([], CBMode, StateEnter) ->
-    {CBMode,StateEnter};
-parse_callback_mode([H|T], CBMode, StateEnter) ->
+    callback_mode_result(
+      S, CallbackMode, listify(CallbackMode), undefined, false).
+%%
+callback_mode_result(_S, CallbackMode, [], undefined, _StateEnter) ->
+    [error,
+     {bad_return_from_callback_mode,CallbackMode},
+     ?STACKTRACE()];
+callback_mode_result(S, _CallbackMode, [], CBMode, StateEnter) ->
+    S#state{callback_mode = CBMode, state_enter = StateEnter};
+callback_mode_result(S, CallbackMode, [H|T], CBMode, StateEnter) ->
     case callback_mode(H) of
 	true ->
-	    parse_callback_mode(T, H, StateEnter);
+            callback_mode_result(S, CallbackMode, T, H, StateEnter);
 	false ->
-	    case H of
-		state_enter ->
-		    parse_callback_mode(T, CBMode, true);
-		_ ->
-		    {undefined,StateEnter}
+	    case state_enter(H) of
+		true ->
+                    callback_mode_result(S, CallbackMode, T, CBMode, true);
+		false ->
+                    [error,
+                     {bad_return_from_callback_mode,CallbackMode},
+                     ?STACKTRACE()]
 	    end
-    end;
-parse_callback_mode(_, _CBMode, StateEnter) ->
-    {undefined,StateEnter}.
+    end.
 
 
 call_state_function(
-  #{callback_mode := undefined} = S, Type, Content, State, Data) ->
+  #state{callback_mode = undefined} = S, Type, Content, State, Data) ->
     case call_callback_mode(S) of
-	{ok,NewS} ->
+	#state{} = NewS ->
 	    call_state_function(NewS, Type, Content, State, Data);
 	Error ->
 	    Error
     end;
 call_state_function(
-  #{callback_mode := CallbackMode, module := Module} = S,
+  #state{callback_mode = CallbackMode, module = Module} = S,
   Type, Content, State, Data) ->
     try
 	case CallbackMode of
@@ -1241,333 +1627,108 @@ call_state_function(
 	end
     of
 	Result ->
-	    {ok,Result,S}
+	    {Result,S}
     catch
 	Result ->
-	    {ok,Result,S};
-	Class:Reason ->
-	    {Class,Reason,erlang:get_stacktrace()}
-    end.
-
-
-%% Interpret all callback return variants
-parse_event_result(
-  AllowStateChange, Debug, S,
-  Events, Event, State, Data, Result) ->
-    case Result of
-	stop ->
-	    terminate(
-	      exit, normal, ?STACKTRACE(), Debug,
-	      S#{state := State, data := Data},
-	      [Event|Events]);
-	{stop,Reason} ->
-	    terminate(
-	      exit, Reason, ?STACKTRACE(), Debug,
-	      S#{state := State, data := Data},
-	      [Event|Events]);
-	{stop,Reason,NewData} ->
-	    terminate(
-	      exit, Reason, ?STACKTRACE(), Debug,
-	      S#{state := State, data := NewData},
-	      [Event|Events]);
-	%%
-	{stop_and_reply,Reason,Replies} ->
-	    reply_then_terminate(
-	      exit, Reason, ?STACKTRACE(), Debug,
-	      S#{state := State, data := Data},
-	      [Event|Events], Replies);
-	{stop_and_reply,Reason,Replies,NewData} ->
-	    reply_then_terminate(
-	      exit, Reason, ?STACKTRACE(), Debug,
-	      S#{state := State, data := NewData},
-	      [Event|Events], Replies);
-	%%
-	{next_state,State,NewData} ->
-	    {State,NewData,[],false};
-	{next_state,NextState,NewData} when AllowStateChange ->
-	    {NextState,NewData,[],true};
-	{next_state,State,NewData,Actions} ->
-	    {State,NewData,Actions,false};
-	{next_state,NextState,NewData,Actions} when AllowStateChange ->
-	    {NextState,NewData,Actions,true};
-	%%
-	{keep_state,NewData} ->
-	    {State,NewData,[],false};
-	{keep_state,NewData,Actions} ->
-	    {State,NewData,Actions,false};
-	keep_state_and_data ->
-	    {State,Data,[],false};
-	{keep_state_and_data,Actions} ->
-	    {State,Data,Actions,false};
-	%%
-	{repeat_state,NewData} ->
-	    {State,NewData,[],true};
-	{repeat_state,NewData,Actions} ->
-	    {State,NewData,Actions,true};
-	repeat_state_and_data ->
-	    {State,Data,[],true};
-	{repeat_state_and_data,Actions} ->
-	    {State,Data,Actions,true};
-	%%
-	_ ->
-	    terminate(
-	      error,
-	      {bad_return_from_state_function,Result},
-	      ?STACKTRACE(), Debug,
-	      S#{state := State, data := Data},
-	      [Event|Events])
+	    {Result,S};
+	Class:Reason:Stacktrace ->
+	    [Class,Reason,Stacktrace]
     end.
 
 
-parse_enter_actions(Debug, S, State, Actions, Hibernate, TimeoutsR) ->
-    Postpone = forbidden,
-    NextEventsR = forbidden,
-    parse_actions(
-      Debug, S, State, listify(Actions),
-      Hibernate, TimeoutsR, Postpone, NextEventsR).
-
-parse_actions(Debug, S, State, Actions) ->
-    Hibernate = false,
-    TimeoutsR = [infinity], %% Will cancel event timer
-    Postpone = false,
-    NextEventsR = [],
-    parse_actions(
-      Debug, S, State, listify(Actions),
-      Hibernate, TimeoutsR, Postpone, NextEventsR).
+%% -> absolute | relative | badarg
+classify_timer(Time, Opts) ->
+    classify_timer(Time, Opts, false).
 %%
-parse_actions(
-  Debug, _S, _State, [],
-  Hibernate, TimeoutsR, Postpone, NextEventsR) ->
-    {ok,Debug,Hibernate,TimeoutsR,Postpone,NextEventsR};
-parse_actions(
-  Debug, S, State, [Action|Actions],
-  Hibernate, TimeoutsR, Postpone, NextEventsR) ->
-    case Action of
-	%% Actual actions
-	{reply,From,Reply} ->
-	    case from(From) of
-		true ->
-		    NewDebug = do_reply(Debug, S, State, From, Reply),
-		    parse_actions(
-		      NewDebug, S, State, Actions,
-		      Hibernate, TimeoutsR, Postpone, NextEventsR);
-		false ->
-		    {error,
-		     {bad_action_from_state_function,Action},
-		     ?STACKTRACE()}
-	    end;
-	%%
-	%% Actions that set options
-	{hibernate,NewHibernate} when is_boolean(NewHibernate) ->
-	    parse_actions(
-	      Debug, S, State, Actions,
-	      NewHibernate, TimeoutsR, Postpone, NextEventsR);
-	hibernate ->
-	    NewHibernate = true,
-	    parse_actions(
-	      Debug, S, State, Actions,
-	      NewHibernate, TimeoutsR, Postpone, NextEventsR);
-	%%
-	{postpone,NewPostpone}
-	  when is_boolean(NewPostpone), Postpone =/= forbidden ->
-	    parse_actions(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, NewPostpone, NextEventsR);
-	postpone when Postpone =/= forbidden ->
-	    NewPostpone = true,
-	    parse_actions(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, NewPostpone, NextEventsR);
-	%%
-	{next_event,Type,Content} ->
-	    case event_type(Type) of
-		true when NextEventsR =/= forbidden ->
-		    NewDebug =
-			sys_debug(Debug, S, State, {in,{Type,Content}}),
-		    parse_actions(
-		      NewDebug, S, State, Actions,
-		      Hibernate, TimeoutsR, Postpone,
-		      [{Type,Content}|NextEventsR]);
-		_ ->
-		    {error,
-		     {bad_action_from_state_function,Action},
-		     ?STACKTRACE()}
-	    end;
-	%%
-	{{timeout,_},_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	{{timeout,_},_,_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	{timeout,_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	{timeout,_,_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	{state_timeout,_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	{state_timeout,_,_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	Time ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Time)
-    end.
-
-parse_actions_timeout(
-  Debug, S, State, Actions,
-  Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout) ->
-    case Timeout of
-	{TimerType,Time,TimerMsg,TimerOpts} ->
-	    case validate_timer_args(Time, listify(TimerOpts)) of
-		true ->
-		    parse_actions(
-		      Debug, S, State, Actions,
-		      Hibernate, [Timeout|TimeoutsR],
-		      Postpone, NextEventsR);
-		false ->
-		    NewTimeout = {TimerType,Time,TimerMsg},
-		    parse_actions(
-		      Debug, S, State, Actions,
-		      Hibernate, [NewTimeout|TimeoutsR],
-		      Postpone, NextEventsR);
-		error ->
-		    {error,
-		     {bad_action_from_state_function,Timeout},
-		     ?STACKTRACE()}
-	    end;
-	{_,Time,_} ->
-	    case validate_timer_args(Time, []) of
-		false ->
-		    parse_actions(
-		      Debug, S, State, Actions,
-		      Hibernate, [Timeout|TimeoutsR],
-		      Postpone, NextEventsR);
-		error ->
-		    {error,
-		     {bad_action_from_state_function,Timeout},
-		     ?STACKTRACE()}
-	    end;
-	Time ->
-	    case validate_timer_args(Time, []) of
-		false ->
-		    parse_actions(
-		      Debug, S, State, Actions,
-		      Hibernate, [Timeout|TimeoutsR],
-		      Postpone, NextEventsR);
-		error ->
-		    {error,
-		     {bad_action_from_state_function,Timeout},
-		     ?STACKTRACE()}
-	    end
-    end.
-
-validate_timer_args(Time, Opts) ->
-    validate_timer_args(Time, Opts, false).
-%%
-validate_timer_args(Time, [], true) when is_integer(Time) ->
-    true;
-validate_timer_args(Time, [], false) when is_integer(Time), Time >= 0 ->
-    false;
-validate_timer_args(infinity, [], Abs) ->
-    Abs;
-validate_timer_args(Time, [{abs,Abs}|Opts], _) when is_boolean(Abs) ->
-    validate_timer_args(Time, Opts, Abs);
-validate_timer_args(_, [_|_], _) ->
-    error.
+classify_timer(Time, [], Abs) ->
+    case Abs of
+        true when
+              is_integer(Time);
+              Time =:= infinity ->
+            absolute;
+        false when
+              is_integer(Time), 0 =< Time;
+              Time =:= infinity ->
+            relative;
+        _ ->
+            badarg
+    end;
+classify_timer(Time, [{abs,Abs}|Opts], _) when is_boolean(Abs) ->
+    classify_timer(Time, Opts, Abs);
+classify_timer(_, Opts, _) when is_list(Opts) ->
+    badarg.
 
 %% Stop and start timers as well as create timeout zero events
 %% and pending event timer
 %%
 %% Stop and start timers non-event timers
-parse_timers(TimerRefs, TimerTypes, CancelTimers, TimeoutsR) ->
-    parse_timers(TimerRefs, TimerTypes, CancelTimers, TimeoutsR, #{}, []).
+parse_timers(TimerRefs, Timers, TimeoutsR) ->
+    parse_timers(TimerRefs, Timers, TimeoutsR, #{}, []).
 %%
 parse_timers(
-  TimerRefs, TimerTypes, CancelTimers, [], _Seen, TimeoutEvents) ->
-    {TimerRefs,TimerTypes,CancelTimers,TimeoutEvents};
+  TimerRefs, Timers, [], _Seen, TimeoutEvents) ->
+    %%
+    {TimerRefs,Timers,TimeoutEvents};
 parse_timers(
-  TimerRefs, TimerTypes, CancelTimers, [Timeout|TimeoutsR],
-  Seen, TimeoutEvents) ->
+  TimerRefs, Timers, [Timeout|TimeoutsR], Seen, TimeoutEvents) ->
+    %%
     case Timeout of
 	{TimerType,Time,TimerMsg,TimerOpts} ->
 	    %% Absolute timer
 	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents,
+	      TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
 	      TimerType, Time, TimerMsg, listify(TimerOpts));
 	%% Relative timers below
 	{TimerType,0,TimerMsg} ->
 	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents,
+	      TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
 	      TimerType, zero, TimerMsg, []);
 	{TimerType,Time,TimerMsg} ->
 	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents,
+	      TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
 	      TimerType, Time, TimerMsg, []);
 	0 ->
 	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents,
+	      TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
 	      timeout, zero, 0, []);
 	Time ->
 	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents,
+	      TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
 	      timeout, Time, Time, [])
     end.
 
 parse_timers(
-  TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-  Seen, TimeoutEvents,
+  TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
   TimerType, Time, TimerMsg, TimerOpts) ->
     case Seen of
 	#{TimerType := _} ->
 	    %% Type seen before - ignore
 	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents);
+              TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents);
 	#{} ->
 	    %% Unseen type - handle
 	    NewSeen = Seen#{TimerType => true},
 	    case Time of
 		infinity ->
 		    %% Cancel any running timer
-		    {NewTimerTypes,NewCancelTimers} =
-			cancel_timer_by_type(
-			  TimerType, TimerTypes, CancelTimers),
 		    parse_timers(
-		      TimerRefs, NewTimerTypes, NewCancelTimers, TimeoutsR,
-		      NewSeen, TimeoutEvents);
+		      TimerRefs, cancel_timer_by_type(TimerType, Timers),
+                      TimeoutsR, NewSeen, TimeoutEvents);
 		zero ->
 		    %% Cancel any running timer
-		    {NewTimerTypes,NewCancelTimers} =
-			cancel_timer_by_type(
-			  TimerType, TimerTypes, CancelTimers),
 		    %% Handle zero time timeouts later
-		    TimeoutEvent = {TimerType,TimerMsg},
 		    parse_timers(
-		      TimerRefs, NewTimerTypes, NewCancelTimers, TimeoutsR,
-		      NewSeen, [TimeoutEvent|TimeoutEvents]);
+		      TimerRefs, cancel_timer_by_type(TimerType, Timers),
+                      TimeoutsR, NewSeen,
+                      [{TimerType,TimerMsg}|TimeoutEvents]);
 		_ ->
 		    %% (Re)start the timer
 		    TimerRef =
 			erlang:start_timer(
 			  Time, self(), TimerMsg, TimerOpts),
-		    case TimerTypes of
-			#{TimerType := OldTimerRef} ->
+		    case Timers of
+			{#{TimerType := OldTimerRef} = TimerTypes,
+                         CancelTimers} ->
 			    %% Cancel the running timer
 			    cancel_timer(OldTimerRef),
 			    NewCancelTimers = CancelTimers + 1,
@@ -1575,17 +1736,17 @@ parse_timers(
 			    %% both TimerRefs and TimerTypes
 			    parse_timers(
 			      TimerRefs#{TimerRef => TimerType},
-			      TimerTypes#{TimerType => TimerRef},
-			      NewCancelTimers, TimeoutsR,
-			      NewSeen, TimeoutEvents);
-			#{} ->
+			      {TimerTypes#{TimerType => TimerRef},
+                               NewCancelTimers},
+                              TimeoutsR, NewSeen, TimeoutEvents);
+			{#{} = TimerTypes,CancelTimers} ->
 			    %% Insert the new timer into
 			    %% both TimerRefs and TimerTypes
 			    parse_timers(
 			      TimerRefs#{TimerRef => TimerType},
-			      TimerTypes#{TimerType => TimerRef},
-			      CancelTimers, TimeoutsR,
-			      NewSeen, TimeoutEvents)
+			      {TimerTypes#{TimerType => TimerRef},
+                               CancelTimers},
+                              TimeoutsR, NewSeen, TimeoutEvents)
 		    end
 	    end
     end.
@@ -1607,6 +1768,8 @@ prepend_timeout_events([], EventsR) ->
 prepend_timeout_events([{timeout,_} = TimeoutEvent|TimeoutEvents], []) ->
     prepend_timeout_events(TimeoutEvents, [TimeoutEvent]);
 prepend_timeout_events([{timeout,_}|TimeoutEvents], EventsR) ->
+    %% Ignore since there are other events in queue
+    %% so they have cancelled the event timeout 0.
     prepend_timeout_events(TimeoutEvents, EventsR);
 prepend_timeout_events([TimeoutEvent|TimeoutEvents], EventsR) ->
     %% Just prepend all others
@@ -1617,23 +1780,28 @@ prepend_timeout_events([TimeoutEvent|TimeoutEvents], EventsR) ->
 %%---------------------------------------------------------------------------
 %% Server helpers
 
-reply_then_terminate(
-  Class, Reason, Stacktrace, Debug,
-  #{state := State} = S, Q, Replies) ->
+reply_then_terminate(Class, Reason, Stacktrace, Debug, S, Q, Replies) ->
     do_reply_then_terminate(
-      Class, Reason, Stacktrace, Debug,
-      S, Q, listify(Replies), State).
+      Class, Reason, Stacktrace, Debug, S, Q, listify(Replies)).
 %%
 do_reply_then_terminate(
-  Class, Reason, Stacktrace, Debug, S, Q, [], _State) ->
+  Class, Reason, Stacktrace, Debug, S, Q, []) ->
     terminate(Class, Reason, Stacktrace, Debug, S, Q);
 do_reply_then_terminate(
-  Class, Reason, Stacktrace, Debug, S, Q, [R|Rs], State) ->
+  Class, Reason, Stacktrace, Debug, S, Q, [R|Rs]) ->
     case R of
 	{reply,{_To,_Tag}=From,Reply} ->
-	    NewDebug = do_reply(Debug, S, State, From, Reply),
+            reply(From, Reply),
+            NewDebug =
+                ?sys_debug(
+                   Debug,
+                   begin
+                       #state{name = Name, state = State} = S,
+                       {Name,State}
+                   end,
+                   {out,Reply,From}),
 	    do_reply_then_terminate(
-	      Class, Reason, Stacktrace, NewDebug, S, Q, Rs, State);
+	      Class, Reason, Stacktrace, NewDebug, S, Q, Rs);
 	_ ->
 	    terminate(
 	      error,
@@ -1642,14 +1810,9 @@ do_reply_then_terminate(
 	      Debug, S, Q)
     end.
 
-do_reply(Debug, S, State, From, Reply) ->
-    reply(From, Reply),
-    sys_debug(Debug, S, State, {out,Reply,From}).
-
-
 terminate(
   Class, Reason, Stacktrace, Debug,
-  #{module := Module, state := State, data := Data, postponed := P} = S,
+  #state{module = Module, state = State, data = Data} = S,
   Q) ->
     case erlang:function_exported(Module, terminate, 3) of
 	true ->
@@ -1657,10 +1820,9 @@ terminate(
 		_ -> ok
 	    catch
 		_ -> ok;
-		C:R ->
-		    ST = erlang:get_stacktrace(),
+		C:R:ST ->
 		    error_info(
-		      C, R, ST, S, Q, P,
+		      C, R, ST, S, Q,
 		      format_status(terminate, get(), S)),
 		    sys:print_log(Debug),
 		    erlang:raise(C, R, ST)
@@ -1671,14 +1833,14 @@ terminate(
     _ =
 	case Reason of
 	    normal ->
-		sys_debug(Debug, S, State, {terminate,Reason});
+                terminate_sys_debug(Debug, S, State, Reason);
 	    shutdown ->
-		sys_debug(Debug, S, State, {terminate,Reason});
+                terminate_sys_debug(Debug, S, State, Reason);
 	    {shutdown,_} ->
-		sys_debug(Debug, S, State, {terminate,Reason});
+                terminate_sys_debug(Debug, S, State, Reason);
 	    _ ->
 		error_info(
-		  Class, Reason, Stacktrace, S, Q, P,
+		  Class, Reason, Stacktrace, S, Q,
 		  format_status(terminate, get(), S)),
 		sys:print_log(Debug)
 	end,
@@ -1689,12 +1851,18 @@ terminate(
 	    erlang:raise(Class, Reason, Stacktrace)
     end.
 
+terminate_sys_debug(Debug, S, State, Reason) ->
+    ?sys_debug(Debug, {S#state.name,State}, {terminate,Reason}).
+
+
 error_info(
   Class, Reason, Stacktrace,
-  #{name := Name,
-    callback_mode := CallbackMode,
-    state_enter := StateEnter},
-  Q, P, FmtData) ->
+  #state{
+     name = Name,
+     callback_mode = CallbackMode,
+     state_enter = StateEnter,
+     postponed = P},
+  Q, FmtData) ->
     {FixedReason,FixedStacktrace} =
 	case Stacktrace of
 	    [{M,F,Args,_}|ST]
@@ -1775,7 +1943,7 @@ error_info(
 %% Call Module:format_status/2 or return a default value
 format_status(
   Opt, PDict,
-  #{module := Module, state := State, data := Data}) ->
+  #state{module = Module, state = State, data = Data}) ->
     case erlang:function_exported(Module, format_status, 2) of
 	true ->
 	    try Module:format_status(Opt, [PDict,State,Data])
@@ -1800,6 +1968,7 @@ format_status_default(Opt, State, Data) ->
 	    [{data,[{"State",StateData}]}]
     end.
 
+-compile({inline, [listify/1]}).
 listify(Item) when is_list(Item) ->
     Item;
 listify(Item) ->
@@ -1813,14 +1982,16 @@ listify(Item) ->
 %%
 %% Remove the timer from TimerTypes.
 %% When we get the cancel_timer msg we remove it from TimerRefs.
-cancel_timer_by_type(TimerType, TimerTypes, CancelTimers) ->
+-compile({inline, [cancel_timer_by_type/2]}).
+cancel_timer_by_type(TimerType, {TimerTypes,CancelTimers} = TT_CT) ->
     case TimerTypes of
 	#{TimerType := TimerRef} ->
-	    cancel_timer(TimerRef),
+            ok = erlang:cancel_timer(TimerRef, [{async,true}]),
 	    {maps:remove(TimerType, TimerTypes),CancelTimers + 1};
 	#{} ->
-	    {TimerTypes,CancelTimers}
+	    TT_CT
     end.
 
+-compile({inline, [cancel_timer/1]}).
 cancel_timer(TimerRef) ->
     ok = erlang:cancel_timer(TimerRef, [{async,true}]).
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 9d447418f8..e37c13093b 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -149,7 +149,7 @@ fread(Chars, Format) ->
 
 -spec fread(Continuation, CharSpec, Format) -> Return when
       Continuation :: continuation() | [],
-      CharSpec :: string() | eof,
+      CharSpec :: string() | 'eof',
       Format :: string(),
       Return :: {'more', Continuation1 :: continuation()}
               | {'done', Result, LeftOverChars :: string()},
@@ -931,7 +931,7 @@ limit_term(Term, Depth) ->
 limit(_, 0) -> '...';
 limit([H|T]=L, D) ->
     if
-	D =:= 1 -> '...';
+	D =:= 1 -> ['...'];
 	true ->
             case printable_list(L) of
                 true -> L;
@@ -944,7 +944,7 @@ limit(Term, D) when is_map(Term) ->
 limit({}=T, _D) -> T;
 limit(T, D) when is_tuple(T) ->
     if
-	D =:= 1 -> '...';
+	D =:= 1 -> {'...'};
 	true ->
             list_to_tuple([limit(element(1, T), D-1)|
                            limit_tail(tl(tuple_to_list(T)), D-1)])
@@ -961,21 +961,29 @@ limit_tail(Other, D) ->
 
 %% Cannot limit maps properly since there is no guarantee that
 %% maps:from_list() creates a map with the same internal ordering of
-%% the selected associations as in Map.
+%% the selected associations as in Map. Instead of subtracting one
+%% from the depth as the map associations are traversed (as is done
+%% for tuples and lists), the same depth is applied to each and every
+%% (returned) association.
 limit_map(Map, D) ->
-    maps:from_list(erts_internal:maps_to_list(Map, D)).
-%%     maps:from_list(limit_map_body(erts_internal:maps_to_list(Map, D), D)).
-
-%% limit_map_body(_, 0) -> [{'...', '...'}];
-%% limit_map_body([], _) -> [];
-%% limit_map_body([{K,V}], D) -> [limit_map_assoc(K, V, D)];
-%% limit_map_body([{K,V}|KVs], D) ->
-%%     [limit_map_assoc(K, V, D) | limit_map_body(KVs, D-1)].
+    %% Keep one extra association to make sure the final ',...' is included.
+    limit_map_body(maps:iterator(Map), D + 1, D, []).
+
+limit_map_body(_I, 0, _D0, Acc) ->
+    maps:from_list(Acc);
+limit_map_body(I, D, D0, Acc) ->
+    case maps:next(I) of
+        {K, V, NextI} ->
+            limit_map_body(NextI, D-1, D0, [limit_map_assoc(K, V, D0) | Acc]);
+        none ->
+            maps:from_list(Acc)
+    end.
 
-%% limit_map_assoc(K, V, D) ->
-%%     {limit(K, D-1), limit(V, D-1)}.
+limit_map_assoc(K, V, D) ->
+    %% Keep keys as are to avoid creating duplicated keys.
+    {K, limit(V, D - 1)}.
 
-limit_bitstring(B, _D) -> B. %% Keeps all printable binaries.
+limit_bitstring(B, _D) -> B. % Keeps all printable binaries.
 
 test_limit(_, 0) -> throw(limit);
 test_limit([H|T]=L, D) when is_integer(D) ->
@@ -1011,18 +1019,21 @@ test_limit_tuple(T, I, Sz, D) ->
     test_limit(element(I, T), D-1),
     test_limit_tuple(T, I+1, Sz, D-1).
 
-test_limit_map(_Map, _D) -> ok.
-%%     test_limit_map_body(erts_internal:maps_to_list(Map, D), D).
-
-%% test_limit_map_body(_, 0) -> throw(limit);
-%% test_limit_map_body([], _) -> ok;
-%% test_limit_map_body([{K,V}], D) -> test_limit_map_assoc(K, V, D);
-%% test_limit_map_body([{K,V}|KVs], D) ->
-%%     test_limit_map_assoc(K, V, D),
-%%     test_limit_map_body(KVs, D-1).
+test_limit_map(Map, D) ->
+    test_limit_map_body(maps:iterator(Map), D).
+
+test_limit_map_body(_I, 0) -> throw(limit); % cannot happen
+test_limit_map_body(I, D) ->
+    case maps:next(I) of
+        {K, V, NextI} ->
+            test_limit_map_assoc(K, V, D),
+            test_limit_map_body(NextI, D-1);
+        none ->
+            ok
+    end.
 
-%% test_limit_map_assoc(K, V, D) ->
-%%     test_limit(K, D-1),
-%%     test_limit(V, D-1).
+test_limit_map_assoc(K, V, D) ->
+    test_limit(K, D - 1),
+    test_limit(V, D - 1).
 
 test_limit_bitstring(_, _) -> ok.
diff --git a/lib/stdlib/src/io_lib_format.erl b/lib/stdlib/src/io_lib_format.erl
index e345810ca0..64edbf1824 100644
--- a/lib/stdlib/src/io_lib_format.erl
+++ b/lib/stdlib/src/io_lib_format.erl
@@ -95,7 +95,7 @@ print([]) ->
     [].
 
 print(C, F, Ad, P, Pad, Encoding, Strings) ->
-    [$~] ++ print_field_width(F, Ad) ++ print_precision(P) ++
+    [$~] ++ print_field_width(F, Ad) ++ print_precision(P, Pad) ++
         print_pad_char(Pad) ++ print_encoding(Encoding) ++
         print_strings(Strings) ++ [C].
 
@@ -103,8 +103,9 @@ print_field_width(none, _Ad) -> "";
 print_field_width(F, left) -> integer_to_list(-F);
 print_field_width(F, right) -> integer_to_list(F).
 
-print_precision(none) -> "";
-print_precision(P) -> [$. | integer_to_list(P)].
+print_precision(none, $\s) -> "";
+print_precision(none, _Pad) -> ".";  % pad must be second dot
+print_precision(P, _Pad) -> [$. | integer_to_list(P)].
 
 print_pad_char($\s) -> ""; % default, no need to make explicit
 print_pad_char(Pad) -> [$., Pad].
@@ -126,25 +127,23 @@ collect_cseq(Fmt0, Args0) ->
     {F,Ad,Fmt1,Args1} = field_width(Fmt0, Args0),
     {P,Fmt2,Args2} = precision(Fmt1, Args1),
     {Pad,Fmt3,Args3} = pad_char(Fmt2, Args2),
-    {Encoding,Fmt4,Args4} = encoding(Fmt3, Args3),
-    {Strings,Fmt5,Args5} = strings(Fmt4, Args4),
-    {C,As,Fmt6,Args6} = collect_cc(Fmt5, Args5),
-    FormatSpec = #{control_char => C, args => As, width => F, adjust => Ad,
-                   precision => P, pad_char => Pad, encoding => Encoding,
-                   strings => Strings},
-    {FormatSpec,Fmt6,Args6}.
-
-encoding([$t|Fmt],Args) ->
-    true = hd(Fmt) =/= $l,
-    {unicode,Fmt,Args};
-encoding(Fmt,Args) ->
-    {latin1,Fmt,Args}.
-
-strings([$l|Fmt],Args) ->
-    true = hd(Fmt) =/= $t,
-    {false,Fmt,Args};
-strings(Fmt,Args) ->
-    {true,Fmt,Args}.
+    Spec0 = #{width => F,
+              adjust => Ad,
+              precision => P,
+              pad_char => Pad,
+              encoding => latin1,
+              strings => true},
+    {Spec1,Fmt4} = modifiers(Fmt3, Spec0),
+    {C,As,Fmt5,Args4} = collect_cc(Fmt4, Args3),
+    Spec2 = Spec1#{control_char => C, args => As},
+    {Spec2,Fmt5,Args4}.
+
+modifiers([$t|Fmt], Spec) ->
+    modifiers(Fmt, Spec#{encoding => unicode});
+modifiers([$l|Fmt], Spec) ->
+    modifiers(Fmt, Spec#{strings => false});
+modifiers(Fmt, Spec) ->
+    {Spec, Fmt}.
 
 field_width([$-|Fmt0], Args0) ->
     {F,Fmt,Args} = field_value(Fmt0, Args0),
diff --git a/lib/stdlib/src/io_lib_fread.erl b/lib/stdlib/src/io_lib_fread.erl
index 983e8d4566..319bff484e 100644
--- a/lib/stdlib/src/io_lib_fread.erl
+++ b/lib/stdlib/src/io_lib_fread.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -38,7 +38,7 @@
 
 -spec fread(Continuation, String, Format) -> Return when
       Continuation :: io_lib:continuation() |  [],
-      String :: string(),
+      String :: string() | 'eof',
       Format :: string(),
       Return :: {'more', Continuation1 :: io_lib:continuation()}
               | {'done', Result, LeftOverChars :: string()},
diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl
index 505613b80e..89e1931d2d 100644
--- a/lib/stdlib/src/io_lib_pretty.erl
+++ b/lib/stdlib/src/io_lib_pretty.erl
@@ -478,9 +478,19 @@ print_length(Term, _D, _RF, _Enc, _Str) ->
 print_length_map(_Map, 1, _RF, _Enc, _Str) ->
     {"#{...}", 6};
 print_length_map(Map, D, RF, Enc, Str) when is_map(Map) ->
-    Pairs = print_length_map_pairs(erts_internal:maps_to_list(Map, D), D, RF, Enc, Str),
+    Pairs = print_length_map_pairs(limit_map(maps:iterator(Map), D, []), D, RF, Enc, Str),
     {{map, Pairs}, list_length(Pairs, 3)}.
 
+limit_map(_I, 0, Acc) ->
+    Acc;
+limit_map(I, D, Acc) ->
+    case maps:next(I) of
+        {K, V, NextI} ->
+            limit_map(NextI, D-1, [{K,V} | Acc]);
+        none ->
+            Acc
+    end.
+
 print_length_map_pairs([], _D, _RF, _Enc, _Str) ->
     [];
 print_length_map_pairs(_Pairs, 1, _RF, _Enc, _Str) ->
diff --git a/lib/stdlib/src/lib.erl b/lib/stdlib/src/lib.erl
index a7980cc294..51e0c3f77e 100644
--- a/lib/stdlib/src/lib.erl
+++ b/lib/stdlib/src/lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -551,7 +551,7 @@ format_stacktrace1(S0, Stack0, PF, SF, Enc) ->
     format_stacktrace2(S, Stack, 1, PF, Enc).
 
 format_stacktrace2(S, [{M,F,A,L}|Fs], N, PF, Enc) when is_integer(A) ->
-    [io_lib:fwrite(<<"~s~s ~ts ~s">>,
+    [io_lib:fwrite(<<"~s~s ~ts ~ts">>,
                    [sep(N, S), origin(N, M, F, A),
 		    mfa_to_string(M, F, A, Enc),
 		    location(L)])
@@ -573,7 +573,7 @@ location(L) ->
     Line = proplists:get_value(line, L),
     if
 	File =/= undefined, Line =/= undefined ->
-	    io_lib:format("(~s, line ~w)", [File, Line]);
+	    io_lib:format("(~ts, line ~w)", [File, Line]);
 	true ->
 	    ""
     end.
diff --git a/lib/stdlib/src/maps.erl b/lib/stdlib/src/maps.erl
index 5dafdb282a..a13f340709 100644
--- a/lib/stdlib/src/maps.erl
+++ b/lib/stdlib/src/maps.erl
@@ -23,7 +23,8 @@
 -export([get/3, filter/2,fold/3,
          map/2, size/1,
          update_with/3, update_with/4,
-         without/2, with/2]).
+         without/2, with/2,
+         iterator/1, next/1]).
 
 %% BIFs
 -export([get/2, find/2, from_list/1,
@@ -31,6 +32,15 @@
          new/0, put/3, remove/2, take/2,
          to_list/1, update/3, values/1]).
 
+-opaque iterator() :: {term(), term(), iterator()}
+                      | none | nonempty_improper_list(integer(),map()).
+
+-export_type([iterator/0]).
+
+-dialyzer({no_improper_lists, iterator/1}).
+
+-define(IS_ITERATOR(I), is_tuple(I) andalso tuple_size(I) == 3; I == none; is_integer(hd(I)) andalso is_map(tl(I))).
+
 %% Shadowed by erl_bif_types: maps:get/2
 -spec get(Key,Map) -> Value when
     Key :: term(),
@@ -39,7 +49,6 @@
 
 get(_,_) -> erlang:nif_error(undef).
 
-
 -spec find(Key,Map) -> {ok, Value} | error when
     Key :: term(),
     Map :: map(),
@@ -114,14 +123,20 @@ remove(_,_) -> erlang:nif_error(undef).
 
 take(_,_) -> erlang:nif_error(undef).
 
-%% Shadowed by erl_bif_types: maps:to_list/1
 -spec to_list(Map) -> [{Key,Value}] when
     Map :: map(),
     Key :: term(),
     Value :: term().
 
-to_list(_) -> erlang:nif_error(undef).
+to_list(Map) when is_map(Map) ->
+    to_list_internal(erts_internal:map_next(0, Map, []));
+to_list(Map) ->
+    erlang:error({badmap,Map},[Map]).
 
+to_list_internal([Iter, Map | Acc]) when is_integer(Iter) ->
+    to_list_internal(erts_internal:map_next(Iter, Map, Acc));
+to_list_internal(Acc) ->
+    Acc.
 
 %% Shadowed by erl_bif_types: maps:update/3
 -spec update(Key,Value,Map1) -> Map2 when
@@ -192,47 +207,80 @@ get(Key,Map,Default) ->
     erlang:error({badmap,Map},[Key,Map,Default]).
 
 
--spec filter(Pred,Map1) -> Map2 when
+-spec filter(Pred,MapOrIter) -> Map when
       Pred :: fun((Key, Value) -> boolean()),
       Key  :: term(),
       Value :: term(),
-      Map1 :: map(),
-      Map2 :: map().
+      MapOrIter :: map() | iterator(),
+      Map :: map().
 
 filter(Pred,Map) when is_function(Pred,2), is_map(Map) ->
-    maps:from_list([{K,V}||{K,V}<-maps:to_list(Map),Pred(K,V)]);
+    maps:from_list(filter_1(Pred, iterator(Map)));
+filter(Pred,Iterator) when is_function(Pred,2), ?IS_ITERATOR(Iterator) ->
+    maps:from_list(filter_1(Pred, Iterator));
 filter(Pred,Map) ->
     erlang:error(error_type(Map),[Pred,Map]).
 
-
--spec fold(Fun,Init,Map) -> Acc when
+filter_1(Pred, Iter) ->
+    case next(Iter) of
+        {K, V, NextIter} ->
+            case Pred(K,V) of
+                true ->
+                    [{K,V} | filter_1(Pred, NextIter)];
+                false ->
+                    filter_1(Pred, NextIter)
+            end;
+        none ->
+            []
+    end.
+
+-spec fold(Fun,Init,MapOrIter) -> Acc when
     Fun :: fun((K, V, AccIn) -> AccOut),
     Init :: term(),
     Acc :: term(),
     AccIn :: term(),
     AccOut :: term(),
-    Map :: map(),
+    MapOrIter :: map() | iterator(),
     K :: term(),
     V :: term().
 
 fold(Fun,Init,Map) when is_function(Fun,3), is_map(Map) ->
-    lists:foldl(fun({K,V},A) -> Fun(K,V,A) end,Init,maps:to_list(Map));
+    fold_1(Fun,Init,iterator(Map));
+fold(Fun,Init,Iterator) when is_function(Fun,3), ?IS_ITERATOR(Iterator) ->
+    fold_1(Fun,Init,Iterator);
 fold(Fun,Init,Map) ->
     erlang:error(error_type(Map),[Fun,Init,Map]).
 
--spec map(Fun,Map1) -> Map2 when
+fold_1(Fun, Acc, Iter) ->
+    case next(Iter) of
+        {K, V, NextIter} ->
+            fold_1(Fun, Fun(K,V,Acc), NextIter);
+        none ->
+            Acc
+    end.
+
+-spec map(Fun,MapOrIter) -> Map when
     Fun :: fun((K, V1) -> V2),
-    Map1 :: map(),
-    Map2 :: map(),
+    MapOrIter :: map() | iterator(),
+    Map :: map(),
     K :: term(),
     V1 :: term(),
     V2 :: term().
 
 map(Fun,Map) when is_function(Fun, 2), is_map(Map) ->
-    maps:from_list([{K,Fun(K,V)}||{K,V}<-maps:to_list(Map)]);
+    maps:from_list(map_1(Fun, iterator(Map)));
+map(Fun,Iterator) when is_function(Fun, 2), ?IS_ITERATOR(Iterator) ->
+    maps:from_list(map_1(Fun, Iterator));
 map(Fun,Map) ->
     erlang:error(error_type(Map),[Fun,Map]).
 
+map_1(Fun, Iter) ->
+    case next(Iter) of
+        {K, V, NextIter} ->
+            [{K, Fun(K, V)} | map_1(Fun, NextIter)];
+        none ->
+            []
+    end.
 
 -spec size(Map) -> non_neg_integer() when
     Map :: map().
@@ -242,6 +290,26 @@ size(Map) when is_map(Map) ->
 size(Val) ->
     erlang:error({badmap,Val},[Val]).
 
+-spec iterator(Map) -> Iterator when
+      Map :: map(),
+      Iterator :: iterator().
+
+iterator(M) when is_map(M) -> [0 | M];
+iterator(M) -> erlang:error({badmap, M}, [M]).
+
+-spec next(Iterator) -> {Key, Value, NextIterator} | 'none' when
+      Iterator :: iterator(),
+      Key :: term(),
+      Value :: term(),
+      NextIterator :: iterator().
+next({K, V, I}) ->
+    {K, V, I};
+next([Path | Map]) when is_integer(Path), is_map(Map) ->
+    erts_internal:map_next(Path, Map, iterator);
+next(none) ->
+    none;
+next(Iter) ->
+    erlang:error(badarg, [Iter]).
 
 -spec without(Ks,Map1) -> Map2 when
     Ks :: [K],
@@ -250,11 +318,10 @@ size(Val) ->
     K :: term().
 
 without(Ks,M) when is_list(Ks), is_map(M) ->
-    lists:foldl(fun(K, M1) -> ?MODULE:remove(K, M1) end, M, Ks);
+    lists:foldl(fun(K, M1) -> maps:remove(K, M1) end, M, Ks);
 without(Ks,M) ->
     erlang:error(error_type(M),[Ks,M]).
 
-
 -spec with(Ks, Map1) -> Map2 when
     Ks :: [K],
     Map1 :: map(),
@@ -263,17 +330,17 @@ without(Ks,M) ->
 
 with(Ks,Map1) when is_list(Ks), is_map(Map1) ->
     Fun = fun(K, List) ->
-      case ?MODULE:find(K, Map1) of
-          {ok, V} ->
-              [{K, V} | List];
-          error ->
-              List
-      end
-    end,
-    ?MODULE:from_list(lists:foldl(Fun, [], Ks));
+                  case maps:find(K, Map1) of
+                      {ok, V} ->
+                          [{K, V} | List];
+                      error ->
+                          List
+                  end
+          end,
+    maps:from_list(lists:foldl(Fun, [], Ks));
 with(Ks,M) ->
     erlang:error(error_type(M),[Ks,M]).
 
 
-error_type(M) when is_map(M) -> badarg;
+error_type(M) when is_map(M); ?IS_ITERATOR(M) -> badarg;
 error_type(V) -> {badmap, V}.
diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
index 8e10cbe93b..1991585c13 100644
--- a/lib/stdlib/src/proc_lib.erl
+++ b/lib/stdlib/src/proc_lib.erl
@@ -231,8 +231,8 @@ init_p(Parent, Ancestors, Fun) when is_function(Fun) ->
     try
 	Fun()
     catch
-	Class:Reason ->
-	    exit_p(Class, Reason, erlang:get_stacktrace())
+	Class:Reason:Stacktrace ->
+	    exit_p(Class, Reason, Stacktrace)
     end.
 
 -spec init_p(pid(), [pid()], atom(), atom(), [term()]) -> term().
@@ -246,8 +246,8 @@ init_p_do_apply(M, F, A) ->
     try
 	apply(M, F, A) 
     catch
-	Class:Reason ->
-	    exit_p(Class, Reason, erlang:get_stacktrace())
+	Class:Reason:Stacktrace ->
+	    exit_p(Class, Reason, Stacktrace)
     end.
 
 -spec wake_up(atom(), atom(), [term()]) -> term().
@@ -256,8 +256,8 @@ wake_up(M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
     try
 	apply(M, F, A) 
     catch
-	Class:Reason ->
-	    exit_p(Class, Reason, erlang:get_stacktrace())
+	Class:Reason:Stacktrace ->
+	    exit_p(Class, Reason, Stacktrace)
     end.
 
 exit_p(Class, Reason, Stacktrace) ->
diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index f11f9d0a0b..3a66f6930b 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -301,11 +301,11 @@ eval(QH, Options) ->
                             post_funs(Post)
                         end
                 end
-            catch Term ->
-                case erlang:get_stacktrace() of
+            catch throw:Term:Stacktrace ->
+                case Stacktrace of
                     [?THROWN_ERROR | _] ->
                         Term;
-                    Stacktrace ->
+                    _ ->
                         erlang:raise(throw, Term, Stacktrace)
                 end
             end
@@ -359,11 +359,11 @@ fold(Fun, Acc0, QH, Options) ->
                             post_funs(Post)
                         end
                 end
-            catch Term ->
-                case erlang:get_stacktrace() of
+            catch throw:Term:Stacktrace ->
+                case Stacktrace of
                     [?THROWN_ERROR | _] ->
                         Term;
-                    Stacktrace ->
+                    _ ->
                         erlang:raise(throw, Term, Stacktrace)
                 end
             end
@@ -457,11 +457,11 @@ info(QH, Options) ->
                     debug -> % Not documented. Intended for testing only.
                         Info
                 end
-            catch Term ->
-                case erlang:get_stacktrace() of
+            catch throw:Term:Stacktrace ->
+                case Stacktrace of
                     [?THROWN_ERROR | _] ->
                         Term;
-                    Stacktrace ->
+                    _ ->
                         erlang:raise(throw, Term, Stacktrace)
                 end
             end
@@ -1056,9 +1056,9 @@ cursor_process(H, GUnique, GCache, TmpDir, SpawnOptions, MaxList, TmpUsage) ->
                          Prep = prepare_qlc(H, not_a_list, GUnique, GCache, 
                                             TmpDir, MaxList, TmpUsage),
                          setup_qlc(Prep, Setup)
-                     catch Class:Reason ->
-                           Parent ! {self(), {caught, Class, Reason, 
-                                     erlang:get_stacktrace()}},
+                     catch Class:Reason:Stacktrace ->
+                           Parent ! {self(),
+                                     {caught, Class, Reason, Stacktrace}},
                            exit(normal)
                      end,
                  Parent ! {self(), ok},
@@ -1075,8 +1075,8 @@ parent_fun(Pid, Parent) ->
         {TPid, {parent_fun, Fun}} ->
             V = try 
                     {value, Fun()}
-                catch Class:Reason ->
-                    {parent_fun_caught, Class, Reason, erlang:get_stacktrace()}
+                catch Class:Reason:Stacktrace ->
+                    {parent_fun_caught, Class, Reason, Stacktrace}
             end,
             TPid ! {Parent, V},
             parent_fun(Pid, Parent);
@@ -1101,9 +1101,9 @@ reply(Parent, MonRef, Post, Cont) ->
                         throw_error(Cont)
                 end
             catch 
-                Class:Reason ->
+                Class:Reason:Stacktrace ->
                    post_funs(Post),
-                   Message = {caught, Class, Reason, erlang:get_stacktrace()},
+                   Message = {caught, Class, Reason, Stacktrace},
                    Parent ! {self(), Message},
                    exit(normal)
             end,
@@ -1392,9 +1392,8 @@ next_loop(Pid, L, N) when N =/= 0 ->
         {caught, throw, Error, [?THROWN_ERROR | _]} ->
             Error;
         {caught, Class, Reason, Stacktrace} ->
-            CurrentStacktrace = try erlang:error(foo)
-                                catch error:_ -> erlang:get_stacktrace()
-                                end,
+            {current_stacktrace, CurrentStacktrace} =
+                erlang:process_info(self(), current_stacktrace),
             erlang:raise(Class, Reason, Stacktrace ++ CurrentStacktrace);
         error ->
             erlang:error({qlc_cursor_pid_no_longer_exists, Pid})
@@ -2627,9 +2626,9 @@ table_handle(#qlc_table{trav_fun = TraverseFun, trav_MS = TravMS,
             Parent =:= self() ->
                 try
                     ParentFun() 
-                catch Class:Reason ->
+                catch Class:Reason:Stacktrace ->
                     post_funs(Post),
-                    erlang:raise(Class, Reason, erlang:get_stacktrace())
+                    erlang:raise(Class, Reason, Stacktrace)
                 end;
             true ->
                 case monitor_request(Parent, {parent_fun, ParentFun}) of
@@ -3033,9 +3032,9 @@ file_sort_handle(H, Kp, SortOptions, TmpDir, Compressed, Post, LocalPost) ->
         {terms, BTerms} ->
             try 
                 {[binary_to_term(B) || B <- BTerms], Post, LocalPost}
-            catch Class:Reason ->
+            catch Class:Reason:Stacktrace ->
                 post_funs(Post),
-                erlang:raise(Class, Reason, erlang:get_stacktrace())
+                erlang:raise(Class, Reason, Stacktrace)
             end
     end.
 
@@ -3045,9 +3044,9 @@ do_sort(In, Out, Sort, SortOptions, Post) ->
             {error, Reason} -> throw_reason(Reason);
             Reply -> Reply
         end
-    catch Class:Term ->
+    catch Class:Term:Stacktrace ->
         post_funs(Post),
-        erlang:raise(Class, Term, erlang:get_stacktrace())
+        erlang:raise(Class, Term, Stacktrace)
     end.
 
 do_sort(In, Out, sort, SortOptions) ->
@@ -3797,9 +3796,9 @@ call(undefined, _Arg, Default, _Post) ->
 call(Fun, Arg, _Default, Post) ->
     try
         Fun(Arg) 
-    catch Class:Reason ->
+    catch Class:Reason:Stacktrace ->
         post_funs(Post),
-        erlang:raise(Class, Reason, erlang:get_stacktrace())
+        erlang:raise(Class, Reason, Stacktrace)
     end.
 
 grd(undefined, _Arg) ->
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index 212b143b1d..e4153e7899 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -645,8 +645,7 @@ eval_exprs(Es, Shell, Bs0, RT, Lf, Ef, W) ->
     catch 
         exit:normal ->
             exit(normal);
-        Class:Reason ->
-            Stacktrace = erlang:get_stacktrace(),
+        Class:Reason:Stacktrace ->
             M = {self(),Class,{Reason,Stacktrace}},
             case do_catch(Class, Reason) of
                 true ->
@@ -701,7 +700,9 @@ exprs([E0|Es], Bs1, RT, Lf, Ef, Bs0, W) ->
                                 {W,V0};
                             true -> case result_will_be_saved() of
                                      true -> V0;
-                                     false -> ignored
+                                     false ->
+                                         erlang:garbage_collect(),
+                                         ignored
                                  end
                         end,
                     {{value,V,Bs,get()},Bs};
@@ -805,8 +806,8 @@ restrict_handlers(RShMod, Shell, RT) ->
 
 -define(BAD_RETURN(M, F, V),
         try erlang:error(reason)
-        catch _:_ -> erlang:raise(exit, {restricted_shell_bad_return,V}, 
-                                  [{M,F,3} | erlang:get_stacktrace()])
+        catch _:_:S -> erlang:raise(exit, {restricted_shell_bad_return,V}, 
+                                    [{M,F,3} | S])
         end).
 
 local_allowed(F, As, RShMod, Bs, Shell, RT) when is_atom(F) ->
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index ab0824ca17..5fb48acfab 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -101,6 +101,7 @@
 	     timer,
 	     unicode,
              unicode_util,
+	     uri_string,
 	     win32reg,
 	     zip]},
   {registered,[timer_server,rsh_starter,take_over_monitor,pool_master,
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index 5a4d2df2a6..4e89819e41 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -74,15 +74,16 @@
 -export([to_upper/1, to_lower/1]).
 %%
 -import(lists,[member/2]).
-
 -compile({no_auto_import,[length/1]}).
+-compile({inline, [btoken/2, rev/1, append/2, stack/2, search_compile/1]}).
+-define(ASCII_LIST(CP1,CP2), CP1 < 256, CP2 < 256, CP1 =/= $\r).
 
 -export_type([grapheme_cluster/0]).
 
 -type grapheme_cluster() :: char() | [char()].
 -type direction() :: 'leading' | 'trailing'.
 
--dialyzer({no_improper_lists, stack/2}).
+-dialyzer({no_improper_lists, [stack/2, length_b/3]}).
 %%% BIFs internal (not documented) should not to be used outside of this module
 %%% May be removed
 -export([list_to_float/1, list_to_integer/1]).
@@ -127,8 +128,10 @@ is_empty(_) -> false.
 
 %% Count the number of grapheme clusters in chardata
 -spec length(String::unicode:chardata()) -> non_neg_integer().
+length(<<CP1/utf8, Bin/binary>>) ->
+    length_b(Bin, CP1, 0);
 length(CD) ->
-    length_1(unicode_util:gc(CD), 0).
+    length_1(CD, 0).
 
 %% Convert a string to a list of grapheme clusters
 -spec to_graphemes(String::unicode:chardata()) -> [grapheme_cluster()].
@@ -176,6 +179,8 @@ equal(A, B, true, Norm) ->
 
 %% Reverse grapheme clusters
 -spec reverse(String::unicode:chardata()) -> [grapheme_cluster()].
+reverse(<<CP1/utf8, Rest/binary>>) ->
+    reverse_b(Rest, CP1, []);
 reverse(CD) ->
     reverse_1(CD, []).
 
@@ -186,7 +191,10 @@ reverse(CD) ->
       Start :: non_neg_integer(),
       Slice :: unicode:chardata().
 slice(CD, N) when is_integer(N), N >= 0 ->
-    slice_l(CD, N, is_binary(CD)).
+    case slice_l0(CD, N) of
+        [] when is_binary(CD) -> <<>>;
+        Res -> Res
+    end.
 
 -spec slice(String, Start, Length) -> Slice when
       String::unicode:chardata(),
@@ -195,9 +203,15 @@ slice(CD, N) when is_integer(N), N >= 0 ->
       Slice :: unicode:chardata().
 slice(CD, N, Length)
   when is_integer(N), N >= 0, is_integer(Length), Length > 0 ->
-    slice_trail(slice_l(CD, N, is_binary(CD)), Length);
+    case slice_l0(CD, N) of
+        [] when is_binary(CD) -> <<>>;
+        L -> slice_trail(L, Length)
+    end;
 slice(CD, N, infinity) ->
-    slice_l(CD, N, is_binary(CD));
+    case slice_l0(CD, N) of
+        [] when is_binary(CD) -> <<>>;
+        Res -> Res
+    end;
 slice(CD, _, 0) ->
     case is_binary(CD) of
         true  -> <<>>;
@@ -256,18 +270,22 @@ trim(Str, Dir) ->
       Dir :: direction() | 'both',
       Characters :: [grapheme_cluster()].
 trim(Str, _, []) -> Str;
+trim(Str, leading, [Sep]) when is_list(Str), Sep < 256 ->
+    trim_ls(Str, Sep);
 trim(Str, leading, Sep) when is_list(Sep) ->
-    trim_l(Str, search_pattern(Sep));
-trim(Str, trailing, Sep) when is_list(Sep) ->
-    trim_t(Str, 0, search_pattern(Sep));
-trim(Str, both, Sep0) when is_list(Sep0) ->
-    Sep = search_pattern(Sep0),
-    trim_t(trim_l(Str,Sep), 0, Sep).
+    trim_l(Str, Sep);
+trim(Str, trailing, [Sep]) when is_list(Str), Sep < 256 ->
+    trim_ts(Str, Sep);
+trim(Str, trailing, Seps0) when is_list(Seps0) ->
+    Seps = search_pattern(Seps0),
+    trim_t(Str, 0, Seps);
+trim(Str, both, Sep) when is_list(Sep) ->
+    trim(trim(Str,leading,Sep), trailing, Sep).
 
 %% Delete trailing newlines or \r\n
 -spec chomp(String::unicode:chardata()) -> unicode:chardata().
 chomp(Str) ->
-    trim_t(Str,0, {[[$\r,$\n],$\n], [$\r,$\n], [<<$\r>>,<<$\n>>]}).
+    trim(Str, trailing, [[$\r,$\n],$\n]).
 
 %% Split String into two parts where the leading part consists of Characters
 -spec take(String, Characters) -> {Leading, Trailing} when
@@ -300,8 +318,7 @@ take(Str, [], Complement, Dir) ->
         {true,  leading} -> {Str, Empty};
         {true,  trailing} -> {Empty, Str}
     end;
-take(Str, Sep0, false, leading) ->
-    Sep = search_pattern(Sep0),
+take(Str, Sep, false, leading) ->
     take_l(Str, Sep, []);
 take(Str, Sep0, true, leading) ->
     Sep = search_pattern(Sep0),
@@ -403,10 +420,12 @@ to_number(_, Number, Rest, _, Tail) ->
 %% Return the remaining string with prefix removed or else nomatch
 -spec prefix(String::unicode:chardata(), Prefix::unicode:chardata()) ->
                     'nomatch' | unicode:chardata().
-prefix(Str, []) -> Str;
 prefix(Str, Prefix0) ->
-    Prefix = unicode:characters_to_list(Prefix0),
-    case prefix_1(Str, Prefix) of
+    Result = case unicode:characters_to_list(Prefix0) of
+                 [] -> Str;
+                 Prefix -> prefix_1(Str, Prefix)
+             end,
+    case Result of
         [] when is_binary(Str) -> <<>>;
         Res -> Res
     end.
@@ -461,6 +480,7 @@ replace(String, SearchPattern, Replacement, Where) ->
               SeparatorList::[grapheme_cluster()]) ->
                      [unicode:chardata()].
 lexemes([], _) -> [];
+lexemes(Str, []) -> [Str];
 lexemes(Str, Seps0) when is_list(Seps0) ->
     Seps = search_pattern(Seps0),
     lexemes_m(Str, Seps, []).
@@ -494,13 +514,13 @@ find(String, SearchPattern, leading) ->
 find(String, SearchPattern, trailing) ->
     find_r(String, unicode:characters_to_list(SearchPattern), nomatch).
 
-%% Fetch first codepoint and return rest in tail
+%% Fetch first grapheme cluster and return rest in tail
 -spec next_grapheme(String::unicode:chardata()) ->
                            maybe_improper_list(grapheme_cluster(),unicode:chardata()) |
                            {error,unicode:chardata()}.
 next_grapheme(CD) -> unicode_util:gc(CD).
 
-%% Fetch first grapheme cluster and return rest in tail
+%% Fetch first codepoint and return rest in tail
 -spec next_codepoint(String::unicode:chardata()) ->
                             maybe_improper_list(char(),unicode:chardata()) |
                             {error,unicode:chardata()}.
@@ -508,10 +528,23 @@ next_codepoint(CD) -> unicode_util:cp(CD).
 
 %% Internals
 
-length_1([_|Rest], N) ->
-    length_1(unicode_util:gc(Rest), N+1);
-length_1([], N) ->
-    N.
+length_1([CP1|[CP2|_]=Cont], N) when ?ASCII_LIST(CP1,CP2) ->
+    length_1(Cont, N+1);
+length_1(Str, N) ->
+    case unicode_util:gc(Str) of
+        [] -> N;
+        [_|Rest] -> length_1(Rest, N+1)
+    end.
+
+length_b(<<CP2/utf8, Rest/binary>>, CP1, N)
+  when ?ASCII_LIST(CP1,CP2) ->
+    length_b(Rest, CP2, N+1);
+length_b(Bin0, CP1, N) ->
+    [_|Bin1] = unicode_util:gc([CP1|Bin0]),
+    case unicode_util:cp(Bin1) of
+        [] -> N+1;
+        [CP3|Bin] -> length_b(Bin, CP3, N+1)
+    end.
 
 equal_1([A|AR], [B|BR]) when is_integer(A), is_integer(B) ->
     A =:= B andalso equal_1(AR, BR);
@@ -550,29 +583,66 @@ equal_norm_nocase(A0, B0, Norm) ->
         {L1,L2} when is_list(L1), is_list(L2) -> false
     end.
 
+reverse_1([CP1|[CP2|_]=Cont], Acc) when ?ASCII_LIST(CP1,CP2) ->
+    reverse_1(Cont, [CP1|Acc]);
 reverse_1(CD, Acc) ->
     case unicode_util:gc(CD) of
         [GC|Rest] -> reverse_1(Rest, [GC|Acc]);
         [] -> Acc
     end.
 
-slice_l(CD, N, Binary) when N > 0 ->
+reverse_b(<<CP2/utf8, Rest/binary>>, CP1, Acc)
+  when ?ASCII_LIST(CP1,CP2) ->
+    reverse_b(Rest, CP2,  [CP1|Acc]);
+reverse_b(Bin0, CP1, Acc) ->
+    [GC|Bin1] = unicode_util:gc([CP1|Bin0]),
+    case unicode_util:cp(Bin1) of
+        [] -> [GC|Acc];
+        [CP3|Bin] -> reverse_b(Bin, CP3, [GC|Acc])
+    end.
+
+slice_l0(<<CP1/utf8, Bin/binary>>, N) when N > 0 ->
+    slice_lb(Bin, CP1, N);
+slice_l0(L, N) ->
+    slice_l(L, N).
+
+slice_l([CP1|[CP2|_]=Cont], N) when ?ASCII_LIST(CP1,CP2),N > 0 ->
+    slice_l(Cont, N-1);
+slice_l(CD, N) when N > 0 ->
     case unicode_util:gc(CD) of
-        [_|Cont] -> slice_l(Cont, N-1, Binary);
-        [] when Binary -> <<>>;
+        [_|Cont] -> slice_l(Cont, N-1);
         [] -> []
     end;
-slice_l(Cont, 0, Binary) ->
-    case is_empty(Cont) of
-        true when Binary -> <<>>;
-        _ -> Cont
+slice_l(Cont, 0) ->
+    Cont.
+
+slice_lb(<<CP2/utf8, Bin/binary>>, CP1, N) when ?ASCII_LIST(CP1,CP2), N > 1 ->
+    slice_lb(Bin, CP2, N-1);
+slice_lb(Bin, CP1, N) ->
+    [_|Rest] = unicode_util:gc([CP1|Bin]),
+    if N > 1 ->
+            case unicode_util:cp(Rest) of
+                [CP2|Cont] -> slice_lb(Cont, CP2, N-1);
+                [] -> <<>>
+            end;
+       N =:= 1 ->
+            Rest
     end.
 
+slice_trail(Orig, N) when is_binary(Orig) ->
+    case Orig of
+        <<CP1/utf8, Bin/binary>> when N > 0 ->
+            Length = slice_bin(Bin, CP1, N),
+            Sz = byte_size(Orig) - Length,
+            <<Keep:Sz/binary, _/binary>> = Orig,
+            Keep;
+        _ -> <<>>
+    end;
 slice_trail(CD, N) when is_list(CD) ->
-    slice_list(CD, N);
-slice_trail(CD, N) when is_binary(CD) ->
-    slice_bin(CD, N, CD).
+    slice_list(CD, N).
 
+slice_list([CP1|[CP2|_]=Cont], N) when ?ASCII_LIST(CP1,CP2),N > 0 ->
+    [CP1|slice_list(Cont, N-1)];
 slice_list(CD, N) when N > 0 ->
     case unicode_util:gc(CD) of
         [GC|Cont] -> append(GC, slice_list(Cont, N-1));
@@ -581,17 +651,16 @@ slice_list(CD, N) when N > 0 ->
 slice_list(_, 0) ->
     [].
 
-slice_bin(CD, N, Orig) when N > 0 ->
-    case unicode_util:gc(CD) of
-        [_|Cont] -> slice_bin(Cont, N-1, Orig);
-        [] -> Orig
+slice_bin(<<CP2/utf8, Bin/binary>>, CP1, N) when ?ASCII_LIST(CP1,CP2), N > 0 ->
+    slice_bin(Bin, CP2, N-1);
+slice_bin(CD, CP1, N) when N > 0 ->
+    [_|Bin] = unicode_util:gc([CP1|CD]),
+    case unicode_util:cp(Bin) of
+        [CP2|Cont] -> slice_bin(Cont, CP2, N-1);
+        [] -> 0
     end;
-slice_bin([], 0, Orig) ->
-    Orig;
-slice_bin(CD, 0, Orig) ->
-    Sz = byte_size(Orig) - byte_size(CD),
-    <<Keep:Sz/binary, _/binary>> = Orig,
-    Keep.
+slice_bin(CD, CP1, 0) ->
+    byte_size(CD)+byte_size(<<CP1/utf8>>).
 
 uppercase_list(CPs0) ->
     case unicode_util:uppercase(CPs0) of
@@ -641,16 +710,31 @@ casefold_bin(CPs0, Acc) ->
         [] -> Acc
     end.
 
-
+%% Fast path for ascii searching for one character in lists
+trim_ls([CP1|[CP2|_]=Cont]=Str, Sep)
+  when ?ASCII_LIST(CP1,CP2) ->
+    case Sep of
+        CP1 -> trim_ls(Cont, Sep);
+        _ -> Str
+    end;
+trim_ls(Str, Sep) ->
+    trim_l(Str, [Sep]).
+
+trim_l([CP1|[CP2|_]=Cont]=Str, Sep)
+  when ?ASCII_LIST(CP1,CP2) ->
+    case lists:member(CP1, Sep) of
+        true -> trim_l(Cont, Sep);
+        false -> Str
+    end;
 trim_l([Bin|Cont0], Sep) when is_binary(Bin) ->
     case bin_search_inv(Bin, Cont0, Sep) of
         {nomatch, Cont} -> trim_l(Cont, Sep);
         Keep -> Keep
     end;
-trim_l(Str, {GCs, _, _}=Sep) when is_list(Str) ->
+trim_l(Str, Sep) when is_list(Str) ->
     case unicode_util:gc(Str) of
         [C|Cs] ->
-            case lists:member(C, GCs) of
+            case lists:member(C, Sep) of
                 true -> trim_l(Cs, Sep);
                 false -> Str
             end;
@@ -662,15 +746,51 @@ trim_l(Bin, Sep) when is_binary(Bin) ->
         [Keep] -> Keep
     end.
 
-trim_t([Bin|Cont0], N, Sep) when is_binary(Bin) ->
+%% Fast path for ascii searching for one character in lists
+trim_ts([Sep|Cs1]=Str, Sep) ->
+    case Cs1 of
+        [] -> [];
+        [CP2|_] when ?ASCII_LIST(Sep,CP2) ->
+            Tail = trim_ts(Cs1, Sep),
+            case is_empty(Tail) of
+                true -> [];
+                false -> [Sep|Tail]
+            end;
+        _ ->
+            trim_t(Str, 0, search_pattern([Sep]))
+    end;
+trim_ts([CP|Cont],Sep) when is_integer(CP) ->
+    [CP|trim_ts(Cont, Sep)];
+trim_ts(Str, Sep) ->
+    trim_t(Str, 0, search_pattern([Sep])).
+
+trim_t([CP1|Cont]=Cs0, _, {GCs,CPs,_}=Seps) when is_integer(CP1) ->
+    case lists:member(CP1, CPs) of
+        true ->
+            [GC|Cs1] = unicode_util:gc(Cs0),
+            case lists:member(GC, GCs) of
+                true ->
+                    Tail = trim_t(Cs1, 0, Seps),
+                    case is_empty(Tail) of
+                        true -> [];
+                        false -> append(GC,Tail)
+                    end;
+                false ->
+                    append(GC,trim_t(Cs1, 0, Seps))
+            end;
+        false ->
+            [CP1|trim_t(Cont, 0, Seps)]
+    end;
+trim_t([Bin|Cont0], N, {GCs,_,_}=Seps0) when is_binary(Bin) ->
     <<_:N/binary, Rest/binary>> = Bin,
-    case bin_search(Rest, Cont0, Sep) of
+    Seps = search_compile(Seps0),
+    case bin_search(Rest, Cont0, Seps) of
         {nomatch,_} ->
-            stack(Bin, trim_t(Cont0, 0, Sep));
+            stack(Bin, trim_t(Cont0, 0, Seps));
         [SepStart|Cont1] ->
-            case bin_search_inv(SepStart, Cont1, Sep) of
+            case bin_search_inv(SepStart, Cont1, GCs) of
                 {nomatch, Cont} ->
-                    Tail = trim_t(Cont, 0, Sep),
+                    Tail = trim_t(Cont, 0, Seps),
                     case is_empty(Tail) of
                         true ->
                             KeepSz = byte_size(Bin) - byte_size(SepStart),
@@ -682,67 +802,69 @@ trim_t([Bin|Cont0], N, Sep) when is_binary(Bin) ->
                     end;
                 [NonSep|Cont] when is_binary(NonSep) ->
                     KeepSz = byte_size(Bin) - byte_size(NonSep),
-                    trim_t([Bin|Cont], KeepSz, Sep)
+                    trim_t([Bin|Cont], KeepSz, Seps)
             end
     end;
-trim_t(Str, 0, {GCs,CPs,_}=Sep) when is_list(Str) ->
-    case unicode_util:cp(Str) of
-        [CP|Cs] ->
-            case lists:member(CP, CPs) of
+trim_t(Str, 0, {GCs,_,_}=Seps) when is_list(Str) ->
+    case unicode_util:gc(Str) of
+        [GC|Cs1] ->
+            case lists:member(GC, GCs) of
                 true ->
-                    [GC|Cs1] = unicode_util:gc(Str),
-                    case lists:member(GC, GCs) of
-                        true ->
-                            Tail = trim_t(Cs1, 0, Sep),
-                            case is_empty(Tail) of
-                                true -> [];
-                                false -> append(GC,Tail)
-                            end;
-                        false ->
-                            append(GC,trim_t(Cs1, 0, Sep))
+                    Tail = trim_t(Cs1, 0, Seps),
+                    case is_empty(Tail) of
+                        true -> [];
+                        false -> append(GC,Tail)
                     end;
                 false ->
-                    append(CP,trim_t(Cs, 0, Sep))
+                    append(GC,trim_t(Cs1, 0, Seps))
             end;
         [] -> []
     end;
-trim_t(Bin, N, Sep) when is_binary(Bin) ->
+trim_t(Bin, N, {GCs,_,_}=Seps0) when is_binary(Bin) ->
     <<_:N/binary, Rest/binary>> = Bin,
-    case bin_search(Rest, Sep) of
+    Seps = search_compile(Seps0),
+    case bin_search(Rest, [], Seps) of
         {nomatch,_} -> Bin;
         [SepStart] ->
-            case bin_search_inv(SepStart, [], Sep) of
+            case bin_search_inv(SepStart, [], GCs) of
                 {nomatch,_} ->
                     KeepSz = byte_size(Bin) - byte_size(SepStart),
                     <<Keep:KeepSz/binary, _/binary>> = Bin,
                     Keep;
                 [NonSep] ->
                     KeepSz = byte_size(Bin) - byte_size(NonSep),
-                    trim_t(Bin, KeepSz, Sep)
+                    trim_t(Bin, KeepSz, Seps)
             end
     end.
 
-take_l([Bin|Cont0], Sep, Acc) when is_binary(Bin) ->
-    case bin_search_inv(Bin, Cont0, Sep) of
+
+take_l([CP1|[CP2|_]=Cont]=Str, Seps, Acc)
+  when ?ASCII_LIST(CP1,CP2) ->
+    case lists:member(CP1, Seps) of
+        true -> take_l(Cont, Seps, [CP1|Acc]);
+        false -> {rev(Acc), Str}
+    end;
+take_l([Bin|Cont0], Seps, Acc) when is_binary(Bin) ->
+    case bin_search_inv(Bin, Cont0, Seps) of
         {nomatch, Cont} ->
             Used = cp_prefix(Cont0, Cont),
-            take_l(Cont, Sep, [unicode:characters_to_binary([Bin|Used])|Acc]);
+            take_l(Cont, Seps, [unicode:characters_to_binary([Bin|Used])|Acc]);
         [Bin1|_]=After when is_binary(Bin1) ->
             First = byte_size(Bin) - byte_size(Bin1),
             <<Keep:First/binary, _/binary>> = Bin,
             {btoken(Keep,Acc), After}
     end;
-take_l(Str, {GCs, _, _}=Sep, Acc) when is_list(Str) ->
+take_l(Str, Seps, Acc) when is_list(Str) ->
     case unicode_util:gc(Str) of
         [C|Cs] ->
-            case lists:member(C, GCs) of
-                true -> take_l(Cs, Sep, append(rev(C),Acc));
+            case lists:member(C, Seps) of
+                true -> take_l(Cs, Seps, append(rev(C),Acc));
                 false -> {rev(Acc), Str}
             end;
         [] -> {rev(Acc), []}
     end;
-take_l(Bin, Sep, Acc) when is_binary(Bin) ->
-    case bin_search_inv(Bin, [], Sep) of
+take_l(Bin, Seps, Acc) when is_binary(Bin) ->
+    case bin_search_inv(Bin, [], Seps) of
         {nomatch,_} ->
             {btoken(Bin, Acc), <<>>};
         [After] ->
@@ -751,27 +873,41 @@ take_l(Bin, Sep, Acc) when is_binary(Bin) ->
             {btoken(Keep, Acc), After}
     end.
 
-take_lc([Bin|Cont0], Sep, Acc) when is_binary(Bin) ->
-    case bin_search(Bin, Cont0, Sep) of
+
+take_lc([CP1|Cont]=Str0, {GCs,CPs,_}=Seps, Acc) when is_integer(CP1) ->
+    case lists:member(CP1, CPs) of
+        true ->
+            [GC|Str] = unicode_util:gc(Str0),
+            case lists:member(GC, GCs) of
+                false -> take_lc(Str, Seps, append(rev(GC),Acc));
+                true  -> {rev(Acc), Str0}
+            end;
+        false ->
+            take_lc(Cont, Seps, append(CP1,Acc))
+    end;
+take_lc([Bin|Cont0], Seps0, Acc) when is_binary(Bin) ->
+    Seps = search_compile(Seps0),
+    case bin_search(Bin, Cont0, Seps) of
         {nomatch, Cont} ->
             Used = cp_prefix(Cont0, Cont),
-            take_lc(Cont, Sep, [unicode:characters_to_binary([Bin|Used])|Acc]);
+            take_lc(Cont, Seps, [unicode:characters_to_binary([Bin|Used])|Acc]);
         [Bin1|_]=After when is_binary(Bin1) ->
             First = byte_size(Bin) - byte_size(Bin1),
             <<Keep:First/binary, _/binary>> = Bin,
             {btoken(Keep,Acc), After}
     end;
-take_lc(Str, {GCs, _, _}=Sep, Acc) when is_list(Str) ->
+take_lc(Str, {GCs,_,_}=Seps, Acc) when is_list(Str) ->
     case unicode_util:gc(Str) of
         [C|Cs] ->
             case lists:member(C, GCs) of
-                false -> take_lc(Cs, Sep, append(rev(C),Acc));
+                false -> take_lc(Cs, Seps, append(rev(C),Acc));
                 true  -> {rev(Acc), Str}
             end;
         [] -> {rev(Acc), []}
     end;
-take_lc(Bin, Sep, Acc) when is_binary(Bin) ->
-    case bin_search(Bin, [], Sep) of
+take_lc(Bin, Seps0, Acc) when is_binary(Bin) ->
+    Seps = search_compile(Seps0),
+    case bin_search(Bin, [], Seps) of
         {nomatch,_} ->
             {btoken(Bin, Acc), <<>>};
         [After] ->
@@ -780,148 +916,192 @@ take_lc(Bin, Sep, Acc) when is_binary(Bin) ->
             {btoken(Keep, Acc), After}
     end.
 
-take_t([Bin|Cont0], N, Sep) when is_binary(Bin) ->
+
+take_t([CP1|Cont]=Str0, _, {GCs,CPs,_}=Seps) when is_integer(CP1) ->
+    case lists:member(CP1, CPs) of
+        true ->
+            [GC|Str] = unicode_util:gc(Str0),
+            case lists:member(GC, GCs) of
+                true ->
+                    {Head, Tail} = take_t(Str, 0, Seps),
+                    case is_empty(Head) of
+                        true ->  {Head, append(GC,Tail)};
+                        false -> {append(GC,Head), Tail}
+                    end;
+                false ->
+                    {Head, Tail} = take_t(Str, 0, Seps),
+                    {append(GC,Head), Tail}
+            end;
+        false ->
+            {Head, Tail} = take_t(Cont, 0, Seps),
+            {[CP1|Head], Tail}
+    end;
+take_t([Bin|Cont0], N, {GCs,_,_}=Seps0) when is_binary(Bin) ->
     <<_:N/binary, Rest/binary>> = Bin,
-    case bin_search(Rest, Cont0, Sep) of
+    Seps = search_compile(Seps0),
+    case bin_search(Rest, Cont0, Seps) of
         {nomatch,Cont} ->
             Used = cp_prefix(Cont0, Cont),
-            {Head, Tail} = take_t(Cont, 0, Sep),
+            {Head, Tail} = take_t(Cont, 0, Seps),
             {stack(unicode:characters_to_binary([Bin|Used]), Head), Tail};
         [SepStart|Cont1] ->
-            case bin_search_inv(SepStart, Cont1, Sep) of
+            case bin_search_inv(SepStart, Cont1, GCs) of
                 {nomatch, Cont} ->
-                    {Head, Tail} = take_t(Cont, 0, Sep),
+                    {Head, Tail} = take_t(Cont, 0, Seps),
                     Used = cp_prefix(Cont0, Cont),
-                    case equal(Tail, Cont) of
+                    case is_empty(Head) of
                         true ->
                             KeepSz = byte_size(Bin) - byte_size(SepStart),
                             <<Keep:KeepSz/binary, End/binary>> = Bin,
-                            {stack(Keep,Head), stack(stack(End,Used),Tail)};
+                            {Keep, stack(stack(End,Used),Tail)};
                         false ->
                             {stack(unicode:characters_to_binary([Bin|Used]),Head), Tail}
                     end;
                 [NonSep|Cont] when is_binary(NonSep) ->
                     KeepSz = byte_size(Bin) - byte_size(NonSep),
-                    take_t([Bin|Cont], KeepSz, Sep)
+                    take_t([Bin|Cont], KeepSz, Seps)
             end
     end;
-take_t(Str, 0, {GCs,CPs,_}=Sep) when is_list(Str) ->
-    case unicode_util:cp(Str) of
-        [CP|Cs] ->
-            case lists:member(CP, CPs) of
+take_t(Str, 0, {GCs,_,_}=Seps) when is_list(Str) ->
+    case unicode_util:gc(Str) of
+        [GC|Cs1] ->
+            case lists:member(GC, GCs) of
                 true ->
-                    [GC|Cs1] = unicode_util:gc(Str),
-                    case lists:member(GC, GCs) of
-                        true ->
-                            {Head, Tail} = take_t(Cs1, 0, Sep),
-                            case equal(Tail, Cs1) of
-                                true -> {Head, append(GC,Tail)};
-                                false -> {append(GC,Head), Tail}
-                            end;
-                        false ->
-                            {Head, Tail} = take_t(Cs, 0, Sep),
-                            {append(CP,Head), Tail}
+                    {Head, Tail} = take_t(Cs1, 0, Seps),
+                    case is_empty(Head) of
+                        true ->  {Head, append(GC,Tail)};
+                        false -> {append(GC,Head), Tail}
                     end;
                 false ->
-                    {Head, Tail} = take_t(Cs, 0, Sep),
-                    {append(CP,Head), Tail}
+                    {Head, Tail} = take_t(Cs1, 0, Seps),
+                    {append(GC,Head), Tail}
             end;
         [] -> {[],[]}
     end;
-take_t(Bin, N, Sep) when is_binary(Bin) ->
+take_t(Bin, N, {GCs,_,_}=Seps0) when is_binary(Bin) ->
     <<_:N/binary, Rest/binary>> = Bin,
-    case bin_search(Rest, Sep) of
+    Seps = search_compile(Seps0),
+    case bin_search(Rest, [], Seps) of
         {nomatch,_} -> {Bin, <<>>};
         [SepStart] ->
-            case bin_search_inv(SepStart, [], Sep) of
+            case bin_search_inv(SepStart, [], GCs) of
                 {nomatch,_} ->
                     KeepSz = byte_size(Bin) - byte_size(SepStart),
                     <<Before:KeepSz/binary, End/binary>> = Bin,
                     {Before, End};
                 [NonSep] ->
                     KeepSz = byte_size(Bin) - byte_size(NonSep),
-                    take_t(Bin, KeepSz, Sep)
+                    take_t(Bin, KeepSz, Seps)
             end
     end.
 
-take_tc([Bin|Cont0], N, Sep) when is_binary(Bin) ->
+take_tc([CP1|[CP2|_]=Cont], _, {GCs,_,_}=Seps) when ?ASCII_LIST(CP1,CP2) ->
+    case lists:member(CP1, GCs) of
+        false ->
+            {Head, Tail} = take_tc(Cont, 0, Seps),
+            case is_empty(Head) of
+                true -> {Head, append(CP1,Tail)};
+                false -> {append(CP1,Head), Tail}
+            end;
+        true ->
+            {Head, Tail} = take_tc(Cont, 0, Seps),
+            {append(CP1,Head), Tail}
+    end;
+take_tc([Bin|Cont0], N, {GCs,_,_}=Seps0) when is_binary(Bin) ->
     <<_:N/binary, Rest/binary>> = Bin,
-    case bin_search_inv(Rest, Cont0, Sep) of
+    case bin_search_inv(Rest, Cont0, GCs) of
         {nomatch,Cont} ->
             Used = cp_prefix(Cont0, Cont),
-            {Head, Tail} = take_tc(Cont, 0, Sep),
+            {Head, Tail} = take_tc(Cont, 0, Seps0),
             {stack(unicode:characters_to_binary([Bin|Used]), Head), Tail};
         [SepStart|Cont1] ->
-            case bin_search(SepStart, Cont1, Sep) of
+            Seps = search_compile(Seps0),
+            case bin_search(SepStart, Cont1, Seps) of
                 {nomatch, Cont} ->
-                    {Head, Tail} = take_tc(Cont, 0, Sep),
+                    {Head, Tail} = take_tc(Cont, 0, Seps),
                     Used = cp_prefix(Cont0, Cont),
-                    case equal(Tail, Cont) of
+                    case is_empty(Head) of
                         true ->
                             KeepSz = byte_size(Bin) - byte_size(SepStart),
                             <<Keep:KeepSz/binary, End/binary>> = Bin,
-                            {stack(Keep,Head), stack(stack(End,Used),Tail)};
+                            {Keep, stack(stack(End,Used),Tail)};
                         false ->
                             {stack(unicode:characters_to_binary([Bin|Used]),Head), Tail}
                     end;
                 [NonSep|Cont] when is_binary(NonSep) ->
                     KeepSz = byte_size(Bin) - byte_size(NonSep),
-                    take_tc([Bin|Cont], KeepSz, Sep)
+                    take_tc([Bin|Cont], KeepSz, Seps)
             end
     end;
-take_tc(Str, 0, {GCs,CPs,_}=Sep) when is_list(Str) ->
-    case unicode_util:cp(Str) of
-        [CP|Cs] ->
-            case lists:member(CP, CPs) of
-                true ->
-                    [GC|Cs1] = unicode_util:gc(Str),
-                    case lists:member(GC, GCs) of
-                        false ->
-                            {Head, Tail} = take_tc(Cs1, 0, Sep),
-                            case equal(Tail, Cs1) of
-                                true -> {Head, append(GC,Tail)};
-                                false -> {append(GC,Head), Tail}
-                            end;
-                        true ->
-                            {Head, Tail} = take_tc(Cs1, 0, Sep),
-                            {append(GC,Head), Tail}
-                    end;
+take_tc(Str, 0, {GCs,_,_}=Seps) when is_list(Str) ->
+    case unicode_util:gc(Str) of
+        [GC|Cs1] ->
+            case lists:member(GC, GCs) of
                 false ->
-                    {Head, Tail} = take_tc(Cs, 0, Sep),
-                    case equal(Tail, Cs) of
-                        true  -> {Head, append(CP,Tail)};
-                        false -> {append(CP,Head), Tail}
-                    end
+                    {Head, Tail} = take_tc(Cs1, 0, Seps),
+                    case is_empty(Head) of
+                        true -> {Head, append(GC,Tail)};
+                        false -> {append(GC,Head), Tail}
+                    end;
+                true ->
+                    {Head, Tail} = take_tc(Cs1, 0, Seps),
+                    {append(GC,Head), Tail}
             end;
         [] -> {[],[]}
     end;
-take_tc(Bin, N, Sep) when is_binary(Bin) ->
+take_tc(Bin, N, {GCs,_,_}=Seps0) when is_binary(Bin) ->
     <<_:N/binary, Rest/binary>> = Bin,
-    case bin_search_inv(Rest, [], Sep) of
+    case bin_search_inv(Rest, [], GCs) of
         {nomatch,_} -> {Bin, <<>>};
         [SepStart] ->
-            case bin_search(SepStart, [], Sep) of
+            Seps = search_compile(Seps0),
+            case bin_search(SepStart, [], Seps) of
                 {nomatch,_} ->
                     KeepSz = byte_size(Bin) - byte_size(SepStart),
                     <<Before:KeepSz/binary, End/binary>> = Bin,
                     {Before, End};
                 [NonSep] ->
                     KeepSz = byte_size(Bin) - byte_size(NonSep),
-                    take_tc(Bin, KeepSz, Sep)
+                    take_tc(Bin, KeepSz, Seps)
             end
     end.
 
-prefix_1(Cs, []) -> Cs;
-prefix_1(Cs, [_]=Pre) ->
-    prefix_2(unicode_util:gc(Cs), Pre);
-prefix_1(Cs, Pre) ->
-    prefix_2(unicode_util:cp(Cs), Pre).
-
-prefix_2([C|Cs], [C|Pre]) ->
-    prefix_1(Cs, Pre);
-prefix_2(_, _) ->
-    nomatch.
+prefix_1(Cs0, [GC]) ->
+    case unicode_util:gc(Cs0) of
+        [GC|Cs] -> Cs;
+        _ -> nomatch
+    end;
+prefix_1([CP|Cs], [Pre|PreR]) when is_integer(CP) ->
+    case CP =:= Pre of
+        true -> prefix_1(Cs,PreR);
+        false -> nomatch
+    end;
+prefix_1(<<CP/utf8, Cs/binary>>, [Pre|PreR]) ->
+    case CP =:= Pre of
+        true -> prefix_1(Cs,PreR);
+        false -> nomatch
+    end;
+prefix_1(Cs0, [Pre|PreR]) ->
+    case unicode_util:cp(Cs0) of
+        [Pre|Cs] ->  prefix_1(Cs,PreR);
+        _ -> nomatch
+    end.
 
+split_1([CP1|Cs]=Cs0, [C|_]=Needle, _, Where, Curr, Acc) when is_integer(CP1) ->
+    case CP1=:=C of
+        true ->
+            case prefix_1(Cs0, Needle) of
+                nomatch -> split_1(Cs, Needle, 0, Where, append(C,Curr), Acc);
+                Rest when Where =:= leading ->
+                    [rev(Curr), Rest];
+                Rest when Where =:= trailing ->
+                    split_1(Cs, Needle, 0, Where, [C|Curr], [rev(Curr), Rest]);
+                Rest when Where =:= all ->
+                    split_1(Rest, Needle, 0, Where, [], [rev(Curr)|Acc])
+            end;
+        false ->
+            split_1(Cs, Needle, 0, Where, append(CP1,Curr), Acc)
+    end;
 split_1([Bin|Cont0], Needle, Start, Where, Curr0, Acc)
   when is_binary(Bin) ->
     case bin_search_str(Bin, Start, Cont0, Needle) of
@@ -981,32 +1161,50 @@ split_1(Bin, [_C|_]=Needle, Start, Where, Curr0, Acc) ->
             end
     end.
 
-lexemes_m([Bin|Cont0], Seps, Ts) when is_binary(Bin) ->
-    case bin_search_inv(Bin, Cont0, Seps) of
+lexemes_m([CP|_]=Cs0, {GCs,CPs,_}=Seps, Ts) when is_integer(CP) ->
+    case lists:member(CP, CPs) of
+        true ->
+            [GC|Cs2] = unicode_util:gc(Cs0),
+            case lists:member(GC, GCs) of
+                true ->
+                    lexemes_m(Cs2, Seps, Ts);
+                false ->
+                    {Lexeme,Rest} = lexeme_pick(Cs0, Seps, []),
+                    lexemes_m(Rest, Seps, [Lexeme|Ts])
+            end;
+        false ->
+            {Lexeme,Rest} = lexeme_pick(Cs0, Seps, []),
+            lexemes_m(Rest, Seps, [Lexeme|Ts])
+    end;
+lexemes_m([Bin|Cont0], {GCs,_,_}=Seps0, Ts) when is_binary(Bin) ->
+    case bin_search_inv(Bin, Cont0, GCs) of
         {nomatch,Cont} ->
-            lexemes_m(Cont, Seps, Ts);
+            lexemes_m(Cont, Seps0, Ts);
         Cs ->
+            Seps = search_compile(Seps0),
             {Lexeme,Rest} = lexeme_pick(Cs, Seps, []),
             lexemes_m(Rest, Seps, [Lexeme|Ts])
     end;
-lexemes_m(Cs0, {GCs, _, _}=Seps, Ts) when is_list(Cs0) ->
+lexemes_m(Cs0, {GCs, _, _}=Seps0, Ts) when is_list(Cs0) ->
     case unicode_util:gc(Cs0) of
         [C|Cs] ->
             case lists:member(C, GCs) of
                 true  ->
-                    lexemes_m(Cs, Seps, Ts);
+                    lexemes_m(Cs, Seps0, Ts);
                 false ->
+                    Seps = search_compile(Seps0),
                     {Lexeme,Rest} = lexeme_pick(Cs0, Seps, []),
                     lexemes_m(Rest, Seps, [Lexeme|Ts])
             end;
         [] ->
             lists:reverse(Ts)
     end;
-lexemes_m(Bin, Seps, Ts) when is_binary(Bin) ->
-    case bin_search_inv(Bin, [], Seps) of
+lexemes_m(Bin, {GCs,_,_}=Seps0, Ts) when is_binary(Bin) ->
+    case bin_search_inv(Bin, [], GCs) of
         {nomatch,_} ->
             lists:reverse(Ts);
         [Cs] ->
+            Seps = search_compile(Seps0),
             {Lexeme,Rest} = lexeme_pick(Cs, Seps, []),
             lexemes_m(Rest, Seps, add_non_empty(Lexeme,Ts))
     end.
@@ -1037,7 +1235,7 @@ lexeme_pick(Cs0, {GCs, CPs, _} = Seps, Tkn) when is_list(Cs0) ->
                 true ->
                     [GC|Cs2] = unicode_util:gc(Cs0),
                     case lists:member(GC, GCs) of
-                        true -> {rev(Tkn), Cs0};
+                        true -> {rev(Tkn), Cs2};
                         false -> lexeme_pick(Cs2, Seps, append(rev(GC),Tkn))
                     end;
                 false ->
@@ -1047,7 +1245,7 @@ lexeme_pick(Cs0, {GCs, CPs, _} = Seps, Tkn) when is_list(Cs0) ->
             {rev(Tkn), []}
     end;
 lexeme_pick(Bin, Seps, Tkn) when is_binary(Bin) ->
-    case bin_search(Bin, Seps) of
+    case bin_search(Bin, [], Seps) of
         {nomatch,_} ->
             {btoken(Bin,Tkn), []};
         [Left] ->
@@ -1056,35 +1254,38 @@ lexeme_pick(Bin, Seps, Tkn) when is_binary(Bin) ->
             {btoken(Lexeme, Tkn), Left}
     end.
 
-nth_lexeme_m([Bin|Cont0], Seps, N) when is_binary(Bin) ->
-    case bin_search_inv(Bin, Cont0, Seps) of
+nth_lexeme_m([Bin|Cont0], {GCs,_,_}=Seps0, N) when is_binary(Bin) ->
+    case bin_search_inv(Bin, Cont0, GCs) of
         {nomatch,Cont} ->
-            nth_lexeme_m(Cont, Seps, N);
+            nth_lexeme_m(Cont, Seps0, N);
         Cs when N > 1 ->
-            Rest = lexeme_skip(Cs, Seps),
-            nth_lexeme_m(Rest, Seps, N-1);
+            Rest = lexeme_skip(Cs, Seps0),
+            nth_lexeme_m(Rest, Seps0, N-1);
         Cs ->
+            Seps = search_compile(Seps0),
             {Lexeme,_} = lexeme_pick(Cs, Seps, []),
             Lexeme
     end;
-nth_lexeme_m(Cs0, {GCs, _, _}=Seps, N) when is_list(Cs0) ->
+nth_lexeme_m(Cs0, {GCs, _, _}=Seps0, N) when is_list(Cs0) ->
     case unicode_util:gc(Cs0) of
         [C|Cs] ->
             case lists:member(C, GCs) of
                 true ->
-                    nth_lexeme_m(Cs, Seps, N);
+                    nth_lexeme_m(Cs, Seps0, N);
                 false when N > 1 ->
-                    Cs1 = lexeme_skip(Cs, Seps),
-                    nth_lexeme_m(Cs1, Seps, N-1);
+                    Cs1 = lexeme_skip(Cs, Seps0),
+                    nth_lexeme_m(Cs1, Seps0, N-1);
                 false ->
+                    Seps = search_compile(Seps0),
                     {Lexeme,_} = lexeme_pick(Cs0, Seps, []),
                     Lexeme
             end;
         [] ->
             []
     end;
-nth_lexeme_m(Bin, Seps, N) when is_binary(Bin) ->
-    case bin_search_inv(Bin, [], Seps) of
+nth_lexeme_m(Bin, {GCs,_,_}=Seps0, N) when is_binary(Bin) ->
+    Seps = search_compile(Seps0),
+    case bin_search_inv(Bin, [], GCs) of
         [Cs] when N > 1 ->
             Cs1 = lexeme_skip(Cs, Seps),
             nth_lexeme_m(Cs1, Seps, N-1);
@@ -1100,16 +1301,17 @@ lexeme_skip([CP|Cs1]=Cs0, {GCs,CPs,_}=Seps) when is_integer(CP) ->
         true  ->
             [GC|Cs2] = unicode_util:gc(Cs0),
             case lists:member(GC, GCs) of
-                true -> Cs0;
+                true -> Cs2;
                 false -> lexeme_skip(Cs2, Seps)
             end;
         false ->
             lexeme_skip(Cs1, Seps)
     end;
-lexeme_skip([Bin|Cont0], Seps) when is_binary(Bin) ->
+lexeme_skip([Bin|Cont0], Seps0) when is_binary(Bin) ->
+    Seps = search_compile(Seps0),
     case bin_search(Bin, Cont0, Seps) of
         {nomatch,_} -> lexeme_skip(Cont0, Seps);
-        Cs -> Cs
+        Cs -> tl(unicode_util:gc(Cs))
     end;
 lexeme_skip(Cs0, {GCs, CPs, _} = Seps) when is_list(Cs0) ->
     case unicode_util:cp(Cs0) of
@@ -1118,7 +1320,7 @@ lexeme_skip(Cs0, {GCs, CPs, _} = Seps) when is_list(Cs0) ->
                 true ->
                     [GC|Cs2] = unicode_util:gc(Cs0),
                     case lists:member(GC, GCs) of
-                        true -> Cs0;
+                        true -> Cs2;
                         false -> lexeme_skip(Cs2, Seps)
                     end;
                 false ->
@@ -1127,12 +1329,23 @@ lexeme_skip(Cs0, {GCs, CPs, _} = Seps) when is_list(Cs0) ->
         [] ->
             []
     end;
-lexeme_skip(Bin, Seps) when is_binary(Bin) ->
-    case bin_search(Bin, Seps) of
+lexeme_skip(Bin, Seps0) when is_binary(Bin) ->
+    Seps = search_compile(Seps0),
+    case bin_search(Bin, [], Seps) of
         {nomatch,_} -> <<>>;
-        [Left] -> Left
+        [Left] -> tl(unicode_util:gc(Left))
     end.
 
+find_l([C1|Cs]=Cs0, [C|_]=Needle) when is_integer(C1) ->
+    case C1 of
+        C ->
+            case prefix_1(Cs0, Needle) of
+                nomatch -> find_l(Cs, Needle);
+                _ -> Cs0
+            end;
+        _ ->
+            find_l(Cs, Needle)
+    end;
 find_l([Bin|Cont0], Needle) when is_binary(Bin) ->
     case bin_search_str(Bin, 0, Cont0, Needle) of
         {nomatch, _, Cont} ->
@@ -1157,6 +1370,16 @@ find_l(Bin, Needle) ->
         {_Before, [Cs], _After} -> Cs
     end.
 
+find_r([Cp|Cs]=Cs0, [C|_]=Needle, Res) when is_integer(Cp) ->
+    case Cp of
+        C ->
+            case prefix_1(Cs0, Needle) of
+                nomatch -> find_r(Cs, Needle, Res);
+                _ -> find_r(Cs, Needle, Cs0)
+            end;
+        _ ->
+            find_r(Cs, Needle, Res)
+    end;
 find_r([Bin|Cont0], Needle, Res) when is_binary(Bin) ->
     case bin_search_str(Bin, 0, Cont0, Needle) of
         {nomatch,_,Cont} ->
@@ -1227,11 +1450,6 @@ cp_prefix_1(Orig, Until, Cont) ->
 
 
 %% Binary special
-bin_search(Bin, Seps) ->
-    bin_search(Bin, [], Seps).
-
-bin_search(_Bin, Cont, {[],_,_}) ->
-    {nomatch, Cont};
 bin_search(Bin, Cont, {Seps,_,BP}) ->
     bin_search_loop(Bin, 0, BP, Cont, Seps).
 
@@ -1239,10 +1457,14 @@ bin_search(Bin, Cont, {Seps,_,BP}) ->
 %% i.e. å in nfd form  $a "COMBINING RING ABOVE"
 %% and PREPEND characters like "ARABIC NUMBER SIGN" 1536 <<216,128>>
 %% combined with other characters are currently ignored.
+search_pattern({_,_,_}=P) -> P;
 search_pattern(Seps) ->
     CPs = search_cp(Seps),
-    Bin = bin_pattern(CPs),
-    {Seps, CPs, Bin}.
+    {Seps, CPs, undefined}.
+
+search_compile({Sep, CPs, undefined}) ->
+    {Sep, CPs, binary:compile_pattern(bin_pattern(CPs))};
+search_compile({_,_,_}=Compiled) -> Compiled.
 
 search_cp([CP|Seps]) when is_integer(CP) ->
     [CP|search_cp(Seps)];
@@ -1263,9 +1485,21 @@ bin_search_loop(Bin0, Start, BinSeps, Cont, Seps) ->
     case binary:match(Bin, BinSeps) of
         nomatch ->
             {nomatch,Cont};
+        {Where, _CL} when Cont =:= [] ->
+            <<_:Where/binary, Cont1/binary>> = Bin,
+            [GC|Cont2] = unicode_util:gc(Cont1),
+            case lists:member(GC, Seps) of
+                false when Cont2 =:= [] ->
+                    {nomatch, []};
+                false ->
+                    Next = byte_size(Bin0) - byte_size(Cont2),
+                    bin_search_loop(Bin0, Next, BinSeps, Cont, Seps);
+                true ->
+                    [Cont1]
+            end;
         {Where, _CL} ->
             <<_:Where/binary, Cont0/binary>> = Bin,
-            Cont1 = stack(Cont0, Cont),
+            Cont1 = [Cont0|Cont],
             [GC|Cont2] = unicode_util:gc(Cont1),
             case lists:member(GC, Seps) of
                 false ->
@@ -1273,55 +1507,108 @@ bin_search_loop(Bin0, Start, BinSeps, Cont, Seps) ->
                         [BinR|Cont] when is_binary(BinR) ->
                             Next = byte_size(Bin0) - byte_size(BinR),
                             bin_search_loop(Bin0, Next, BinSeps, Cont, Seps);
-                        BinR when is_binary(BinR), Cont =:= [] ->
-                            Next = byte_size(Bin0) - byte_size(BinR),
-                            bin_search_loop(Bin0, Next, BinSeps, Cont, Seps);
                         _ ->
                             {nomatch, Cont2}
                     end;
-                true when is_list(Cont1) ->
-                    Cont1;
                 true ->
-                    [Cont1]
+                    Cont1
             end
     end.
 
-bin_search_inv(Bin, Cont, {[], _, _}) ->
-    [Bin|Cont];
-bin_search_inv(Bin, Cont, {[Sep], _, _}) ->
-    bin_search_inv_1([Bin|Cont], Sep);
-bin_search_inv(Bin, Cont, {Seps, _, _}) ->
-    bin_search_inv_n([Bin|Cont], Seps).
-
-bin_search_inv_1([<<>>|CPs], _) ->
-    {nomatch, CPs};
-bin_search_inv_1(CPs = [Bin0|Cont], Sep) when is_binary(Bin0) ->
-    case unicode_util:gc(CPs) of
-        [Sep|Bin] when is_binary(Bin), Cont =:= [] ->
-            bin_search_inv_1([Bin], Sep);
-        [Sep|[Bin|Cont]=Cs] when is_binary(Bin) ->
-            bin_search_inv_1(Cs, Sep);
-        [Sep|Cs] ->
-            {nomatch, Cs};
-        _ -> CPs
-    end.
+bin_search_inv(<<>>, Cont, _) ->
+    {nomatch, Cont};
+bin_search_inv(Bin, Cont, [Sep]) ->
+    bin_search_inv_1(Bin, Cont, Sep);
+bin_search_inv(Bin, Cont, Seps) ->
+    bin_search_inv_n(Bin, Cont, Seps).
+
+bin_search_inv_1(<<CP1/utf8, BinRest/binary>>=Bin0, Cont, Sep) ->
+    case BinRest of
+        <<CP2/utf8, _/binary>> when ?ASCII_LIST(CP1, CP2) ->
+            case CP1 of
+                Sep -> bin_search_inv_1(BinRest, Cont, Sep);
+                _ -> [Bin0|Cont]
+            end;
+        _ when Cont =:= [] ->
+            case unicode_util:gc(Bin0) of
+                [Sep|Bin] -> bin_search_inv_1(Bin, Cont, Sep);
+                _ -> [Bin0|Cont]
+            end;
+        _ ->
+            case unicode_util:gc([Bin0|Cont]) of
+                [Sep|[Bin|Cont]] when is_binary(Bin) ->
+                    bin_search_inv_1(Bin, Cont, Sep);
+                [Sep|Cs] ->
+                    {nomatch, Cs};
+                _ -> [Bin0|Cont]
+            end
+    end;
+bin_search_inv_1(<<>>, Cont, _Sep) ->
+    {nomatch, Cont};
+bin_search_inv_1([], Cont, _Sep) ->
+    {nomatch, Cont}.
 
-bin_search_inv_n([<<>>|CPs], _) ->
-    {nomatch, CPs};
-bin_search_inv_n([Bin0|Cont]=CPs, Seps) when is_binary(Bin0) ->
-    [C|Cs0] = unicode_util:gc(CPs),
-    case {lists:member(C, Seps), Cs0} of
-        {true, Cs} when is_binary(Cs), Cont =:= [] ->
-            bin_search_inv_n([Cs], Seps);
-        {true, [Bin|Cont]=Cs} when is_binary(Bin) ->
-            bin_search_inv_n(Cs, Seps);
-        {true, Cs} -> {nomatch, Cs};
-        {false, _} -> CPs
-    end.
 
+bin_search_inv_n(<<CP1/utf8, BinRest/binary>>=Bin0, Cont, Seps) ->
+    case BinRest of
+        <<CP2/utf8, _/binary>> when ?ASCII_LIST(CP1, CP2) ->
+            case lists:member(CP1,Seps) of
+                true -> bin_search_inv_n(BinRest, Cont, Seps);
+                false -> [Bin0|Cont]
+            end;
+        _ when Cont =:= [] ->
+            [GC|Bin] = unicode_util:gc(Bin0),
+            case lists:member(GC, Seps) of
+                true -> bin_search_inv_n(Bin, Cont, Seps);
+                false -> [Bin0|Cont]
+            end;
+        _ ->
+            [GC|Cs0] = unicode_util:gc([Bin0|Cont]),
+            case lists:member(GC, Seps) of
+                false -> [Bin0|Cont];
+                true ->
+                    case Cs0 of
+                        [Bin|Cont] when is_binary(Bin) ->
+                            bin_search_inv_n(Bin, Cont, Seps);
+                        _ ->
+                            {nomatch, Cs0}
+                    end
+            end
+    end;
+bin_search_inv_n(<<>>, Cont, _Sep) ->
+    {nomatch, Cont};
+bin_search_inv_n([], Cont, _Sep) ->
+    {nomatch, Cont}.
+
+bin_search_str(Bin0, Start, [], SearchCPs) ->
+    Compiled = binary:compile_pattern(unicode:characters_to_binary(SearchCPs)),
+    bin_search_str_1(Bin0, Start, Compiled, SearchCPs);
 bin_search_str(Bin0, Start, Cont, [CP|_]=SearchCPs) ->
+    First = binary:compile_pattern(<<CP/utf8>>),
+    bin_search_str_2(Bin0, Start, Cont, First, SearchCPs).
+
+bin_search_str_1(Bin0, Start, First, SearchCPs) ->
+    <<_:Start/binary, Bin/binary>> = Bin0,
+    case binary:match(Bin, First) of
+        nomatch -> {nomatch, byte_size(Bin0), []};
+        {Where0, _} ->
+            Where = Start+Where0,
+            <<Keep:Where/binary, Cs0/binary>> = Bin0,
+            case prefix_1(Cs0, SearchCPs) of
+                nomatch ->
+                    <<_/utf8, Cs/binary>> = Cs0,
+                    KeepSz = byte_size(Bin0) - byte_size(Cs),
+                    bin_search_str_1(Bin0, KeepSz, First, SearchCPs);
+                [] ->
+                    {Keep, [Cs0], <<>>};
+                Rest ->
+                    {Keep, [Cs0], Rest}
+            end
+    end.
+
+bin_search_str_2(Bin0, Start, Cont, First, SearchCPs) ->
     <<_:Start/binary, Bin/binary>> = Bin0,
-    case binary:match(Bin, <<CP/utf8>>) of
+    case binary:match(Bin, First) of
         nomatch -> {nomatch, byte_size(Bin0), Cont};
         {Where0, _} ->
             Where = Start+Where0,
@@ -1330,7 +1617,7 @@ bin_search_str(Bin0, Start, Cont, [CP|_]=SearchCPs) ->
             case prefix_1(stack(Cs0,Cont), SearchCPs) of
                 nomatch when is_binary(Cs) ->
                     KeepSz = byte_size(Bin0) - byte_size(Cs),
-                    bin_search_str(Bin0, KeepSz, Cont, SearchCPs);
+                    bin_search_str_2(Bin0, KeepSz, Cont, First, SearchCPs);
                 nomatch ->
                     {nomatch, Where, stack([GC|Cs],Cont)};
                 [] ->
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index 7920e55930..e56415650f 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -31,7 +31,6 @@
 %% Internal exports
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3, format_status/2]).
--export([try_again_restart/2]).
 
 %% For release_handler only
 -export([get_callback_module/1]).
@@ -79,6 +78,7 @@
                    | {RestartStrategy :: strategy(),
                       Intensity :: non_neg_integer(),
                       Period :: pos_integer()}.
+-type children() :: {Ids :: [child_id()], Db :: #{child_id() => child_rec()}}.
 
 %%--------------------------------------------------------------------------
 %% Defaults
@@ -96,7 +96,7 @@
 	        pid = undefined :: child()
 	                         | {restarting, pid() | undefined}
 	                         | [pid()],
-		name            :: child_id(),
+		id              :: child_id(),
 		mfargs          :: mfargs(),
 		restart_type    :: restart(),
 		shutdown        :: shutdown(),
@@ -104,16 +104,11 @@
 		modules = []    :: modules()}).
 -type child_rec() :: #child{}.
 
--define(DICTS, dict).
--define(DICT, dict:dict).
--define(SETS, sets).
--define(SET, sets:set).
-
 -record(state, {name,
 		strategy               :: strategy() | 'undefined',
-		children = []          :: [child_rec()],
-                dynamics               :: {'dict', ?DICT(pid(), list())}
-                                        | {'set', ?SET(pid())}
+		children = {[],#{}}    :: children(), % Ids in start order
+                dynamics               :: {'maps', #{pid() => list()}}
+                                        | {'sets', sets:set(pid())}
                                         | 'undefined',
 		intensity              :: non_neg_integer() | 'undefined',
 		period                 :: pos_integer() | 'undefined',
@@ -124,6 +119,9 @@
 -type state() :: #state{}.
 
 -define(is_simple(State), State#state.strategy =:= simple_one_for_one).
+-define(is_temporary(_Child_), _Child_#child.restart_type=:=temporary).
+-define(is_transient(_Child_), _Child_#child.restart_type=:=transient).
+-define(is_permanent(_Child_), _Child_#child.restart_type=:=permanent).
 
 -callback init(Args :: term()) ->
     {ok, {SupFlags :: sup_flags(), [ChildSpec :: child_spec()]}}
@@ -179,16 +177,16 @@ start_child(Supervisor, ChildSpec) ->
               | {'error', Error},
       Error :: 'running' | 'restarting' | 'not_found' | 'simple_one_for_one' |
 	       term().
-restart_child(Supervisor, Name) ->
-    call(Supervisor, {restart_child, Name}).
+restart_child(Supervisor, Id) ->
+    call(Supervisor, {restart_child, Id}).
 
 -spec delete_child(SupRef, Id) -> Result when
       SupRef :: sup_ref(),
       Id :: child_id(),
       Result :: 'ok' | {'error', Error},
       Error :: 'running' | 'restarting' | 'not_found' | 'simple_one_for_one'.
-delete_child(Supervisor, Name) ->
-    call(Supervisor, {delete_child, Name}).
+delete_child(Supervisor, Id) ->
+    call(Supervisor, {delete_child, Id}).
 
 %%-----------------------------------------------------------------
 %% Func: terminate_child/2
@@ -202,16 +200,16 @@ delete_child(Supervisor, Name) ->
       Id :: pid() | child_id(),
       Result :: 'ok' | {'error', Error},
       Error :: 'not_found' | 'simple_one_for_one'.
-terminate_child(Supervisor, Name) ->
-    call(Supervisor, {terminate_child, Name}).
+terminate_child(Supervisor, Id) ->
+    call(Supervisor, {terminate_child, Id}).
 
 -spec get_childspec(SupRef, Id) -> Result when
       SupRef :: sup_ref(),
       Id :: pid() | child_id(),
       Result :: {'ok', child_spec()} | {'error', Error},
       Error :: 'not_found'.
-get_childspec(Supervisor, Name) ->
-    call(Supervisor, {get_childspec, Name}).
+get_childspec(Supervisor, Id) ->
+    call(Supervisor, {get_childspec, Id}).
 
 -spec which_children(SupRef) -> [{Id,Child,Type,Modules}] when
       SupRef :: sup_ref(),
@@ -246,17 +244,6 @@ check_childspecs(ChildSpecs) when is_list(ChildSpecs) ->
 check_childspecs(X) -> {error, {badarg, X}}.
 
 %%%-----------------------------------------------------------------
-%%% Called by restart/2
--spec try_again_restart(SupRef, Child) -> ok when
-      SupRef :: sup_ref(),
-      Child :: child_id() | pid().
-try_again_restart(Supervisor, Child) ->
-    cast(Supervisor, {try_again_restart, Child}).
-
-cast(Supervisor, Req) ->
-    gen_server:cast(Supervisor, Req).
-
-%%%-----------------------------------------------------------------
 %%% Called by release_handler during upgrade
 -spec get_callback_module(Pid) -> Module when
       Pid :: pid(),
@@ -325,7 +312,7 @@ init_children(State, StartSpec) ->
 init_dynamic(State, [StartSpec]) ->
     case check_startspec([StartSpec]) of
         {ok, Children} ->
-	    {ok, State#state{children = Children}};
+	    {ok, dyn_init(State#state{children = Children})};
         Error ->
             {stop, {start_spec, Error}}
     end;
@@ -334,35 +321,34 @@ init_dynamic(_State, StartSpec) ->
 
 %%-----------------------------------------------------------------
 %% Func: start_children/2
-%% Args: Children = [child_rec()] in start order
+%% Args: Children = children() % Ids in start order
 %%       SupName = {local, atom()} | {global, atom()} | {pid(), Mod}
-%% Purpose: Start all children.  The new list contains #child's
+%% Purpose: Start all children.  The new map contains #child's
 %%          with pids.
 %% Returns: {ok, NChildren} | {error, NChildren, Reason}
-%%          NChildren = [child_rec()] in termination order (reversed
-%%                        start order)
+%%          NChildren = children() % Ids in termination order
+%%                                   (reversed start order)
 %%-----------------------------------------------------------------
-start_children(Children, SupName) -> start_children(Children, [], SupName).
-
-start_children([Child|Chs], NChildren, SupName) ->
-    case do_start_child(SupName, Child) of
-	{ok, undefined} when Child#child.restart_type =:= temporary ->
-	    start_children(Chs, NChildren, SupName);
-	{ok, Pid} ->
-	    start_children(Chs, [Child#child{pid = Pid}|NChildren], SupName);
-	{ok, Pid, _Extra} ->
-	    start_children(Chs, [Child#child{pid = Pid}|NChildren], SupName);
-	{error, Reason} ->
-	    report_error(start_error, Reason, Child, SupName),
-	    {error, lists:reverse(Chs) ++ [Child | NChildren],
-	     {failed_to_start_child,Child#child.name,Reason}}
-    end;
-start_children([], NChildren, _SupName) ->
-    {ok, NChildren}.
+start_children(Children, SupName) ->
+    Start =
+        fun(Id,Child) ->
+                case do_start_child(SupName, Child) of
+                    {ok, undefined} when ?is_temporary(Child) ->
+                        remove;
+                    {ok, Pid} ->
+                        {update,Child#child{pid = Pid}};
+                    {ok, Pid, _Extra} ->
+                        {update,Child#child{pid = Pid}};
+                    {error, Reason} ->
+                        report_error(start_error, Reason, Child, SupName),
+                        {abort,{failed_to_start_child,Id,Reason}}
+                end
+        end,
+    children_map(Start,Children).
 
 do_start_child(SupName, Child) ->
     #child{mfargs = {M, F, Args}} = Child,
-    case catch apply(M, F, Args) of
+    case do_start_child_i(M, F, Args) of
 	{ok, Pid} when is_pid(Pid) ->
 	    NChild = Child#child{pid = Pid},
 	    report_progress(NChild, SupName),
@@ -371,10 +357,8 @@ do_start_child(SupName, Child) ->
 	    NChild = Child#child{pid = Pid},
 	    report_progress(NChild, SupName),
 	    {ok, Pid, Extra};
-	ignore ->
-	    {ok, undefined};
-	{error, What} -> {error, What};
-	What -> {error, What}
+        Other ->
+            Other
     end.
 
 do_start_child_i(M, F, A) ->
@@ -400,17 +384,17 @@ do_start_child_i(M, F, A) ->
 -spec handle_call(call(), term(), state()) -> {'reply', term(), state()}.
 
 handle_call({start_child, EArgs}, _From, State) when ?is_simple(State) ->
-    Child = hd(State#state.children),
+    Child = get_dynamic_child(State),
     #child{mfargs = {M, F, A}} = Child,
     Args = A ++ EArgs,
     case do_start_child_i(M, F, Args) of
 	{ok, undefined} ->
 	    {reply, {ok, undefined}, State};
 	{ok, Pid} ->
-	    NState = save_dynamic_child(Child#child.restart_type, Pid, Args, State),
+	    NState = dyn_store(Pid, Args, State),
 	    {reply, {ok, Pid}, NState};
 	{ok, Pid, Extra} ->
-	    NState = save_dynamic_child(Child#child.restart_type, Pid, Args, State),
+	    NState = dyn_store(Pid, Args, State),
 	    {reply, {ok, Pid, Extra}, NState};
 	What ->
 	    {reply, What, State}
@@ -426,121 +410,94 @@ handle_call({start_child, ChildSpec}, _From, State) ->
     end;
 
 %% terminate_child for simple_one_for_one can only be done with pid
-handle_call({terminate_child, Name}, _From, State) when not is_pid(Name),
-							?is_simple(State) ->
+handle_call({terminate_child, Id}, _From, State) when not is_pid(Id),
+                                                      ?is_simple(State) ->
     {reply, {error, simple_one_for_one}, State};
 
-handle_call({terminate_child, Name}, _From, State) ->
-    case get_child(Name, State, ?is_simple(State)) of
-	{value, Child} ->
-	    case do_terminate(Child, State#state.name) of
-		#child{restart_type=RT} when RT=:=temporary; ?is_simple(State) ->
-		    {reply, ok, state_del_child(Child, State)};
-		NChild ->
-		    {reply, ok, replace_child(NChild, State)}
-		end;
-	false ->
+handle_call({terminate_child, Id}, _From, State) ->
+    case find_child(Id, State) of
+	{ok, Child} ->
+	    do_terminate(Child, State#state.name),
+            {reply, ok, del_child(Child, State)};
+	error ->
 	    {reply, {error, not_found}, State}
     end;
 
 %% restart_child request is invalid for simple_one_for_one supervisors
-handle_call({restart_child, _Name}, _From, State) when ?is_simple(State) ->
+handle_call({restart_child, _Id}, _From, State) when ?is_simple(State) ->
     {reply, {error, simple_one_for_one}, State};
 
-handle_call({restart_child, Name}, _From, State) ->
-    case get_child(Name, State) of
-	{value, Child} when Child#child.pid =:= undefined ->
+handle_call({restart_child, Id}, _From, State) ->
+    case find_child(Id, State) of
+	{ok, Child} when Child#child.pid =:= undefined ->
 	    case do_start_child(State#state.name, Child) of
 		{ok, Pid} ->
-		    NState = replace_child(Child#child{pid = Pid}, State),
+		    NState = set_pid(Pid, Id, State),
 		    {reply, {ok, Pid}, NState};
 		{ok, Pid, Extra} ->
-		    NState = replace_child(Child#child{pid = Pid}, State),
+		    NState = set_pid(Pid, Id, State),
 		    {reply, {ok, Pid, Extra}, NState};
 		Error ->
 		    {reply, Error, State}
 	    end;
-	{value, #child{pid=?restarting(_)}} ->
+	{ok, #child{pid=?restarting(_)}} ->
 	    {reply, {error, restarting}, State};
-	{value, _} ->
+	{ok, _} ->
 	    {reply, {error, running}, State};
 	_ ->
 	    {reply, {error, not_found}, State}
     end;
 
 %% delete_child request is invalid for simple_one_for_one supervisors
-handle_call({delete_child, _Name}, _From, State) when ?is_simple(State) ->
+handle_call({delete_child, _Id}, _From, State) when ?is_simple(State) ->
     {reply, {error, simple_one_for_one}, State};
 
-handle_call({delete_child, Name}, _From, State) ->
-    case get_child(Name, State) of
-	{value, Child} when Child#child.pid =:= undefined ->
-	    NState = remove_child(Child, State),
+handle_call({delete_child, Id}, _From, State) ->
+    case find_child(Id, State) of
+	{ok, Child} when Child#child.pid =:= undefined ->
+	    NState = remove_child(Id, State),
 	    {reply, ok, NState};
-	{value, #child{pid=?restarting(_)}} ->
+	{ok, #child{pid=?restarting(_)}} ->
 	    {reply, {error, restarting}, State};
-	{value, _} ->
+	{ok, _} ->
 	    {reply, {error, running}, State};
 	_ ->
 	    {reply, {error, not_found}, State}
     end;
 
-handle_call({get_childspec, Name}, _From, State) ->
-    case get_child(Name, State, ?is_simple(State)) of
-	{value, Child} ->
+handle_call({get_childspec, Id}, _From, State) ->
+    case find_child(Id, State) of
+	{ok, Child} ->
             {reply, {ok, child_to_spec(Child)}, State};
-	false ->
+	error ->
 	    {reply, {error, not_found}, State}
     end;
 
-handle_call(which_children, _From, #state{children = [#child{restart_type = temporary,
-							     child_type = CT,
-							     modules = Mods}]} =
-		State) when ?is_simple(State) ->
-    Reply = lists:map(fun(Pid) -> {undefined, Pid, CT, Mods} end,
-                      ?SETS:to_list(dynamics_db(temporary, State#state.dynamics))),
-    {reply, Reply, State};
-
-handle_call(which_children, _From, #state{children = [#child{restart_type = RType,
-							 child_type = CT,
-							 modules = Mods}]} =
-		State) when ?is_simple(State) ->
-    Reply = lists:map(fun({?restarting(_),_}) -> {undefined,restarting,CT,Mods};
-			 ({Pid, _}) -> {undefined, Pid, CT, Mods} end,
-		      ?DICTS:to_list(dynamics_db(RType, State#state.dynamics))),
+handle_call(which_children, _From, State) when ?is_simple(State) ->
+    #child{child_type = CT,modules = Mods} = get_dynamic_child(State),
+    Reply = dyn_map(fun(?restarting(_)) -> {undefined, restarting, CT, Mods};
+                       (Pid) -> {undefined, Pid, CT, Mods}
+                    end, State),
     {reply, Reply, State};
 
 handle_call(which_children, _From, State) ->
     Resp =
-	lists:map(fun(#child{pid = ?restarting(_), name = Name,
-			     child_type = ChildType, modules = Mods}) ->
-			  {Name, restarting, ChildType, Mods};
-		     (#child{pid = Pid, name = Name,
-			     child_type = ChildType, modules = Mods}) ->
-			  {Name, Pid, ChildType, Mods}
-		  end,
-		  State#state.children),
+	children_to_list(
+          fun(Id,#child{pid = ?restarting(_),
+                        child_type = ChildType, modules = Mods}) ->
+                  {Id, restarting, ChildType, Mods};
+             (Id,#child{pid = Pid,
+                        child_type = ChildType, modules = Mods}) ->
+                  {Id, Pid, ChildType, Mods}
+          end,
+          State#state.children),
     {reply, Resp, State};
 
-
-handle_call(count_children, _From, #state{children = [#child{restart_type = temporary,
-							     child_type = CT}]} = State)
-  when ?is_simple(State) ->
-    Sz = ?SETS:size(dynamics_db(temporary, State#state.dynamics)),
-    Reply = case CT of
-		supervisor -> [{specs, 1}, {active, Sz},
-			       {supervisors, Sz}, {workers, 0}];
-		worker -> [{specs, 1}, {active, Sz},
-			   {supervisors, 0}, {workers, Sz}]
-	    end,
-    {reply, Reply, State};
-
-handle_call(count_children, _From,  #state{dynamic_restarts = Restarts,
-					   children = [#child{restart_type = RType,
-							      child_type = CT}]} = State)
+handle_call(count_children, _From,  #state{dynamic_restarts = Restarts} = State)
   when ?is_simple(State) ->
-    Sz = ?DICTS:size(dynamics_db(RType, State#state.dynamics)),
-    Active = Sz - Restarts,
+    #child{child_type = CT} = get_dynamic_child(State),
+    Sz = dyn_size(State),
+    Active = Sz - Restarts, % Restarts is always 0 for temporary children
     Reply = case CT of
 		supervisor -> [{specs, 1}, {active, Active},
 			       {supervisors, Sz}, {workers, 0}];
@@ -552,16 +509,15 @@ handle_call(count_children, _From,  #state{dynamic_restarts = Restarts,
 handle_call(count_children, _From, State) ->
     %% Specs and children are together on the children list...
     {Specs, Active, Supers, Workers} =
-	lists:foldl(fun(Child, Counts) ->
-			   count_child(Child, Counts)
-		   end, {0,0,0,0}, State#state.children),
+	children_fold(fun(_Id, Child, Counts) ->
+                              count_child(Child, Counts)
+                      end, {0,0,0,0}, State#state.children),
 
     %% Reformat counts to a property list.
     Reply = [{specs, Specs}, {active, Active},
 	     {supervisors, Supers}, {workers, Workers}],
     {reply, Reply, State}.
 
-
 count_child(#child{pid = Pid, child_type = worker},
 	    {Specs, Active, Supers, Workers}) ->
     case is_pid(Pid) andalso is_process_alive(Pid) of
@@ -575,34 +531,15 @@ count_child(#child{pid = Pid, child_type = supervisor},
 	false -> {Specs+1, Active, Supers+1, Workers}
     end.
 
-
 %%% If a restart attempt failed, this message is cast
 %%% from restart/2 in order to give gen_server the chance to
 %%% check it's inbox before trying again.
--spec handle_cast({try_again_restart, child_id() | pid()}, state()) ->
+-spec handle_cast({try_again_restart, child_id() | {'restarting',pid()}}, state()) ->
 			 {'noreply', state()} | {stop, shutdown, state()}.
 
-handle_cast({try_again_restart,Pid}, #state{children=[Child]}=State)
-  when ?is_simple(State) ->
-    RT = Child#child.restart_type,
-    RPid = restarting(Pid),
-    case dynamic_child_args(RPid, RT, State#state.dynamics) of
-	{ok, Args} ->
-	    {M, F, _} = Child#child.mfargs,
-	    NChild = Child#child{pid = RPid, mfargs = {M, F, Args}},
-	    case restart(NChild,State) of
-		{ok, State1} ->
-		    {noreply, State1};
-		{shutdown, State1} ->
-		    {stop, shutdown, State1}
-	    end;
-	error ->
-            {noreply, State}
-    end;
-
-handle_cast({try_again_restart,Name}, State) ->
-    case lists:keyfind(Name,#child.name,State#state.children) of
-	Child = #child{pid=?restarting(_)} ->
+handle_cast({try_again_restart,TryAgainId}, State) ->
+    case find_child_and_args(TryAgainId, State) of
+	{ok, Child = #child{pid=?restarting(_)}} ->
 	    case restart(Child,State) of
 		{ok, State1} ->
 		    {noreply, State1};
@@ -637,10 +574,8 @@ handle_info(Msg, State) ->
 %%
 -spec terminate(term(), state()) -> 'ok'.
 
-terminate(_Reason, #state{children=[Child]} = State) when ?is_simple(State) ->
-    terminate_dynamic_children(Child, dynamics_db(Child#child.restart_type,
-                                                  State#state.dynamics),
-                               State#state.name);
+terminate(_Reason, State) when ?is_simple(State) ->
+    terminate_dynamic_children(State);
 terminate(_Reason, State) ->
     terminate_children(State#state.children, State#state.name).
 
@@ -675,8 +610,8 @@ code_change(_, State, _) ->
 
 update_childspec(State, StartSpec) when ?is_simple(State) ->
     case check_startspec(StartSpec) of
-        {ok, [Child]} ->
-            {ok, State#state{children = [Child]}};
+        {ok, {[_],_}=Children} ->
+            {ok, State#state{children = Children}};
         Error ->
             {error, Error}
     end;
@@ -690,39 +625,36 @@ update_childspec(State, StartSpec) ->
 	    {error, Error}
     end.
 
-update_childspec1([Child|OldC], Children, KeepOld) ->
-    case update_chsp(Child, Children) of
-	{ok,NewChildren} ->
-	    update_childspec1(OldC, NewChildren, KeepOld);
+update_childspec1({[Id|OldIds], OldDb}, {Ids,Db}, KeepOld) ->
+    case update_chsp(maps:get(Id,OldDb), Db) of
+	{ok,NewDb} ->
+	    update_childspec1({OldIds,OldDb}, {Ids,NewDb}, KeepOld);
 	false ->
-	    update_childspec1(OldC, Children, [Child|KeepOld])
+	    update_childspec1({OldIds,OldDb}, {Ids,Db}, [Id|KeepOld])
     end;
-update_childspec1([], Children, KeepOld) ->
+update_childspec1({[],OldDb}, {Ids,Db}, KeepOld) ->
+    KeepOldDb = maps:with(KeepOld,OldDb),
     %% Return them in (kept) reverse start order.
-    lists:reverse(Children ++ KeepOld).
-
-update_chsp(OldCh, Children) ->
-    case lists:map(fun(Ch) when OldCh#child.name =:= Ch#child.name ->
-			   Ch#child{pid = OldCh#child.pid};
-		      (Ch) ->
-			   Ch
-		   end,
-		   Children) of
-	Children ->
-	    false;  % OldCh not found in new spec.
-	NewC ->
-	    {ok, NewC}
+    {lists:reverse(Ids ++ KeepOld),maps:merge(KeepOldDb,Db)}.
+
+update_chsp(#child{id=Id}=OldChild, NewDb) ->
+    case maps:find(Id, NewDb) of
+        {ok,Child} ->
+            {ok,NewDb#{Id => Child#child{pid = OldChild#child.pid}}};
+        error -> % Id not found in new spec.
+            false
     end.
+
     
 %%% ---------------------------------------------------
 %%% Start a new child.
 %%% ---------------------------------------------------
 
 handle_start_child(Child, State) ->
-    case get_child(Child#child.name, State) of
-	false ->
+    case find_child(Child#child.id, State) of
+	error ->
 	    case do_start_child(State#state.name, Child) of
-		{ok, undefined} when Child#child.restart_type =:= temporary ->
+		{ok, undefined} when ?is_temporary(Child) ->
 		    {{ok, undefined}, State};
 		{ok, Pid} ->
 		    {{ok, Pid}, save_child(Child#child{pid = Pid}, State)};
@@ -731,9 +663,9 @@ handle_start_child(Child, State) ->
 		{error, What} ->
 		    {{error, {What, Child}}, State}
 	    end;
-	{value, OldChild} when is_pid(OldChild#child.pid) ->
+	{ok, OldChild} when is_pid(OldChild#child.pid) ->
 	    {{error, {already_started, OldChild#child.pid}}, State};
-	{value, _OldChild} ->
+	{ok, _OldChild} ->
 	    {{error, already_present}, State}
     end.
 
@@ -742,63 +674,45 @@ handle_start_child(Child, State) ->
 %%% Returns: {ok, state()} | {shutdown, state()}
 %%% ---------------------------------------------------
 
-restart_child(Pid, Reason, #state{children = [Child]} = State) when ?is_simple(State) ->
-    RestartType = Child#child.restart_type,
-    case dynamic_child_args(Pid, RestartType, State#state.dynamics) of
-	{ok, Args} ->
-	    {M, F, _} = Child#child.mfargs,
-	    NChild = Child#child{pid = Pid, mfargs = {M, F, Args}},
-	    do_restart(RestartType, Reason, NChild, State);
-	error ->
-            {ok, State}
-    end;
-
 restart_child(Pid, Reason, State) ->
-    Children = State#state.children,
-    case lists:keyfind(Pid, #child.pid, Children) of
-	#child{restart_type = RestartType} = Child ->
-	    do_restart(RestartType, Reason, Child, State);
-	false ->
+    case find_child_and_args(Pid, State) of
+        {ok, Child} ->
+	    do_restart(Reason, Child, State);
+	error ->
 	    {ok, State}
     end.
 
-do_restart(permanent, Reason, Child, State) ->
+do_restart(Reason, Child, State) when ?is_permanent(Child) ->
     report_error(child_terminated, Reason, Child, State#state.name),
     restart(Child, State);
-do_restart(_, normal, Child, State) ->
-    NState = state_del_child(Child, State),
+do_restart(normal, Child, State) ->
+    NState = del_child(Child, State),
     {ok, NState};
-do_restart(_, shutdown, Child, State) ->
-    NState = state_del_child(Child, State),
+do_restart(shutdown, Child, State) ->
+    NState = del_child(Child, State),
     {ok, NState};
-do_restart(_, {shutdown, _Term}, Child, State) ->
-    NState = state_del_child(Child, State),
+do_restart({shutdown, _Term}, Child, State) ->
+    NState = del_child(Child, State),
     {ok, NState};
-do_restart(transient, Reason, Child, State) ->
+do_restart(Reason, Child, State) when ?is_transient(Child) ->
     report_error(child_terminated, Reason, Child, State#state.name),
     restart(Child, State);
-do_restart(temporary, Reason, Child, State) ->
+do_restart(Reason, Child, State) when ?is_temporary(Child) ->
     report_error(child_terminated, Reason, Child, State#state.name),
-    NState = state_del_child(Child, State),
+    NState = del_child(Child, State),
     {ok, NState}.
 
 restart(Child, State) ->
     case add_restart(State) of
 	{ok, NState} ->
 	    case restart(NState#state.strategy, Child, NState) of
-		{try_again,NState2} ->
+		{{try_again, TryAgainId}, NState2} ->
 		    %% Leaving control back to gen_server before
 		    %% trying again. This way other incoming requsts
 		    %% for the supervisor can be handled - e.g. a
 		    %% shutdown request for the supervisor or the
 		    %% child.
-		    Id = if ?is_simple(State) -> Child#child.pid;
-			    true -> Child#child.name
-			 end,
-		    ok = try_again_restart(self(), Id),
-		    {ok,NState2};
-		{try_again, NState2, #child{name=ChName}} ->
-		    ok = try_again_restart(self(), ChName),
+                    try_again_restart(TryAgainId),
 		    {ok,NState2};
 		Other ->
 		    Other
@@ -806,124 +720,111 @@ restart(Child, State) ->
 	{terminate, NState} ->
 	    report_error(shutdown, reached_max_restart_intensity,
 			 Child, State#state.name),
-	    {shutdown, remove_child(Child, NState)}
+	    {shutdown, del_child(Child, NState)}
     end.
 
 restart(simple_one_for_one, Child, State0) ->
     #child{pid = OldPid, mfargs = {M, F, A}} = Child,
-    State = case OldPid of
+    State1 = case OldPid of
 		?restarting(_) ->
 		    NRes = State0#state.dynamic_restarts - 1,
 		    State0#state{dynamic_restarts = NRes};
 		_ ->
 		    State0
 	    end,
-    Dynamics = ?DICTS:erase(OldPid, dynamics_db(Child#child.restart_type,
-					       State#state.dynamics)),
+    State2 = dyn_erase(OldPid, State1),
     case do_start_child_i(M, F, A) of
 	{ok, Pid} ->
-            DynamicsDb = {dict, ?DICTS:store(Pid, A, Dynamics)},
-	    NState = State#state{dynamics = DynamicsDb},
+            NState = dyn_store(Pid, A, State2),
 	    {ok, NState};
 	{ok, Pid, _Extra} ->
-            DynamicsDb = {dict, ?DICTS:store(Pid, A, Dynamics)},
-	    NState = State#state{dynamics = DynamicsDb},
+            NState = dyn_store(Pid, A, State2),
 	    {ok, NState};
 	{error, Error} ->
-	    NRestarts = State#state.dynamic_restarts + 1,
-            DynamicsDb = {dict, ?DICTS:store(restarting(OldPid), A, Dynamics)},
-	    NState = State#state{dynamic_restarts = NRestarts,
-				 dynamics = DynamicsDb},
-	    report_error(start_error, Error, Child, State#state.name),
-	    {try_again, NState}
+            ROldPid = restarting(OldPid),
+	    NRestarts = State2#state.dynamic_restarts + 1,
+	    State3 = State2#state{dynamic_restarts = NRestarts},
+            NState = dyn_store(ROldPid, A, State3),
+	    report_error(start_error, Error, Child, NState#state.name),
+	    {{try_again, ROldPid}, NState}
     end;
-restart(one_for_one, Child, State) ->
+restart(one_for_one, #child{id=Id} = Child, State) ->
     OldPid = Child#child.pid,
     case do_start_child(State#state.name, Child) of
 	{ok, Pid} ->
-	    NState = replace_child(Child#child{pid = Pid}, State),
+	    NState = set_pid(Pid, Id, State),
 	    {ok, NState};
 	{ok, Pid, _Extra} ->
-	    NState = replace_child(Child#child{pid = Pid}, State),
+	    NState = set_pid(Pid, Id, State),
 	    {ok, NState};
 	{error, Reason} ->
-	    NState = replace_child(Child#child{pid = restarting(OldPid)}, State),
+	    NState = set_pid(restarting(OldPid), Id, State),
 	    report_error(start_error, Reason, Child, State#state.name),
-	    {try_again, NState}
-    end;
-restart(rest_for_one, Child, State) ->
-    {ChAfter, ChBefore} = split_child(Child#child.pid, State#state.children),
-    ChAfter2 = terminate_children(ChAfter, State#state.name),
-    case start_children(ChAfter2, State#state.name) of
-	{ok, ChAfter3} ->
-	    {ok, State#state{children = ChAfter3 ++ ChBefore}};
-	{error, ChAfter3, {failed_to_start_child, ChName, _Reason}}
-	  when ChName =:= Child#child.name ->
-	    NChild = Child#child{pid=restarting(Child#child.pid)},
-	    NState = State#state{children = ChAfter3 ++ ChBefore},
-	    {try_again, replace_child(NChild,NState)};
-	{error, ChAfter3, {failed_to_start_child, ChName, _Reason}} ->
-	    NChild = lists:keyfind(ChName, #child.name, ChAfter3),
-	    NChild2 = NChild#child{pid=?restarting(undefined)},
-	    NState = State#state{children = ChAfter3 ++ ChBefore},
-	    {try_again, replace_child(NChild2,NState), NChild2}
+	    {{try_again,Id}, NState}
     end;
-restart(one_for_all, Child, State) ->
-    Children1 = del_child(Child#child.pid, State#state.children),
-    Children2 = terminate_children(Children1, State#state.name),
-    case start_children(Children2, State#state.name) of
-	{ok, NChs} ->
-	    {ok, State#state{children = NChs}};
-	{error, NChs, {failed_to_start_child, ChName, _Reason}}
-	  when ChName =:= Child#child.name ->
-	    NChild = Child#child{pid=restarting(Child#child.pid)},
-	    NState = State#state{children = NChs},
-	    {try_again, replace_child(NChild,NState)};
-	{error, NChs, {failed_to_start_child, ChName, _Reason}} ->
-	    NChild = lists:keyfind(ChName, #child.name, NChs),
-	    NChild2 = NChild#child{pid=?restarting(undefined)},
-	    NState = State#state{children = NChs},
-	    {try_again, replace_child(NChild2,NState), NChild2}
+restart(rest_for_one, #child{id=Id} = Child, #state{name=SupName} = State) ->
+    {ChAfter, ChBefore} = split_child(Id, State#state.children),
+    {Return, ChAfter2} = restart_multiple_children(Child, ChAfter, SupName),
+    {Return, State#state{children = append(ChAfter2,ChBefore)}};
+restart(one_for_all, Child, #state{name=SupName} = State) ->
+    Children1 = del_child(Child#child.id, State#state.children),
+    {Return, NChildren} = restart_multiple_children(Child, Children1, SupName),
+    {Return, State#state{children = NChildren}}.
+
+restart_multiple_children(Child, Children, SupName) ->
+    Children1 = terminate_children(Children, SupName),
+    case start_children(Children1, SupName) of
+	{ok, NChildren} ->
+	    {ok, NChildren};
+	{error, NChildren, {failed_to_start_child, FailedId, _Reason}} ->
+            NewPid = if FailedId =:= Child#child.id ->
+                             restarting(Child#child.pid);
+                        true ->
+                             ?restarting(undefined)
+                     end,
+	    {{try_again, FailedId}, set_pid(NewPid,FailedId,NChildren)}
     end.
 
 restarting(Pid) when is_pid(Pid) -> ?restarting(Pid);
 restarting(RPid) -> RPid.
 
+-spec try_again_restart(child_id() | {'restarting',pid()}) -> 'ok'.
+try_again_restart(TryAgainId) ->
+    gen_server:cast(self(), {try_again_restart, TryAgainId}).
+
 %%-----------------------------------------------------------------
 %% Func: terminate_children/2
-%% Args: Children = [child_rec()] in termination order
+%% Args: Children = children() % Ids in termination order
 %%       SupName = {local, atom()} | {global, atom()} | {pid(),Mod}
-%% Returns: NChildren = [child_rec()] in
-%%          startup order (reversed termination order)
+%% Returns: NChildren = children() % Ids in startup order
+%%                                 % (reversed termination order)
 %%-----------------------------------------------------------------
 terminate_children(Children, SupName) ->
-    terminate_children(Children, SupName, []).
-
-%% Temporary children should not be restarted and thus should
-%% be skipped when building the list of terminated children, although
-%% we do want them to be shut down as many functions from this module
-%% use this function to just clear everything.
-terminate_children([Child = #child{restart_type=temporary} | Children], SupName, Res) ->
-    _ = do_terminate(Child, SupName),
-    terminate_children(Children, SupName, Res);
-terminate_children([Child | Children], SupName, Res) ->
-    NChild = do_terminate(Child, SupName),
-    terminate_children(Children, SupName, [NChild | Res]);
-terminate_children([], _SupName, Res) ->
-    Res.
+    Terminate =
+        fun(_Id,Child) when ?is_temporary(Child) ->
+                %% Temporary children should not be restarted and thus should
+                %% be skipped when building the list of terminated children.
+                do_terminate(Child, SupName),
+                remove;
+           (_Id,Child) ->
+                do_terminate(Child, SupName),
+                {update,Child#child{pid=undefined}}
+        end,
+    {ok,NChildren} = children_map(Terminate, Children),
+    NChildren.
 
 do_terminate(Child, SupName) when is_pid(Child#child.pid) ->
     case shutdown(Child#child.pid, Child#child.shutdown) of
         ok ->
             ok;
-        {error, normal} when Child#child.restart_type =/= permanent ->
+        {error, normal} when not (?is_permanent(Child)) ->
             ok;
         {error, OtherReason} ->
             report_error(shutdown_error, OtherReason, Child, SupName)
     end,
-    Child#child{pid = undefined};
-do_terminate(Child, _SupName) ->
-    Child#child{pid = undefined}.
+    ok;
+do_terminate(_Child, _SupName) ->
+    ok.
 
 %%-----------------------------------------------------------------
 %% Shutdowns a child. We must check the EXIT value 
@@ -996,66 +897,50 @@ monitor_child(Pid) ->
 	    ok   
     end.
 
-
 %%-----------------------------------------------------------------
-%% Func: terminate_dynamic_children/3
-%% Args: Child    = child_rec()
-%%       Dynamics = ?DICT() | ?SET()
-%%       SupName  = {local, atom()} | {global, atom()} | {pid(),Mod}
+%% Func: terminate_dynamic_children/1
+%% Args: State
 %% Returns: ok
 %%
-%%
 %% Shutdown all dynamic children. This happens when the supervisor is
 %% stopped. Because the supervisor can have millions of dynamic children, we
-%% can have an significative overhead here.
+%% can have a significative overhead here.
 %%-----------------------------------------------------------------
-terminate_dynamic_children(Child, Dynamics, SupName) ->
-    {Pids, EStack0} = monitor_dynamic_children(Child, Dynamics),
-    Sz = ?SETS:size(Pids),
+terminate_dynamic_children(State) ->
+    Child = get_dynamic_child(State),
+    {Pids, EStack0} = monitor_dynamic_children(Child,State),
+    Sz = sets:size(Pids),
     EStack = case Child#child.shutdown of
                  brutal_kill ->
-                     ?SETS:fold(fun(P, _) -> exit(P, kill) end, ok, Pids),
+                     sets:fold(fun(P, _) -> exit(P, kill) end, ok, Pids),
                      wait_dynamic_children(Child, Pids, Sz, undefined, EStack0);
                  infinity ->
-                     ?SETS:fold(fun(P, _) -> exit(P, shutdown) end, ok, Pids),
+                     sets:fold(fun(P, _) -> exit(P, shutdown) end, ok, Pids),
                      wait_dynamic_children(Child, Pids, Sz, undefined, EStack0);
                  Time ->
-                     ?SETS:fold(fun(P, _) -> exit(P, shutdown) end, ok, Pids),
+                     sets:fold(fun(P, _) -> exit(P, shutdown) end, ok, Pids),
                      TRef = erlang:start_timer(Time, self(), kill),
                      wait_dynamic_children(Child, Pids, Sz, TRef, EStack0)
              end,
     %% Unroll stacked errors and report them
-    ?DICTS:fold(fun(Reason, Ls, _) ->
-                       report_error(shutdown_error, Reason,
-                                    Child#child{pid=Ls}, SupName)
-               end, ok, EStack).
-
-
-monitor_dynamic_children(#child{restart_type=temporary}, Dynamics) ->
-    ?SETS:fold(fun(P, {Pids, EStack}) ->
-                       case monitor_child(P) of
-                           ok ->
-                               {?SETS:add_element(P, Pids), EStack};
-                           {error, normal} ->
-                               {Pids, EStack};
-                           {error, Reason} ->
-                               {Pids, ?DICTS:append(Reason, P, EStack)}
-                       end
-               end, {?SETS:new(), ?DICTS:new()}, Dynamics);
-monitor_dynamic_children(#child{restart_type=RType}, Dynamics) ->
-    ?DICTS:fold(fun(P, _, {Pids, EStack}) when is_pid(P) ->
-                       case monitor_child(P) of
-                           ok ->
-                               {?SETS:add_element(P, Pids), EStack};
-                           {error, normal} when RType =/= permanent ->
-                               {Pids, EStack};
-                           {error, Reason} ->
-                               {Pids, ?DICTS:append(Reason, P, EStack)}
-                       end;
-		  (?restarting(_), _, {Pids, EStack}) ->
-		       {Pids, EStack}
-               end, {?SETS:new(), ?DICTS:new()}, Dynamics).
-
+    dict:fold(fun(Reason, Ls, _) ->
+                      report_error(shutdown_error, Reason,
+                                   Child#child{pid=Ls}, State#state.name)
+              end, ok, EStack).
+
+monitor_dynamic_children(Child,State) ->
+    dyn_fold(fun(P,{Pids, EStack}) when is_pid(P) ->
+                     case monitor_child(P) of
+                         ok ->
+                             {sets:add_element(P, Pids), EStack};
+                         {error, normal} when not (?is_permanent(Child)) ->
+                             {Pids, EStack};
+                         {error, Reason} ->
+                             {Pids, dict:append(Reason, P, EStack)}
+                     end;
+                (?restarting(_), {Pids, EStack}) ->
+                     {Pids, EStack}
+             end, {sets:new(), dict:new()}, State).
 
 wait_dynamic_children(_Child, _Pids, 0, undefined, EStack) ->
     EStack;
@@ -1073,39 +958,38 @@ wait_dynamic_children(#child{shutdown=brutal_kill} = Child, Pids, Sz,
                       TRef, EStack) ->
     receive
         {'DOWN', _MRef, process, Pid, killed} ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
                                   TRef, EStack);
 
         {'DOWN', _MRef, process, Pid, Reason} ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
-                                  TRef, ?DICTS:append(Reason, Pid, EStack))
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
+                                  TRef, dict:append(Reason, Pid, EStack))
     end;
-wait_dynamic_children(#child{restart_type=RType} = Child, Pids, Sz,
-                      TRef, EStack) ->
+wait_dynamic_children(Child, Pids, Sz, TRef, EStack) ->
     receive
         {'DOWN', _MRef, process, Pid, shutdown} ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
                                   TRef, EStack);
 
         {'DOWN', _MRef, process, Pid, {shutdown, _}} ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
                                   TRef, EStack);
 
-        {'DOWN', _MRef, process, Pid, normal} when RType =/= permanent ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+        {'DOWN', _MRef, process, Pid, normal} when not (?is_permanent(Child)) ->
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
                                   TRef, EStack);
 
         {'DOWN', _MRef, process, Pid, Reason} ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
-                                  TRef, ?DICTS:append(Reason, Pid, EStack));
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
+                                  TRef, dict:append(Reason, Pid, EStack));
 
         {timeout, TRef, kill} ->
-            ?SETS:fold(fun(P, _) -> exit(P, kill) end, ok, Pids),
+            sets:fold(fun(P, _) -> exit(P, kill) end, ok, Pids),
             wait_dynamic_children(Child, Pids, Sz, undefined, EStack)
     end.
 
 %%-----------------------------------------------------------------
-%% Child/State manipulating functions.
+%% Access #state.children
 %%-----------------------------------------------------------------
 
 %% Note we do not want to save the parameter list for temporary processes as
@@ -1113,114 +997,184 @@ wait_dynamic_children(#child{restart_type=RType} = Child, Pids, Sz,
 %% Especially for dynamic children to simple_one_for_one supervisors
 %% it could become very costly as it is not uncommon to spawn
 %% very many such processes.
-save_child(#child{restart_type = temporary,
-		  mfargs = {M, F, _}} = Child, #state{children = Children} = State) ->
-    State#state{children = [Child#child{mfargs = {M, F, undefined}} |Children]};
-save_child(Child, #state{children = Children} = State) ->
-    State#state{children = [Child |Children]}.
-
-save_dynamic_child(temporary, Pid, _, #state{dynamics = Dynamics} = State) ->
-    DynamicsDb = dynamics_db(temporary, Dynamics),
-    State#state{dynamics = {set, ?SETS:add_element(Pid, DynamicsDb)}};
-save_dynamic_child(RestartType, Pid, Args, #state{dynamics = Dynamics} = State) ->
-    DynamicsDb = dynamics_db(RestartType, Dynamics),
-    State#state{dynamics = {dict, ?DICTS:store(Pid, Args, DynamicsDb)}}.
-
-dynamics_db(temporary, undefined) ->
-    ?SETS:new();
-dynamics_db(_, undefined) ->
-    ?DICTS:new();
-dynamics_db(_, {_Tag, DynamicsDb}) ->
-    DynamicsDb.
-
-dynamic_child_args(_Pid, temporary, _DynamicsDb) ->
-    {ok, undefined};
-dynamic_child_args(Pid, _RT, {dict, DynamicsDb}) ->
-    ?DICTS:find(Pid, DynamicsDb);
-dynamic_child_args(_Pid, _RT, undefined) ->
-    error.
-
-state_del_child(#child{pid = Pid, restart_type = temporary}, State) when ?is_simple(State) ->
-    NDynamics = ?SETS:del_element(Pid, dynamics_db(temporary, State#state.dynamics)),
-    State#state{dynamics = {set, NDynamics}};
-state_del_child(#child{pid = Pid, restart_type = RType}, State) when ?is_simple(State) ->
-    NDynamics = ?DICTS:erase(Pid, dynamics_db(RType, State#state.dynamics)),
-    State#state{dynamics = {dict, NDynamics}};
-state_del_child(Child, State) ->
-    NChildren = del_child(Child#child.name, State#state.children),
-    State#state{children = NChildren}.
-
-del_child(Name, [Ch|Chs]) when Ch#child.name =:= Name, Ch#child.restart_type =:= temporary ->
-    Chs;
-del_child(Name, [Ch|Chs]) when Ch#child.name =:= Name ->
-    [Ch#child{pid = undefined} | Chs];
-del_child(Pid, [Ch|Chs]) when Ch#child.pid =:= Pid, Ch#child.restart_type =:= temporary ->
-    Chs;
-del_child(Pid, [Ch|Chs]) when Ch#child.pid =:= Pid ->
-    [Ch#child{pid = undefined} | Chs];
-del_child(Name, [Ch|Chs]) ->
-    [Ch|del_child(Name, Chs)];
-del_child(_, []) ->
-    [].
+-spec save_child(child_rec(), state()) -> state().
+save_child(#child{mfargs = {M, F, _}} = Child, State) when ?is_temporary(Child) ->
+    do_save_child(Child#child{mfargs = {M, F, undefined}}, State);
+save_child(Child, State) ->
+    do_save_child(Child, State).
+
+-spec do_save_child(child_rec(), state()) -> state().
+do_save_child(#child{id = Id} = Child, #state{children = {Ids,Db}} = State) ->
+    State#state{children = {[Id|Ids],Db#{Id => Child}}}.
+
+-spec del_child(child_rec(), state()) -> state();
+               (child_id(), children()) -> children().
+del_child(#child{pid = Pid}, State) when ?is_simple(State) ->
+    dyn_erase(Pid,State);
+del_child(Child, State) when is_record(Child,child), is_record(State,state) ->
+    NChildren = del_child(Child#child.id, State#state.children),
+    State#state{children = NChildren};
+del_child(Id, {Ids,Db}) ->
+    case maps:get(Id, Db) of
+        Child when Child#child.restart_type =:= temporary ->
+            {lists:delete(Id, Ids), maps:remove(Id, Db)};
+        Child ->
+            {Ids, Db#{Id=>Child#child{pid=undefined}}}
+    end.
 
-%% Chs = [S4, S3, Ch, S1, S0]
-%% Ret: {[S4, S3, Ch], [S1, S0]}
-split_child(Name, Chs) ->
-    split_child(Name, Chs, []).
-
-split_child(Name, [Ch|Chs], After) when Ch#child.name =:= Name ->
-    {lists:reverse([Ch#child{pid = undefined} | After]), Chs};
-split_child(Pid, [Ch|Chs], After) when Ch#child.pid =:= Pid ->
-    {lists:reverse([Ch#child{pid = undefined} | After]), Chs};
-split_child(Name, [Ch|Chs], After) ->
-    split_child(Name, Chs, [Ch | After]);
-split_child(_, [], After) ->
-    {lists:reverse(After), []}.
-
-get_child(Name, State) ->
-    get_child(Name, State, false).
-
-get_child(Pid, State, AllowPid) when AllowPid, is_pid(Pid) ->
-    get_dynamic_child(Pid, State);
-get_child(Name, State, _) ->
-    lists:keysearch(Name, #child.name, State#state.children).
-
-get_dynamic_child(Pid, #state{children=[Child], dynamics=Dynamics}) ->
-    case is_dynamic_pid(Pid, Dynamics) of
-	true ->
-	    {value, Child#child{pid=Pid}};
-	false ->
-	    RPid = restarting(Pid),
-	    case is_dynamic_pid(RPid, Dynamics) of
-		true ->
-		    {value, Child#child{pid=RPid}};
-		false ->
+%% In: {[S4, S3, Ch, S1, S0],Db}
+%% Ret: {{[S4, S3, Ch],Db1}, {[S1, S0],Db2}}
+%% Db1 and Db2 contain the keys in the lists they are associated with.
+-spec split_child(child_id(), children()) -> {children(), children()}.
+split_child(Id, {Ids,Db}) ->
+    {IdsAfter,IdsBefore} = split_ids(Id, Ids, []),
+    DbBefore = maps:with(IdsBefore,Db),
+    #{Id:=Ch} = DbAfter = maps:with(IdsAfter,Db),
+    {{IdsAfter,DbAfter#{Id=>Ch#child{pid=undefined}}},{IdsBefore,DbBefore}}.
+
+split_ids(Id, [Id|Ids], After) ->
+    {lists:reverse([Id|After]), Ids};
+split_ids(Id, [Other|Ids], After) ->
+    split_ids(Id, Ids, [Other | After]).
+
+%% Find the child record for a given Pid (dynamic child) or Id
+%% (non-dynamic child). This is called from the API functions.
+-spec find_child(pid() | child_id(), state()) -> {ok,child_rec()} | error.
+find_child(Pid, State) when is_pid(Pid), ?is_simple(State) ->
+    case find_dynamic_child(Pid, State) of
+        error ->
+            case find_dynamic_child(restarting(Pid), State) of
+                error ->
 		    case erlang:is_process_alive(Pid) of
-			true -> false;
-			false -> {value, Child}
-		    end
-	    end
+			true -> error;
+			false -> {ok, get_dynamic_child(State)}
+		    end;
+                Other ->
+                    Other
+            end;
+        Other ->
+            Other
+    end;
+find_child(Id, #state{children = {_Ids,Db}}) ->
+    maps:find(Id, Db).
+
+%% Get the child record - either by child id or by pid.  If
+%% simple_one_for_one, then insert the pid and args into the returned
+%% child record. This is called when trying to restart the child.
+-spec find_child_and_args(IdOrPid, state()) -> {ok, child_rec()} | error when
+      IdOrPid :: pid() | {restarting,pid()} | child_id().
+find_child_and_args(Pid, State) when ?is_simple(State) ->
+    case find_dynamic_child(Pid, State) of
+        {ok,#child{mfargs={M,F,_}} = Child} ->
+            {ok, Args} = dyn_args(Pid, State),
+            {ok, Child#child{mfargs = {M, F, Args}}};
+        error ->
+            error
+    end;
+find_child_and_args(Pid, State) when is_pid(Pid) ->
+    find_child_by_pid(Pid, State);
+find_child_and_args(Id, #state{children={_Ids,Db}})  ->
+    maps:find(Id, Db).
+
+%% Given the pid, find the child record for a dynamic child, and
+%% include the pid in the returned record.
+-spec find_dynamic_child(IdOrPid, state()) -> {ok, child_rec()} | error when
+      IdOrPid :: pid() | {restarting,pid()} | child_id().
+find_dynamic_child(Pid, State) ->
+    case dyn_exists(Pid, State) of
+        true ->
+            Child = get_dynamic_child(State),
+            {ok, Child#child{pid=Pid}};
+        false ->
+            error
     end.
 
-is_dynamic_pid(Pid, {dict, Dynamics}) ->
-    ?DICTS:is_key(Pid, Dynamics);
-is_dynamic_pid(Pid, {set, Dynamics}) ->
-    ?SETS:is_element(Pid, Dynamics);
-is_dynamic_pid(_Pid, undefined) ->
-    false.
-
-replace_child(Child, State) ->
-    Chs = do_replace_child(Child, State#state.children),
-    State#state{children = Chs}.
-
-do_replace_child(Child, [Ch|Chs]) when Ch#child.name =:= Child#child.name ->
-    [Child | Chs];
-do_replace_child(Child, [Ch|Chs]) ->
-    [Ch|do_replace_child(Child, Chs)].
+%% Given the pid, find the child record for a non-dyanamic child.
+-spec find_child_by_pid(IdOrPid, state()) -> {ok,child_rec()} | error when
+      IdOrPid :: pid() | {restarting,pid()}.
+find_child_by_pid(Pid,#state{children={_Ids,Db}}) ->
+    Fun = fun(_Id,#child{pid=P}=Ch,_) when P =:= Pid ->
+                  throw(Ch);
+             (_,_,error) ->
+                  error
+          end,
+    try maps:fold(Fun,error,Db)
+    catch throw:Child -> {ok,Child}
+    end.
 
-remove_child(Child, State) ->
-    Chs = lists:keydelete(Child#child.name, #child.name, State#state.children),
-    State#state{children = Chs}.
+%% Get the child record from a simple_one_for_one supervisor - no pid
+%% It is assumed that the child can always be found
+-spec get_dynamic_child(state()) -> child_rec().
+get_dynamic_child(#state{children={[Id],Db}}) ->
+    #{Id := Child} = Db,
+    Child.
+
+%% Update pid in the given child record and store it in the process state
+-spec set_pid(term(), child_id(), state()) -> state();
+             (term(), child_id(), children()) -> children().
+set_pid(Pid, Id, #state{children=Children} = State) ->
+    State#state{children = set_pid(Pid, Id, Children)};
+set_pid(Pid, Id, {Ids, Db}) ->
+    NewDb = maps:update_with(Id, fun(Child) -> Child#child{pid=Pid} end, Db),
+    {Ids,NewDb}.
+
+%% Remove the Id and the child record from the process state
+-spec remove_child(child_id(), state()) -> state().
+remove_child(Id, #state{children={Ids,Db}} = State) ->
+    NewIds = lists:delete(Id,Ids),
+    NewDb = maps:remove(Id,Db),
+    State#state{children = {NewIds,NewDb}}.
+
+%% In the order of Ids, traverse the children and update each child
+%% according to the return value of the Fun.
+%% On error, abort and return the merge of the old and the updated map.
+%% NOTE: The returned list of Ids is reverted compared to the input.
+-spec children_map(Fun, children()) -> {ok, children()} |
+                                       {error,children(),Reason} when
+      Fun :: fun((child_id(),child_rec()) -> {update,child_rec()} |
+                                             remove |
+                                             {abort, Reason}),
+      Reason :: term().
+children_map(Fun,{Ids,Db}) ->
+    children_map(Fun, Ids, Db, []).
+
+children_map(Fun,[Id|Ids],Db,Acc) ->
+    case Fun(Id,maps:get(Id,Db)) of
+        {update,Child} ->
+            children_map(Fun,Ids,Db#{Id => Child},[Id|Acc]);
+        remove ->
+            children_map(Fun,Ids,maps:remove(Id,Db),Acc);
+        {abort,Reason} ->
+            {error,{lists:reverse(Ids)++[Id|Acc],Db},Reason}
+    end;
+children_map(_Fun,[],Db,Acc) ->
+    {ok,{Acc,Db}}.
+
+%% In the order of Ids, map over all children and return the list
+-spec children_to_list(Fun, children()) -> List when
+      Fun :: fun((child_id(), child_rec()) -> Elem),
+      List :: list(Elem),
+      Elem :: term().
+children_to_list(Fun,{Ids,Db}) ->
+    children_to_list(Fun, Ids, Db, []).
+children_to_list(Fun,[Id|Ids],Db,Acc) ->
+    children_to_list(Fun,Ids,Db,[Fun(Id,maps:get(Id,Db))|Acc]);
+children_to_list(_Fun,[],_Db,Acc) ->
+    lists:reverse(Acc).
+
+%% The order is not important - so ignore Ids
+-spec children_fold(Fun, Acc0, children()) -> Acc1 when
+      Fun :: fun((child_id(), child_rec(), AccIn) -> AccOut),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term().
+children_fold(Fun,Init,{_Ids,Db}) ->
+    maps:fold(Fun, Init, Db).
+
+-spec append(children(), children()) -> children().
+append({Ids1,Db1},{Ids2,Db2}) ->
+    {Ids1++Ids2,maps:merge(Db1,Db2)}.
 
 %%-----------------------------------------------------------------
 %% Func: init_state/4
@@ -1290,27 +1244,27 @@ supname(N, _)      -> N.
 %%% Returns: {ok, [child_rec()]} | Error
 %%% ------------------------------------------------------
 
-check_startspec(Children) -> check_startspec(Children, []).
+check_startspec(Children) -> check_startspec(Children, [], #{}).
 
-check_startspec([ChildSpec|T], Res) ->
+check_startspec([ChildSpec|T], Ids, Db) ->
     case check_childspec(ChildSpec) of
-	{ok, Child} ->
-	    case lists:keymember(Child#child.name, #child.name, Res) of
+	{ok, #child{id=Id}=Child} ->
+	    case maps:is_key(Id, Db) of
 		%% The error message duplicate_child_name is kept for
 		%% backwards compatibility, although
 		%% duplicate_child_id would be more correct.
-		true -> {duplicate_child_name, Child#child.name};
-		false -> check_startspec(T, [Child | Res])
+		true -> {duplicate_child_name, Id};
+		false -> check_startspec(T, [Id | Ids], Db#{Id=>Child})
 	    end;
 	Error -> Error
     end;
-check_startspec([], Res) ->
-    {ok, lists:reverse(Res)}.
+check_startspec([], Ids, Db) ->
+    {ok, {lists:reverse(Ids),Db}}.
 
 check_childspec(ChildSpec) when is_map(ChildSpec) ->
     catch do_check_childspec(maps:merge(?default_child_spec,ChildSpec));
-check_childspec({Name, Func, RestartType, Shutdown, ChildType, Mods}) ->
-    check_childspec(#{id => Name,
+check_childspec({Id, Func, RestartType, Shutdown, ChildType, Mods}) ->
+    check_childspec(#{id => Id,
 		      start => Func,
 		      restart => RestartType,
 		      shutdown => Shutdown,
@@ -1320,15 +1274,15 @@ check_childspec(X) -> {invalid_child_spec, X}.
 
 do_check_childspec(#{restart := RestartType,
 		     type := ChildType} = ChildSpec)->
-    Name = case ChildSpec of
-	       #{id := N} -> N;
+    Id = case ChildSpec of
+	       #{id := I} -> I;
 	       _ -> throw(missing_id)
 	   end,
     Func = case ChildSpec of
 	       #{start := F} -> F;
 	       _ -> throw(missing_start)
 	   end,
-    validName(Name),
+    validId(Id),
     validFunc(Func),
     validRestartType(RestartType),
     validChildType(ChildType),
@@ -1343,14 +1297,14 @@ do_check_childspec(#{restart := RestartType,
 	       _ -> {M,_,_} = Func, [M]
 	   end,
     validMods(Mods),
-    {ok, #child{name = Name, mfargs = Func, restart_type = RestartType,
+    {ok, #child{id = Id, mfargs = Func, restart_type = RestartType,
 		shutdown = Shutdown, child_type = ChildType, modules = Mods}}.
 
 validChildType(supervisor) -> true;
 validChildType(worker) -> true;
 validChildType(What) -> throw({invalid_child_type, What}).
 
-validName(_Name) -> true.
+validId(_Id) -> true.
 
 validFunc({M, F, A}) when is_atom(M), 
                           is_atom(F), 
@@ -1379,13 +1333,13 @@ validMods(Mods) when is_list(Mods) ->
 		  Mods);
 validMods(Mods) -> throw({invalid_modules, Mods}).
 
-child_to_spec(#child{name = Name,
+child_to_spec(#child{id = Id,
 		    mfargs = Func,
 		    restart_type = RestartType,
 		    shutdown = Shutdown,
 		    child_type = ChildType,
 		    modules = Mods}) ->
-    #{id => Name,
+    #{id => Id,
       start => Func,
       restart => RestartType,
       shutdown => Shutdown,
@@ -1439,17 +1393,16 @@ report_error(Error, Reason, Child, SupName) ->
 		{offender, extract_child(Child)}],
     error_logger:error_report(supervisor_report, ErrorMsg).
 
-
 extract_child(Child) when is_list(Child#child.pid) ->
     [{nb_children, length(Child#child.pid)},
-     {id, Child#child.name},
+     {id, Child#child.id},
      {mfargs, Child#child.mfargs},
      {restart_type, Child#child.restart_type},
      {shutdown, Child#child.shutdown},
      {child_type, Child#child.child_type}];
 extract_child(Child) ->
     [{pid, Child#child.pid},
-     {id, Child#child.name},
+     {id, Child#child.id},
      {mfargs, Child#child.mfargs},
      {restart_type, Child#child.restart_type},
      {shutdown, Child#child.shutdown},
@@ -1465,3 +1418,46 @@ format_status(terminate, [_PDict, State]) ->
 format_status(_, [_PDict, State]) ->
     [{data, [{"State", State}]},
      {supervisor, [{"Callback", State#state.module}]}].
+
+%%%-----------------------------------------------------------------
+%%% Dynamics database access
+dyn_size(#state{dynamics = {Mod,Db}}) ->
+    Mod:size(Db).
+
+dyn_erase(Pid,#state{dynamics={sets,Db}}=State) ->
+    State#state{dynamics={sets,sets:del_element(Pid,Db)}};
+dyn_erase(Pid,#state{dynamics={maps,Db}}=State) ->
+    State#state{dynamics={maps,maps:remove(Pid,Db)}}.
+
+dyn_store(Pid,_,#state{dynamics={sets,Db}}=State) ->
+    State#state{dynamics={sets,sets:add_element(Pid,Db)}};
+dyn_store(Pid,Args,#state{dynamics={maps,Db}}=State) ->
+    State#state{dynamics={maps,Db#{Pid => Args}}}.
+
+dyn_fold(Fun,Init,#state{dynamics={sets,Db}}) ->
+    sets:fold(Fun,Init,Db);
+dyn_fold(Fun,Init,#state{dynamics={maps,Db}}) ->
+    maps:fold(fun(Pid,_,Acc) -> Fun(Pid,Acc) end, Init, Db).
+
+dyn_map(Fun, #state{dynamics={sets,Db}}) ->
+    lists:map(Fun, sets:to_list(Db));
+dyn_map(Fun, #state{dynamics={maps,Db}}) ->
+    lists:map(Fun, maps:keys(Db)).
+
+dyn_exists(Pid, #state{dynamics={sets, Db}}) ->
+    sets:is_element(Pid, Db);
+dyn_exists(Pid, #state{dynamics={maps, Db}}) ->
+    maps:is_key(Pid, Db).
+
+dyn_args(_Pid, #state{dynamics={sets, _Db}}) ->
+    {ok,undefined};
+dyn_args(Pid, #state{dynamics={maps, Db}}) ->
+    maps:find(Pid, Db).
+
+dyn_init(State) ->
+    dyn_init(get_dynamic_child(State),State).
+
+dyn_init(Child,State) when ?is_temporary(Child) ->
+    State#state{dynamics={sets,sets:new()}};
+dyn_init(_Child,State) ->
+    State#state{dynamics={maps,maps:new()}}.
diff --git a/lib/stdlib/src/sys.erl b/lib/stdlib/src/sys.erl
index 1f966411c5..0c578acf21 100644
--- a/lib/stdlib/src/sys.erl
+++ b/lib/stdlib/src/sys.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -38,7 +38,9 @@
 
 -export_type([dbg_opt/0]).
 
--type name()         :: pid() | atom() | {'global', atom()}.
+-type name()         :: pid() | atom()
+                      | {'global', term()}
+                      | {'via', module(), term()}.
 -type system_event() :: {'in', Msg :: _}
                       | {'in', Msg :: _, From :: _}
                       | {'out', Msg :: _, To :: _}
diff --git a/lib/stdlib/src/uri_string.erl b/lib/stdlib/src/uri_string.erl
new file mode 100644
index 0000000000..28d36ea229
--- /dev/null
+++ b/lib/stdlib/src/uri_string.erl
@@ -0,0 +1,2096 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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.
+%% 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%
+%%
+%%
+%% [RFC 3986, Chapter 2.2. Reserved Characters]
+%%
+%%   reserved    = gen-delims / sub-delims
+%%
+%%   gen-delims  = ":" / "/" / "?" / "#" / "[" / "]" / "@"
+%%
+%%   sub-delims  = "!" / "$" / "&" / "'" / "(" / ")"
+%%               / "*" / "+" / "," / ";" / "="
+%%
+%%
+%% [RFC 3986, Chapter 2.3. Unreserved Characters]
+%%
+%%   unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
+%%
+%%
+%% [RFC 3986, Chapter 3. Syntax Components]
+%%
+%% The generic URI syntax consists of a hierarchical sequence of
+%% components referred to as the scheme, authority, path, query, and
+%% fragment.
+%%
+%%    URI         = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+%%
+%%    hier-part   = "//" authority path-abempty
+%%                   / path-absolute
+%%                   / path-rootless
+%%                   / path-empty
+%%
+%%    The scheme and path components are required, though the path may be
+%%    empty (no characters).  When authority is present, the path must
+%%    either be empty or begin with a slash ("/") character.  When
+%%    authority is not present, the path cannot begin with two slash
+%%    characters ("//").  These restrictions result in five different ABNF
+%%    rules for a path (Section 3.3), only one of which will match any
+%%    given URI reference.
+%%
+%%    The following are two example URIs and their component parts:
+%%
+%%          foo://example.com:8042/over/there?name=ferret#nose
+%%          \_/   \______________/\_________/ \_________/ \__/
+%%           |           |            |            |        |
+%%        scheme     authority       path        query   fragment
+%%           |   _____________________|__
+%%          / \ /                        \
+%%          urn:example:animal:ferret:nose
+%%
+%%
+%% [RFC 3986, Chapter 3.1. Scheme]
+%%
+%% Each URI begins with a scheme name that refers to a specification for
+%% assigning identifiers within that scheme.
+%%
+%%    scheme      = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+%%
+%%
+%% [RFC 3986, Chapter 3.2. Authority]
+%%
+%% Many URI schemes include a hierarchical element for a naming
+%% authority so that governance of the name space defined by the
+%% remainder of the URI is delegated to that authority (which may, in
+%% turn, delegate it further).
+%%
+%%    authority   = [ userinfo "@" ] host [ ":" port ]
+%%
+%%
+%% [RFC 3986, Chapter 3.2.1. User Information]
+%%
+%% The userinfo subcomponent may consist of a user name and, optionally,
+%% scheme-specific information about how to gain authorization to access
+%% the resource. The user information, if present, is followed by a
+%% commercial at-sign ("@") that delimits it from the host.
+%%
+%%    userinfo    = *( unreserved / pct-encoded / sub-delims / ":" )
+%%
+%%
+%% [RFC 3986, Chapter 3.2.2. Host]
+%%
+%% The host subcomponent of authority is identified by an IP literal
+%% encapsulated within square brackets, an IPv4 address in dotted-
+%% decimal form, or a registered name.
+%%
+%%    host        = IP-literal / IPv4address / reg-name
+%%
+%%    IP-literal = "[" ( IPv6address / IPvFuture  ) "]"
+%%
+%%    IPvFuture  = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
+%%
+%%    IPv6address =                            6( h16 ":" ) ls32
+%%                /                       "::" 5( h16 ":" ) ls32
+%%                / [               h16 ] "::" 4( h16 ":" ) ls32
+%%                / [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32
+%%                / [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32
+%%                / [ *3( h16 ":" ) h16 ] "::"    h16 ":"   ls32
+%%                / [ *4( h16 ":" ) h16 ] "::"              ls32
+%%                / [ *5( h16 ":" ) h16 ] "::"              h16
+%%                / [ *6( h16 ":" ) h16 ] "::"
+%%
+%%    ls32        = ( h16 ":" h16 ) / IPv4address
+%%                ; least-significant 32 bits of address
+%%
+%%    h16         = 1*4HEXDIG
+%%                ; 16 bits of address represented in hexadecimal
+%%
+%%    IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet
+%%
+%%    dec-octet   = DIGIT                 ; 0-9
+%%                / %x31-39 DIGIT         ; 10-99
+%%                / "1" 2DIGIT            ; 100-199
+%%                / "2" %x30-34 DIGIT     ; 200-249
+%%                / "25" %x30-35          ; 250-255
+%%
+%%    reg-name    = *( unreserved / pct-encoded / sub-delims )
+%%
+%%
+%% [RFC 3986, Chapter 3.2.2. Port]
+%%
+%% The port subcomponent of authority is designated by an optional port
+%% number in decimal following the host and delimited from it by a
+%% single colon (":") character.
+%%
+%%    port        = *DIGIT
+%%
+%%
+%% [RFC 3986, Chapter 3.3. Path]
+%%
+%% The path component contains data, usually organized in hierarchical
+%% form, that, along with data in the non-hierarchical query component
+%% (Section 3.4), serves to identify a resource within the scope of the
+%% URI's scheme and naming authority (if any).  The path is terminated
+%% by the first question mark ("?") or number sign ("#") character, or
+%% by the end of the URI.
+%%
+%%    path          = path-abempty    ; begins with "/" or is empty
+%%                  / path-absolute   ; begins with "/" but not "//"
+%%                  / path-noscheme   ; begins with a non-colon segment
+%%                  / path-rootless   ; begins with a segment
+%%                  / path-empty      ; zero characters
+%%
+%%    path-abempty  = *( "/" segment )
+%%    path-absolute = "/" [ segment-nz *( "/" segment ) ]
+%%    path-noscheme = segment-nz-nc *( "/" segment )
+%%    path-rootless = segment-nz *( "/" segment )
+%%    path-empty    = 0<pchar>
+%%    segment       = *pchar
+%%    segment-nz    = 1*pchar
+%%    segment-nz-nc = 1*( unreserved / pct-encoded / sub-delims / "@" )
+%%                  ; non-zero-length segment without any colon ":"
+%%
+%%    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+%%
+%%
+%% [RFC 3986, Chapter 3.4. Query]
+%%
+%% The query component contains non-hierarchical data that, along with
+%% data in the path component (Section 3.3), serves to identify a
+%% resource within the scope of the URI's scheme and naming authority
+%% (if any).  The query component is indicated by the first question
+%% mark ("?") character and terminated by a number sign ("#") character
+%% or by the end of the URI.
+%%
+%%    query       = *( pchar / "/" / "?" )
+%%
+%%
+%% [RFC 3986, Chapter 3.5. Fragment]
+%%
+%% The fragment identifier component of a URI allows indirect
+%% identification of a secondary resource by reference to a primary
+%% resource and additional identifying information.
+%%
+%%    fragment    = *( pchar / "/" / "?" )
+%%
+%%
+%% [RFC 3986, Chapter 4.1. URI Reference]
+%%
+%% URI-reference is used to denote the most common usage of a resource
+%% identifier.
+%%
+%%    URI-reference = URI / relative-ref
+%%
+%%
+%% [RFC 3986, Chapter 4.2. Relative Reference]
+%%
+%% A relative reference takes advantage of the hierarchical syntax
+%% (Section 1.2.3) to express a URI reference relative to the name space
+%% of another hierarchical URI.
+%%
+%%    relative-ref  = relative-part [ "?" query ] [ "#" fragment ]
+%%
+%%    relative-part = "//" authority path-abempty
+%%                  / path-absolute
+%%                  / path-noscheme
+%%                  / path-empty
+%%
+%%
+%% [RFC 3986, Chapter 4.3. Absolute URI]
+%%
+%% Some protocol elements allow only the absolute form of a URI without
+%% a fragment identifier.  For example, defining a base URI for later
+%% use by relative references calls for an absolute-URI syntax rule that
+%% does not allow a fragment.
+%%
+%%    absolute-URI  = scheme ":" hier-part [ "?" query ]
+%%
+-module(uri_string).
+
+%%-------------------------------------------------------------------------
+%% External API
+%%-------------------------------------------------------------------------
+-export([compose_query/1, compose_query/2,
+         dissect_query/1, normalize/1, normalize/2, parse/1,
+         recompose/1, transcode/2]).
+-export_type([error/0, uri_map/0, uri_string/0]).
+
+
+%%-------------------------------------------------------------------------
+%% Internal API
+%%-------------------------------------------------------------------------
+-export([is_host/1, is_path/1]).  % suppress warnings
+
+
+%%-------------------------------------------------------------------------
+%% Macros
+%%-------------------------------------------------------------------------
+-define(CHAR(Char), <<Char/utf8>>).
+-define(STRING_EMPTY, <<>>).
+-define(STRING(MatchStr), <<MatchStr/binary>>).
+-define(STRING_REST(MatchStr, Rest), <<MatchStr/utf8, Rest/binary>>).
+
+-define(DEC2HEX(X),
+        if ((X) >= 0) andalso ((X) =< 9) -> (X) + $0;
+           ((X) >= 10) andalso ((X) =< 15) -> (X) + $A - 10
+        end).
+
+-define(HEX2DEC(X),
+        if ((X) >= $0) andalso ((X) =< $9) -> (X) - $0;
+           ((X) >= $A) andalso ((X) =< $F) -> (X) - $A + 10;
+           ((X) >= $a) andalso ((X) =< $f) -> (X) - $a + 10
+        end).
+
+
+%%%=========================================================================
+%%%  API
+%%%=========================================================================
+
+%%-------------------------------------------------------------------------
+%% URI compliant with RFC 3986
+%% ASCII %x21 - %x7A ("!" - "z") except
+%%   %x34    "    double quote
+%%   %x60    <    less than
+%%   %x62    >    greater than
+%%   %x92    \    backslash
+%%   %x94    ^    caret / circumflex
+%%   %x96    `    grave / accent
+%%-------------------------------------------------------------------------
+-type uri_string() :: iodata().
+-type error() :: {error, atom(), term()}.
+
+
+%%-------------------------------------------------------------------------
+%% RFC 3986, Chapter 3. Syntax Components
+%%-------------------------------------------------------------------------
+-type uri_map() ::
+  #{fragment => unicode:chardata(),
+    host => unicode:chardata(),
+    path => unicode:chardata(),
+    port => non_neg_integer() | undefined,
+    query => unicode:chardata(),
+    scheme => unicode:chardata(),
+    userinfo => unicode:chardata()} | #{}.
+
+
+%%-------------------------------------------------------------------------
+%% Normalize URIs
+%%-------------------------------------------------------------------------
+-spec normalize(URI) -> NormalizedURI when
+      URI :: uri_string() | uri_map(),
+      NormalizedURI :: uri_string()
+                     | error().
+normalize(URIMap) ->
+    normalize(URIMap, []).
+
+
+-spec normalize(URI, Options) -> NormalizedURI when
+      URI :: uri_string() | uri_map(),
+      Options :: [return_map],
+      NormalizedURI :: uri_string() | uri_map().
+normalize(URIMap, []) when is_map(URIMap) ->
+    recompose(normalize_map(URIMap));
+normalize(URIMap, [return_map]) when is_map(URIMap) ->
+    normalize_map(URIMap);
+normalize(URIString, []) ->
+    case parse(URIString) of
+        Value when is_map(Value) ->
+            recompose(normalize_map(Value));
+        Error ->
+            Error
+    end;
+normalize(URIString, [return_map]) ->
+    case parse(URIString) of
+        Value when is_map(Value) ->
+            normalize_map(Value);
+        Error ->
+            Error
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Parse URIs
+%%-------------------------------------------------------------------------
+-spec parse(URIString) -> URIMap when
+      URIString :: uri_string(),
+      URIMap :: uri_map()
+              | error().
+parse(URIString) when is_binary(URIString) ->
+    try parse_uri_reference(URIString, #{})
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end;
+parse(URIString) when is_list(URIString) ->
+    try
+        Binary = unicode:characters_to_binary(URIString),
+        Map = parse_uri_reference(Binary, #{}),
+        convert_mapfields_to_list(Map)
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Recompose URIs
+%%-------------------------------------------------------------------------
+-spec recompose(URIMap) -> URIString when
+      URIMap :: uri_map(),
+      URIString :: uri_string()
+                 | error().
+recompose(Map) ->
+    case is_valid_map(Map) of
+        false ->
+            {error, invalid_map, Map};
+        true ->
+            try
+                T0 = update_scheme(Map, empty),
+                T1 = update_userinfo(Map, T0),
+                T2 = update_host(Map, T1),
+                T3 = update_port(Map, T2),
+                T4 = update_path(Map, T3),
+                T5 = update_query(Map, T4),
+                update_fragment(Map, T5)
+            catch
+                throw:{error, Atom, RestData} -> {error, Atom, RestData}
+            end
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Transcode URIs
+%%-------------------------------------------------------------------------
+-spec transcode(URIString, Options) -> Result when
+      URIString :: uri_string(),
+      Options :: [{in_encoding, unicode:encoding()}|{out_encoding, unicode:encoding()}],
+      Result :: uri_string()
+              | error().
+transcode(URIString, Options) when is_binary(URIString) ->
+    try
+        InEnc = proplists:get_value(in_encoding, Options, utf8),
+        OutEnc = proplists:get_value(out_encoding, Options, utf8),
+        List = convert_to_list(URIString, InEnc),
+        Output = transcode(List, [], InEnc, OutEnc),
+        convert_to_binary(Output, utf8, OutEnc)
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end;
+transcode(URIString, Options) when is_list(URIString) ->
+    InEnc = proplists:get_value(in_encoding, Options, utf8),
+    OutEnc = proplists:get_value(out_encoding, Options, utf8),
+    Flattened = flatten_list(URIString, InEnc),
+    try transcode(Flattened, [], InEnc, OutEnc)
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Functions for working with the query part of a URI as a list
+%% of key/value pairs.
+%% HTML 5.2 - 4.10.21.6 URL-encoded form data - WHATWG URL (10 Jan 2018) - UTF-8
+%% HTML 5.0 - 4.10.22.6 URL-encoded form data - non UTF-8
+%%-------------------------------------------------------------------------
+
+%%-------------------------------------------------------------------------
+%% Compose urlencoded query string from a list of unescaped key/value pairs.
+%% (application/x-www-form-urlencoded encoding algorithm)
+%%-------------------------------------------------------------------------
+-spec compose_query(QueryList) -> QueryString when
+      QueryList :: [{unicode:chardata(), unicode:chardata()}],
+      QueryString :: uri_string()
+                   | error().
+compose_query(List) ->
+    compose_query(List, [{encoding, utf8}]).
+
+
+-spec compose_query(QueryList, Options) -> QueryString when
+      QueryList :: [{unicode:chardata(), unicode:chardata()}],
+      Options :: [{encoding, atom()}],
+      QueryString :: uri_string()
+                   | error().
+compose_query([],_Options) ->
+    [];
+compose_query(List, Options) ->
+    try compose_query(List, Options, false, <<>>)
+    catch
+      throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end.
+%%
+compose_query([{Key,Value}|Rest], Options, IsList, Acc) ->
+    Separator = get_separator(Rest),
+    K = form_urlencode(Key, Options),
+    V = form_urlencode(Value, Options),
+    IsListNew = IsList orelse is_list(Key) orelse is_list(Value),
+    compose_query(Rest, Options, IsListNew, <<Acc/binary,K/binary,"=",V/binary,Separator/binary>>);
+compose_query([], _Options, IsList, Acc) ->
+    case IsList of
+        true -> convert_to_list(Acc, utf8);
+        false -> Acc
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Dissect a query string into a list of unescaped key/value pairs.
+%% (application/x-www-form-urlencoded decoding algorithm)
+%%-------------------------------------------------------------------------
+-spec dissect_query(QueryString) -> QueryList when
+      QueryString :: uri_string(),
+      QueryList :: [{unicode:chardata(), unicode:chardata()}]
+                 | error().
+dissect_query(<<>>) ->
+    [];
+dissect_query([]) ->
+    [];
+dissect_query(QueryString) when is_list(QueryString) ->
+    try
+        B = convert_to_binary(QueryString, utf8, utf8),
+        dissect_query_key(B, true, [], <<>>, <<>>)
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end;
+dissect_query(QueryString) ->
+    try dissect_query_key(QueryString, false, [], <<>>, <<>>)
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end.
+
+
+%%%========================================================================
+%%% Internal functions
+%%%========================================================================
+
+%%-------------------------------------------------------------------------
+%% Converts Map fields to lists
+%%-------------------------------------------------------------------------
+convert_mapfields_to_list(Map) ->
+    Fun = fun (_, V) when is_binary(V) -> unicode:characters_to_list(V);
+              (_, V) -> V end,
+    maps:map(Fun, Map).
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 4.1. URI Reference]
+%%
+%% URI-reference is used to denote the most common usage of a resource
+%% identifier.
+%%
+%%    URI-reference = URI / relative-ref
+%%-------------------------------------------------------------------------
+-spec parse_uri_reference(binary(), uri_map()) -> uri_map().
+parse_uri_reference(<<>>, _) -> #{path => <<>>};
+parse_uri_reference(URIString, URI) ->
+    try parse_scheme_start(URIString, URI)
+    catch
+        throw:{_,_,_} ->
+            parse_relative_part(URIString, URI)
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 4.2. Relative Reference]
+%%
+%% A relative reference takes advantage of the hierarchical syntax
+%% (Section 1.2.3) to express a URI reference relative to the name space
+%% of another hierarchical URI.
+%%
+%%    relative-ref  = relative-part [ "?" query ] [ "#" fragment ]
+%%
+%%    relative-part = "//" authority path-abempty
+%%                  / path-absolute
+%%                  / path-noscheme
+%%                  / path-empty
+%%-------------------------------------------------------------------------
+-spec parse_relative_part(binary(), uri_map()) -> uri_map().
+parse_relative_part(?STRING_REST("//", Rest), URI) ->
+    %% Parse userinfo - "//" is NOT part of authority
+    try parse_userinfo(Rest, URI) of
+        {T, URI1} ->
+            Userinfo = calculate_parsed_userinfo(Rest, T),
+            URI2 = maybe_add_path(URI1),
+            URI2#{userinfo => decode_userinfo(Userinfo)}
+    catch
+        throw:{_,_,_} ->
+            {T, URI1} = parse_host(Rest, URI),
+            Host = calculate_parsed_host_port(Rest, T),
+            URI2 = maybe_add_path(URI1),
+            URI2#{host => decode_host(remove_brackets(Host))}
+    end;
+parse_relative_part(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-absolute
+    Path = calculate_parsed_part(Rest, T),
+    URI1#{path => decode_path(?STRING_REST($/, Path))};
+parse_relative_part(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    URI2 = maybe_add_path(URI1),
+    URI2#{query => decode_query(Query)};
+parse_relative_part(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    URI2 = maybe_add_path(URI1),
+    URI2#{fragment => decode_fragment(Fragment)};
+parse_relative_part(?STRING_REST(Char, Rest), URI) ->
+    case is_segment_nz_nc(Char) of
+        true ->
+            {T, URI1} = parse_segment_nz_nc(Rest, URI),  % path-noscheme
+            Path = calculate_parsed_part(Rest, T),
+            URI1#{path => decode_path(?STRING_REST(Char, Path))};
+        false -> throw({error,invalid_uri,[Char]})
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.3. Path]
+%%
+%% The path component contains data, usually organized in hierarchical
+%% form, that, along with data in the non-hierarchical query component
+%% (Section 3.4), serves to identify a resource within the scope of the
+%% URI's scheme and naming authority (if any).  The path is terminated
+%% by the first question mark ("?") or number sign ("#") character, or
+%% by the end of the URI.
+%%
+%%    path          = path-abempty    ; begins with "/" or is empty
+%%                  / path-absolute   ; begins with "/" but not "//"
+%%                  / path-noscheme   ; begins with a non-colon segment
+%%                  / path-rootless   ; begins with a segment
+%%                  / path-empty      ; zero characters
+%%
+%%    path-abempty  = *( "/" segment )
+%%    path-absolute = "/" [ segment-nz *( "/" segment ) ]
+%%    path-noscheme = segment-nz-nc *( "/" segment )
+%%    path-rootless = segment-nz *( "/" segment )
+%%    path-empty    = 0<pchar>
+%%    segment       = *pchar
+%%    segment-nz    = 1*pchar
+%%    segment-nz-nc = 1*( unreserved / pct-encoded / sub-delims / "@" )
+%%                  ; non-zero-length segment without any colon ":"
+%%
+%%    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+%%-------------------------------------------------------------------------
+
+%%-------------------------------------------------------------------------
+%%    path-abempty
+%%-------------------------------------------------------------------------
+-spec parse_segment(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_segment(?STRING_REST($/, Rest), URI) ->
+    parse_segment(Rest, URI);  % segment
+parse_segment(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => decode_query(Query)}};
+parse_segment(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => decode_fragment(Fragment)}};
+parse_segment(?STRING_REST(Char, Rest), URI) ->
+    case is_pchar(Char) of
+        true -> parse_segment(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_segment(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+%%-------------------------------------------------------------------------
+%%    path-noscheme
+%%-------------------------------------------------------------------------
+-spec parse_segment_nz_nc(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_segment_nz_nc(?STRING_REST($/, Rest), URI) ->
+    parse_segment(Rest, URI);  % segment
+parse_segment_nz_nc(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => decode_query(Query)}};
+parse_segment_nz_nc(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => decode_fragment(Fragment)}};
+parse_segment_nz_nc(?STRING_REST(Char, Rest), URI) ->
+    case is_segment_nz_nc(Char) of
+        true -> parse_segment_nz_nc(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_segment_nz_nc(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+%% Check if char is pchar.
+-spec is_pchar(char()) -> boolean().
+is_pchar($%) -> true;  % pct-encoded
+is_pchar($:) -> true;
+is_pchar($@) -> true;
+is_pchar(Char) -> is_unreserved(Char) orelse is_sub_delim(Char).
+
+%% Check if char is segment_nz_nc.
+-spec is_segment_nz_nc(char()) -> boolean().
+is_segment_nz_nc($%) -> true;  % pct-encoded
+is_segment_nz_nc($@) -> true;
+is_segment_nz_nc(Char) -> is_unreserved(Char) orelse is_sub_delim(Char).
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.1. Scheme]
+%%
+%% Each URI begins with a scheme name that refers to a specification for
+%% assigning identifiers within that scheme.
+%%
+%%    scheme      = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+%%-------------------------------------------------------------------------
+-spec parse_scheme_start(binary(), uri_map()) -> uri_map().
+parse_scheme_start(?STRING_REST(Char, Rest), URI) ->
+    case is_alpha(Char) of
+        true  -> {T, URI1} = parse_scheme(Rest, URI),
+                 Scheme = calculate_parsed_scheme(Rest, T),
+                 URI2 = maybe_add_path(URI1),
+		 URI2#{scheme => ?STRING_REST(Char, Scheme)};
+        false -> throw({error,invalid_uri,[Char]})
+    end.
+
+%% Add path component if it missing after parsing the URI.
+%% According to the URI specification there is always a
+%% path component in every URI-reference and it can be
+%% empty.
+maybe_add_path(Map) ->
+    case maps:is_key(path, Map) of
+        false ->
+            Map#{path => <<>>};
+        _Else ->
+            Map
+    end.
+
+
+
+-spec parse_scheme(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_scheme(?STRING_REST($:, Rest), URI) ->
+    {_, URI1} = parse_hier(Rest, URI),
+    {Rest, URI1};
+parse_scheme(?STRING_REST(Char, Rest), URI) ->
+    case is_scheme(Char) of
+        true  -> parse_scheme(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_scheme(?STRING_EMPTY, _URI) ->
+    throw({error,invalid_uri,<<>>}).
+
+
+%% Check if char is allowed in scheme
+-spec is_scheme(char()) -> boolean().
+is_scheme($+) -> true;
+is_scheme($-) -> true;
+is_scheme($.) -> true;
+is_scheme(Char) -> is_alpha(Char) orelse is_digit(Char).
+
+
+%%-------------------------------------------------------------------------
+%%    hier-part   = "//" authority path-abempty
+%%                   / path-absolute
+%%                   / path-rootless
+%%                   / path-empty
+%%-------------------------------------------------------------------------
+-spec parse_hier(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_hier(?STRING_REST("//", Rest), URI) ->
+    % Parse userinfo - "//" is NOT part of authority
+    try parse_userinfo(Rest, URI) of
+        {T, URI1} ->
+            Userinfo = calculate_parsed_userinfo(Rest, T),
+	    {Rest, URI1#{userinfo => decode_userinfo(Userinfo)}}
+    catch
+        throw:{_,_,_} ->
+            {T, URI1} = parse_host(Rest, URI),
+            Host = calculate_parsed_host_port(Rest, T),
+	    {Rest, URI1#{host => decode_host(remove_brackets(Host))}}
+    end;
+parse_hier(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-absolute
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => decode_path(?STRING_REST($/, Path))}};
+parse_hier(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => decode_query(Query)}};
+parse_hier(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => decode_fragment(Fragment)}};
+parse_hier(?STRING_REST(Char, Rest), URI) ->  % path-rootless
+    case is_pchar(Char) of
+        true ->  % segment_nz
+            {T, URI1} = parse_segment(Rest, URI),
+            Path = calculate_parsed_part(Rest, T),
+            {Rest, URI1#{path => decode_path(?STRING_REST(Char, Path))}};
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_hier(?STRING_EMPTY, URI) ->
+    {<<>>, URI}.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.2. Authority]
+%%
+%% Many URI schemes include a hierarchical element for a naming
+%% authority so that governance of the name space defined by the
+%% remainder of the URI is delegated to that authority (which may, in
+%% turn, delegate it further).
+%%
+%% The authority component is preceded by a double slash ("//") and is
+%% terminated by the next slash ("/"), question mark ("?"), or number
+%% sign ("#") character, or by the end of the URI.
+%%
+%%    authority   = [ userinfo "@" ] host [ ":" port ]
+%%
+%%
+%% [RFC 3986, Chapter 3.2.1. User Information]
+%%
+%% The userinfo subcomponent may consist of a user name and, optionally,
+%% scheme-specific information about how to gain authorization to access
+%% the resource. The user information, if present, is followed by a
+%% commercial at-sign ("@") that delimits it from the host.
+%%
+%%    userinfo    = *( unreserved / pct-encoded / sub-delims / ":" )
+%%-------------------------------------------------------------------------
+-spec parse_userinfo(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_userinfo(?CHAR($@), URI) ->
+    {?STRING_EMPTY, URI#{host => <<>>}};
+parse_userinfo(?STRING_REST($@, Rest), URI) ->
+    {T, URI1} = parse_host(Rest, URI),
+    Host = calculate_parsed_host_port(Rest, T),
+    {Rest, URI1#{host => decode_host(remove_brackets(Host))}};
+parse_userinfo(?STRING_REST(Char, Rest), URI) ->
+    case is_userinfo(Char) of
+        true -> parse_userinfo(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_userinfo(?STRING_EMPTY, _URI) ->
+    %% URI cannot end in userinfo state
+    throw({error,invalid_uri,<<>>}).
+
+
+%% Check if char is allowed in userinfo
+-spec is_userinfo(char()) -> boolean().
+is_userinfo($%) -> true;  % pct-encoded
+is_userinfo($:) -> true;
+is_userinfo(Char) -> is_unreserved(Char) orelse is_sub_delim(Char).
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.2.2. Host]
+%%
+%% The host subcomponent of authority is identified by an IP literal
+%% encapsulated within square brackets, an IPv4 address in dotted-
+%% decimal form, or a registered name.
+%%
+%%    host        = IP-literal / IPv4address / reg-name
+%%
+%%    IP-literal = "[" ( IPv6address / IPvFuture  ) "]"
+%%
+%%    IPvFuture  = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
+%%
+%%    IPv6address =                            6( h16 ":" ) ls32
+%%                /                       "::" 5( h16 ":" ) ls32
+%%                / [               h16 ] "::" 4( h16 ":" ) ls32
+%%                / [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32
+%%                / [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32
+%%                / [ *3( h16 ":" ) h16 ] "::"    h16 ":"   ls32
+%%                / [ *4( h16 ":" ) h16 ] "::"              ls32
+%%                / [ *5( h16 ":" ) h16 ] "::"              h16
+%%                / [ *6( h16 ":" ) h16 ] "::"
+%%
+%%    ls32        = ( h16 ":" h16 ) / IPv4address
+%%                ; least-significant 32 bits of address
+%%
+%%    h16         = 1*4HEXDIG
+%%                ; 16 bits of address represented in hexadecimal
+%%
+%%    IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet
+%%
+%%    dec-octet   = DIGIT                 ; 0-9
+%%                / %x31-39 DIGIT         ; 10-99
+%%                / "1" 2DIGIT            ; 100-199
+%%                / "2" %x30-34 DIGIT     ; 200-249
+%%                / "25" %x30-35          ; 250-255
+%%
+%%    reg-name    = *( unreserved / pct-encoded / sub-delims )
+%%-------------------------------------------------------------------------
+-spec parse_host(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_host(?STRING_REST($:, Rest), URI) ->
+    {T, URI1} = parse_port(Rest, URI),
+    H = calculate_parsed_host_port(Rest, T),
+    Port = get_port(H),
+    {Rest, URI1#{port => Port}};
+parse_host(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-abempty
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => decode_path(?STRING_REST($/, Path))}};
+parse_host(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => decode_query(Query)}};
+parse_host(?STRING_REST($[, Rest), URI) ->
+    parse_ipv6_bin(Rest, [], URI);
+parse_host(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => decode_fragment(Fragment)}};
+parse_host(?STRING_REST(Char, Rest), URI) ->
+    case is_digit(Char) of
+        true -> parse_ipv4_bin(Rest, [Char], URI);
+        false -> parse_reg_name(?STRING_REST(Char, Rest), URI)
+    end;
+parse_host(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+-spec parse_reg_name(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_reg_name(?STRING_REST($:, Rest), URI) ->
+    {T, URI1} = parse_port(Rest, URI),
+    H = calculate_parsed_host_port(Rest, T),
+    Port = get_port(H),
+    {Rest, URI1#{port => Port}};
+parse_reg_name(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-abempty
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => decode_path(?STRING_REST($/, Path))}};
+parse_reg_name(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => decode_query(Query)}};
+parse_reg_name(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => decode_fragment(Fragment)}};
+parse_reg_name(?STRING_REST(Char, Rest), URI) ->
+    case is_reg_name(Char) of
+        true -> parse_reg_name(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_reg_name(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+%% Check if char is allowed in reg-name
+-spec is_reg_name(char()) -> boolean().
+is_reg_name($%) -> true;
+is_reg_name(Char) -> is_unreserved(Char) orelse is_sub_delim(Char).
+
+
+-spec parse_ipv4_bin(binary(), list(), uri_map()) -> {binary(), uri_map()}.
+parse_ipv4_bin(?STRING_REST($:, Rest), Acc, URI) ->
+    _ = validate_ipv4_address(lists:reverse(Acc)),
+    {T, URI1} = parse_port(Rest, URI),
+    H = calculate_parsed_host_port(Rest, T),
+    Port = get_port(H),
+    {Rest, URI1#{port => Port}};
+parse_ipv4_bin(?STRING_REST($/, Rest), Acc, URI) ->
+    _ = validate_ipv4_address(lists:reverse(Acc)),
+    {T, URI1} = parse_segment(Rest, URI),  % path-abempty
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => decode_path(?STRING_REST($/, Path))}};
+parse_ipv4_bin(?STRING_REST($?, Rest), Acc, URI) ->
+    _ = validate_ipv4_address(lists:reverse(Acc)),
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => decode_query(Query)}};
+parse_ipv4_bin(?STRING_REST($#, Rest), Acc, URI) ->
+    _ = validate_ipv4_address(lists:reverse(Acc)),
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => decode_fragment(Fragment)}};
+parse_ipv4_bin(?STRING_REST(Char, Rest), Acc, URI) ->
+    case is_ipv4(Char) of
+        true -> parse_ipv4_bin(Rest, [Char|Acc], URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_ipv4_bin(?STRING_EMPTY, Acc, URI) ->
+    _ = validate_ipv4_address(lists:reverse(Acc)),
+    {?STRING_EMPTY, URI}.
+
+
+%% Check if char is allowed in IPv4 addresses
+-spec is_ipv4(char()) -> boolean().
+is_ipv4($.) -> true;
+is_ipv4(Char) -> is_digit(Char).
+
+-spec validate_ipv4_address(list()) -> list().
+validate_ipv4_address(Addr) ->
+    case inet:parse_ipv4strict_address(Addr) of
+        {ok, _} -> Addr;
+        {error, _} -> throw({error,invalid_uri,Addr})
+    end.
+
+
+-spec parse_ipv6_bin(binary(), list(), uri_map()) -> {binary(), uri_map()}.
+parse_ipv6_bin(?STRING_REST($], Rest), Acc, URI) ->
+    _ = validate_ipv6_address(lists:reverse(Acc)),
+    parse_ipv6_bin_end(Rest, URI);
+parse_ipv6_bin(?STRING_REST(Char, Rest), Acc, URI) ->
+    case is_ipv6(Char) of
+        true -> parse_ipv6_bin(Rest, [Char|Acc], URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_ipv6_bin(?STRING_EMPTY, _Acc, _URI) ->
+    throw({error,invalid_uri,<<>>}).
+
+%% Check if char is allowed in IPv6 addresses
+-spec is_ipv6(char()) -> boolean().
+is_ipv6($:) -> true;
+is_ipv6($.) -> true;
+is_ipv6(Char) -> is_hex_digit(Char).
+
+
+-spec parse_ipv6_bin_end(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_ipv6_bin_end(?STRING_REST($:, Rest), URI) ->
+    {T, URI1} = parse_port(Rest, URI),
+    H = calculate_parsed_host_port(Rest, T),
+    Port = get_port(H),
+    {Rest, URI1#{port => Port}};
+parse_ipv6_bin_end(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-abempty
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => decode_path(?STRING_REST($/, Path))}};
+parse_ipv6_bin_end(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => decode_query(Query)}};
+parse_ipv6_bin_end(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => decode_fragment(Fragment)}};
+parse_ipv6_bin_end(?STRING_REST(Char, Rest), URI) ->
+    case is_ipv6(Char) of
+        true -> parse_ipv6_bin_end(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_ipv6_bin_end(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+-spec validate_ipv6_address(list()) -> list().
+validate_ipv6_address(Addr) ->
+    case inet:parse_ipv6strict_address(Addr) of
+        {ok, _} -> Addr;
+        {error, _} -> throw({error,invalid_uri,Addr})
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.2.2. Port]
+%%
+%% The port subcomponent of authority is designated by an optional port
+%% number in decimal following the host and delimited from it by a
+%% single colon (":") character.
+%%
+%%    port        = *DIGIT
+%%-------------------------------------------------------------------------
+-spec parse_port(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_port(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-abempty
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => decode_path(?STRING_REST($/, Path))}};
+parse_port(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => decode_query(Query)}};
+parse_port(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => decode_fragment(Fragment)}};
+parse_port(?STRING_REST(Char, Rest), URI) ->
+    case is_digit(Char) of
+        true -> parse_port(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_port(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.4. Query]
+%%
+%% The query component contains non-hierarchical data that, along with
+%% data in the path component (Section 3.3), serves to identify a
+%% resource within the scope of the URI's scheme and naming authority
+%% (if any).  The query component is indicated by the first question
+%% mark ("?") character and terminated by a number sign ("#") character
+%% or by the end of the URI.
+%%
+%%    query       = *( pchar / "/" / "?" )
+%%-------------------------------------------------------------------------
+-spec parse_query(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_query(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => decode_fragment(Fragment)}};
+parse_query(?STRING_REST(Char, Rest), URI) ->
+    case is_query(Char) of
+        true -> parse_query(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_query(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+%% Check if char is allowed in query
+-spec is_query(char()) -> boolean().
+is_query($/) -> true;
+is_query($?) -> true;
+is_query(Char) -> is_pchar(Char).
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.5. Fragment]
+%%
+%% The fragment identifier component of a URI allows indirect
+%% identification of a secondary resource by reference to a primary
+%% resource and additional identifying information.
+%%
+%%    fragment    = *( pchar / "/" / "?" )
+%%-------------------------------------------------------------------------
+-spec parse_fragment(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_fragment(?STRING_REST(Char, Rest), URI) ->
+    case is_fragment(Char) of
+        true -> parse_fragment(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_fragment(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+%% Check if char is allowed in fragment
+-spec is_fragment(char()) -> boolean().
+is_fragment($/) -> true;
+is_fragment($?) -> true;
+is_fragment(Char) -> is_pchar(Char).
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 2.2. Reserved Characters]
+%%
+%%   reserved    = gen-delims / sub-delims
+%%
+%%   gen-delims  = ":" / "/" / "?" / "#" / "[" / "]" / "@"
+%%
+%%   sub-delims  = "!" / "$" / "&" / "'" / "(" / ")"
+%%               / "*" / "+" / "," / ";" / "="
+%%
+%%-------------------------------------------------------------------------
+
+%% Check if char is sub-delim.
+-spec is_sub_delim(char()) -> boolean().
+is_sub_delim($!) -> true;
+is_sub_delim($$) -> true;
+is_sub_delim($&) -> true;
+is_sub_delim($') -> true;
+is_sub_delim($() -> true;
+is_sub_delim($)) -> true;
+
+is_sub_delim($*) -> true;
+is_sub_delim($+) -> true;
+is_sub_delim($,) -> true;
+is_sub_delim($;) -> true;
+is_sub_delim($=) -> true;
+is_sub_delim(_) -> false.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 2.3. Unreserved Characters]
+%%
+%%   unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
+%%
+%%-------------------------------------------------------------------------
+-spec is_unreserved(char()) -> boolean().
+is_unreserved($-) -> true;
+is_unreserved($.) -> true;
+is_unreserved($_) -> true;
+is_unreserved($~) -> true;
+is_unreserved(Char) -> is_alpha(Char) orelse is_digit(Char).
+
+-spec is_alpha(char()) -> boolean().
+is_alpha(C)
+  when $A =< C, C =< $Z;
+       $a =< C, C =< $z -> true;
+is_alpha(_) -> false.
+
+-spec is_digit(char()) -> boolean().
+is_digit(C)
+  when $0 =< C, C =< $9 -> true;
+is_digit(_) -> false.
+
+-spec is_hex_digit(char()) -> boolean().
+is_hex_digit(C)
+  when $0 =< C, C =< $9;$a =< C, C =< $f;$A =< C, C =< $F -> true;
+is_hex_digit(_) -> false.
+
+
+%% Remove enclosing brackets from binary
+-spec remove_brackets(binary()) -> binary().
+remove_brackets(<<$[/utf8, Rest/binary>>) ->
+    {H,T} = split_binary(Rest, byte_size(Rest) - 1),
+    case T =:= <<$]/utf8>> of
+        true -> H;
+        false -> Rest
+    end;
+remove_brackets(Addr) -> Addr.
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions for calculating the parsed binary.
+%%-------------------------------------------------------------------------
+-spec calculate_parsed_scheme(binary(), binary()) -> binary().
+calculate_parsed_scheme(Input, <<>>) ->
+    strip_last_char(Input, [$:]);
+calculate_parsed_scheme(Input, Unparsed) ->
+    get_parsed_binary(Input, Unparsed).
+
+
+-spec calculate_parsed_part(binary(), binary()) -> binary().
+calculate_parsed_part(Input, <<>>) ->
+    strip_last_char(Input, [$?,$#]);
+calculate_parsed_part(Input, Unparsed) ->
+    get_parsed_binary(Input, Unparsed).
+
+
+-spec calculate_parsed_userinfo(binary(), binary()) -> binary().
+calculate_parsed_userinfo(Input, <<>>) ->
+    strip_last_char(Input, [$?,$#,$@]);
+calculate_parsed_userinfo(Input, Unparsed) ->
+    get_parsed_binary(Input, Unparsed).
+
+
+-spec calculate_parsed_host_port(binary(), binary()) -> binary().
+calculate_parsed_host_port(Input, <<>>) ->
+    strip_last_char(Input, [$:,$?,$#,$/]);
+calculate_parsed_host_port(Input, Unparsed) ->
+    get_parsed_binary(Input, Unparsed).
+
+
+calculate_parsed_query_fragment(Input, <<>>) ->
+    strip_last_char(Input, [$#]);
+calculate_parsed_query_fragment(Input, Unparsed) ->
+    get_parsed_binary(Input, Unparsed).
+
+
+get_port(<<>>) ->
+    undefined;
+get_port(B) ->
+    try binary_to_integer(B)
+    catch
+        error:badarg ->
+            throw({error, invalid_uri, B})
+    end.
+
+
+%% Strip last char if it is in list
+%%
+%% This function is optimized for speed: parse/1 is about 10% faster than
+%% with an alternative implementation based on lists and sets.
+strip_last_char(<<>>, _) -> <<>>;
+strip_last_char(Input, [C0]) ->
+    case binary:last(Input) of
+        C0 ->
+            init_binary(Input);
+        _Else ->
+            Input
+    end;
+strip_last_char(Input, [C0,C1]) ->
+    case binary:last(Input) of
+        C0 ->
+            init_binary(Input);
+        C1 ->
+            init_binary(Input);
+        _Else ->
+            Input
+    end;
+strip_last_char(Input, [C0,C1,C2]) ->
+    case binary:last(Input) of
+        C0 ->
+            init_binary(Input);
+        C1 ->
+            init_binary(Input);
+        C2 ->
+            init_binary(Input);
+        _Else ->
+            Input
+    end;
+strip_last_char(Input, [C0,C1,C2,C3]) ->
+    case binary:last(Input) of
+        C0 ->
+            init_binary(Input);
+        C1 ->
+            init_binary(Input);
+        C2 ->
+            init_binary(Input);
+        C3 ->
+            init_binary(Input);
+        _Else ->
+            Input
+    end.
+
+
+%% Get parsed binary
+get_parsed_binary(Input, Unparsed) ->
+    {First, _} = split_binary(Input, byte_size(Input) - byte_size_exl_head(Unparsed)),
+    First.
+
+
+%% Return all bytes of the binary except the last one. The binary must be non-empty.
+init_binary(B) ->
+    {Init, _} =
+        split_binary(B, byte_size(B) - 1),
+    Init.
+
+
+%% Returns the size of a binary exluding the first element.
+%% Used in calls to split_binary().
+-spec byte_size_exl_head(binary()) -> number().
+byte_size_exl_head(<<>>) -> 0;
+byte_size_exl_head(Binary) -> byte_size(Binary) + 1.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 2.1.  Percent-Encoding]
+%%
+%% A percent-encoding mechanism is used to represent a data octet in a
+%% component when that octet's corresponding character is outside the
+%% allowed set or is being used as a delimiter of, or within, the
+%% component.  A percent-encoded octet is encoded as a character
+%% triplet, consisting of the percent character "%" followed by the two
+%% hexadecimal digits representing that octet's numeric value.  For
+%% example, "%20" is the percent-encoding for the binary octet
+%% "00100000" (ABNF: %x20), which in US-ASCII corresponds to the space
+%% character (SP).  Section 2.4 describes when percent-encoding and
+%% decoding is applied.
+%%
+%%   pct-encoded = "%" HEXDIG HEXDIG
+%%-------------------------------------------------------------------------
+-spec decode_userinfo(binary()) -> binary().
+decode_userinfo(Cs) ->
+    check_utf8(decode(Cs, fun is_userinfo/1, <<>>)).
+
+-spec decode_host(binary()) -> binary().
+decode_host(Cs) ->
+    check_utf8(decode(Cs, fun is_host/1, <<>>)).
+
+-spec decode_path(binary()) -> binary().
+decode_path(Cs) ->
+    check_utf8(decode(Cs, fun is_path/1, <<>>)).
+
+-spec decode_query(binary()) -> binary().
+decode_query(Cs) ->
+    check_utf8(decode(Cs, fun is_query/1, <<>>)).
+
+-spec decode_fragment(binary()) -> binary().
+decode_fragment(Cs) ->
+    check_utf8(decode(Cs, fun is_fragment/1, <<>>)).
+
+
+%% Returns Cs if it is utf8 encoded.
+check_utf8(Cs) ->
+    case unicode:characters_to_list(Cs) of
+        {incomplete,_,_} ->
+            throw({error,invalid_utf8,Cs});
+        {error,_,_} ->
+            throw({error,invalid_utf8,Cs});
+        _ -> Cs
+    end.
+
+%%-------------------------------------------------------------------------
+%% Percent-encode
+%%-------------------------------------------------------------------------
+
+%% Only validates as scheme cannot have percent-encoded characters
+-spec encode_scheme(list()|binary()) -> list() | binary().
+encode_scheme([]) ->
+    throw({error,invalid_scheme,""});
+encode_scheme(<<>>) ->
+    throw({error,invalid_scheme,<<>>});
+encode_scheme(Scheme) ->
+    case validate_scheme(Scheme) of
+        true -> Scheme;
+        false -> throw({error,invalid_scheme,Scheme})
+    end.
+
+-spec encode_userinfo(list()|binary()) -> list() | binary().
+encode_userinfo(Cs) ->
+    encode(Cs, fun is_userinfo/1).
+
+-spec encode_host(list()|binary()) -> list() | binary().
+encode_host(Cs) ->
+    case classify_host(Cs) of
+        regname -> Cs;
+        ipv4 -> Cs;
+        ipv6 -> bracket_ipv6(Cs);
+        other -> encode(Cs, fun is_reg_name/1)
+    end.
+
+-spec encode_path(list()|binary()) -> list() | binary().
+encode_path(Cs) ->
+    encode(Cs, fun is_path/1).
+
+-spec encode_query(list()|binary()) -> list() | binary().
+encode_query(Cs) ->
+    encode(Cs, fun is_query/1).
+
+-spec encode_fragment(list()|binary()) -> list() | binary().
+encode_fragment(Cs) ->
+    encode(Cs, fun is_fragment/1).
+
+%%-------------------------------------------------------------------------
+%% Helper funtions for percent-decode
+%%-------------------------------------------------------------------------
+decode(<<$%,C0,C1,Cs/binary>>, Fun, Acc) ->
+    case is_hex_digit(C0) andalso is_hex_digit(C1) of
+        true ->
+            B = ?HEX2DEC(C0)*16+?HEX2DEC(C1),
+            decode(Cs, Fun, <<Acc/binary, B>>);
+        false -> throw({error,invalid_percent_encoding,<<$%,C0,C1>>})
+    end;
+decode(<<C,Cs/binary>>, Fun, Acc) ->
+    case Fun(C) of
+        true -> decode(Cs, Fun, <<Acc/binary, C>>);
+        false -> throw({error,invalid_percent_encoding,<<C,Cs/binary>>})
+    end;
+decode(<<>>, _Fun, Acc) ->
+    Acc.
+
+%% Check if char is allowed in host
+-spec is_host(char()) -> boolean().
+is_host($:) -> true;
+is_host(Char) -> is_unreserved(Char) orelse is_sub_delim(Char).
+
+%% Check if char is allowed in path
+-spec is_path(char()) -> boolean().
+is_path($/) -> true;
+is_path(Char) -> is_pchar(Char).
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions for percent-encode
+%%-------------------------------------------------------------------------
+-spec encode(list()|binary(), fun()) -> list() | binary().
+encode(Component, Fun) when is_list(Component) ->
+    B = unicode:characters_to_binary(Component),
+    unicode:characters_to_list(encode(B, Fun, <<>>));
+encode(Component, Fun) when is_binary(Component) ->
+    encode(Component, Fun, <<>>).
+%%
+encode(<<Char/utf8, Rest/binary>>, Fun, Acc) ->
+    C = encode_codepoint_binary(Char, Fun),
+    encode(Rest, Fun, <<Acc/binary,C/binary>>);
+encode(<<Char, Rest/binary>>, _Fun, _Acc) ->
+    throw({error,invalid_input,<<Char,Rest/binary>>});
+encode(<<>>, _Fun, Acc) ->
+    Acc.
+
+
+-spec encode_codepoint_binary(integer(), fun()) -> binary().
+encode_codepoint_binary(C, Fun) ->
+    case Fun(C) of
+        false -> percent_encode_binary(C);
+        true -> <<C>>
+    end.
+
+
+-spec percent_encode_binary(integer()) -> binary().
+percent_encode_binary(Code) ->
+    percent_encode_binary(<<Code/utf8>>, <<>>).
+
+
+percent_encode_binary(<<A:4,B:4,Rest/binary>>, Acc) ->
+    percent_encode_binary(Rest, <<Acc/binary,$%,(?DEC2HEX(A)),(?DEC2HEX(B))>>);
+percent_encode_binary(<<>>, Acc) ->
+    Acc.
+
+
+%%-------------------------------------------------------------------------
+%%-------------------------------------------------------------------------
+validate_scheme([]) -> true;
+validate_scheme([H|T]) ->
+    case is_scheme(H) of
+        true -> validate_scheme(T);
+        false -> false
+    end;
+validate_scheme(<<>>) -> true;
+validate_scheme(<<H, Rest/binary>>) ->
+    case is_scheme(H) of
+        true -> validate_scheme(Rest);
+        false -> false
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Classifies hostname into the following categories:
+%% regname, ipv4 - address does not contain reserved characters to be
+%%           percent-encoded
+%% ipv6 - address does not contain reserved characters but it shall be
+%%        encolsed in brackets
+%% other - address shall be percent-encoded
+%%-------------------------------------------------------------------------
+classify_host([]) -> other;
+classify_host(Addr) when is_binary(Addr) ->
+    A = unicode:characters_to_list(Addr),
+    classify_host_ipv6(A);
+classify_host(Addr) ->
+    classify_host_ipv6(Addr).
+
+classify_host_ipv6(Addr) ->
+    case is_ipv6_address(Addr) of
+        true -> ipv6;
+        false -> classify_host_ipv4(Addr)
+    end.
+
+classify_host_ipv4(Addr) ->
+    case is_ipv4_address(Addr) of
+        true -> ipv4;
+        false -> classify_host_regname(Addr)
+    end.
+
+classify_host_regname([]) -> regname;
+classify_host_regname([H|T]) ->
+    case is_reg_name(H) of
+        true -> classify_host_regname(T);
+        false -> other
+    end.
+
+is_ipv4_address(Addr) ->
+    case inet:parse_ipv4strict_address(Addr) of
+        {ok, _} -> true;
+        {error, _} -> false
+    end.
+
+is_ipv6_address(Addr) ->
+    case inet:parse_ipv6strict_address(Addr) of
+        {ok, _} -> true;
+        {error, _} -> false
+    end.
+
+bracket_ipv6(Addr) when is_binary(Addr) ->
+    concat(<<$[,Addr/binary>>,<<$]>>);
+bracket_ipv6(Addr) when is_list(Addr) ->
+    [$[|Addr] ++ "]".
+
+
+%%-------------------------------------------------------------------------
+%% Helper funtions for recompose
+%%-------------------------------------------------------------------------
+
+%%-------------------------------------------------------------------------
+%% Checks if input Map has valid combination of fields that can be
+%% recomposed into a URI.
+%%
+%% The implementation is based on a decision tree that fulfills the
+%% following rules:
+%%   - 'path' shall always be present in the input map
+%%       URI         = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+%%       hier-part   = "//" authority path-abempty
+%%                      / path-absolute
+%%                      / path-rootless
+%%                      / path-empty
+%%   - 'host' shall be present in the input map when 'path' starts with
+%%     two slashes ("//")
+%%       path          = path-abempty    ; begins with "/" or is empty
+%%                     / path-absolute   ; begins with "/" but not "//"
+%%                     / path-noscheme   ; begins with a non-colon segment
+%%                     / path-rootless   ; begins with a segment
+%%                     / path-empty      ; zero characters
+%%       path-abempty  = *( "/" segment )
+%%       segment       = *pchar
+%%   - 'host' shall be present if userinfo or port is present in input map
+%%       authority   = [ userinfo "@" ] host [ ":" port ]
+%%   - All fields shall be valid (scheme, userinfo, host, port, path, query
+%%     or fragment).
+%%-------------------------------------------------------------------------
+is_valid_map(#{path := Path} = Map) ->
+    ((starts_with_two_slash(Path) andalso is_valid_map_host(Map))
+     orelse
+       (maps:is_key(userinfo, Map) andalso is_valid_map_host(Map))
+     orelse
+       (maps:is_key(port, Map) andalso is_valid_map_host(Map))
+     orelse
+     all_fields_valid(Map));
+is_valid_map(#{}) ->
+    false.
+
+
+is_valid_map_host(Map) ->
+    maps:is_key(host, Map) andalso all_fields_valid(Map).
+
+
+all_fields_valid(Map) ->
+    Fun = fun(scheme, _, Acc) -> Acc;
+             (userinfo, _, Acc) -> Acc;
+             (host, _, Acc) -> Acc;
+             (port, _, Acc) -> Acc;
+             (path, _, Acc) -> Acc;
+             (query, _, Acc) -> Acc;
+             (fragment, _, Acc) -> Acc;
+             (_, _, _) -> false
+          end,
+    maps:fold(Fun, true, Map).
+
+
+starts_with_two_slash([$/,$/|_]) ->
+    true;
+starts_with_two_slash(?STRING_REST("//", _)) ->
+    true;
+starts_with_two_slash(_) -> false.
+
+
+update_scheme(#{scheme := Scheme}, _) ->
+    add_colon_postfix(encode_scheme(Scheme));
+update_scheme(#{}, _) ->
+    empty.
+
+
+update_userinfo(#{userinfo := Userinfo}, empty) ->
+    add_auth_prefix(encode_userinfo(Userinfo));
+update_userinfo(#{userinfo := Userinfo}, URI) ->
+    concat(URI,add_auth_prefix(encode_userinfo(Userinfo)));
+update_userinfo(#{}, empty) ->
+    empty;
+update_userinfo(#{}, URI) ->
+    URI.
+
+
+update_host(#{host := Host}, empty) ->
+    add_auth_prefix(encode_host(Host));
+update_host(#{host := Host} = Map, URI) ->
+    concat(URI,add_host_prefix(Map, encode_host(Host)));
+update_host(#{}, empty) ->
+    empty;
+update_host(#{}, URI) ->
+    URI.
+
+
+%% URI cannot be empty for ports. E.g. ":8080" is not a valid URI
+update_port(#{port := undefined}, URI) ->
+    concat(URI, <<":">>);
+update_port(#{port := Port}, URI) ->
+    concat(URI,add_colon(encode_port(Port)));
+update_port(#{}, URI) ->
+    URI.
+
+
+update_path(#{path := Path}, empty) ->
+    encode_path(Path);
+update_path(#{path := Path}, URI) ->
+    concat(URI,encode_path(Path));
+update_path(#{}, empty) ->
+    empty;
+update_path(#{}, URI) ->
+    URI.
+
+
+update_query(#{query := Query}, empty) ->
+    encode_query(Query);
+update_query(#{query := Query}, URI) ->
+    concat(URI,add_question_mark(encode_query(Query)));
+update_query(#{}, empty) ->
+    empty;
+update_query(#{}, URI) ->
+    URI.
+
+
+update_fragment(#{fragment := Fragment}, empty) ->
+    add_hashmark(encode_fragment(Fragment));
+update_fragment(#{fragment := Fragment}, URI) ->
+    concat(URI,add_hashmark(encode_fragment(Fragment)));
+update_fragment(#{}, empty) ->
+    "";
+update_fragment(#{}, URI) ->
+    URI.
+
+%%-------------------------------------------------------------------------
+%% Concatenates its arguments that can be lists and binaries.
+%% The result is a list if at least one of its argument is a list and
+%% binary otherwise.
+%%-------------------------------------------------------------------------
+concat(A, B) when is_binary(A), is_binary(B) ->
+    <<A/binary, B/binary>>;
+concat(A, B) when is_binary(A), is_list(B) ->
+    unicode:characters_to_list(A) ++ B;
+concat(A, B) when is_list(A) ->
+    A ++ maybe_to_list(B).
+
+add_hashmark(Comp) when is_binary(Comp) ->
+    <<$#, Comp/binary>>;
+add_hashmark(Comp) when is_list(Comp) ->
+    [$#|Comp].
+
+add_question_mark(Comp) when is_binary(Comp) ->
+    <<$?, Comp/binary>>;
+add_question_mark(Comp) when is_list(Comp) ->
+    [$?|Comp].
+
+add_colon(Comp) when is_binary(Comp) ->
+    <<$:, Comp/binary>>.
+
+add_colon_postfix(Comp) when is_binary(Comp) ->
+    <<Comp/binary,$:>>;
+add_colon_postfix(Comp) when is_list(Comp) ->
+    Comp ++ ":".
+
+add_auth_prefix(Comp) when is_binary(Comp) ->
+    <<"//", Comp/binary>>;
+add_auth_prefix(Comp) when is_list(Comp) ->
+    [$/,$/|Comp].
+
+add_host_prefix(#{userinfo := _}, Host) when is_binary(Host) ->
+    <<$@,Host/binary>>;
+add_host_prefix(#{}, Host) when is_binary(Host) ->
+    <<"//",Host/binary>>;
+add_host_prefix(#{userinfo := _}, Host) when is_list(Host) ->
+    [$@|Host];
+add_host_prefix(#{}, Host) when is_list(Host) ->
+    [$/,$/|Host].
+
+maybe_to_list(Comp) when is_binary(Comp) -> unicode:characters_to_list(Comp);
+maybe_to_list(Comp) -> Comp.
+
+encode_port(Port) ->
+    integer_to_binary(Port).
+
+%%-------------------------------------------------------------------------
+%% Helper functions for transcode
+%%-------------------------------------------------------------------------
+
+%%-------------------------------------------------------------------------
+%% uri_string:transcode(<<"x%00%00%00%F6"/utf32>>).
+%% 1. Convert (transcode/2) input to list form (list of unicode codepoints)
+%%    "x%00%00%00%F6"
+%% 2. Accumulate characters until percent-encoded segment (transcode/4).
+%%    Acc = "x"
+%% 3. Convert percent-encoded triplets to binary form (transcode_pct/4)
+%%    <<0,0,0,246>>
+%% 4. Transcode in-encoded binary to out-encoding (utf32 -> utf8):
+%%    <<195,182>>
+%% 5. Percent-encode out-encoded binary:
+%%    <<"%C3%B6"/utf8>> = <<37,67,51,37,66,54>>
+%% 6. Convert binary to list form, reverse it and append the accumulator
+%%    "6B%3C%" + "x"
+%% 7. Reverse Acc and return it
+%%-------------------------------------------------------------------------
+transcode([$%,_C0,_C1|_Rest] = L, Acc, InEnc, OutEnc) ->
+    transcode_pct(L, Acc, <<>>, InEnc, OutEnc);
+transcode([_C|_Rest] = L, Acc, InEnc, OutEnc) ->
+    transcode(L, Acc, [], InEnc, OutEnc).
+%%
+transcode([$%,_C0,_C1|_Rest] = L, Acc, List, InEncoding, OutEncoding) ->
+    transcode_pct(L, List ++ Acc, <<>>, InEncoding, OutEncoding);
+transcode([C|Rest], Acc, List, InEncoding, OutEncoding) ->
+    transcode(Rest, Acc, [C|List], InEncoding, OutEncoding);
+transcode([], Acc, List, _InEncoding, _OutEncoding) ->
+    lists:reverse(List ++ Acc).
+
+
+%% Transcode percent-encoded segment
+transcode_pct([$%,C0,C1|Rest] = L, Acc, B, InEncoding, OutEncoding) ->
+    case is_hex_digit(C0) andalso is_hex_digit(C1) of
+        true ->
+            Int = ?HEX2DEC(C0)*16+?HEX2DEC(C1),
+            transcode_pct(Rest, Acc, <<B/binary, Int>>, InEncoding, OutEncoding);
+        false -> throw({error, invalid_percent_encoding,L})
+    end;
+transcode_pct([_C|_Rest] = L, Acc, B, InEncoding, OutEncoding) ->
+    OutBinary = convert_to_binary(B, InEncoding, OutEncoding),
+    PctEncUtf8 = percent_encode_segment(OutBinary),
+    Out = lists:reverse(convert_to_list(PctEncUtf8, utf8)),
+    transcode(L, Out ++ Acc, [], InEncoding, OutEncoding);
+transcode_pct([], Acc, B, InEncoding, OutEncoding) ->
+    OutBinary = convert_to_binary(B, InEncoding, OutEncoding),
+    PctEncUtf8 = percent_encode_segment(OutBinary),
+    Out = convert_to_list(PctEncUtf8, utf8),
+    lists:reverse(Acc) ++ Out.
+
+
+%% Convert to binary
+convert_to_binary(Binary, InEncoding, OutEncoding) ->
+    case unicode:characters_to_binary(Binary, InEncoding, OutEncoding) of
+        {error, _List, RestData} ->
+            throw({error, invalid_input, RestData});
+        {incomplete, _List, RestData} ->
+            throw({error, invalid_input, RestData});
+        Result ->
+            Result
+    end.
+
+
+%% Convert to list
+convert_to_list(Binary, InEncoding) ->
+    case unicode:characters_to_list(Binary, InEncoding) of
+        {error, _List, RestData} ->
+            throw({error, invalid_input, RestData});
+        {incomplete, _List, RestData} ->
+            throw({error, invalid_input, RestData});
+        Result ->
+            Result
+    end.
+
+
+%% Flatten input list
+flatten_list([], _) ->
+    [];
+flatten_list(L, InEnc) ->
+    flatten_list(L, InEnc, []).
+%%
+flatten_list([H|T], InEnc, Acc) when is_binary(H) ->
+    L = convert_to_list(H, InEnc),
+    flatten_list(T, InEnc, lists:reverse(L) ++ Acc);
+flatten_list([H|T], InEnc, Acc) when is_list(H) ->
+    flatten_list(H ++ T, InEnc, Acc);
+flatten_list([H|T], InEnc, Acc) ->
+    flatten_list(T, InEnc, [H|Acc]);
+flatten_list([], _InEnc, Acc) ->
+    lists:reverse(Acc);
+flatten_list(Arg, _, _) ->
+    throw({error, invalid_input, Arg}).
+
+
+percent_encode_segment(Segment) ->
+    percent_encode_binary(Segment, <<>>).
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions for compose_query
+%%-------------------------------------------------------------------------
+
+%% Returns separator to be used between key-value pairs
+get_separator(L) when length(L) =:= 0 ->
+    <<>>;
+get_separator(_L) ->
+    <<"&">>.
+
+
+%% HTML 5.2 - 4.10.21.6 URL-encoded form data - WHATWG URL (10 Jan 2018) - UTF-8
+%% HTML 5.0 - 4.10.22.6 URL-encoded form data - encoding (non UTF-8)
+form_urlencode(Cs, [{encoding, latin1}]) when is_list(Cs) ->
+    B = convert_to_binary(Cs, utf8, utf8),
+    html5_byte_encode(base10_encode(B));
+form_urlencode(Cs, [{encoding, latin1}]) when is_binary(Cs) ->
+    html5_byte_encode(base10_encode(Cs));
+form_urlencode(Cs, [{encoding, Encoding}])
+  when is_list(Cs), Encoding =:= utf8; Encoding =:= unicode ->
+    B = convert_to_binary(Cs, utf8, Encoding),
+    html5_byte_encode(B);
+form_urlencode(Cs, [{encoding, Encoding}])
+  when is_binary(Cs), Encoding =:= utf8; Encoding =:= unicode ->
+    html5_byte_encode(Cs);
+form_urlencode(Cs, [{encoding, Encoding}]) when is_list(Cs); is_binary(Cs) ->
+    throw({error,invalid_encoding, Encoding});
+form_urlencode(Cs, _) ->
+    throw({error,invalid_input, Cs}).
+
+
+%% For each character in the entry's name and value that cannot be expressed using
+%% the selected character encoding, replace the character by a string consisting of
+%% a U+0026 AMPERSAND character (&), a "#" (U+0023) character, one or more ASCII
+%% digits representing the Unicode code point of the character in base ten, and
+%% finally a ";" (U+003B) character.
+base10_encode(Cs) ->
+    base10_encode(Cs, <<>>).
+%%
+base10_encode(<<>>, Acc) ->
+    Acc;
+base10_encode(<<H/utf8,T/binary>>, Acc) when H > 255 ->
+    Base10 = convert_to_binary(integer_to_list(H,10), utf8, utf8),
+    base10_encode(T, <<Acc/binary,"&#",Base10/binary,$;>>);
+base10_encode(<<H/utf8,T/binary>>, Acc) ->
+    base10_encode(T, <<Acc/binary,H>>).
+
+
+html5_byte_encode(B) ->
+    html5_byte_encode(B, <<>>).
+%%
+html5_byte_encode(<<>>, Acc) ->
+    Acc;
+html5_byte_encode(<<$ ,T/binary>>, Acc) ->
+    html5_byte_encode(T, <<Acc/binary,$+>>);
+html5_byte_encode(<<H,T/binary>>, Acc) ->
+    case is_url_char(H) of
+        true ->
+            html5_byte_encode(T, <<Acc/binary,H>>);
+        false ->
+            <<A:4,B:4>> = <<H>>,
+            html5_byte_encode(T, <<Acc/binary,$%,(?DEC2HEX(A)),(?DEC2HEX(B))>>)
+    end;
+html5_byte_encode(H, _Acc) ->
+    throw({error,invalid_input, H}).
+
+
+%% Return true if input char can appear in form-urlencoded string
+%% Allowed chararacters:
+%%   0x2A, 0x2D, 0x2E, 0x30 to 0x39, 0x41 to 0x5A,
+%%   0x5F, 0x61 to 0x7A
+is_url_char(C)
+  when C =:= 16#2A; C =:= 16#2D;
+       C =:= 16#2E; C =:= 16#5F;
+       16#30 =< C, C =< 16#39;
+       16#41 =< C, C =< 16#5A;
+       16#61 =< C, C =< 16#7A -> true;
+is_url_char(_) -> false.
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions for dissect_query
+%%-------------------------------------------------------------------------
+dissect_query_key(<<$=,T/binary>>, IsList, Acc, Key, Value) ->
+    dissect_query_value(T, IsList, Acc, Key, Value);
+dissect_query_key(<<"&#",T/binary>>, IsList, Acc, Key, Value) ->
+    dissect_query_key(T, IsList, Acc, <<Key/binary,"&#">>, Value);
+dissect_query_key(<<$&,_T/binary>>, _IsList, _Acc, _Key, _Value) ->
+    throw({error, missing_value, "&"});
+dissect_query_key(<<H,T/binary>>, IsList, Acc, Key, Value) ->
+    dissect_query_key(T, IsList, Acc, <<Key/binary,H>>, Value);
+dissect_query_key(B, _, _, _, _) ->
+    throw({error, missing_value, B}).
+
+
+dissect_query_value(<<$&,T/binary>>, IsList, Acc, Key, Value) ->
+    K = form_urldecode(IsList, Key),
+    V = form_urldecode(IsList, Value),
+    dissect_query_key(T, IsList, [{K,V}|Acc], <<>>, <<>>);
+dissect_query_value(<<H,T/binary>>, IsList, Acc, Key, Value) ->
+    dissect_query_value(T, IsList, Acc, Key, <<Value/binary,H>>);
+dissect_query_value(<<>>, IsList, Acc, Key, Value) ->
+    K = form_urldecode(IsList, Key),
+    V = form_urldecode(IsList, Value),
+    lists:reverse([{K,V}|Acc]).
+
+
+%% HTML 5.2 - 4.10.21.6 URL-encoded form data - WHATWG URL (10 Jan 2018) - UTF-8
+%% HTML 5.0 - 4.10.22.6 URL-encoded form data - decoding (non UTF-8)
+form_urldecode(true, B) ->
+    Result = base10_decode(form_urldecode(B, <<>>)),
+    convert_to_list(Result, utf8);
+form_urldecode(false, B) ->
+    base10_decode(form_urldecode(B, <<>>));
+form_urldecode(<<>>, Acc) ->
+    Acc;
+form_urldecode(<<$+,T/binary>>, Acc) ->
+    form_urldecode(T, <<Acc/binary,$ >>);
+form_urldecode(<<$%,C0,C1,T/binary>>, Acc) ->
+    case is_hex_digit(C0) andalso is_hex_digit(C1) of
+        true ->
+            V = ?HEX2DEC(C0)*16+?HEX2DEC(C1),
+            form_urldecode(T, <<Acc/binary, V>>);
+        false ->
+            L = convert_to_list(<<$%,C0,C1,T/binary>>, utf8),
+            throw({error, invalid_percent_encoding, L})
+    end;
+form_urldecode(<<H/utf8,T/binary>>, Acc) ->
+    form_urldecode(T, <<Acc/binary,H/utf8>>);
+form_urldecode(<<H,_/binary>>, _Acc) ->
+    throw({error, invalid_character, [H]}).
+
+base10_decode(Cs) ->
+    base10_decode(Cs, <<>>).
+%
+base10_decode(<<>>, Acc) ->
+    Acc;
+base10_decode(<<"&#",T/binary>>, Acc) ->
+    base10_decode_unicode(T, Acc);
+base10_decode(<<H/utf8,T/binary>>, Acc) ->
+    base10_decode(T,<<Acc/binary,H/utf8>>);
+base10_decode(<<H,_/binary>>, _) ->
+    throw({error, invalid_input, [H]}).
+
+
+base10_decode_unicode(B, Acc) ->
+    base10_decode_unicode(B, 0, Acc).
+%%
+base10_decode_unicode(<<H/utf8,T/binary>>, Codepoint, Acc) when $0 =< H, H =< $9 ->
+    Res = Codepoint * 10 + (H - $0),
+    base10_decode_unicode(T, Res, Acc);
+base10_decode_unicode(<<$;,T/binary>>, Codepoint, Acc) ->
+    base10_decode(T, <<Acc/binary,Codepoint/utf8>>);
+base10_decode_unicode(<<H,_/binary>>, _, _) ->
+    throw({error, invalid_input, [H]}).
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions for normalize
+%%-------------------------------------------------------------------------
+
+normalize_map(URIMap) ->
+      normalize_path_segment(
+        normalize_scheme_based(
+          normalize_case(URIMap))).
+
+
+%% 6.2.2.1.  Case Normalization
+normalize_case(#{scheme := Scheme, host := Host} = Map) ->
+    Map#{scheme => to_lower(Scheme),
+         host => to_lower(Host)};
+normalize_case(#{host := Host} = Map) ->
+    Map#{host => to_lower(Host)};
+normalize_case(#{scheme := Scheme} = Map) ->
+    Map#{scheme => to_lower(Scheme)};
+normalize_case(#{} = Map) ->
+    Map.
+
+
+to_lower(Cs) when is_list(Cs) ->
+    B = convert_to_binary(Cs, utf8, utf8),
+    convert_to_list(to_lower(B), utf8);
+to_lower(Cs) when is_binary(Cs) ->
+    to_lower(Cs, <<>>).
+%%
+to_lower(<<C,Cs/binary>>, Acc) when $A =< C, C =< $Z ->
+    to_lower(Cs, <<Acc/binary,(C + 32)>>);
+to_lower(<<C,Cs/binary>>, Acc) ->
+    to_lower(Cs, <<Acc/binary,C>>);
+to_lower(<<>>, Acc) ->
+    Acc.
+
+
+%% 6.2.2.3. Path Segment Normalization
+%% 5.2.4.   Remove Dot Segments
+normalize_path_segment(Map) ->
+    Path = maps:get(path, Map, undefined),
+    Map#{path => remove_dot_segments(Path)}.
+
+
+remove_dot_segments(Path) when is_binary(Path) ->
+    remove_dot_segments(Path, <<>>);
+remove_dot_segments(Path) when is_list(Path) ->
+    B = convert_to_binary(Path, utf8, utf8),
+    B1 = remove_dot_segments(B, <<>>),
+    convert_to_list(B1, utf8).
+%%
+remove_dot_segments(<<>>, Output) ->
+    Output;
+remove_dot_segments(<<"../",T/binary>>, Output) ->
+    remove_dot_segments(T, Output);
+remove_dot_segments(<<"./",T/binary>>, Output) ->
+    remove_dot_segments(T, Output);
+remove_dot_segments(<<"/./",T/binary>>, Output) ->
+    remove_dot_segments(<<$/,T/binary>>, Output);
+remove_dot_segments(<<"/.">>, Output) ->
+    remove_dot_segments(<<$/>>, Output);
+remove_dot_segments(<<"/../",T/binary>>, Output) ->
+    Out1 = remove_last_segment(Output),
+    remove_dot_segments(<<$/,T/binary>>, Out1);
+remove_dot_segments(<<"/..">>, Output) ->
+    Out1 = remove_last_segment(Output),
+    remove_dot_segments(<<$/>>, Out1);
+remove_dot_segments(<<$.>>, Output) ->
+    remove_dot_segments(<<>>, Output);
+remove_dot_segments(<<"..">>, Output) ->
+    remove_dot_segments(<<>>, Output);
+remove_dot_segments(Input, Output) ->
+    {First, Rest} = first_path_segment(Input),
+    remove_dot_segments(Rest, <<Output/binary,First/binary>>).
+
+
+first_path_segment(Input) ->
+    F = first_path_segment(Input, <<>>),
+    split_binary(Input, byte_size(F)).
+%%
+first_path_segment(<<$/,T/binary>>, Acc) ->
+    first_path_segment_end(<<T/binary>>, <<Acc/binary,$/>>);
+first_path_segment(<<C,T/binary>>, Acc) ->
+    first_path_segment_end(<<T/binary>>, <<Acc/binary,C>>).
+
+
+first_path_segment_end(<<>>, Acc) ->
+    Acc;
+first_path_segment_end(<<$/,_/binary>>, Acc) ->
+    Acc;
+first_path_segment_end(<<C,T/binary>>, Acc) ->
+    first_path_segment_end(<<T/binary>>, <<Acc/binary,C>>).
+
+
+remove_last_segment(<<>>) ->
+    <<>>;
+remove_last_segment(B) ->
+    {Init, Last} = split_binary(B, byte_size(B) - 1),
+    case Last of
+        <<$/>> ->
+            Init;
+        _Char ->
+            remove_last_segment(Init)
+    end.
+
+
+%% RFC 3986, 6.2.3.  Scheme-Based Normalization
+normalize_scheme_based(Map) ->
+    Scheme = maps:get(scheme, Map, undefined),
+    Port = maps:get(port, Map, undefined),
+    Path= maps:get(path, Map, undefined),
+    normalize_scheme_based(Map, Scheme, Port, Path).
+%%
+normalize_scheme_based(Map, Scheme, Port, Path)
+  when Scheme =:= "http"; Scheme =:= <<"http">> ->
+    normalize_http(Map, Port, Path);
+normalize_scheme_based(Map, Scheme, Port, Path)
+  when Scheme =:= "https"; Scheme =:= <<"https">> ->
+    normalize_https(Map, Port, Path);
+normalize_scheme_based(Map, Scheme, Port, _Path)
+  when Scheme =:= "ftp"; Scheme =:= <<"ftp">> ->
+    normalize_ftp(Map, Port);
+normalize_scheme_based(Map, Scheme, Port, _Path)
+  when Scheme =:= "ssh"; Scheme =:= <<"ssh">> ->
+    normalize_ssh_sftp(Map, Port);
+normalize_scheme_based(Map, Scheme, Port, _Path)
+  when Scheme =:= "sftp"; Scheme =:= <<"sftp">> ->
+    normalize_ssh_sftp(Map, Port);
+normalize_scheme_based(Map, Scheme, Port, _Path)
+  when Scheme =:= "tftp"; Scheme =:= <<"tftp">> ->
+    normalize_tftp(Map, Port);
+normalize_scheme_based(Map, _, _, _) ->
+    Map.
+
+
+normalize_http(Map, Port, Path) ->
+    M1 = normalize_port(Map, Port, 80),
+    normalize_http_path(M1, Path).
+
+
+normalize_https(Map, Port, Path) ->
+    M1 = normalize_port(Map, Port, 443),
+    normalize_http_path(M1, Path).
+
+
+normalize_ftp(Map, Port) ->
+    normalize_port(Map, Port, 21).
+
+
+normalize_ssh_sftp(Map, Port) ->
+    normalize_port(Map, Port, 22).
+
+
+normalize_tftp(Map, Port) ->
+    normalize_port(Map, Port, 69).
+
+
+normalize_port(Map, Port, Default) ->
+    case Port of
+        Default ->
+            maps:remove(port, Map);
+        _Else ->
+            Map
+    end.
+
+
+normalize_http_path(Map, Path) ->
+    case Path of
+        "" ->
+            Map#{path => "/"};
+        <<>> ->
+            Map#{path => <<"/">>};
+        _Else ->
+            Map
+    end.
diff --git a/lib/stdlib/src/zip.erl b/lib/stdlib/src/zip.erl
index 81f927f399..39be2abff6 100644
--- a/lib/stdlib/src/zip.erl
+++ b/lib/stdlib/src/zip.erl
@@ -457,8 +457,7 @@ do_zip(F, Files, Options) ->
         Out3 = Output({close, F}, Out2),
         {ok, Out3}
     catch
-        C:R ->
-            Stk = erlang:get_stacktrace(),
+        C:R:Stk ->
             zlib:close(Z),
             Output({close, F}, Out0),
             erlang:raise(C, R, Stk)
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile
index 523cb95065..8490770f3d 100644
--- a/lib/stdlib/test/Makefile
+++ b/lib/stdlib/test/Makefile
@@ -87,6 +87,7 @@ MODULES= \
 	timer_simple_SUITE \
 	unicode_SUITE \
 	unicode_util_SUITE \
+	uri_string_SUITE \
 	win32reg_SUITE \
 	y2k_SUITE \
 	select_SUITE \
diff --git a/lib/stdlib/test/array_SUITE.erl b/lib/stdlib/test/array_SUITE.erl
index 5836f275ba..956582c4fd 100644
--- a/lib/stdlib/test/array_SUITE.erl
+++ b/lib/stdlib/test/array_SUITE.erl
@@ -141,10 +141,10 @@ t(What) ->
 			  io:format("Test ~p ~n",[T]),
 			  try 
 			      ?MODULE:T([])
-			  catch _E:_R ->
+			  catch _E:_R:_S ->
 				  Line = get(test_server_loc),
 				  io:format("Failed ~p:~p ~p ~p~n   ~p~n", 
-					    [T,Line,_E,_R, erlang:get_stacktrace()])
+					    [T,Line,_E,_R,_S])
 			  end
 		  end, What).
 
@@ -161,8 +161,8 @@ extract_tests() ->
 	       end,
 	[Call(Test) || Test <- Tests],
 	io:format("Tests ~p~n", [Tests])
-    catch _:Err ->
-	    io:format("Error: ~p ~p~n", [Err, erlang:get_stacktrace()])
+    catch _:Err:Stacktrace ->
+	    io:format("Error: ~p ~p~n", [Err, Stacktrace])
     end,
     file:close(In),
     file:close(Out).
diff --git a/lib/stdlib/test/base64_SUITE.erl b/lib/stdlib/test/base64_SUITE.erl
index 48b3f5f959..1fc4c3fc0e 100644
--- a/lib/stdlib/test/base64_SUITE.erl
+++ b/lib/stdlib/test/base64_SUITE.erl
@@ -97,10 +97,9 @@ base64_otp_5635(Config) when is_list(Config) ->
     <<"===">> = base64:decode(base64:encode("===")),
     ok.
 %%-------------------------------------------------------------------------
-%% OTP-6279: Guard needed so that function fails in a correct
-%% way for faulty input, i.e. function_clause.
+%% OTP-6279: Make sure illegal characters are rejected when decoding.
 base64_otp_6279(Config) when is_list(Config) ->
-    {'EXIT',{function_clause, _}} = (catch base64:decode("dGVzda==a")),
+    {'EXIT',_} = (catch base64:decode("dGVzda==a")),
     ok.
 %%-------------------------------------------------------------------------
 %% Encode and decode big binaries.
@@ -115,48 +114,61 @@ big(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 %% Make sure illegal characters are rejected when decoding.
 illegal(Config) when is_list(Config) ->
-    {'EXIT',{function_clause, _}} = (catch base64:decode("()")),
+    %% A few samples with different error reasons. Nothing can be
+    %% assumed about the reason for the crash.
+    {'EXIT',_} = (catch base64:decode("()")),
+    {'EXIT',_} = (catch base64:decode(<<19:8,20:8,21:8,22:8>>)),
+    {'EXIT',_} = (catch base64:decode([19,20,21,22])),
+    {'EXIT',_} = (catch base64:decode_to_string(<<19:8,20:8,21:8,22:8>>)),
+    {'EXIT',_} = (catch base64:decode_to_string([19,20,21,22])),
     ok.
 %%-------------------------------------------------------------------------
 %% mime_decode and mime_decode_to_string have different implementations
-%% so test both with the same input separately. Both functions have
-%% the same implementation for binary/string arguments.
+%% so test both with the same input separately.
 %%
 %% Test base64:mime_decode/1.
 mime_decode(Config) when is_list(Config) ->
+    MimeDecode = fun(In) ->
+                         Out = base64:mime_decode(In),
+                         Out = base64:mime_decode(binary_to_list(In))
+                 end,
     %% Test correct padding
-    <<"one">> = base64:mime_decode(<<"b25l">>),
-    <<"on">>  = base64:mime_decode(<<"b24=">>),
-    <<"o">>   = base64:mime_decode(<<"bw==">>),
+    <<"one">> = MimeDecode(<<"b25l">>),
+    <<"on">>  = MimeDecode(<<"b24=">>),
+    <<"o">>   = MimeDecode(<<"bw==">>),
     %% Test 1 extra padding
-    <<"one">> = base64:mime_decode(<<"b25l= =">>),
-    <<"on">>  = base64:mime_decode(<<"b24== =">>),
-    <<"o">>   = base64:mime_decode(<<"bw=== =">>),
+    <<"one">> = MimeDecode(<<"b25l= =">>),
+    <<"on">>  = MimeDecode(<<"b24== =">>),
+    <<"o">>   = MimeDecode(<<"bw=== =">>),
     %% Test 2 extra padding
-    <<"one">> = base64:mime_decode(<<"b25l===">>),
-    <<"on">>  = base64:mime_decode(<<"b24====">>),
-    <<"o">>   = base64:mime_decode(<<"bw=====">>),
+    <<"one">> = MimeDecode(<<"b25l===">>),
+    <<"on">>  = MimeDecode(<<"b24====">>),
+    <<"o">>   = MimeDecode(<<"bw=====">>),
     %% Test misc embedded padding
-    <<"one">> = base64:mime_decode(<<"b2=5l===">>),
-    <<"on">>  = base64:mime_decode(<<"b=24====">>),
-    <<"o">>   = base64:mime_decode(<<"b=w=====">>),
+    <<"one">> = MimeDecode(<<"b2=5l===">>),
+    <<"on">>  = MimeDecode(<<"b=24====">>),
+    <<"o">>   = MimeDecode(<<"b=w=====">>),
     %% Test misc white space and illegals with embedded padding
-    <<"one">> = base64:mime_decode(<<" b~2=\r\n5()l===">>),
-    <<"on">>  = base64:mime_decode(<<"\tb =2\"¤4=¤=   ==">>),
-    <<"o">>   = base64:mime_decode(<<"\nb=w=====">>),
+    <<"one">> = MimeDecode(<<" b~2=\r\n5()l===">>),
+    <<"on">>  = MimeDecode(<<"\tb =2\"¤4=¤=   ==">>),
+    <<"o">>   = MimeDecode(<<"\nb=w=====">>),
     %% Two pads
     <<"Aladdin:open sesame">> =
-	base64:mime_decode("QWxhZGRpbjpvc()GVuIHNlc2FtZQ=="),
+	MimeDecode(<<"QWxhZGRpbjpvc()GVuIHNlc2FtZQ==">>),
     %% One pad to ignore, followed by more text
-    <<"Hello World!!">> = base64:mime_decode(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
+    <<"Hello World!!">> = MimeDecode(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
     %% No pad
     <<"Aladdin:open sesam">> =
-	base64:mime_decode("QWxhZGRpbjpvcG¤\")(VuIHNlc2Ft"),
+	MimeDecode(<<"QWxhZGRpbjpvcG¤\")(VuIHNlc2Ft">>),
     %% Encoded base 64 strings may be divided by non base 64 chars.
     %% In this cases whitespaces.
     <<"0123456789!@#0^&*();:<>,. []{}">> =
-	base64:mime_decode(
+	MimeDecode(
 	  <<"MDEy MzQ1Njc4 \tOSFAIzBeJ \nio)(oKTs6 PD4sLi \r\nBbXXt9">>),
+    %% Zeroes
+    <<"012">> = MimeDecode(<<"\000M\000D\000E\000y=\000">>),
+    <<"o">>   = MimeDecode(<<"bw==\000">>),
+    <<"o">>   = MimeDecode(<<"bw=\000=">>),
     ok.
 
 %%-------------------------------------------------------------------------
@@ -165,39 +177,48 @@ mime_decode(Config) when is_list(Config) ->
 
 %% Test base64:mime_decode_to_string/1.
 mime_decode_to_string(Config) when is_list(Config) ->
+    MimeDecodeToString =
+        fun(In) ->
+                Out = base64:mime_decode_to_string(In),
+                Out = base64:mime_decode_to_string(binary_to_list(In))
+        end,
     %% Test correct padding
-    "one" = base64:mime_decode_to_string(<<"b25l">>),
-    "on"  = base64:mime_decode_to_string(<<"b24=">>),
-    "o"   = base64:mime_decode_to_string(<<"bw==">>),
+    "one" = MimeDecodeToString(<<"b25l">>),
+    "on"  = MimeDecodeToString(<<"b24=">>),
+    "o"   = MimeDecodeToString(<<"bw==">>),
     %% Test 1 extra padding
-    "one" = base64:mime_decode_to_string(<<"b25l= =">>),
-    "on"  = base64:mime_decode_to_string(<<"b24== =">>),
-    "o"   = base64:mime_decode_to_string(<<"bw=== =">>),
+    "one" = MimeDecodeToString(<<"b25l= =">>),
+    "on"  = MimeDecodeToString(<<"b24== =">>),
+    "o"   = MimeDecodeToString(<<"bw=== =">>),
     %% Test 2 extra padding
-    "one" = base64:mime_decode_to_string(<<"b25l===">>),
-    "on"  = base64:mime_decode_to_string(<<"b24====">>),
-    "o"   = base64:mime_decode_to_string(<<"bw=====">>),
+    "one" = MimeDecodeToString(<<"b25l===">>),
+    "on"  = MimeDecodeToString(<<"b24====">>),
+    "o"   = MimeDecodeToString(<<"bw=====">>),
     %% Test misc embedded padding
-    "one" = base64:mime_decode_to_string(<<"b2=5l===">>),
-    "on"  = base64:mime_decode_to_string(<<"b=24====">>),
-    "o"   = base64:mime_decode_to_string(<<"b=w=====">>),
+    "one" = MimeDecodeToString(<<"b2=5l===">>),
+    "on"  = MimeDecodeToString(<<"b=24====">>),
+    "o"   = MimeDecodeToString(<<"b=w=====">>),
     %% Test misc white space and illegals with embedded padding
-    "one" = base64:mime_decode_to_string(<<" b~2=\r\n5()l===">>),
-    "on"  = base64:mime_decode_to_string(<<"\tb =2\"¤4=¤=   ==">>),
-    "o"   = base64:mime_decode_to_string(<<"\nb=w=====">>),
+    "one" = MimeDecodeToString(<<" b~2=\r\n5()l===">>),
+    "on"  = MimeDecodeToString(<<"\tb =2\"¤4=¤=   ==">>),
+    "o"   = MimeDecodeToString(<<"\nb=w=====">>),
     %% Two pads
     "Aladdin:open sesame" =
-	base64:mime_decode_to_string("QWxhZGRpbjpvc()GVuIHNlc2FtZQ=="),
+	MimeDecodeToString(<<"QWxhZGRpbjpvc()GVuIHNlc2FtZQ==">>),
     %% One pad to ignore, followed by more text
-    "Hello World!!" = base64:mime_decode_to_string(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
+    "Hello World!!" = MimeDecodeToString(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
     %% No pad
     "Aladdin:open sesam" =
-	base64:mime_decode_to_string("QWxhZGRpbjpvcG¤\")(VuIHNlc2Ft"),
+	MimeDecodeToString(<<"QWxhZGRpbjpvcG¤\")(VuIHNlc2Ft">>),
     %% Encoded base 64 strings may be divided by non base 64 chars.
     %% In this cases whitespaces.
     "0123456789!@#0^&*();:<>,. []{}" =
-	base64:mime_decode_to_string(
+	MimeDecodeToString(
 	  <<"MDEy MzQ1Njc4 \tOSFAIzBeJ \nio)(oKTs6 PD4sLi \r\nBbXXt9">>),
+    %% Zeroes
+    "012" = MimeDecodeToString(<<"\000M\000D\000E\000y=\000">>),
+    "o"   = MimeDecodeToString(<<"bw==\000">>),
+    "o"   = MimeDecodeToString(<<"bw=\000=">>),
     ok.
 
 %%-------------------------------------------------------------------------
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index 915f478dfa..9123bf2f28 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1998-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.
@@ -551,8 +551,8 @@ otp_8130(Config) when is_list(Config) ->
              "t() ->  "
              "   L = \"{ 34 , \\\"1\\\\x{AAA}\\\" , \\\"34\\\" , X . a , $\\\\x{AAA} }\", "
              "   R = ?M({34,\"1\\x{aaa}\",\"34\",X.a,$\\x{aaa}}),"
-             "   Lt = erl_scan:string(L, 1, [unicode]),"
-             "   Rt = erl_scan:string(R, 1, [unicode]),"
+             "   Lt = erl_scan:string(L, 1),"
+             "   Rt = erl_scan:string(R, 1),"
              "   Lt = Rt, ok. ">>,
           ok},
 
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index c3ef4eb051..8eb85cab8e 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.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.
@@ -41,6 +41,7 @@
          otp_8133/1,
          otp_10622/1,
          otp_13228/1,
+         otp_14826/1,
          funs/1,
 	 try_catch/1,
 	 eval_expr_5/1,
@@ -57,6 +58,7 @@
 
 -export([count_down/2, count_down_fun/0, do_apply/2, 
          local_func/3, local_func_value/2]).
+-export([simple/0]).
 
 -ifdef(STANDALONE).
 -define(config(A,B),config(A,B)).
@@ -83,7 +85,7 @@ all() ->
      pattern_expr, match_bin, guard_3, guard_4, guard_5, lc,
      simple_cases, unary_plus, apply_atom, otp_5269,
      otp_6539, otp_6543, otp_6787, otp_6977, otp_7550,
-     otp_8133, otp_10622, otp_13228,
+     otp_8133, otp_10622, otp_13228, otp_14826,
      funs, try_catch, eval_expr_5, zero_width,
      eep37, eep43].
 
@@ -988,6 +990,173 @@ otp_13228(_Config) ->
     EFH = {value, fun({io, fwrite}, [atom]) -> io_fwrite end},
     {value, worked, []} = parse_and_run("foo(io:fwrite(atom)).", LFH, EFH).
 
+%% OTP-14826: more accurate stacktrace.
+otp_14826(_Config) ->
+    backtrace_check("fun(P) when is_pid(P) -> true end(a).",
+                    function_clause,
+                    [{erl_eval,'-inside-an-interpreted-fun-',[a],[]},
+                     {erl_eval,eval_fun,6},
+                     ?MODULE]),
+    backtrace_check("B.",
+                    {unbound_var, 'B'},
+                    [{erl_eval,expr,2}, ?MODULE]),
+    backtrace_check("B.",
+                    {unbound, 'B'},
+                    [{erl_eval,expr,5}, ?MODULE],
+                    none, none),
+    backtrace_check("1/0.",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    backtrace_catch("catch 1/0.",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    check(fun() -> catch exit(foo) end,
+          "catch exit(foo).",
+          {'EXIT', foo}),
+    check(fun() -> catch throw(foo) end,
+          "catch throw(foo).",
+          foo),
+    backtrace_check("try 1/0 after foo end.",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    backtrace_catch("catch (try 1/0 after foo end).",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    backtrace_catch("try catch 1/0 after foo end.",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    backtrace_check("try a of b -> bar after foo end.",
+                    {try_clause,a},
+                    [{erl_eval,try_clauses,8}]),
+    check(fun() -> X = try foo:bar() catch A:B:C -> {A,B} end, X end,
+          "try foo:bar() catch A:B:C -> {A,B} end.",
+          {error, undef}),
+    backtrace_check("C = 4, try foo:bar() catch A:B:C -> {A,B,C} end.",
+                    stacktrace_bound,
+                    [{erl_eval,check_stacktrace_vars,2},
+                     {erl_eval,try_clauses,8}],
+                    none, none),
+    backtrace_catch("catch (try a of b -> bar after foo end).",
+                    {try_clause,a},
+                    [{erl_eval,try_clauses,8}]),
+    backtrace_check("try 1/0 catch exit:a -> foo end.",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    Es = [{'try',1,[{call,1,{remote,1,{atom,1,foo},{atom,1,bar}},[]}],
+           [],
+           [{clause,1,[{tuple,1,[{var,1,'A'},{var,1,'B'},{atom,1,'C'}]}],
+             [],[{tuple,1,[{var,1,'A'},{var,1,'B'},{atom,1,'C'}]}]}],[]}],
+    try
+        erl_eval:exprs(Es, [], none, none),
+        ct:fail(stacktrace_variable)
+    catch
+        error:{illegal_stacktrace_variable,{atom,1,'C'}}:S ->
+            [{erl_eval,check_stacktrace_vars,2,_},
+             {erl_eval,try_clauses,8,_}|_] = S
+    end,
+    backtrace_check("{1,1} = {A = 1, A = 2}.",
+                    {badmatch, 1},
+                    [erl_eval, {lists,foldl,3}]),
+    backtrace_check("case a of a when foo:bar() -> x end.",
+                    guard_expr,
+                    [{erl_eval,guard0,4}], none, none),
+    backtrace_check("case a of foo() -> ok end.",
+                    {illegal_pattern,{call,1,{atom,1,foo},[]}},
+                    [{erl_eval,match,4}], none, none),
+    backtrace_check("case a of b -> ok end.",
+                    {case_clause,a},
+                    [{erl_eval,case_clauses,6}, ?MODULE]),
+    backtrace_check("if a =:= b -> ok end.",
+                    if_clause,
+                    [{erl_eval,if_clauses,5}, ?MODULE]),
+    backtrace_check("fun A(b) -> ok end(a).",
+                    function_clause,
+                    [{erl_eval,'-inside-an-interpreted-fun-',[a],[]},
+                     {erl_eval,eval_named_fun,8},
+                     ?MODULE]),
+    backtrace_check("[A || A <- a].",
+                    {bad_generator, a},
+                    [{erl_eval,eval_generate,7}, {erl_eval, eval_lc, 6}]),
+    backtrace_check("<< <<A>> || <<A>> <= a>>.",
+                    {bad_generator, a},
+                    [{erl_eval,eval_b_generate,7}, {erl_eval, eval_bc, 6}]),
+    backtrace_check("[A || A <- [1], begin a end].",
+                    {bad_filter, a},
+                    [{erl_eval,eval_filter,6}, {erl_eval, eval_generate, 7}]),
+    fun() ->
+            {'EXIT', {{badarity, {_Fun, []}}, BT}} =
+                (catch parse_and_run("fun(A) -> A end().")),
+            check_backtrace([{erl_eval,do_apply,5}, ?MODULE], BT)
+    end(),
+    fun() ->
+            {'EXIT', {{badarity, {_Fun, []}}, BT}} =
+                (catch parse_and_run("fun F(A) -> A end().")),
+            check_backtrace([{erl_eval,do_apply,5}, ?MODULE], BT)
+    end(),
+    backtrace_check("foo().",
+                    undef,
+                    [{erl_eval,foo,0},{erl_eval,local_func,6}],
+                    none, none),
+    backtrace_check("a orelse false.",
+                    {badarg, a},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("a andalso false.",
+                    {badarg, a},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("t = u.",
+                    {badmatch, u},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("{math,sqrt}(2).",
+                    {badfun, {math,sqrt}},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("erl_eval_SUITE:simple().",
+                    simple,
+                    [{?MODULE,simple1,0},{?MODULE,simple,0},erl_eval]),
+    Args = [{integer,1,I} || I <- lists:seq(1, 30)],
+    backtrace_check("fun(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,"
+                    "19,20,21,22,23,24,25,26,27,28,29,30) -> a end.",
+                    {argument_limit,
+                     {'fun',1,[{clause,1,Args,[],[{atom,1,a}]}]}},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("fun F(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,"
+                    "19,20,21,22,23,24,25,26,27,28,29,30) -> a end.",
+                    {argument_limit,
+                     {named_fun,1,'F',[{clause,1,Args,[],[{atom,1,a}]}]}},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("#r{}.",
+                    {undef_record,r},
+                    [{erl_eval,expr,5}, ?MODULE],
+                    none, none),
+    %% eval_bits
+    backtrace_check("<<100:8/bitstring>>.",
+                    badarg,
+                    [{eval_bits,eval_exp_field1,6},
+                     eval_bits,eval_bits,erl_eval]),
+    backtrace_check("<<100:8/foo>>.",
+                    {undefined_bittype,foo},
+                    [{eval_bits,make_bit_type,3},eval_bits,
+                     eval_bits,erl_eval],
+                    none, none),
+    backtrace_check("B = <<\"foo\">>, <<B/binary-unit:7>>.",
+                    badarg,
+                    [{eval_bits,eval_exp_field1,6},
+                     eval_bits,eval_bits,erl_eval],
+                    none, none),
+    ok.
+
+simple() ->
+    A = simple1(),
+    {A}.
+
+simple1() ->
+    erlang:error(simple).
+
 %% Simple cases, just to cover some code.
 funs(Config) when is_list(Config) ->
     do_funs(none, none),
@@ -1488,6 +1657,43 @@ error_check(String, Result, LFH, EFH) ->
             ct:fail({eval, Other, Result})
     end.
 
+backtrace_check(String, Result, Backtrace) ->
+    case catch parse_and_run(String) of
+        {'EXIT', {Result, BT}} ->
+            check_backtrace(Backtrace, BT);
+        Other ->
+            ct:fail({eval, Other, Result})
+    end.
+
+backtrace_check(String, Result, Backtrace, LFH, EFH) ->
+    case catch parse_and_run(String, LFH, EFH) of
+        {'EXIT', {Result, BT}} ->
+            check_backtrace(Backtrace, BT);
+        Other ->
+            ct:fail({eval, Other, Result})
+    end.
+
+backtrace_catch(String, Result, Backtrace) ->
+    case parse_and_run(String) of
+        {value, {'EXIT', {Result, BT}}, _Bindings} ->
+            check_backtrace(Backtrace, BT);
+        Other ->
+            ct:fail({eval, Other, Result})
+    end.
+
+check_backtrace([B1|Backtrace], [B2|BT]) ->
+    case {B1, B2} of
+        {M, {M,_,_,_}} ->
+            ok;
+        {{M,F,A}, {M,F,A,_}} ->
+            ok;
+        {B, B} ->
+            ok
+    end,
+    check_backtrace(Backtrace, BT);
+check_backtrace([], _) ->
+    ok.
+
 eval_string(String) ->
     {value, Result, _} = parse_and_run(String),
     Result.
@@ -1499,8 +1705,8 @@ parse_and_run(String) ->
 
 parse_and_run(String, LFH, EFH) ->
     {ok,Tokens,_} = erl_scan:string(String),
-    {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
-    erl_eval:expr(Expr, [], LFH, EFH).
+    {ok, Exprs} = erl_parse:parse_exprs(Tokens),
+    erl_eval:exprs(Exprs, [], LFH, EFH).
 
 no_final_dot(S) ->
     case lists:reverse(S) of
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index b76bece07f..e40f5e9a5d 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. 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.
@@ -66,7 +66,8 @@
          otp_11851/1,otp_11879/1,otp_13230/1,
          record_errors/1, otp_11879_cont/1,
          non_latin1_module/1, otp_14323/1,
-         get_stacktrace/1, otp_14285/1, otp_14378/1]).
+         get_stacktrace/1, stacktrace_syntax/1,
+         otp_14285/1, otp_14378/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -87,7 +88,7 @@ all() ->
      maps, maps_type, maps_parallel_match,
      otp_11851, otp_11879, otp_13230,
      record_errors, otp_11879_cont, non_latin1_module, otp_14323,
-     get_stacktrace, otp_14285, otp_14378].
+     get_stacktrace, stacktrace_syntax, otp_14285, otp_14378].
 
 groups() -> 
     [{unused_vars_warn, [],
@@ -3981,8 +3982,9 @@ non_latin1_module(Config) ->
 
 do_non_latin1_module(Mod) ->
     File = atom_to_list(Mod) ++ ".erl",
-    Forms = [{attribute,1,file,{File,1}},
-             {attribute,1,module,Mod},
+    L1 = erl_anno:new(1),
+    Forms = [{attribute,L1,file,{File,1}},
+             {attribute,L1,module,Mod},
              {eof,2}],
     error = compile:forms(Forms),
     {error,_,[]} = compile:forms(Forms, [return]),
@@ -4129,6 +4131,40 @@ get_stacktrace(Config) ->
     run(Config, Ts),
     ok.
 
+stacktrace_syntax(Config) ->
+    Ts = [{guard,
+           <<"t1() ->
+                  try error(foo)
+                  catch _:_:Stk when is_number(Stk) -> ok
+                  end.
+           ">>,
+           [],
+           {errors,[{3,erl_lint,{stacktrace_guard,'Stk'}}],[]}},
+          {bound,
+           <<"t1() ->
+                  Stk = [],
+                  try error(foo)
+                  catch _:_:Stk -> ok
+                  end.
+           ">>,
+           [],
+           {errors,[{4,erl_lint,{stacktrace_bound,'Stk'}}],[]}},
+          {guard_and_bound,
+           <<"t1() ->
+                  Stk = [],
+                  try error(foo)
+                  catch _:_:Stk when is_integer(Stk) -> ok
+                  end.
+           ">>,
+           [],
+           {errors,[{4,erl_lint,{stacktrace_bound,'Stk'}},
+                    {4,erl_lint,{stacktrace_guard,'Stk'}}],[]}}
+         ],
+
+    run(Config, Ts),
+    ok.
+
+
 %% Unicode atoms.
 otp_14285(Config) ->
     %% A small sample of all the errors and warnings in module erl_lint.
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index 808ba9b4c1..dda8d0a12e 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-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.
@@ -1262,7 +1262,7 @@ parse_forms(Chars) ->
 parse_forms2([], _Cont, _Line, Forms) ->
     lists:reverse(Forms);
 parse_forms2(String, Cont0, Line, Forms) ->
-    case erl_scan:tokens(Cont0, String, Line, [unicode]) of
+    case erl_scan:tokens(Cont0, String, Line) of
         {done, {ok, Tokens, EndLine}, Chars} ->
             {ok, Form} = erl_parse:parse_form(Tokens),
             parse_forms2(Chars, [], EndLine, [Form | Forms]);
@@ -1303,7 +1303,7 @@ parse_and_pp_expr(String, Indent, Options) ->
     erl_pp:expr(parse_expr(StringDot), Indent, Options).
 
 parse_expr(Chars) ->
-    {ok, Tokens, _} = erl_scan:string(Chars, 1, [unicode]),
+    {ok, Tokens, _} = erl_scan:string(Chars, 1),
     {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
     Expr.
 
diff --git a/lib/stdlib/test/error_logger_h_SUITE.erl b/lib/stdlib/test/error_logger_h_SUITE.erl
index 1f2a9fda0b..9dc04f27a1 100644
--- a/lib/stdlib/test/error_logger_h_SUITE.erl
+++ b/lib/stdlib/test/error_logger_h_SUITE.erl
@@ -257,8 +257,7 @@ match_output([Item|T], Lines0, AtNode, Depth) ->
 	Lines ->
 	    match_output(T, Lines, AtNode, Depth)
     catch
-	C:E ->
-	    Stk = erlang:get_stacktrace(),
+	C:E:Stk ->
 	    io:format("ITEM: ~p", [Item]),
 	    io:format("LINES: ~p", [Lines0]),
 	    erlang:raise(C, E, Stk)
diff --git a/lib/stdlib/test/escript_SUITE_data/unicode1 b/lib/stdlib/test/escript_SUITE_data/unicode1
index 351bb785e5..8dc9d450b8 100755
--- a/lib/stdlib/test/escript_SUITE_data/unicode1
+++ b/lib/stdlib/test/escript_SUITE_data/unicode1
@@ -8,7 +8,7 @@ main(_) ->
     _D = erlang:system_flag(backtrace_depth, 0),
     A = <<"\x{aaa}"/utf8>>,
     S = lists:flatten(io_lib:format("~p/~p.", [A, A])),
-    {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+    {ok, Ts, _} = erl_scan:string(S, 1),
     {ok, Es} = erl_parse:parse_exprs(Ts),
     B = erl_eval:new_bindings(),
     erl_eval:exprs(Es, B).
diff --git a/lib/stdlib/test/escript_SUITE_data/unicode2 b/lib/stdlib/test/escript_SUITE_data/unicode2
index 495188f6f0..d0195b036c 100755
--- a/lib/stdlib/test/escript_SUITE_data/unicode2
+++ b/lib/stdlib/test/escript_SUITE_data/unicode2
@@ -8,7 +8,7 @@ main(_) ->
     _D = erlang:system_flag(backtrace_depth, 0),
     A = <<"\x{aa}">>,
     S = lists:flatten(io_lib:format("~p/~p.", [A, A])),
-    {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+    {ok, Ts, _} = erl_scan:string(S, 1),
     {ok, Es} = erl_parse:parse_exprs(Ts),
     B = erl_eval:new_bindings(),
     erl_eval:exprs(Es, B).
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 5a5e282998..8b651f4b43 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -78,6 +78,7 @@
 -export([ets_all/1]).
 -export([massive_ets_all/1]).
 -export([take/1]).
+-export([whereis_table/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 %% Convenience for manual testing
@@ -137,7 +138,8 @@ all() ->
      otp_9423,
      ets_all,
      massive_ets_all,
-     take].
+     take,
+     whereis_table].
 
 groups() ->
     [{new, [],
@@ -1682,7 +1684,7 @@ do_random_test() ->
     ets:delete(Set),
     verify_etsmem(EtsMem).
 
-%% Ttest various variants of update_element.
+%% Test various variants of update_element.
 update_element(Config) when is_list(Config) ->
     EtsMem = etsmem(),
     repeat_for_opts(fun update_element_opts/1),
@@ -4099,6 +4101,7 @@ info_do(Opts) ->
     {value, {keypos, 2}} = lists:keysearch(keypos, 1, Res),
     {value, {protection, protected}} =
 	lists:keysearch(protection, 1, Res),
+    {value, {id, Tab}} = lists:keysearch(id, 1, Res),
     true = ets:delete(Tab),
     undefined = ets:info(non_existing_table_xxyy),
     undefined = ets:info(non_existing_table_xxyy,type),
@@ -5892,6 +5895,36 @@ take(Config) when is_list(Config) ->
     ets:delete(T3),
     ok.
 
+whereis_table(Config) when is_list(Config) ->
+    %% Do we return 'undefined' when the named table doesn't exist?
+    undefined = ets:whereis(whereis_test),
+
+    %% Does the tid() refer to the same table as the name?
+    whereis_test = ets:new(whereis_test, [named_table]),
+    Tid = ets:whereis(whereis_test),
+
+    ets:insert(whereis_test, [{hello}, {there}]),
+
+    [[{hello}],[{there}]] = ets:match(whereis_test, '$1'),
+    [[{hello}],[{there}]] = ets:match(Tid, '$1'),
+
+    true = ets:delete_all_objects(Tid),
+
+    [] = ets:match(whereis_test, '$1'),
+    [] = ets:match(Tid, '$1'),
+
+    %% Does the name disappear when deleted through the tid()?
+    true = ets:delete(Tid),
+    undefined = ets:info(whereis_test),
+    {'EXIT',{badarg, _}} = (catch ets:match(whereis_test, '$1')),
+
+    %% Is the old tid() broken when the table is re-created with the same
+    %% name?
+    whereis_test = ets:new(whereis_test, [named_table]),
+    [] = ets:match(whereis_test, '$1'),
+    {'EXIT',{badarg, _}} = (catch ets:match(Tid, '$1')),
+
+    ok.
 
 %%
 %% Utility functions:
@@ -6023,17 +6056,23 @@ etsmem() ->
 	 end},
     {Mem,AllTabs}.
 
-verify_etsmem({MemInfo,AllTabs}) ->
+
+verify_etsmem(MI) ->
     wait_for_test_procs(),
+    verify_etsmem(MI, 1).
+
+verify_etsmem({MemInfo,AllTabs}, Try) ->
     case etsmem() of
 	{MemInfo,_} ->
 	    io:format("Ets mem info: ~p", [MemInfo]),
-	    case MemInfo of
-		{ErlMem,EtsAlloc} when ErlMem == notsup; EtsAlloc == undefined ->
+	    case {MemInfo, Try} of
+		{{ErlMem,EtsAlloc},_} when ErlMem == notsup; EtsAlloc == undefined ->
 		    %% Use 'erl +Mea max' to do more complete memory leak testing.
 		    {comment,"Incomplete or no mem leak testing"};
-		_ ->
-                    ok
+		{_, 1} ->
+                    ok;
+                _ ->
+                    {comment, "Transient memory discrepancy"}
 	    end;
 
 	{MemInfo2, AllTabs2} ->
@@ -6041,7 +6080,15 @@ verify_etsmem({MemInfo,AllTabs}) ->
 	    io:format("Actual:   ~p", [MemInfo2]),
 	    io:format("Changed tables before: ~p\n",[AllTabs -- AllTabs2]),
 	    io:format("Changed tables after: ~p\n", [AllTabs2 -- AllTabs]),
-            ct:fail("Failed memory check")
+            case Try < 2 of
+                true ->
+                    io:format("\nThis discrepancy could be caused by an "
+                              "inconsistent memory \"snapshot\""
+                              "\nTry again...\n", []),
+                    verify_etsmem({MemInfo, AllTabs}, Try+1);
+                false ->
+                    ct:fail("Failed memory check")
+            end
     end.
 
 
@@ -6369,7 +6416,7 @@ very_big_num(0, Result) ->
     Result.
 
 make_port() ->
-    open_port({spawn, "efile"}, [eof]).
+    hd(erlang:ports()).
 
 make_pid() ->
     spawn_link(fun sleeper/0).
diff --git a/lib/stdlib/test/filelib_SUITE.erl b/lib/stdlib/test/filelib_SUITE.erl
index 1236fe45f4..7403d52881 100644
--- a/lib/stdlib/test/filelib_SUITE.erl
+++ b/lib/stdlib/test/filelib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-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.
@@ -26,13 +26,15 @@
 	 wildcard_one/1,wildcard_two/1,wildcard_errors/1,
 	 fold_files/1,otp_5960/1,ensure_dir_eexist/1,ensure_dir_symlink/1,
 	 wildcard_symlink/1, is_file_symlink/1, file_props_symlink/1,
-         find_source/1]).
+         find_source/1, find_source_subdir/1]).
 
 -import(lists, [foreach/2]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
+-define(PRIM_FILE, prim_file).
+
 init_per_testcase(_Case, Config) ->
     Config.
 
@@ -47,7 +49,7 @@ all() ->
     [wildcard_one, wildcard_two, wildcard_errors,
      fold_files, otp_5960, ensure_dir_eexist, ensure_dir_symlink,
      wildcard_symlink, is_file_symlink, file_props_symlink,
-     find_source].
+     find_source, find_source_subdir].
 
 groups() -> 
     [].
@@ -446,10 +448,10 @@ wildcard_symlink(Config) when is_list(Config) ->
 						erl_prim_loader)),
 	    ["sub","symlink"] =
 		basenames(Dir, filelib:wildcard(filename:join(Dir, "*"),
-						prim_file)),
+						?PRIM_FILE)),
 	    ["symlink"] =
 		basenames(Dir, filelib:wildcard(filename:join(Dir, "symlink"),
-						prim_file)),
+						?PRIM_FILE)),
 	    ok = file:delete(AFile),
 	    %% The symlink should still be visible even when its target
 	    %% has been deleted.
@@ -465,10 +467,10 @@ wildcard_symlink(Config) when is_list(Config) ->
 						erl_prim_loader)),
 	    ["sub","symlink"] =
 		basenames(Dir, filelib:wildcard(filename:join(Dir, "*"),
-						prim_file)),
+						?PRIM_FILE)),
 	    ["symlink"] =
 		basenames(Dir, filelib:wildcard(filename:join(Dir, "symlink"),
-						prim_file)),
+						?PRIM_FILE)),
 	    ok
     end.
 
@@ -497,17 +499,17 @@ is_file_symlink(Config) ->
 	ok ->
 	    true = filelib:is_dir(DirAlias),
 	    true = filelib:is_dir(DirAlias, erl_prim_loader),
-	    true = filelib:is_dir(DirAlias, prim_file),
+	    true = filelib:is_dir(DirAlias, ?PRIM_FILE),
 	    true = filelib:is_file(DirAlias),
 	    true = filelib:is_file(DirAlias, erl_prim_loader),
-	    true = filelib:is_file(DirAlias, prim_file),
+	    true = filelib:is_file(DirAlias, ?PRIM_FILE),
 	    ok = file:make_symlink(AFile,FileAlias),
 	    true = filelib:is_file(FileAlias),
 	    true = filelib:is_file(FileAlias, erl_prim_loader),
-	    true = filelib:is_file(FileAlias, prim_file),
+	    true = filelib:is_file(FileAlias, ?PRIM_FILE),
 	    true = filelib:is_regular(FileAlias),
 	    true = filelib:is_regular(FileAlias, erl_prim_loader),
-	    true = filelib:is_regular(FileAlias, prim_file),
+	    true = filelib:is_regular(FileAlias, ?PRIM_FILE),
 	    ok
     end.
 
@@ -528,11 +530,11 @@ file_props_symlink(Config) ->
 	    {_,_} = LastMod = filelib:last_modified(AFile),
 	    LastMod = filelib:last_modified(Alias),
 	    LastMod = filelib:last_modified(Alias, erl_prim_loader),
-	    LastMod = filelib:last_modified(Alias, prim_file),
+	    LastMod = filelib:last_modified(Alias, ?PRIM_FILE),
 	    FileSize = filelib:file_size(AFile),
 	    FileSize = filelib:file_size(Alias),
 	    FileSize = filelib:file_size(Alias, erl_prim_loader),
-	    FileSize = filelib:file_size(Alias, prim_file)
+	    FileSize = filelib:file_size(Alias, ?PRIM_FILE)
     end.
 
 find_source(Config) when is_list(Config) ->
@@ -565,16 +567,18 @@ find_source(Config) when is_list(Config) ->
                                               [{".erl",".yrl",[{"",""}]}]),
 
     {ok, ParserErl} = filelib:find_source(code:which(core_parse)),
+    ParserErlName = filename:basename(ParserErl),
+    ParserErlDir = filename:dirname(ParserErl),
     {ok, ParserYrl} = filelib:find_source(ParserErl),
     "lry." ++ _ = lists:reverse(ParserYrl),
-    {ok, ParserYrl} = filelib:find_source(ParserErl,
+    {ok, ParserYrl} = filelib:find_source(ParserErlName, ParserErlDir,
                                            [{".beam",".erl",[{"ebin","src"}]},
                                             {".erl",".yrl",[{"",""}]}]),
 
     %% find_source automatically checks the local directory regardless of rules
     {ok, ParserYrl} = filelib:find_source(ParserErl),
-    {ok, ParserYrl} = filelib:find_source(ParserErl,
-                                          [{".beam",".erl",[{"ebin","src"}]}]),
+    {ok, ParserYrl} = filelib:find_source(ParserErlName, ParserErlDir,
+                                          [{".erl",".yrl",[{"ebin","src"}]}]),
 
     %% find_file does not check the local directory unless in the rules
     ParserYrlName = filename:basename(ParserYrl),
@@ -588,3 +592,24 @@ find_source(Config) when is_list(Config) ->
     {ok, ParserYrl} = filelib:find_file(ParserYrlName, ParserYrlDir),
     {ok, ParserYrl} = filelib:find_file(ParserYrlName, ParserYrlDir, []),
     ok.
+
+find_source_subdir(Config) when is_list(Config) ->
+    BeamFile = code:which(inets), % Located in lib/inets/src/inets_app/
+    BeamName = filename:basename(BeamFile),
+    BeamDir = filename:dirname(BeamFile),
+    SrcName = filename:basename(BeamFile, ".beam") ++ ".erl",
+
+    {ok, SrcFile} = filelib:find_source(BeamName, BeamDir),
+    SrcName = filename:basename(SrcFile),
+
+    {error, not_found} =
+        filelib:find_source(BeamName, BeamDir,
+                            [{".beam",".erl",[{"ebin","src"}]}]),
+    {ok, SrcFile} =
+        filelib:find_source(BeamName, BeamDir,
+                            [{".beam",".erl",
+                              [{"ebin",filename:join("src", "*")}]}]),
+
+    {ok, SrcFile} = filelib:find_file(SrcName, BeamDir),
+
+    ok.
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index 86cf58566b..41ee3246f5 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -389,7 +389,7 @@ stop10(_Config) ->
     Dir = filename:dirname(code:which(?MODULE)),
     rpc:call(Node,code,add_path,[Dir]),
     {ok, Pid} = rpc:call(Node,gen_fsm,start,[{global,to_stop},?MODULE,[],[]]),
-    global:sync(),
+    ok = global:sync(),
     ok = gen_fsm:stop({global,to_stop}),
     false = rpc:call(Node,erlang,is_process_alive,[Pid]),
     {'EXIT',noproc} = (catch gen_fsm:stop({global,to_stop})),
@@ -1005,7 +1005,7 @@ undef_in_terminate(Config) when is_list(Config) ->
     State = {undef_in_terminate, {?MODULE, terminate}},
     {ok, FSM} = gen_fsm:start(?MODULE, {state_data, State}, []),
     try
-        gen_fsm:stop(FSM),
+        ok = gen_fsm:stop(FSM),
         ct:fail(failed)
     catch
         exit:{undef, [{?MODULE, terminate, _, _}|_]} ->
@@ -1201,7 +1201,7 @@ timeout({timeout,Ref,{timeout,Time}}, {From,Ref}) ->
     Cref = gen_fsm:start_timer(Time, cancel),
     Time4 = Time*4,
     receive after Time4 -> ok end,
-    gen_fsm:cancel_timer(Cref),
+    _= gen_fsm:cancel_timer(Cref),
     {next_state, timeout, {From,Ref2}};
 timeout({timeout,Ref2,ok},{From,Ref2}) ->
     gen_fsm:reply(From, ok),
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index 2bc220fef2..e29195e895 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. 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.
@@ -347,7 +347,7 @@ stop10(_Config) ->
     Dir = filename:dirname(code:which(?MODULE)),
     rpc:call(Node,code,add_path,[Dir]),
     {ok, Pid} = rpc:call(Node,gen_server,start,[{global,to_stop},?MODULE,[],[]]),
-    global:sync(),
+    ok = global:sync(),
     ok = gen_server:stop({global,to_stop}),
     false = rpc:call(Node,erlang,is_process_alive,[Pid]),
     {'EXIT',noproc} = (catch gen_server:stop({global,to_stop})),
@@ -509,7 +509,7 @@ start_node(Name) ->
     %% After starting a slave, it takes a little while until global knows
     %% about it, even if nodes() includes it, so we make sure that global
     %% knows about it before registering something on all nodes.
-    global:sync(),
+    ok = global:sync(),
     N.
 
 call_remote1(Config) when is_list(Config) ->
@@ -647,7 +647,7 @@ cast_fast(Config) when is_list(Config) ->
 cast_fast_messup() ->
     %% Register a false node: hopp@hostname
     unregister(erl_epmd),
-    erl_epmd:start_link(),
+    {ok, _} = erl_epmd:start_link(),
     {ok,S} = gen_tcp:listen(0, []),
     {ok,P} = inet:port(S),
     {ok,_Creation} = erl_epmd:register_node(hopp, P),
@@ -1351,7 +1351,7 @@ do_call_with_huge_message_queue() ->
 
     {Time,ok} = tc(fun() -> calls(10000, Pid) end),
 
-    [self() ! {msg,N} || N <- lists:seq(1, 500000)],
+    _ = [self() ! {msg,N} || N <- lists:seq(1, 500000)],
     erlang:garbage_collect(),
     {NewTime,ok} = tc(fun() -> calls(10000, Pid) end),
     io:format("Time for empty message queue: ~p", [Time]),
@@ -1476,7 +1476,7 @@ undef_in_terminate(Config) when is_list(Config) ->
     State = {undef_in_terminate, {oc_server, terminate}},
     {ok, Server} = gen_server:start(?MODULE, {state, State}, []),
     try
-        gen_server:stop(Server),
+        ok = gen_server:stop(Server),
         ct:fail(failed)
     catch
         exit:{undef, [{oc_server, terminate, [], _}|_]} ->
@@ -1674,7 +1674,7 @@ handle_cast({From,delayed_cast,T}, _State) ->
 handle_cast(hibernate_now, _State) ->
     {noreply, [], hibernate};
 handle_cast(hibernate_later, _State) ->
-    timer:send_after(1000,self(),hibernate_now),
+    {ok, _} = timer:send_after(1000,self(),hibernate_now),
     {noreply, []};
 handle_cast({call_undef_fun, Mod, Fun}, State) ->
     Mod:Fun(),
diff --git a/lib/stdlib/test/gen_statem_SUITE.erl b/lib/stdlib/test/gen_statem_SUITE.erl
index 5b9daecfd3..7c8a386116 100644
--- a/lib/stdlib/test/gen_statem_SUITE.erl
+++ b/lib/stdlib/test/gen_statem_SUITE.erl
@@ -21,7 +21,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 -behaviour(gen_statem).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2040,9 +2040,9 @@ handle_event(Type, Event, State, Data) ->
 	Result ->
 	    wrap_result(Result)
     catch
-	throw:Result ->
+	throw:Result:Stacktrace ->
 	    erlang:raise(
-	      throw, wrap_result(Result), erlang:get_stacktrace())
+	      throw, wrap_result(Result), Stacktrace)
     end.
 
 unwrap_state([State]) ->
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index e2c73371cd..6f4e7ad7e0 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2017. 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.
@@ -714,7 +714,7 @@ p(Term, D) ->
     rp(Term, 1, 80, D).
 
 p(Term, Col, Ll, D) ->
-    rp(Term, Col, Ll, D, no_fun).
+    rp(Term, Col, Ll, D, none).
 
 rp(Term, Col, Ll, D) ->
     rp(Term, Col, Ll, D, fun rfd/2).
@@ -724,6 +724,8 @@ rp(Term, Col, Ll, D) ->
 rp(Term, Col, Ll, D, RF) ->
     rp(Term, Col, Ll, D, ?MAXCS, RF).
 
+rp(Term, Col, Ll, D, M, none) ->
+    rp(Term, Col, Ll, D, M, fun(_, _) -> no end);
 rp(Term, Col, Ll, D, M, RF) ->
     %% io:format("~n~n*** Col = ~p Ll = ~p D = ~p~n~p~n-->~n", 
     %%           [Col, Ll, D, Term]),
@@ -1903,29 +1905,61 @@ otp_10836(Suite) when is_list(Suite) ->
 
 %% OTP-10755. The 'l' modifier
 otp_10755(Suite) when is_list(Suite) ->
+    %% printing plain ascii characters
     S = "string",
     "\"string\"" = fmt("~p", [S]),
     "[115,116,114,105,110,103]" = fmt("~lp", [S]),
     "\"string\"" = fmt("~P", [S, 2]),
     "[115|...]" = fmt("~lP", [S, 2]),
-    {'EXIT',{badarg,_}} = (catch fmt("~ltp", [S])),
-    {'EXIT',{badarg,_}} = (catch fmt("~tlp", [S])),
-    {'EXIT',{badarg,_}} = (catch fmt("~ltP", [S])),
-    {'EXIT',{badarg,_}} = (catch fmt("~tlP", [S])),
+    %% printing latin1 chars, with and without modifiers
+    T = {[255],list_to_atom([255]),[a,b,c]},
+    "{\"ÿ\",ÿ,[a,b,c]}" = fmt("~p", [T]),
+    "{\"ÿ\",ÿ,[a,b,c]}" = fmt("~tp", [T]),
+    "{[255],ÿ,[a,b,c]}" = fmt("~lp", [T]),
+    "{[255],ÿ,[a,b,c]}" = fmt("~ltp", [T]),
+    "{[255],ÿ,[a,b,c]}" = fmt("~tlp", [T]),
+    "{\"ÿ\",ÿ,...}" = fmt("~P", [T,3]),
+    "{\"ÿ\",ÿ,...}" = fmt("~tP", [T,3]),
+    "{[255],ÿ,...}" = fmt("~lP", [T,3]),
+    "{[255],ÿ,...}" = fmt("~ltP", [T,3]),
+    "{[255],ÿ,...}" = fmt("~tlP", [T,3]),
+    %% printing unicode chars, with and without modifiers
+    U = {[666],list_to_atom([666]),[a,b,c]},
+    "{[666],'\\x{29A}',[a,b,c]}" = fmt("~p", [U]),
+    case io:printable_range() of
+        unicode ->
+            "{\"ʚ\",'ʚ',[a,b,c]}" = fmt("~tp", [U]),
+            "{\"ʚ\",'ʚ',...}" = fmt("~tP", [U,3]);
+        latin1 ->
+            "{[666],'ʚ',[a,b,c]}" = fmt("~tp", [U]),
+            "{[666],'ʚ',...}" = fmt("~tP", [U,3])
+    end,
+    "{[666],'\\x{29A}',[a,b,c]}" = fmt("~lp", [U]),
+    "{[666],'ʚ',[a,b,c]}" = fmt("~ltp", [U]),
+    "{[666],'ʚ',[a,b,c]}" = fmt("~tlp", [U]),
+    "{[666],'\\x{29A}',...}" = fmt("~P", [U,3]),
+    "{[666],'\\x{29A}',...}" = fmt("~lP", [U,3]),
+    "{[666],'ʚ',...}" = fmt("~ltP", [U,3]),
+    "{[666],'ʚ',...}" = fmt("~tlP", [U,3]),
+    %% the compiler should catch uses of ~l with other than pP
     Text =
         "-module(l_mod).\n"
         "-export([t/0]).\n"
         "t() ->\n"
         "    S = \"string\",\n"
-        "    io:format(\"~ltp\", [S]),\n"
-        "    io:format(\"~tlp\", [S]),\n"
-        "    io:format(\"~ltP\", [S, 1]),\n"
-        "    io:format(\"~tlP\", [S, 1]).\n",
+        "    io:format(\"~lw\", [S]),\n"
+        "    io:format(\"~lW\", [S, 1]),\n"
+        "    io:format(\"~ltw\", [S]),\n"
+        "    io:format(\"~tlw\", [S]),\n"
+        "    io:format(\"~ltW\", [S, 1]),\n"
+        "    io:format(\"~tlW\", [S, 1]).\n",
     {ok,l_mod,[{_File,Ws}]} = compile_file("l_mod.erl", Text, Suite),
-    ["format string invalid (invalid control ~lt)",
-     "format string invalid (invalid control ~tl)",
-     "format string invalid (invalid control ~lt)",
-     "format string invalid (invalid control ~tl)"] =
+    ["format string invalid (invalid control ~lw)",
+     "format string invalid (invalid control ~lW)",
+     "format string invalid (invalid control ~ltw)",
+     "format string invalid (invalid control ~ltw)",
+     "format string invalid (invalid control ~ltW)",
+     "format string invalid (invalid control ~ltW)"] =
         [lists:flatten(M:format_error(E)) || {_L,M,E} <- Ws],
     ok.
 
@@ -2003,6 +2037,7 @@ writes(N, F1) ->
 
 format_string(_Config) ->
     %% All but padding is tested by fmt/2.
+    "xxxxxxxsss" = fmt("~10..xs", ["sss"]),
     "xxxxxxsssx" = fmt("~10.4.xs", ["sss"]),
     "xxxxxxsssx" = fmt("~10.4.*s", [$x, "sss"]),
     ok.
@@ -2138,8 +2173,8 @@ otp_14175(_Config) ->
     "#{}" = p(#{}, 1),
     "#{...}" = p(#{a => 1}, 1),
     "#{#{} => a}" = p(#{#{} => a}, 2),
-    "#{a => 1,...}" = p(#{a => 1, b => 2}, 2),
-    "#{a => 1,b => 2}" = p(#{a => 1, b => 2}, -1),
+    mt("#{a => 1,...}", p(#{a => 1, b => 2}, 2)),
+    mt("#{a => 1,b => 2}", p(#{a => 1, b => 2}, -1)),
 
     M = #{kaaaaaaaaaaaaaaaaaaa => v1,kbbbbbbbbbbbbbbbbbbb => v2,
           kccccccccccccccccccc => v3,kddddddddddddddddddd => v4,
@@ -2382,19 +2417,36 @@ limit_term(_Config) ->
     {_, 2} = limt({a,b,c,[d,e]}, 2),
     {_, 2} = limt({a,b,c,[d,e]}, 3),
     {_, 2} = limt({a,b,c,[d,e]}, 4),
+    T0 = [1|{a,b,c}],
+    {_, 2} = limt(T0, 2),
+    {_, 2} = limt(T0, 3),
+    {_, 2} = limt(T0, 4),
     {_, 1} = limt(<<"foo">>, 18),
+    {_, 2} = limt({"",[1,2]}, 3),
+    {_, 2} = limt({"",{1,2}}, 3),
+    true = limt_pp({"123456789012345678901234567890",{1,2}}, 3),
     ok = blimt(<<"123456789012345678901234567890">>),
+    true = limt_pp(<<"123456789012345678901234567890">>, 3),
+    {_, 2} = limt({<<"kljlkjsl">>,[1,2,3,4]}, 4),
     {_, 1} = limt(<<7:3>>, 2),
     {_, 1} = limt(<<7:21>>, 2),
     {_, 1} = limt([], 2),
     {_, 1} = limt({}, 2),
+    {_, 1} = limt({"", ""}, 4),
     {_, 1} = limt(#{}, 2),
-    {_, 1} = limt(#{[] => {}}, 2),
+    {_, 2} = limt(#{[] => {}}, 1),
+    {_, 2} = limt(#{[] => {}}, 2),
     {_, 1} = limt(#{[] => {}}, 3),
     T = #{[] => {},[a] => [b]},
-    {_, 1} = limt(T, 2),
+    {_, 1} = limt(T, 0),
+    {_, 2} = limt(T, 1),
+    {_, 2} = limt(T, 2),
     {_, 1} = limt(T, 3),
     {_, 1} = limt(T, 4),
+    T2 = #{[] => {},{} => []},
+    {_, 2} = limt(T2, 1),
+    {_, 2} = limt(T2, 2),
+    {_, 1} = limt(T2, 3),
     ok.
 
 blimt(Binary) ->
@@ -2428,3 +2480,12 @@ limt(Term, Depth) when is_integer(Depth) ->
 
 form(Term, Depth) ->
     lists:flatten(io_lib:format("~W", [Term, Depth])).
+
+limt_pp(Term, Depth) when is_integer(Depth) ->
+    T1 = io_lib:limit_term(Term, Depth),
+    S = pp(Term, Depth),
+    S1 = pp(T1, Depth),
+    S1 =:= S.
+
+pp(Term, Depth) ->
+    lists:flatten(io_lib:format("~P", [Term, Depth])).
diff --git a/lib/stdlib/test/maps_SUITE.erl b/lib/stdlib/test/maps_SUITE.erl
index 42e669a799..a75751b31d 100644
--- a/lib/stdlib/test/maps_SUITE.erl
+++ b/lib/stdlib/test/maps_SUITE.erl
@@ -30,6 +30,7 @@
 -export([t_update_with_3/1, t_update_with_4/1,
          t_get_3/1, t_filter_2/1,
          t_fold_3/1,t_map_2/1,t_size_1/1,
+         t_iterator_1/1,
          t_with_2/1,t_without_2/1]).
 
 %%-define(badmap(V,F,Args), {'EXIT', {{badmap,V}, [{maps,F,Args,_}|_]}}).
@@ -47,6 +48,7 @@ all() ->
     [t_update_with_3,t_update_with_4,
      t_get_3,t_filter_2,
      t_fold_3,t_map_2,t_size_1,
+     t_iterator_1,
      t_with_2,t_without_2].
 
 t_update_with_3(Config) when is_list(Config) ->
@@ -127,6 +129,8 @@ t_filter_2(Config) when is_list(Config) ->
     Pred2 = fun(K,V) -> is_list(K) andalso (V rem 2) =:= 0 end,
     #{a := 2,c := 4} = maps:filter(Pred1,M),
     #{"b" := 2,"c" := 4} = maps:filter(Pred2,M),
+    #{a := 2,c := 4} = maps:filter(Pred1,maps:iterator(M)),
+    #{"b" := 2,"c" := 4} = maps:filter(Pred2,maps:iterator(M)),
     %% error case
     ?badmap(a,filter,[_,a]) = (catch maps:filter(fun(_,_) -> ok end,id(a))),
     ?badarg(filter,[<<>>,#{}]) = (catch maps:filter(id(<<>>),#{})),
@@ -139,6 +143,8 @@ t_fold_3(Config) when is_list(Config) ->
     Tot0 = lists:sum(Vs),
     Tot1 = maps:fold(fun({k,_},V,A) -> A + V end, 0, M0),
     true = Tot0 =:= Tot1,
+    Tot2 = maps:fold(fun({k,_},V,A) -> A + V end, 0, maps:iterator(M0)),
+    true = Tot0 =:= Tot2,
 
     %% error case
     ?badmap(a,fold,[_,0,a]) = (catch maps:fold(fun(_,_,_) -> ok end,0,id(a))),
@@ -151,12 +157,48 @@ t_map_2(Config) when is_list(Config) ->
     #{ {k,1} := 1, {k,200} := 200} = M0,
     M1 = maps:map(fun({k,_},V) -> V + 42 end, M0),
     #{ {k,1} := 43, {k,200} := 242} = M1,
+    M2 = maps:map(fun({k,_},V) -> V + 42 end, maps:iterator(M0)),
+    #{ {k,1} := 43, {k,200} := 242} = M2,
 
     %% error case
     ?badmap(a,map,[_,a]) = (catch maps:map(fun(_,_) -> ok end, id(a))),
     ?badarg(map,[<<>>,#{}]) = (catch maps:map(id(<<>>),#{})),
     ok.
 
+t_iterator_1(Config) when is_list(Config) ->
+
+    %% Small map test
+    M0 = #{ a => 1, b => 2 },
+    I0 = maps:iterator(M0),
+    {K1,V1,I1} = maps:next(I0),
+    {K2,V2,I2} = maps:next(I1),
+    none = maps:next(I2),
+
+    KVList = lists:sort([{K1,V1},{K2,V2}]),
+    KVList = lists:sort(maps:to_list(M0)),
+
+    %% Large map test
+
+    Vs2 = lists:seq(1,200),
+    M2 = maps:from_list([{{k,I},I}||I<-Vs2]),
+    KVList2 = lists:sort(iter_kv(maps:iterator(M2))),
+    KVList2 = lists:sort(maps:to_list(M2)),
+
+    %% Larger map test
+
+    Vs3 = lists:seq(1,10000),
+    M3 = maps:from_list([{{k,I},I}||I<-Vs3]),
+    KVList3 = lists:sort(iter_kv(maps:iterator(M3))),
+    KVList3 = lists:sort(maps:to_list(M3)),
+    ok.
+
+iter_kv(I) ->
+    case maps:next(I) of
+        none ->
+            [];
+        {K,V,NI} ->
+            [{K,V} | iter_kv(NI)]
+    end.
 
 t_size_1(Config) when is_list(Config) ->
       0 = maps:size(#{}),
diff --git a/lib/stdlib/test/proc_lib_SUITE.erl b/lib/stdlib/test/proc_lib_SUITE.erl
index 7686889360..fbdcb518b2 100644
--- a/lib/stdlib/test/proc_lib_SUITE.erl
+++ b/lib/stdlib/test/proc_lib_SUITE.erl
@@ -446,8 +446,8 @@ init_dont_hang(Config) when is_list(Config) ->
 	StartLinkRes = proc_lib:start(?MODULE, init_dont_hang_init, [self()], 1000),
 	StartLinkRes = proc_lib:start(?MODULE, init_dont_hang_init, [self()], 1000, []),
 	ok
-    catch _:Error ->
-	    io:format("Error ~p /= ~p ~n",[erlang:get_stacktrace(), StartLinkRes]),
+    catch _:Error:Stacktrace ->
+	    io:format("Error ~p /= ~p ~n",[Stacktrace, StartLinkRes]),
 	    exit(Error)
     end.
 
diff --git a/lib/stdlib/test/property_test/README b/lib/stdlib/test/property_test/README
new file mode 100644
index 0000000000..57602bf719
--- /dev/null
+++ b/lib/stdlib/test/property_test/README
@@ -0,0 +1,12 @@
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%                                                             %%%
+%%%                       WARNING                               %%%
+%%%                                                             %%%
+%%% This is experimental code which may be changed or removed   %%%
+%%%               anytime without any warning.                  %%%
+%%%                                                             %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+The test in this directory are written assuming that the user has a QuickCheck license.  They are to be run manually.  Some may be possible to be run with other tools, e.g. PropEr.
+
diff --git a/lib/stdlib/test/property_test/uri_string_recompose.erl b/lib/stdlib/test/property_test/uri_string_recompose.erl
new file mode 100644
index 0000000000..e51a671172
--- /dev/null
+++ b/lib/stdlib/test/property_test/uri_string_recompose.erl
@@ -0,0 +1,361 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-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.
+%% 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(uri_string_recompose).
+
+-compile(export_all).
+
+-proptest(eqc).
+-proptest([triq,proper]).
+
+-ifndef(EQC).
+-ifndef(PROPER).
+-ifndef(TRIQ).
+-define(EQC,true).
+-endif.
+-endif.
+-endif.
+
+-ifdef(EQC).
+-include_lib("eqc/include/eqc.hrl").
+-define(MOD_eqc,eqc).
+
+-else.
+-ifdef(PROPER).
+-include_lib("proper/include/proper.hrl").
+-define(MOD_eqc,proper).
+
+-else.
+-ifdef(TRIQ).
+-define(MOD_eqc,triq).
+-include_lib("triq/include/triq.hrl").
+
+-endif.
+-endif.
+-endif.
+
+
+-define(STRING_REST(MatchStr, Rest), <<MatchStr/utf8, Rest/binary>>).
+
+-define(SCHEME, {scheme, scheme()}).
+-define(USER, {userinfo, unicode()}).
+-define(HOST, {host, host_map()}).
+-define(PORT, {port, port()}).
+-define(PATH_ABE, {path, path_abempty_map()}).
+-define(PATH_ABS, {path, path_absolute_map()}).
+-define(PATH_NOS, {path, path_noscheme_map()}).
+-define(PATH_ROO, {path, path_rootless_map()}).
+-define(PATH_EMP, {path, path_empty_map()}).
+-define(QUERY, {query, query_map()}).
+-define(FRAGMENT, {fragment, fragment_map()}).
+
+
+%%%========================================================================
+%%% Properties
+%%%========================================================================
+
+prop_recompose() ->
+    ?FORALL(Map, map(),
+            Map =:= uri_string:parse(uri_string:recompose(Map))
+           ).
+
+%% Stats
+prop_map_key_length_collect() ->
+    ?FORALL(List, map(),
+            collect(length(maps:keys(List)), true)).
+
+prop_map_collect() ->
+    ?FORALL(List, map(),
+            collect(lists:sort(maps:keys(List)), true)).
+
+prop_scheme_collect() ->
+    ?FORALL(List, scheme(),
+            collect(length(List), true)).
+
+
+%%%========================================================================
+%%% Generators
+%%%========================================================================
+
+map() ->
+    ?LET(Gen, comp_proplist(), proplist_to_map(Gen)).
+
+comp_proplist() ->
+    frequency([
+               {2, [?SCHEME,?PATH_ABS]},
+               {2, [?SCHEME,?PATH_ROO]},
+               {2, [?SCHEME,?PATH_EMP]},
+               {2, [?SCHEME,?HOST,?PATH_ABE]},
+               {2, [?SCHEME,?USER,?HOST,?PATH_ABE]},
+               {2, [?SCHEME,?HOST,?PORT,?PATH_ABE]},
+               {2, [?SCHEME,?USER,?HOST,?PORT,?PATH_ABE]},
+
+               {2, [?PATH_ABS]},
+               {2, [?PATH_NOS]},
+               {2, [?PATH_EMP]},
+               {2, [?HOST,?PATH_ABE]},
+               {2, [?USER,?HOST,?PATH_ABE]},
+               {2, [?HOST,?PORT,?PATH_ABE]},
+               {2, [?USER,?HOST,?PORT,?PATH_ABE]},
+
+
+               {2, [?SCHEME,?PATH_ABS,?QUERY]},
+               {2, [?SCHEME,?PATH_ROO,?QUERY]},
+               {2, [?SCHEME,?PATH_EMP,?QUERY]},
+               {2, [?SCHEME,?HOST,?PATH_ABE,?QUERY]},
+               {2, [?SCHEME,?USER,?HOST,?PATH_ABE,?QUERY]},
+               {2, [?SCHEME,?HOST,?PORT,?PATH_ABE,?QUERY]},
+               {2, [?SCHEME,?USER,?HOST,?PORT,?PATH_ABE,?QUERY]},
+
+               {2, [?PATH_ABS,?QUERY]},
+               {2, [?PATH_NOS,?QUERY]},
+               {2, [?PATH_EMP,?QUERY]},
+               {2, [?HOST,?PATH_ABE,?QUERY]},
+               {2, [?USER,?HOST,?PATH_ABE,?QUERY]},
+               {2, [?HOST,?PORT,?PATH_ABE,?QUERY]},
+               {2, [?USER,?HOST,?PORT,?PATH_ABE,?QUERY]},
+
+
+               {2, [?SCHEME,?PATH_ABS,?FRAGMENT]},
+               {2, [?SCHEME,?PATH_ROO,?FRAGMENT]},
+               {2, [?SCHEME,?PATH_EMP,?FRAGMENT]},
+               {2, [?SCHEME,?HOST,?PATH_ABE,?FRAGMENT]},
+               {2, [?SCHEME,?USER,?HOST,?PATH_ABE,?FRAGMENT]},
+               {2, [?SCHEME,?HOST,?PORT,?PATH_ABE,?FRAGMENT]},
+               {2, [?SCHEME,?USER,?HOST,?PORT,?PATH_ABE,?FRAGMENT]},
+
+               {2, [?PATH_ABS,?FRAGMENT]},
+               {2, [?PATH_NOS,?FRAGMENT]},
+               {2, [?PATH_EMP,?FRAGMENT]},
+               {2, [?HOST,?PATH_ABE,?FRAGMENT]},
+               {2, [?USER,?HOST,?PATH_ABE,?FRAGMENT]},
+               {2, [?HOST,?PORT,?PATH_ABE,?FRAGMENT]},
+               {2, [?USER,?HOST,?PORT,?PATH_ABE,?FRAGMENT]},
+
+
+               {2, [?SCHEME,?PATH_ABS,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?PATH_ROO,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?PATH_EMP,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?HOST,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?USER,?HOST,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?HOST,?PORT,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?USER,?HOST,?PORT,?PATH_ABE,?QUERY,?FRAGMENT]},
+
+               {2, [?PATH_ABS,?QUERY,?FRAGMENT]},
+               {2, [?PATH_NOS,?QUERY,?FRAGMENT]},
+               {2, [?PATH_EMP,?QUERY,?FRAGMENT]},
+               {2, [?HOST,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?USER,?HOST,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?HOST,?PORT,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?USER,?HOST,?PORT,?PATH_ABE,?QUERY,?FRAGMENT]}
+              ]).
+
+
+%%-------------------------------------------------------------------------
+%% Path
+%%-------------------------------------------------------------------------
+path_abempty_map() ->
+    frequency([{90, path_abe_map()},
+               {10, path_empty_map()}]).
+
+path_abe_map() ->
+    ?SIZED(Length, path_abe_map(Length, [])).
+%%
+path_abe_map(0, Segments) ->
+    ?LET(Gen, Segments, lists:append(Gen));
+path_abe_map(N, Segments) ->
+    path_abe_map(N-1, [slash(),segment()|Segments]).
+
+
+path_absolute_map() ->
+    ?SIZED(Length, path_absolute_map(Length, [])).
+%%
+path_absolute_map(0, Segments) ->
+    ?LET(Gen, [slash(),segment_nz()|Segments], lists:append(Gen));
+path_absolute_map(N, Segments) ->
+    path_absolute_map(N-1, [slash(),segment()|Segments]).
+
+
+path_noscheme_map() ->
+    ?SIZED(Length, path_noscheme_map(Length, [])).
+%%
+path_noscheme_map(0, Segments) ->
+    ?LET(Gen, [segment_nz_nc()|Segments], lists:append(Gen));
+path_noscheme_map(N, Segments) ->
+    path_noscheme_map(N-1, [slash(),segment()|Segments]).
+
+path_rootless_map() ->
+    ?SIZED(Length, path_rootless_map(Length, [])).
+%%
+path_rootless_map(0, Segments) ->
+    ?LET(Gen, [segment_nz()|Segments], lists:append(Gen));
+path_rootless_map(N, Segments) ->
+    path_rootless_map(N-1, [slash(),segment()|Segments]).
+
+
+segment_nz() ->
+    non_empty(segment()).
+
+segment_nz_nc() ->
+    non_empty(list(frequency([{30, unreserved()},
+                              {10, sub_delims()},
+                              {10, unicode_char()},
+                              {5, oneof([$@])}
+                             ]))).
+
+
+segment() ->
+    list(frequency([{30, unreserved()},
+                    {10, sub_delims()},
+                    {10, unicode_char()},
+                    {5, oneof([$:, $@])}
+                   ])).
+
+slash() ->
+    "/".
+
+path_empty_map() ->
+    "".
+
+
+%%-------------------------------------------------------------------------
+%% Path
+%%-------------------------------------------------------------------------
+host_map() ->
+    frequency([{30, reg_name()},
+               {30, ip_address()}
+              ]).
+
+
+reg_name() ->
+    list(frequency([{30, alpha()},
+                              {10, sub_delims()},
+                              {10, unicode_char()}
+                             ])).
+
+ip_address() ->
+    oneof(["127.0.0.1", "::127.0.0.1",
+           "2001:0db8:0000:0000:0000:0000:1428:07ab",
+           "2001:0db8:0000:0000:0000::1428:07ab",
+           "2001:0db8:0:0:0:0:1428:07ab",
+           "2001:0db8:0::0:1428:07ab"]).
+
+%% Generating only reg-names
+host_uri() ->
+    non_empty(list(frequency([{30, unreserved()},
+                              {10, sub_delims()},
+                              {10, pct_encoded()}
+                             ]))).
+
+%%-------------------------------------------------------------------------
+%% Port, Query, Fragment
+%%-------------------------------------------------------------------------
+port() ->
+    frequency([{10, undefined},
+               {10, range(1,65535)}
+              ]).
+
+query_map() ->
+    unicode().
+
+
+query_uri() ->
+    [$?| non_empty(list(frequency([{20, pchar()},
+                                   {5, oneof([$/, $?])} % punctuation
+                                  ])))].
+
+fragment_map() ->
+    unicode().
+
+fragment_uri() ->
+    [$?| non_empty(list(frequency([{20, pchar()},
+                                   {5, oneof([$/, $?])} % punctuation
+                                  ])))].
+
+
+%%-------------------------------------------------------------------------
+%% Scheme
+%%-------------------------------------------------------------------------
+scheme() ->
+    ?SIZED(Length, scheme_start(Length, [])).
+%%
+scheme_start(0, L) ->
+    ?LET(Gen, L, lists:reverse(Gen));
+scheme_start(N, L) ->
+    scheme(N-1,[alpha()|L]).
+
+scheme(0, L) ->
+    ?LET(Gen, L, lists:reverse(Gen));
+scheme(N, L) ->
+    scheme(N-1, [scheme_char()|L]).
+
+
+%%-------------------------------------------------------------------------
+%% Misc
+%%-------------------------------------------------------------------------
+unicode() ->
+    list(frequency([{20, alpha()},                    % alpha
+               {10, digit()},                    % digit
+               {10, unicode_char()}              % unicode
+              ])).
+
+scheme_char() ->
+    frequency([{20, alpha()},                    % alpha
+               {20, digit()},                    % digit
+               {5, oneof([$+, $-, $.])}          % punctuation
+              ]).
+
+sub_delims() ->
+    oneof([$!, $$, $&, $', $(, $),
+           $*, $+, $,,$;, $=]).
+
+pchar() ->
+    frequency([{20, unreserved()},
+               {5, pct_encoded()},
+               {5, sub_delims()},
+               {1, oneof([$:, $@])}              % punctuation
+              ]).
+
+unreserved() ->
+    frequency([{20, alpha()},
+               {5, digit()},
+               {1, oneof([$-, $., $_, $~])}      % punctuation
+              ]).
+
+unicode_char() ->
+    range(913, 1023).
+
+alpha() ->
+    frequency([{20, range($a, $z)},              % letters
+               {20, range($A, $Z)}]).            % letters
+
+digit() ->
+    range($0, $9).                               % numbers
+
+pct_encoded() ->
+    oneof(["%C3%A4", "%C3%A5", "%C3%B6"]).
+
+
+%%%========================================================================
+%%% Helpers
+%%%========================================================================
+proplist_to_map(L) ->
+    lists:foldl(fun({K,V},M) -> M#{K => V};
+                  (_,M) -> M
+               end, #{}, L).
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 949142ec77..8f8a0f6e73 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -1695,28 +1695,7 @@ sort(Config) when is_list(Config) ->
           [true || I <- lists:seq(1, 50000), not ets:insert(E, {I, I})],
           H = qlc:q([{X,Y} || X <- [a,b], Y <- qlc:sort(ets:table(E))]),
           100000 = length(qlc:e(H)),
-          ets:delete(E)">>,
-
-       begin
-       TmpDir = ?privdir,
-       [<<"TE = process_flag(trap_exit, true),
-           E = ets:new(foo, []),
-           [true || I <- lists:seq(1, 50000), not ets:insert(E, {I, I})],
-           Ports = erlang:ports(),
-           H = qlc:q([{X,Y} || X <- [a,b], 
-                               begin
-                                   [P] = erlang:ports() -- Ports,
-                                   exit(P, port_exit),
-                                   true
-                               end,
-                               Y <- qlc:sort(ets:table(E),
-                                             [{tmpdir,\"">>, 
-                                               TmpDir, <<"\"}])]),
-           {error, qlc, {file_error, _, _}} = (catch qlc:e(H)),
-           receive {'EXIT', _, port_exit} -> ok end,
-           ets:delete(E),
-           process_flag(trap_exit, TE)">>]
-       end
+          ets:delete(E)">>
 
         ],
     run(Config, Ts),
diff --git a/lib/stdlib/test/rand_SUITE.erl b/lib/stdlib/test/rand_SUITE.erl
index ef4f9faad9..d753d929f5 100644
--- a/lib/stdlib/test/rand_SUITE.erl
+++ b/lib/stdlib/test/rand_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2000-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,9 @@
 	 basic_stats_uniform_1/1, basic_stats_uniform_2/1,
 	 basic_stats_standard_normal/1,
 	 basic_stats_normal/1,
+         stats_standard_normal_box_muller/1,
+         stats_standard_normal_box_muller_2/1,
+         stats_standard_normal/1,
          uniform_real_conv/1,
 	 plugin/1, measure/1,
 	 reference_jump_state/1, reference_jump_procdict/1]).
@@ -49,7 +52,9 @@ all() ->
     [seed, interval_int, interval_float,
      api_eq,
      reference,
-     {group, basic_stats}, uniform_real_conv,
+     {group, basic_stats},
+     {group, distr_stats},
+     uniform_real_conv,
      plugin, measure,
      {group, reference_jump}
     ].
@@ -58,12 +63,19 @@ groups() ->
     [{basic_stats, [parallel],
       [basic_stats_uniform_1, basic_stats_uniform_2,
        basic_stats_standard_normal]},
+     {distr_stats, [parallel],
+      [stats_standard_normal_box_muller,
+       stats_standard_normal_box_muller_2,
+       stats_standard_normal]},
      {reference_jump, [parallel],
       [reference_jump_state, reference_jump_procdict]}].
 
 group(basic_stats) ->
     %% valgrind needs a lot of time
     [{timetrap,{minutes,10}}];
+group(distr_stats) ->
+    %% valgrind needs a lot of time
+    [{timetrap,{minutes,10}}];
 group(reference_jump) ->
     %% valgrind needs a lot of time
     [{timetrap,{minutes,10}}].
@@ -76,9 +88,9 @@ test() ->
               try
                   ok = ?MODULE:Test([]),
                   io:format("~p: ok~n", [Test])
-              catch _:Reason ->
+              catch _:Reason:Stacktrace ->
                       io:format("Failed: ~p: ~p ~p~n",
-                                [Test, Reason, erlang:get_stacktrace()])
+                                [Test, Reason, Stacktrace])
               end
       end, Tests).
 
@@ -92,8 +104,8 @@ seed(Config) when is_list(Config) ->
     Algs = algs(),
     Test = fun(Alg) ->
 		   try seed_1(Alg)
-		   catch _:Reason ->
-			   ct:fail({Alg, Reason, erlang:get_stacktrace()})
+		   catch _:Reason:Stacktrace ->
+			   ct:fail({Alg, Reason, Stacktrace})
 		   end
 	   end,
     [Test(Alg) || Alg <- Algs],
@@ -410,6 +422,220 @@ normal_s(Mean, Variance, State0) when Mean == 0, Variance == 1 ->
 normal_s(Mean, Variance, State0) ->
     rand:normal_s(Mean, Variance, State0).
 
+
+
+-dialyzer({no_improper_lists, stats_standard_normal_box_muller/1}).
+stats_standard_normal_box_muller(Config) when is_list(Config) ->
+    try math:erfc(1.0) of
+        _ ->
+            TwoPi = 2.0 * math:pi(),
+            NormalS =
+                fun
+                    ([S0]) ->
+                        {U1, S1} = rand:uniform_real_s(S0),
+                        R = math:sqrt(-2.0 * math:log(U1)),
+                        {U2, S2} = rand:uniform_s(S1),
+                        T = TwoPi * U2,
+                        Z0 = R * math:cos(T),
+                        Z1 = R * math:sin(T),
+                        {Z0, [S2|Z1]};
+                    ([S|Z]) ->
+                        {Z, [S]}
+                end,
+            State = [rand:seed(exrop)],
+            stats_standard_normal(NormalS, State, 3)
+    catch error:_ ->
+            {skip, "math:erfc/1 not supported"}
+    end.
+
+-dialyzer({no_improper_lists, stats_standard_normal_box_muller_2/1}).
+stats_standard_normal_box_muller_2(Config) when is_list(Config) ->
+    try math:erfc(1.0) of
+        _ ->
+            TwoPi = 2.0 * math:pi(),
+            NormalS =
+                fun
+                    ([S0]) ->
+                        {U0, S1} = rand:uniform_s(S0),
+                        U1 = 1.0 - U0,
+                        R = math:sqrt(-2.0 * math:log(U1)),
+                        {U2, S2} = rand:uniform_s(S1),
+                        T = TwoPi * U2,
+                        Z0 = R * math:cos(T),
+                        Z1 = R * math:sin(T),
+                        {Z0, [S2|Z1]};
+                    ([S|Z]) ->
+                        {Z, [S]}
+                end,
+            State = [rand:seed(exrop)],
+            stats_standard_normal(NormalS, State, 3)
+    catch error:_ ->
+            {skip, "math:erfc/1 not supported"}
+    end.
+
+
+stats_standard_normal(Config) when is_list(Config) ->
+    try math:erfc(1.0) of
+        _ ->
+            stats_standard_normal(
+              fun rand:normal_s/1, rand:seed_s(exrop), 3)
+    catch error:_ ->
+            {skip, "math:erfc/1 not supported"}
+    end.
+%%
+stats_standard_normal(Fun, S, Retries) ->
+%%%
+%%% ct config:
+%%% {rand_SUITE, [{stats_standard_normal,[{seconds, 8}, {std_devs, 4.0}]}]}.
+%%%
+    Seconds = ct:get_config({?MODULE, ?FUNCTION_NAME, seconds}, 8),
+    StdDevs =
+        ct:get_config(
+          {?MODULE, ?FUNCTION_NAME, std_devs},
+          4.0), % probability erfc(4.0/sqrt(2)) (1/15787) to fail a bucket
+%%%
+    ct:timetrap({seconds, Seconds + 120}),
+    %% Buckets is chosen to get a range where the the probability to land
+    %% in the top catch-all bucket is not vanishingly low, but with
+    %% these values it is about 1/25 of the probability for the low bucket
+    %% (closest to 0).
+    %%
+    %% Rounds is calculated so the expected value for the low
+    %% bucket will be at least TargetHits.
+    %%
+    InvDelta = 512,
+    Buckets = 4 * InvDelta, % 4 std devs range
+    TargetHits = 1024,
+    Sqrt2 = math:sqrt(2.0),
+    W = InvDelta * Sqrt2,
+    P0 = math:erf(1 / W),
+    Rounds = TargetHits * ceil(1.0 / P0),
+    Histogram = array:new({default, 0}),
+    ct:pal(
+      "Running standard normal test against ~w std devs for ~w seconds...",
+      [StdDevs, Seconds]),
+    StopTime = erlang:monotonic_time(second) + Seconds,
+    {PositiveHistogram, NegativeHistogram, Outlier, TotalRounds, NewS} =
+        stats_standard_normal(
+          InvDelta, Buckets, Histogram, Histogram, 0.0,
+          Fun, S, Rounds, StopTime, Rounds, 0),
+    Precision = math:sqrt(TotalRounds * P0) / StdDevs,
+    TopP = math:erfc(Buckets / W),
+    TopPrecision = math:sqrt(TotalRounds * TopP) / StdDevs,
+    OutlierProbability = math:erfc(Outlier / Sqrt2) * TotalRounds,
+    InvOP = 1.0 / OutlierProbability,
+    ct:pal(
+      "Total rounds: ~w, tolerance: 1/~.2f..1/~.2f, "
+      "outlier: ~.2f, probability 1/~.2f.",
+      [TotalRounds, Precision, TopPrecision, Outlier, InvOP]),
+    case
+        {bucket_error, TotalRounds,
+         check_histogram(
+           W, TotalRounds, StdDevs, PositiveHistogram, Buckets),
+         check_histogram(
+           W, TotalRounds, StdDevs, NegativeHistogram, Buckets)}
+    of
+        {_, _, [], []} when InvOP < 100 ->
+            {comment, {tp, TopPrecision, op, InvOP}};
+        {_, _, [], []} ->
+            %% If the probability for getting this Outlier is lower than
+            %% 1/100, then this is fishy!
+            stats_standard_normal(
+              Fun, NewS, Retries, {outlier_fishy, InvOP});
+        BucketErrors ->
+            stats_standard_normal(
+              Fun, NewS, Retries, BucketErrors)
+    end.
+%%
+stats_standard_normal(Fun, S, Retries, Failure) ->
+    case Retries - 1 of
+        0 ->
+            ct:fail(Failure);
+        NewRetries ->
+            ct:pal("Retry due to TC glitch: ~p", [Failure]),
+            stats_standard_normal(Fun, S, NewRetries)
+    end.
+%%
+stats_standard_normal(
+  InvDelta, Buckets, PositiveHistogram, NegativeHistogram, Outlier,
+  Fun, S, 0, StopTime, Rounds, TotalRounds) ->
+    case erlang:monotonic_time(second) of
+        Now when Now < StopTime ->
+            stats_standard_normal(
+              InvDelta, Buckets,
+              PositiveHistogram, NegativeHistogram, Outlier,
+              Fun, S, Rounds, StopTime, Rounds, TotalRounds + Rounds);
+        _ ->
+            {PositiveHistogram, NegativeHistogram,
+             Outlier, TotalRounds + Rounds, S}
+    end;
+stats_standard_normal(
+  InvDelta, Buckets, PositiveHistogram, NegativeHistogram, Outlier,
+  Fun, S, Count, StopTime, Rounds, TotalRounds) ->
+    case Fun(S) of
+        {X, NewS} when 0.0 =< X ->
+            Bucket = min(Buckets, floor(X * InvDelta)),
+            stats_standard_normal(
+              InvDelta, Buckets,
+              increment_bucket(Bucket, PositiveHistogram),
+              NegativeHistogram, max(Outlier, X),
+              Fun, NewS, Count - 1, StopTime, Rounds, TotalRounds);
+        {MinusX, NewS} ->
+            X = -MinusX,
+            Bucket = min(Buckets, floor(X * InvDelta)),
+            stats_standard_normal(
+              InvDelta, Buckets,
+              PositiveHistogram,
+              increment_bucket(Bucket, NegativeHistogram), max(Outlier, X),
+              Fun, NewS, Count - 1, StopTime, Rounds, TotalRounds)
+    end.
+
+increment_bucket(Bucket, Array) ->
+    array:set(Bucket, array:get(Bucket, Array) + 1, Array).
+
+check_histogram(W, Rounds, StdDevs, Histogram, Buckets) ->
+    TargetP = 0.5 * math:erfc(Buckets / W),
+    P = 0.0,
+    N = 0,
+    check_histogram(
+      W, Rounds, StdDevs, Histogram, TargetP,
+      Buckets, Buckets, P, N).
+%%
+check_histogram(
+  _W, _Rounds, _StdDevs, _Histogram, _TargetP,
+  0, _PrevBucket, _PrevP, _PrevN) ->
+    [];
+check_histogram(
+  W, Rounds, StdDevs, Histogram, TargetP,
+  Bucket, PrevBucket, PrevP, PrevN) ->
+    N = PrevN + array:get(Bucket, Histogram),
+    P = 0.5 * math:erfc(Bucket / W),
+    BucketP = P - PrevP,
+    if
+        BucketP < TargetP ->
+            check_histogram(
+              W, Rounds, StdDevs, Histogram, TargetP,
+              Bucket - 1, PrevBucket, PrevP, N);
+        true ->
+            Exp = BucketP * Rounds,
+            Var = Rounds * BucketP*(1.0 - BucketP),
+            Threshold = StdDevs * math:sqrt(Var),
+            LowerLimit = floor(Exp - Threshold),
+            UpperLimit = ceil(Exp + Threshold),
+            if
+                N < LowerLimit; UpperLimit < N ->
+                    [#{bucket => {Bucket, PrevBucket}, n => N,
+                       lower => LowerLimit, upper => UpperLimit} |
+                     check_histogram(
+                       W, Rounds, StdDevs, Histogram, TargetP,
+                       Bucket - 1, Bucket, P, 0)];
+                true ->
+                    check_histogram(
+                      W, Rounds, StdDevs, Histogram, TargetP,
+                      Bucket - 1, Bucket, P, 0)
+            end
+    end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% White box test of the conversion to float
 
@@ -516,12 +742,12 @@ uniform_real_conv_check(M, E, Gen) ->
                [["16#",integer_to_list(G,16),$\s]||G<-Gen]]),
             ct:fail({neq, FF, F})
     catch
-        Error:Reason ->
+        Error:Reason:Stacktrace ->
             ct:pal(
               "~w:~p ~s: ~s~n",
               [Error, Reason, rand:float2str(F),
                [["16#",integer_to_list(G,16),$\s]||G<-Gen]]),
-            ct:fail({Error, Reason, F, erlang:get_stacktrace()})
+            ct:fail({Error, Reason, F, Stacktrace})
     end.
 
 
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index 71f86e32e5..7b82647416 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -894,10 +894,13 @@ match_limit(Config) when is_list(Config) ->
 %% Test that we get sub-binaries if subject is a binary and we capture
 %% binaries.
 sub_binaries(Config) when is_list(Config) ->
-    Bin = list_to_binary(lists:seq(1,255)),
-    {match,[B,C]}=re:run(Bin,"(a)",[{capture,all,binary}]),
-    255 = binary:referenced_byte_size(B),
-    255 = binary:referenced_byte_size(C),
-    {match,[D]}=re:run(Bin,"(a)",[{capture,[1],binary}]),
-    255 = binary:referenced_byte_size(D),
+    %% The GC can auto-convert tiny sub-binaries to heap binaries, so we
+    %% extract large sequences to make the test more stable.
+    Bin = << <<I>> || I <- lists:seq(1, 4096) >>,
+    {match,[B,C]}=re:run(Bin,"a(.+)$",[{capture,all,binary}]),
+    true = byte_size(B) =/= byte_size(C),
+    4096 = binary:referenced_byte_size(B),
+    4096 = binary:referenced_byte_size(C),
+    {match,[D]}=re:run(Bin,"a(.+)$",[{capture,[1],binary}]),
+    4096 = binary:referenced_byte_size(D),
     ok.
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 217e8cc252..ca85314775 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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.
@@ -561,9 +561,10 @@ otp_5226(Config) when is_list(Config) ->
 otp_5327(Config) when is_list(Config) ->
     "exception error: bad argument" =
         comm_err(<<"<<\"hej\":default>>.">>),
+    L1 = erl_anno:new(1),
     <<"abc">> =
-        erl_parse:normalise({bin,1,[{bin_element,1,{string,1,"abc"},
-				     default,default}]}),
+        erl_parse:normalise({bin,L1,[{bin_element,L1,{string,L1,"abc"},
+                                      default,default}]}),
     [<<"abc">>] = scan(<<"<<(<<\"abc\">>):3/binary>>.">>),
     [<<"abc">>] = scan(<<"<<(<<\"abc\">>)/binary>>.">>),
     "exception error: bad argument" =
@@ -576,9 +577,9 @@ otp_5327(Config) when is_list(Config) ->
         comm_err(<<"<<10:default>>.">>),
     [<<98,1:1>>] = scan(<<"<<3:3,5:6>>.">>),
     {'EXIT',{badarg,_}} =
-        (catch erl_parse:normalise({bin,1,[{bin_element,1,{integer,1,17},
-                                            {atom,1,all},
-                                            default}]})),
+        (catch erl_parse:normalise({bin,L1,[{bin_element,L1,{integer,L1,17},
+                                             {atom,L1,all},
+                                             default}]})),
     [<<-20/signed>>] = scan(<<"<<-20/signed>> = <<-20>>.">>),
     [<<-300:16/signed>>] =
 	scan(<<"<<-300:16/signed>> = <<-300:16>>.">>),
@@ -2784,7 +2785,7 @@ otp_10302(Config) when is_list(Config) ->
         <<"begin
                A = <<\"\\xaa\">>,
                S = lists:flatten(io_lib:format(\"~p/~p.\", [A, A])),
-               {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+               {ok, Ts, _} = erl_scan:string(S, 1),
                {ok, Es} = erl_parse:parse_exprs(Ts),
                B = erl_eval:new_bindings(),
                erl_eval:exprs(Es, B)
@@ -2797,7 +2798,7 @@ otp_10302(Config) when is_list(Config) ->
         <<"io:setopts([{encoding,utf8}]).
            A = <<\"\\xaa\">>,
            S = lists:flatten(io_lib:format(\"~p/~p.\", [A, A])),
-           {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+           {ok, Ts, _} = erl_scan:string(S, 1),
            {ok, Es} = erl_parse:parse_exprs(Ts),
            B = erl_eval:new_bindings(),
            erl_eval:exprs(Es, B).">>,
@@ -2809,7 +2810,7 @@ otp_10302(Config) when is_list(Config) ->
         <<"begin
                A = [1089],
                S = lists:flatten(io_lib:format(\"~tp/~tp.\", [A, A])),
-               {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+               {ok, Ts, _} = erl_scan:string(S, 1),
                {ok, Es} = erl_parse:parse_exprs(Ts),
                B = erl_eval:new_bindings(),
                erl_eval:exprs(Es, B)
@@ -2821,7 +2822,7 @@ otp_10302(Config) when is_list(Config) ->
         <<"io:setopts([{encoding,utf8}]).
            A = [1089],
            S = lists:flatten(io_lib:format(\"~tp/~tp.\", [A, A])),
-           {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+           {ok, Ts, _} = erl_scan:string(S, 1),
            {ok, Es} = erl_parse:parse_exprs(Ts),
            B = erl_eval:new_bindings(),
            erl_eval:exprs(Es, B).">>,
@@ -2940,7 +2941,7 @@ otp_14296(Config) when is_list(Config) ->
     end(),
 
     fun() ->
-            Port = open_port({spawn, "ls"}, [line]),
+            Port = open_port({spawn, "ls"}, [{line,1}]),
             KnownPort = erlang:port_to_list(Port),
             S = KnownPort ++ ".",
             R = KnownPort ++ ".\n",
@@ -3012,7 +3013,7 @@ scan(B) ->
     scan(t(B), F).
 
 scan(S0, F) ->
-    case erl_scan:tokens([], S0, 1, [unicode]) of
+    case erl_scan:tokens([], S0, 1) of
         {done,{ok,Ts,_},S} ->
             [F(Ts) | scan(S, F)];
         _Else ->
diff --git a/lib/stdlib/test/stdlib.spec b/lib/stdlib/test/stdlib.spec
index 91712b8963..9c625091a8 100644
--- a/lib/stdlib/test/stdlib.spec
+++ b/lib/stdlib/test/stdlib.spec
@@ -1,2 +1,4 @@
 {suites,"../stdlib_test",all}.
-{skip_suites,"../stdlib_test",stdlib_bench_SUITE, "bench only"}.
+{skip_groups,"../stdlib_test",stdlib_bench_SUITE,
+             [base64,gen_server,gen_statem,unicode],
+             "Benchmark only"}.
diff --git a/lib/stdlib/test/stdlib_bench.spec b/lib/stdlib/test/stdlib_bench.spec
index a5d1e1db80..7a0da811a0 100644
--- a/lib/stdlib/test/stdlib_bench.spec
+++ b/lib/stdlib/test/stdlib_bench.spec
@@ -5,3 +5,6 @@
 {skip_suites,"../stdlib_test",string_SUITE, "bench only"}.
 
 {suites,"../stdlib_test",[stdlib_bench_SUITE]}.
+{skip_groups,"../stdlib_test",stdlib_bench_SUITE,
+             [gen_server_comparison,gen_statem_comparison],
+             "Not a benchmark"}.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE.erl b/lib/stdlib/test/stdlib_bench_SUITE.erl
index 8670e7029c..294898a932 100644
--- a/lib/stdlib/test/stdlib_bench_SUITE.erl
+++ b/lib/stdlib/test/stdlib_bench_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.
@@ -21,6 +21,7 @@
 %%
 -module(stdlib_bench_SUITE).
 -compile([export_all, nowarn_export_all]).
+-include_lib("common_test/include/ct.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28,14 +29,55 @@ suite() -> [{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}].
 
 
 all() ->
-    [{group,unicode}].
+    [{group,unicode},{group,base64},
+     {group,gen_server},{group,gen_statem},
+     {group,gen_server_comparison},{group,gen_statem_comparison}].
 
 groups() ->
     [{unicode,[{repeat,5}],
       [norm_nfc_list, norm_nfc_deep_l, norm_nfc_binary,
        string_lexemes_list, string_lexemes_binary
-      ]}].
+      ]},
+     {base64,[{repeat,5}],
+      [decode_binary, decode_binary_to_string,
+       decode_list, decode_list_to_string,
+       encode_binary, encode_binary_to_string,
+       encode_list, encode_list_to_string,
+       mime_binary_decode, mime_binary_decode_to_string,
+       mime_list_decode, mime_list_decode_to_string]},
+     {gen_server, [{repeat,5}], cases(gen_server)},
+     {gen_statem, [{repeat,3}], cases(gen_statem)},
+     {gen_server_comparison, [],
+      [single_small, single_medium, single_big,
+       sched_small, sched_medium, sched_big,
+       multi_small, multi_medium, multi_big]},
+     {gen_statem_comparison, [],
+      [single_small, single_big,
+       sched_small, sched_big,
+       multi_small, multi_big]}].
 
+cases(gen_server) ->
+      [simple, simple_timer, simple_mon, simple_timer_mon,
+       generic, generic_timer];
+cases(gen_statem) ->
+    [generic, generic_fsm, generic_fsm_transit,
+     generic_statem, generic_statem_transit,
+     generic_statem_complex].
+
+init_per_group(gen_server, Config) ->
+    compile_servers(Config),
+    [{benchmark_suite,"stdlib_gen_server"}|Config];
+init_per_group(gen_statem, Config) ->
+    compile_servers(Config),
+    [{benchmark_suite,"stdlib_gen_statem"}|Config];
+init_per_group(gen_server_comparison, Config) ->
+    compile_servers(Config),
+    [{cases,cases(gen_server)},
+     {benchmark_suite,"stdlib_gen_server"}|Config];
+init_per_group(gen_statem_comparison, Config) ->
+    compile_servers(Config),
+    [{cases,cases(gen_statem)},
+     {benchmark_suite,"stdlib_gen_statem"}|Config];
 init_per_group(_GroupName, Config) ->
     Config.
 
@@ -55,23 +97,33 @@ end_per_testcase(_Func, _Conf) ->
     ok.
 
 
+compile_servers(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Files = filelib:wildcard(filename:join(DataDir, "{simple,generic}*.erl")),
+    _ = [{ok, _} = compile:file(File) || File <- Files],
+    ok.
+
+comment(Value) ->
+    C = lists:flatten(io_lib:format("~p", [Value])),
+    {comment, C}.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -define(REPEAT_NORM, 5).
 
 norm_nfc_list(Config) ->
     Bin = norm_data(Config),
     {_N, Mean, _Stddev, Res} = unicode_util_SUITE:time_count(nfc, list, Bin, ?REPEAT_NORM),
-    report(1000.0*Res / Mean).
+    comment(report(1000.0*Res / Mean)).
 
 norm_nfc_deep_l(Config) ->
     Bin = norm_data(Config),
     {_N, Mean, _Stddev, Res} = unicode_util_SUITE:time_count(nfc, deep_l, Bin, ?REPEAT_NORM),
-    report(1000.0*Res / Mean).
+    comment(report(1000.0*Res / Mean)).
 
 norm_nfc_binary(Config) ->
     Bin = norm_data(Config),
     {_N, Mean, _Stddev, Res} = unicode_util_SUITE:time_count(nfc, binary, Bin, ?REPEAT_NORM),
-    report(1000.0*Res / Mean).
+    comment(report(1000.0*Res / Mean)).
 
 
 string_lexemes_list(Config) ->
@@ -80,7 +132,7 @@ string_lexemes_list(Config) ->
     Bin = norm_data(Config),
     Fun = fun(Str) -> string:nth_lexeme(Str, 200000, [$;,$\n,$\r]), 200000 end,
     {_N, Mean, _Stddev, Res} = string_SUITE:time_func(Fun, list, Bin, 15),
-    report(1000.0*Res / Mean).
+    comment(report(1000.0*Res / Mean)).
 
 string_lexemes_binary(Config) ->
     %% Use nth_lexeme instead of lexemes to avoid building a result of
@@ -88,7 +140,7 @@ string_lexemes_binary(Config) ->
     Bin = norm_data(Config),
     Fun = fun(Str) -> string:nth_lexeme(Str, 200000, [$;,$\n,$\r]), 200000 end,
     {_N, Mean, _Stddev, Res} = string_SUITE:time_func(Fun, binary, Bin, ?REPEAT_NORM),
-    report(1000.0*Res / Mean).
+    comment(report(1000.0*Res / Mean)).
 
 %%%
 report(Tps) ->
@@ -105,3 +157,386 @@ norm_data(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+decode_binary(_Config) ->
+    comment(test(decode, encoded_binary())).
+
+decode_binary_to_string(_Config) ->
+    comment(test(decode_to_string, encoded_binary())).
+
+decode_list(_Config) ->
+    comment(test(decode, encoded_list())).
+
+decode_list_to_string(_Config) ->
+    comment(test(decode_to_string, encoded_list())).
+
+encode_binary(_Config) ->
+    comment(test(encode, binary())).
+
+encode_binary_to_string(_Config) ->
+    comment(test(encode_to_string, binary())).
+
+encode_list(_Config) ->
+    comment(test(encode, list())).
+
+encode_list_to_string(_Config) ->
+    comment(test(encode_to_string, list())).
+
+mime_binary_decode(_Config) ->
+    comment(test(mime_decode, encoded_binary())).
+
+mime_binary_decode_to_string(_Config) ->
+    comment(test(mime_decode_to_string, encoded_binary())).
+
+mime_list_decode(_Config) ->
+    comment(test(mime_decode, encoded_list())).
+
+mime_list_decode_to_string(_Config) ->
+    comment(test(mime_decode_to_string, encoded_list())).
+
+-define(SIZE, 10000).
+-define(N, 1000).
+
+encoded_binary() ->
+    list_to_binary(encoded_list()).
+
+encoded_list() ->
+    L = random_byte_list(round(?SIZE*0.75)),
+    base64:encode_to_string(L).
+
+binary() ->
+    list_to_binary(list()).
+
+list() ->
+    random_byte_list(?SIZE).
+
+test(Func, Data) ->
+    F = fun() -> loop(?N, Func, Data) end,
+    {Time, ok} = timer:tc(fun() -> lspawn(F) end),
+    report_base64(Time).
+
+loop(0, _F, _D) -> garbage_collect(), ok;
+loop(N, F, D) ->
+    _ = base64:F(D),
+    loop(N - 1, F, D).
+
+lspawn(Fun) ->
+    {Pid, Ref} = spawn_monitor(fun() -> exit(Fun()) end),
+    receive
+        {'DOWN', Ref, process, Pid, Rep} -> Rep
+    end.
+
+report_base64(Time) ->
+    Tps = round((?N*1000000)/Time),
+    ct_event:notify(#event{name = benchmark_data,
+                           data = [{suite, "stdlib_base64"},
+                                   {value, Tps}]}),
+    Tps.
+
+%% Copied from base64_SUITE.erl.
+
+random_byte_list(N) ->
+    random_byte_list(N, []).
+
+random_byte_list(0, Acc) ->
+    Acc;
+random_byte_list(N, Acc) ->
+    random_byte_list(N-1, [rand:uniform(255)|Acc]).
+
+make_big_binary(N) ->
+    list_to_binary(mbb(N, [])).
+
+mbb(N, Acc) when N > 256 ->
+    B = list_to_binary(lists:seq(0, 255)),
+    mbb(N - 256, [B | Acc]);
+mbb(N, Acc) ->
+    B = list_to_binary(lists:seq(0, N-1)),
+    lists:reverse(Acc, B).
+
+simple(Config) when is_list(Config) ->
+    comment(do_tests(simple, single_small, Config)).
+
+simple_timer(Config) when is_list(Config) ->
+    comment(do_tests(simple_timer, single_small, Config)).
+
+simple_mon(Config) when is_list(Config) ->
+    comment(do_tests(simple_mon, single_small, Config)).
+
+simple_timer_mon(Config) when is_list(Config) ->
+    comment(do_tests(simple_timer_mon, single_small, Config)).
+
+generic(Config) when is_list(Config) ->
+    comment(do_tests(generic, single_small, Config)).
+
+generic_timer(Config) when is_list(Config) ->
+    comment(do_tests(generic_timer, single_small, Config)).
+
+generic_statem(Config) when is_list(Config) ->
+    comment(do_tests(generic_statem, single_small, Config)).
+
+generic_statem_transit(Config) when is_list(Config) ->
+    comment(do_tests(generic_statem_transit, single_small, Config)).
+
+generic_statem_complex(Config) when is_list(Config) ->
+    comment(do_tests(generic_statem_complex, single_small, Config)).
+
+generic_fsm(Config) when is_list(Config) ->
+    comment(do_tests(generic_fsm, single_small, Config)).
+
+generic_fsm_transit(Config) when is_list(Config) ->
+    comment(do_tests(generic_fsm_transit, single_small, Config)).
+
+single_small(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), single_small, Config).
+
+single_medium(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), single_medium, Config).
+
+single_big(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), single_big, Config).
+
+sched_small(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), sched_small, Config).
+
+sched_medium(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), sched_medium, Config).
+
+sched_big(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), sched_big, Config).
+
+multi_small(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), multi_small, Config).
+
+multi_medium(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), multi_medium, Config).
+
+multi_big(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), multi_big, Config).
+
+comparison(Cases, Kind, Config) ->
+    Cases = ?config(cases, Config),
+    [RefResult|_] = Results =
+        [do_tests(Case, Kind, Config) || Case <- Cases],
+    Normalized = [norm(Result, RefResult) || Result <- Results],
+    {Parallelism, Message} = bench_params(Kind),
+    Wordsize = erlang:system_info(wordsize),
+    MSize = Wordsize * erts_debug:flat_size(Message),
+    What = io_lib:format("#parallel gen_server instances: ~.4w, "
+                         "message flat size: ~.5w bytes",
+                         [Parallelism, MSize]),
+    Format =
+        lists:flatten(
+          ["~s: "] ++
+              [[atom_to_list(Case),": ~s "] || Case <- Cases]),
+    C = lists:flatten(io_lib:format(Format, [What] ++ Normalized)),
+    {comment, C}.
+
+norm(T, Ref) ->
+    try Ref / T of
+        Norm ->
+            io_lib:format("~.2f", [Norm])
+    catch error:badarith ->
+            "---"
+    end.
+
+-define(MAX_TIME_SECS, 3).   % s
+-define(MAX_TIME, 1000 * ?MAX_TIME_SECS). % ms
+-define(CALLS_PER_LOOP, 5).
+
+do_tests(Test, ParamSet, Config) ->
+    BenchmarkSuite = ?config(benchmark_suite, Config),
+    {Client, ServerMod} = bench(Test),
+    {Parallelism, Message} = bench_params(ParamSet),
+    Fun = create_clients(Message, ServerMod, Client, Parallelism),
+    {TotalLoops, AllPidTime} = run_test(Fun),
+    PerSecond = ?CALLS_PER_LOOP * round((1000 * TotalLoops) / AllPidTime),
+    ct_event:notify(
+      #event{
+         name = benchmark_data,
+         data = [{suite,BenchmarkSuite},{value,PerSecond}]}),
+    PerSecond.
+
+-define(COUNTER, n).
+
+simple_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = simple_server:reply(P, M),
+    _ = simple_server:reply(P, M),
+    _ = simple_server:reply(P, M),
+    _ = simple_server:reply(P, M),
+    _ = simple_server:reply(P, M),
+    simple_client(N+1, M, P).
+
+simple_client_timer(N, M, P) ->
+    put(?COUNTER, N),
+    _ = simple_server_timer:reply(P, M),
+    _ = simple_server_timer:reply(P, M),
+    _ = simple_server_timer:reply(P, M),
+    _ = simple_server_timer:reply(P, M),
+    _ = simple_server_timer:reply(P, M),
+    simple_client_timer(N+1, M, P).
+
+simple_client_mon(N, M, P) ->
+    put(?COUNTER, N),
+    _ = simple_server_mon:reply(P, M),
+    _ = simple_server_mon:reply(P, M),
+    _ = simple_server_mon:reply(P, M),
+    _ = simple_server_mon:reply(P, M),
+    _ = simple_server_mon:reply(P, M),
+    simple_client_mon(N+1, M, P).
+
+simple_client_timer_mon(N, M, P) ->
+    put(?COUNTER, N),
+    _ = simple_server_timer_mon:reply(P, M),
+    _ = simple_server_timer_mon:reply(P, M),
+    _ = simple_server_timer_mon:reply(P, M),
+    _ = simple_server_timer_mon:reply(P, M),
+    _ = simple_server_timer_mon:reply(P, M),
+    simple_client_timer_mon(N+1, M, P).
+
+generic_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_server:reply(P, M),
+    _ = generic_server:reply(P, M),
+    _ = generic_server:reply(P, M),
+    _ = generic_server:reply(P, M),
+    _ = generic_server:reply(P, M),
+    generic_client(N+1, M, P).
+
+generic_timer_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_server_timer:reply(P, M),
+    _ = generic_server_timer:reply(P, M),
+    _ = generic_server_timer:reply(P, M),
+    _ = generic_server_timer:reply(P, M),
+    _ = generic_server_timer:reply(P, M),
+    generic_timer_client(N+1, M, P).
+
+generic_statem_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    generic_statem_client(N+1, M, P).
+
+generic_statem_transit_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_statem:transit(P, M),
+    _ = generic_statem:transit(P, M),
+    _ = generic_statem:transit(P, M),
+    _ = generic_statem:transit(P, M),
+    _ = generic_statem:transit(P, M),
+    generic_statem_transit_client(N+1, M, P).
+
+generic_statem_complex_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    generic_statem_complex_client(N+1, M, P).
+
+generic_fsm_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_fsm:reply(P, M),
+    _ = generic_fsm:reply(P, M),
+    _ = generic_fsm:reply(P, M),
+    _ = generic_fsm:reply(P, M),
+    _ = generic_fsm:reply(P, M),
+    generic_fsm_client(N+1, M, P).
+
+generic_fsm_transit_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_fsm:transit(P, M),
+    _ = generic_fsm:transit(P, M),
+    _ = generic_fsm:transit(P, M),
+    _ = generic_fsm:transit(P, M),
+    _ = generic_fsm:transit(P, M),
+    generic_fsm_transit_client(N+1, M, P).
+
+bench(simple) ->
+    {fun simple_client/3, simple_server};
+bench(simple_timer) ->
+    {fun simple_client_timer/3, simple_server_timer};
+bench(simple_mon) ->
+    {fun simple_client_mon/3, simple_server_mon};
+bench(simple_timer_mon) ->
+    {fun simple_client_timer_mon/3, simple_server_timer_mon};
+bench(generic) ->
+    {fun generic_client/3, generic_server};
+bench(generic_timer) ->
+    {fun generic_timer_client/3, generic_server_timer};
+bench(generic_statem) ->
+    {fun generic_statem_client/3, generic_statem};
+bench(generic_statem_transit) ->
+    {fun generic_statem_transit_client/3, generic_statem};
+bench(generic_statem_complex) ->
+    {fun generic_statem_complex_client/3, generic_statem_complex};
+bench(generic_fsm) ->
+    {fun generic_fsm_client/3, generic_fsm};
+bench(generic_fsm_transit) ->
+    {fun generic_fsm_transit_client/3, generic_fsm}.
+
+%% -> {Parallelism, MessageTerm}
+bench_params(single_small) -> {1, small()};
+bench_params(single_medium) -> {1, medium()};
+bench_params(single_big) -> {1, big()};
+bench_params(sched_small)  -> {parallelism(), small()};
+bench_params(sched_medium)  -> {parallelism(), medium()};
+bench_params(sched_big)  -> {parallelism(), big()};
+bench_params(multi_small)  -> {400, small()};
+bench_params(multi_medium)  -> {400, medium()};
+bench_params(multi_big)  -> {400, big()}.
+
+small() ->
+    small.
+
+medium() ->
+    lists:seq(1, 50).
+
+big() ->
+    lists:seq(1, 1000).
+
+parallelism() ->
+    case erlang:system_info(multi_scheduling) of
+        enabled -> erlang:system_info(schedulers_online);
+        _ -> 1
+    end.
+
+create_clients(M, ServerMod, Client, Parallel) ->
+    fun() ->
+            State = term,
+            ServerPid = ServerMod:start(State),
+            PidRefs = [spawn_monitor(fun() -> Client(0, M, ServerPid) end) ||
+                          _ <- lists:seq(1, Parallel)],
+            timer:sleep(?MAX_TIME),
+            try
+                AllPidsN = collect(PidRefs, []),
+                TotalLoops = lists:sum(AllPidsN),
+                TotalLoops
+            after
+                ok = ServerMod:stop(ServerPid)
+            end
+    end.
+
+collect([], Result) ->
+    Result;
+collect([{Pid, Ref}|PidRefs], Result) ->
+    N = case erlang:process_info(Pid, dictionary) of
+            {dictionary, Dict} ->
+                {?COUNTER, N0} = lists:keyfind(?COUNTER, 1, Dict),
+                N0;
+            undefined -> % Process did not start in ?MAX_TIME_SECS.
+                0
+        end,
+    exit(Pid, kill),
+    receive {'DOWN', Ref, _, _, _} -> ok end,
+    collect(PidRefs, [N|Result]).
+
+run_test(Test) ->
+    {T1, _} = statistics(runtime),
+    Result = Test(),
+    {T2, _} = statistics(runtime),
+    {Result, T2 - T1}.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_fsm.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_fsm.erl
new file mode 100644
index 0000000000..50f7df7a2a
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_fsm.erl
@@ -0,0 +1,59 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-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.
+%% 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(generic_fsm).
+
+-export([start/1, reply/2, transit/2, stop/1]).
+
+-export([init/1, terminate/3]).
+-export([state1/3, state2/3]).
+
+-behaivour(gen_fsm).
+
+
+%% API
+
+start(Data) ->
+    {ok, Pid} = gen_fsm:start(?MODULE, Data, []),
+    Pid.
+
+stop(P) ->
+    ok = gen_fsm:stop(P).
+
+reply(S, M) ->
+    gen_fsm:sync_send_event(S, {reply, M}, infinity).
+
+transit(S, M) ->
+    gen_fsm:sync_send_event(S, {transit, M}, infinity).
+
+%% Implementation
+
+init(Data) ->
+    {ok, state1, Data}.
+
+terminate(_Reason, _State, _Data) ->
+    ok.
+
+state1({reply, M}, _From, Data) ->
+    {reply, M, ?FUNCTION_NAME, Data};
+state1({transit, M}, _From, Data) ->
+    {reply, M, state2, Data}.
+
+state2({transit, M}, _From, Data) ->
+    {reply, M, state1, Data}.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl
new file mode 100644
index 0000000000..abd61dcdef
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl
@@ -0,0 +1,31 @@
+-module(generic_server).
+
+-export([start/1, reply/2, stop/1]).
+
+-export([handle_call/3, handle_cast/2, init/1, terminate/2]).
+
+-behaviour(gen_server).
+
+-define(GEN_SERVER, gen_server).
+
+start(State) ->
+    {ok, Pid} = ?GEN_SERVER:start(?MODULE, State, []),
+    Pid.
+
+init(State) ->
+    {ok, State}.
+
+stop(P) ->
+    ok = ?GEN_SERVER:stop(P).
+
+reply(S, M) ->
+    _M = ?GEN_SERVER:call(S, {reply, M}, infinity).
+
+handle_call({reply, M}, _From, State) ->
+    {reply, M, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server_timer.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server_timer.erl
new file mode 100644
index 0000000000..0faa30207d
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server_timer.erl
@@ -0,0 +1,31 @@
+-module(generic_server_timer).
+
+-export([start/1, reply/2, stop/1]).
+
+-export([handle_call/3, handle_cast/2, init/1, terminate/2]).
+
+-behaviour(gen_server).
+
+-define(GEN_SERVER, gen_server).
+
+start(State) ->
+    {ok, Pid} = ?GEN_SERVER:start(?MODULE, State, []),
+    Pid.
+
+init(State) ->
+    {ok, State}.
+
+stop(P) ->
+    ok = ?GEN_SERVER:stop(P).
+
+reply(S, M) ->
+    ?GEN_SERVER:call(S, {reply, M}).
+
+handle_call({reply, M}, _From, State) ->
+    {reply, M, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl
new file mode 100644
index 0000000000..2e0491f060
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl
@@ -0,0 +1,58 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-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.
+%% 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(generic_statem).
+
+-export([start/1, reply/2, transit/2, stop/1]).
+
+-export([callback_mode/0, init/1]).
+-export([state1/3, state2/3]).
+
+-behaviour(gen_statem).
+
+%% API
+
+start(Data) ->
+    {ok, Pid} = gen_statem:start(?MODULE, Data, []),
+    Pid.
+
+stop(P) ->
+    ok = gen_statem:stop(P).
+
+reply(S, M) ->
+    gen_statem:call(S, {reply, M}, infinity).
+
+transit(S, M) ->
+    gen_statem:call(S, {transit, M}, infinity).
+
+%% Implementation
+
+callback_mode() ->
+    state_functions.
+
+init(Data) ->
+    {ok, state1, Data}.
+
+state1({call, From}, {reply, M}, Data) ->
+    {keep_state, Data, {reply, From, M}};
+state1({call, From}, {transit, M}, Data) ->
+    {next_state, state2, Data, {reply, From, M}}.
+
+state2({call, From}, {transit, M}, Data) ->
+    {next_state, state1, Data, {reply, From, M}}.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem_complex.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem_complex.erl
new file mode 100644
index 0000000000..983227d281
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem_complex.erl
@@ -0,0 +1,66 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-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.
+%% 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(generic_statem_complex).
+
+-export([start/1, reply/2, stop/1]).
+
+-export([callback_mode/0, init/1]).
+-export([state1/3, state2/3, state3/3]).
+
+-behaviour(gen_statem).
+
+%% API
+
+start(Data) ->
+    {ok, Pid} = gen_statem:start(?MODULE, Data, []),
+    Pid.
+
+stop(P) ->
+    ok = gen_statem:stop(P).
+
+reply(S, M) ->
+    gen_statem:call(S, {reply, M}, infinity).
+
+%% Implementation
+
+callback_mode() ->
+    [state_functions,state_enter].
+
+init(Data) ->
+    {ok, state1, Data}.
+
+state1(enter, _, Data) ->
+    {keep_state, Data,
+     {state_timeout, 5000, t1}};
+state1({call, _From}, {reply, _M}, Data) ->
+    {next_state, state2, Data,
+     [postpone,{next_event,internal,e}]}.
+
+state2(enter, _, _Data) ->
+    keep_state_and_data;
+state2(internal, e, Data) ->
+    {next_state, state3, Data}.
+
+state3(enter, _, Data) ->
+    {keep_state, Data,
+     {state_timeout, 5000, t3}};
+state3({call, From}, {reply, M}, Data) ->
+    {next_state, state1, Data,
+     {reply, From, M}}.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server.erl
new file mode 100644
index 0000000000..bd43f686e8
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server.erl
@@ -0,0 +1,31 @@
+-module(simple_server).
+
+%% Local process. No timer. No monitor.
+
+-export([start/1, reply/2, stop/1]).
+
+start(State) ->
+    spawn(fun() -> loop(State) end).
+
+stop(P) ->
+    P ! {stop, self()},
+    receive
+        ok ->
+            ok
+    end.
+
+loop(S) ->
+    receive
+        {reply, P, M} ->
+            P ! M,
+            loop(S);
+        {stop, P} ->
+            P ! ok
+    end.
+
+reply(P, M) ->
+    P ! {reply, self(), M},
+    receive
+        M ->
+            M
+    end.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_mon.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_mon.erl
new file mode 100644
index 0000000000..9b5ace5586
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_mon.erl
@@ -0,0 +1,33 @@
+-module(simple_server_mon).
+
+%% Local process. No timer. Monitor.
+
+-export([start/1, reply/2, stop/1]).
+
+start(State) ->
+    spawn(fun() -> loop(State) end).
+
+stop(P) ->
+    P ! {stop, self()},
+    receive
+        ok ->
+            ok
+    end.
+
+loop(S) ->
+    receive
+        {reply, P, Mref, M} ->
+            P ! {ok, Mref, M},
+            loop(S);
+        {stop, P} ->
+            P ! ok
+    end.
+
+reply(P, M) ->
+    Mref = erlang:monitor(process, P),
+    P ! {reply, self(), Mref, M},
+    receive
+        {ok, Mref, M} ->
+            erlang:demonitor(Mref, [flush]),
+            ok
+    end.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer.erl
new file mode 100644
index 0000000000..82381e1fdf
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer.erl
@@ -0,0 +1,33 @@
+-module(simple_server_timer).
+
+%% Local process. Timer. No monitor.
+
+-export([start/1, reply/2, stop/1]).
+
+start(State) ->
+    spawn(fun() -> loop(State) end).
+
+stop(P) ->
+    P ! {stop, self()},
+    receive
+        ok ->
+            ok
+    end.
+
+loop(S) ->
+    receive
+        {reply, P, M} ->
+            P ! M,
+            loop(S);
+        {stop, P} ->
+            P ! ok
+    end.
+
+reply(P, M) ->
+    P ! {reply, self(), M},
+    receive
+        M ->
+            M
+    after 100 ->
+            exit(fel)
+    end.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer_mon.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer_mon.erl
new file mode 100644
index 0000000000..6124ca29c2
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer_mon.erl
@@ -0,0 +1,35 @@
+-module(simple_server_timer_mon).
+
+%% Local process. Timer. Monitor.
+
+-export([start/1, reply/2, stop/1]).
+
+start(State) ->
+    spawn(fun() -> loop(State) end).
+
+stop(P) ->
+    P ! {stop, self()},
+    receive
+        ok ->
+            ok
+    end.
+
+loop(S) ->
+    receive
+        {reply, P, Mref, M} ->
+            P ! {ok, Mref, M},
+            loop(S);
+        {stop, P} ->
+            P ! ok
+    end.
+
+reply(P, M) ->
+    Mref = erlang:monitor(process, P),
+    P ! {reply, self(), Mref, M},
+    receive
+        {ok, Mref,  M} ->
+            erlang:demonitor(Mref, [flush]),
+            ok
+    after 100 ->
+            exit(fel)
+    end.
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl
index 05f18ef238..fdff2d24b8 100644
--- a/lib/stdlib/test/string_SUITE.erl
+++ b/lib/stdlib/test/string_SUITE.erl
@@ -48,6 +48,7 @@
 
 %% Run tests when debugging them
 -export([debug/0, time_func/4]).
+-compile([nowarn_deprecated_function]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -92,14 +93,11 @@ end_per_testcase(_Case, _Config) ->
     ok.
 
 debug() ->
-    Config = [{data_dir, ?MODULE_STRING++"_data"}],
+    Config = [{data_dir, "./" ++ ?MODULE_STRING++"_data"}],
     [io:format("~p:~p~n",[Test,?MODULE:Test(Config)]) ||
         {_,Tests} <- groups(), Test <- Tests].
 
 -define(TEST(B,C,D), test(?LINE,?FUNCTION_NAME,B,C,D, true)).
--define(TEST_EQ(B,C,D),
-        test(?LINE,?FUNCTION_NAME,B,C,D, true),
-        test(?LINE,?FUNCTION_NAME,hd(C),[B|tl(C),D, true)).
 
 -define(TEST_NN(B,C,D),
         test(?LINE,?FUNCTION_NAME,B,C,D, false),
@@ -294,6 +292,7 @@ trim(_) ->
     ?TEST(["..h", ".e", <<"j..">>], [both, ". "], "h.ej"),
     ?TEST(["..h", <<".ejsa"/utf8>>, "n.."], [both, ". "], "h.ejsan"),
     %% Test that it behaves with graphemes (i.e. nfd tests are the hard part)
+    ?TEST([1013,101,778,101,101], [trailing, [101]], [1013,101,778]),
     ?TEST("aaåaa", [both, "a"], "å"),
     ?TEST(["aaa",778,"äöoo"], [both, "ao"], "åäö"),
     ?TEST([<<"aaa">>,778,"äöoo"], [both, "ao"], "åäö"),
@@ -353,6 +352,7 @@ take(_) ->
     ?TEST([<<>>,<<"..">>, " h.ej", <<" ..">>], [Chars, true, leading], {".. ", "h.ej .."}),
     ?TEST(["..h", <<".ejsa"/utf8>>, "n.."], [Chars, true, leading], {"..", "h.ejsan.."}),
     %% Test that it behaves with graphemes (i.e. nfd tests are the hard part)
+    ?TEST([101,778], [[[101, 779]], true], {[101,778], []}),
     ?TEST(["aaee",778,"äöoo"], [[[$e,778]], true, leading], {"aae", [$e,778|"äöoo"]}),
     ?TEST([<<"aae">>,778,"äöoo"], [[[$e,778]],true,leading], {"aa", [$e,778|"äöoo"]}),
     ?TEST([<<"e">>,778,"åäöe", <<778/utf8>>], [[[$e,778]], true, leading], {[], [$e,778]++"åäöe"++[778]}),
@@ -486,6 +486,10 @@ to_float(_) ->
 prefix(_) ->
     ?TEST("", ["a"], nomatch),
     ?TEST("a", [""], "a"),
+    ?TEST("a", [[[]]], "a"),
+    ?TEST("a", [<<>>], "a"),
+    ?TEST("a", [[<<>>]], "a"),
+    ?TEST("a", [[[<<>>]]], "a"),
     ?TEST("b", ["a"], nomatch),
     ?TEST("a", ["a"], ""),
     ?TEST("å", ["a"], nomatch),
@@ -713,29 +717,123 @@ nth_lexeme(_) ->
 
 
 meas(Config) ->
+    Parent = self(),
+    Exec = fun() ->
+                   DataDir0 = proplists:get_value(data_dir, Config),
+                   DataDir = filename:join(lists:droplast(filename:split(DataDir0))),
+                   case proplists:get_value(profile, Config, false) of
+                       false ->
+                           do_measure(DataDir);
+                       eprof ->
+                           eprof:profile(fun() -> do_measure(DataDir) end, [set_on_spawn]),
+                           eprof:stop_profiling(),
+                           eprof:analyze(),
+                           eprof:stop()
+                   end,
+                   Parent ! {test_done, self()},
+                   normal
+           end,
+    ct:timetrap({minutes,2}),
     case ct:get_timetrap_info() of
         {_,{_,Scale}} when Scale > 1 ->
             {skip,{will_not_run_in_debug,Scale}};
-        _ -> % No scaling
-            DataDir = proplists:get_value(data_dir, Config),
-            TestDir = filename:dirname(string:trim(DataDir, trailing, "/")),
-            do_measure(TestDir)
+        _ -> % No scaling, run at most 1.5 min
+            Tester = spawn(Exec),
+            receive {test_done, Tester} -> ok
+            after 90000 ->
+                    io:format("Timelimit reached stopping~n",[]),
+                    exit(Tester, die)
+            end,
+            ok
     end.
 
-do_measure(TestDir) ->
-    File =  filename:join(TestDir, ?MODULE_STRING ++ ".erl"),
+do_measure(DataDir) ->
+    File =  filename:join([DataDir,"unicode_util_SUITE_data","NormalizationTest.txt"]),
     io:format("File ~s ",[File]),
     {ok, Bin} = file:read_file(File),
     io:format("~p~n",[byte_size(Bin)]),
     Do = fun(Name, Func, Mode) ->
-                 {N, Mean, Stddev, _} = time_func(Func, Mode, Bin, 50),
-                 io:format("~10w ~6w ~6.2fms ±~4.2fms #~.2w gc included~n",
+                 {N, Mean, Stddev, _} = time_func(Func, Mode, Bin, 20),
+                 io:format("~15w ~6w ~6.2fms ±~5.2fms #~.2w gc included~n",
                            [Name, Mode, Mean/1000, Stddev/1000, N])
          end,
+    Do2 = fun(Name, Func, Mode) ->
+                  {N, Mean, Stddev, _} = time_func(Func, binary, <<>>, 20),
+                  io:format("~15w ~6w ~6.2fms ±~5.2fms #~.2w gc included~n",
+                            [Name, Mode, Mean/1000, Stddev/1000, N])
+          end,
     io:format("----------------------~n"),
-    Do(tokens, fun(Str) -> string:tokens(Str, [$\n,$\r]) end, list),
+
+    Do(old_tokens, fun(Str) -> string:tokens(Str, [$\n,$\r]) end, list),
     Tokens = {lexemes, fun(Str) -> string:lexemes(Str, [$\n,$\r]) end},
     [Do(Name,Fun,Mode) || {Name,Fun} <- [Tokens], Mode <- [list, binary]],
+
+    S0 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxy.....",
+    S0B = <<"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxy.....">>,
+    Do2(old_strip_l, repeat(fun() -> string:strip(S0, left, $x) end), list),
+    Do2(trim_l,  repeat(fun() -> string:trim(S0, leading, [$x]) end), list),
+    Do2(trim_l,  repeat(fun() -> string:trim(S0B, leading, [$x]) end), binary),
+    Do2(old_strip_r, repeat(fun() -> string:strip(S0, right, $.) end), list),
+    Do2(trim_t,  repeat(fun() -> string:trim(S0, trailing, [$.]) end), list),
+    Do2(trim_t,  repeat(fun() -> string:trim(S0B, trailing, [$.]) end), binary),
+
+    Do2(old_chr_sub, repeat(fun() -> string:sub_string(S0, string:chr(S0, $.)) end), list),
+    Do2(old_str_sub, repeat(fun() -> string:sub_string(S0, string:str(S0, [$.])) end), list),
+    Do2(find, repeat(fun() -> string:find(S0, [$.]) end), list),
+    Do2(find, repeat(fun() -> string:find(S0B, [$.]) end), binary),
+    Do2(old_str_sub2, repeat(fun() -> N = string:str(S0, "xy.."),
+                        {string:sub_string(S0,1,N), string:sub_string(S0,N+4)} end), list),
+    Do2(split, repeat(fun() -> string:split(S0, "xy..") end), list),
+    Do2(split, repeat(fun() -> string:split(S0B, "xy..") end), binary),
+
+    Do2(old_rstr_sub, repeat(fun() -> string:sub_string(S0, string:rstr(S0, [$y])) end), list),
+    Do2(find_t, repeat(fun() -> string:find(S0, [$y], trailing) end), list),
+    Do2(find_t, repeat(fun() -> string:find(S0B, [$y], trailing) end), binary),
+    Do2(old_rstr_sub2, repeat(fun() -> N = string:rstr(S0, "y.."),
+                         {string:sub_string(S0,1,N), string:sub_string(S0,N+3)} end), list),
+    Do2(split_t, repeat(fun() -> string:split(S0, "y..", trailing) end), list),
+    Do2(split_t, repeat(fun() -> string:split(S0B, "y..", trailing) end), binary),
+
+    Do2(old_span, repeat(fun() -> N=string:span(S0, [$x, $y]),
+                                  {string:sub_string(S0,1,N),string:sub_string(S0,N+1)}
+                         end), list),
+    Do2(take, repeat(fun() -> string:take(S0, [$x, $y]) end), list),
+    Do2(take, repeat(fun() -> string:take(S0B, [$x, $y]) end), binary),
+
+    Do2(old_cspan, repeat(fun() -> N=string:cspan(S0, [$.,$y]),
+                                   {string:sub_string(S0,1,N),string:sub_string(S0,N+1)}
+                          end), list),
+    Do2(take_c, repeat(fun() -> string:take(S0, [$.,$y], true) end), list),
+    Do2(take_c, repeat(fun() -> string:take(S0B, [$.,$y], true) end), binary),
+
+    Do2(old_substr, repeat(fun() -> string:substr(S0, 21, 15) end), list),
+    Do2(slice, repeat(fun() -> string:slice(S0, 20, 15) end), list),
+    Do2(slice, repeat(fun() -> string:slice(S0B, 20, 15) end), binary),
+
+    io:format("--~n",[]),
+    NthTokens = {nth_lexemes, fun(Str) -> string:nth_lexeme(Str, 18000, [$\n,$\r]) end},
+    [Do(Name,Fun,Mode) || {Name,Fun} <- [NthTokens], Mode <- [list, binary]],
+    Do2(take_t, repeat(fun() -> string:take(S0, [$.,$y], false, trailing) end), list),
+    Do2(take_t, repeat(fun() -> string:take(S0B, [$.,$y], false, trailing) end), binary),
+    Do2(take_tc, repeat(fun() -> string:take(S0, [$x], true, trailing) end), list),
+    Do2(take_tc, repeat(fun() -> string:take(S0B, [$x], true, trailing) end), binary),
+
+    Length = {length, fun(Str) -> string:length(Str) end},
+    [Do(Name,Fun,Mode) || {Name,Fun} <- [Length], Mode <- [list, binary]],
+
+    Reverse = {reverse, fun(Str) -> string:reverse(Str) end},
+    [Do(Name,Fun,Mode) || {Name,Fun} <- [Reverse], Mode <- [list, binary]],
+
+    ok.
+
+repeat(F) ->
+    fun(_) -> repeat_1(F,20000) end.
+
+repeat_1(F, N) when N > 0 ->
+    F(),
+    repeat_1(F, N-1);
+repeat_1(_, _) ->
+    erlang:garbage_collect(),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -783,9 +881,9 @@ test_1(Line, Func, Str, Args, Exp) ->
     catch
         error:Exp ->
             ok;
-        error:Reason ->
+        error:Reason:Stacktrace ->
             io:format("~p:~p: Crash ~p ~p~n",
-                      [?MODULE,Line, Reason, erlang:get_stacktrace()]),
+                      [?MODULE,Line, Reason, Stacktrace]),
             exit({error, Func})
     end.
 
@@ -850,10 +948,10 @@ check_types(Line, Func, [Str|_], Res)  ->
             io:format("Failed: ~p ~p: ~p ~p~n",[Line, Func, T1, T2]),
             io:format("  ~p  => ~p~n", [Str, Res]),
             error;
-          _:Reason ->
-            io:format("Crash: ~p in~n ~p~n",[Reason, erlang:get_stacktrace()]),
+          _:Reason:Stacktrace ->
+            io:format("Crash: ~p in~n ~p~n",[Reason, Stacktrace]),
             io:format("Failed: ~p ~p: ~p => ~p~n", [Line, Func, Str, Res]),
-            exit({Reason, erlang:get_stacktrace()})
+            exit({Reason, Stacktrace})
     end.
 
 check_types_1(T, T) ->
@@ -865,8 +963,6 @@ check_types_1({list, _},{list, undefined}) ->
     ok;
 check_types_1({list, _},{list, codepoints}) ->
     ok;
-check_types_1({list, _},{list, {list, codepoints}}) ->
-    ok;
 check_types_1({list, {list, _}},{list, {list, codepoints}}) ->
     ok;
 check_types_1(mixed,_) ->
diff --git a/lib/stdlib/test/supervisor_1.erl b/lib/stdlib/test/supervisor_1.erl
index 419026749b..c3ccacc587 100644
--- a/lib/stdlib/test/supervisor_1.erl
+++ b/lib/stdlib/test/supervisor_1.erl
@@ -42,6 +42,8 @@ start_child(error) ->
 	set -> gen_server:start_link(?MODULE, error, [])
     end;
 
+start_child({return, Term}) ->
+    Term;
 
 start_child(Extra) ->
     {ok, Pid} = gen_server:start_link(?MODULE, normal, []),
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index cd2c6b0cbb..761df8eb40 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -39,6 +39,9 @@
 	  sup_start_ignore_temporary_child_start_child_simple/1,
           sup_start_ignore_permanent_child_start_child_simple/1,
 	  sup_start_error_return/1, sup_start_fail/1,
+          sup_start_child_returns_error/1,
+          sup_start_restart_child_returns_error/1,
+          sup_start_child_returns_error_simple/1,
 	  sup_start_map/1, sup_start_map_simple/1,
 	  sup_start_map_faulty_specs/1,
 	  sup_stop_infinity/1, sup_stop_timeout/1, sup_stop_brutal_kill/1,
@@ -65,14 +68,16 @@
 	  simple_one_for_one_extra/1, simple_one_for_one_shutdown/1]).
 
 %% Misc tests
--export([child_unlink/1, tree/1, count_children/1,
+-export([child_unlink/1, tree/1, count_children/1, count_children_supervisor/1,
 	 count_restarting_children/1, get_callback_module/1,
 	 do_not_save_start_parameters_for_temporary_children/1,
 	 do_not_save_child_specs_for_temporary_children/1,
 	 simple_one_for_one_scale_many_temporary_children/1,
          simple_global_supervisor/1, hanging_restart_loop/1,
+	 hanging_restart_loop_rest_for_one/1,
 	 hanging_restart_loop_simple/1, code_change/1, code_change_map/1,
-	 code_change_simple/1, code_change_simple_map/1]).
+	 code_change_simple/1, code_change_simple_map/1,
+         order_of_children/1, scale_start_stop_many_children/1]).
 
 %%-------------------------------------------------------------------------
 
@@ -91,12 +96,15 @@ all() ->
      {group, normal_termination},
      {group, shutdown_termination},
      {group, abnormal_termination}, child_unlink, tree,
-     count_children, count_restarting_children, get_callback_module,
+     count_children, count_children_supervisor, count_restarting_children,
+     get_callback_module,
      do_not_save_start_parameters_for_temporary_children,
      do_not_save_child_specs_for_temporary_children,
      simple_one_for_one_scale_many_temporary_children, temporary_bystander,
-     simple_global_supervisor, hanging_restart_loop, hanging_restart_loop_simple,
-     code_change, code_change_map, code_change_simple, code_change_simple_map].
+     simple_global_supervisor, hanging_restart_loop,
+     hanging_restart_loop_rest_for_one, hanging_restart_loop_simple,
+     code_change, code_change_map, code_change_simple, code_change_simple_map,
+     order_of_children, scale_start_stop_many_children].
 
 groups() -> 
     [{sup_start, [],
@@ -105,7 +113,10 @@ groups() ->
        sup_start_ignore_temporary_child_start_child,
        sup_start_ignore_temporary_child_start_child_simple,
        sup_start_ignore_permanent_child_start_child_simple,
-       sup_start_error_return, sup_start_fail]},
+       sup_start_error_return, sup_start_fail,
+       sup_start_child_returns_error, sup_start_restart_child_returns_error,
+       sup_start_child_returns_error_simple
+      ]},
      {sup_start_map, [],
       [sup_start_map, sup_start_map_simple, sup_start_map_faulty_specs]},
      {sup_stop, [],
@@ -147,6 +158,15 @@ init_per_testcase(_Case, Config) ->
     Config.
 
 end_per_testcase(_Case, _Config) ->
+    %% Clean up to avoid unnecessary error reports in the shell
+    case whereis(sup_test) of
+        SupPid when is_pid(SupPid) ->
+            unlink(SupPid),
+            exit(SupPid,shutdown),
+            ok;
+        _ ->
+            error
+    end,
     ok.
 
 start_link(InitResult) ->
@@ -274,6 +294,7 @@ sup_start_ignore_permanent_child_start_child_simple(Config)
     %% Regression test: check that the supervisor terminates without error.
     exit(Pid, shutdown),
     check_exit_reason(Pid, shutdown).
+
 %%-------------------------------------------------------------------------
 %% Tests what happens if init-callback returns a invalid value.
 sup_start_error_return(Config) when is_list(Config) ->
@@ -289,6 +310,53 @@ sup_start_fail(Config) when is_list(Config) ->
     check_exit_reason(Term).
 
 %%-------------------------------------------------------------------------
+%% Test what happens when the start function for a child returns
+%% {error,Reason} or some other term().
+sup_start_restart_child_returns_error(_Config) ->
+    process_flag(trap_exit, true),
+    Child = {child1, {supervisor_1, start_child, [error]},
+              permanent, 1000, worker, []},
+    {ok, _Pid}  = start_link({ok, {{one_for_one, 2, 3600}, [Child]}}),
+
+    ok = supervisor:terminate_child(sup_test, child1),
+    {error,{function_clause,_}} = supervisor:restart_child(sup_test,child1),
+
+    [{child1,undefined,worker,[]}] = supervisor:which_children(sup_test),
+    ok.
+
+%%-------------------------------------------------------------------------
+%% Test what happens when the start function for a child returns
+%% {error,Reason} or some other term().
+sup_start_child_returns_error(_Config) ->
+    process_flag(trap_exit, true),
+    Child1 = {child1, {supervisor_1, start_child, [{return,{error,reason}}]},
+              permanent, 1000, worker, []},
+    Child2 = {child2, {supervisor_1, start_child, [{return,error_reason}]},
+              permanent, 1000, worker, []},
+    {ok, _Pid}  = start_link({ok, {{one_for_one, 2, 3600}, []}}),
+
+    {error,{reason,_}} = supervisor:start_child(sup_test,Child1),
+    {error,{error_reason,_}} = supervisor:start_child(sup_test,Child2),
+
+    [] = supervisor:which_children(sup_test),
+    ok.
+
+%%-------------------------------------------------------------------------
+%% Test what happens when the start function for a child returns
+%% {error,Reason} - simple_one_for_one
+sup_start_child_returns_error_simple(_Config) ->
+    process_flag(trap_exit, true),
+    Child = {child1, {supervisor_1, start_child, []},
+             permanent, 1000, worker, []},
+    {ok, _Pid}  = start_link({ok, {{simple_one_for_one, 2, 3600}, [Child]}}),
+
+    {error,reason} = supervisor:start_child(sup_test,[{return,{error,reason}}]),
+    {error,error_reason} = supervisor:start_child(sup_test,[{return,error_reason}]),
+
+    [] = supervisor:which_children(sup_test),
+    ok.
+
+%%-------------------------------------------------------------------------
 %% Tests that the supervisor process starts correctly with map
 %% startspec, and that the full childspec can be read.
 sup_start_map(Config) when is_list(Config) ->
@@ -468,7 +536,16 @@ extra_return(Config) when is_list(Config) ->
     [{child1, CPid3, worker, []}] = supervisor:which_children(sup_test),
     [1,1,0,1] = get_child_counts(sup_test),
 
-    ok.
+    %% Check that it can be automatically restarted
+    terminate(CPid3, abnormal),
+    [{child1, CPid4, worker, []}] = supervisor:which_children(sup_test),
+    [1,1,0,1] = get_child_counts(sup_test),
+    if (not is_pid(CPid4)) orelse CPid4=:=CPid3 ->
+            ct:fail({not_restarted,CPid3,CPid4});
+       true ->
+            ok
+    end.
+
 %%-------------------------------------------------------------------------
 %% Test API functions start_child/2, terminate_child/2, delete_child/2
 %% restart_child/2, which_children/1, count_children/1. Only correct
@@ -1140,7 +1217,7 @@ simple_one_for_one(Config) when is_list(Config) ->
     [{Id4, Pid4, _, _}|_] = supervisor:which_children(sup_test),
 
     terminate(SupPid, Pid4, Id4, abnormal),
-    check_exit([SupPid]).
+    check_exit_reason(SupPid,shutdown).
 
 
 %%-------------------------------------------------------------------------
@@ -1378,6 +1455,11 @@ tree(Config) when is_list(Config) ->
 		  [?MODULE, {ok, {{one_for_one, 4, 3600}, []}}]},
 		 permanent, infinity,
 		 supervisor, []},
+    ChildSup3 = {supchild3,
+		 {supervisor, start_link,
+		  [?MODULE, {ok, {{one_for_one, 4, 3600}, []}}]},
+		 transient, infinity,
+		 supervisor, []},
 
     %% Top supervisor
     {ok, SupPid} = start_link({ok, {{one_for_all, 4, 3600}, []}}),
@@ -1385,7 +1467,9 @@ tree(Config) when is_list(Config) ->
     %% Child supervisors  
     {ok, Sup1} = supervisor:start_child(SupPid, ChildSup1),
     {ok, Sup2} = supervisor:start_child(SupPid, ChildSup2),
-    [2,2,2,0] = get_child_counts(SupPid),
+    {ok, _Sup3} = supervisor:start_child(SupPid, ChildSup3),
+    ok = supervisor:terminate_child(SupPid, supchild3),
+    [3,2,3,0] = get_child_counts(SupPid),
 
     %% Workers
     [{_, CPid2, _, _},{_, CPid1, _, _}] =
@@ -1417,16 +1501,21 @@ tree(Config) when is_list(Config) ->
 
     timer:sleep(1000),
 
-    [{supchild2, NewSup2, _, _},{supchild1, NewSup1, _, _}] =
+    [{supchild3, NewSup3, _, _},
+     {supchild2, NewSup2, _, _},
+     {supchild1, NewSup1, _, _}] =
 	supervisor:which_children(SupPid),
-    [2,2,2,0] = get_child_counts(SupPid),
+    [3,3,3,0] = get_child_counts(SupPid),
 
     [{child2, _, _, _},{child1, _, _, _}]  =
 	supervisor:which_children(NewSup1),
     [2,2,0,2] = get_child_counts(NewSup1),
 
     [] = supervisor:which_children(NewSup2),
-    [0,0,0,0] = get_child_counts(NewSup2).
+    [0,0,0,0] = get_child_counts(NewSup2),
+
+    [] = supervisor:which_children(NewSup3),
+    [0,0,0,0] = get_child_counts(NewSup3).
 
 %%-------------------------------------------------------------------------
 %% Test count_children
@@ -1459,6 +1548,36 @@ count_children(Config) when is_list(Config) ->
     [1,0,0,0] = get_child_counts(sup_test).
 
 %%-------------------------------------------------------------------------
+%% Test count_children for simple_one_for_one, when children are supervisors
+count_children_supervisor(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    Child = {child, {supervisor_1, start_child, []}, temporary, infinity,
+	     supervisor, []},
+    {ok, SupPid} = start_link({ok, {{simple_one_for_one, 2, 3600}, [Child]}}),
+    [supervisor:start_child(sup_test, []) || _Ignore <- lists:seq(1,1000)],
+
+    Children = supervisor:which_children(sup_test),
+    ChildCount = get_child_counts(sup_test),
+
+    [supervisor:start_child(sup_test, []) || _Ignore2 <- lists:seq(1,1000)],
+
+    ChildCount2 = get_child_counts(sup_test),
+    Children2 = supervisor:which_children(sup_test),
+
+    ChildCount3 = get_child_counts(sup_test),
+    Children3 = supervisor:which_children(sup_test),
+
+    1000 = length(Children),
+    [1,1000,1000,0] = ChildCount,
+    2000 = length(Children2),
+    [1,2000,2000,0] = ChildCount2,
+    Children3 = Children2,
+    ChildCount3 = ChildCount2,
+
+    [terminate(SupPid, Pid, child, kill) || {undefined, Pid, supervisor, _Modules} <- Children3],
+    [1,0,0,0] = get_child_counts(sup_test).
+
+%%-------------------------------------------------------------------------
 %% Test count_children when some children are restarting
 count_restarting_children(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
@@ -1577,11 +1696,11 @@ dont_save_start_parameters_for_temporary_children(simple_one_for_one = Type) ->
     start_children(Sup2, [LargeList], 100),
     start_children(Sup3, [LargeList], 100),
 
-    [{memory,Mem1}] = process_info(Sup1, [memory]),
-    [{memory,Mem2}] = process_info(Sup2, [memory]),
-    [{memory,Mem3}] = process_info(Sup3, [memory]),
+    Size1 = erts_debug:flat_size(sys:get_status(Sup1)),
+    Size2 = erts_debug:flat_size(sys:get_status(Sup2)),
+    Size3 = erts_debug:flat_size(sys:get_status(Sup3)),
 
-    true = (Mem3 < Mem1)  and  (Mem3 < Mem2),
+    true = (Size3 < Size1)  and  (Size3 < Size2),
 
     terminate(Sup1, shutdown),
     terminate(Sup2, shutdown),
@@ -1605,11 +1724,11 @@ dont_save_start_parameters_for_temporary_children(Type) ->
     start_children(Sup2, Transient, 100),
     start_children(Sup3, Temporary, 100),
 
-    [{memory,Mem1}] = process_info(Sup1, [memory]),
-    [{memory,Mem2}] = process_info(Sup2, [memory]),
-    [{memory,Mem3}] = process_info(Sup3, [memory]),
+    Size1 = erts_debug:flat_size(sys:get_status(Sup1)),
+    Size2 = erts_debug:flat_size(sys:get_status(Sup2)),
+    Size3 = erts_debug:flat_size(sys:get_status(Sup3)),
 
-    true = (Mem3 < Mem1)  and  (Mem3 < Mem2),
+    true = (Size3 < Size1)  and  (Size3 < Size2),
 
     terminate(Sup1, shutdown),
     terminate(Sup2, shutdown),
@@ -1847,6 +1966,61 @@ hanging_restart_loop(Config) when is_list(Config) ->
     undefined = whereis(sup_test),
     ok.
 
+hanging_restart_loop_rest_for_one(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    {ok, Pid} = start_link({ok, {{rest_for_one, 8, 10}, []}}),
+    Child1 = {child1, {supervisor_1, start_child, []},
+	      permanent, brutal_kill, worker, []},
+    Child2 = {child2, {supervisor_deadlock, start_child, []},
+	      permanent, brutal_kill, worker, []},
+    Child3 = {child3, {supervisor_1, start_child, []},
+	      permanent, brutal_kill, worker, []},
+
+    %% Ets table with state read by supervisor_deadlock.erl
+    ets:new(supervisor_deadlock,[set,named_table,public]),
+    ets:insert(supervisor_deadlock,{fail_start,false}),
+
+    {ok, CPid1} = supervisor:start_child(sup_test, Child1),
+    {ok, CPid2} = supervisor:start_child(sup_test, Child2),
+    link(CPid2),
+    {ok, _CPid3} = supervisor:start_child(sup_test, Child3),
+
+    ets:insert(supervisor_deadlock,{fail_start,true}),
+    supervisor_deadlock:restart_child(),
+    timer:sleep(2000), % allow restart to happen before proceeding
+
+    {error, already_present} = supervisor:start_child(sup_test, Child2),
+    {error, restarting} = supervisor:restart_child(sup_test, child2),
+    {error, restarting} = supervisor:delete_child(sup_test, child2),
+    [{child3,undefined,worker,[]},
+     {child2,restarting,worker,[]},
+     {child1,CPid1,worker,[]}] = supervisor:which_children(sup_test),
+    [3,1,0,3] = get_child_counts(sup_test),
+
+    ok = supervisor:terminate_child(sup_test, child2),
+    check_exit_reason(CPid2, error),
+    [{child3,undefined,worker,[]},
+     {child2,undefined,worker,[]},
+     {child1,CPid1,worker,[]}] = supervisor:which_children(sup_test),
+
+    ets:insert(supervisor_deadlock,{fail_start,false}),
+    {ok, CPid22} = supervisor:restart_child(sup_test, child2),
+    link(CPid22),
+
+    ets:insert(supervisor_deadlock,{fail_start,true}),
+    supervisor_deadlock:restart_child(),
+    timer:sleep(2000), % allow restart to happen before proceeding
+
+    %% Terminating supervisor.
+    %% OTP-9549 fixes so this does not give a timetrap timeout -
+    %% i.e. that supervisor does not hang in restart loop.
+    terminate(Pid,shutdown),
+
+    %% Check that child died with reason from 'restart' request above
+    check_exit_reason(CPid22, error),
+    undefined = whereis(sup_test),
+    ok.
+
 %%-------------------------------------------------------------------------
 %% Test that child and supervisor can be shutdown while hanging in
 %% restart loop, simple_one_for_one.
@@ -2022,11 +2196,11 @@ code_change_simple(_Config) ->
     SimpleChild2 = {child2,{supervisor_1, start_child, []}, permanent,
 		    brutal_kill, worker, []},
 
-    {error, {error, {ok,[_,_]}}} =
+    {error, {error, {ok,{[_,_],_}}}} =
 	fake_upgrade(SimplePid,{ok,{SimpleFlags,[SimpleChild1,SimpleChild2]}}),
 
     %% Attempt to remove child
-    {error, {error, {ok,[]}}} = fake_upgrade(SimplePid,{ok,{SimpleFlags,[]}}),
+    {error, {error, {ok,{[],_}}}} = fake_upgrade(SimplePid,{ok,{SimpleFlags,[]}}),
 
     terminate(SimplePid,shutdown),
     ok.
@@ -2047,11 +2221,11 @@ code_change_simple_map(_Config) ->
     %% Attempt to add child
     SimpleChild2 = #{id=>child2,
 		     start=>{supervisor_1, start_child, []}},
-    {error, {error, {ok, [_,_]}}} =
+    {error, {error, {ok, {[_,_],_}}}} =
 	fake_upgrade(SimplePid,{ok,{SimpleFlags,[SimpleChild1,SimpleChild2]}}),
 
     %% Attempt to remove child
-    {error, {error, {ok, []}}} =
+    {error, {error, {ok, {[],_}}}} =
 	fake_upgrade(SimplePid,{ok,{SimpleFlags,[]}}),
 
     terminate(SimplePid,shutdown),
@@ -2075,6 +2249,148 @@ fake_upgrade(Pid,NewInitReturn) ->
     ok = sys:resume(Pid),
     R.
 
+%% Test that children are started in the order they are given, and
+%% terminated in the opposite order
+order_of_children(_Config) ->
+    process_flag(trap_exit, true),
+    %% Use child ids that are not alphabetically storted
+    Id1 = ch7,
+    Id2 = ch3,
+    Id3 = ch10,
+    Id4 = ch2,
+    Id5 = ch5,
+    Children =
+        [{Id, {supervisor_1, start_child, []}, permanent, 1000, worker, []} ||
+            Id <- [Id1,Id2,Id3,Id4,Id5]],
+
+    {ok, SupPid}  = start_link({ok, {{rest_for_one, 2, 3600}, Children}}),
+
+
+    %% Check start order (pids are growing)
+    Which1 = supervisor:which_children(sup_test),
+    IsPid = fun({_,P,_,_}) when is_pid(P) -> true; (_) -> false end,
+    true = lists:all(IsPid,Which1),
+    SortedOnPid1 = lists:keysort(2,Which1),
+    [{Id1,Pid1,_,_},
+     {Id2,Pid2,_,_},
+     {Id3,Pid3,_,_},
+     {Id4,Pid4,_,_},
+     {Id5,Pid5,_,_}] = SortedOnPid1,
+
+    TPid = self(),
+    TraceHandler = fun({trace,P,exit,_},{Last,Ps}) when P=:=Last ->
+                           TPid ! {exited,lists:reverse([P|Ps])},
+                           {Last,Ps};
+                      ({trace,P,exit,_},{Last,Ps}) ->
+                           {Last,[P|Ps]};
+                      (_T,Acc) ->
+                           Acc
+                   end,
+
+    %% Terminate Pid3 and check that Pid4 and Pid5 are terminated in
+    %% expected order.
+    Expected1 = [Pid5,Pid4],
+    {ok,_} = dbg:tracer(process,{TraceHandler,{Pid4,[]}}),
+    [{ok,[_]} = dbg:p(P,procs) || P <- Expected1],
+    terminate(Pid3, abnormal),
+    receive {exited,ExitedPids1} ->
+            dbg:stop_clear(),
+            case ExitedPids1 of
+                Expected1 -> ok;
+                _ -> ct:fail({faulty_termination_order,
+                              {expected,Expected1},
+                              {got,ExitedPids1}})
+            end
+    after 3000 ->
+            dbg:stop_clear(),
+            ct:fail({shutdown_fail,timeout})
+    end,
+
+    %% Then check that Id3-5 are started again in correct order
+    Which2 = supervisor:which_children(sup_test),
+    true = lists:all(IsPid,Which2),
+    SortedOnPid2 = lists:keysort(2,Which2),
+    [{Id1,Pid1,_,_},
+     {Id2,Pid2,_,_},
+     {Id3,Pid32,_,_},
+     {Id4,Pid42,_,_},
+     {Id5,Pid52,_,_}] = SortedOnPid2,
+
+    %% Terminate supervisor and check that all children are terminated
+    %% in opposite start order
+    Expected2 = [Pid52,Pid42,Pid32,Pid2,Pid1],
+    {ok,_} = dbg:tracer(process,{TraceHandler,{Pid1,[]}}),
+    [{ok,[_]} = dbg:p(P,procs) || P <- Expected2],
+    exit(SupPid,shutdown),
+    receive {exited,ExitedPids2} ->
+            dbg:stop_clear(),
+            case ExitedPids2 of
+                Expected2 -> ok;
+                _ -> ct:fail({faulty_termination_order,
+                              {expected,Expected2},
+                              {got,ExitedPids2}})
+            end
+    after 3000 ->
+            dbg:stop_clear(),
+            ct:fail({shutdown_fail,timeout})
+    end,
+    ok.
+
+%% Test that a non-simple supervisor scales well for starting and
+%% stopping many children.
+scale_start_stop_many_children(_Config) ->
+    process_flag(trap_exit, true),
+    {ok, _Pid}  = start_link({ok, {{one_for_one, 2, 3600}, []}}),
+    N1 = 1000,
+    N2 = 100000,
+    Ids1 = lists:seq(1,N1),
+    Ids2 = lists:seq(1,N2),
+    Children1 = [{Id,{supervisor_1,start_child,[]},permanent,1000,worker,[]} ||
+                    Id <- Ids1],
+    Children2 = [{Id,{supervisor_1,start_child,[]},permanent,1000,worker,[]} ||
+                    Id <- Ids2],
+
+    {StartT1,_} =
+        timer:tc(fun() ->
+                         [supervisor:start_child(sup_test,C) || C <- Children1]
+                 end),
+    {StopT1,_} =
+        timer:tc(fun() ->
+                         [supervisor:terminate_child(sup_test,I) || I <- Ids1]
+                 end),
+    ct:log("~w children, start time: ~w ms, stop time: ~w ms",
+           [N1, StartT1 div 1000, StopT1 div 1000]),
+
+    {StartT2,_} =
+        timer:tc(fun() ->
+                         [supervisor:start_child(sup_test,C) || C <- Children2]
+                 end),
+    {StopT2,_} =
+        timer:tc(fun() ->
+                         [supervisor:terminate_child(sup_test,I) || I <- Ids2]
+                 end),
+    ct:log("~w children, start time: ~w ms, stop time: ~w ms",
+           [N2, StartT2 div 1000, StopT2 div 1000]),
+
+    %% Scaling should be more or less linear, but allowing a bit more
+    %% to avoid false alarms
+    ScaleLimit = (N2 div N1) * 10,
+    StartScale = StartT2 div StartT1,
+    StopScale = StopT2 div StopT1,
+
+    ct:log("Scale limit: ~w~nStart scale: ~w~nStop scale: ~w",
+           [ScaleLimit, StartScale, StopScale]),
+
+    if StartScale > ScaleLimit ->
+            ct:fail({bad_start_scale,StartScale});
+       StopScale > ScaleLimit ->
+            ct:fail({bad_stop_scale,StopScale});
+       true ->
+            ok
+    end,
+
+    ok.
+
 %%-------------------------------------------------------------------------
 terminate(Pid, Reason) when Reason =/= supervisor ->
     terminate(dummy, Pid, dummy, Reason).
diff --git a/lib/stdlib/test/supervisor_deadlock.erl b/lib/stdlib/test/supervisor_deadlock.erl
index 8d3d1c6f30..f51aecccb2 100644
--- a/lib/stdlib/test/supervisor_deadlock.erl
+++ b/lib/stdlib/test/supervisor_deadlock.erl
@@ -1,5 +1,5 @@
 -module(supervisor_deadlock).
--compile(export_all).
+-compile([export_all,nowarn_export_all]).
 
 
 %%%-----------------------------------------------------------------
diff --git a/lib/stdlib/test/tar_SUITE.erl b/lib/stdlib/test/tar_SUITE.erl
index 4061008812..32a33283d1 100644
--- a/lib/stdlib/test/tar_SUITE.erl
+++ b/lib/stdlib/test/tar_SUITE.erl
@@ -28,7 +28,7 @@
 	 extract_from_open_file/1, symlinks/1, open_add_close/1, cooked_compressed/1,
 	 memory/1,unicode/1,read_other_implementations/1,
          sparse/1, init/1, leading_slash/1, dotdot/1,
-         roundtrip_metadata/1]).
+         roundtrip_metadata/1, apply_file_info_opts/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
@@ -42,7 +42,8 @@ all() ->
      extract_filtered,
      symlinks, open_add_close, cooked_compressed, memory, unicode,
      read_other_implementations,
-     sparse,init,leading_slash,dotdot,roundtrip_metadata].
+     sparse,init,leading_slash,dotdot,roundtrip_metadata,
+     apply_file_info_opts].
 
 groups() -> 
     [].
@@ -989,6 +990,31 @@ do_roundtrip_metadata(Dir, File) ->
             ok
     end.
 
+apply_file_info_opts(Config) when is_list(Config) ->
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
+
+    ok = file:make_dir("empty_directory"),
+    ok = file:write_file("file", "contents"),
+
+    Opts = [{atime, 0}, {mtime, 0}, {ctime, 0}, {uid, 0}, {gid, 0}],
+    TarFile = "reproducible.tar",
+    {ok, Tar} = erl_tar:open(TarFile, [write]),
+    ok = erl_tar:add(Tar, "file", Opts),
+    ok = erl_tar:add(Tar, "empty_directory", Opts),
+    ok = erl_tar:add(Tar, <<"contents">>, "memory_file", Opts),
+    erl_tar:close(Tar),
+
+    ok = file:make_dir("extracted"),
+    erl_tar:extract(TarFile, [{cwd, "extracted"}]),
+
+    {ok, #file_info{mtime=0}} =
+        file:read_file_info("extracted/empty_directory", [{time, posix}]),
+    {ok, #file_info{mtime=0}} =
+        file:read_file_info("extracted/file", [{time, posix}]),
+    {ok, #file_info{mtime=0}} =
+        file:read_file_info("extracted/memory_file", [{time, posix}]),
+
+    ok.
 
 %% Delete the given list of files.
 delete_files([]) -> ok;
diff --git a/lib/stdlib/test/unicode_util_SUITE.erl b/lib/stdlib/test/unicode_util_SUITE.erl
index 7dba0a2fd0..40b1c260a5 100644
--- a/lib/stdlib/test/unicode_util_SUITE.erl
+++ b/lib/stdlib/test/unicode_util_SUITE.erl
@@ -136,10 +136,10 @@ verify_gc(Line0, N, Acc) ->
             io:format("Expected: ~p~n", [Res]),
             io:format("Got: ~w~n", [Other]),
             Acc+1;
-          Cl:R ->
+          Cl:R:Stacktrace ->
             io:format("~p: ~ts => |~tp|~n",[N, Line, Str]),
             io:format("Expected: ~p~n", [Res]),
-            erlang:raise(Cl,R,erlang:get_stacktrace())
+            erlang:raise(Cl,R,Stacktrace)
     end.
 
 gc_test_data([[247]|Rest], Str, [First|GCs]) ->
@@ -175,29 +175,29 @@ verify_nfd(Data0, LineNo, _Acc) ->
         C3GC = fetch(C1, fun unicode_util:nfd/1),
         C3GC = fetch(C2, fun unicode_util:nfd/1),
         C3GC = fetch(C3, fun unicode_util:nfd/1)
-    catch  _Cl:{badmatch, Other} = _R->
+    catch  _Cl:{badmatch, Other} = _R: Stacktrace ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C1, C1]),
             io:format("Expected: ~ts ~w~n", [C3GC, C3GC]),
             io:format("Got: ~ts ~w~n", [Other, Other]),
-            erlang:raise(_Cl,_R,erlang:get_stacktrace());
-           Cl:R ->
+            erlang:raise(_Cl,_R,Stacktrace);
+           Cl:R:Stacktrace ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C3]),
-            erlang:raise(Cl,R,erlang:get_stacktrace())
+            erlang:raise(Cl,R,Stacktrace)
     end,
     C5GC = fetch(C5, fun unicode_util:gc/1),
     try
         C5GC = fetch(C4, fun unicode_util:nfd/1),
         C5GC = fetch(C5, fun unicode_util:nfd/1)
-    catch  _Cl2:{badmatch, Other2} = _R2->
+    catch  _Cl2:{badmatch, Other2} = _R2:Stacktrace2 ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C1, C1]),
             io:format("Expected: ~ts ~w~n", [C5GC, C5GC]),
             io:format("Got:      ~ts ~w~n", [Other2, Other2]),
-            erlang:raise(_Cl2,_R2,erlang:get_stacktrace());
-           Cl2:R2 ->
+            erlang:raise(_Cl2,_R2,Stacktrace2);
+           Cl2:R2:Stacktrace2 ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C5]),
-            erlang:raise(Cl2,R2,erlang:get_stacktrace())
+            erlang:raise(Cl2,R2,Stacktrace2)
     end,
     ok.
 
@@ -218,29 +218,29 @@ verify_nfc(Data0, LineNo, _Acc) ->
         C2GC = fetch(C1, fun unicode_util:nfc/1),
         C2GC = fetch(C2, fun unicode_util:nfc/1),
         C2GC = fetch(C3, fun unicode_util:nfc/1)
-    catch  _Cl:{badmatch, Other} = _R->
+    catch  _Cl:{badmatch, Other} = _R:Stacktrace ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C1, C1]),
             io:format("Expected: ~ts ~w~n", [C2GC, C2GC]),
             io:format("Got:      ~ts ~w~n", [Other, Other]),
-            erlang:raise(_Cl,_R,erlang:get_stacktrace());
-           Cl:R ->
+            erlang:raise(_Cl,_R,Stacktrace);
+           Cl:R:Stacktrace ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C3]),
-            erlang:raise(Cl,R,erlang:get_stacktrace())
+            erlang:raise(Cl,R,Stacktrace)
     end,
     C4GC = fetch(C4, fun unicode_util:gc/1),
     try
         C4GC = fetch(C4, fun unicode_util:nfc/1),
         C4GC = fetch(C5, fun unicode_util:nfc/1)
-    catch  _Cl2:{badmatch, Other2} = _R2->
+    catch  _Cl2:{badmatch, Other2} = _R2:Stacktrace2 ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C1, C1]),
             io:format("Expected: ~ts ~w~n", [C4GC, C4GC]),
             io:format("Got: ~ts ~w~n", [Other2, Other2]),
-            erlang:raise(_Cl2,_R2,erlang:get_stacktrace());
-           Cl2:R2 ->
+            erlang:raise(_Cl2,_R2,Stacktrace2);
+           Cl2:R2:Stacktrace2 ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C5]),
-            erlang:raise(Cl2,R2,erlang:get_stacktrace())
+            erlang:raise(Cl2,R2,Stacktrace2)
     end,
     ok.
 
@@ -263,15 +263,15 @@ verify_nfkd(Data0, LineNo, _Acc) ->
         C5GC = lists:flatten(fetch(C3, fun unicode_util:nfkd/1)),
         C5GC = lists:flatten(fetch(C4, fun unicode_util:nfkd/1)),
         C5GC = lists:flatten(fetch(C5, fun unicode_util:nfkd/1))
-    catch  _Cl:{badmatch, Other} = _R->
+    catch  _Cl:{badmatch, Other} = _R:Stacktrace ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C5, C5]),
             io:format("Expected: ~ts ~w~n", [C5GC, C5GC]),
             io:format("Got: ~ts ~w~n", [Other, Other]),
-            erlang:raise(_Cl,_R,erlang:get_stacktrace());
-           Cl:R ->
+            erlang:raise(_Cl,_R,Stacktrace);
+           Cl:R:Stacktrace ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C3]),
-            erlang:raise(Cl,R,erlang:get_stacktrace())
+            erlang:raise(Cl,R,Stacktrace)
     end,
     ok.
 
@@ -296,15 +296,15 @@ verify_nfkc(Data0, LineNo, _Acc) ->
         C4GC = lists:flatten(fetch(C4, fun unicode_util:nfkc/1)),
         C4GC = lists:flatten(fetch(C5, fun unicode_util:nfkc/1))
 
-    catch  _Cl:{badmatch, Other} = _R->
+    catch  _Cl:{badmatch, Other} = _R:Stacktrace ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C4, C4]),
             io:format("Expected: ~ts ~w~n", [C4GC, C4GC]),
             io:format("Got:      ~ts ~w~n", [Other, Other]),
-            erlang:raise(_Cl,_R,erlang:get_stacktrace());
-           Cl:R ->
+            erlang:raise(_Cl,_R,Stacktrace);
+           Cl:R:Stacktrace ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C3]),
-            erlang:raise(Cl,R,erlang:get_stacktrace())
+            erlang:raise(Cl,R,Stacktrace)
     end,
     ok.
 
@@ -312,12 +312,23 @@ get(_) ->
     add_get_tests.
 
 count(Config) ->
+    Parent = self(),
+    Exec = fun() ->
+                   do_measure(Config),
+                   Parent ! {test_done, self()}
+           end,
     ct:timetrap({minutes,5}),
     case ct:get_timetrap_info() of
-        {_,{_,Scale}} ->
+        {_,{_,Scale}} when Scale > 1 ->
             {skip,{measurments_skipped_debug,Scale}};
-        _ -> % No scaling
-            do_measure(Config)
+        _ -> % No scaling, run at most 2 min
+            Tester = spawn(Exec),
+            receive {test_done, Tester} -> ok
+            after 120000 ->
+                    io:format("Timelimit reached stopping~n",[]),
+                    exit(Tester, die)
+            end,
+            ok
     end.
 
 do_measure(Config) ->
diff --git a/lib/stdlib/test/uri_string_SUITE.erl b/lib/stdlib/test/uri_string_SUITE.erl
new file mode 100644
index 0000000000..92f8bb3292
--- /dev/null
+++ b/lib/stdlib/test/uri_string_SUITE.erl
@@ -0,0 +1,979 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-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.
+%% 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(uri_string_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+
+-export([all/0, suite/0,groups/0,
+         normalize/1, normalize_map/1, normalize_return_map/1, normalize_negative/1,
+         parse_binary_fragment/1, parse_binary_host/1, parse_binary_host_ipv4/1,
+         parse_binary_host_ipv6/1,
+         parse_binary_path/1, parse_binary_pct_encoded_fragment/1, parse_binary_pct_encoded_query/1,
+         parse_binary_pct_encoded_userinfo/1, parse_binary_port/1,
+         parse_binary_query/1, parse_binary_scheme/1, parse_binary_userinfo/1,
+         parse_fragment/1, parse_host/1, parse_host_ipv4/1, parse_host_ipv6/1,
+         parse_path/1, parse_pct_encoded_fragment/1, parse_pct_encoded_query/1,
+         parse_pct_encoded_userinfo/1, parse_port/1,
+         parse_query/1, parse_scheme/1, parse_userinfo/1,
+	 parse_list/1, parse_binary/1, parse_mixed/1, parse_relative/1,
+         parse_special/1, parse_special2/1, parse_negative/1,
+         recompose_fragment/1, recompose_parse_fragment/1,
+         recompose_query/1, recompose_parse_query/1,
+         recompose_path/1, recompose_parse_path/1,
+         recompose_autogen/1, parse_recompose_autogen/1,
+         transcode_basic/1, transcode_options/1, transcode_mixed/1, transcode_negative/1,
+         compose_query/1, compose_query_latin1/1, compose_query_negative/1,
+         dissect_query/1, dissect_query_negative/1,
+         interop_query_latin1/1, interop_query_utf8/1
+        ]).
+
+
+-define(SCHEME, "foo").
+-define(USERINFO, "åsa").
+-define(USERINFO_ENC, "%C3%A5sa").
+-define(HOST, "älvsjö").
+-define(HOST_ENC, "%C3%A4lvsj%C3%B6").
+-define(IPV6, "::127.0.0.1").
+-define(IPV6_ENC, "[::127.0.0.1]").
+-define(PORT, 8042).
+-define(PORT_ENC, ":8042").
+-define(PATH, "/där").
+-define(PATH_ENC, "/d%C3%A4r").
+-define(QUERY, "name=örn").
+-define(QUERY_ENC, "?name=%C3%B6rn").
+-define(FRAGMENT, "näsa").
+-define(FRAGMENT_ENC, "#n%C3%A4sa").
+
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+all() ->
+    [
+     normalize,
+     normalize_map,
+     normalize_return_map,
+     normalize_negative,
+     parse_binary_scheme,
+     parse_binary_userinfo,
+     parse_binary_pct_encoded_userinfo,
+     parse_binary_host,
+     parse_binary_host_ipv4,
+     parse_binary_host_ipv6,
+     parse_binary_port,
+     parse_binary_path,
+     parse_binary_query,
+     parse_binary_pct_encoded_query,
+     parse_binary_fragment,
+     parse_binary_pct_encoded_fragment,
+     parse_scheme,
+     parse_userinfo,
+     parse_pct_encoded_userinfo,
+     parse_host,
+     parse_host_ipv4,
+     parse_host_ipv6,
+     parse_port,
+     parse_path,
+     parse_query,
+     parse_pct_encoded_query,
+     parse_fragment,
+     parse_pct_encoded_fragment,
+     parse_list,
+     parse_binary,
+     parse_mixed,
+     parse_relative,
+     parse_special,
+     parse_special2,
+     parse_negative,
+     recompose_fragment,
+     recompose_parse_fragment,
+     recompose_query,
+     recompose_parse_query,
+     recompose_path,
+     recompose_parse_path,
+     recompose_autogen,
+     parse_recompose_autogen,
+     transcode_basic,
+     transcode_options,
+     transcode_mixed,
+     transcode_negative,
+     compose_query,
+     compose_query_latin1,
+     compose_query_negative,
+     dissect_query,
+     dissect_query_negative,
+     interop_query_latin1,
+     interop_query_utf8
+    ].
+
+groups() ->
+    [].
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions
+%%-------------------------------------------------------------------------
+uri_combinations() ->
+    [[Sch,Usr,Hst,Prt,Pat,Qry,Frg] ||
+        Sch <- [fun update_scheme/1, fun update_scheme_binary/1, none],
+        Usr <- [fun update_userinfo/1, fun update_userinfo_binary/1, none],
+        Hst <- [fun update_host/1, fun update_host_binary/1,
+                fun update_ipv6/1, fun update_ipv6_binary/1, none],
+        Prt <- [fun update_port/1, none],
+        Pat <- [fun update_path/1, fun update_path_binary/1],
+        Qry <- [fun update_query/1,fun update_query_binary/1, none],
+        Frg <- [fun update_fragment/1, fun update_fragment_binary/1, none],
+        not (Usr =:= none andalso Hst =:= none andalso Prt =/= none),
+        not (Usr =/= none andalso Hst =:= none andalso Prt =:= none),
+        not (Usr =/= none andalso Hst =:= none andalso Prt =/= none)].
+
+
+generate_test_vector(Comb) ->
+    Fun = fun (F, {Map, URI}) when is_function(F) -> F({Map, URI});
+              (_, Map) -> Map
+          end,
+    lists:foldl(Fun, {#{}, empty}, Comb).
+
+generate_test_vectors(L) ->
+    lists:map(fun generate_test_vector/1, L).
+
+update_fragment({In, empty}) ->
+    {In#{fragment => ?FRAGMENT}, ?FRAGMENT_ENC};
+update_fragment({In, Out}) when is_list(Out) ->
+    {In#{fragment => ?FRAGMENT}, Out ++ ?FRAGMENT_ENC};
+update_fragment({In, Out}) when is_binary(Out) ->
+    {In#{fragment => ?FRAGMENT}, binary_to_list(Out) ++ ?FRAGMENT_ENC}.
+
+update_fragment_binary({In, empty}) ->
+    {In#{fragment => <<?FRAGMENT/utf8>>}, <<?FRAGMENT_ENC>>};
+update_fragment_binary({In, Out}) when is_list(Out) ->
+    {In#{fragment => <<?FRAGMENT/utf8>>}, Out ++ ?FRAGMENT_ENC};
+update_fragment_binary({In, Out}) when is_binary(Out) ->
+    {In#{fragment => <<?FRAGMENT/utf8>>}, <<Out/binary,?FRAGMENT_ENC>>}.
+
+
+update_query({In, empty}) ->
+    {In#{query => ?QUERY}, ?QUERY_ENC};
+update_query({In, Out}) when is_list(Out) ->
+    {In#{query => ?QUERY}, Out ++ ?QUERY_ENC};
+update_query({In, Out}) when is_binary(Out) ->
+    {In#{query => ?QUERY}, binary_to_list(Out) ++ ?QUERY_ENC}.
+
+update_query_binary({In, empty}) ->
+    {In#{query => <<?QUERY/utf8>>}, <<?QUERY_ENC>>};
+update_query_binary({In, Out}) when is_list(Out) ->
+    {In#{query => <<?QUERY/utf8>>}, Out ++ ?QUERY_ENC};
+update_query_binary({In, Out}) when is_binary(Out) ->
+    {In#{query => <<?QUERY/utf8>>}, <<Out/binary,?QUERY_ENC>>}.
+
+update_path({In, empty}) ->
+    {In#{path => ?PATH}, ?PATH_ENC};
+update_path({In, Out}) when is_list(Out) ->
+    {In#{path => ?PATH}, Out ++ ?PATH_ENC};
+update_path({In, Out}) when is_binary(Out) ->
+    {In#{path => ?PATH}, binary_to_list(Out) ++ ?PATH_ENC}.
+
+update_path_binary({In, empty}) ->
+    {In#{path => <<?PATH/utf8>>}, <<?PATH_ENC>>};
+update_path_binary({In, Out}) when is_list(Out) ->
+    {In#{path => <<?PATH/utf8>>}, Out ++ ?PATH_ENC};
+update_path_binary({In, Out}) when is_binary(Out) ->
+    {In#{path => <<?PATH/utf8>>}, <<Out/binary,?PATH_ENC>>}.
+
+update_port({In, Out}) when is_list(Out) ->
+    {In#{port => ?PORT}, Out ++ ?PORT_ENC};
+update_port({In, Out}) when is_binary(Out) ->
+    {In#{port => ?PORT}, <<Out/binary,?PORT_ENC>>}.
+
+update_host({In, empty}) ->
+    {In#{host => ?HOST}, "//" ++ ?HOST_ENC};
+update_host({In, Out}) when is_list(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => ?HOST}, Out ++ [$@|?HOST_ENC]};
+        false -> {In#{host => ?HOST}, Out ++ [$/,$/|?HOST_ENC]}
+    end;
+update_host({In, Out}) when is_binary(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => ?HOST}, binary_to_list(Out) ++ [$@|?HOST_ENC]};
+        false -> {In#{host => ?HOST}, binary_to_list(Out) ++ [$/,$/|?HOST_ENC]}
+    end.
+
+update_host_binary({In, empty}) ->
+    {In#{host => <<?HOST/utf8>>}, <<"//",?HOST_ENC>>};
+update_host_binary({In, Out}) when is_list(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => <<?HOST/utf8>>}, Out ++ [$@|?HOST_ENC]};
+        false -> {In#{host => <<?HOST/utf8>>}, Out ++ [$/,$/|?HOST_ENC]}
+    end;
+update_host_binary({In, Out}) when is_binary(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => <<?HOST/utf8>>}, <<Out/binary,$@,?HOST_ENC>>};
+        false-> {In#{host => <<?HOST/utf8>>}, <<Out/binary,"//",?HOST_ENC>>}
+    end.
+
+update_ipv6({In, empty}) ->
+    {In#{host => ?IPV6}, "//" ++ ?IPV6_ENC};
+update_ipv6({In, Out}) when is_list(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => ?IPV6}, Out ++ [$@|?IPV6_ENC]};
+        false -> {In#{host => ?IPV6}, Out ++ [$/,$/|?IPV6_ENC]}
+    end;
+update_ipv6({In, Out}) when is_binary(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => ?IPV6}, binary_to_list(Out) ++ [$@|?IPV6_ENC]};
+        false -> {In#{host => ?IPV6}, binary_to_list(Out) ++ [$/,$/|?IPV6_ENC]}
+    end.
+
+update_ipv6_binary({In, empty}) ->
+    {In#{host => <<?IPV6/utf8>>}, <<"//",?IPV6_ENC>>};
+update_ipv6_binary({In, Out}) when is_list(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => <<?IPV6/utf8>>}, Out ++ [$@|?IPV6_ENC]};
+        false -> {In#{host => <<?IPV6/utf8>>}, Out ++ [$/,$/|?IPV6_ENC]}
+    end;
+update_ipv6_binary({In, Out}) when is_binary(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => <<?IPV6/utf8>>}, <<Out/binary,$@,?IPV6_ENC>>};
+        false-> {In#{host => <<?IPV6/utf8>>}, <<Out/binary,"//",?IPV6_ENC>>}
+    end.
+
+update_userinfo({In, empty}) ->
+    {In#{userinfo => ?USERINFO}, "//" ++ ?USERINFO_ENC};
+update_userinfo({In, Out}) when is_list(Out) ->
+    {In#{userinfo => ?USERINFO}, Out ++ "//" ++ ?USERINFO_ENC};
+update_userinfo({In, Out}) when is_binary(Out) ->
+    {In#{userinfo => ?USERINFO}, binary_to_list(Out) ++ "//" ++ ?USERINFO_ENC}.
+
+update_userinfo_binary({In, empty}) ->
+    {In#{userinfo => <<?USERINFO/utf8>>}, <<"//",?USERINFO_ENC>>};
+update_userinfo_binary({In, Out}) when is_list(Out) ->
+    {In#{userinfo => <<?USERINFO/utf8>>}, Out ++ "//" ++ ?USERINFO_ENC};
+update_userinfo_binary({In, Out}) when is_binary(Out) ->
+    {In#{userinfo => <<?USERINFO/utf8>>}, <<Out/binary,"//",?USERINFO_ENC>>}.
+
+update_scheme({In, empty}) ->
+    {In#{scheme => ?SCHEME}, ?SCHEME ++ ":"}.
+
+update_scheme_binary({In, empty}) ->
+    {In#{scheme => <<?SCHEME/utf8>>}, <<?SCHEME,$:>>}.
+
+
+%% Test recompose on a generated test vector
+run_test_recompose({#{}, empty}) ->
+    try "" = uri_string:recompose(#{}) of
+        _ -> ok
+    catch
+        _:_ -> error({test_failed, #{}, ""})
+    end;
+run_test_recompose({Map, URI}) ->
+    try URI = uri_string:recompose(Map) of
+        URI -> ok
+    catch
+        _:_ -> error({test_failed, Map, URI})
+    end.
+
+%% Test parse - recompose on a generated test vector
+run_test_parse_recompose({#{}, empty}) ->
+    try "" = uri_string:recompose(uri_string:parse("")) of
+        _ -> ok
+    catch
+        _:_ -> error({test_failed, #{}, ""})
+    end;
+run_test_parse_recompose({Map, URI}) ->
+    try URI = uri_string:recompose(uri_string:parse(URI)) of
+        URI -> ok
+    catch
+        _:_ -> error({test_failed, Map, URI})
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Parse tests
+%%-------------------------------------------------------------------------
+
+parse_binary_scheme(_Config) ->
+    #{} = uri_string:parse(<<>>),
+    #{path := <<"foo">>} = uri_string:parse(<<"foo">>),
+    #{scheme := <<"foo">>} = uri_string:parse(<<"foo:">>),
+    #{scheme := <<"foo">>, path := <<"bar:nisse">>} = uri_string:parse(<<"foo:bar:nisse">>),
+    #{scheme := <<"foo">>, host := <<"">>} = uri_string:parse(<<"foo://">>),
+    #{scheme := <<"foo">>, host := <<"">>, path := <<"/">>} = uri_string:parse(<<"foo:///">>),
+    #{scheme := <<"foo">>, host := <<"">>, path := <<"//">>} = uri_string:parse(<<"foo:////">>),
+
+    #{path := <<"/">>} = uri_string:parse(<<"/">>),
+    #{host := <<>>} = uri_string:parse(<<"//">>),
+    #{host := <<>>, path := <<"/">>} = uri_string:parse(<<"///">>).
+
+parse_binary_userinfo(_Config) ->
+    #{scheme := <<"user">>, path := <<"password@localhost">>} =
+        uri_string:parse(<<"user:password@localhost">>),
+    #{path := <<"user@">>} = uri_string:parse(<<"user@">>),
+    #{path := <<"/user@">>} = uri_string:parse(<<"/user@">>),
+    #{path := <<"user@localhost">>} = uri_string:parse(<<"user@localhost">>),
+    #{userinfo := <<"user">>, host := <<"localhost">>} = uri_string:parse(<<"//user@localhost">>),
+    #{userinfo := <<"user:password">>, host := <<"localhost">>} =
+        uri_string:parse(<<"//user:password@localhost">>),
+    #{scheme := <<"foo">>, path := <<"/user@">>} =
+        uri_string:parse(<<"foo:/user@">>),
+    #{scheme := <<"foo">>, userinfo := <<"user">>, host := <<"localhost">>} =
+        uri_string:parse(<<"foo://user@localhost">>),
+    #{scheme := <<"foo">>, userinfo := <<"user:password">>, host := <<"localhost">>} =
+        uri_string:parse(<<"foo://user:password@localhost">>).
+
+parse_binary_pct_encoded_userinfo(_Config) ->
+    #{scheme := <<"user">>, path := <<"合@気道"/utf8>>} =
+        uri_string:parse(<<"user:%E5%90%88@%E6%B0%97%E9%81%93">>),
+    #{path := <<"合気道@"/utf8>>} = uri_string:parse(<<"%E5%90%88%E6%B0%97%E9%81%93@">>),
+    #{path := <<"/合気道@"/utf8>>} = uri_string:parse(<<"/%E5%90%88%E6%B0%97%E9%81%93@">>),
+    #{path := <<"合@気道"/utf8>>} = uri_string:parse(<<"%E5%90%88@%E6%B0%97%E9%81%93">>),
+    #{userinfo := <<"合"/utf8>>, host := <<"気道"/utf8>>} =
+        uri_string:parse(<<"//%E5%90%88@%E6%B0%97%E9%81%93">>),
+    #{userinfo := <<"合:気"/utf8>>, host := <<"道"/utf8>>} =
+        uri_string:parse(<<"//%E5%90%88:%E6%B0%97@%E9%81%93">>),
+    #{scheme := <<"foo">>, path := <<"/合気道@"/utf8>>} =
+        uri_string:parse(<<"foo:/%E5%90%88%E6%B0%97%E9%81%93@">>),
+    #{scheme := <<"foo">>, userinfo := <<"合"/utf8>>, host := <<"気道"/utf8>>} =
+        uri_string:parse(<<"foo://%E5%90%88@%E6%B0%97%E9%81%93">>),
+    #{scheme := <<"foo">>, userinfo := <<"合:気"/utf8>>, host := <<"道"/utf8>>} =
+        uri_string:parse(<<"foo://%E5%90%88:%E6%B0%97@%E9%81%93">>),
+    {error,invalid_uri,"@"} = uri_string:parse(<<"//%E5%90%88@%E6%B0%97%E9%81%93@">>),
+    {error,invalid_uri,":"} = uri_string:parse(<<"foo://%E5%90%88@%E6%B0%97%E9%81%93@">>).
+
+parse_binary_host(_Config) ->
+    #{host := <<"hostname">>} = uri_string:parse(<<"//hostname">>),
+    #{host := <<"hostname">>,scheme := <<"foo">>} = uri_string:parse(<<"foo://hostname">>),
+    #{host := <<"hostname">>,scheme := <<"foo">>, userinfo := <<"user">>} =
+        uri_string:parse(<<"foo://user@hostname">>).
+
+parse_binary_host_ipv4(_Config) ->
+    #{host := <<"127.0.0.1">>} = uri_string:parse(<<"//127.0.0.1">>),
+    #{host := <<"127.0.0.1">>, path := <<"/over/there">>} =
+        uri_string:parse(<<"//127.0.0.1/over/there">>),
+    #{host := <<"127.0.0.1">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"//127.0.0.1?name=ferret">>),
+    #{host := <<"127.0.0.1">>, fragment := <<"nose">>} = uri_string:parse(<<"//127.0.0.1#nose">>),
+    {error,invalid_uri,"x"} = uri_string:parse(<<"//127.0.0.x">>),
+    {error,invalid_uri,"1227.0.0.1"} = uri_string:parse(<<"//1227.0.0.1">>).
+
+parse_binary_host_ipv6(_Config) ->
+    #{host := <<"::127.0.0.1">>} = uri_string:parse(<<"//[::127.0.0.1]">>),
+    #{host := <<"2001:0db8:0000:0000:0000:0000:1428:07ab">>} =
+        uri_string:parse(<<"//[2001:0db8:0000:0000:0000:0000:1428:07ab]">>),
+    #{host := <<"::127.0.0.1">>, path := <<"/over/there">>} =
+        uri_string:parse(<<"//[::127.0.0.1]/over/there">>),
+    #{host := <<"::127.0.0.1">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"//[::127.0.0.1]?name=ferret">>),
+    #{host := <<"::127.0.0.1">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"//[::127.0.0.1]#nose">>),
+    {error,invalid_uri,"x"} = uri_string:parse(<<"//[::127.0.0.x]">>),
+    {error,invalid_uri,"::1227.0.0.1"} = uri_string:parse(<<"//[::1227.0.0.1]">>),
+    {error,invalid_uri,"G"} = uri_string:parse(<<"//[2001:0db8:0000:0000:0000:0000:1428:G7ab]">>).
+
+parse_binary_port(_Config) ->
+    #{path:= <<"/:8042">>} =
+        uri_string:parse(<<"/:8042">>),
+    #{host:= <<>>, port := 8042} =
+        uri_string:parse(<<"//:8042">>),
+    #{host := <<"example.com">>, port:= 8042} =
+        uri_string:parse(<<"//example.com:8042">>),
+    #{scheme := <<"foo">>, path := <<"/:8042">>} =
+        uri_string:parse(<<"foo:/:8042">>),
+    #{scheme := <<"foo">>, host := <<>>, port := 8042} =
+        uri_string:parse(<<"foo://:8042">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, port := 8042} =
+        uri_string:parse(<<"foo://example.com:8042">>),
+    {error,invalid_uri,":"} = uri_string:parse(":600"),
+    {error,invalid_uri,"x"} = uri_string:parse("//:8042x").
+
+parse_binary_path(_Config) ->
+    #{path := <<"over/there">>} = uri_string:parse(<<"over/there">>),
+    #{path := <<"/over/there">>} = uri_string:parse(<<"/over/there">>),
+    #{scheme := <<"foo">>, path := <<"/over/there">>} =
+        uri_string:parse(<<"foo:/over/there">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, path := <<"/over/there">>} =
+        uri_string:parse(<<"foo://example.com/over/there">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, path := <<"/over/there">>, port := 8042} =
+        uri_string:parse(<<"foo://example.com:8042/over/there">>).
+
+parse_binary_query(_Config) ->
+    #{scheme := <<"foo">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"foo:?name=ferret">>),
+    #{scheme := <<"foo">>, path:= <<"over/there">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"foo:over/there?name=ferret">>),
+    #{scheme := <<"foo">>, path:= <<"/over/there">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"foo:/over/there?name=ferret">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"foo://example.com?name=ferret">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, path := <<"/">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"foo://example.com/?name=ferret">>),
+
+    #{path := <<>>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"?name=ferret">>),
+    #{path := <<"over/there">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"over/there?name=ferret">>),
+    #{path := <<"/">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"/?name=ferret">>),
+    #{path := <<"/over/there">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"/over/there?name=ferret">>),
+    #{host := <<"example.com">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"//example.com?name=ferret">>),
+    #{host := <<"example.com">>, path := <<"/">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"//example.com/?name=ferret">>).
+
+parse_binary_pct_encoded_query(_Config) ->
+    #{scheme := <<"foo">>, host := <<"example.com">>, path := <<"/">>,
+      query := <<"name=合気道"/utf8>>} =
+        uri_string:parse(<<"foo://example.com/?name=%E5%90%88%E6%B0%97%E9%81%93">>),
+    #{host := <<"example.com">>, path := <<"/">>, query := <<"name=合気道"/utf8>>} =
+        uri_string:parse(<<"//example.com/?name=%E5%90%88%E6%B0%97%E9%81%93">>).
+
+parse_binary_fragment(_Config) ->
+    #{scheme := <<"foo">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo:#nose">>),
+    #{scheme := <<"foo">>, path:= <<"over/there">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo:over/there#nose">>),
+    #{scheme := <<"foo">>, path:= <<"/over/there">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo:/over/there#nose">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo://example.com#nose">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, path := <<"/">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo://example.com/#nose">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo://example.com#nose">>),
+
+    #{fragment := <<"nose">>} =
+        uri_string:parse(<<"#nose">>),
+    #{path := <<"over/there">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"over/there#nose">>),
+    #{path := <<"/">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"/#nose">>),
+    #{path := <<"/over/there">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"/over/there#nose">>),
+    #{host := <<"example.com">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"//example.com#nose">>),
+    #{host := <<"example.com">>, path := <<"/">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"//example.com/#nose">>).
+
+parse_binary_pct_encoded_fragment(_Config) ->
+    #{scheme := <<"foo">>, host := <<"example.com">>, fragment := <<"合気道"/utf8>>} =
+        uri_string:parse(<<"foo://example.com#%E5%90%88%E6%B0%97%E9%81%93">>),
+    #{host := <<"example.com">>, path := <<"/">>, fragment := <<"合気道"/utf8>>} =
+        uri_string:parse(<<"//example.com/#%E5%90%88%E6%B0%97%E9%81%93">>).
+
+parse_scheme(_Config) ->
+    #{} = uri_string:parse(""),
+    #{path := "foo"} = uri_string:parse("foo"),
+    #{scheme := "foo"} = uri_string:parse("foo:"),
+    #{scheme := "foo", path := "bar:nisse"} = uri_string:parse("foo:bar:nisse"),
+    #{scheme := "foo", host := ""} = uri_string:parse("foo://"),
+    #{scheme := "foo", host := "", path := "/"} = uri_string:parse("foo:///"),
+    #{scheme := "foo", host := "", path := "//"} = uri_string:parse("foo:////"),
+
+    #{path := "/"} = uri_string:parse("/"),
+    #{host := ""} = uri_string:parse("//"),
+    #{host := "", path := "/"} = uri_string:parse("///").
+
+parse_userinfo(_Config) ->
+    #{scheme := "user", path := "password@localhost"} = uri_string:parse("user:password@localhost"),
+    #{path := "user@"} = uri_string:parse("user@"),
+    #{path := "/user@"} = uri_string:parse("/user@"),
+    #{path := "user@localhost"} = uri_string:parse("user@localhost"),
+    #{userinfo := "user", host := "localhost"} = uri_string:parse("//user@localhost"),
+    #{userinfo := "user:password", host := "localhost"} =
+        uri_string:parse("//user:password@localhost"),
+    #{scheme := "foo", path := "/user@"} =
+        uri_string:parse("foo:/user@"),
+    #{scheme := "foo", userinfo := "user", host := "localhost"} =
+        uri_string:parse("foo://user@localhost"),
+    #{scheme := "foo", userinfo := "user:password", host := "localhost"} =
+        uri_string:parse("foo://user:password@localhost").
+
+parse_pct_encoded_userinfo(_Config) ->
+    #{scheme := "user", path := "合@気道"} =
+        uri_string:parse("user:%E5%90%88@%E6%B0%97%E9%81%93"),
+    #{path := "合気道@"} = uri_string:parse("%E5%90%88%E6%B0%97%E9%81%93@"),
+    #{path := "/合気道@"} = uri_string:parse("/%E5%90%88%E6%B0%97%E9%81%93@"),
+    #{path := "合@気道"} = uri_string:parse("%E5%90%88@%E6%B0%97%E9%81%93"),
+    #{userinfo := "合", host := "気道"} =
+        uri_string:parse("//%E5%90%88@%E6%B0%97%E9%81%93"),
+    #{userinfo := "合:気", host := "道"} =
+        uri_string:parse("//%E5%90%88:%E6%B0%97@%E9%81%93"),
+    #{scheme := "foo", path := "/合気道@"} =
+        uri_string:parse("foo:/%E5%90%88%E6%B0%97%E9%81%93@"),
+    #{scheme := "foo", userinfo := "合", host := "気道"} =
+        uri_string:parse("foo://%E5%90%88@%E6%B0%97%E9%81%93"),
+    #{scheme := "foo", userinfo := "合:気", host := "道"} =
+        uri_string:parse("foo://%E5%90%88:%E6%B0%97@%E9%81%93"),
+    {error,invalid_uri,"@"} = uri_string:parse("//%E5%90%88@%E6%B0%97%E9%81%93@"),
+    {error,invalid_uri,":"} = uri_string:parse("foo://%E5%90%88@%E6%B0%97%E9%81%93@").
+
+
+parse_host(_Config) ->
+    #{host := "hostname"} = uri_string:parse("//hostname"),
+    #{host := "hostname",scheme := "foo"} = uri_string:parse("foo://hostname"),
+    #{host := "hostname",scheme := "foo", userinfo := "user"} =
+        uri_string:parse("foo://user@hostname").
+
+parse_host_ipv4(_Config) ->
+    #{host := "127.0.0.1"} = uri_string:parse("//127.0.0.1"),
+    #{host := "2001:0db8:0000:0000:0000:0000:1428:07ab"} =
+        uri_string:parse("//[2001:0db8:0000:0000:0000:0000:1428:07ab]"),
+    #{host := "127.0.0.1", path := "/over/there"} = uri_string:parse("//127.0.0.1/over/there"),
+    #{host := "127.0.0.1", query := "name=ferret"} = uri_string:parse("//127.0.0.1?name=ferret"),
+    #{host := "127.0.0.1", fragment := "nose"} = uri_string:parse("//127.0.0.1#nose"),
+    {error,invalid_uri,"x"} = uri_string:parse("//127.0.0.x"),
+    {error,invalid_uri,"1227.0.0.1"} = uri_string:parse("//1227.0.0.1").
+
+parse_host_ipv6(_Config) ->
+    #{host := "::127.0.0.1"} = uri_string:parse("//[::127.0.0.1]"),
+    #{host := "::127.0.0.1", path := "/over/there"} = uri_string:parse("//[::127.0.0.1]/over/there"),
+    #{host := "::127.0.0.1", query := "name=ferret"} =
+        uri_string:parse("//[::127.0.0.1]?name=ferret"),
+    #{host := "::127.0.0.1", fragment := "nose"} = uri_string:parse("//[::127.0.0.1]#nose"),
+    {error,invalid_uri,"x"} = uri_string:parse("//[::127.0.0.x]"),
+    {error,invalid_uri,"::1227.0.0.1"} = uri_string:parse("//[::1227.0.0.1]"),
+    {error,invalid_uri,"G"} = uri_string:parse("//[2001:0db8:0000:0000:0000:0000:1428:G7ab]").
+
+parse_port(_Config) ->
+    #{path:= "/:8042"} =
+        uri_string:parse("/:8042"),
+    #{host:= "", port := 8042} =
+        uri_string:parse("//:8042"),
+    #{host := "example.com", port:= 8042} =
+        uri_string:parse("//example.com:8042"),
+    #{scheme := "foo", path := "/:8042"} =
+        uri_string:parse("foo:/:8042"),
+    #{scheme := "foo", host := "", port := 8042} =
+        uri_string:parse("foo://:8042"),
+    #{scheme := "foo", host := "example.com", port := 8042} =
+        uri_string:parse("foo://example.com:8042").
+
+parse_path(_Config) ->
+    #{path := "over/there"} = uri_string:parse("over/there"),
+    #{path := "/over/there"} = uri_string:parse("/over/there"),
+    #{scheme := "foo", path := "/over/there"} =
+        uri_string:parse("foo:/over/there"),
+    #{scheme := "foo", host := "example.com", path := "/over/there"} =
+        uri_string:parse("foo://example.com/over/there"),
+    #{scheme := "foo", host := "example.com", path := "/over/there", port := 8042} =
+        uri_string:parse("foo://example.com:8042/over/there").
+
+parse_query(_Config) ->
+    #{scheme := "foo", query := "name=ferret"} =
+        uri_string:parse("foo:?name=ferret"),
+    #{scheme := "foo", path:= "over/there", query := "name=ferret"} =
+        uri_string:parse("foo:over/there?name=ferret"),
+    #{scheme := "foo", path:= "/over/there", query := "name=ferret"} =
+        uri_string:parse("foo:/over/there?name=ferret"),
+    #{scheme := "foo", host := "example.com", query := "name=ferret"} =
+        uri_string:parse("foo://example.com?name=ferret"),
+    #{scheme := "foo", host := "example.com", path := "/", query := "name=ferret"} =
+        uri_string:parse("foo://example.com/?name=ferret"),
+
+    #{path := "", query := "name=ferret"} =
+        uri_string:parse("?name=ferret"),
+    #{path := "over/there", query := "name=ferret"} =
+        uri_string:parse("over/there?name=ferret"),
+    #{path := "/", query := "name=ferret"} =
+        uri_string:parse("/?name=ferret"),
+    #{path := "/over/there", query := "name=ferret"} =
+        uri_string:parse("/over/there?name=ferret"),
+    #{host := "example.com", query := "name=ferret"} =
+        uri_string:parse("//example.com?name=ferret"),
+    #{host := "example.com", path := "/", query := "name=ferret"} =
+        uri_string:parse("//example.com/?name=ferret").
+
+parse_pct_encoded_query(_Config) ->
+    #{scheme := "foo", host := "example.com", path := "/",
+      query := "name=合気道"} =
+        uri_string:parse("foo://example.com/?name=%E5%90%88%E6%B0%97%E9%81%93"),
+    #{host := "example.com", path := "/", query := "name=合気道"} =
+        uri_string:parse("//example.com/?name=%E5%90%88%E6%B0%97%E9%81%93").
+
+parse_fragment(_Config) ->
+    #{scheme := "foo", fragment := "nose"} =
+        uri_string:parse("foo:#nose"),
+    #{scheme := "foo", path:= "over/there", fragment := "nose"} =
+        uri_string:parse("foo:over/there#nose"),
+    #{scheme := "foo", path:= "/over/there", fragment := "nose"} =
+        uri_string:parse("foo:/over/there#nose"),
+    #{scheme := "foo", host := "example.com", fragment := "nose"} =
+        uri_string:parse("foo://example.com#nose"),
+    #{scheme := "foo", host := "example.com", path := "/", fragment := "nose"} =
+        uri_string:parse("foo://example.com/#nose"),
+    #{scheme := "foo", host := "example.com", fragment := "nose"} =
+        uri_string:parse("foo://example.com#nose"),
+
+    #{fragment := "nose"} =
+        uri_string:parse("#nose"),
+    #{path := "over/there", fragment := "nose"} =
+        uri_string:parse("over/there#nose"),
+    #{path := "/", fragment := "nose"} =
+        uri_string:parse("/#nose"),
+    #{path := "/over/there", fragment := "nose"} =
+        uri_string:parse("/over/there#nose"),
+    #{host := "example.com", fragment := "nose"} =
+        uri_string:parse("//example.com#nose"),
+    #{host := "example.com", path := "/", fragment := "nose"} =
+        uri_string:parse("//example.com/#nose").
+
+parse_pct_encoded_fragment(_Config) ->
+    #{scheme := "foo", host := "example.com", fragment := "合気道"} =
+        uri_string:parse("foo://example.com#%E5%90%88%E6%B0%97%E9%81%93"),
+    #{host := "example.com", path := "/", fragment := "合気道"} =
+        uri_string:parse("//example.com/#%E5%90%88%E6%B0%97%E9%81%93").
+
+parse_list(_Config) ->
+    #{scheme := "foo", path := "bar:nisse"} = uri_string:parse("foo:bar:nisse"),
+    #{scheme := "foo", host := "example.com", port := 8042,
+      path := "/over/there", query := "name=ferret", fragment := "nose"} =
+        uri_string:parse("foo://example.com:8042/over/there?name=ferret#nose"),
+    #{scheme := "foo", userinfo := "admin:admin", host := "example.com", port := 8042,
+      path := "/over/there", query := "name=ferret", fragment := "nose"} =
+        uri_string:parse("foo://admin:[email protected]:8042/over/there?name=ferret#nose").
+
+parse_binary(_Config) ->
+    #{scheme := <<"foo">>, path := <<"bar:nisse">>} = uri_string:parse(<<"foo:bar:nisse">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, port := 8042,
+      path := <<"/over/there">>, query := <<"name=ferret">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo://example.com:8042/over/there?name=ferret#nose">>),
+    #{scheme := <<"foo">>, userinfo := <<"admin:admin">>, host := <<"example.com">>, port := 8042,
+      path := <<"/over/there">>, query := <<"name=ferret">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo://admin:[email protected]:8042/over/there?name=ferret#nose">>).
+
+
+parse_mixed(_Config) ->
+    #{scheme := "foo", path := "bar"} =
+        uri_string:parse(lists:append("fo",<<"o:bar">>)),
+    #{scheme := "foo", path := "bar"} =
+        uri_string:parse(lists:append("foo:b",<<"ar">>)),
+    #{scheme := "foo", path := "bar:bar"} =
+        uri_string:parse([[102],[111,111],<<":bar">>,58,98,97,114]).
+
+parse_relative(_Config) ->
+    #{path := "/path"} =
+        uri_string:parse(lists:append("/pa",<<"th">>)),
+    #{path := "foo"} =
+        uri_string:parse(lists:append("fo",<<"o">>)).
+
+parse_special(_Config) ->
+    #{host := [],query := []} = uri_string:parse("//?"),
+    #{fragment := [],host := []} = uri_string:parse("//#"),
+    #{host := [],query := [],scheme := "foo"} = uri_string:parse("foo://?"),
+    #{fragment := [],host := [],scheme := "foo"} = uri_string:parse("foo://#"),
+    #{host := <<>>, path := <<"/">>} = uri_string:parse(<<"///">>),
+    #{host := <<"hostname">>} = uri_string:parse(<<"//hostname">>),
+    #{host := <<>>, path := <<"/hostname">>} = uri_string:parse(<<"///hostname">>),
+    #{host :=  [],path := "/",query := []} = uri_string:parse("///?"),
+    #{fragment := [],host := [],path := "/"} = uri_string:parse("///#"),
+    #{host := "foo",query := []} = uri_string:parse("//foo?"),
+    #{fragment := [],host := "foo"} = uri_string:parse("//foo#"),
+    #{host := "foo",path := "/"} = uri_string:parse("//foo/"),
+    #{host := "foo",query := [],scheme := "http"} = uri_string:parse("http://foo?"),
+    #{fragment := [],host := "foo",scheme := "http"} = uri_string:parse("http://foo#"),
+    #{host := "foo",path := "/",scheme := "http"} = uri_string:parse("http://foo/"),
+    #{fragment := [],host := "host",port := 80,scheme := "http"} = uri_string:parse("http://host:80#"),
+    #{host := "host",port := 80,query := [],scheme := "http"} = uri_string:parse("http://host:80?"),
+    #{path := [],query := []} = uri_string:parse("?"),
+    #{path := [],query := "?"} = uri_string:parse("??"),
+    #{path := [],query := "??"} = uri_string:parse("???").
+
+parse_special2(_Config) ->
+    #{host := [],path := "/",port := 1,scheme := "a"} = uri_string:parse("a://:1/"),
+    #{path := "/a/",scheme := "a"} = uri_string:parse("a:/a/"),
+    #{host := [],path := [],userinfo := []} = uri_string:parse("//@"),
+    #{host := [],path := [],scheme := "foo",userinfo := []} = uri_string:parse("foo://@"),
+    #{host := [],path := "/",userinfo := []} = uri_string:parse("//@/"),
+    #{host := [],path := "/",scheme := "foo",userinfo := []} = uri_string:parse("foo://@/"),
+    #{host := "localhost",path := "/",port := undefined} = uri_string:parse("//localhost:/"),
+    #{host := [],path := [],port := undefined} = uri_string:parse("//:").
+
+parse_negative(_Config) ->
+    {error,invalid_uri,"å"} = uri_string:parse("å"),
+    {error,invalid_uri,"å"} = uri_string:parse("aå:/foo"),
+    {error,invalid_uri,":"} = uri_string:parse("foo://usär@host"),
+    {error,invalid_uri,"ö"} = uri_string:parse("//host/path?foö=bar"),
+    {error,invalid_uri,"ö"} = uri_string:parse("//host/path#foö"),
+    {error,invalid_uri,"127.256.0.1"} = uri_string:parse("//127.256.0.1"),
+    {error,invalid_uri,":::127.0.0.1"} = uri_string:parse("//[:::127.0.0.1]"),
+    {error,invalid_utf8,<<0,0,0,246>>} = uri_string:parse("//%00%00%00%F6"),
+    {error,invalid_uri,"A"} = uri_string:parse("//localhost:A8").
+
+
+%%-------------------------------------------------------------------------
+%% Recompose tests
+%%-------------------------------------------------------------------------
+recompose_fragment(_Config) ->
+    <<?FRAGMENT_ENC>> = uri_string:recompose(#{fragment => <<?FRAGMENT/utf8>>, path => <<>>}),
+    ?FRAGMENT_ENC = uri_string:recompose(#{fragment => ?FRAGMENT, path => ""}).
+
+recompose_parse_fragment(_Config) ->
+    <<?FRAGMENT_ENC>> = uri_string:recompose(uri_string:parse(<<?FRAGMENT_ENC>>)),
+    ?FRAGMENT_ENC = uri_string:recompose(uri_string:parse(?FRAGMENT_ENC)).
+
+recompose_query(_Config) ->
+    <<?QUERY_ENC>> =
+        uri_string:recompose(#{query => <<?QUERY/utf8>>, path => <<>>}),
+    <<?QUERY_ENC?FRAGMENT_ENC>> =
+        uri_string:recompose(#{query => <<?QUERY/utf8>>,
+                               fragment => <<?FRAGMENT/utf8>>,
+                               path => <<>>}),
+    "?name=%C3%B6rn" =
+        uri_string:recompose(#{query => "name=örn", path => ""}),
+    "?name=%C3%B6rn#n%C3%A4sa" =
+        uri_string:recompose(#{query => "name=örn",
+                               fragment => "näsa",
+                               path => ""}).
+
+recompose_parse_query(_Config) ->
+    <<"?name=%C3%B6rn">> = uri_string:recompose(uri_string:parse(<<"?name=%C3%B6rn">>)),
+    <<"?name=%C3%B6rn#n%C3%A4sa">> =
+        uri_string:recompose(uri_string:parse(<<"?name=%C3%B6rn#n%C3%A4sa">>)),
+    "?name=%C3%B6rn" = uri_string:recompose(uri_string:parse("?name=%C3%B6rn")),
+    "?name=%C3%B6rn#n%C3%A4sa" = uri_string:recompose(uri_string:parse("?name=%C3%B6rn#n%C3%A4sa")).
+
+recompose_path(_Config) ->
+    <<"/d%C3%A4r">> =
+        uri_string:recompose(#{path => <<"/där"/utf8>>}),
+    <<"/d%C3%A4r#n%C3%A4sa">> =
+        uri_string:recompose(#{path => <<"/där"/utf8>>,
+                               fragment => <<"näsa"/utf8>>}),
+    <<"/d%C3%A4r?name=%C3%B6rn">> =
+        uri_string:recompose(#{path => <<"/där"/utf8>>,
+                               query => <<"name=örn"/utf8>>}),
+    <<"/d%C3%A4r?name=%C3%B6rn#n%C3%A4sa">> =
+        uri_string:recompose(#{path => <<"/där"/utf8>>,
+                               query => <<"name=örn"/utf8>>,
+                               fragment => <<"näsa"/utf8>>}),
+
+
+    "/d%C3%A4r" =
+        uri_string:recompose(#{path => "/där"}),
+    "/d%C3%A4r#n%C3%A4sa" =
+        uri_string:recompose(#{path => "/där",
+                               fragment => "näsa"}),
+    "/d%C3%A4r?name=%C3%B6rn" =
+        uri_string:recompose(#{path => "/där",
+                               query => "name=örn"}),
+    "/d%C3%A4r?name=%C3%B6rn#n%C3%A4sa" =
+        uri_string:recompose(#{path => "/där",
+                               query => "name=örn",
+                               fragment => "näsa"}).
+
+
+recompose_parse_path(_Config) ->
+    <<"/d%C3%A4r">> =
+        uri_string:recompose(uri_string:parse(<<"/d%C3%A4r">>)),
+    <<"/d%C3%A4r#n%C3%A4sa">> =
+        uri_string:recompose(uri_string:parse(<<"/d%C3%A4r#n%C3%A4sa">>)),
+    <<"/d%C3%A4r?name=%C3%B6rn">> =
+        uri_string:recompose(uri_string:parse(<<"/d%C3%A4r?name=%C3%B6rn">>)),
+
+    "/d%C3%A4r" =
+        uri_string:recompose(uri_string:parse("/d%C3%A4r")),
+    "/d%C3%A4r#n%C3%A4sa" =
+        uri_string:recompose(uri_string:parse("/d%C3%A4r#n%C3%A4sa")),
+    "/d%C3%A4r?name=%C3%B6rn" =
+        uri_string:recompose(uri_string:parse("/d%C3%A4r?name=%C3%B6rn")).
+
+
+recompose_autogen(_Config) ->
+    Tests = generate_test_vectors(uri_combinations()),
+    lists:map(fun run_test_recompose/1, Tests).
+
+parse_recompose_autogen(_Config) ->
+    Tests = generate_test_vectors(uri_combinations()),
+    lists:map(fun run_test_parse_recompose/1, Tests).
+
+transcode_basic(_Config) ->
+    <<"foo%C3%B6bar"/utf8>> =
+        uri_string:transcode(<<"foo%00%00%00%F6bar"/utf32>>, [{in_encoding, utf32},{out_encoding, utf8}]),
+    "foo%C3%B6bar" =
+        uri_string:transcode("foo%00%00%00%F6bar", [{in_encoding, utf32},{out_encoding, utf8}]),
+    <<"foo%00%00%00%F6bar"/utf32>> =
+        uri_string:transcode(<<"foo%C3%B6bar"/utf8>>, [{in_encoding, utf8},{out_encoding, utf32}]),
+    "foo%00%00%00%F6bar" =
+        uri_string:transcode("foo%C3%B6bar", [{in_encoding, utf8},{out_encoding, utf32}]),
+    "foo%C3%B6bar" =
+        uri_string:transcode("foo%F6bar", [{in_encoding, latin1},{out_encoding, utf8}]).
+
+transcode_options(_Config) ->
+    <<"foo%C3%B6bar"/utf8>> =
+        uri_string:transcode(<<"foo%C3%B6bar"/utf8>>, []),
+    <<"foo%C3%B6bar"/utf8>> =
+        uri_string:transcode(<<"foo%00%00%00%F6bar"/utf32>>, [{in_encoding, utf32}]),
+    <<"foo%00%00%00%F6bar"/utf32>> =
+        uri_string:transcode(<<"foo%C3%B6bar"/utf8>>, [{out_encoding, utf32}]).
+
+transcode_mixed(_Config) ->
+    "foo%00%00%00%F6bar" =
+        uri_string:transcode(["foo",<<"%C3%B6"/utf8>>,<<"ba"/utf8>>,"r"], [{out_encoding, utf32}]),
+    "foo%00%00%00%F6bar" =
+        uri_string:transcode(["foo",<<"%C3%"/utf8>>,<<"B6ba"/utf8>>,"r"], [{out_encoding, utf32}]),
+    "foo%C3%B6bar" =
+        uri_string:transcode(["foo%00", <<"%00%0"/utf32>>,<<"0%F"/utf32>>,"6bar"], [{in_encoding, utf32},{out_encoding, utf8}]).
+
+transcode_negative(_Config) ->
+    {error,invalid_percent_encoding,"%BXbar"} =
+        uri_string:transcode(<<"foo%C3%BXbar"/utf8>>, [{in_encoding, utf8},{out_encoding, utf32}]),
+    {error,invalid_input,<<"ö">>} =
+        uri_string:transcode("foo%F6bar", [{in_encoding, utf8},{out_encoding, utf8}]).
+
+compose_query(_Config) ->
+    [] = uri_string:compose_query([]),
+    "foo=1&bar=2" = uri_string:compose_query([{<<"foo">>,"1"}, {"bar", "2"}]),
+    "foo=1&b%C3%A4r=2" = uri_string:compose_query([{"foo","1"}, {"bär", "2"}],[{encoding,utf8}]),
+    "foo=1&b%C3%A4r=2" = uri_string:compose_query([{"foo","1"}, {"bär", "2"}],[{encoding,unicode}]),
+    "foo=1&b%E4r=2" = uri_string:compose_query([{"foo","1"}, {"bär", "2"}],[{encoding,latin1}]),
+    "foo+bar=1&%E5%90%88=2" = uri_string:compose_query([{"foo bar","1"}, {"合", "2"}]),
+    "foo+bar=1&%26%2321512%3B=2" =
+        uri_string:compose_query([{"foo bar","1"}, {"合", "2"}],[{encoding,latin1}]),
+    "foo+bar=1&%C3%B6=2" = uri_string:compose_query([{<<"foo bar">>,<<"1">>}, {"ö", <<"2">>}]),
+    <<"foo+bar=1&%C3%B6=2">> =
+        uri_string:compose_query([{<<"foo bar">>,<<"1">>}, {<<"ö"/utf8>>, <<"2">>}]).
+
+compose_query_latin1(_Config) ->
+    Q = uri_string:compose_query([{"合foö bar","1"}, {"合", "合"}],[{encoding,latin1}]),
+    Q1 = uri_string:transcode(Q, [{in_encoding, latin1}]),
+    [{"合foö bar","1"}, {"合", "合"}] = uri_string:dissect_query(Q1),
+    Q2 = uri_string:compose_query([{<<"合foö bar"/utf8>>,<<"1">>}, {<<"合"/utf8>>, <<"合"/utf8>>}],
+                                  [{encoding,latin1}]),
+    Q3 = uri_string:transcode(Q2, [{in_encoding, latin1}]),
+    [{<<"合foö bar"/utf8>>,<<"1">>}, {<<"合"/utf8>>, <<"合"/utf8>>}] =
+        uri_string:dissect_query(Q3).
+
+compose_query_negative(_Config) ->
+    {error,invalid_input,4} = uri_string:compose_query([{"",4}]),
+    {error,invalid_input,5} = uri_string:compose_query([{5,""}]),
+    {error,invalid_encoding,utf16} =
+        uri_string:compose_query([{"foo bar","1"}, {<<"ö">>, "2"}],[{encoding,utf16}]).
+
+dissect_query(_Config) ->
+    [] = uri_string:dissect_query(""),
+    [{"foo","1"}, {"amp;bar", "2"}] = uri_string:dissect_query("foo=1&amp;bar=2"),
+    [{"foo","1"}, {"bar", "2"}] = uri_string:dissect_query("foo=1&bar=2"),
+    [{"foo","1;bar=2"}] = uri_string:dissect_query("foo=1;bar=2"),
+    [{"foo","1"}, {"bar", "222"}] = uri_string:dissect_query([<<"foo=1&bar=2">>,"22"]),
+    [{"foo","ö"}, {"bar", "2"}] = uri_string:dissect_query("foo=%C3%B6&bar=2"),
+    [{<<"foo">>,<<"ö"/utf8>>}, {<<"bar">>, <<"2">>}] =
+        uri_string:dissect_query(<<"foo=%C3%B6&bar=2">>),
+    [{"foo bar","1"},{"ö","2"}] =
+        uri_string:dissect_query([<<"foo+bar=1&">>,<<"%C3%B6=2">>]),
+    [{"foo bar","1"},{[21512],"2"}] =
+        uri_string:dissect_query("foo+bar=1&%26%2321512%3B=2"),
+    [{<<"foo bar">>,<<"1">>},{<<"合"/utf8>>,<<"2">>}] =
+        uri_string:dissect_query(<<"foo+bar=1&%26%2321512%3B=2">>),
+    [{"föo bar","1"},{"ö","2"}] =
+        uri_string:dissect_query("föo+bar=1&%C3%B6=2"),
+    [{<<"föo bar"/utf8>>,<<"1">>},{<<"ö"/utf8>>,<<"2">>}] =
+        uri_string:dissect_query(<<"föo+bar=1&%C3%B6=2"/utf8>>).
+
+dissect_query_negative(_Config) ->
+    {error,missing_value,"&"} =
+        uri_string:dissect_query("foo1&bar=2"),
+    {error,invalid_percent_encoding,"%XX%B6"} = uri_string:dissect_query("foo=%XX%B6&amp;bar=2"),
+    {error,invalid_input,[153]} =
+        uri_string:dissect_query("foo=%99%B6&amp;bar=2"),
+    {error,invalid_character,"ö"} = uri_string:dissect_query(<<"föo+bar=1&%C3%B6=2">>),
+    {error,invalid_input,<<"ö">>} =
+        uri_string:dissect_query([<<"foo+bar=1&amp;">>,<<"%C3%B6=2ö">>]).
+
+normalize(_Config) ->
+    "/a/g" = uri_string:normalize("/a/b/c/./../../g"),
+    <<"mid/6">> = uri_string:normalize(<<"mid/content=5/../6">>),
+    "http://localhost-%C3%B6rebro/a/g" =
+        uri_string:normalize("http://localhos%74-%c3%b6rebro:80/a/b/c/./../../g"),
+    <<"http://localhost-%C3%B6rebro/a/g">> =
+        uri_string:normalize(<<"http://localhos%74-%c3%b6rebro:80/a/b/c/./../../g">>),
+    <<"https://localhost/">> =
+        uri_string:normalize(<<"https://localhost:443">>),
+    <<"https://localhost:445/">> =
+        uri_string:normalize(<<"https://localhost:445">>),
+    <<"ftp://localhost">> =
+        uri_string:normalize(<<"ftp://localhost:21">>),
+    <<"ssh://localhost">> =
+        uri_string:normalize(<<"ssh://localhost:22">>),
+    <<"sftp://localhost">> =
+        uri_string:normalize(<<"sftp://localhost:22">>),
+    <<"tftp://localhost">> =
+        uri_string:normalize(<<"tftp://localhost:69">>).
+
+normalize_map(_Config) ->
+    "/a/g" = uri_string:normalize(#{path => "/a/b/c/./../../g"}),
+    <<"mid/6">> = uri_string:normalize(#{path => <<"mid/content=5/../6">>}),
+    "http://localhost-%C3%B6rebro/a/g" =
+        uri_string:normalize(#{scheme => "http",port => 80,path => "/a/b/c/./../../g",
+                               host => "localhost-örebro"}),
+    <<"http://localhost-%C3%B6rebro/a/g">> =
+        uri_string:normalize(#{scheme => <<"http">>,port => 80,
+                               path => <<"/a/b/c/./../../g">>,
+                               host => <<"localhost-örebro"/utf8>>}),
+    <<"https://localhost/">> =
+        uri_string:normalize(#{scheme => <<"https">>,port => 443,path => <<>>,
+                               host => <<"localhost">>}),
+    <<"https://localhost:445/">> =
+        uri_string:normalize(#{scheme => <<"https">>,port => 445,path => <<>>,
+                               host => <<"localhost">>}),
+    <<"ftp://localhost">> =
+        uri_string:normalize(#{scheme => <<"ftp">>,port => 21,path => <<>>,
+                               host => <<"localhost">>}),
+    <<"ssh://localhost">> =
+        uri_string:normalize(#{scheme => <<"ssh">>,port => 22,path => <<>>,
+                               host => <<"localhost">>}),
+    <<"sftp://localhost">> =
+        uri_string:normalize(#{scheme => <<"sftp">>,port => 22,path => <<>>,
+                               host => <<"localhost">>}),
+    <<"tftp://localhost">> =
+        uri_string:normalize(#{scheme => <<"tftp">>,port => 69,path => <<>>,
+                               host => <<"localhost">>}).
+
+normalize_return_map(_Config) ->
+    #{scheme := "http",path := "/a/g",host := "localhost-örebro"} =
+        uri_string:normalize("http://localhos%74-%c3%b6rebro:80/a/b/c/./../../g",
+                                   [return_map]),
+    #{scheme := <<"http">>,path := <<"/a/g">>, host := <<"localhost-örebro"/utf8>>} =
+        uri_string:normalize(<<"http://localhos%74-%c3%b6rebro:80/a/b/c/./../../g">>,
+                                   [return_map]),
+    #{scheme := <<"https">>,path := <<"/">>, host := <<"localhost">>} =
+        uri_string:normalize(#{scheme => <<"https">>,port => 443,path => <<>>,
+                               host => <<"localhost">>}, [return_map]).
+
+normalize_negative(_Config) ->
+    {error,invalid_uri,":"} =
+        uri_string:normalize("http://local>host"),
+    {error,invalid_uri,":"} =
+        uri_string:normalize(<<"http://local>host">>),
+    {error,invalid_uri,":"} =
+        uri_string:normalize("http://[192.168.0.1]", [return_map]),
+    {error,invalid_uri,":"} =
+        uri_string:normalize(<<"http://[192.168.0.1]">>, [return_map]).
+
+interop_query_utf8(_Config) ->
+    Q = uri_string:compose_query([{"foo bar","1"}, {"合", "2"}]),
+    Uri = uri_string:recompose(#{path => "/", query => Q}),
+    #{query := Q1} = uri_string:parse(Uri),
+    [{"foo bar","1"}, {"合", "2"}] = uri_string:dissect_query(Q1).
+
+interop_query_latin1(_Config) ->
+    Q = uri_string:compose_query([{"foo bar","1"}, {"合", "2"}], [{encoding,latin1}]),
+    Uri = uri_string:recompose(#{path => "/", query => Q}),
+    Uri1 = uri_string:transcode(Uri, [{in_encoding, latin1}]),
+    #{query := Q1} = uri_string:parse(Uri1),
+    [{"foo bar","1"}, {"合", "2"}] = uri_string:dissect_query(Q1).
diff --git a/lib/stdlib/test/uri_string_property_test_SUITE.erl b/lib/stdlib/test/uri_string_property_test_SUITE.erl
new file mode 100644
index 0000000000..ae2c61c7aa
--- /dev/null
+++ b/lib/stdlib/test/uri_string_property_test_SUITE.erl
@@ -0,0 +1,39 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-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.
+%% 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(uri_string_property_test_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+-compile(export_all).
+
+all() -> [recompose].
+
+init_per_suite(Config) ->
+    ct_property_test:init_per_suite(Config).
+
+end_per_suite(Config) ->
+    Config.
+
+%%%========================================================================
+%%% Test suites
+%%%========================================================================
+recompose(Config) ->
+    ct_property_test:quickcheck(
+      uri_string_recompose:prop_recompose(),
+      Config).
diff --git a/lib/stdlib/test/zip_SUITE.erl b/lib/stdlib/test/zip_SUITE.erl
index 1dfcda4ed0..e5ba629c55 100644
--- a/lib/stdlib/test/zip_SUITE.erl
+++ b/lib/stdlib/test/zip_SUITE.erl
@@ -909,8 +909,7 @@ do_fd_leak(Bad, N) ->
         ok ->
             do_fd_leak(Bad, N + 1)
     catch
-        C:R ->
-            Stk = erlang:get_stacktrace(),
+        C:R:Stk ->
             io:format("Bad error after ~p attempts\n", [N]),
             erlang:raise(C, R, Stk)
     end.
diff --git a/lib/stdlib/uc_spec/gen_unicode_mod.escript b/lib/stdlib/uc_spec/gen_unicode_mod.escript
index 674e5a0628..fe5a860d45 100755
--- a/lib/stdlib/uc_spec/gen_unicode_mod.escript
+++ b/lib/stdlib/uc_spec/gen_unicode_mod.escript
@@ -170,7 +170,7 @@ gen_header(Fd) ->
     io:put_chars(Fd, "-export([spec_version/0, lookup/1, get_case/1]).\n"),
     io:put_chars(Fd, "-inline([class/1]).\n"),
     io:put_chars(Fd, "-compile(nowarn_unused_vars).\n"),
-    io:put_chars(Fd, "-dialyzer({no_improper_lists, [cp/1, gc_prepend/2, gc_e_cont/2]}).\n"),
+    io:put_chars(Fd, "-dialyzer({no_improper_lists, [cp/1, gc/1, gc_prepend/2, gc_e_cont/2]}).\n"),
     io:put_chars(Fd, "-type gc() :: char()|[char()].\n\n\n"),
     ok.
 
@@ -240,7 +240,7 @@ gen_norm(Fd) ->
                  "-spec nfd(unicode:chardata()) -> maybe_improper_list(gc(),unicode:chardata()) | {error, unicode:chardata()}.\n"
                  "nfd(Str0) ->\n"
                  "    case gc(Str0) of\n"
-                 "        [GC|R] when GC < 127 -> [GC|R];\n"
+                 "        [GC|R] when GC < 128 -> [GC|R];\n"
                  "        [GC|Str] -> [decompose(GC)|Str];\n"
                  "        [] -> [];\n"
                  "        {error,_}=Error -> Error\n    end.\n\n"
@@ -250,7 +250,7 @@ gen_norm(Fd) ->
                  "-spec nfkd(unicode:chardata()) -> maybe_improper_list(gc(),unicode:chardata()) | {error, unicode:chardata()}.\n"
                  "nfkd(Str0) ->\n"
                  "    case gc(Str0) of\n"
-                 "        [GC|R] when GC < 127 -> [GC|R];\n"
+                 "        [GC|R] when GC < 128 -> [GC|R];\n"
                  "        [GC|Str] -> [decompose_compat(GC)|Str];\n"
                  "        [] -> [];\n"
                  "        {error,_}=Error -> Error\n    end.\n\n"
@@ -260,7 +260,7 @@ gen_norm(Fd) ->
                  "-spec nfc(unicode:chardata()) -> maybe_improper_list(gc(),unicode:chardata()) | {error, unicode:chardata()}.\n"
                  "nfc(Str0) ->\n"
                  "    case gc(Str0) of\n"
-                 "        [GC|R] when GC < 255 -> [GC|R];\n"
+                 "        [GC|R] when GC < 256 -> [GC|R];\n"
                  "        [GC|Str] -> [compose(decompose(GC))|Str];\n"
                  "        [] -> [];\n"
                  "        {error,_}=Error -> Error\n    end.\n\n"
@@ -270,7 +270,7 @@ gen_norm(Fd) ->
                  "-spec nfkc(unicode:chardata()) -> maybe_improper_list(gc(),unicode:chardata()) | {error, unicode:chardata()}.\n"
                  "nfkc(Str0) ->\n"
                  "    case gc(Str0) of\n"
-                 "        [GC|R] when GC < 127 -> [GC|R];\n"
+                 "        [GC|R] when GC < 128 -> [GC|R];\n"
                  "        [GC|Str] -> [compose_compat_0(decompose_compat(GC))|Str];\n"
                  "        [] -> [];\n"
                  "        {error,_}=Error -> Error\n    end.\n\n"
@@ -476,13 +476,30 @@ gen_gc(Fd, GBP) ->
                  "-spec gc(String::unicode:chardata()) ->"
                  " maybe_improper_list() | {error, unicode:chardata()}.\n"),
     io:put_chars(Fd,
+                 "gc([CP1, CP2|_]=T)\n"
+                 "  when CP1 < 256, CP2 < 256, CP1 =/= $\r -> %% Ascii Fast path\n"
+                 "       T;\n"
+                 "gc(<<CP1/utf8, Rest/binary>>) ->\n"
+                 "    if CP1 < 256, CP1 =/= $\r ->\n"
+                 "           case Rest of\n"
+                 "               <<CP2/utf8, _/binary>> when CP2 < 256 -> %% Ascii Fast path\n"
+                 "                   [CP1|Rest];\n"
+                 "               _ -> gc_1([CP1|Rest])\n"
+                 "           end;\n"
+                 "      true -> gc_1([CP1|Rest])\n"
+                 "    end;\n"
                  "gc(Str) ->\n"
                  "    gc_1(cp(Str)).\n\n"
                  "gc_1([$\\r|R0] = R) ->\n"
                  "    case cp(R0) of % Don't break CRLF\n"
                  "        [$\\n|R1] -> [[$\\r,$\\n]|R1];\n"
                  "        _ -> R\n"
-                 "    end;\n"),
+                 "    end;\n"
+                 %% "gc_1([CP1, CP2|_]=T) when CP1 < 256, CP2 < 256 ->\n"
+                 %% "    T;  %% Fast path\n"
+                 %% "gc_1([CP1|<<CP2/utf8, _/binary>>]=T) when CP1 < 256, CP2 < 256 ->\n"
+                 %% "    T;  %% Fast path\n"
+                ),
 
     io:put_chars(Fd, "%% Handle control\n"),
     GenControl = fun(Range) -> io:format(Fd, "gc_1~s R0;\n", [gen_clause(Range)]) end,
@@ -490,7 +507,7 @@ gen_gc(Fd, GBP) ->
     [R1,R2,R3|Crs] = CRs0,
     [GenControl(CP) || CP <- merge_ranges([R1,R2,R3], split), CP =/= {$\r, undefined}],
     %%GenControl(R1),GenControl(R2),GenControl(R3),
-    io:format(Fd, "gc_1([CP|R]) when CP < 255 -> gc_extend(R,CP);\n", []),
+    io:format(Fd, "gc_1([CP|R]) when CP < 256 -> gc_extend(R,CP);\n", []),
     [GenControl(CP) || CP <- Crs],
     %% One clause per CP
     %% CRs0 = merge_ranges(maps:get(cr, GBP) ++ maps:get(lf, GBP) ++ maps:get(control, GBP)),
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 48db5dc900..69d258c2f0 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.4.2
+STDLIB_VSN = 3.4.3
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index 8c91f01e3b..bd2bcde2c2 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 2.1.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Syntax_Tools 2.1.3</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/syntax_tools/src/erl_prettypr.erl b/lib/syntax_tools/src/erl_prettypr.erl
index 40ddd2b22a..60a15c8e3f 100644
--- a/lib/syntax_tools/src/erl_prettypr.erl
+++ b/lib/syntax_tools/src/erl_prettypr.erl
@@ -774,9 +774,16 @@ lay_2(Node, Ctxt) ->
 	class_qualifier ->
 	    Ctxt1 = set_prec(Ctxt, max_prec()),
 	    D1 = lay(erl_syntax:class_qualifier_argument(Node), Ctxt1),
-	    D2 = lay(erl_syntax:class_qualifier_body(Node), Ctxt1),
-	    beside(D1, beside(text(":"), D2));
-
+            D2 = lay(erl_syntax:class_qualifier_body(Node), Ctxt1),
+            Stacktrace = erl_syntax:class_qualifier_stacktrace(Node),
+            case erl_syntax:variable_name(Stacktrace) of
+                '_' ->
+                    beside(D1, beside(text(":"), D2));
+                _ ->
+                    D3 = lay(Stacktrace, Ctxt1),
+                    beside(D1, beside(beside(text(":"), D2),
+                                      beside(text(":"), D3)))
+            end;
 	comment ->
 	    D = stack_comment_lines(
 		  erl_syntax:comment_text(Node)),
diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl
index 9b2b503762..b816c0699c 100644
--- a/lib/syntax_tools/src/erl_syntax.erl
+++ b/lib/syntax_tools/src/erl_syntax.erl
@@ -342,8 +342,10 @@
 	 typed_record_field_body/1,
          typed_record_field_type/1,
 	 class_qualifier/2,
+	 class_qualifier/3,
 	 class_qualifier_argument/1,
 	 class_qualifier_body/1,
+	 class_qualifier_stacktrace/1,
 	 tuple/1,
 	 tuple_elements/1,
 	 tuple_size/1,
@@ -3884,7 +3886,7 @@ fold_try_clause({clause, Pos, [P], Guard, Body}) ->
 	     class_qualifier ->
 		 {tuple, Pos, [class_qualifier_argument(P),
 			       class_qualifier_body(P),
-			       {var, Pos, '_'}]};
+			       class_qualifier_stacktrace(P)]};
 	     _ ->
 		 {tuple, Pos, [{atom, Pos, throw}, P, {var, Pos, '_'}]}
 	 end,
@@ -3893,12 +3895,14 @@ fold_try_clause({clause, Pos, [P], Guard, Body}) ->
 unfold_try_clauses(Cs) ->
     [unfold_try_clause(C) || C <- Cs].
 
-unfold_try_clause({clause, Pos, [{tuple, _, [{atom, _, throw}, V, _]}],
+unfold_try_clause({clause, Pos, [{tuple, _, [{atom, _, throw},
+                                             V,
+                                             [{var, _, '_'}]]}],
 		   Guard, Body}) ->
     {clause, Pos, [V], Guard, Body};
-unfold_try_clause({clause, Pos, [{tuple, _, [C, V, _]}],
+unfold_try_clause({clause, Pos, [{tuple, _, [C, V, Stacktrace]}],
 		   Guard, Body}) ->
-    {clause, Pos, [class_qualifier(C, V)], Guard, Body}.
+    {clause, Pos, [class_qualifier(C, V, Stacktrace)], Guard, Body}.
 
 
 %% =====================================================================
@@ -6725,9 +6729,12 @@ try_expr_after(Node) ->
 %%
 %% @see class_qualifier_argument/1
 %% @see class_qualifier_body/1
+%% @see class_qualifier_stacktrace/1
 %% @see try_expr/4
 
--record(class_qualifier, {class :: syntaxTree(), body :: syntaxTree()}).
+-record(class_qualifier, {class :: syntaxTree(),
+                          body :: syntaxTree(),
+                          stacktrace :: syntaxTree()}).
 
 %% type(Node) = class_qualifier
 %% data(Node) = #class_qualifier{class :: Class, body :: Body}
@@ -6737,8 +6744,27 @@ try_expr_after(Node) ->
 -spec class_qualifier(syntaxTree(), syntaxTree()) -> syntaxTree().
 
 class_qualifier(Class, Body) ->
+    Underscore = {var, get_pos(Body), '_'},
     tree(class_qualifier,
-	 #class_qualifier{class = Class, body = Body}).
+	 #class_qualifier{class = Class, body = Body,
+                          stacktrace = Underscore}).
+
+%% =====================================================================
+%% @doc Creates an abstract class qualifier. The result represents
+%% "<code><em>Class</em>:<em>Body</em>:<em>Stacktrace</em></code>".
+%%
+%% @see class_qualifier_argument/1
+%% @see class_qualifier_body/1
+%% @see try_expr/4
+
+-spec class_qualifier(syntaxTree(), syntaxTree(), syntaxTree()) ->
+                             syntaxTree().
+
+class_qualifier(Class, Body, Stacktrace) ->
+    tree(class_qualifier,
+	 #class_qualifier{class = Class,
+                          body = Body,
+                          stacktrace = Stacktrace}).
 
 
 %% =====================================================================
@@ -6763,6 +6789,16 @@ class_qualifier_argument(Node) ->
 class_qualifier_body(Node) ->
     (data(Node))#class_qualifier.body.
 
+%% =====================================================================
+%% @doc Returns the stacktrace subtree of a `class_qualifier' node.
+%%
+%% @see class_qualifier/2
+
+-spec class_qualifier_stacktrace(syntaxTree()) -> syntaxTree().
+
+class_qualifier_stacktrace(Node) ->
+    (data(Node))#class_qualifier.stacktrace.
+
 
 %% =====================================================================
 %% @doc Creates an abstract "implicit fun" expression. If
@@ -7727,8 +7763,9 @@ subtrees(T) ->
 		catch_expr ->
 		    [[catch_expr_body(T)]];
 		class_qualifier ->
-		    [[class_qualifier_argument(T)],
-		     [class_qualifier_body(T)]];
+                    [[class_qualifier_argument(T)],
+                     [class_qualifier_body(T)],
+                     [class_qualifier_stacktrace(T)]];
 		clause ->
 		    case clause_guard(T) of
 			none ->
@@ -7949,6 +7986,7 @@ make_tree(block_expr, [B]) -> block_expr(B);
 make_tree(case_expr, [[A], C]) -> case_expr(A, C);
 make_tree(catch_expr, [[B]]) -> catch_expr(B);
 make_tree(class_qualifier, [[A], [B]]) -> class_qualifier(A, B);
+make_tree(class_qualifier, [[A], [B], [C]]) -> class_qualifier(A, B, C);
 make_tree(clause, [P, B]) -> clause(P, none, B);
 make_tree(clause, [P, [G], B]) -> clause(P, G, B);
 make_tree(cond_expr, [C]) -> cond_expr(C);
diff --git a/lib/syntax_tools/vsn.mk b/lib/syntax_tools/vsn.mk
index e0880d61ee..8d37c40742 100644
--- a/lib/syntax_tools/vsn.mk
+++ b/lib/syntax_tools/vsn.mk
@@ -1 +1 @@
-SYNTAX_TOOLS_VSN = 2.1.3
+SYNTAX_TOOLS_VSN = 2.1.4
diff --git a/lib/tools/doc/src/Makefile b/lib/tools/doc/src/Makefile
index 7011f869cd..b554781382 100644
--- a/lib/tools/doc/src/Makefile
+++ b/lib/tools/doc/src/Makefile
@@ -58,8 +58,7 @@ XML_CHAPTER_FILES = \
 	lcnt_chapter.xml \
 	erlang_mode_chapter.xml \
 	xref_chapter.xml \
-	notes.xml \
-	notes_history.xml
+	notes.xml
 
 
 BOOK_FILES = book.xml
diff --git a/lib/tools/doc/src/lcnt.xml b/lib/tools/doc/src/lcnt.xml
index 5bdfc60448..0c24375b91 100644
--- a/lib/tools/doc/src/lcnt.xml
+++ b/lib/tools/doc/src/lcnt.xml
@@ -371,7 +371,7 @@
 		<v>Serial = integer()</v>
 	    </type>
 	    <desc>
-		<p>Creates a process id with creation 0. Example:</p>
+		<p>Creates a process id with creation 0.</p>
 	    </desc>
 	</func>
 
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 3eaa2058a0..1edc08c9cd 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 2.11.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 2.11</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile
index 35c93ba4ed..ea4d6cb723 100644
--- a/lib/tools/emacs/Makefile
+++ b/lib/tools/emacs/Makefile
@@ -54,8 +54,6 @@ EL_FILES = $(EMACS_FILES:%=%.el)
 
 ELC_FILES = $(EMACS_FILES:%=%.elc) 
 
-TEST_FILES = test.erl.indented test.erl.orig
-
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
@@ -75,7 +73,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/emacs"
-	$(INSTALL_DATA) $(EL_FILES) $(README_FILES) $(TEST_FILES) \
+	$(INSTALL_DATA) $(EL_FILES) $(README_FILES) \
 		"$(RELSYSDIR)/emacs"
 
 ifeq ($(DOCTYPE),pdf)
@@ -89,19 +87,3 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(MAN_FILES) "$(RELEASE_PATH)/man/man3"
 endif
 endif
-
-EMACS ?= emacs
-
-test_indentation:
-	@rm -f test.erl
-	@rm -f test_indent.el
-	@echo '(load "erlang-start")' >> test_indent.el
-	@echo '(find-file "test.erl.orig")' >> test_indent.el
-	@echo "(require 'cl)    ; required with Emacs < 23 for ignore-errors" >> test_indent.el
-	@echo '(erlang-mode)' >> test_indent.el
-	@echo '(toggle-debug-on-error)' >> test_indent.el
-	@echo '(erlang-indent-current-buffer)' >> test_indent.el
-	@echo '(write-file "test.erl")' >> test_indent.el
-	$(EMACS) --batch -Q -L . -l test_indent.el
-	diff -u test.erl.indented test.erl
-	@echo "No differences between expected and actual indentation"
diff --git a/lib/tools/emacs/erlang-skels.el b/lib/tools/emacs/erlang-skels.el
index bdb3d9ad4a..534f50ab33 100644
--- a/lib/tools/emacs/erlang-skels.el
+++ b/lib/tools/emacs/erlang-skels.el
@@ -279,7 +279,8 @@ Please see the function `tempo-define-template'.")
   '((erlang-skel-include erlang-skel-large-header)
     "-behaviour(application)." n n
     "%% Application callbacks" n
-    "-export([start/2, stop/1])." n n
+    "-export([start/2, start_phase/3, stop/1, prep_stop/1," n>
+    "config_change/3])." n n
     (erlang-skel-double-separator-start 3)
     "%%% Application callbacks" n
     (erlang-skel-double-separator-end 3) n
@@ -291,13 +292,14 @@ Please see the function `tempo-define-template'.")
     "%% application. If the application is structured according to the OTP" n
     "%% design principles as a supervision tree, this means starting the" n
     "%% top supervisor of the tree." n
-    "%%" n
-    "%% @spec start(StartType, StartArgs) -> {ok, Pid} |" n
-    "%%                                      {ok, Pid, State} |" n
-    "%%                                      {error, Reason}" n
-    "%%      StartType = normal | {takeover, Node} | {failover, Node}" n
-    "%%      StartArgs = term()" n
     (erlang-skel-separator-end 2)
+    "-spec start(StartType :: normal |" n>
+    "{takeover, Node :: node()} |" n>
+    "{failover, Node :: node()}," n>
+    "StartArgs :: term()) ->" n>
+    "{ok, Pid :: pid()} |" n>
+    "{ok, Pid :: pid(), State :: term()} |" n>
+    "{error, Reason :: term()}." n
     "start(_StartType, _StartArgs) ->" n>
     "case 'TopSupervisor':start_link() of" n>
     "{ok, Pid} ->" n>
@@ -309,15 +311,52 @@ Please see the function `tempo-define-template'.")
     (erlang-skel-separator-start 2)
     "%% @private" n
     "%% @doc" n
+    "%% top supervisor of the tree." n
+    "%% Starts an application with included applications, when" n
+    "%% synchronization is needed between processes in the different" n
+    "%% applications during startup."
+    (erlang-skel-separator-end 2)
+    "-spec start_phase(Phase :: atom()," n>
+    "StartType :: normal |" n>
+    "{takeover, Node :: node()} |" n>
+    "{failover, Node :: node()}," n>
+    "PhaseArgs :: term()) -> ok | {error, Reason :: term()}." n
+    "start_phase(_Phase, _StartType, _PhaseArgs) ->" n>
+    "ok."n
+    n
+    (erlang-skel-separator-start 2)
+    "%% @private" n
+    "%% @doc" n
     "%% This function is called whenever an application has stopped. It" n
     "%% is intended to be the opposite of Module:start/2 and should do" n
     "%% any necessary cleaning up. The return value is ignored." n
-    "%%" n
-    "%% @spec stop(State) -> void()" n
     (erlang-skel-separator-end 2)
+    "-spec stop(State :: term()) -> any()." n
     "stop(_State) ->" n>
     "ok." n
     n
+    (erlang-skel-separator-start 2)
+    "%% @private" n
+    "%% @doc" n
+    "%% This function is called when an application is about to be stopped," n
+    "%% before shutting down the processes of the application." n
+    (erlang-skel-separator-end 2)
+    "-spec prep_stop(State :: term()) -> NewState :: term()." n
+    "prep_stop(State) ->" n>
+    "State." n
+    n
+    (erlang-skel-separator-start 2)
+    "%% @private" n
+    "%% @doc" n
+    "%% This function is called by an application after a code replacement," n
+    "%% if the configuration parameters have changed." n
+    (erlang-skel-separator-end 2)
+    "-spec config_change(Changed :: [{Par :: atom(), Val :: term()}]," n>
+    "New :: [{Par :: atom(), Val :: term()}]," n>
+    "Removed :: [Par :: atom()]) -> ok." n
+    "config_change(_Changed, _New, _Removed) ->" n>
+    "ok." n
+    n
     (erlang-skel-double-separator-start 3)
     "%%% Internal functions" n
     (erlang-skel-double-separator-end 3)
@@ -343,9 +382,12 @@ Please see the function `tempo-define-template'.")
     (erlang-skel-separator-start 2)
     "%% @doc" n
     "%% Starts the supervisor" n
-    "%%" n
-    "%% @spec start_link() -> {ok, Pid} | ignore | {error, Error}" n
     (erlang-skel-separator-end 2)
+    "-spec start_link() -> {ok, Pid :: pid()} |" n>
+    "{error, {already_started, Pid :: pid()}} |" n>
+    "{error, {shutdown, term()}} |" n>
+    "{error, term()} |" n>
+    "ignore." n
     "start_link() ->" n>
     "supervisor:start_link({local, ?SERVER}, ?MODULE, [])." n
     n
@@ -359,11 +401,11 @@ Please see the function `tempo-define-template'.")
     "%% this function is called by the new process to find out about" n
     "%% restart strategy, maximum restart intensity, and child" n
     "%% specifications." n
-    "%%" n
-    "%% @spec init(Args) -> {ok, {SupFlags, [ChildSpec]}} |" n
-    "%%                     ignore |" n
-    "%%                     {error, Reason}" n
     (erlang-skel-separator-end 2)
+    "-spec init(Args :: term()) ->" n>
+    "{ok, {SupFlags :: supervisor:sup_flags()," n>
+    "[ChildSpec :: supervisor:child_spec()]}} |" n>
+    "ignore." n
     "init([]) ->" n
     "" n>
     "SupFlags = #{strategy => one_for_one," n>
@@ -406,9 +448,11 @@ Please see the function `tempo-define-template'.")
     (erlang-skel-separator-start 2)
     "%% @doc" n
     "%% Starts the supervisor bridge" n
-    "%%" n
-    "%% @spec start_link() -> {ok, Pid} | ignore | {error, Error}" n
     (erlang-skel-separator-end 2)
+    "-spec start_link() -> {ok, Pid :: pid()} |" n>
+    "{error, {already_started, Pid :: pid()}} |" n>
+    "{error, term()} |" n>
+    "ignore." n
     "start_link() ->" n>
     "supervisor_bridge:start_link({local, ?SERVER}, ?MODULE, [])." n
     n
@@ -422,11 +466,10 @@ Please see the function `tempo-define-template'.")
     "%% which calls Module:init/1 to start the subsystem. To ensure a" n
     "%% synchronized start-up procedure, this function does not return" n
     "%% until Module:init/1 has returned." n
-    "%%" n
-    "%% @spec init(Args) -> {ok, Pid, State} |" n
-    "%%                     ignore |" n
-    "%%                     {error, Reason}" n
     (erlang-skel-separator-end 2)
+    "-spec init(Args :: term()) -> {ok, Pid :: pid(), State :: term()} |" n>
+    "{error, Error :: term()} |" n>
+    "ignore." n
     "init([]) ->" n>
     "case 'AModule':start_link() of" n>
     "{ok, Pid} ->" n>
@@ -442,10 +485,9 @@ Please see the function `tempo-define-template'.")
     "%% to terminate. It should be the opposite of Module:init/1 and stop" n
     "%% the subsystem and do any necessary cleaning up.The return value is" n
     "%% ignored." n
-    "%%" n
-    "%% @spec terminate(Reason, State) -> void()" n
     (erlang-skel-separator-end 2)
-    "terminate(Reason, State) ->" n>
+    "-spec terminate(Reason :: shutdown | term(), State :: term()) -> any()." n
+    "terminate(_Reason, _State) ->" n>
     "'AModule':stop()," n>
     "ok." n
     n
@@ -464,9 +506,8 @@ Please see the function `tempo-define-template'.")
     "-export([start_link/0])." n n
 
     "%% gen_server callbacks" n
-    "-export([init/1, handle_call/3, handle_cast/2, "
-    "handle_info/2," n>
-    "terminate/2, code_change/3])." n n
+    "-export([init/1, handle_call/3, handle_cast/2, handle_info/2," n>
+    "terminate/2, code_change/3, format_status/2])." n n
 
     "-define(SERVER, ?MODULE)." n n
 
@@ -478,9 +519,11 @@ Please see the function `tempo-define-template'.")
     (erlang-skel-separator-start 2)
     "%% @doc" n
     "%% Starts the server" n
-    "%%" n
-    "%% @spec start_link() -> {ok, Pid} | ignore | {error, Error}" n
     (erlang-skel-separator-end 2)
+    "-spec start_link() -> {ok, Pid :: pid()} |" n>
+    "{error, Error :: {already_started, pid()}} |" n>
+    "{error, Error :: term()} |" n>
+    "ignore." n
     "start_link() ->" n>
     "gen_server:start_link({local, ?SERVER}, ?MODULE, [], [])." n
     n
@@ -492,12 +535,12 @@ Please see the function `tempo-define-template'.")
     "%% @private" n
     "%% @doc" n
     "%% Initializes the server" n
-    "%%" n
-    "%% @spec init(Args) -> {ok, State} |" n
-    "%%                     {ok, State, Timeout} |" n
-    "%%                     ignore |" n
-    "%%                     {stop, Reason}" n
     (erlang-skel-separator-end 2)
+    "-spec init(Args :: term()) -> {ok, State :: term()} |" n>
+    "{ok, State :: term(), Timeout :: timeout()} |" n>
+    "{ok, State :: term(), hibernate} |" n>
+    "{stop, Reason :: term()} |" n>
+    "ignore." n
     "init([]) ->" n>
     "process_flag(trap_exit, true)," n>
     "{ok, #state{}}." n
@@ -506,15 +549,16 @@ Please see the function `tempo-define-template'.")
     "%% @private" n
     "%% @doc" n
     "%% Handling call messages" n
-    "%%" n
-    "%% @spec handle_call(Request, From, State) ->" n
-    "%%                                   {reply, Reply, State} |" n
-    "%%                                   {reply, Reply, State, Timeout} |" n
-    "%%                                   {noreply, State} |" n
-    "%%                                   {noreply, State, Timeout} |" n
-    "%%                                   {stop, Reason, Reply, State} |" n
-    "%%                                   {stop, Reason, State}" n
     (erlang-skel-separator-end 2)
+    "-spec handle_call(Request :: term(), From :: {pid(), term()}, State :: term()) ->" n>
+    "{reply, Reply :: term(), NewState :: term()} |" n>
+    "{reply, Reply :: term(), NewState :: term(), Timeout :: timeout()} |" n>
+    "{reply, Reply :: term(), NewState :: term(), hibernate} |" n>
+    "{noreply, NewState :: term()} |" n>
+    "{noreply, NewState :: term(), Timeout :: timeout()} |" n>
+    "{noreply, NewState :: term(), hibernate} |" n>
+    "{stop, Reason :: term(), Reply :: term(), NewState :: term()} |" n>
+    "{stop, Reason :: term(), NewState :: term()}." n
     "handle_call(_Request, _From, State) ->" n>
     "Reply = ok," n>
     "{reply, Reply, State}." n
@@ -523,23 +567,25 @@ Please see the function `tempo-define-template'.")
     "%% @private" n
     "%% @doc" n
     "%% Handling cast messages" n
-    "%%" n
-    "%% @spec handle_cast(Msg, State) -> {noreply, State} |" n
-    "%%                                  {noreply, State, Timeout} |" n
-    "%%                                  {stop, Reason, State}" n
     (erlang-skel-separator-end 2)
-    "handle_cast(_Msg, State) ->" n>
+    "-spec handle_cast(Request :: term(), State :: term()) ->" n>
+    "{noreply, NewState :: term()} |" n>
+    "{noreply, NewState :: term(), Timeout :: timeout()} |" n>
+    "{noreply, NewState :: term(), hibernate} |" n>
+    "{stop, Reason :: term(), NewState :: term()}." n
+    "handle_cast(_Request, State) ->" n>
     "{noreply, State}." n
     n
     (erlang-skel-separator-start 2)
     "%% @private" n
     "%% @doc" n
     "%% Handling all non call/cast messages" n
-    "%%" n
-    "%% @spec handle_info(Info, State) -> {noreply, State} |" n
-    "%%                                   {noreply, State, Timeout} |" n
-    "%%                                   {stop, Reason, State}" n
     (erlang-skel-separator-end 2)
+    "-spec handle_info(Info :: timeout() | term(), State :: term()) ->" n>
+    "{noreply, NewState :: term()} |" n>
+    "{noreply, NewState :: term(), Timeout :: timeout()} |" n>
+    "{noreply, NewState :: term(), hibernate} |" n>
+    "{stop, Reason :: normal | term(), NewState :: term()}." n
     "handle_info(_Info, State) ->" n>
     "{noreply, State}." n
     n
@@ -550,9 +596,9 @@ Please see the function `tempo-define-template'.")
     "%% terminate. It should be the opposite of Module:init/1 and do any" n
     "%% necessary cleaning up. When it returns, the gen_server terminates" n
     "%% with Reason. The return value is ignored." n
-    "%%" n
-    "%% @spec terminate(Reason, State) -> void()" n
     (erlang-skel-separator-end 2)
+    "-spec terminate(Reason :: normal | shutdown | {shutdown, term()} | term()," n>
+    "State :: term()) -> any()." n
     "terminate(_Reason, _State) ->" n>
     "ok." n
     n
@@ -560,12 +606,26 @@ Please see the function `tempo-define-template'.")
     "%% @private" n
     "%% @doc" n
     "%% Convert process state when code is changed" n
-    "%%" n
-    "%% @spec code_change(OldVsn, State, Extra) -> {ok, NewState}" n
     (erlang-skel-separator-end 2)
+    "-spec code_change(OldVsn :: term() | {down, term()}," n>
+    "State :: term()," n>
+    "Extra :: term()) -> {ok, NewState :: term()} |" n>
+    "{error, Reason :: term()}." n
     "code_change(_OldVsn, State, _Extra) ->" n>
     "{ok, State}." n
     n
+    (erlang-skel-separator-start 2)
+    "%% @private" n
+    "%% @doc" n
+    "%% This function is called for changing the form and appearance" n
+    "%% of gen_server status when it is returned from sys:get_status/1,2" n
+    "%% or when it appears in termination error logs." n
+    (erlang-skel-separator-end 2)
+    "-spec format_status(Opt :: normal | terminate," n>
+    "Status :: list()) -> Status :: term()." n
+    "format_status(_Opt, Status) ->" n>
+    "Status." n
+    n
     (erlang-skel-double-separator-start 3)
     "%%% Internal functions" n
     (erlang-skel-double-separator-end 3)
@@ -581,8 +641,8 @@ Please see the function `tempo-define-template'.")
     "-export([start_link/0, add_handler/0])." n n
 
     "%% gen_event callbacks" n
-    "-export([init/1, handle_event/2, handle_call/2, " n>
-    "handle_info/2, terminate/2, code_change/3])." n n
+    "-export([init/1, handle_event/2, handle_call/2, handle_info/2," n>
+    "terminate/2, code_change/3, format_status/2])." n n
 
     "-define(SERVER, ?MODULE)." n n
 
@@ -594,18 +654,17 @@ Please see the function `tempo-define-template'.")
     (erlang-skel-separator-start 2)
     "%% @doc" n
     "%% Creates an event manager" n
-    "%%" n
-    "%% @spec start_link() -> {ok, Pid} | {error, Error}" n
     (erlang-skel-separator-end 2)
+    "-spec start_link() -> {ok, Pid :: pid()} |" n>
+    "{error, Error :: {already_started, pid()} | term()}." n
     "start_link() ->" n>
     "gen_event:start_link({local, ?SERVER})." n
     n
     (erlang-skel-separator-start 2)
     "%% @doc" n
     "%% Adds an event handler" n
-    "%%" n
-    "%% @spec add_handler() -> ok | {'EXIT', Reason} | term()" n
     (erlang-skel-separator-end 2)
+    "-spec add_handler() -> ok | {'EXIT', Reason :: term()} | term()." n
     "add_handler() ->" n>
     "gen_event:add_handler(?SERVER, ?MODULE, [])." n
     n
@@ -617,9 +676,11 @@ Please see the function `tempo-define-template'.")
     "%% @doc" n
     "%% Whenever a new event handler is added to an event manager," n
     "%% this function is called to initialize the event handler." n
-    "%%" n
-    "%% @spec init(Args) -> {ok, State}" n
     (erlang-skel-separator-end 2)
+    "-spec init(Args :: term() | {Args :: term(), Term :: term()}) ->" n>
+    "{ok, State :: term()} |" n>
+    "{ok, State :: term(), hibernate} |" n>
+    "{error, Reason :: term()}." n
     "init([]) ->" n>
     "{ok, #state{}}." n
     n
@@ -629,12 +690,13 @@ Please see the function `tempo-define-template'.")
     "%% Whenever an event manager receives an event sent using" n
     "%% gen_event:notify/2 or gen_event:sync_notify/2, this function is" n
     "%% called for each installed event handler to handle the event." n
-    "%%" n
-    "%% @spec handle_event(Event, State) ->" n
-    "%%                          {ok, State} |" n
-    "%%                          {swap_handler, Args1, State1, Mod2, Args2} |"n
-    "%%                          remove_handler" n
     (erlang-skel-separator-end 2)
+    "-spec handle_event(Event :: term(), State :: term()) ->" n>
+    "{ok, NewState :: term()} |" n>
+    "{ok, NewState :: term(), hibernate} |" n>
+    "remove_handler |" n>
+    "{swap_handler, Args1 :: term(), NewState :: term()," n>
+    "Handler2 :: atom() | {atom(), term()} , Args2 :: term()}." n>
     "handle_event(_Event, State) ->" n>
     "{ok, State}." n
     n
@@ -644,12 +706,13 @@ Please see the function `tempo-define-template'.")
     "%% Whenever an event manager receives a request sent using" n
     "%% gen_event:call/3,4, this function is called for the specified" n
     "%% event handler to handle the request." n
-    "%%" n
-    "%% @spec handle_call(Request, State) ->" n
-    "%%                   {ok, Reply, State} |" n
-    "%%                   {swap_handler, Reply, Args1, State1, Mod2, Args2} |" n
-    "%%                   {remove_handler, Reply}" n
     (erlang-skel-separator-end 2)
+    "-spec handle_call(Request :: term(), State :: term()) ->" n>
+    "{ok, Reply :: term(), NewState :: term()} |" n>
+    "{ok, Reply :: term(), NewState :: term(), hibernate} |" n>
+    "{remove_handler, Reply :: term()} |" n>
+    "{swap_handler, Reply :: term(), Args1 :: term(), NewState :: term()," n>
+    "Handler2 :: atom() | {atom(), term()}, Args2 :: term()}." n
     "handle_call(_Request, State) ->" n>
     "Reply = ok," n>
     "{ok, Reply, State}." n
@@ -660,12 +723,13 @@ Please see the function `tempo-define-template'.")
     "%% This function is called for each installed event handler when" n
     "%% an event manager receives any other message than an event or a" n
     "%% synchronous request (or a system message)." n
-    "%%" n
-    "%% @spec handle_info(Info, State) ->" n
-    "%%                         {ok, State} |" n
-    "%%                         {swap_handler, Args1, State1, Mod2, Args2} |" n
-    "%%                         remove_handler" n
     (erlang-skel-separator-end 2)
+    "-spec handle_info(Info :: term(), State :: term()) ->" n>
+    "{ok, NewState :: term()} |" n>
+    "{ok, NewState :: term(), hibernate} |" n>
+    "remove_handler |" n>
+    "{swap_handler, Args1 :: term(), NewState :: term()," n>
+    "Handler2 :: atom() | {atom(), term()}, Args2 :: term()}." n
     "handle_info(_Info, State) ->" n>
     "{ok, State}." n
     n
@@ -675,22 +739,40 @@ Please see the function `tempo-define-template'.")
     "%% Whenever an event handler is deleted from an event manager, this" n
     "%% function is called. It should be the opposite of Module:init/1 and" n
     "%% do any necessary cleaning up." n
-    "%%" n
-    "%% @spec terminate(Reason, State) -> void()" n
     (erlang-skel-separator-end 2)
-    "terminate(_Reason, _State) ->" n>
+    "-spec terminate(Arg :: {stop, Reason :: term()} |" n>
+    "stop |" n>
+    "remove_handler |" n>
+    "{error, {'EXIT', Reason :: term()}} |" n>
+    "{error, Term :: term()} |" n>
+    "term()," n>
+    "State :: term()) -> any()." n
+    "terminate(_Arg, _State) ->" n>
     "ok." n
     n
     (erlang-skel-separator-start 2)
     "%% @private" n
     "%% @doc" n
     "%% Convert process state when code is changed" n
-    "%%" n
-    "%% @spec code_change(OldVsn, State, Extra) -> {ok, NewState}" n
     (erlang-skel-separator-end 2)
+    "-spec code_change(OldVsn :: term() | {down, term()}," n>
+    "State :: term()," n>
+    "Extra :: term()) -> {ok, NewState :: term()}." n
     "code_change(_OldVsn, State, _Extra) ->" n>
     "{ok, State}." n
     n
+    (erlang-skel-separator-start 2)
+    "%% @private" n
+    "%% @doc" n
+    "%% This function is called for changing the form and appearance" n
+    "%% of gen_event status when it is returned from sys:get_status/1,2" n
+    "%% or when it appears in termination error logs." n
+    (erlang-skel-separator-end 2)
+    "-spec format_status(Opt :: normal | terminate," n>
+    "Status :: list()) -> Status :: term()." n
+    "format_status(_Opt, Status) ->" n>
+    "Status." n
+    n
     (erlang-skel-double-separator-start 3)
     "%%% Internal functions" n
     (erlang-skel-double-separator-end 3)
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 429188b028..b3411c3ce7 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -4,7 +4,7 @@
 ;; Author:   Anders Lindgren
 ;; Keywords: erlang, languages, processes
 ;; Date:     2011-12-11
-;; Version:  2.8.0
+;; Version:  2.8.1
 ;; Package-Requires: ((emacs "24.1"))
 
 ;; %CopyrightBegin%
@@ -84,7 +84,7 @@
   "The Erlang programming language."
   :group 'languages)
 
-(defconst erlang-version "2.8.0"
+(defconst erlang-version "2.8.1"
   "The version number of Erlang mode.")
 
 (defcustom erlang-root-dir nil
@@ -885,7 +885,6 @@ resulting regexp is surrounded by \\_< and \\_>."
       "append"
       "append_element"
       "await_proc_exit"
-      "await_sched_wall_time_modifications"
       "bump_reductions"
       "call_on_load_function"
       "cancel_timer"
@@ -895,8 +894,6 @@ resulting regexp is surrounded by \\_< and \\_>."
       "decode_packet"
       "delay_trap"
       "delete_element"
-      "dexit"
-      "dgroup_leader"
       "display"
       "display_nl"
       "display_string"
@@ -905,11 +902,8 @@ resulting regexp is surrounded by \\_< and \\_>."
       "dist_ctrl_get_data_notification"
       "dist_ctrl_input_handler"
       "dist_ctrl_put_data"
-      "dist_exit"
-      "dlink"
       "dmonitor_node"
       "dmonitor_p"
-      "dsend"
       "dt_append_vm_tag_data"
       "dt_get_tag"
       "dt_get_tag_data"
@@ -917,7 +911,6 @@ resulting regexp is surrounded by \\_< and \\_>."
       "dt_put_tag"
       "dt_restore_tag"
       "dt_spread_tag"
-      "dunlink"
       "convert_time_unit"
       "external_size"
       "finish_after_on_load"
@@ -929,7 +922,6 @@ resulting regexp is surrounded by \\_< and \\_>."
       "function_exported"
       "garbage_collect_message_area"
       "gather_gc_info_result"
-      "gather_sched_wall_time_result"
       "get_cookie"
       "get_module_info"
       "get_stacktrace"
@@ -2750,7 +2742,7 @@ Return nil if inside string, t if in a comment."
                   (1+ (nth 2 stack-top)))
                  ((= (char-syntax (following-char)) ?\))
                   (goto-char (nth 1 stack-top))
-                  (cond ((looking-at "[({]\\s *\\($\\|%\\)")
+                  (cond ((erlang-record-or-function-args-p)
                          ;; Line ends with parenthesis.
                          (let ((previous (erlang-indent-find-preceding-expr))
                                (stack-pos (nth 2 stack-top)))
@@ -2760,19 +2752,10 @@ Return nil if inside string, t if in a comment."
                          (nth 2 stack-top))))
                  ((= (following-char) ?,)
                   ;; a comma at the start of the line: line up with opening parenthesis.
-                  (nth 2 stack-top))
+                  (min (nth 2 stack-top)
+                       (erlang-indent-element stack-top indent-point token)))
                  (t
-                  (goto-char (nth 1 stack-top))
-                  (let ((base (cond ((looking-at "[({]\\s *\\($\\|%\\)")
-                                     ;; Line ends with parenthesis.
-                                     (erlang-indent-parenthesis (nth 2 stack-top)))
-                                    (t
-                                     ;; Indent to the same column as the first
-                                     ;; argument.
-                                     (goto-char (1+ (nth 1 stack-top)))
-                                     (skip-chars-forward " \t")
-                                     (current-column)))))
-                    (erlang-indent-standard indent-point token base 't)))))
+                  (erlang-indent-element stack-top indent-point token))))
           ;;
           ((eq (car stack-top) '<<)
            ;; Element of binary (possible comprehension) expression,
@@ -2781,13 +2764,11 @@ Return nil if inside string, t if in a comment."
                   (+ 2 (nth 2 stack-top)))
                  ((looking-at "\\(>>\\)[^_a-zA-Z0-9]")
                   (nth 2 stack-top))
+                 ((= (following-char) ?,)
+                  (min (+ (nth 2 stack-top) 1)
+                       (- (erlang-indent-to-first-element stack-top 2) 1)))
                  (t
-                  (goto-char (nth 1 stack-top))
-                  ;; Indent to the same column as the first
-                  ;; argument.
-                  (goto-char (+ 2 (nth 1 stack-top)))
-                  (skip-chars-forward " \t")
-                  (current-column))))
+                  (erlang-indent-to-first-element stack-top 2))))
 
           ((memq (car stack-top) '(icr fun spec))
            ;; The default indentation is the column of the option
@@ -2843,12 +2824,13 @@ Return nil if inside string, t if in a comment."
                (let ((base (erlang-indent-find-base stack indent-point off skip)))
                  ;; Special cases
                  (goto-char indent-point)
-                 (cond ((looking-at "\\(end\\|after\\)\\($\\|[^_a-zA-Z0-9]\\)")
+                 (cond ((looking-at "\\(;\\|end\\|after\\)\\($\\|[^_a-zA-Z0-9]\\)")
                         (if (eq (car stack-top) '->)
                             (erlang-pop stack))
-                        (if stack
-                            (erlang-caddr (car stack))
-                          0))
+                        (cond ((and stack (looking-at ";"))
+                               (+ (erlang-caddr (car stack)) (- erlang-indent-level 2)))
+                              (stack (erlang-caddr (car stack)))
+                              (t off)))
                        ((looking-at "catch\\b\\($\\|[^_a-zA-Z0-9]\\)")
                         ;; Are we in a try
                         (let ((start (if (eq (car stack-top) '->)
@@ -2922,6 +2904,22 @@ Return nil if inside string, t if in a comment."
                                 (current-column))) start-alternativ))))))
           )))
 
+(defun erlang-indent-to-first-element (stack-top extra)
+  ;; Indent to the same column as the first
+  ;; argument.  extra should be 1 for lists tuples or 2 for binaries
+  (goto-char (+ (nth 1 stack-top) extra))
+  (skip-chars-forward " \t")
+  (current-column))
+
+(defun erlang-indent-element (stack-top indent-point token)
+  (goto-char (nth 1 stack-top))
+  (let ((base (cond ((erlang-record-or-function-args-p)
+                     ;; Line ends with parenthesis.
+                     (erlang-indent-parenthesis (nth 2 stack-top)))
+                    (t
+                     (erlang-indent-to-first-element stack-top 1)))))
+    (erlang-indent-standard indent-point token base 't)))
+
 (defun erlang-indent-standard (indent-point token base inside-parenthesis)
   "Standard indent when in blocks or tuple or arguments.
    Look at last thing to see in what state we are, move relative to the base."
@@ -2947,6 +2945,9 @@ Return nil if inside string, t if in a comment."
                ;; Avoid treating comments a continued line.
                ((= (following-char) ?%)
                 base)
+               ((and (= (following-char) ?,) inside-parenthesis)
+                ;; a comma at the start of the line line up with parenthesis
+                (- base 1))
                ;; Continued line (e.g. line beginning
                ;; with an operator.)
                (t
@@ -3036,11 +3037,21 @@ This assumes that the preceding expression is either simple
                (t col)))
        col))))
 
+(defun erlang-record-or-function-args-p ()
+  (and (looking-at "[({]\\s *\\($\\|%\\)")
+       (or (eq (following-char) ?\( )
+           (save-excursion
+             (ignore-errors (forward-sexp (- 1)))
+             (eq (preceding-char) ?#)))))
+
 (defun erlang-indent-parenthesis (stack-position)
   (let ((previous (erlang-indent-find-preceding-expr)))
-    (if (> previous stack-position)
-        (+ stack-position erlang-argument-indent)
-      (+ previous erlang-argument-indent))))
+    (cond ((eq previous stack-position) ;; tuple or map not a record
+           (1+ stack-position))
+          ((> previous stack-position)
+           (+ stack-position erlang-argument-indent))
+          (t
+           (+ previous erlang-argument-indent)))))
 
 (defun erlang-skip-blank (&optional lim)
   "Skip over whitespace and comments until limit reached."
@@ -5174,7 +5185,6 @@ future, a new shell on an already running host will be started."
 ;; e.g. it does not assume that we are running an inferior
 ;; Erlang, there exists a lot of other possibilities.
 
-
 (defvar erlang-shell-buffer-name "*erlang*"
   "The name of the Erlang link shell buffer.")
 
@@ -5185,46 +5195,28 @@ Also see the description of `ielm-prompt-read-only'."
   :type 'boolean
   :package-version '(erlang . "2.8.0"))
 
-(defvar erlang-shell-mode-map nil
-  "Keymap used by Erlang shells.")
-
-
-(defvar erlang-shell-mode-hook nil
-  "User functions to run when an Erlang shell is started.
-
-This hook is used to change the behaviour of Erlang mode.  It is
-normally used by the user to personalise the programming environment.
-When used in a site init file, it could be used to customise Erlang
-mode for all users on the system.
-
-The function added to this hook is run every time a new Erlang
-shell is started.
+(defvar erlang-shell-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\M-\t"    'erlang-complete-tag)
 
-See also `erlang-load-hook', a hook which is run once, when Erlang
-mode is loaded, and `erlang-mode-hook' which is run every time a new
-Erlang source file is loaded into Emacs.")
+    ;; Normally the other way around.
+    (define-key map "\C-a"     'comint-bol)
+    (define-key map "\C-c\C-a" 'beginning-of-line)
 
+    (define-key map "\C-d"     nil)     ; Was `comint-delchar-or-maybe-eof'
+    (define-key map "\M-\C-m"  'compile-goto-error)
+    map)
+  "Keymap used by Erlang shells.")
 
 (defvar erlang-input-ring-file-name "~/.erlang_history"
   "When non-nil, file name used to store Erlang shell history information.")
 
-
-(defun erlang-shell-mode ()
+(define-derived-mode erlang-shell-mode comint-mode "Erlang Shell"
   "Major mode for interacting with an Erlang shell.
 
-We assume that we already are in Comint mode.
-
 The following special commands are available:
 \\{erlang-shell-mode-map}"
-  (interactive)
-  (setq major-mode 'erlang-shell-mode)
-  (setq mode-name "Erlang Shell")
   (erlang-mode-variables)
-  (if erlang-shell-mode-map
-      nil
-    (setq erlang-shell-mode-map (copy-keymap comint-mode-map))
-    (erlang-shell-mode-commands erlang-shell-mode-map))
-  (use-local-map erlang-shell-mode-map)
   ;; Needed when compiling directly from the Erlang shell.
   (setq compilation-last-buffer (current-buffer))
   (setq comint-prompt-regexp "^[^>=]*> *")
@@ -5238,7 +5230,6 @@ The following special commands are available:
             'inferior-erlang-strip-delete nil t)
   (add-hook 'comint-output-filter-functions
             'inferior-erlang-strip-ctrl-m nil t)
-
   (setq comint-input-ring-file-name erlang-input-ring-file-name)
   (comint-read-input-ring t)
   (make-local-variable 'kill-buffer-hook)
@@ -5257,8 +5248,7 @@ The following special commands are available:
                    (define-key map [menu-bar compilation]
                      (cons "Errors" compilation-menu-map)))
                map))))
-  (erlang-tags-init)
-  (run-hooks 'erlang-shell-mode-hook))
+  (erlang-tags-init))
 
 
 (defun erlang-mouse-2-command (event)
@@ -5280,13 +5270,6 @@ Selects Comint or Compilation mode command as appropriate."
       (call-interactively (lookup-key compilation-mode-map "\C-m"))
     (call-interactively (lookup-key comint-mode-map "\C-m"))))
 
-(defun erlang-shell-mode-commands (map)
-  (define-key map "\M-\t"    'erlang-complete-tag)
-  (define-key map "\C-a"     'comint-bol) ; Normally the other way around.
-  (define-key map "\C-c\C-a" 'beginning-of-line)
-  (define-key map "\C-d"     nil)       ; Was `comint-delchar-or-maybe-eof'
-  (define-key map "\M-\C-m"  'compile-goto-error))
-
 ;;;
 ;;; Inferior Erlang -- Run an Erlang shell as a subprocess.
 ;;;
diff --git a/lib/tools/emacs/test.erl.indented b/lib/tools/emacs/test.erl.indented
deleted file mode 100644
index 14a4eca7c3..0000000000
--- a/lib/tools/emacs/test.erl.indented
+++ /dev/null
@@ -1,784 +0,0 @@
-%% -*- Mode: erlang; indent-tabs-mode: nil -*-
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2009-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%
-
-%%%-------------------------------------------------------------------
-%%% File    : test.erl
-%%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description :   Test emacs mode indention and font-locking
-%%%                 this file is intentionally not indented.
-%%%                 Copy the file and indent it and you should end up with test.erl.indented
-%%% Created :  6 Oct 2009 by Dan Gudmundsson <[email protected]>
-%%%-------------------------------------------------------------------
-
-%% Start off with syntax highlighting you have to verify this by looking here
-%% and see that the code looks alright
-
--module(test).
--compile(export_all).
-
-%% Used to cause an "Unbalanced parentheses" error.
-foo(M) ->
-    M#{a :=<<"a">>
-      ,b:=1}.
-foo() ->
-    #{a =><<"a">>
-     ,b=>1}.
-
-%% Module attributes should be highlighted
-
--export([t/1]).
--record(record1, {a,
-                  b,
-                  c
-                 }).
--record(record2, {
-          a,
-          b
-         }).
-
--record(record3, {a = 8#42423 bor
-                      8#4234,
-                  b = 8#5432
-                      bor 2#1010101
-                  c = 123 +
-                      234,
-		  d}).
-
--record(record4, {
-          a = 8#42423 bor
-              8#4234,
-          b = 8#5432
-              bor 2#1010101
-          c = 123 +
-              234,
-          d}).
-
--record(record5, { a = 1 :: integer()
-                 , b = foobar :: atom()
-                 }).
-
--define(MACRO_1, macro).
--define(MACRO_2(_), macro).
-
--spec t(integer()) -> any().
-
--type ann() :: Var :: integer().
--type ann2() :: Var ::
-            'return'
-          | 'return_white_spaces'
-          | 'return_comments'
-          | 'text' | ann().
--type paren() ::
-        (ann2()).
--type t1() :: atom().
--type t2() :: [t1()].
--type t3(Atom) :: integer(Atom).
--type t4() :: t3(foobar).
--type t5() :: {t1(), t3(foo)}.
--type t6() :: 1 | 2 | 3 |
-              'foo' | 'bar'.
--type t7() :: [].
--type t71() :: [_].
--type t8() :: {any(),none(),pid(),port(),
-	       reference(),float()}.
--type t9() :: [1|2|3|foo|bar] |
-              list(a | b | c) | t71().
--type t10() :: {1|2|3|foo|t9()} | {}.
--type t11() :: 1..2.
--type t13() :: maybe_improper_list(integer(), t11()).
--type t14() :: [erl_scan:foo() |
-                %% Should be highlighted
-                term() |
-                bool() |
-                byte() |
-                char() |
-                non_neg_integer() | nonempty_list() |
-                pos_integer() |
-                neg_integer() |
-                number() |
-                list() |
-                nonempty_improper_list() | nonempty_maybe_improper_list() |
-                maybe_improper_list() | string() | iolist() | byte() |
-                module() |
-                mfa() 	|
-                node() 	|
-                timeout() |
-                no_return() |
-                %% Should not be highlighted
-                nonempty_() | nonlist() |
-                erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)].
-
-
--type t15() :: {binary(),<<>>,<<_:34>>,<<_:_*42>>,
-		<<_:3,_:_*14>>,<<>>} | [<<>>|<<_:34>>|<<_:16>>|
-                                        <<_:3,_:_*1472>>|<<_:19,_:_*14>>| <<_:34>>|
-                                        <<_:34>>|<<_:34>>|<<_:34>>].
--type t16() :: fun().
--type t17() :: fun((...) -> paren()).
--type t18() :: fun(() -> t17() | t16()).
--type t19() :: fun((t18()) -> t16()) |
-               fun((nonempty_maybe_improper_list('integer', any())|
-                    1|2|3|a|b|<<_:3,_:_*14>>|integer()) ->
-                          nonempty_maybe_improper_list('integer', any())|
-                          1|2|3|a|b|<<_:3,_:_*14>>|integer()).
--type t20() :: [t19(), ...].
--type t21() :: tuple().
--type t21(A) :: A.
--type t22() :: t21(integer()).
--type t23() :: #rec1{}.
--type t24() :: #rec2{a :: t23(), b :: [atom()]}.
--type t25() :: #rec3{f123 :: [t24() |
-                              1|2|3|4|a|b|c|d|
-                              nonempty_maybe_improper_list(integer, any())]}.
--type t26() :: #rec4{ a :: integer()
-                    , b :: any()
-                    }.
--type t27() :: { integer()
-               , atom()
-               }.
--type t99() ::
-        {t2(),t4(),t5(),t6(),t7(),t8(),t10(),t14(),
-         t15(),t20(),t21(), t22(),t25()}.
--spec t1(FooBar :: t99()) -> t99();
-        (t2()) -> t2();
-	(t4()) -> t4() when is_subtype(t4(), t24);
-        (t23()) -> t23() when is_subtype(t23(), atom()),
-                              is_subtype(t23(), t14());
-        (t24()) -> t24() when is_subtype(t24(), atom()),
-                              is_subtype(t24(), t14()),
-                              is_subtype(t24(), t4()).
-
--spec over(I :: integer()) -> R1 :: foo:typen();
-          (A :: atom()) -> R2 :: foo:atomen();
-          (T :: tuple()) -> R3 :: bar:typen().
-
--spec mod:t2() -> any().
-
--spec handle_cast(Cast :: {'exchange', node(), [[name(),...]]}
-                        | {'del_member', name(), pid()},
-                  #state{}) -> {'noreply', #state{}}.
-
--spec handle_cast(Cast ::
-                    {'exchange', node(), [[name(),...]]}
-                  | {'del_member', name(), pid()},
-                  #state{}) -> {'noreply', #state{}}.
-
--spec all(fun((T) -> boolean()), List :: [T]) ->
-                 boolean() when is_subtype(T, term()). % (*)
-
--spec get_closest_pid(term()) ->
-                             Return :: pid()
-                                     | {'error', {'no_process', term()}
-                                        | {'no_such_group', term()}}.
-
--spec add( X :: integer()
-         , Y :: integer()
-         ) -> integer().
-
--opaque attributes_data() ::
-          [{'column', column()} | {'line', info_line()} |
-           {'text', string()}] |  {line(),column()}.
--record(r,{
-	  f1 :: attributes_data(),
-          f222 = foo:bar(34, #rec3{}, 234234234423,
-                         aassdsfsdfsdf, 2234242323) ::
-                   [t24() | 1|2|3|4|a|b|c|d|
-                    nonempty_maybe_improper_list(integer, any())],
-          f333 :: [t24() | 1|2|3|4|a|b|c|d|
-                   nonempty_maybe_improper_list(integer, any())],
-          f3 = x:y(),
-          f4 = x:z() :: t99(),
-          f17 :: 'undefined',
-          f18 :: 1 | 2 | 'undefined',
-          f19 = 3 :: integer()|undefined,
-          f5 = 3 :: undefined|integer()}).
-
--record(state, {
-          sequence_number = 1          :: integer()
-         }).
-
-
-highlighting(X)			  % Function definitions should be highlighted
-  when is_integer(X) ->	  % and so should `when' and `is_integer' be
-    %% Highlighting
-    %% Various characters (we keep an `atom' after to see that highlighting ends)
-    $a,atom,			  % Characters should be marked
-    "string",atom,		  % and strings
-    'asdasd',atom,		  % quote should be atoms??
-    'VaV',atom,
-    'aVa',atom,
-    '\'atom',atom,
-    'atom\'',atom,
-    'at\'om',atom,
-    '#1',atom,
-
-    $", atom,					% atom should be ok
-    $', atom,
-
-    "string$", atom,  "string$", atom,  		% currently buggy I know...
-    "string\$", atom,   				% workaround for bug above
-
-    "char $in string", atom,
-
-    'atom$', atom,  'atom$', atom,
-    'atom\$', atom,
-
-    'char $in atom', atom,
-
-    $[, ${, $\\, atom,
-    ?MACRO_1,
-    ?MACRO_2(foo),
-
-    %% Numerical constants
-    16#DD,					% AD Should not be highlighted
-    32#dd,					% AD Should not be highlighted
-    32#ddAB,				        % AD Should not be highlighted
-    32#101,				        % AD Should not be highlighted
-    32#ABTR,				        % AD Should not be highlighted
-
-    %% Variables
-    Variables = lists:foo(),
-    _Variables = lists:foo(),                      % AD
-    AppSpec = Xyz/2,
-    Module42 = Xyz(foo, bar),
-    Module:foo(),
-    _Module:foo(),				% AD
-    FooÅÅ = lists:reverse([tl,hd,tl,hd]),	% AD Should highlight FooÅÅ
-    _FooÅÅ = 42,				% AD Should highlight _FooÅÅ
-
-    %% Bifs
-    erlang:registered(),
-    registered(),
-    hd(tl(tl(hd([a,b,c])))),
-    erlang:anything(lists),
-    %% Guards
-    is_atom(foo), is_float(2.3), is_integer(32), is_number(4323.3),
-    is_function(Fun), is_pid(self()),
-    not_a_guard:is_list([]),
-    %% Other Types
-
-    atom,			  % not (currently) hightlighted
-    234234,
-    234.43,
-
-    [list, are, not, higlighted],
-    {nor, is, tuple},
-    ok.
-
-%%%
-%%%  Indentation
-%%%
-
-%%%  Left
-
-%%   Indented
-
-                                                %    Right
-
-
-indent_basics(X, Y, Z)
-  when X > 42,
-       Z < 13;
-       Y =:= 4711 ->
-    %% comments
-                                                % right comments
-    case lists:filter(fun(_, AlongName,
-                          B,
-                          C) ->
-                              true
-                      end,
-                      [a,v,b])
-    of
-        [] ->
-            Y = 5 * 43,
-            ok;
-        [_|_] ->
-            Y = 5 * 43,
-            ok
-    end,
-    Y,
-    %% List, tuples and binaries
-    [a,
-     b, c
-    ],
-    [ a,
-      b, c
-    ],
-
-    [
-     a,
-     b
-    ],
-    {a,
-     b,c
-    },
-    { a,
-      b,c
-    },
-
-    {
-      a,
-      b
-    },
-
-    <<1:8,
-      2:8
-    >>,
-    <<
-      1:8,
-      2:8
-    >>,
-    << 1:8,
-       2:8
-    >>,
-
-    (a,
-     b,
-     c
-    ),
-
-    ( a,
-      b,
-      c
-    ),
-
-
-    (
-      a,
-      b,
-      c
-    ),
-
-    call(2#42423 bor
-             #4234,
-         2#5432,
-         other_arg),
-    ok;
-indent_basics(Xlongname,
-              #struct{a=Foo,
-                      b=Bar},
-              [X|
-               Y]) ->
-    testing_next_clause,
-    ok;
-indent_basics(					% AD added clause
-  X, 						% not sure how this should look
-  Y,
-  Z)
-  when
-      X < 42, Z > 13;
-      Y =:= 4711 ->
-    foo;
-indent_basics(X, Y, Z) when			% AD added clause
-      X < 42, Z > 13;				% testing when indentation
-      Y =:= 4711 ->
-    foo;
-indent_basics(X, Y, Z)				% AD added clause
-  when						% testing when indentation
-      X < 42, Z > 13;				% unsure about this one
-      Y =:= 4711 ->
-    foo.
-
-
-
-indent_nested() ->
-    [
-     {foo, 2, "string"},
-     {bar, 3, "another string"}
-    ].
-
-
-indent_icr(Z) -> 				% icr = if case receive
-    %% If
-    if Z >= 0 ->
-            X = 43 div 4,
-            foo(X);
-       Z =< 10 ->
-            X = 43 div 4,
-            foo(X);
-       Z == 5 orelse
-       Z == 7 ->
-            X = 43 div 4,
-            foo(X);
-       true ->
-            if_works
-    end,
-    %% Case
-    case {Z, foo, bar} of
-        {Z,_,_} ->
-            X = 43 div 4,
-            foo(X);
-        {Z,_,_}	when
-              Z =:= 42 ->				% AD line should be indented as a when
-            X = 43 div 4,
-            foo(X);
-        {Z,_,_}
-          when Z < 10 ->			% AD when should be indented
-            X = 43 div 4,
-            foo(X);
-        {Z,_,_}
-          when					% AD when should be indented
-              Z < 10				% and the guards should follow when
-              andalso				% unsure about how though
-              true ->
-            X = 43 div 4,
-            foo(X)
-    end,
-    %% begin
-    begin
-        sune,
-        X = 74234 + foo(8456) +
-            345 div 43,
-        ok
-    end,
-
-
-    %% receive
-    receive
-        {Z,_,_} ->
-            X = 43 div 4,
-            foo(X);
-        Z ->
-            X = 43 div 4,
-            foo(X)
-    end,
-    receive
-        {Z,_,_} ->
-            X = 43 div 4,
-            foo(X);
-        Z 					% AD added clause
-          when Z =:= 1 ->			% This line should be indented by 2
-            X = 43 div 4,
-            foo(X);
-        Z when					% AD added clause
-              Z =:= 2 ->				% This line should be indented by 2
-            X = 43 div 4,
-            foo(X);
-        Z ->
-            X = 43 div 4,
-            foo(X)
-    after infinity ->
-            foo(X),
-            asd(X),
-            5*43
-    end,
-    receive
-    after 10 ->
-            foo(X),
-            asd(X),
-            5*43
-    end,
-    ok.
-
-indent_fun() ->
-    %% Changed fun to one indention level
-    Var = spawn(fun(X)
-                      when X == 2;
-                           X > 10 ->
-                        hello,
-                        case Hello() of
-                            true when is_atom(X) ->
-                                foo;
-                            false ->
-                                bar
-                        end;
-                   (Foo) when is_atom(Foo),
-                              is_integer(X) ->
-                        X = 6* 45,
-                        Y = true andalso
-                            kalle
-                end),
-    %% check EEP37 named funs
-    Fn1 = fun Fact(N) when N > 0 ->
-                  F = Fact(N-1),
-                  N * F;
-              Fact(0) ->
-                  1
-          end,
-    %% check anonymous funs too
-    Fn2 = fun(0) ->
-                  1;
-             (N) ->
-                  N
-          end,
-    ok.
-
-indent_try_catch() ->
-    try
-        io:format(stdout, "Parsing file ~s, ",
-                  [St0#leex.xfile]),
-        {ok,Line3,REAs,Actions,St3} =
-            parse_rules(Xfile, Line2, Macs, St2)
-    catch
-        exit:{badarg,R} ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R);
-        error:R 				% AD added clause
-          when R =:= 42 ->			% when should be indented
-            foo(R);
-        error:R 				% AD added clause
-          when					% when should be indented
-              R =:= 42 ->				% but unsure about this (maybe 2 more)
-            foo(R);
-        error:R when				% AD added clause
-              R =:= foo ->				% line should be 2 indented (works)
-            foo(R);
-        error:R ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R)
-    after
-        foo('after'),
-        file:close(Xfile)
-    end;
-indent_try_catch() ->
-    try
-        foo(bar)
-    of
-        X when true andalso
-               kalle ->
-            io:format(stdout, "Parsing file ~s, ",
-                      [St0#leex.xfile]),
-            {ok,Line3,REAs,Actions,St3} =
-                parse_rules(Xfile, Line2, Macs, St2);
-        X 					% AD added clause
-          when false andalso			% when should be 2 indented
-               bengt ->
-            gurka();
-        X when					% AD added clause
-              false andalso				% line should be 2 indented
-              not bengt ->
-            gurka();
-        X ->
-            io:format(stdout, "Parsing file ~s, ",
-                      [St0#leex.xfile]),
-            {ok,Line3,REAs,Actions,St3} =
-                parse_rules(Xfile, Line2, Macs, St2)
-    catch
-        exit:{badarg,R} ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R);
-        error:R ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R)
-    after
-        foo('after'),
-        file:close(Xfile),
-        bar(with_long_arg,
-            with_second_arg)
-    end;
-indent_try_catch() ->
-    try foo()
-    after
-        foo(),
-        bar(with_long_arg,
-            with_second_arg)
-    end.
-
-indent_catch() ->
-    D = B +
-        float(43.1),
-
-    B = catch oskar(X),
-
-    A = catch (baz +
-                   bax),
-    catch foo(),
-
-    C = catch B +
-        float(43.1),
-
-    case catch foo(X) of
-        A ->
-            B
-    end,
-
-    case
-        catch foo(X)
-    of
-        A ->
-            B
-    end,
-
-    case
-        foo(X)
-    of
-        A ->
-            catch B,
-            X
-    end,
-
-    try sune of
-        _ -> foo
-    catch _:_ -> baf
-    end,
-
-    try
-        sune
-    of
-        _ ->
-            X = 5,
-            (catch foo(X)),
-            X + 10
-    catch _:_ -> baf
-    end,
-
-    try
-        (catch sune)
-    of
-        _ ->
-    catch foo()  %% BUGBUG can't handle catch inside try without parentheses
-    catch _:_ ->
-            baf
-    end,
-
-    try
-        (catch exit())
-    catch
-        _ ->
-            catch baf()
-    end,
-    ok.
-
-indent_binary() ->
-    X = lists:foldr(fun(M) ->
-                            <<Ma/binary, " ">>
-                    end, [], A),
-    A = <<X/binary, 0:8>>,
-    B.
-
-
-indent_comprehensions() ->
-    %% I don't have a good idea how we want to handle this
-    %% but they are here to show how they are indented today.
-    Result1 = [X ||
-                  #record{a=X} <- lists:seq(1, 10),
-                  true = (X rem 2)
-              ],
-    Result2 = [X || <<X:32,_:32>> <= <<0:512>>,
-                    true = (X rem 2)
-              ],
-
-    Binary1 = << <<X:8>> ||
-                  #record{a=X} <- lists:seq(1, 10),
-                  true = (X rem 2)
-              >>,
-
-    Binary2 = << <<X:8>> || <<X:32,_:32>> <= <<0:512>>,
-                            true = (X rem 2)
-              >>,
-    ok.
-
-%% This causes an error in earlier erlang-mode versions.
-foo() ->
-    [#foo{
-        foo = foo}].
-
-%% Record indentation
-some_function_with_a_very_long_name() ->
-    #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-       field1=a,
-       field2=b},
-    case dummy_function_with_a_very_very_long_name(x) of
-        #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-           field1=a,
-           field2=b} ->
-            ok;
-        Var = #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-                 field1=a,
-                 field2=b} ->
-            Var#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-              field1=a,
-              field2=b};
-        #xyz{
-           a=1,
-           b=2} ->
-            ok
-    end.
-
-another_function_with_a_very_very_long_name() ->
-    #rec{
-       field1=1,
-       field2=1}.
-
-some_function_name_xyz(xyzzy, #some_record{
-                                 field1=Field1,
-                                 field2=Field2}) ->
-    SomeVariable = f(#'Some-long-record-name'{
-                        field_a = 1,
-                        'inter-xyz-parameters' =
-                            #'Some-other-very-long-record-name'{
-                               field2 = Field1,
-                               field2 = Field2}}),
-    {ok, SomeVariable}.
-
-commas_first() ->
-    {abc, [ {some_var, 1}
-          , {some_other_var, 2}
-          , {erlang_ftw, 9}
-          , {erlang_cookie, 'cookie'}
-          , {cmds,
-             [ {one,   "sudo ls"}
-             , {one,   "sudo ls"}
-             , {two,   "sudo ls"}
-             , {three, "sudo ls"}
-             , {four,  "sudo ls"}
-             , {three, "sudo ls"}
-             ] }
-          , {ssh_username, "yow"}
-          , {cluster,
-             [ {aaaa, [ {"10.198.55.12" , "" }
-                      , {"10.198.55.13" , "" }
-                      ] }
-             , {bbbb, [ {"10.198.55.151", "" }
-                      , {"10.198.55.123", "" }
-                      , {"10.198.55.34" , "" }
-                      , {"10.198.55.85" , "" }
-                      , {"10.198.55.67" , "" }
-                      ] }
-             , {cccc, [ {"10.198.55.68" , "" }
-                      , {"10.198.55.69" , "" }
-                      ] }
-             ] }
-          ]
-    }.
-
-
-%% this used to result in a scan-sexp error
-[{
- }].
-
-%% this used to result in 2x the correct indentation within the function
-%% body, due to the function name being mistaken for a keyword
-catcher(N) ->
-    try generate_exception(N) of
-        Val -> {N, normal, Val}
-    catch
-        throw:X -> {N, caught, thrown, X};
-        exit:X -> {N, caught, exited, X};
-        error:X -> {N, caught, error, X}
-    end.
diff --git a/lib/tools/emacs/test.erl.orig b/lib/tools/emacs/test.erl.orig
deleted file mode 100644
index c0cf1749b6..0000000000
--- a/lib/tools/emacs/test.erl.orig
+++ /dev/null
@@ -1,784 +0,0 @@
-%% -*- Mode: erlang; indent-tabs-mode: nil -*-
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2009-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%
-
-%%%-------------------------------------------------------------------
-%%% File    : test.erl
-%%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description :   Test emacs mode indention and font-locking
-%%%                 this file is intentionally not indented.
-%%%                 Copy the file and indent it and you should end up with test.erl.indented
-%%% Created :  6 Oct 2009 by Dan Gudmundsson <[email protected]>
-%%%-------------------------------------------------------------------
-
-%% Start off with syntax highlighting you have to verify this by looking here
-%% and see that the code looks alright
-
--module(test).
--compile(export_all).
-
-%% Used to cause an "Unbalanced parentheses" error.
-foo(M) ->
-M#{a :=<<"a">>
-,b:=1}.
-foo() ->
-#{a =><<"a">>
-,b=>1}.
-
-%% Module attributes should be highlighted
-
--export([t/1]).
--record(record1, {a,
- b,
- c
-}).
--record(record2, {
-  a,
-  b
- }).
-
--record(record3, {a = 8#42423 bor
-    8#4234,
-  b = 8#5432
-		  bor 2#1010101
-  c = 123 +
-234,
-		  d}).
-
--record(record4, {
- a = 8#42423 bor
-   8#4234,
- b = 8#5432
-    bor 2#1010101
- c = 123 +
-     234,
- d}).
-
--record(record5, { a = 1 :: integer()
-, b = foobar :: atom()
-}).
-
--define(MACRO_1, macro).
--define(MACRO_2(_), macro).
-
--spec t(integer()) -> any().
-
--type ann() :: Var :: integer().
--type ann2() :: Var ::
-   'return'
- | 'return_white_spaces'
-  | 'return_comments'
-  | 'text' | ann().
--type paren() ::
-  (ann2()).
--type t1() :: atom().
--type t2() :: [t1()].
--type t3(Atom) :: integer(Atom).
--type t4() :: t3(foobar).
--type t5() :: {t1(), t3(foo)}.
--type t6() :: 1 | 2 | 3 |
-	'foo' | 'bar'.
--type t7() :: [].
--type t71() :: [_].
--type t8() :: {any(),none(),pid(),port(),
-	       reference(),float()}.
--type t9() :: [1|2|3|foo|bar] |
-    list(a | b | c) | t71().
--type t10() :: {1|2|3|foo|t9()} | {}.
--type t11() :: 1..2.
--type t13() :: maybe_improper_list(integer(), t11()).
--type t14() :: [erl_scan:foo() |
-        %% Should be highlighted
-	term() |
-	bool() |
-	byte() |
-	char() |
-	non_neg_integer() | nonempty_list() |
-	pos_integer() |
-	neg_integer() |
-	number() |
-	list() |
-	nonempty_improper_list() | nonempty_maybe_improper_list() |
-	maybe_improper_list() | string() | iolist() | byte() |
-	module() |
-	mfa() 	|
-	node() 	|
-	timeout() |
-	no_return() |
-	%% Should not be highlighted
-	nonempty_() | nonlist() |
- erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)].
-
-
--type t15() :: {binary(),<<>>,<<_:34>>,<<_:_*42>>,
-		<<_:3,_:_*14>>,<<>>} | [<<>>|<<_:34>>|<<_:16>>|
-<<_:3,_:_*1472>>|<<_:19,_:_*14>>| <<_:34>>|
-<<_:34>>|<<_:34>>|<<_:34>>].
--type t16() :: fun().
--type t17() :: fun((...) -> paren()).
--type t18() :: fun(() -> t17() | t16()).
--type t19() :: fun((t18()) -> t16()) |
-  fun((nonempty_maybe_improper_list('integer', any())|
-      1|2|3|a|b|<<_:3,_:_*14>>|integer()) ->
-nonempty_maybe_improper_list('integer', any())|
-1|2|3|a|b|<<_:3,_:_*14>>|integer()).
--type t20() :: [t19(), ...].
--type t21() :: tuple().
--type t21(A) :: A.
--type t22() :: t21(integer()).
--type t23() :: #rec1{}.
--type t24() :: #rec2{a :: t23(), b :: [atom()]}.
--type t25() :: #rec3{f123 :: [t24() |
-1|2|3|4|a|b|c|d|
-nonempty_maybe_improper_list(integer, any())]}.
--type t26() :: #rec4{ a :: integer()
-, b :: any()
-}.
--type t27() :: { integer()
-, atom()
-}.
--type t99() ::
-{t2(),t4(),t5(),t6(),t7(),t8(),t10(),t14(),
-t15(),t20(),t21(), t22(),t25()}.
--spec t1(FooBar :: t99()) -> t99();
-(t2()) -> t2();
-	(t4()) -> t4() when is_subtype(t4(), t24);
-(t23()) -> t23() when is_subtype(t23(), atom()),
-                      is_subtype(t23(), t14());
-(t24()) -> t24() when is_subtype(t24(), atom()),
-                      is_subtype(t24(), t14()),
-	   is_subtype(t24(), t4()).
-
--spec over(I :: integer()) -> R1 :: foo:typen();
-  (A :: atom()) -> R2 :: foo:atomen();
- (T :: tuple()) -> R3 :: bar:typen().
-
--spec mod:t2() -> any().
-
--spec handle_cast(Cast :: {'exchange', node(), [[name(),...]]}
-  | {'del_member', name(), pid()},
-     #state{}) -> {'noreply', #state{}}.
-
--spec handle_cast(Cast ::
-   {'exchange', node(), [[name(),...]]}
- | {'del_member', name(), pid()},
-   #state{}) -> {'noreply', #state{}}.
-
--spec all(fun((T) -> boolean()), List :: [T]) ->
- boolean() when is_subtype(T, term()). % (*)
-
--spec get_closest_pid(term()) ->
-       Return :: pid()
- | {'error', {'no_process', term()}
-   | {'no_such_group', term()}}.
-
--spec add( X :: integer()
-, Y :: integer()
-) -> integer().
-
--opaque attributes_data() ::
-[{'column', column()} | {'line', info_line()} |
- {'text', string()}] |  {line(),column()}.
--record(r,{
-	  f1 :: attributes_data(),
-f222 = foo:bar(34, #rec3{}, 234234234423,
-               aassdsfsdfsdf, 2234242323) ::
-[t24() | 1|2|3|4|a|b|c|d|
- nonempty_maybe_improper_list(integer, any())],
-f333 :: [t24() | 1|2|3|4|a|b|c|d|
-	 nonempty_maybe_improper_list(integer, any())],
-f3 = x:y(),
-f4 = x:z() :: t99(),
-f17 :: 'undefined',
-f18 :: 1 | 2 | 'undefined',
-f19 = 3 :: integer()|undefined,
-f5 = 3 :: undefined|integer()}).
-
--record(state, {
-  sequence_number = 1          :: integer()
-  }).
-
-
-highlighting(X)			  % Function definitions should be highlighted
-  when is_integer(X) ->	  % and so should `when' and `is_integer' be
- %% Highlighting
- %% Various characters (we keep an `atom' after to see that highlighting ends)
- $a,atom,			  % Characters should be marked
- "string",atom,		  % and strings
- 'asdasd',atom,		  % quote should be atoms??
- 'VaV',atom,
- 'aVa',atom,
- '\'atom',atom,
- 'atom\'',atom,
- 'at\'om',atom,
- '#1',atom,
-
- $", atom,					% atom should be ok
- $', atom,
-
- "string$", atom,  "string$", atom,  		% currently buggy I know...
- "string\$", atom,   				% workaround for bug above
-
- "char $in string", atom,
-
- 'atom$', atom,  'atom$', atom,
- 'atom\$', atom,
-
- 'char $in atom', atom,
-
- $[, ${, $\\, atom,
- ?MACRO_1,
- ?MACRO_2(foo),
-
- %% Numerical constants
- 16#DD,					% AD Should not be highlighted
- 32#dd,					% AD Should not be highlighted
- 32#ddAB,				        % AD Should not be highlighted
- 32#101,				        % AD Should not be highlighted
- 32#ABTR,				        % AD Should not be highlighted
-
- %% Variables
- Variables = lists:foo(),
- _Variables = lists:foo(),                      % AD
- AppSpec = Xyz/2,
- Module42 = Xyz(foo, bar),
- Module:foo(),
- _Module:foo(),				% AD
- FooÅÅ = lists:reverse([tl,hd,tl,hd]),	% AD Should highlight FooÅÅ
- _FooÅÅ = 42,				% AD Should highlight _FooÅÅ
-
- %% Bifs
- erlang:registered(),
- registered(),
- hd(tl(tl(hd([a,b,c])))),
- erlang:anything(lists),
- %% Guards
- is_atom(foo), is_float(2.3), is_integer(32), is_number(4323.3),
- is_function(Fun), is_pid(self()),
- not_a_guard:is_list([]),
- %% Other Types
-
- atom,			  % not (currently) hightlighted
- 234234,
- 234.43,
-
- [list, are, not, higlighted],
- {nor, is, tuple},
- ok.
-
-%%%
-%%%  Indentation
-%%%
-
-%%%  Left
-
-%%   Indented
-
-%    Right
-
-
-indent_basics(X, Y, Z)
-  when X > 42,
-Z < 13;
-Y =:= 4711 ->
- %% comments
- % right comments
- case lists:filter(fun(_, AlongName,
-	      B,
-    C) ->
-		       true
-		   end,
-		   [a,v,b])
- of
- [] ->
- Y = 5 * 43,
- ok;
- [_|_] ->
- Y = 5 * 43,
- ok
- end,
- Y,
- %% List, tuples and binaries
- [a,
-  b, c
- ],
- [ a,
-   b, c
-  ],
-
- [
- a,
- b
-],
- {a,
-  b,c
- },
- { a,
-  b,c
-    },
-
- {
- a,
- b
- },
-
-<<1:8,
-  2:8
-  >>,
- <<
- 1:8,
- 2:8
-  >>,
- << 1:8,
-   2:8
-    >>,
-
- (a,
-  b,
-  c
- ),
-
-    ( a,
-     b,
-     c
-    ),
-
-
- (
-  a,
-  b,
-  c
- ),
-
- call(2#42423 bor
-   #4234,
-  2#5432,
- other_arg),
- ok;
-indent_basics(Xlongname,
-     #struct{a=Foo,
-     b=Bar},
-       [X|
-	Y]) ->
- testing_next_clause,
- ok;
-indent_basics(					% AD added clause
- X, 						% not sure how this should look
- Y,
- Z)
- when
- X < 42, Z > 13;
- Y =:= 4711 ->
- foo;
-indent_basics(X, Y, Z) when			% AD added clause
- X < 42, Z > 13;				% testing when indentation
- Y =:= 4711 ->
- foo;
-indent_basics(X, Y, Z)				% AD added clause
- when						% testing when indentation
- X < 42, Z > 13;				% unsure about this one
- Y =:= 4711 ->
- foo.
-
-
-
-indent_nested() ->
- [
- {foo, 2, "string"},
- {bar, 3, "another string"}
-  ].
-
-
-indent_icr(Z) -> 				% icr = if case receive
- %% If
- if Z >= 0 ->
-	 X = 43 div 4,
-	 foo(X);
-    Z =< 10 ->
-	 X = 43 div 4,
-	 foo(X);
-    Z == 5 orelse
-    Z == 7 ->
-	 X = 43 div 4,
-	 foo(X);
-    true ->
-	 if_works
-  end,
- %% Case
- case {Z, foo, bar} of
-  {Z,_,_} ->
-  X = 43 div 4,
-  foo(X);
-  {Z,_,_}	when
-  Z =:= 42 ->				% AD line should be indented as a when
-  X = 43 div 4,
-  foo(X);
-  {Z,_,_}
-  when Z < 10 ->			% AD when should be indented
-  X = 43 div 4,
-  foo(X);
-  {Z,_,_}
-  when					% AD when should be indented
-  Z < 10				% and the guards should follow when
-  andalso				% unsure about how though
-  true ->
-  X = 43 div 4,
-  foo(X)
- end,
- %% begin
- begin
- sune,
- X = 74234 + foo(8456) +
-  345 div 43,
- ok
- end,
-
-
- %% receive
-  receive
-  {Z,_,_} ->
-    X = 43 div 4,
-    foo(X);
-  Z ->
-   X = 43 div 4,
-   foo(X)
-  end,
-  receive
-  {Z,_,_} ->
-  X = 43 div 4,
-  foo(X);
- Z 					% AD added clause
-  when Z =:= 1 ->			% This line should be indented by 2
-  X = 43 div 4,
-  foo(X);
- Z when					% AD added clause
-  Z =:= 2 ->				% This line should be indented by 2
-  X = 43 div 4,
-  foo(X);
- Z ->
-    X = 43 div 4,
-    foo(X)
- after infinity ->
-    foo(X),
-    asd(X),
-    5*43
- end,
- receive
- after 10 ->
- foo(X),
- asd(X),
- 5*43
- end,
- ok.
-
-indent_fun() ->
-    %% Changed fun to one indention level
-Var = spawn(fun(X)
-       when X == 2;
-	     X > 10 ->
-  hello,
-  case Hello() of
-   true when is_atom(X) ->
-      foo;
-  false ->
-      bar
-  end;
- (Foo) when is_atom(Foo),
-   is_integer(X) ->
-  X = 6* 45,
-  Y = true andalso
-	  kalle
- end),
-%% check EEP37 named funs
-Fn1 = fun Fact(N) when N > 0 ->
-   F = Fact(N-1),
-          N * F;
-Fact(0) ->
-                 1
-  end,
-%% check anonymous funs too
-   Fn2 = fun(0) ->
-1;
-   (N) ->
-   N
- end,
-  ok.
-
-indent_try_catch() ->
- try
- io:format(stdout, "Parsing file ~s, ",
- [St0#leex.xfile]),
- {ok,Line3,REAs,Actions,St3} =
- parse_rules(Xfile, Line2, Macs, St2)
- catch
-  exit:{badarg,R} ->
-  foo(R),
-  io:format(stdout,
-   "ERROR reason ~p~n",
-    R);
-  error:R 				% AD added clause
-  when R =:= 42 ->			% when should be indented
-  foo(R);
-  error:R 				% AD added clause
-  when					% when should be indented
-  R =:= 42 ->				% but unsure about this (maybe 2 more)
-  foo(R);
-  error:R when				% AD added clause
-  R =:= foo ->				% line should be 2 indented (works)
-  foo(R);
-  error:R ->
-  foo(R),
-  io:format(stdout,
-   "ERROR reason ~p~n",
-    R)
- after
-  foo('after'),
-  file:close(Xfile)
- end;
-indent_try_catch() ->
- try
-   foo(bar)
- of
- X when true andalso
- kalle ->
-  io:format(stdout, "Parsing file ~s, ",
-  [St0#leex.xfile]),
-  {ok,Line3,REAs,Actions,St3} =
-  parse_rules(Xfile, Line2, Macs, St2);
- X 					% AD added clause
-  when false andalso			% when should be 2 indented
-  bengt ->
-  gurka();
- X when					% AD added clause
-  false andalso				% line should be 2 indented
-  not bengt ->
-  gurka();
- X ->
-  io:format(stdout, "Parsing file ~s, ",
-  [St0#leex.xfile]),
-  {ok,Line3,REAs,Actions,St3} =
-  parse_rules(Xfile, Line2, Macs, St2)
- catch
- exit:{badarg,R} ->
-    foo(R),
-    io:format(stdout,
-	      "ERROR reason ~p~n",
-	      R);
- error:R ->
-    foo(R),
-    io:format(stdout,
-	      "ERROR reason ~p~n",
-	      R)
- after
- foo('after'),
-  file:close(Xfile),
-  bar(with_long_arg,
-       with_second_arg)
- end;
- indent_try_catch() ->
- try foo()
- after
-  foo(),
-  bar(with_long_arg,
-      with_second_arg)
- end.
-
-indent_catch() ->
-  D = B +
-  float(43.1),
-
-  B = catch oskar(X),
-
-  A = catch (baz +
-      bax),
- catch foo(),
-
-  C = catch B +
-     float(43.1),
-
-  case catch foo(X) of
-  A ->
- B
- end,
-
- case
-  catch foo(X)
- of
- A ->
-   B
-  end,
-
-  case
-  foo(X)
-   of
- A ->
-	  catch B,
-	  X
-   end,
-
- try sune of
- _ -> foo
-   catch _:_ -> baf
-   end,
-
-    try
-sune
-   of
- _ ->
-   X = 5,
-   (catch foo(X)),
-   X + 10
-   catch _:_ -> baf
-   end,
-
-   try
- (catch sune)
-   of
- _ ->
-   catch foo()  %% BUGBUG can't handle catch inside try without parentheses
-   catch _:_ ->
-    baf
-   end,
-
-   try
-(catch exit())
-   catch
-_ ->
-    catch baf()
-   end,
- ok.
-
-indent_binary() ->
-  X = lists:foldr(fun(M) ->
-    <<Ma/binary, " ">>
-    end, [], A),
-  A = <<X/binary, 0:8>>,
-  B.
-
-
-indent_comprehensions() ->
-%% I don't have a good idea how we want to handle this
-%% but they are here to show how they are indented today.
-Result1 = [X ||
-  #record{a=X} <- lists:seq(1, 10),
-  true = (X rem 2)
-     ],
-Result2 = [X || <<X:32,_:32>> <= <<0:512>>,
-    true = (X rem 2)
-       ],
-
-Binary1 = << <<X:8>> ||
-  #record{a=X} <- lists:seq(1, 10),
-  true = (X rem 2)
-      >>,
-
-Binary2 = << <<X:8>> || <<X:32,_:32>> <= <<0:512>>,
-  true = (X rem 2)
-      >>,
-ok.
-
-%% This causes an error in earlier erlang-mode versions.
-foo() ->
-[#foo{
-foo = foo}].
-
-%% Record indentation
-some_function_with_a_very_long_name() ->
- #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b},
- case dummy_function_with_a_very_very_long_name(x) of
- #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b} ->
- ok;
- Var = #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b} ->
- Var#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b};
- #xyz{
- a=1,
- b=2} ->
- ok
- end.
-
-another_function_with_a_very_very_long_name() ->
- #rec{
- field1=1,
- field2=1}.
-
-some_function_name_xyz(xyzzy, #some_record{
- field1=Field1,
- field2=Field2}) ->
- SomeVariable = f(#'Some-long-record-name'{
- field_a = 1,
- 'inter-xyz-parameters' =
- #'Some-other-very-long-record-name'{
- field2 = Field1,
- field2 = Field2}}),
- {ok, SomeVariable}.
-
-commas_first() ->
- {abc, [ {some_var, 1}
-        , {some_other_var, 2}
-        , {erlang_ftw, 9}
-        , {erlang_cookie, 'cookie'}
-        , {cmds,
-            [ {one,   "sudo ls"}
-              , {one,   "sudo ls"}
-              , {two,   "sudo ls"}
-              , {three, "sudo ls"}
-              , {four,  "sudo ls"}
-              , {three, "sudo ls"}
-            ] }
-        , {ssh_username, "yow"}
-        , {cluster,
-            [ {aaaa, [ {"10.198.55.12" , "" }
-                     , {"10.198.55.13" , "" }
-                     ] }
-            , {bbbb, [ {"10.198.55.151", "" }
-                     , {"10.198.55.123", "" }
-                     , {"10.198.55.34" , "" }
-                     , {"10.198.55.85" , "" }
-                     , {"10.198.55.67" , "" }
-                     ] }
-            , {cccc, [ {"10.198.55.68" , "" }
-                     , {"10.198.55.69" , "" }
-                     ] }
-            ] }
-]
-}.
-
-
-%% this used to result in a scan-sexp error
-[{
-}].
-
-%% this used to result in 2x the correct indentation within the function
-%% body, due to the function name being mistaken for a keyword
-catcher(N) ->
-try generate_exception(N) of
-Val -> {N, normal, Val}
-catch
-throw:X -> {N, caught, thrown, X};
-exit:X -> {N, caught, exited, X};
-error:X -> {N, caught, error, X}
-end.
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 801bbc7461..bf5faa165d 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -2456,7 +2456,9 @@ do_analyse_to_file1(Module, OutFile, ErlFile, HTML) ->
 
 		    Pattern = {#bump{module=Module,line='$1',_='_'},'$2'},
 		    MS = [{Pattern,[{is_integer,'$1'},{'>','$1',0}],[{{'$1','$2'}}]}],
-		    CovLines = lists:keysort(1,ets:select(?COLLECTION_TABLE, MS)),
+                    CovLines0 =
+                        lists:keysort(1, ets:select(?COLLECTION_TABLE, MS)),
+                    CovLines = merge_dup_lines(CovLines0),
 		    print_lines(Module, CovLines, InFd, OutFd, 1, HTML),
 		    
 		    if HTML ->
@@ -2477,19 +2479,23 @@ do_analyse_to_file1(Module, OutFile, ErlFile, HTML) ->
 	    {error, {file, ErlFile, Reason}}
     end.
 
+merge_dup_lines(CovLines) ->
+    merge_dup_lines(CovLines, []).
+merge_dup_lines([{L, N}|T], [{L, NAcc}|TAcc]) ->
+    merge_dup_lines(T, [{L, NAcc + N}|TAcc]);
+merge_dup_lines([{L, N}|T], Acc) ->
+    merge_dup_lines(T, [{L, N}|Acc]);
+merge_dup_lines([], Acc) ->
+    lists:reverse(Acc).
 
 print_lines(Module, CovLines, InFd, OutFd, L, HTML) ->
     case file:read_line(InFd) of
 	eof ->
 	    ignore;
-	{ok,"%"++_=Line} ->		 %Comment line - not executed.
-	    ok = file:write(OutFd, [tab(),escape_lt_and_gt(Line, HTML)]),
-	    print_lines(Module, CovLines, InFd, OutFd, L+1, HTML);
 	{ok,RawLine} ->
 	    Line = escape_lt_and_gt(RawLine,HTML),
 	    case CovLines of
 	       [{L,N}|CovLines1] ->
-		    %% N = lists:foldl(fun([Ni], Nacc) -> Nacc+Ni end, 0, Ns),
                     if N=:=0, HTML=:=true ->
                            LineNoNL = Line -- "\n",
                            Str = "     0",
@@ -2508,7 +2514,7 @@ print_lines(Module, CovLines, InFd, OutFd, L, HTML) ->
                            ok = file:write(OutFd, [Str,fill3(),Line])
                     end,
 		    print_lines(Module, CovLines1, InFd, OutFd, L+1, HTML);
-		_ ->
+		_ ->                            %Including comment lines
 		    ok = file:write(OutFd, [tab(),Line]),
 		    print_lines(Module, CovLines, InFd, OutFd, L+1, HTML)
 	    end
diff --git a/lib/tools/src/fprof.erl b/lib/tools/src/fprof.erl
index fb657c2928..a3b4bfdddf 100644
--- a/lib/tools/src/fprof.erl
+++ b/lib/tools/src/fprof.erl
@@ -1242,8 +1242,7 @@ spawn_3step(Spawn, FunPrelude, FunAck, FunBody)
 		    catch Child ! {Parent, Ref, Go},
 		    Result
 	    catch
-		Class:Reason ->
-		    Stacktrace = erlang:get_stacktrace(),
+		Class:Reason:Stacktrace ->
 		    catch exit(Child, kill),
 		    erlang:raise(Class, Reason, Stacktrace)
 	    end;
diff --git a/lib/tools/src/lcnt.erl b/lib/tools/src/lcnt.erl
index 139b3d8a4a..d0152a4915 100644
--- a/lib/tools/src/lcnt.erl
+++ b/lib/tools/src/lcnt.erl
@@ -218,9 +218,11 @@ raw()                -> call(raw).
 set(Option, Value)   -> call({set, Option, Value}).
 set({Option, Value}) -> call({set, Option, Value}).
 save(Filename)       -> call({save, Filename}).
-load(Filename)       -> ok = start_internal(), call({load, Filename}).
+load(Filename)       -> call({load, Filename}).
 
-call(Msg) -> gen_server:call(?MODULE, Msg, infinity).
+call(Msg) ->
+    ok = start_internal(),
+    gen_server:call(?MODULE, Msg, infinity).
 
 %% -------------------------------------------------------------------- %%
 %%
@@ -237,7 +239,6 @@ apply(Fun) when is_function(Fun) ->
     lcnt:apply(Fun, []).
 
 apply(Fun, As) when is_function(Fun) ->
-    ok = start_internal(),
     Opt = lcnt:rt_opt({copy_save, true}),
     lcnt:clear(),
     Res = erlang:apply(Fun, As),
@@ -943,7 +944,7 @@ print_state_information(#state{locks = Locks} = State) ->
     print(kv("#tries",          s(Stats#stats.tries))),
     print(kv("#colls",          s(Stats#stats.colls))),
     print(kv("wait time",       s(Stats#stats.time) ++ " us" ++ " ( " ++ s(Stats#stats.time/1000000) ++ " s)")),
-    print(kv("percent of duration", s(Stats#stats.time/State#state.duration*100) ++ " %")),
+    print(kv("percent of duration", s(percent(Stats#stats.time, State#state.duration)) ++ " %")),
     ok.
 
 
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 90e113c178..161b0105b9 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2001-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.
@@ -35,7 +35,7 @@ all() ->
                  distribution, reconnect, die_and_reconnect,
                  dont_reconnect_after_stop, stop_node_after_disconnect,
                  export_import, otp_5031, otp_6115,
-                 otp_8270, otp_10979_hanging_node],
+                 otp_8270, otp_10979_hanging_node, otp_14817],
     case whereis(cover_server) of
         undefined ->
             [coverage,StartStop ++ NoStartStop];
@@ -1574,6 +1574,30 @@ otp_10979_hanging_node(_Config) ->
 
     ok.
 
+otp_14817(Config) when is_list(Config) ->
+    Test = <<"-module(otp_14817).
+              -export([a/0, b/0, c/0, d/0]).
+              a() -> ok. b() -> ok. c() -> ok.
+              d() -> ok.
+             ">>,
+    File = cc_mod(otp_14817, Test, Config),
+    ok = otp_14817:a(),
+    ok = otp_14817:b(),
+    ok = otp_14817:c(),
+    ok = otp_14817:d(),
+    {ok,[{{otp_14817,3},1},
+         {{otp_14817,3},1},
+         {{otp_14817,3},1},
+         {{otp_14817,4},1}]} =
+        cover:analyse(otp_14817, calls, line),
+    {ok, CovOut} = cover:analyse_to_file(otp_14817),
+    {ok, Bin} = file:read_file(CovOut),
+    <<"3..|",_/binary>> = string:find(Bin, "3..|"),
+    <<"1..|",_/binary>> = string:find(Bin, "1..|"),
+    ok = file:delete(File),
+    ok = file:delete(CovOut),
+    ok.
+
 %% Take compiler options from beam in cover:compile_beam
 compile_beam_opts(Config) when is_list(Config) ->
     {ok, Cwd} = file:get_cwd(),
diff --git a/lib/tools/test/emacs_SUITE.erl b/lib/tools/test/emacs_SUITE.erl
index 77a8813db5..f4e78da667 100644
--- a/lib/tools/test/emacs_SUITE.erl
+++ b/lib/tools/test/emacs_SUITE.erl
@@ -23,10 +23,10 @@
 
 -export([all/0, init_per_testcase/2, end_per_testcase/2]).
 
--export([bif_highlight/1]).
+-export([bif_highlight/1, indent/1]).
 
-all() -> 
-    [bif_highlight].
+all() ->
+    [bif_highlight, indent].
 
 init_per_testcase(_Case, Config) ->
     ErlangEl = filename:join([code:lib_dir(tools),"emacs","erlang.el"]),
@@ -74,4 +74,69 @@ check_bif_highlight(Bin, Tag, Compare) ->
     [] = Compare -- EmacsIntBifs,
     [] = EmacsIntBifs -- Compare.
     
-    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+indent(Config) ->
+    case emacs_version_ok() of
+        false -> {skip, "Old or no emacs found"};
+        true ->
+            Def = filename:dirname(code:which(?MODULE)) ++ "/" ++ ?MODULE_STRING ++ "_data",
+            Dir = proplists:get_value(data_dir, Config, Def),
+            OrigFs = filelib:wildcard(Dir ++ "/*"),
+            io:format("Dir: ~s~nFs: ~p~n", [Dir, OrigFs]),
+            Fs = [{File, unindent(File)} || File <- OrigFs,
+                                            filename:extension(File) =:= ""],
+            Indent = fun emacs/1,
+            [Indent(File) || {_, File} <- Fs],
+            Res = [diff(Orig, File) || {Orig, File} <- Fs],
+            [file:delete(File) || {ok, File} <- Res],       %% Cleanup
+            [] = [Fail || {fail, Fail} <- Res],
+            ok
+    end.
+
+unindent(Input) ->
+    Output = Input ++ ".erl",
+    {ok, Bin} = file:read_file(Input),
+    Lines0 = string:split(Bin, "\n", all),
+    Lines = [string:trim(Line, leading, [$\s,$\t]) || Line <- Lines0],
+    %% io:format("File: ~s lines: ~w~n", [Input, length(Lines0)]),
+    %% [io:format("~s~n", [L]) || L <- Lines],
+    ok = file:write_file(Output, lists:join("\n", Lines)),
+    Output.
+
+diff(Orig, File) ->
+    case os:cmd(["diff ", Orig, " ", File]) of
+        "" -> {ok, File};
+        Diff ->
+            io:format("Fail: ~s vs ~s~n~s~n~n",[Orig, File, Diff]),
+            {fail, File}
+    end.
+
+emacs_version_ok() ->
+    case os:cmd("emacs --version | head -1") of
+        "GNU Emacs " ++ Ver ->
+            case string:to_float(Ver) of
+                {Vsn, _} when Vsn >= 24.1 ->
+                    true;
+                _ ->
+                    io:format("Emacs version fail~n~s~n~n",[Ver]),
+                    false
+            end;
+        Res ->
+            io:format("Emacs version fail~n~s~n~n",[Res]),
+            false
+    end.
+
+emacs(File) ->
+    EmacsErlDir = filename:join([code:lib_dir(tools), "emacs"]),
+    Cmd = ["emacs ",
+           "--batch --quick ",
+           "--directory ", EmacsErlDir, " ",
+           "--eval \"(require 'erlang-start)\" ",
+           File, " ",
+           "--eval '(indent-region (point-min) (point-max) nil)' ",
+           "--eval '(save-buffer 0)'"
+          ],
+    _Res = os:cmd(Cmd),
+    % io:format("cmd ~s:~n=> ~s~n", [Cmd, _Res]),
+    ok.
diff --git a/lib/tools/test/emacs_SUITE_data/comments b/lib/tools/test/emacs_SUITE_data/comments
new file mode 100644
index 0000000000..ff974ca295
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/comments
@@ -0,0 +1,25 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% 3 comment chars: always left indented
+%%% 2 comment chars: Context indented
+%%% 1 comment char: Rigth indented
+
+%%% left
+%% context dependent
+                                                % rigth
+
+func() ->
+%%% left
+    %% context dependent
+                                                % right indented
+    case get(foo) of
+        undefined ->
+            %% Testing indention
+            ok;
+        %% Catch all
+        Other ->
+            Other
+    end,
+    ok.
+
diff --git a/lib/tools/test/emacs_SUITE_data/comprehensions b/lib/tools/test/emacs_SUITE_data/comprehensions
new file mode 100644
index 0000000000..45279850a5
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/comprehensions
@@ -0,0 +1,47 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% indentation of comprehensions
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+list() ->
+    %% I don't have a good idea how we want to handle this
+    %% but they are here to show how they are indented today.
+    Result1 = [X ||
+                  #record{a=X} <- lists:seq(1, 10),
+                  true = (X rem 2)
+              ],
+    Result2 = [X || <<X:32,_:32>> <= <<0:512>>,
+                    true = (X rem 2)
+              ],
+    Res = [ func(X,
+                 arg2)
+            ||
+              #record{a=X} <- lists:seq(1, 10),
+              true = (X rem 2)
+          ],
+    Result1.
+
+binary(B) ->
+    Binary1 = << <<X:8>> ||
+                  #record{a=X} <- lists:seq(1, 10),
+                  true = (X rem 2)
+              >>,
+
+    Binary2 = << <<X:8>> || <<X:32,_:32>> <= <<0:512>>,
+                            true = (X rem 2)
+              >>,
+
+    Bin3 = <<
+             <<
+               X:8,
+               34:8
+             >>
+             || <<X:32,_:32>> <= <<0:512>>,
+                true = (X rem 2)
+           >>,
+    ok.
diff --git a/lib/tools/test/emacs_SUITE_data/funcs b/lib/tools/test/emacs_SUITE_data/funcs
new file mode 100644
index 0000000000..877f982005
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/funcs
@@ -0,0 +1,174 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Function (and funs) indentation
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+-export([
+         func1/0,
+         func2/0,
+         a_function_with_a_very_very_long_name/0,
+         when1/2
+        ]).
+
+-compile([nowarn_unused_functions,
+          {inline, [
+                    func2/2,
+                    func3/2
+                   ]
+          }
+         ]).
+
+func1() ->
+    basic.
+
+func2(A1,
+      A2) ->
+    ok.
+
+func3(
+  A1,
+  A2
+ ) ->
+    ok.
+
+%% Okeefe style
+func4(A1
+     ,A2
+     ,A3
+     ) ->
+    ok.
+
+func5(
+  A41
+ ,A42) ->
+    ok.
+
+a_function_with_a_very_very_long_name() ->
+    A00 = #record{
+             field1=1,
+             field2=1
+            },
+    A00.
+
+when1(W1, W2)
+  when is_number(W1),
+       is_number(W2) ->
+    ok.
+
+when2(W1,W2,W3) when
+      W1 > W2,
+      W2 > W3 ->
+    ok.
+
+when3(W1,W2,W3) when
+      W1 > W2,
+      W2 > W3
+      ->
+    ok.
+
+when4(W1,W2,W3)
+  when
+      W1 > W2,
+      W2 > W3 ->
+    ok.
+
+match1({[H|T],
+        Other},
+       M1A2) ->
+    ok.
+
+match2(
+  {
+   [H|T],
+   Other
+  },
+  M2A2
+ ) ->
+    ok.
+
+match3({
+        M3A1,
+        [
+         H |
+         T
+        ],
+        Other
+       },
+       M3A2
+      ) ->
+    ok.
+
+match4(<<
+         M4A:8,
+         M4B:16/unsigned-integer,
+         _/binary
+       >>,
+       M4C) ->
+    ok.
+
+match5(M5A,
+       #record{
+          b=M5B,
+          c=M5C
+         }
+      ) ->
+    ok.
+
+match6(M6A,
+       #{key6a := a6,
+         key6b := b6
+        }) ->
+    ok.
+
+funs(1)
+  when
+      X ->
+    %% Changed fun to one indention level
+    %% 'when' and several clause forces a depth of '4'
+    Var = spawn(fun(X, _)
+                      when X == 2;
+                           X > 10 ->
+                        hello,
+                        case Hello() of
+                            true when is_atom(X) ->
+                                foo;
+                            false ->
+                                bar
+                        end;
+                   (Foo) when is_atom(Foo),
+                              is_integer(X) ->
+                        X = 6 * 45,
+                        Y = true andalso
+                            kalle
+                end),
+    Var;
+funs(2) ->
+    %% check EEP37 named funs
+    Fn1 = fun
+              Factory(N) when
+                    N > 0 ->
+                  F = Fact(N-1),
+                  N * F;
+              Factory(0) ->
+                  1
+          end,
+    Fn1;
+funs(3) ->
+    %% check anonymous funs too
+    Fn2 = fun(0) ->
+                  1;
+             (N) ->
+                  N
+          end,
+    ok;
+funs(4) ->
+    X = lists:foldr(fun(M) ->
+                            <<M/binary, " ">>
+                    end, [], Z),
+    A = <<X/binary, 0:8>>,
+    A.
diff --git a/lib/tools/test/emacs_SUITE_data/highlight b/lib/tools/test/emacs_SUITE_data/highlight
new file mode 100644
index 0000000000..0719f6516a
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/highlight
@@ -0,0 +1,78 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Open this file in your editor and manually check the colors of
+%%% different types and calls and builtin words
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+
+highlighting(X)			  % Function definitions should be highlighted
+  when is_integer(X) ->	          % and so should `when' and `is_integer' be
+    %% Highlighting
+    %% Various characters (we keep an `atom' after to see that highlighting ends)
+    $a,atom,			  % Characters should be marked
+    "string",atom,		  % and strings
+    'asdasd',atom,		  % quote should be atoms??
+    'VaV',atom,
+    'aVa',atom,
+    '\'atom',atom,
+    'atom\'',atom,
+    'at\'om',atom,
+    '#1',atom,
+
+    $", atom,					% atom should be ok
+    $', atom,
+
+    "string$", atom,  "string$", atom,  		% currently buggy I know...
+    "string\$", atom,   				% workaround for bug above
+
+    "char $in string", atom,
+
+    'atom$', atom,  'atom$', atom,
+    'atom\$', atom,
+
+    'char $in atom', atom,
+
+    $[, ${, $\\, atom,
+    ?MACRO_1,
+    ?MACRO_2(foo),
+
+    %% Numerical constants
+    16#DD,					% Should not be highlighted
+    32#dd,					% Should not be highlighted
+    32#ddAB,				        % Should not be highlighted
+    32#101,				        % Should not be highlighted
+    32#ABTR,				        % Should not be highlighted
+
+    %% Variables
+    Variables = lists:foo(),
+    _Variables = lists:foo(),
+    AppSpec = Xyz/2,
+    Module42 = Xyz(foo, bar),
+    Module:foo(),
+    _Module:foo(),				%
+    FooÅÅ = lists:reverse([tl,hd,tl,hd]),	%  Should highlight FooÅÅ
+    _FooÅÅ = 42,				%  Should highlight _FooÅÅ
+
+    %% Bifs
+    erlang:registered(),
+    registered(),
+    hd(tl(tl(hd([a,b,c])))),
+    erlang:anything(lists),
+    %% Guards
+    is_atom(foo), is_float(2.3), is_integer(32), is_number(4323.3),
+    is_function(Fun), is_pid(self()),
+    not_a_guard:is_list([]),
+    %% Other Types
+
+    atom,			  % not (currently) hightlighted
+    234234,
+    234.43,
+
+    [list, are, not, higlighted],
+    {nor, is, tuple},
+    ok.
diff --git a/lib/tools/test/emacs_SUITE_data/icr b/lib/tools/test/emacs_SUITE_data/icr
new file mode 100644
index 0000000000..8445c1a74d
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/icr
@@ -0,0 +1,157 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% indentation of if case receive statements
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+indent_if(1, Z) ->
+    %% If
+    if Z >= 0 ->
+            X = 43 div Z,
+            X;
+       Z =< 10 ->
+            X = 43 div Z,
+            X;
+       Z == 5 orelse
+       Z == 7 ->
+            X = 43 div Z,
+            X;
+       is_number(Z),
+       Z < 32 ->
+            Z;
+       is_number(Z);
+       Z < 32 ->
+            Z * 32;
+       true ->
+            if_works
+    end;
+indent_if(2, Z) ->
+    %% If
+    if
+        Z >= 0 ->
+            X = 43 div Z,
+            X
+      ; Z =< 10 ->
+            43 div Z
+      ; Z == 5 orelse
+        Z == 7 ->
+            X = 43 div Z,
+            X
+      ; is_number(Z),
+        Z < 32 ->
+            Z
+      ; true ->
+            if_works
+    end.
+
+indent_case(1, Z) ->
+    %% Case
+    case {Z, foo, bar} of
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X);
+        {Z,_,_}	when
+              Z =:= 42 ->                       % line should be indented as a when
+            X = 43 div 4,
+            foo(X);
+        {Z,_,_}
+          when   Z < 10 orelse
+                 Z =:= foo ->			% Binary op alignment here !!!
+            X = 43 div 4,
+            Bool = Z < 5 orelse                 % Binary op args align differently after when
+                Z =:= foo,                      % and elsewhere ???
+            foo(X);
+        {Z,_,_}
+          when					% when should be indented
+              Z < 10				% and the guards should follow when
+              andalso				% unsure about how though
+              true ->
+            X = 43 div 4,
+            foo(X)
+    end;
+indent_case(2, Z) ->
+    %% Case
+    case {Z, foo, bar} of
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X)
+      ; {Z,_,_}	when
+              Z =:= 42 ->                       % line should be indented as a when
+            X = 43 div 4,
+            foo(X)
+      ; {Z,_,_}
+          when Z < 10 ->			% when should be indented
+            X = 43 div 4,
+            foo(X)
+      ; {Z,_,_}
+          when					% when should be indented
+              Z < 10				% and the guards should follow when
+              andalso				% unsure about how though
+              true ->
+            X = 43 div 4,
+            foo(X)
+    end.
+
+indent_begin(Z) ->
+    %% Begin
+    begin
+        sune,
+        Z = 74234 +
+            foo(8456) +
+            345 div 43,
+        Foo = begin
+                  ok,
+                  foo(234),
+                  begin
+                      io:format("Down here\n")
+                  end
+              end,
+        {Foo,
+         bar}
+    end.
+
+indent_receive(1) ->
+    %% receive
+    receive
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X)
+      ; Z ->
+            X = 43 div 4,
+            foo(X)
+    end,
+    ok;
+indent_receive(2) ->
+    receive
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X);
+        Z 					% added clause
+          when Z =:= 1 ->			% This line should be indented by 2
+            X = 43 div 4,
+            foo(X);
+        Z when					% added clause
+              Z =:= 2 ->			% This line should be indented by 2
+            X = 43 div 4,
+            foo(X);
+        Z ->
+            X = 43 div 4,
+            foo(X)
+    after infinity ->
+            foo(X),
+            asd(X),
+            5*43
+    end,
+    ok;
+indent_receive() ->
+    receive
+    after 10 ->
+            foo(X),
+            asd(X),
+            5*43
+    end,
+    ok.
diff --git a/lib/tools/test/emacs_SUITE_data/macros b/lib/tools/test/emacs_SUITE_data/macros
new file mode 100644
index 0000000000..6c874e9187
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/macros
@@ -0,0 +1,31 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Macros should be indented as code
+
+-define(M0, ok).
+
+-define(M1,
+        case X of
+            undefined -> error;
+            _ -> ok
+        end).
+
+-define(M2(M2A1,
+           M2A2),
+        func(M2A1,
+             M2A2)
+       ).
+
+-define(
+   M3,
+   undefined
+  ).
+
+-ifdef(DEBUG).
+-define(LOG,
+        logger:log(?MODULE,?LINE)
+       ).
+-else().
+-define(LOG, ok).
+-endif().
diff --git a/lib/tools/test/emacs_SUITE_data/records b/lib/tools/test/emacs_SUITE_data/records
new file mode 100644
index 0000000000..241582718c
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/records
@@ -0,0 +1,35 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%% Test that records are indented correctly
+
+-record(record0,
+        {
+         r0a,
+         r0b,
+         r0c
+        }).
+
+-record(record1, {r1a,
+                  r1b,
+                  r1c
+                 }).
+
+-record(record2, {
+                  r2a,
+                  r2b
+                 }).
+
+-record(record3, {r3a = 8#42423 bor
+                      8#4234,
+                  r3b = 8#5432
+                      bor 2#1010101,
+                  r3c = 123 +
+                      234,
+                  r3d}).
+
+-record(record5,
+        { r5a = 1 :: integer()
+        , r5b = foobar :: atom()
+        }).
+
diff --git a/lib/tools/test/emacs_SUITE_data/terms b/lib/tools/test/emacs_SUITE_data/terms
new file mode 100644
index 0000000000..352364a73c
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/terms
@@ -0,0 +1,174 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% indentation of terms contain builtin types
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+
+list(1) ->
+    [a,
+     b,
+     c
+    ];
+list(2) ->
+    [ a,
+      b, c
+    ];
+list(3) ->
+    [
+     a,
+     b, c
+    ];
+list(4) ->
+    [ a
+    , b
+    , c
+    ].
+
+tuple(1) ->
+    {a,
+     b,c
+    };
+tuple(2) ->
+    { a,
+      b,c
+    };
+tuple(3) ->
+    {
+     a,
+     b,c
+    };
+tuple(4) ->
+    { a
+    , b
+    ,c
+    }.
+
+binary(1) ->
+    <<1:8,
+      2:8
+    >>;
+binary(2) ->
+    <<
+      1:8,
+      2:8
+    >>;
+binary(3) ->
+    << 1:8,
+       2:8
+    >>;
+binary(4) ->
+    <<
+      1:8
+     ,2:8
+    >>;
+binary(5) ->
+    << 1:8
+     , 2:8
+    >>.
+
+record(1) ->
+    #record{a=1,
+            b=2
+           };
+record(2) ->
+    #record{ a=1,
+             b=2
+           };
+record(3) ->
+    #record{
+       a=1,
+       b=2
+      };
+record(4) ->
+    #record{
+       a=1
+      ,b=2
+      };
+record(Record) ->
+    Record#record{
+      a=1
+     ,b=2
+     }.
+
+map(1) ->
+    #{a=>1,
+      b=>2
+     };
+map(2) ->
+    #{ a=>1,
+       b=>2
+     };
+map(3) ->
+    #{
+      a=>1,
+      b=>2
+     };
+map(4) ->
+    #{
+      a => <<"a">>
+     ,b => 2
+     };
+map(MapVar) ->
+    MapVar = #{a :=<<"a">>
+              ,b:=1}.
+
+deep(Rec) ->
+    Rec#rec{ atom = 'atom',
+             map = #{ k1 => {v,
+                             1},
+                      k2 => [
+                             1,
+                             2,
+                             3
+                            ],
+                      {key,
+                       3}
+                      =>
+                          <<
+                            123:8,
+                            255:8
+                          >>
+                    }
+           }.
+
+%% Record indentation
+some_function_with_a_very_long_name() ->
+    #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+       field1=a,
+       field2=b},
+    case dummy_function_with_a_very_very_long_name(x) of
+        #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+           field1=a,
+           field2=b} ->
+            ok;
+        Var = #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+                 field1=a,
+                 field2=b} ->
+            Var#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+              field1=a,
+              field2=b};
+        #xyz{
+           a=1,
+           b=2} ->
+            ok
+    end.
+
+some_function_name_xyz(xyzzy, #some_record{
+                                 field1=Field1,
+                                 field2=Field2}) ->
+    SomeVariable = f(#'Some-long-record-name'{
+                        field_a = 1,
+                        'inter-xyz-parameters' =
+                            #'Some-other-very-long-record-name'{
+                               field2 = Field1,
+                               field2 = Field2}}),
+    {ok, SomeVariable}.
+
+foo() ->
+    [#foo{
+        foo = foo}].
diff --git a/lib/tools/test/emacs_SUITE_data/try_catch b/lib/tools/test/emacs_SUITE_data/try_catch
new file mode 100644
index 0000000000..0005b2003a
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/try_catch
@@ -0,0 +1,166 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Try and catch indentation is hard
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+try_catch() ->
+    try
+        io:format(stdout, "Parsing file ~s, ",
+                  [St0#leex.xfile]),
+        {ok,Line3,REAs,Actions,St3} =
+            parse_rules(Xfile, Line2, Macs, St2)
+    catch
+        exit:{badarg,R} ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R);
+        error:R
+          when R =:= 42 ->			% when should be indented
+            foo(R);
+        error:R
+          when					% when should be indented
+              R =:= 42 ->			% but unsure about this (maybe 2 more)
+            foo(R);
+        error:R when
+              R =:= foo ->			% line should be 2 indented (works)
+            foo(R);
+        error:R ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R)
+    after
+        foo('after'),
+        file:close(Xfile)
+    end;
+try_catch() ->
+    try
+        foo(bar)
+    of
+        X when true andalso
+               kalle ->
+            io:format(stdout, "Parsing file ~s, ",
+                      [St0#leex.xfile]),
+            {ok,Line3,REAs,Actions,St3} =
+                parse_rules(Xfile, Line2, Macs, St2);
+        X
+          when false andalso			% when should be 2 indented
+               bengt ->
+            gurka();
+        X when
+              false andalso			% line should be 2 indented
+              not bengt ->
+            gurka();
+        X ->
+            io:format(stdout, "Parsing file ~s, ",
+                      [St0#leex.xfile]),
+            {ok,Line3,REAs,Actions,St3} =
+                parse_rules(Xfile, Line2, Macs, St2)
+    catch
+        exit:{badarg,R} ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R);
+        error:R ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R)
+    after
+        foo('after'),
+        file:close(Xfile),
+        bar(with_long_arg,
+            with_second_arg)
+    end;
+try_catch() ->
+    try foo()
+    after
+        foo(),
+        bar(with_long_arg,
+            with_second_arg)
+    end.
+
+indent_catch() ->
+    D = B +
+        float(43.1),
+
+    B = catch oskar(X),
+
+    A = catch (baz +
+                   bax),
+    catch foo(),
+
+    C = catch B +
+        float(43.1),
+
+    case catch foo(X) of
+        A ->
+            B
+    end,
+
+    case
+        catch foo(X)
+    of
+        A ->
+            B
+    end,
+
+    case
+        foo(X)
+    of
+        A ->
+            catch B,
+            X
+    end,
+
+    try sune of
+        _ -> foo
+    catch _:_ -> baf
+    end,
+
+    Variable = try
+                   sune
+               of
+                   _ ->
+                       X = 5,
+                       (catch foo(X)),
+                       X + 10
+               catch _:_ -> baf
+               after cleanup()
+               end,
+
+    try
+        (catch sune)
+    of
+        _ ->
+            foo1(),
+    catch foo()  %% BUGBUG can't handle catch inside try without parentheses
+    catch _:_ ->
+            baf
+    end,
+
+    try
+        (catch exit())
+    catch
+        _ ->
+            catch baf()
+    end,
+    ok.
+
+%% this used to result in 2x the correct indentation within the function
+%% body, due to the function name being mistaken for a keyword
+catcher(N) ->
+    try generate_exception(N) of
+        Val -> {N, normal, Val}
+    catch
+        throw:X -> {N, caught, thrown, X};
+        exit:X -> {N, caught, exited, X};
+        error:X -> {N, caught, error, X}
+    end.
diff --git a/lib/tools/test/emacs_SUITE_data/type_specs b/lib/tools/test/emacs_SUITE_data/type_specs
new file mode 100644
index 0000000000..e71841cc7a
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/type_specs
@@ -0,0 +1,110 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%% Tests how types and specs are indented (also that the editor can parse them)
+%% May need improvements
+
+
+-type ann() :: Var :: integer().
+-type ann2() ::
+        'return'
+      | 'return_white_spaces'
+      | 'return_comments'
+      | 'text' | ann().
+-type paren() ::
+        (ann2()).
+
+-type t6() ::
+        1 | 2 | 3 |
+        'foo'
+      | 'bar'.
+
+-type t8() :: {any(),none(),pid(),port(),
+               reference(),float()}.
+
+-type t14() :: [erl_scan:foo() |
+                %% Should be highlighted
+                term() |
+                boolean() |
+                byte() |
+                char() |
+                non_neg_integer() | nonempty_list() |
+                pos_integer() |
+                neg_integer() |
+                number() |
+                list() |
+                nonempty_improper_list() | nonempty_maybe_improper_list() |
+                maybe_improper_list() | string() | iolist() | byte() |
+                module() |
+                mfa()   |
+                node()  |
+                timeout() |
+                no_return() |
+                %% Should not be highlighted
+                nonempty_() | nonlist() |
+                erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)].
+
+-type t15() :: {binary(),<<>>,<<_:34>>,<<_:_*42>>,
+                <<_:3,_:_*14>>,<<>>} | [<<>>|<<_:34>>|<<_:16>>|
+                                        <<_:3,_:_*1472>>|<<_:19,_:_*14>>| <<_:34>>|
+                                        <<_:34>>|<<_:34>>|<<_:34>>].
+
+-type t18() ::
+        fun(() -> t17() | t16()).
+-type t19() ::
+        fun((t18()) -> t16()) |
+        fun((nonempty_maybe_improper_list('integer', any())|
+             1|2|3|a|b|<<_:3,_:_*14>>|integer())
+            ->
+                   nonempty_maybe_improper_list('integer', any())|   %% left to col 16?
+                   1|2|3|a|b|<<_:3,_:_*14>>|integer()).              %% left to col 16?
+-type t20() :: [t19(), ...].
+-type t25() :: #rec3{f123 :: [t24() |
+                              1|2|3|4|a|b|c|d|
+                              nonempty_maybe_improper_list(integer, any())]}.
+-type t26() :: #rec4{ a :: integer()
+                    , b :: any()
+                    }.
+
+%% Spec
+
+-spec t1(FooBar :: t99()) -> t99();
+        (t2()) -> t2();
+        (t4()) -> t4() when is_subtype(t4(), t24);
+        (t23()) -> t23() when is_subtype(t23(), atom()),
+                              is_subtype(t23(), t14());
+        (t24()) -> t24() when is_subtype(t24(), atom()),
+                              is_subtype(t24(), t14()),
+                              is_subtype(t24(), t4()).
+
+-spec over(I :: integer()) -> R1 :: foo:typen();
+          (A :: atom()) -> R2 :: foo:atomen();
+          (T :: tuple()) -> R3 :: bar:typen().
+
+-spec mod:t2() -> any().
+
+-spec handle_cast(Cast :: {'exchange', node(), [[name(),...]]}
+                        | {'del_member', name(), pid()},
+                  #state{}) -> {'noreply', #state{}}.
+
+-spec handle_cast(Cast ::
+                    {'exchange', node(), [[name(),...]]}
+                  | {'del_member', name(), pid()},
+                  #state{}) ->
+                         {'noreply', #state{}}. %% left to col 10?
+
+-spec all(fun((T) -> boolean()), List :: [T]) ->
+                 boolean() when is_subtype(T, term()). % (*)
+
+-spec get_closest_pid(term()) ->
+                             Return :: pid()  %% left to col 10?
+                                     | {'error', {'no_process', term()}} %% left to col 10?
+                                     | {'no_such_group', term()}. %% left to col 10?
+
+-spec add( X :: integer()
+         , Y :: integer()
+         ) -> integer().
+
+-opaque attributes_data() ::
+          [{'column', column()} | {'line', info_line()} |
+           {'text', string()}] |  {line(),column()}.
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index 8fd164a4b3..ae0e7253ad 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -51,7 +51,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,60}}].
+     {timetrap,{seconds,240}}].
 
 all() -> 
     case test_server:is_native(fprof_SUITE) of
@@ -571,7 +571,7 @@ seq_r(Start, Stop, Succ, R) ->
 
 create_file_slow(Name, N) when is_integer(N), N >= 0 ->
     {ok, FD} = 
-    file:open(Name, [raw, write, delayed_write, binary]),
+    file:open(Name, [raw, write, binary]),
     if N > 256 ->
            ok = file:write(FD,
                            lists:map(fun (X) -> <<X:32/unsigned>> end,
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index 146c915087..a79572a742 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -30,6 +30,8 @@
          t_conflicts/1,
          t_locations/1,
          t_swap_keys/1,
+         t_implicit_start/1,
+         t_crash_before_collect/1,
          smoke_lcnt/1]).
 
 init_per_testcase(_Case, Config) ->
@@ -44,8 +46,8 @@ suite() ->
      {timetrap,{minutes,4}}].
 
 all() ->
-    [t_load, t_conflicts, t_locations, t_swap_keys,
-     smoke_lcnt].
+    [t_load, t_conflicts, t_locations, t_swap_keys, t_implicit_start,
+     t_crash_before_collect, smoke_lcnt].
 
 %%----------------------------------------------------------------------
 %% Tests
@@ -149,6 +151,15 @@ t_swap_keys_file([File|Files]) ->
     ok = lcnt:stop(),
     t_swap_keys_file(Files).
 
+%% Prior to OTP-14913 this would crash with 'noproc' as the lcnt server hadn't
+%% been started yet.
+t_implicit_start(Config) when is_list(Config) ->
+    ok = lcnt:conflicts().
+
+t_crash_before_collect(Config) when is_list(Config) ->
+    {ok, _} = lcnt:start(),
+    ok = lcnt:information().
+
 %% Simple smoke test of actual lock-counting, if running on
 %% a run-time with lock-counting enabled.
 smoke_lcnt(Config) ->
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index b9249ae45c..6cafbca6a7 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.11
+TOOLS_VSN = 2.11.1
diff --git a/lib/wx/api_gen/gen_util.erl b/lib/wx/api_gen/gen_util.erl
index 5e2f405498..3068a2f4ea 100644
--- a/lib/wx/api_gen/gen_util.erl
+++ b/lib/wx/api_gen/gen_util.erl
@@ -106,8 +106,8 @@ check_diff(Diff) ->
 	throw:_ ->  diff;
 	error:{badmatch,_} ->
 	    diff;
-	_:What ->
-	    io:format("~p:~p: ~p ~p~n", [?MODULE,?LINE, What, erlang:get_stacktrace()]),
+	_:What:Stacktrace ->
+	    io:format("~p:~p: ~p ~p~n", [?MODULE,?LINE, What, Stacktrace]),
 	    diff
     end.
 
diff --git a/lib/wx/api_gen/gl_gen.erl b/lib/wx/api_gen/gl_gen.erl
index 7e3766a43b..6f68517c16 100644
--- a/lib/wx/api_gen/gl_gen.erl
+++ b/lib/wx/api_gen/gl_gen.erl
@@ -47,9 +47,9 @@ safe(What, QuitOnErr) ->
 	What(),
 	io:format("Completed successfully~n~n", []),
 	QuitOnErr andalso gen_util:halt(0)
-    catch Err:Reason ->
+    catch Err:Reason:Stacktrace ->
 	    io:format("Error ~p: ~p:~p~n  ~p~n", 
-		      [get(current_func),Err,Reason,erlang:get_stacktrace()]),
+		      [get(current_func),Err,Reason,Stacktrace]),
 	    (catch gen_util:close()),
 	    timer:sleep(1999),
 	    QuitOnErr andalso gen_util:halt(1)
diff --git a/lib/wx/api_gen/gl_gen_erl.erl b/lib/wx/api_gen/gl_gen_erl.erl
index 45f5fd8f4c..7e673c2987 100644
--- a/lib/wx/api_gen/gl_gen_erl.erl
+++ b/lib/wx/api_gen/gl_gen_erl.erl
@@ -246,8 +246,8 @@ gen_types(Where) ->
 
 gen_export(F) ->
     try gen_export_1(F)
-    catch E:R ->
-	    io:format("Crash ~p:~p in ~p ~n",[E,R, erlang:get_stacktrace()]),
+    catch E:R:S ->
+	    io:format("Crash ~p:~p in ~p ~n",[E,R,S]),
 	    io:format("Func = ~p~n  ~p", [F, get(F)])
     end.
 
@@ -489,8 +489,8 @@ doc_return_types2(T, Ps) ->
 doc_arg_type(#arg{name=Name,type=T}) ->
     try
 	erl_arg_name(Name) ++ " :: " ++ doc_arg_type2(T)
-    catch _:Error ->
-	    io:format("Error spec: ~p ~p~n~p~n",[Name, Error, erlang:get_stacktrace()]),
+    catch _:Error:Stacktrace ->
+	    io:format("Error spec: ~p ~p~n~p~n",[Name, Error, Stacktrace]),
 	    exit(error)
     end.
 
diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl
index aadfe4b111..ab70a588ab 100644
--- a/lib/wx/api_gen/wx_gen.erl
+++ b/lib/wx/api_gen/wx_gen.erl
@@ -47,9 +47,9 @@ safe(What, QuitOnErr) ->
 	What(),
 	io:format("Completed successfully~n~n", []),
 	QuitOnErr andalso gen_util:halt(0)
-    catch Err:Reason ->
+    catch Err:Reason:Stacktrace ->
 	    io:format("Error in ~p ~p~n", [get(current_class),get(current_func)]),
-	    erlang:display({Err,Reason, erlang:get_stacktrace()}),
+	    erlang:display({Err,Reason,Stacktrace}),
 	    catch gen_util:close(),
 	    QuitOnErr andalso gen_util:halt(1)
     end.
diff --git a/lib/wx/c_src/wxe_ps_init.c b/lib/wx/c_src/wxe_ps_init.c
index e6b677d469..277f3ac25f 100644
--- a/lib/wx/c_src/wxe_ps_init.c
+++ b/lib/wx/c_src/wxe_ps_init.c
@@ -61,13 +61,20 @@ int is_packaged_app() {
 void * wxe_ps_init2() {
    NSAutoreleasePool *pool;
    ProcessSerialNumber psn;
-
+   size_t app_len = 127;
+   char app_title_buf[128];
+   char * app_title;
    // Setup and enable gui
    pool = [[NSAutoreleasePool alloc] init];
-   
+
    if( !is_packaged_app() ) {
       // Undocumented function (but no documented way of doing this exists)
-      char *app_title = getenv("WX_APP_TITLE");
+      int res = erl_drv_getenv("WX_APP_TITLE", app_title_buf, &app_len);
+      if (res >= 0) {
+          app_title = app_title_buf;
+      } else {
+          app_title = NULL;
+      }
       if(!GetCurrentProcess(&psn)) {
       	 CPSSetProcessName(&psn, app_title?app_title:"Erlang");
       }
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 599b5b64fd..69ea906ec0 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,6 +32,22 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 1.8.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    wx crashes in otp 20.1 if empty binaries was sent down as
+	    arguments.</p>
+          <p>
+	    Own Id: OTP-14688</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 1.8.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/examples/demo/ex_aui.erl b/lib/wx/examples/demo/ex_aui.erl
index d8fc0021f1..97805621ed 100644
--- a/lib/wx/examples/demo/ex_aui.erl
+++ b/lib/wx/examples/demo/ex_aui.erl
@@ -87,8 +87,7 @@ do_init(Config) ->
 	wxAuiManager:update(Manager),
 	process_flag(trap_exit, true),
 	{Panel, #state{parent=Panel, config=Config, aui=Manager}}
-    catch Class:Reason ->
-	    ST = erlang:get_stacktrace(),
+    catch Class:Reason:ST ->
 	    io:format("AUI Crashed ~p ~p~n",[Reason, ST]),
 	    wxAuiManager:unInit(Manager),
 	    wxAuiManager:destroy(Manager),
diff --git a/lib/wx/src/wx.erl b/lib/wx/src/wx.erl
index 34bf06cf46..6dd3c148db 100644
--- a/lib/wx/src/wx.erl
+++ b/lib/wx/src/wx.erl
@@ -183,7 +183,7 @@ batch(Fun) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try Fun()
     catch
-	error:W -> erlang:exit({W, erlang:get_stacktrace()});
+	error:W:S -> erlang:exit({W, S});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
     after
@@ -196,7 +196,7 @@ foreach(Fun, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:foreach(Fun, List)
     catch
-	error:W -> erlang:exit({W, erlang:get_stacktrace()});
+	error:W:S -> erlang:exit({W, S});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
     after
@@ -209,7 +209,7 @@ map(Fun, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:map(Fun, List)
     catch
-	error:W -> erlang:exit({W, erlang:get_stacktrace()});
+	error:W:S -> erlang:exit({W, S});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
     after
@@ -222,7 +222,7 @@ foldl(Fun, Acc, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:foldl(Fun, Acc, List)
     catch
-	error:W -> erlang:exit({W, erlang:get_stacktrace()});
+	error:W:S -> erlang:exit({W, S});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
     after
@@ -235,7 +235,7 @@ foldr(Fun, Acc, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:foldr(Fun, Acc, List)
     catch
-	error:W -> erlang:exit({W, erlang:get_stacktrace()});
+	error:W:S -> erlang:exit({W, S});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
     after
diff --git a/lib/wx/src/wxe_master.erl b/lib/wx/src/wxe_master.erl
index ce859b3eb3..a55917f0aa 100644
--- a/lib/wx/src/wxe_master.erl
+++ b/lib/wx/src/wxe_master.erl
@@ -122,16 +122,9 @@ init([SilentStart]) ->
 	    erlang:error(not_smp)
     end,
 
-    case os:type() of
-        {win32,_} ->  %% Needed for mingwm10.dll
-            Path = os:getenv("PATH"),
-            os:putenv("PATH", PrivDir ++ ";" ++ Path);
-        _ -> ok
-    end,
-
     case erl_ddll:load_driver(PrivDir,DriverName) of
 	ok -> ok;
-	{error, What} -> 
+	{error, What} ->
 	    wxe_util:opt_error_log(SilentStart,
                                    "WX Failed loading ~p@~p ~n",
                                    [DriverName,PrivDir]),
@@ -139,8 +132,8 @@ init([SilentStart]) ->
 	    erlang:error({load_driver,Str})
     end,
     process_flag(trap_exit, true),
-    DriverWithArgs = DriverName ++ " " ++ code:priv_dir(wx) ++ [0],
-    
+    DriverWithArgs = DriverName ++ " " ++ code:priv_dir(wx),
+
     try
 	Port = open_port({spawn, DriverWithArgs},[binary]),
 	wx_debug_info = ets:new(wx_debug_info, [named_table]),
diff --git a/lib/wx/src/wxe_server.erl b/lib/wx/src/wxe_server.erl
index 58fcaf8f23..d6d9dbd629 100644
--- a/lib/wx/src/wxe_server.erl
+++ b/lib/wx/src/wxe_server.erl
@@ -283,10 +283,10 @@ invoke_callback(Pid, Ev, Ref) ->
 				 Return -> exit({bad_return, Return})
 			     end
 		     end
-		 catch _:Reason ->
+		 catch _:Reason:Stacktrace ->
 			 wxEvent:skip(Ref),
 			 ?log("Callback fun crashed with {'EXIT, ~p, ~p}~n",
-			      [Reason, erlang:get_stacktrace()])
+			      [Reason, Stacktrace])
 		 end,
 		 wxe_util:cast(?WXE_CB_RETURN, <<>>)
 	 end,
@@ -299,9 +299,9 @@ invoke_callback_fun(Fun) ->
 	      Return = Fun(),
 	      true = is_binary(Return),
 	      Return
-	  catch _:Reason ->
+	  catch _:Reason:Stacktrace ->
 		  ?log("Callback fun crashed with {'EXIT, ~p, ~p}~n",
-		       [Reason, erlang:get_stacktrace()]),
+		       [Reason, Stacktrace]),
 		  <<>>
 	  end,
     wxe_util:cast(?WXE_CB_RETURN, Res).
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index 039fae322e..7da4529c98 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.8.2
+WX_VSN = 1.8.3
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 1162561225..f62a8dc53d 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.16</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.15</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 2e9c9061d9..ddff0c8894 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.15
+XMERL_VSN = 1.3.16
diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk
index 13b54645ad..23b4416963 100644
--- a/make/otp_release_targets.mk
+++ b/make/otp_release_targets.mk
@@ -94,6 +94,8 @@ $(HTMLDIR)/users_guide.html: $(XML_FILES)
 # ------------------------------------------------------------------------
 # The following targets just exist in the documentation directory
 # ------------------------------------------------------------------------
+.PHONY: xmllint
+
 ifneq ($(XML_FILES),)
 
 # ----------------------------------------------------
@@ -108,21 +110,38 @@ $(HTMLDIR)/$(APPLICATION).eix: $(XML_FILES) $(SPECS_FILES)
 	        -xinclude $(TOP_SPECS_PARAM)  \
 		-path $(DOCGEN)/priv/dtd \
 	        -path $(DOCGEN)/priv/dtd_html_entities \
-	        $(DOCGEN)/priv/xsl/db_eix.xsl book.xml >  $@ 
+	        $(DOCGEN)/priv/xsl/db_eix.xsl book.xml >  $@
 
 docs: $(HTMLDIR)/$(APPLICATION).eix
 
-xmllint: $(XML_FILES)
-	@echo "Running xmllint"
-	@BookFiles=`awk -F\" '/xi:include/ {print $$2}' book.xml`; \
-	for i in $$BookFiles; do \
-		if [ $$i = "notes.xml" ]; then \
-			echo Checking $$i; \
-			xmllint --noout --valid --nodefdtd --loaddtd --path $(DOCGEN)/priv/dtd:$(DOCGEN)/priv/dtd_html_entities $$i; \
-		else\
-			awk -F\" '/xi:include/ {print "echo Checking " $$2 ;print "xmllint --noout --valid --nodefdtd --loaddtd --path $(DOCGEN)/priv/dtd:$(DOCGEN)/priv/dtd_html_entities:$(XMLLINT_SRCDIRS) " $$2}' $$i |sh; \
-		fi \
-	done
+## Here awk is used to find all xi:include files in $(BOOK_FILES)
+## Then we look into all those files check for xi:includes
+BOOK_XI_INC_FILES:=$(foreach file,$(BOOK_FILES),$(shell awk -F\" '/xi:include/ {print $$2}' $(file))) $(BOOK_FILES)
+ALL_XI_INC_FILES:=$(foreach file,$(BOOK_XI_INC_FILES),$(shell awk -F\" '/xi:include/ {if ("$(dir $(file))" != "./") printf "$(dir $(file))"; print $$2}' $(file))) $(BOOK_XI_INC_FILES)
+
+## These are the patterns of file names that xmllint cannot currently parse
+XI_INC_FILES:=%user_man.xml %usersguide.xml %refman.xml %ref_man.xml %part.xml %book.xml
+
+## These are the files that we should run the xmllint on
+LINT_XI_INC_FILES := $(filter-out $(XI_INC_FILES), $(ALL_XI_INC_FILES))
+
+EMPTY :=
+SPACE := $(EMPTY) $(EMPTY)
+XMLLINT_SRCDIRS:=$(subst $(SPACE),:,$(sort $(foreach file,$(XML_FILES),$(dir $(file)))))
+
+xmllint: $(ALL_XI_INC_FILES)
+## We verify that the $(XML_FILES) variable in the Makefile have exactly
+## the same files as we found out by following xi:include.
+ifneq ($(filter-out $(filter %.xml,$(XML_FILES)),$(ALL_XI_INC_FILES)),)
+	$(error "$(filter-out $(filter %.xml,$(XML_FILES)),$(ALL_XI_INC_FILES)) in $$ALL_XI_INC_FILES but not in $$XML_FILES");
+endif
+ifneq ($(filter-out $(ALL_XI_INC_FILES),$(filter %.xml,$(XML_FILES))),)
+	$(error "$(filter-out $(ALL_XI_INC_FILES),$(filter %.xml,$(XML_FILES))) in $$XML_FILES but not in $$ALL_XI_INC_FILES");
+endif
+	@echo "xmllint $(LINT_XI_INC_FILES)"
+	@xmllint --noout --valid --nodefdtd --loaddtd --path \
+	$(DOCGEN)/priv/dtd:$(DOCGEN)/priv/dtd_html_entities:$(XMLLINT_SRCDIRS) \
+	$(LINT_XI_INC_FILES)
 
 # ----------------------------------------------------
 # Local documentation target for testing 
@@ -143,6 +162,8 @@ local_copy_of_topdefs:
 		$(DOCGEN)/priv/js/flipmenu/flip_static.gif \
 		$(DOCGEN)/priv/js/flipmenu/flipmenu.js $(HTMLDIR)/js/flipmenu
 
+else
+xmllint:
 endif
 
 # ----------------------------------------------------
diff --git a/make/otp_subdir.mk b/make/otp_subdir.mk
index 5734970298..19c744955c 100644
--- a/make/otp_subdir.mk
+++ b/make/otp_subdir.mk
@@ -25,7 +25,7 @@
 #
 # Targets that don't affect documentation directories
 #
-opt debug lcnt release docs release_docs tests release_tests clean depend valgrind static_lib:
+opt debug lcnt release docs release_docs tests release_tests clean depend valgrind static_lib xmllint:
 	@set -e ;							\
 	app_pwd=`pwd` ;							\
 	if test -f vsn.mk; then						\
diff --git a/make/run_make.mk b/make/run_make.mk
index 2591a37cad..bcbbf53f7d 100644
--- a/make/run_make.mk
+++ b/make/run_make.mk
@@ -38,9 +38,5 @@ plain smp frag smp_frag:
 	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile FLAVOR=$@
 
 clean generate depend docs release release_spec release_docs release_docs_spec \
-  tests release_tests release_tests_spec static_lib:
+  tests release_tests release_tests_spec static_lib xmllint:
 	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile $@
-
-
-
-
diff --git a/otp_versions.table b/otp_versions.table
index 0cb8c9aa0b..b976962c1e 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,12 @@
+OTP-20.2.4 : ssh-4.6.5 # asn1-5.0.4 common_test-1.15.3 compiler-7.1.4 cosEvent-2.2.2 cosEventDomain-1.2.2 cosFileTransfer-1.2.2 cosNotification-1.2.3 cosProperty-1.2.3 cosTime-1.2.3 cosTransactions-1.3.3 crypto-4.2 debugger-4.2.4 dialyzer-3.2.3 diameter-2.1.3 edoc-0.9.2 eldap-1.2.3 erl_docgen-0.7.2 erl_interface-3.10.1 erts-9.2.1 et-1.6.1 eunit-2.3.5 hipe-3.17 ic-4.4.3 inets-6.4.5 jinterface-1.8.1 kernel-5.4.2 megaco-3.18.3 mnesia-4.15.3 observer-2.6 odbc-2.12.1 orber-3.8.4 os_mon-2.4.4 otp_mibs-1.1.2 parsetools-2.1.6 public_key-1.5.2 reltool-0.7.5 runtime_tools-1.12.4 sasl-3.1.1 snmp-5.2.9 ssl-8.2.3 stdlib-3.4.3 syntax_tools-2.1.4 tools-2.11.1 wx-1.8.3 xmerl-1.3.16 :
+OTP-20.2.3 : erts-9.2.1 kernel-5.4.2 runtime_tools-1.12.4 # asn1-5.0.4 common_test-1.15.3 compiler-7.1.4 cosEvent-2.2.2 cosEventDomain-1.2.2 cosFileTransfer-1.2.2 cosNotification-1.2.3 cosProperty-1.2.3 cosTime-1.2.3 cosTransactions-1.3.3 crypto-4.2 debugger-4.2.4 dialyzer-3.2.3 diameter-2.1.3 edoc-0.9.2 eldap-1.2.3 erl_docgen-0.7.2 erl_interface-3.10.1 et-1.6.1 eunit-2.3.5 hipe-3.17 ic-4.4.3 inets-6.4.5 jinterface-1.8.1 megaco-3.18.3 mnesia-4.15.3 observer-2.6 odbc-2.12.1 orber-3.8.4 os_mon-2.4.4 otp_mibs-1.1.2 parsetools-2.1.6 public_key-1.5.2 reltool-0.7.5 sasl-3.1.1 snmp-5.2.9 ssh-4.6.4 ssl-8.2.3 stdlib-3.4.3 syntax_tools-2.1.4 tools-2.11.1 wx-1.8.3 xmerl-1.3.16 :
+OTP-20.2.2 : mnesia-4.15.3 # asn1-5.0.4 common_test-1.15.3 compiler-7.1.4 cosEvent-2.2.2 cosEventDomain-1.2.2 cosFileTransfer-1.2.2 cosNotification-1.2.3 cosProperty-1.2.3 cosTime-1.2.3 cosTransactions-1.3.3 crypto-4.2 debugger-4.2.4 dialyzer-3.2.3 diameter-2.1.3 edoc-0.9.2 eldap-1.2.3 erl_docgen-0.7.2 erl_interface-3.10.1 erts-9.2 et-1.6.1 eunit-2.3.5 hipe-3.17 ic-4.4.3 inets-6.4.5 jinterface-1.8.1 kernel-5.4.1 megaco-3.18.3 observer-2.6 odbc-2.12.1 orber-3.8.4 os_mon-2.4.4 otp_mibs-1.1.2 parsetools-2.1.6 public_key-1.5.2 reltool-0.7.5 runtime_tools-1.12.3 sasl-3.1.1 snmp-5.2.9 ssh-4.6.4 ssl-8.2.3 stdlib-3.4.3 syntax_tools-2.1.4 tools-2.11.1 wx-1.8.3 xmerl-1.3.16 :
+OTP-20.2.1 : ssh-4.6.4 # asn1-5.0.4 common_test-1.15.3 compiler-7.1.4 cosEvent-2.2.2 cosEventDomain-1.2.2 cosFileTransfer-1.2.2 cosNotification-1.2.3 cosProperty-1.2.3 cosTime-1.2.3 cosTransactions-1.3.3 crypto-4.2 debugger-4.2.4 dialyzer-3.2.3 diameter-2.1.3 edoc-0.9.2 eldap-1.2.3 erl_docgen-0.7.2 erl_interface-3.10.1 erts-9.2 et-1.6.1 eunit-2.3.5 hipe-3.17 ic-4.4.3 inets-6.4.5 jinterface-1.8.1 kernel-5.4.1 megaco-3.18.3 mnesia-4.15.2 observer-2.6 odbc-2.12.1 orber-3.8.4 os_mon-2.4.4 otp_mibs-1.1.2 parsetools-2.1.6 public_key-1.5.2 reltool-0.7.5 runtime_tools-1.12.3 sasl-3.1.1 snmp-5.2.9 ssl-8.2.3 stdlib-3.4.3 syntax_tools-2.1.4 tools-2.11.1 wx-1.8.3 xmerl-1.3.16 :
+OTP-20.2 : asn1-5.0.4 common_test-1.15.3 compiler-7.1.4 cosEvent-2.2.2 cosEventDomain-1.2.2 cosFileTransfer-1.2.2 cosNotification-1.2.3 cosProperty-1.2.3 cosTime-1.2.3 cosTransactions-1.3.3 crypto-4.2 debugger-4.2.4 dialyzer-3.2.3 diameter-2.1.3 edoc-0.9.2 eldap-1.2.3 erl_docgen-0.7.2 erl_interface-3.10.1 erts-9.2 eunit-2.3.5 hipe-3.17 ic-4.4.3 inets-6.4.5 jinterface-1.8.1 kernel-5.4.1 megaco-3.18.3 mnesia-4.15.2 observer-2.6 odbc-2.12.1 orber-3.8.4 os_mon-2.4.4 otp_mibs-1.1.2 parsetools-2.1.6 public_key-1.5.2 runtime_tools-1.12.3 sasl-3.1.1 snmp-5.2.9 ssh-4.6.3 ssl-8.2.3 stdlib-3.4.3 syntax_tools-2.1.4 tools-2.11.1 wx-1.8.3 xmerl-1.3.16 # et-1.6.1 reltool-0.7.5 :
+OTP-20.1.7.1 : kernel-5.4.0.1 # asn1-5.0.3 common_test-1.15.2 compiler-7.1.3 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.2 cosTime-1.2.2 cosTransactions-1.3.2 crypto-4.1 debugger-4.2.3 dialyzer-3.2.2 diameter-2.1.2 edoc-0.9.1 eldap-1.2.2 erl_docgen-0.7.1 erl_interface-3.10 erts-9.1.5 et-1.6.1 eunit-2.3.4 hipe-3.16.1 ic-4.4.2 inets-6.4.4 jinterface-1.8 megaco-3.18.2 mnesia-4.15.1 observer-2.5 odbc-2.12 orber-3.8.3 os_mon-2.4.3 otp_mibs-1.1.1 parsetools-2.1.5 public_key-1.5.1 reltool-0.7.5 runtime_tools-1.12.2 sasl-3.1 snmp-5.2.8 ssh-4.6.2 ssl-8.2.2 stdlib-3.4.2 syntax_tools-2.1.3 tools-2.11 wx-1.8.2 xmerl-1.3.15 :
+OTP-20.1.7 : public_key-1.5.1 ssl-8.2.2 # asn1-5.0.3 common_test-1.15.2 compiler-7.1.3 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.2 cosTime-1.2.2 cosTransactions-1.3.2 crypto-4.1 debugger-4.2.3 dialyzer-3.2.2 diameter-2.1.2 edoc-0.9.1 eldap-1.2.2 erl_docgen-0.7.1 erl_interface-3.10 erts-9.1.5 et-1.6.1 eunit-2.3.4 hipe-3.16.1 ic-4.4.2 inets-6.4.4 jinterface-1.8 kernel-5.4 megaco-3.18.2 mnesia-4.15.1 observer-2.5 odbc-2.12 orber-3.8.3 os_mon-2.4.3 otp_mibs-1.1.1 parsetools-2.1.5 reltool-0.7.5 runtime_tools-1.12.2 sasl-3.1 snmp-5.2.8 ssh-4.6.2 stdlib-3.4.2 syntax_tools-2.1.3 tools-2.11 wx-1.8.2 xmerl-1.3.15 :
+OTP-20.1.6 : erts-9.1.5 ssh-4.6.2 # asn1-5.0.3 common_test-1.15.2 compiler-7.1.3 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.2 cosTime-1.2.2 cosTransactions-1.3.2 crypto-4.1 debugger-4.2.3 dialyzer-3.2.2 diameter-2.1.2 edoc-0.9.1 eldap-1.2.2 erl_docgen-0.7.1 erl_interface-3.10 et-1.6.1 eunit-2.3.4 hipe-3.16.1 ic-4.4.2 inets-6.4.4 jinterface-1.8 kernel-5.4 megaco-3.18.2 mnesia-4.15.1 observer-2.5 odbc-2.12 orber-3.8.3 os_mon-2.4.3 otp_mibs-1.1.1 parsetools-2.1.5 public_key-1.5 reltool-0.7.5 runtime_tools-1.12.2 sasl-3.1 snmp-5.2.8 ssl-8.2.1 stdlib-3.4.2 syntax_tools-2.1.3 tools-2.11 wx-1.8.2 xmerl-1.3.15 :
+OTP-20.1.5 : erts-9.1.4 inets-6.4.4 # asn1-5.0.3 common_test-1.15.2 compiler-7.1.3 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.2 cosTime-1.2.2 cosTransactions-1.3.2 crypto-4.1 debugger-4.2.3 dialyzer-3.2.2 diameter-2.1.2 edoc-0.9.1 eldap-1.2.2 erl_docgen-0.7.1 erl_interface-3.10 et-1.6.1 eunit-2.3.4 hipe-3.16.1 ic-4.4.2 jinterface-1.8 kernel-5.4 megaco-3.18.2 mnesia-4.15.1 observer-2.5 odbc-2.12 orber-3.8.3 os_mon-2.4.3 otp_mibs-1.1.1 parsetools-2.1.5 public_key-1.5 reltool-0.7.5 runtime_tools-1.12.2 sasl-3.1 snmp-5.2.8 ssh-4.6.1 ssl-8.2.1 stdlib-3.4.2 syntax_tools-2.1.3 tools-2.11 wx-1.8.2 xmerl-1.3.15 :
 OTP-20.1.4 : inets-6.4.3 # asn1-5.0.3 common_test-1.15.2 compiler-7.1.3 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.2 cosTime-1.2.2 cosTransactions-1.3.2 crypto-4.1 debugger-4.2.3 dialyzer-3.2.2 diameter-2.1.2 edoc-0.9.1 eldap-1.2.2 erl_docgen-0.7.1 erl_interface-3.10 erts-9.1.3 et-1.6.1 eunit-2.3.4 hipe-3.16.1 ic-4.4.2 jinterface-1.8 kernel-5.4 megaco-3.18.2 mnesia-4.15.1 observer-2.5 odbc-2.12 orber-3.8.3 os_mon-2.4.3 otp_mibs-1.1.1 parsetools-2.1.5 public_key-1.5 reltool-0.7.5 runtime_tools-1.12.2 sasl-3.1 snmp-5.2.8 ssh-4.6.1 ssl-8.2.1 stdlib-3.4.2 syntax_tools-2.1.3 tools-2.11 wx-1.8.2 xmerl-1.3.15 :
 OTP-20.1.3 : diameter-2.1.2 erts-9.1.3 snmp-5.2.8 # asn1-5.0.3 common_test-1.15.2 compiler-7.1.3 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.2 cosTime-1.2.2 cosTransactions-1.3.2 crypto-4.1 debugger-4.2.3 dialyzer-3.2.2 edoc-0.9.1 eldap-1.2.2 erl_docgen-0.7.1 erl_interface-3.10 et-1.6.1 eunit-2.3.4 hipe-3.16.1 ic-4.4.2 inets-6.4.2 jinterface-1.8 kernel-5.4 megaco-3.18.2 mnesia-4.15.1 observer-2.5 odbc-2.12 orber-3.8.3 os_mon-2.4.3 otp_mibs-1.1.1 parsetools-2.1.5 public_key-1.5 reltool-0.7.5 runtime_tools-1.12.2 sasl-3.1 ssh-4.6.1 ssl-8.2.1 stdlib-3.4.2 syntax_tools-2.1.3 tools-2.11 wx-1.8.2 xmerl-1.3.15 :
 OTP-20.1.2 : diameter-2.1.1 erts-9.1.2 # asn1-5.0.3 common_test-1.15.2 compiler-7.1.3 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.2 cosTime-1.2.2 cosTransactions-1.3.2 crypto-4.1 debugger-4.2.3 dialyzer-3.2.2 edoc-0.9.1 eldap-1.2.2 erl_docgen-0.7.1 erl_interface-3.10 et-1.6.1 eunit-2.3.4 hipe-3.16.1 ic-4.4.2 inets-6.4.2 jinterface-1.8 kernel-5.4 megaco-3.18.2 mnesia-4.15.1 observer-2.5 odbc-2.12 orber-3.8.3 os_mon-2.4.3 otp_mibs-1.1.1 parsetools-2.1.5 public_key-1.5 reltool-0.7.5 runtime_tools-1.12.2 sasl-3.1 snmp-5.2.7 ssh-4.6.1 ssl-8.2.1 stdlib-3.4.2 syntax_tools-2.1.3 tools-2.11 wx-1.8.2 xmerl-1.3.15 :
@@ -9,6 +18,9 @@ OTP-20.0.3 : asn1-5.0.2 compiler-7.1.1 erts-9.0.3 ssh-4.5.1 # common_test-1.15.1
 OTP-20.0.2 : asn1-5.0.1 erts-9.0.2 kernel-5.3.1 # common_test-1.15.1 compiler-7.1 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.2 cosTime-1.2.2 cosTransactions-1.3.2 crypto-4.0 debugger-4.2.2 dialyzer-3.2 diameter-2.0 edoc-0.9 eldap-1.2.2 erl_docgen-0.7 erl_interface-3.10 et-1.6 eunit-2.3.3 hipe-3.16 ic-4.4.2 inets-6.4 jinterface-1.8 megaco-3.18.2 mnesia-4.15 observer-2.4 odbc-2.12 orber-3.8.3 os_mon-2.4.2 otp_mibs-1.1.1 parsetools-2.1.5 public_key-1.4.1 reltool-0.7.4 runtime_tools-1.12.1 sasl-3.0.4 snmp-5.2.6 ssh-4.5 ssl-8.2 stdlib-3.4.1 syntax_tools-2.1.2 tools-2.10.1 wx-1.8.1 xmerl-1.3.15 :
 OTP-20.0.1 : common_test-1.15.1 erts-9.0.1 runtime_tools-1.12.1 stdlib-3.4.1 tools-2.10.1 # asn1-5.0 compiler-7.1 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.2 cosTime-1.2.2 cosTransactions-1.3.2 crypto-4.0 debugger-4.2.2 dialyzer-3.2 diameter-2.0 edoc-0.9 eldap-1.2.2 erl_docgen-0.7 erl_interface-3.10 et-1.6 eunit-2.3.3 hipe-3.16 ic-4.4.2 inets-6.4 jinterface-1.8 kernel-5.3 megaco-3.18.2 mnesia-4.15 observer-2.4 odbc-2.12 orber-3.8.3 os_mon-2.4.2 otp_mibs-1.1.1 parsetools-2.1.5 public_key-1.4.1 reltool-0.7.4 sasl-3.0.4 snmp-5.2.6 ssh-4.5 ssl-8.2 syntax_tools-2.1.2 wx-1.8.1 xmerl-1.3.15 :
 OTP-20.0 : asn1-5.0 common_test-1.15 compiler-7.1 cosProperty-1.2.2 crypto-4.0 debugger-4.2.2 dialyzer-3.2 diameter-2.0 edoc-0.9 erl_docgen-0.7 erl_interface-3.10 erts-9.0 eunit-2.3.3 hipe-3.16 inets-6.4 jinterface-1.8 kernel-5.3 megaco-3.18.2 mnesia-4.15 observer-2.4 orber-3.8.3 parsetools-2.1.5 public_key-1.4.1 reltool-0.7.4 runtime_tools-1.12 sasl-3.0.4 snmp-5.2.6 ssh-4.5 ssl-8.2 stdlib-3.4 syntax_tools-2.1.2 tools-2.10 wx-1.8.1 xmerl-1.3.15 # cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosTime-1.2.2 cosTransactions-1.3.2 eldap-1.2.2 et-1.6 ic-4.4.2 odbc-2.12 os_mon-2.4.2 otp_mibs-1.1.1 :
+OTP-19.3.6.6 : ssh-4.4.2.2 ssl-8.1.3.1.1 # asn1-4.0.4 common_test-1.14 compiler-7.0.4.1 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7.4 debugger-4.2.1 dialyzer-3.1.1 diameter-1.12.2 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.3 erts-8.3.5.4 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.4 ic-4.4.2 inets-6.3.9 jinterface-1.7.1 kernel-5.2 megaco-3.18.1 mnesia-4.14.3.1 observer-2.3.1 odbc-2.12 orber-3.8.2 os_mon-2.4.2 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.4 reltool-0.7.3 runtime_tools-1.11.1 sasl-3.0.3 snmp-5.2.5 stdlib-3.3 syntax_tools-2.1.1 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.14 :
+OTP-19.3.6.5 : erts-8.3.5.4 mnesia-4.14.3.1 ssh-4.4.2.1 # asn1-4.0.4 common_test-1.14 compiler-7.0.4.1 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7.4 debugger-4.2.1 dialyzer-3.1.1 diameter-1.12.2 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.3 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.4 ic-4.4.2 inets-6.3.9 jinterface-1.7.1 kernel-5.2 megaco-3.18.1 observer-2.3.1 odbc-2.12 orber-3.8.2 os_mon-2.4.2 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.4 reltool-0.7.3 runtime_tools-1.11.1 sasl-3.0.3 snmp-5.2.5 ssl-8.1.3.1 stdlib-3.3 syntax_tools-2.1.1 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.14 :
+OTP-19.3.6.4 : ssl-8.1.3.1 # asn1-4.0.4 common_test-1.14 compiler-7.0.4.1 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7.4 debugger-4.2.1 dialyzer-3.1.1 diameter-1.12.2 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.3 erts-8.3.5.3 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.4 ic-4.4.2 inets-6.3.9 jinterface-1.7.1 kernel-5.2 megaco-3.18.1 mnesia-4.14.3 observer-2.3.1 odbc-2.12 orber-3.8.2 os_mon-2.4.2 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.4 reltool-0.7.3 runtime_tools-1.11.1 sasl-3.0.3 snmp-5.2.5 ssh-4.4.2 stdlib-3.3 syntax_tools-2.1.1 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.14 :
 OTP-19.3.6.3 : compiler-7.0.4.1 erts-8.3.5.3 # asn1-4.0.4 common_test-1.14 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7.4 debugger-4.2.1 dialyzer-3.1.1 diameter-1.12.2 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.3 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.4 ic-4.4.2 inets-6.3.9 jinterface-1.7.1 kernel-5.2 megaco-3.18.1 mnesia-4.14.3 observer-2.3.1 odbc-2.12 orber-3.8.2 os_mon-2.4.2 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.4 reltool-0.7.3 runtime_tools-1.11.1 sasl-3.0.3 snmp-5.2.5 ssh-4.4.2 ssl-8.1.3 stdlib-3.3 syntax_tools-2.1.1 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.14 :
 OTP-19.3.6.2 : erts-8.3.5.2 # asn1-4.0.4 common_test-1.14 compiler-7.0.4 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7.4 debugger-4.2.1 dialyzer-3.1.1 diameter-1.12.2 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.3 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.4 ic-4.4.2 inets-6.3.9 jinterface-1.7.1 kernel-5.2 megaco-3.18.1 mnesia-4.14.3 observer-2.3.1 odbc-2.12 orber-3.8.2 os_mon-2.4.2 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.4 reltool-0.7.3 runtime_tools-1.11.1 sasl-3.0.3 snmp-5.2.5 ssh-4.4.2 ssl-8.1.3 stdlib-3.3 syntax_tools-2.1.1 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.14 :
 OTP-19.3.6.1 : erts-8.3.5.1 # asn1-4.0.4 common_test-1.14 compiler-7.0.4 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7.4 debugger-4.2.1 dialyzer-3.1.1 diameter-1.12.2 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.3 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.4 ic-4.4.2 inets-6.3.9 jinterface-1.7.1 kernel-5.2 megaco-3.18.1 mnesia-4.14.3 observer-2.3.1 odbc-2.12 orber-3.8.2 os_mon-2.4.2 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.4 reltool-0.7.3 runtime_tools-1.11.1 sasl-3.0.3 snmp-5.2.5 ssh-4.4.2 ssl-8.1.3 stdlib-3.3 syntax_tools-2.1.1 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.14 :
@@ -19,6 +31,7 @@ OTP-19.3.3 : dialyzer-3.1.1 erts-8.3.3 inets-6.3.8 # asn1-4.0.4 common_test-1.14
 OTP-19.3.2 : erts-8.3.2 # asn1-4.0.4 common_test-1.14 compiler-7.0.4 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7.4 debugger-4.2.1 dialyzer-3.1 diameter-1.12.2 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.3 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.4 ic-4.4.2 inets-6.3.7 jinterface-1.7.1 kernel-5.2 megaco-3.18.1 mnesia-4.14.3 observer-2.3.1 odbc-2.12 orber-3.8.2 os_mon-2.4.2 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.4 reltool-0.7.3 runtime_tools-1.11.1 sasl-3.0.3 snmp-5.2.5 ssh-4.4.2 ssl-8.1.2 stdlib-3.3 syntax_tools-2.1.1 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.13 :
 OTP-19.3.1 : crypto-3.7.4 erts-8.3.1 inets-6.3.7 ssh-4.4.2 ssl-8.1.2 # asn1-4.0.4 common_test-1.14 compiler-7.0.4 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 debugger-4.2.1 dialyzer-3.1 diameter-1.12.2 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.3 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.4 ic-4.4.2 jinterface-1.7.1 kernel-5.2 megaco-3.18.1 mnesia-4.14.3 observer-2.3.1 odbc-2.12 orber-3.8.2 os_mon-2.4.2 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.4 reltool-0.7.3 runtime_tools-1.11.1 sasl-3.0.3 snmp-5.2.5 stdlib-3.3 syntax_tools-2.1.1 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.13 :
 OTP-19.3 : common_test-1.14 compiler-7.0.4 crypto-3.7.3 dialyzer-3.1 diameter-1.12.2 erl_interface-3.9.3 erts-8.3 hipe-3.15.4 inets-6.3.6 kernel-5.2 observer-2.3.1 os_mon-2.4.2 public_key-1.4 reltool-0.7.3 runtime_tools-1.11.1 sasl-3.0.3 snmp-5.2.5 ssh-4.4.1 ssl-8.1.1 stdlib-3.3 tools-2.9.1 typer-0.9.12 xmerl-1.3.13 # asn1-4.0.4 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 debugger-4.2.1 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 et-1.6 eunit-2.3.2 gs-1.6.2 ic-4.4.2 jinterface-1.7.1 megaco-3.18.1 mnesia-4.14.3 odbc-2.12 orber-3.8.2 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 syntax_tools-2.1.1 wx-1.8 :
+OTP-19.2.3.1 : erts-8.2.2.1 # asn1-4.0.4 common_test-1.13 compiler-7.0.3 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7.2 debugger-4.2.1 dialyzer-3.0.3 diameter-1.12.1 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.2 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.3 ic-4.4.2 inets-6.3.5 jinterface-1.7.1 kernel-5.1.1 megaco-3.18.1 mnesia-4.14.3 observer-2.3 odbc-2.12 orber-3.8.2 os_mon-2.4.1 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.3 reltool-0.7.2 runtime_tools-1.11 sasl-3.0.2 snmp-5.2.4 ssh-4.4 ssl-8.1 stdlib-3.2 syntax_tools-2.1.1 tools-2.9 typer-0.9.11 wx-1.8 xmerl-1.3.12 :
 OTP-19.2.3 : erts-8.2.2 inets-6.3.5 # asn1-4.0.4 common_test-1.13 compiler-7.0.3 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7.2 debugger-4.2.1 dialyzer-3.0.3 diameter-1.12.1 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.2 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.3 ic-4.4.2 jinterface-1.7.1 kernel-5.1.1 megaco-3.18.1 mnesia-4.14.3 observer-2.3 odbc-2.12 orber-3.8.2 os_mon-2.4.1 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.3 reltool-0.7.2 runtime_tools-1.11 sasl-3.0.2 snmp-5.2.4 ssh-4.4 ssl-8.1 stdlib-3.2 syntax_tools-2.1.1 tools-2.9 typer-0.9.11 wx-1.8 xmerl-1.3.12 :
 OTP-19.2.2 : mnesia-4.14.3 # asn1-4.0.4 common_test-1.13 compiler-7.0.3 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7.2 debugger-4.2.1 dialyzer-3.0.3 diameter-1.12.1 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.2 erts-8.2.1 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.3 ic-4.4.2 inets-6.3.4 jinterface-1.7.1 kernel-5.1.1 megaco-3.18.1 observer-2.3 odbc-2.12 orber-3.8.2 os_mon-2.4.1 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.3 reltool-0.7.2 runtime_tools-1.11 sasl-3.0.2 snmp-5.2.4 ssh-4.4 ssl-8.1 stdlib-3.2 syntax_tools-2.1.1 tools-2.9 typer-0.9.11 wx-1.8 xmerl-1.3.12 :
 OTP-19.2.1 : erts-8.2.1 # asn1-4.0.4 common_test-1.13 compiler-7.0.3 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7.2 debugger-4.2.1 dialyzer-3.0.3 diameter-1.12.1 edoc-0.8.1 eldap-1.2.2 erl_docgen-0.6.1 erl_interface-3.9.2 et-1.6 eunit-2.3.2 gs-1.6.2 hipe-3.15.3 ic-4.4.2 inets-6.3.4 jinterface-1.7.1 kernel-5.1.1 megaco-3.18.1 mnesia-4.14.2 observer-2.3 odbc-2.12 orber-3.8.2 os_mon-2.4.1 otp_mibs-1.1.1 parsetools-2.1.4 percept-0.9 public_key-1.3 reltool-0.7.2 runtime_tools-1.11 sasl-3.0.2 snmp-5.2.4 ssh-4.4 ssl-8.1 stdlib-3.2 syntax_tools-2.1.1 tools-2.9 typer-0.9.11 wx-1.8 xmerl-1.3.12 :
@@ -39,10 +52,14 @@ OTP-19.0.3 : inets-6.3.2 kernel-5.0.1 ssl-8.0.1 # asn1-4.0.3 common_test-1.12.2
 OTP-19.0.2 : compiler-7.0.1 erts-8.0.2 stdlib-3.0.1 # asn1-4.0.3 common_test-1.12.2 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7 debugger-4.2 dialyzer-3.0.1 diameter-1.12 edoc-0.7.19 eldap-1.2.2 erl_docgen-0.5 erl_interface-3.9 et-1.6 eunit-2.3 gs-1.6.1 hipe-3.15.1 ic-4.4.1 inets-6.3.1 jinterface-1.7 kernel-5.0 megaco-3.18.1 mnesia-4.14 observer-2.2.1 odbc-2.11.2 orber-3.8.2 os_mon-2.4.1 otp_mibs-1.1.1 parsetools-2.1.2 percept-0.9 public_key-1.2 reltool-0.7.1 runtime_tools-1.10 sasl-3.0 snmp-5.2.3 ssh-4.3.1 ssl-8.0 syntax_tools-2.0 tools-2.8.5 typer-0.9.11 wx-1.7 xmerl-1.3.11 :
 OTP-19.0.1 : dialyzer-3.0.1 erts-8.0.1 inets-6.3.1 observer-2.2.1 ssh-4.3.1 tools-2.8.5 # asn1-4.0.3 common_test-1.12.2 compiler-7.0 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7 debugger-4.2 diameter-1.12 edoc-0.7.19 eldap-1.2.2 erl_docgen-0.5 erl_interface-3.9 et-1.6 eunit-2.3 gs-1.6.1 hipe-3.15.1 ic-4.4.1 jinterface-1.7 kernel-5.0 megaco-3.18.1 mnesia-4.14 odbc-2.11.2 orber-3.8.2 os_mon-2.4.1 otp_mibs-1.1.1 parsetools-2.1.2 percept-0.9 public_key-1.2 reltool-0.7.1 runtime_tools-1.10 sasl-3.0 snmp-5.2.3 ssl-8.0 stdlib-3.0 syntax_tools-2.0 typer-0.9.11 wx-1.7 xmerl-1.3.11 :
 OTP-19.0 : asn1-4.0.3 common_test-1.12.2 compiler-7.0 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7 debugger-4.2 dialyzer-3.0 diameter-1.12 edoc-0.7.19 eldap-1.2.2 erl_docgen-0.5 erl_interface-3.9 erts-8.0 et-1.6 eunit-2.3 gs-1.6.1 hipe-3.15.1 ic-4.4.1 inets-6.3 jinterface-1.7 kernel-5.0 megaco-3.18.1 mnesia-4.14 observer-2.2 odbc-2.11.2 orber-3.8.2 os_mon-2.4.1 otp_mibs-1.1.1 parsetools-2.1.2 percept-0.9 public_key-1.2 reltool-0.7.1 runtime_tools-1.10 sasl-3.0 snmp-5.2.3 ssh-4.3 ssl-8.0 stdlib-3.0 syntax_tools-2.0 tools-2.8.4 typer-0.9.11 wx-1.7 xmerl-1.3.11 # :
+OTP-18.3.4.8 : ssh-4.2.2.5 # asn1-4.0.2 common_test-1.12.1.1 compiler-6.0.3.1 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3.1 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1.1 erl_docgen-0.4.2 erl_interface-3.8.2 erts-7.3.1.4 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 inets-6.2.4.1 jinterface-1.6.1 kernel-4.2 megaco-3.18 mnesia-4.13.4 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssl-7.3.3.2 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
+OTP-18.3.4.7 : ssl-7.3.3.2 # asn1-4.0.2 common_test-1.12.1.1 compiler-6.0.3.1 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3.1 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1.1 erl_docgen-0.4.2 erl_interface-3.8.2 erts-7.3.1.4 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 inets-6.2.4.1 jinterface-1.6.1 kernel-4.2 megaco-3.18 mnesia-4.13.4 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssh-4.2.2.4 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
+OTP-18.3.4.6 : compiler-6.0.3.1 eldap-1.2.1.1 erts-7.3.1.4 ssh-4.2.2.4 # asn1-4.0.2 common_test-1.12.1.1 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3.1 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 erl_docgen-0.4.2 erl_interface-3.8.2 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 inets-6.2.4.1 jinterface-1.6.1 kernel-4.2 megaco-3.18 mnesia-4.13.4 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssl-7.3.3.1 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
 OTP-18.3.4.5 : crypto-3.6.3.1 erts-7.3.1.3 inets-6.2.4.1 ssh-4.2.2.3 # asn1-4.0.2 common_test-1.12.1.1 compiler-6.0.3 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1 erl_docgen-0.4.2 erl_interface-3.8.2 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 jinterface-1.6.1 kernel-4.2 megaco-3.18 mnesia-4.13.4 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssl-7.3.3.1 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
 OTP-18.3.4.4 : erts-7.3.1.2 # asn1-4.0.2 common_test-1.12.1.1 compiler-6.0.3 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1 erl_docgen-0.4.2 erl_interface-3.8.2 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 inets-6.2.4 jinterface-1.6.1 kernel-4.2 megaco-3.18 mnesia-4.13.4 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssh-4.2.2.2 ssl-7.3.3.1 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
 OTP-18.3.4.3 : ssh-4.2.2.2 # asn1-4.0.2 common_test-1.12.1.1 compiler-6.0.3 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1 erl_docgen-0.4.2 erl_interface-3.8.2 erts-7.3.1.1 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 inets-6.2.4 jinterface-1.6.1 kernel-4.2 megaco-3.18 mnesia-4.13.4 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssl-7.3.3.1 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
 OTP-18.3.4.2 : common_test-1.12.1.1 erts-7.3.1.1 ssl-7.3.3.1 # asn1-4.0.2 compiler-6.0.3 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1 erl_docgen-0.4.2 erl_interface-3.8.2 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 inets-6.2.4 jinterface-1.6.1 kernel-4.2 megaco-3.18 mnesia-4.13.4 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssh-4.2.2.1 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
+OTP-18.3.4.1.1 : ssl-7.3.3.0.1 # asn1-4.0.2 common_test-1.12.1 compiler-6.0.3 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1 erl_docgen-0.4.2 erl_interface-3.8.2 erts-7.3.1 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 inets-6.2.4 jinterface-1.6.1 kernel-4.2 megaco-3.18 mnesia-4.13.4 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssh-4.2.2.1 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
 OTP-18.3.4.1 : ssh-4.2.2.1 # asn1-4.0.2 common_test-1.12.1 compiler-6.0.3 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1 erl_docgen-0.4.2 erl_interface-3.8.2 erts-7.3.1 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 inets-6.2.4 jinterface-1.6.1 kernel-4.2 megaco-3.18 mnesia-4.13.4 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssl-7.3.3 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
 OTP-18.3.4 : inets-6.2.4 ssl-7.3.3 # asn1-4.0.2 common_test-1.12.1 compiler-6.0.3 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1 erl_docgen-0.4.2 erl_interface-3.8.2 erts-7.3.1 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 jinterface-1.6.1 kernel-4.2 megaco-3.18 mnesia-4.13.4 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssh-4.2.2 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
 OTP-18.3.3 : common_test-1.12.1 inets-6.2.3 ssl-7.3.2 # asn1-4.0.2 compiler-6.0.3 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1 erl_docgen-0.4.2 erl_interface-3.8.2 erts-7.3.1 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 jinterface-1.6.1 kernel-4.2 megaco-3.18 mnesia-4.13.4 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssh-4.2.2 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
diff --git a/system/doc/design_principles/release_structure.xml b/system/doc/design_principles/release_structure.xml
index a0ab21c43f..8e62ba845f 100644
--- a/system/doc/design_principles/release_structure.xml
+++ b/system/doc/design_principles/release_structure.xml
@@ -208,8 +208,8 @@ releases/ch_rel-1.rel</pre>
       is therefore now instead duplicated in the tar file so no manual
       copying is necessary.</p>
     <p>If a <c>relup</c> file and/or a system configuration file called
-      <c>sys.config</c> is found, these files are also included in
-      the release package. See
+      <c>sys.config</c>, or a <c>sys.config.src</c>, is found, these files
+      are also included in the release package. See
       <seealso marker="release_handling#req">Release Handling</seealso>.</p>
     <p>Options can be set to make the release package include source
       code and the ERTS binary as well.</p>
@@ -240,7 +240,7 @@ $ROOT/lib/App1-AVsn1/ebin
        <item><c>erts-EVsn/bin</c> - Erlang runtime system executables</item>
        <item><c>releases/Vsn</c> - <c>.rel</c> file and boot script
        <c>start.boot</c>; if present in the release package, <c>relup</c>
-       and/or <c>sys.config</c></item>
+       and/or <c>sys.config</c> or <c>sys.config.src</c></item>
        <item><c>bin</c> - Top-level Erlang runtime system executables</item>
      </list>
     <p>Applications are not required to be located under directory
diff --git a/system/doc/design_principles/statem.xml b/system/doc/design_principles/statem.xml
index a0611a46da..5be2981f62 100644
--- a/system/doc/design_principles/statem.xml
+++ b/system/doc/design_principles/statem.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2016</year><year>2017</year>
+      <year>2016</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -1679,8 +1679,8 @@ handle_event(
 		    {next_state, {open,LockButton}, Data,
 		     [{reply,From,ok}]};
 		[Digit|Rest] -> % Incomplete
-		    {keep_state, Data#{remaining := Rest, 30000},
-		     [{reply,From,ok}]};
+		    {keep_state, Data#{remaining := Rest},
+		     [{reply,From,ok}, 30000]};
 		[_|_] -> % Wrong
 		    {keep_state, Data#{remaining := Code},
 		     [{reply,From,ok}]}
diff --git a/system/doc/efficiency_guide/advanced.xml b/system/doc/efficiency_guide/advanced.xml
index 896eda5f1c..21d4a66d77 100644
--- a/system/doc/efficiency_guide/advanced.xml
+++ b/system/doc/efficiency_guide/advanced.xml
@@ -151,7 +151,7 @@
       <row>
         <cell>Processes</cell>
         <cell>The maximum number of simultaneously alive Erlang processes
-	is by default 32,768. This limit can be configured at startup.
+	is by default 262,144. This limit can be configured at startup.
 	For more information, see the
 	<seealso marker="erts:erl#max_processes"><c>+P</c></seealso>
 	command-line flag in the
@@ -194,10 +194,8 @@
       </row>
       <row>
 	<cell>Elements in a tuple</cell>
-	<cell>The maximum number of elements in a tuple is 67,108,863
-	(26-bit unsigned integer). Clearly, other factors such as the
-	available memory can make it difficult to create a tuple of
-	that size.</cell>
+	<cell>The maximum number of elements in a tuple is 16,777,215
+	(24-bit unsigned integer).</cell>
       </row>
       <row>
 	<cell>Size of binary</cell>
diff --git a/system/doc/efficiency_guide/profiling.xml b/system/doc/efficiency_guide/profiling.xml
index bf50a03fa6..f185456158 100644
--- a/system/doc/efficiency_guide/profiling.xml
+++ b/system/doc/efficiency_guide/profiling.xml
@@ -41,30 +41,87 @@
     <p>Erlang/OTP contains several tools to help finding bottlenecks:</p>
 
     <list type="bulleted">
-      <item><c>fprof</c> provides the most detailed information about
-      where the program time is spent, but it significantly slows down the
-      program it profiles.</item>
-
-      <item><p><c>eprof</c> provides time information of each function
-      used in the program. No call graph is produced, but <c>eprof</c> has
-      considerable less impact on the program it profiles.</p>
-      <p>If the program is too large to be profiled by <c>fprof</c> or
-      <c>eprof</c>, the <c>cover</c> and <c>cprof</c> tools can be used
-      to locate code parts that are to be more thoroughly profiled using
-      <c>fprof</c> or <c>eprof</c>.</p></item>
-
-      <item><c>cover</c> provides execution counts per line per
-      process, with less overhead than <c>fprof</c>. Execution counts
-      can, with some caution, be used to locate potential performance
-      bottlenecks.</item>
-
-      <item><c>cprof</c> is the most lightweight tool, but it only
-      provides execution counts on a function basis (for all processes,
-      not per process).</item>
+      <item><p><seealso marker="tools:fprof"><c>fprof</c></seealso> provides
+          the most detailed information about where the program time is spent,
+          but it significantly slows down the program it profiles.</p></item>
+
+      <item><p><seealso marker="tools:eprof"><c>eprof</c></seealso> provides
+          time information of each function used in the program. No call graph is
+          produced, but <c>eprof</c> has considerable less impact on the program it
+          profiles.</p>
+        <p>If the program is too large to be profiled by <c>fprof</c> or
+          <c>eprof</c>, <c>cprof</c> can be used to locate code parts that
+          are to be more thoroughly profiled using <c>fprof</c> or <c>eprof</c>.</p></item>
+
+      <item><p><seealso marker="tools:cprof"><c>cprof</c></seealso> is the
+          most lightweight tool, but it only provides execution counts on a
+          function basis (for all processes, not per process).</p></item>
+
+      <item><p><seealso marker="runtime_tools:dbg"><c>dbg</c></seealso> is the
+          generic erlang tracing frontend. By using the <c>timestamp</c> or
+          <c>cpu_timestamp</c> options it can be used to time how long function
+          calls in a live system take.</p></item>
+
+      <item><p><seealso marker="tools:lcnt"><c>lcnt</c></seealso> is used
+          to find contention points in the Erlang Run-Time System's internal
+          locking mechanisms. It is useful when looking for bottlenecks in
+          interaction between process, port, ets tables and other entities
+          that can be run in parallel.</p></item>
+
     </list>
 
     <p>The tools are further described in
     <seealso marker="#profiling_tools">Tools</seealso>.</p>
+
+    <p>There are also several open source tools outside of Erlang/OTP
+    that can be used to help profiling. Some of them are:</p>
+
+    <list type="bulleted">
+      <item><url href="https://github.com/isacssouza/erlgrind">erlgrind</url>
+      can be used to visualize fprof data in kcachegrind.</item>
+      <item><url href="https://github.com/proger/eflame">eflame</url>
+      is an alternative to fprof that displays the profiling output as a flamegraph.</item>
+      <item><url href="https://ferd.github.io/recon/index.html">recon</url>
+      is a collection of Erlang profiling and debugging tools.
+      This tool comes with an accompanying E-book called
+      <url href="https://www.erlang-in-anger.com/">Erlang in Anger</url>.</item>
+    </list>
+  </section>
+
+  <section>
+    <title>Memory profiling</title>
+    <pre>eheap_alloc: Cannot allocate 1234567890 bytes of memory (of type "heap").</pre>
+    <p>The above slogan is one of the more common reasons for Erlang to terminate.
+      For unknown reasons the Erlang Run-Time System failed to allocate memory to
+      use. When this happens a crash dump is generated that contains information
+      about the state of the system as it ran out of mmeory. Use the
+      <seealso marker="observer:cdv"><c>crashdump_viewer</c></seealso> to get a
+      view of the memory is being used. Look for processes with large heaps or
+      many messages, large ets tables, etc.</p>
+    <p>When looking at memory usage in a running system the most basic function
+      to get information from is <seealso marker="erts:erlang#memory/0"><c>
+      erlang:memory()</c></seealso>. It returns the current memory usage
+      of the system. <seealso marker="tools:instrument"><c>instrument(3)</c></seealso>
+      can be used to get a more detailed breakdown of where memory is used.</p>
+    <p>Processes, ports and ets tables can then be inspecting using their
+      respective info functions, i.e.
+      <seealso marker="erts:erlang#process_info_memory"><c>erlang:process_info/2
+      </c></seealso>,
+      <seealso marker="erts:erlang#port_info_memory"><c>erlang:port_info/2
+      </c></seealso> and
+      <seealso marker="stdlib:ets#info/1"><c>ets:info/1</c></seealso>.
+    </p>
+    <p>Sometimes the system can enter a state where the reported memory
+      from <c>erlang:memory(total)</c> is very different from the
+      memory reported by the OS. This can be because of internal
+      fragmentation within the Erlang Run-Time System. Data about
+      how memory is allocated can be retrieved using
+      <seealso marker="erts:erlang#system_info_allocator">
+        <c>erlang:system_info(allocator)</c></seealso>.
+      The data you get from that function is very raw and not very plesant to read.
+      <url href="http://ferd.github.io/recon/recon_alloc.html">recon_alloc</url>
+      can be used to extract useful information from system_info
+      statistics counters.</p>
   </section>
 
   <section>
@@ -80,6 +137,22 @@
       tools on the whole system. Instead you want to concentrate on
       central processes and modules, which contribute for a big part
       of the execution.</p>
+
+    <p>There are also some tools that can be used to get a view of the
+      whole system with more or less overhead.</p>
+    <list type="bulleted">
+      <item><seealso marker="observer:observer"><c>observer</c></seealso>
+      is a GUI tool that can connect to remote nodes and display a
+      variety of information about the running system.</item>
+      <item><seealso marker="observer:etop"><c>etop</c></seealso>
+      is a command line tool that can connect to remote nodes and
+      display information similar to what the UNIX tool top shows.</item>
+      <item><seealso marker="runtime_tools:msacc"><c>msacc</c></seealso>
+      allows the user to get a view of what the Erlang Run-Time system
+      is spending its time doing. Has a very low overhead, which makes it
+      useful to run in heavily loaded systems to get some idea of where
+      to start doing more granular profiling.</item>
+    </list>
   </section>
 
   <section>
@@ -128,7 +201,7 @@
       performance impact. Using <c>fprof</c> is just a matter of
       calling a few library functions, see the
       <seealso marker="tools:fprof">fprof</seealso> manual page in
-      Tools .<c>fprof</c> was introduced in R8.</p>
+      Tools.</p>
     </section>
 
     <section>
@@ -142,20 +215,6 @@
     </section>
 
     <section>
-      <title>cover</title>
-      <p>The primary use of <c>cover</c> is coverage analysis to verify
-      test cases, making sure that all relevant code is covered.
-      <c>cover</c> counts how many times each executable line of code
-      is executed when a program is run, on a per module basis.</p>
-      <p>Clearly, this information can be used to determine what
-      code is run very frequently and can therefore be subject for
-      optimization. Using <c>cover</c> is just a matter of calling a
-      few library functions, see the
-      <seealso marker="tools:cover">cover</seealso> manual page in
-      Tools.</p>
-    </section>
-
-    <section>
       <title>cprof</title>
       <p><c>cprof</c> is something in between <c>fprof</c> and
       <c>cover</c> regarding features. It counts how many times each
@@ -202,16 +261,6 @@
           <cell>No</cell>
         </row>
         <row>
-          <cell><c>cover</c></cell>
-          <cell>Per module to screen/file</cell>
-          <cell>Small</cell>
-          <cell>Moderate slowdown</cell>
-          <cell>Yes, per line</cell>
-          <cell>No</cell>
-          <cell>No</cell>
-          <cell>No</cell>
-        </row>
-        <row>
           <cell><c>cprof</c></cell>
           <cell>Per module to caller</cell>
           <cell>Small</cell>
@@ -224,6 +273,37 @@
         <tcaption>Tool Summary</tcaption>
       </table>
     </section>
+
+    <section>
+      <title>dbg</title>
+      <p><c>dbg</c> is a generic Erlang trace tool. By using the
+      <c>timestamp</c> or <c>cpu_timestamp</c> options it can be used
+      as a precision instrument to profile how long time a function
+      call takes for a specific process. This can be very useful when
+      trying to understand where time is spent in a heavily loaded
+      system as it is possible to limit the scope of what is profiled
+      to be very small.
+      For more information, see the
+      <seealso marker="runtime_tools:dbg">dbg</seealso> manual page in
+      Runtime Tools.</p>
+    </section>
+
+    <section>
+      <title>lcnt</title>
+      <p><c>lcnt</c> is used to profile interactions inbetween
+        entities that run in parallel. For example if you have
+        a process that all other processes in the system needs
+        to interact with (maybe it has some global configuration),
+        then <c>lcnt</c> can be used to figure out if the interaction
+        with that process is a problem.</p>
+      <p>In the Erlang Run-time System entities are only run in parallel
+        when there are multiple schedulers. Therefore <c>lcnt</c> will
+        show more contention points (and thus be more useful) on systems
+        using many schedulers on many cores.</p>
+      <p>For more information, see the
+        <seealso marker="tools:lcnt">lcnt</seealso> manual page in Tools.</p>
+    </section>
+
   </section>
 
   <section>
@@ -282,4 +362,3 @@
     </list>
   </section>
 </chapter>
-
diff --git a/system/doc/efficiency_guide/xmlfiles.mk b/system/doc/efficiency_guide/xmlfiles.mk
index 88df9417f5..23c0d991b4 100644
--- a/system/doc/efficiency_guide/xmlfiles.mk
+++ b/system/doc/efficiency_guide/xmlfiles.mk
@@ -29,5 +29,5 @@ EFF_GUIDE_CHAPTER_FILES = \
 	processes.xml \
 	profiling.xml \
 	tablesDatabases.xml \
-	drivers.xml
-
+	drivers.xml \
+	retired_myths.xml
diff --git a/system/doc/getting_started/seq_prog.xml b/system/doc/getting_started/seq_prog.xml
index 6b7e1cd24f..2b0750ff80 100644
--- a/system/doc/getting_started/seq_prog.xml
+++ b/system/doc/getting_started/seq_prog.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2016</year>
+      <year>2003</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -271,11 +271,12 @@ convert(N, centimeter) ->
 {'EXIT',{function_clause,[{tut2,convert,
                                 [3,miles],
                                 [{file,"tut2.erl"},{line,4}]},
-                          {erl_eval,do_apply,5,[{file,"erl_eval.erl"},{line,482}]},
-                          {shell,exprs,7,[{file,"shell.erl"},{line,666}]},
-                          {shell,eval_exprs,7,[{file,"shell.erl"},{line,621}]},
-                          {shell,eval_loop,3,[{file,"shell.erl"},{line,606}]}]}}</pre>
-
+                          {erl_eval,do_apply,6,
+                                    [{file,"erl_eval.erl"},{line,677}]},
+                          {shell,exprs,7,[{file,"shell.erl"},{line,687}]},
+                          {shell,eval_exprs,7,[{file,"shell.erl"},{line,642}]},
+                          {shell,eval_loop,3,
+                                 [{file,"shell.erl"},{line,627}]}]}}</pre>
   </section>
 
   <section>
diff --git a/system/doc/reference_manual/errors.xml b/system/doc/reference_manual/errors.xml
index b16c5da6eb..16d3e7590e 100644
--- a/system/doc/reference_manual/errors.xml
+++ b/system/doc/reference_manual/errors.xml
@@ -108,14 +108,55 @@
       (see <seealso marker="#exit_reasons">Exit Reason</seealso>),
       and a stack trace (which aids in finding the code location of
       the exception).</p>
-    <p>The stack trace can be retrieved using
-      <c>erlang:get_stacktrace/0</c>
-      from within a <c>try</c> expression, and is returned for 
+    <p>The stack trace can be be bound to a variable from within
+      a <c>try</c> expression, and is returned for
       exceptions of class <c>error</c> from a <c>catch</c> expression.</p>
     <p>An exception of class <c>error</c> is also known as a run-time 
       error.</p>
+
+      <section>
+	<title>The call-stack back trace (stacktrace)</title>
+        <p>The stack back-trace (<em>stacktrace</em>) is a list of
+          <c>{Module,Function,Arity,Location}</c>
+          tuples. The field <c>Arity</c> in the first tuple can be the
+          argument list of that function call instead of an arity integer,
+          depending on the exception.</p>
+
+	<p><c>Location</c> is a (possibly empty) list of two-tuples
+	that can indicate the location in the source code of the
+	function.  The first element is an atom describing the type of
+	information in the second element. The following items can
+	occur:</p>
+	<taglist>
+          <tag><c>file</c></tag>
+          <item>The second element of the tuple is a string (list of
+          characters) representing the filename of the source file
+          of the function.
+          </item>
+          <tag><c>line</c></tag>
+          <item>The second element of the tuple is the line number
+          (an integer &gt; 0) in the source file
+          where the exception occurred or the function was called.
+          </item>
+	</taglist>
+	<warning><p>Developers should rely on stacktrace entries only for
+	debugging purposes.</p>
+	<p>The VM performs tail call optimization, which
+	does not add new entries to the stacktrace, and also limits stacktraces
+	to a certain depth. Furthermore, compiler options, optimizations and
+	future changes may add or remove stacktrace entries, causing any code
+	that expects the stacktrace to be in a certain order or contain specific
+	items to fail.</p>
+	<p>The only exception to this rule is the class <c>error</c> with the
+	reason <c>undef</c> which is guaranteed to include the <c>Module</c>,
+	<c>Function</c> and <c>Arity</c> of the attempted
+	function as the first stacktrace entry.</p>
+	</warning>
+      </section>
+
   </section>
 
+
   <section>
     <title>Handling of Run-time Errors in Erlang</title>
 
diff --git a/system/doc/reference_manual/expressions.xml b/system/doc/reference_manual/expressions.xml
index cf2d5034aa..94e40dd077 100644
--- a/system/doc/reference_manual/expressions.xml
+++ b/system/doc/reference_manual/expressions.xml
@@ -1340,9 +1340,9 @@ hello</pre>
     <code type="none">
 try Exprs
 catch
-    [Class1:]ExceptionPattern1 [when ExceptionGuardSeq1] ->
+    Class1:ExceptionPattern1[:Stacktrace] [when ExceptionGuardSeq1] ->
         ExceptionBody1;
-    [ClassN:]ExceptionPatternN [when ExceptionGuardSeqN] ->
+    ClassN:ExceptionPatternN[:Stacktrace] [when ExceptionGuardSeqN] ->
         ExceptionBodyN
 end</code>
     <p>This is an enhancement of
@@ -1362,10 +1362,12 @@ end</code>
       the evaluation. In that case the exception is caught and
       the patterns <c>ExceptionPattern</c> with the right exception
       class <c>Class</c> are sequentially matched against the caught
-      exception. An omitted <c>Class</c> is shorthand for <c>throw</c>.
-      If a match succeeds and the optional guard sequence
+      exception. If a match succeeds and the optional guard sequence
       <c>ExceptionGuardSeq</c> is true, the corresponding
       <c>ExceptionBody</c> is evaluated to become the return value.</p>
+    <p><c>Stacktrace</c>, if specified, must be the name of a variable
+      (not a pattern). The stack trace is bound to the variable when
+      the corresponding <c>ExceptionPattern</c> matches.</p>
     <p>If an exception occurs during evaluation of <c>Exprs</c> but
       there is no matching <c>ExceptionPattern</c> of the right
       <c>Class</c> with a true guard sequence, the exception is passed
@@ -1373,6 +1375,18 @@ end</code>
       expression.</p>
     <p>If an exception occurs during evaluation of <c>ExceptionBody</c>,
       it is not caught.</p>
+    <p>It is allowed to omit <c>Class</c> and <c>Stacktrace</c>.
+      An omitted <c>Class</c> is shorthand for <c>throw</c>:</p>
+
+    <code type="none">
+try Exprs
+catch
+    ExceptionPattern1 [when ExceptionGuardSeq1] ->
+        ExceptionBody1;
+    ExceptionPatternN [when ExceptionGuardSeqN] ->
+        ExceptionBodyN
+end</code>
+
     <p>The <c>try</c> expression can have an <c>of</c>
       section:
       </p>
@@ -1384,10 +1398,10 @@ try Exprs of
     PatternN [when GuardSeqN] ->
         BodyN
 catch
-    [Class1:]ExceptionPattern1 [when ExceptionGuardSeq1] ->
+    Class1:ExceptionPattern1[:Stacktrace] [when ExceptionGuardSeq1] ->
         ExceptionBody1;
     ...;
-    [ClassN:]ExceptionPatternN [when ExceptionGuardSeqN] ->
+    ClassN:ExceptionPatternN[:Stacktrace] [when ExceptionGuardSeqN] ->
         ExceptionBodyN
 end</code>
     <p>If the evaluation of <c>Exprs</c> succeeds without an exception,
@@ -1408,10 +1422,10 @@ try Exprs of
     PatternN [when GuardSeqN] ->
         BodyN
 catch
-    [Class1:]ExceptionPattern1 [when ExceptionGuardSeq1] ->
+    Class1:ExceptionPattern1[:Stacktrace] [when ExceptionGuardSeq1] ->
         ExceptionBody1;
     ...;
-    [ClassN:]ExceptionPatternN [when ExceptionGuardSeqN] ->
+    ClassN:ExceptionPatternN[:Stacktrace] [when ExceptionGuardSeqN] ->
         ExceptionBodyN
 after
     AfterBody
@@ -1470,7 +1484,7 @@ try Expr
 catch
     throw:Term -> Term;
     exit:Reason -> {'EXIT',Reason}
-    error:Reason -> {'EXIT',{Reason,erlang:get_stacktrace()}}
+    error:Reason:Stk -> {'EXIT',{Reason,Stk}}
 end</code>
   </section>
 
diff --git a/system/doc/reference_manual/xmlfiles.mk b/system/doc/reference_manual/xmlfiles.mk
index 61637ae701..fffcbdd911 100644
--- a/system/doc/reference_manual/xmlfiles.mk
+++ b/system/doc/reference_manual/xmlfiles.mk
@@ -30,5 +30,6 @@ REF_MAN_CHAPTER_FILES = \
 	processes.xml \
 	distributed.xml \
 	code_loading.xml \
-	ports.xml
-
+	ports.xml \
+	character_set.xml \
+	typespec.xml
diff --git a/system/doc/system_principles/create_target.xmlsrc b/system/doc/system_principles/create_target.xmlsrc
index f9b27ffc35..dc6cbbe980 100644
--- a/system/doc/system_principles/create_target.xmlsrc
+++ b/system/doc/system_principles/create_target.xmlsrc
@@ -263,6 +263,14 @@ os> <input>/usr/local/erl-target/bin/erl -boot /usr/local/erl-target/releases/FI
       current directory create not only the file <c>mysystem.rel</c>,
       but also file <c>sys.config</c>, the latter file is tacitly
       put in the appropriate directory.</p>
+    <p>However, it can also be convenient to replace variables in
+       within a <c>sys.config</c> on the target after unpacking but
+       before running the release. If you have a <c>sys.config.src</c>
+       it will be included and is not required to be a valid Erlang term
+       file like <c>sys.config</c>. Before running the release you must
+       have a valid <c>sys.config</c> in the same directory, so using
+       <c>sys.config.src</c> requires having some tool to populate what is
+       needed and write <c>sys.config</c> to disk before booting the release.</p>
   </section>
 
   <section>
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index 116ec688fa..b6a80aadf5 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -50,6 +50,8 @@ include ../tutorial/xmlfiles.mk
 include ../design_principles/xmlfiles.mk
 include ../oam/xmlfiles.mk
 
+BOOK_FILES = book.xml
+
 XML_FILES = \
 	$(INST_GUIDE_CHAPTER_FILES:%=../installation_guide/%) \
 	$(SYSTEM_PRINCIPLES_CHAPTER_FILES:%=../system_principles/%) \
@@ -70,9 +72,9 @@ XML_FILES = \
 	../efficiency_guide/part.xml \
 	../tutorial/part.xml \
 	../design_principles/part.xml \
-	../oam/part.xml
+	../oam/part.xml \
+	$(BOOK_FILES)
 
-BOOK_FILES = book.xml
 
 XMLLINT_SRCDIRS= ../installation_guide:../system_principles:../embedded:../getting_started:../reference_manual:../programming_examples:../efficiency_guide:../tutorial:../design_principles:../oam
 HTMLDIR= ../html
diff --git a/t.erl b/t.erl
new file mode 100644
index 0000000000..eafb025666
--- /dev/null
+++ b/t.erl
@@ -0,0 +1,5 @@
+-module(t).
+-compile([export_all,nowarn_export_all]).
+
+id(I) ->
+    I.